oxml: convert CT_Br to xmlchemy

Steve Canny · Steve Canny · commit 9022cbac3ba0 · 2014-06-17T00:27:51.000-07:00
diff --git a/docx/oxml/simpletypes.py b/docx/oxml/simpletypes.py
@@ -153,6 +153,30 @@ def validate(cls, value):
         cls.validate_int_in_range(value, 0, 4294967295)
 
 
+class ST_BrClear(XsdString):
+
+    @classmethod
+    def validate(cls, value):
+        cls.validate_string(value)
+        valid_values = ('none', 'left', 'right', 'all')
+        if value not in valid_values:
+            raise ValueError(
+                "must be one of %s, got '%s'" % (valid_values, value)
+            )
+
+
+class ST_BrType(XsdString):
+
+    @classmethod
+    def validate(cls, value):
+        cls.validate_string(value)
+        valid_values = ('page', 'column', 'textWrapping')
+        if value not in valid_values:
+            raise ValueError(
+                "must be one of %s, got '%s'" % (valid_values, value)
+            )
+
+
 class ST_Coordinate(BaseIntType):
 
     @classmethod
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -9,35 +9,16 @@
 from ..enum.text import WD_UNDERLINE
 from .ns import nsdecls, qn
 from .shared import CT_String
-from .xmlchemy import BaseOxmlElement
+from .simpletypes import ST_BrClear, ST_BrType
+from .xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore
 
 
 class CT_Br(BaseOxmlElement):
     """
     ``<w:br>`` element, indicating a line, page, or column break in a run.
     """
-    @classmethod
-    def new(cls):
-        """
-        Return a new ``<w:br>`` element.
-        """
-        return OxmlElement('w:br')
-
-    @property
-    def clear(self):
-        self.get(qn('w:clear'))
-
-    @clear.setter
-    def clear(self, clear_str):
-        self.set(qn('w:clear'), clear_str)
-
-    @property
-    def type(self):
-        return self.get(qn('w:type'))
-
-    @type.setter
-    def type(self, type_str):
-        self.set(qn('w:type'), type_str)
+    type = OptionalAttribute('w:type', ST_BrType)
+    clear = OptionalAttribute('w:clear', ST_BrClear)
 
 
 class CT_P(BaseOxmlElement):
@@ -208,13 +189,7 @@ class CT_R(BaseOxmlElement):
     """
     ``<w:r>`` element, containing the properties and text for a run.
     """
-    def add_br(self):
-        """
-        Return a newly appended CT_Br (<w:br>) child element.
-        """
-        br = CT_Br.new()
-        self.append(br)
-        return br
+    br = ZeroOrMore('w:br')
 
     def add_drawing(self, inline_or_anchor):
         """
