Updated the tests to work with ReportLab 2.1 and added a test that was

supposed to show a failure a user reported, but works fine for me.
zopefoundation · Jun 19, 2007 · b5c12c6 · b5c12c6
1 parent b98beb8
commit b5c12c6
Show file tree

Hide file tree

Showing 21 changed files with 131 additions and 23 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -0,0 +1,3 @@
+- Stephan Richter (stephan.richter_at_gmail.com)
+
+This package is based on ReportLab Inc.'s ReportLab library.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -0,0 +1,21 @@
+=======
+CHANGES
+=======
+
+0.6 (06/19/2007)
+----------------
+
+- Fixed setup.py to include all dependencies.
+
+- Added test to show that a blocktable style can be applied multiple times. A
+  user reported that this is not working, but I could not replicate the
+  problem.
+
+- Updated the expected renderings to ReportLab 2.1. There were some good
+  layout fixes that broke the image comparison.
+
+
+0.5 (04/01/2007)
+----------------
+
+- Initial Release
diff --git a/buildout.cfg b/buildout.cfg
@@ -4,4 +4,4 @@ develop = .
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = z3c.rml
+eggs = z3c.rml [test]
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup (
     name='z3c.rml',
-    version='0.5',
+    version='0.6',
     author = "Stephan Richter and the Zope Community",
     author_email = "zope3-dev@zope.org",
     description = "An alternative implementation of RML",
@@ -15,14 +15,15 @@
     package_dir = {'':'src'},
     namespace_packages = ['z3c'],
     extras_require = dict(
-        test = ['zope.testing'],
+        test = ['zope.pagetemplate', 'zope.testing'],
         pagetemplate = ['zope.pagetemplate']
         ),
     install_requires = [
         # ReportLab does not seem to upload their packages to PyPI
         # 'reportlab',
         'setuptools',
         'zope.interface',
+        'zope.schema',
         ],
     dependency_links = ['http://download.zope.org/distribution']
     )

diff --git a/src/z3c/rml/TODO.txt b/src/z3c/rml/TODO.txt
diff --git a/src/z3c/rml/tests/expected/rml-examples-000-simple.pdf b/src/z3c/rml/tests/expected/rml-examples-000-simple.pdf
diff --git a/src/z3c/rml/tests/expected/rml-examples-002-paras.pdf b/src/z3c/rml/tests/expected/rml-examples-002-paras.pdf
diff --git a/src/z3c/rml/tests/expected/rml-examples-022-paras-oas.pdf b/src/z3c/rml/tests/expected/rml-examples-022-paras-oas.pdf
diff --git a/src/z3c/rml/tests/expected/rml-examples-029-keepinframe.pdf b/src/z3c/rml/tests/expected/rml-examples-029-keepinframe.pdf
diff --git a/src/z3c/rml/tests/expected/rml-guide-example-01.pdf b/src/z3c/rml/tests/expected/rml-guide-example-01.pdf
diff --git a/src/z3c/rml/tests/expected/tag-blockTableStyle-2.pdf b/src/z3c/rml/tests/expected/tag-blockTableStyle-2.pdf
diff --git a/src/z3c/rml/tests/expected/tag-buttonField.pdf b/src/z3c/rml/tests/expected/tag-buttonField.pdf
diff --git a/src/z3c/rml/tests/expected/tag-drawAlignedString.pdf b/src/z3c/rml/tests/expected/tag-drawAlignedString.pdf
diff --git a/src/z3c/rml/tests/expected/tag-drawCenteredString.pdf b/src/z3c/rml/tests/expected/tag-drawCenteredString.pdf
diff --git a/src/z3c/rml/tests/expected/tag-drawRightString.pdf b/src/z3c/rml/tests/expected/tag-drawRightString.pdf
diff --git a/src/z3c/rml/tests/expected/tag-fixedSize.pdf b/src/z3c/rml/tests/expected/tag-fixedSize.pdf
diff --git a/src/z3c/rml/tests/expected/tag-keepInFrame.pdf b/src/z3c/rml/tests/expected/tag-keepInFrame.pdf
diff --git a/src/z3c/rml/tests/expected/tag-textField.pdf b/src/z3c/rml/tests/expected/tag-textField.pdf
diff --git a/src/z3c/rml/tests/input/rml-examples-002-paras.rml b/src/z3c/rml/tests/input/rml-examples-002-paras.rml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no" ?> 
-<!DOCTYPE document SYSTEM "rml_1_0.dtd"> 
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+]>
 <document filename="test_002_paras.pdf"> 
 
 

diff --git a/src/z3c/rml/tests/input/rml-examples-022-paras-oas.rml b/src/z3c/rml/tests/input/rml-examples-022-paras-oas.rml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no" ?> 
-<!DOCTYPE document SYSTEM "rml_1_0.dtd"> 
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+]>
 <document filename="test_022_paras_oas.pdf"> 
 
 

diff --git a/src/z3c/rml/tests/input/tag-blockTableStyle-2.rml b/src/z3c/rml/tests/input/tag-blockTableStyle-2.rml
@@ -0,0 +1,97 @@
+<!DOCTYPE document SYSTEM "rml.dtd">
+<document
+    filename="tag-blockTableStyle-2.pdf"
+    xmlns:doc="http://namespaces.zope.org/rml/doc">
+
+  <template>
+    <pageTemplate id="main">
+      <frame id="first" x1="72" y1="72" width="451" height="698"/>
+    </pageTemplate>
+  </template>
+
+  <stylesheet>
+    <blockTableStyle id="custom">
+      <blockAlignment value="CENTER" />
+      <lineStyle kind="BOX" colorName="black" />
+      <lineStyle kind="LINEBELOW" colorName="red" start="0,0" stop="-1,0" />
+      <lineStyle kind="LINEAFTER" colorName="blue" start="2,0" />
+    </blockTableStyle>
+  </stylesheet>
+
+  <story>
+    <title><font face="Courier">&lt;blockTableStyle&gt;</font> Tag Demo</title>
+
+    <p>This demo ensures that a table style can be applied multiple times.</p>
+
+    <blockTable style="custom">
+      <tr>
+        <td>00</td>
+        <td>01</td>
+        <td>02</td>
+        <td>03</td>
+        <td>04</td>
+        <td>05</td>
+      </tr>
+      <tr>
+        <td>10</td>
+        <td>11</td>
+        <td>12</td>
+        <td>13</td>
+        <td>14</td>
+        <td>15</td>
+      </tr>
+      <tr>
+        <td>20</td>
+        <td>21</td>
+        <td>22</td>
+        <td>23</td>
+        <td>24</td>
+        <td>25</td>
+      </tr>
+      <tr>
+        <td>30</td>
+        <td>31</td>
+        <td>32</td>
+        <td>33</td>
+        <td>34</td>
+        <td>35</td>
+      </tr>
+      <tr>
+        <td>40</td>
+        <td>41</td>
+        <td>42</td>
+        <td>43</td>
+        <td>44</td>
+        <td>45</td>
+      </tr>
+    </blockTable>
+
+    <spacer length="1cm" />
+
+    <blockTable style="custom">
+      <tr>
+        <td>00</td>
+        <td>01</td>
+        <td>02</td>
+        <td>03</td>
+        <td>04</td>
+      </tr>
+      <tr>
+        <td>10</td>
+        <td>11</td>
+        <td>12</td>
+        <td>13</td>
+        <td>14</td>
+      </tr>
+      <tr>
+        <td>20</td>
+        <td>21</td>
+        <td>22</td>
+        <td>23</td>
+        <td>24</td>
+      </tr>
+    </blockTable>
+
+  </story>
+
+</document>