Merge pull request #216 from CenterForOpenScience/issue_216

jlward · jlward · commit 9a3ca8849746 · 2016-05-20T17:33:42.000-04:00
Picts can have rects, which can have textbox
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,7 @@
 **0.9.8**
 
 - Textboxes can now contain tables.
+- Pict elements can now contain Rect elements.
 
 **0.9.7**
 
diff --git a/pydocx/__init__.py b/pydocx/__init__.py
@@ -6,4 +6,4 @@
     'PyDocX',
 ]
 
-__version__ = '0.9.7'
+__version__ = '0.9.8'
diff --git a/pydocx/export/base.py b/pydocx/export/base.py
@@ -63,6 +63,7 @@ def __init__(self, path):
             wordprocessing.FieldCode: self.export_field_code,
             wordprocessing.SimpleField: self.export_simple_field,
             vml.Shape: self.export_vml_shape,
+            vml.Rect: self.export_vml_rect,
             vml.ImageData: self.export_vml_image_data,
             vml.Textbox: self.export_textbox,
             wordprocessing.EmbeddedObject: self.export_embedded_object,
@@ -481,6 +482,9 @@ def export_footnote_reference_mark(self, footnote_reference_mark):
     def export_vml_shape(self, shape):
         return self.yield_nested(shape.children, self.export_node)
 
+    def export_vml_rect(self, rect):
+        return self.yield_nested(rect.children, self.export_node)
+
     def export_embedded_object(self, obj):
         return self.yield_nested(obj.children, self.export_node)
 
diff --git a/pydocx/openxml/vml/__init__.py b/pydocx/openxml/vml/__init__.py
@@ -1,10 +1,12 @@
 # coding: utf-8
 from pydocx.openxml.vml.image_data import ImageData
+from pydocx.openxml.vml.rect import Rect
 from pydocx.openxml.vml.shape import Shape
 from pydocx.openxml.vml.textbox import Textbox
 
 __all__ = [
     'ImageData',
+    'Rect',
     'Shape',
     'Textbox',
 ]
diff --git a/pydocx/openxml/vml/rect.py b/pydocx/openxml/vml/rect.py
@@ -0,0 +1,15 @@
+# coding: utf-8
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+)
+
+from pydocx.models import XmlModel, XmlCollection
+from pydocx.openxml.vml.image_data import ImageData
+
+
+class Rect(XmlModel):
+    XML_TAG = 'rect'
+
+    children = XmlCollection(ImageData, 'vml.Textbox')
diff --git a/pydocx/openxml/wordprocessing/picture.py b/pydocx/openxml/wordprocessing/picture.py
@@ -6,10 +6,10 @@
 )
 
 from pydocx.models import XmlModel, XmlCollection
-from pydocx.openxml.vml import Shape
+from pydocx.openxml.vml import Shape, Rect
 
 
 class Picture(XmlModel):
     XML_TAG = 'pict'
 
-    children = XmlCollection(Shape)
+    children = XmlCollection(Shape, Rect)
diff --git a/tests/export/html/test_rect.py b/tests/export/html/test_rect.py
@@ -0,0 +1,46 @@
+# coding: utf-8
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+)
+
+from pydocx.test import DocumentGeneratorTestCase
+from pydocx.test.utils import WordprocessingDocumentFactory
+from pydocx.openxml.packaging import MainDocumentPart
+
+
+class RectTestCase(DocumentGeneratorTestCase):
+    def test_rect_with_textbox(self):
+        document_xml = '''
+            <p>
+                <r>
+                    <pict>
+                        <rect>
+                            <textbox>
+                                <txbxContent>
+                                    <p>
+                                        <r>
+                                            <t>AAA</t>
+                                        </r>
+                                    </p>
+                                </txbxContent>
+                            </textbox>
+                        </rect>
+                    </pict>
+                </r>
+            </p>
+        '''
+
+        document = WordprocessingDocumentFactory()
+        document.add(MainDocumentPart, document_xml)
+
+        expected_html = '''
+            <p>
+                <p>
+                    AAA
+                </p>
+            </p>
+        '''
+        self.assert_document_generates_html(document, expected_html)

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@`
`6`	`6`	`'PyDocX',`
`7`	`7`	`]`
`8`	`8`
`9`		`-__version__ = '0.9.7'`
	`9`	`+__version__ = '0.9.8'`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`from pydocx.models import XmlModel, XmlCollection`
`9`		`-from pydocx.openxml.vml import Shape`
	`9`	`+from pydocx.openxml.vml import Shape, Rect`
`10`	`10`
`11`	`11`
`12`	`12`	`class Picture(XmlModel):`
`13`	`13`	`XML_TAG = 'pict'`
`14`	`14`
`15`		`- children = XmlCollection(Shape)`
	`15`	`+ children = XmlCollection(Shape, Rect)`