oxml: convert CT_Point2D to xmlchemy

Steve Canny · Steve Canny · commit 1eae1104e709 · 2014-06-16T18:41:55.000-07:00
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
@@ -68,12 +68,14 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 
 from docx.oxml.shape import (
     CT_Blip, CT_BlipFillProperties, CT_GraphicalObject,
-    CT_GraphicalObjectData, CT_Inline, CT_Picture, CT_PositiveSize2D
+    CT_GraphicalObjectData, CT_Inline, CT_Picture, CT_Point2D,
+    CT_PositiveSize2D
 )
 register_element_cls('a:blip',        CT_Blip)
 register_element_cls('a:ext',         CT_PositiveSize2D)
 register_element_cls('a:graphic',     CT_GraphicalObject)
 register_element_cls('a:graphicData', CT_GraphicalObjectData)
+register_element_cls('a:off',         CT_Point2D)
 register_element_cls('pic:blipFill',  CT_BlipFillProperties)
 register_element_cls('pic:pic',       CT_Picture)
 register_element_cls('wp:extent',     CT_PositiveSize2D)
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
@@ -6,7 +6,9 @@
 
 from . import OxmlElement
 from .ns import nsmap, nspfxmap, qn
-from .simpletypes import ST_PositiveCoordinate, ST_RelationshipId, XsdToken
+from .simpletypes import (
+    ST_Coordinate, ST_PositiveCoordinate, ST_RelationshipId, XsdToken
+)
 from .xmlchemy import (
     BaseOxmlElement, OneAndOnlyOne, OptionalAttribute, RequiredAttribute,
     ZeroOrOne
@@ -159,11 +161,14 @@ class CT_Point2D(BaseOxmlElement):
     Used for ``<a:off>`` element, and perhaps others. Specifies an x, y
     coordinate (point).
     """
+    x = RequiredAttribute('x', ST_Coordinate)
+    y = RequiredAttribute('y', ST_Coordinate)
+
     @classmethod
     def new(cls, nsptagname_str, x, y):
         elm = OxmlElement(nsptagname_str)
-        elm.set('x', str(x))
-        elm.set('y', str(y))
+        elm.x = x
+        elm.y = y
         return elm
 
 
diff --git a/docx/oxml/simpletypes.py b/docx/oxml/simpletypes.py
@@ -153,6 +153,26 @@ def validate(cls, value):
         cls.validate_int_in_range(value, 0, 4294967295)
 
 
+class ST_Coordinate(BaseIntType):
+
+    @classmethod
+    def convert_from_xml(cls, str_value):
+        if 'i' in str_value or 'm' in str_value or 'p' in str_value:
+            return ST_UniversalMeasure.convert_from_xml(str_value)
+        return int(str_value)
+
+    @classmethod
+    def validate(cls, value):
+        ST_CoordinateUnqualified.validate(value)
+
+
+class ST_CoordinateUnqualified(XsdLong):
+
+    @classmethod
+    def validate(cls, value):
+        cls.validate_int_in_range(value, -27273042329600, 27273042316900)
+
+
 class ST_DecimalNumber(XsdInt):
     pass
 
@@ -170,3 +190,17 @@ def validate(cls, value):
 
 class ST_RelationshipId(XsdString):
     pass
+
+
+class ST_UniversalMeasure(BaseSimpleType):
+
+    @classmethod
+    def convert_from_xml(cls, str_value):
+        float_part, units_part = str_value[:-2], str_value[-2:]
+        quantity = float(float_part)
+        multiplier = {
+            'mm': 36000, 'cm': 360000, 'in': 914400, 'pt': 12700,
+            'pc': 152400, 'pi': 152400
+        }[units_part]
+        emu_value = int(round(quantity * multiplier))
+        return emu_value
