Fix pageNumber and other dynamic tags when used in table repeatRows

zopefoundation · May 27, 2015 · 4010573 · 4010573
1 parent f8c8faa
commit 4010573
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -43,7 +43,7 @@ def alltests():
 
 setup (
     name="z3c.rml",
-    version='2.8.1.dev0',
+    version='2.8.1.dev1',
     author="Stephan Richter and the Zope Community",
     author_email="zope-dev@zope.org",
     description="An alternative implementation of RML",

diff --git a/src/z3c/rml/paraparser.py b/src/z3c/rml/paraparser.py
@@ -34,7 +34,10 @@ def text(self, value):
         setattr(self, key, value)
 
     def _get_pass_key(self):
-        return '_text_%s' % self._get_canvas()._doctemplate.current_pass
+        canvas = self._get_canvas()
+        return '_text_%s_%s' % (
+            canvas._doctemplate.current_pass, canvas.getPageNumber()
+        )
 
     def _get_canvas(self):
         canvas = None

diff --git a/src/z3c/rml/tests/expected/tag-pageNumber.pdf b/src/z3c/rml/tests/expected/tag-pageNumber.pdf
diff --git a/src/z3c/rml/tests/input/tag-pageNumber.rml b/src/z3c/rml/tests/input/tag-pageNumber.rml
@@ -0,0 +1,27 @@
+<!DOCTYPE document SYSTEM "rml.dtd">
+<document filename="tag-pagenumber.pdf">
+    <template>
+        <pageTemplate id="main">
+            <frame id="first" x1="0" y1="0" width="100" height="100"/>
+        </pageTemplate>
+    </template>
+
+    <story>
+        <blockTable repeatRows="1">
+            <tr><td><para>Header <pageNumber /></para></td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+            <tr><td>Lorem ipsum</td></tr>
+        </blockTable>
+    </story>
+</document>