Make sure a flow's canv attribute is assigned before drawing it. Th…

…is fixes having a `fixedSize` inside a `place`.
zopefoundation · Dec 1, 2018 · 1db8db5 · 1db8db5
1 parent bdf39b1
commit 1db8db5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/src/z3c/rml/canvas.py b/src/z3c/rml/canvas.py
@@ -419,6 +419,7 @@ def process(self):
 
         canvas = attr.getManager(self, interfaces.ICanvasManager).canvas
         for flow in flows.flow:
+            flow.canv = canvas
             flowWidth, flowHeight = flow.wrap(width, height)
             if flowWidth <= width and flowHeight <= height:
                 y -= flowHeight

diff --git a/src/z3c/rml/tests/expected/tag-place.pdf b/src/z3c/rml/tests/expected/tag-place.pdf
diff --git a/src/z3c/rml/tests/input/tag-place.rml b/src/z3c/rml/tests/input/tag-place.rml
@@ -53,5 +53,31 @@
       <para>A paragraph within the place.</para>
     </place>
 
+    <drawString x="1cm" y="8cm">
+      Below is a place with fitted content.
+    </drawString>
+
+    <place
+        x="1cm" y="6cm" width="13cm" height="1.5cm">
+      <fixedSize  width="13cm" height="1.5cm">
+        <para>
+          A long paragraph within the place.
+          A long paragraph within the place.
+          A long paragraph within the place.
+          A long paragraph within the place.
+        </para>
+        <para>
+          A second long paragraph.
+          A second long paragraph.
+          A second long paragraph.
+          A second long paragraph.
+          A second long paragraph.
+          A second long paragraph.
+          A second long paragraph.
+          A second long paragraph.
+        </para>
+      </fixedSize>
+    </place>
+
   </pageDrawing>
 </document>