Merge lp:~logan/ubuntu/raring/z3c.rml/2.0.0 into lp:ubuntu/raring/z3c.rml

[Logan Rosen]

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file '.pc/no-scripts.patch/setup.py'
--- .pc/no-scripts.patch/setup.py	2012-04-02 19:19:22 +0000
+++ .pc/no-scripts.patch/setup.py	2013-01-09 02:49:23 +0000
@@ -21,7 +21,7 @@
 
 setup (
     name='z3c.rml',
-    version='1.0.0',
+    version='2.0.0',
     author = "Stephan Richter and the Zope Community",
     author_email = "[e-mail]",
     description = "An alternative implementation of RML",
@@ -46,12 +46,12 @@
     extras_require = dict(
         test = [
             'zope.pagetemplate',
-            'zope.testing',
-            'PIL'],
+            'Pillow'],
         pagetemplate = [
             'zope.pagetemplate']
         ),
     install_requires = [
+        'Pygments',
         'lxml',
         'pyPdf',
         'reportlab',

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2012-04-02 15:47:51 +0000
+++ CHANGES.txt	2013-01-09 02:49:23 +0000
@@ -2,6 +2,115 @@
 CHANGES
 =======
 
+2.0.0 (2012-12-21)
+------------------
+
+- Implemented ``saveState`` and ``restoreState`` directives. (LP #666194)
+
+- Implemented ``storyPlace`` directive. (LP #665941)
+
+- Implemented ``clip`` attribute of ``path`` directive. See RML example 041.
+
+- Added ``h4``, ``h5``, and ``h6`` directives.
+
+- Implemented ``codesnippet`` directive.
+
+- Implemented ``pageBreakBefore``, ``frameBreakBefore``, ``textTransform``,
+  and ``endDots`` attributes for paragraph styles.
+
+- Added ``maxLineLength`` and ``newLineChars`` attributes to the ``pre``
+  directive.
+
+- Implemented ``pageNumber`` element for all ``draw*String`` elements.
+
+- Implemented ``NamedString`` directive.
+
+- Implemented ``startIndex`` and ``showIndex`` directive. Also hooked up
+  ``index`` in paragraphs properly. You can now create real book indexes.
+
+- Implemented ``ol``, ``ul``, and ``li`` directives, which allow highly
+  flexible lists to be created. Also implemented a complimentary ``listStyle``
+  directive.
+
+- Implemented the following doc-programming directives:
+
+    * docAssert
+    * docAssign
+    * docElse
+    * docIf
+    * docExec
+    * docPara
+    * docWhile
+
+- Added ``encName`` attribute to ``registerCidFont`` directive.
+
+- Renamed ``bookmark`` to ``bookmarkPage``.
+
+- Created a new canvas directive called ``bookmark``.
+
+- Added ``img`` directive, which is a simple image flowable.
+
+- Implemented crop marks support fully.
+
+- Added ``pageLayout`` and ``pageMode`` to ``docInit`` directive.
+
+- Implemented all logging related directives.
+
+- Implemented ``color`` directive inside the ``initialize`` directive.
+
+- Renamed ``pdfInclude`` to documented ``includePdfPages`` and added `pages`
+  attribute, so that you can only include specific pages.
+
+- Don't show "doc" namespace in reference snippets.
+
+- Create a list of RML2PDF and z3c.rml differences.
+
+- Implemented the ``ABORT_ON_INVALID_DIRECTIVE`` flag, that when set ``True``
+  will raise a ``ValueError`` error on the first occurence of a bad tag.
+
+- Implemented ``setFontSize`` directive for page drawings.
+
+- Implemented ``plugInGraphic`` which allows inserting graphics rendered in
+  Python.
+
+- Added `href` and `destination` to table cells and rectangles.
+
+- Bug: Due to a logic error, bad directives were never properly detected and
+  logged about.
+
+- Bug: Overwriting the default paragraph styles did not work properly.
+
+- Bug: Specifying a color in any tag inside the paragraph would fail, if the
+  color was a referenced name.
+
+- Bug: Moved premature ``getName`` evaluation into runtime to properly handle
+  synamic content now. This is now properly done for any paragraph and
+  draw string variant.
+
+- Bug: Fixed DTD generator to properly ignore Text Nodes as attributes. Also
+  text nodes were not properly documented as element PCDATA.
+
+
+1.1.0 (2012-12-18)
+------------------
+
+- Upgrade to ReportLab 2.6. This required some font changes and several
+  generated PDFs did not match, since some default fonts changed to sans-serif.
+
+- Added ``pdfInclude`` directive from Alex Garel. (LP #969399).
+
+- Switched to Pillow (from PIL).
+
+- Switched RML highlighting in RML Reference from SilverCity to Pygments.
+
+- Bug: Addressed a bug in ReportLab 2.6 that disallowed 3-D pie charts from
+  rendering.
+
+- Bug: Properly reset pdfform before rendering a document.
+
+- Bug: Reset fonts properly before a rendering.
+
+
 1.0.0 (2012-04-02)
 ------------------
 
@@ -16,6 +125,7 @@
   is updated, the border supports a border radius and the tag-para.rml sample
   has been updated.
 
+
 0.9.0 (2010-07-22)
 ------------------
 

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-04-02 15:47:51 +0000
+++ PKG-INFO	2013-01-09 02:49:23 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: z3c.rml
-Version: 1.0.0
+Version: 2.0.0
 Summary: An alternative implementation of RML
 Home-page: http://pypi.python.org/pypi/z3c.rml
 Author: Stephan Richter and the Zope Community
@@ -22,6 +22,115 @@
         CHANGES
         =======
         
+        2.0.0 (2012-12-21)
+        ------------------
+        
+        - Implemented ``saveState`` and ``restoreState`` directives. (LP #666194)
+        
+        - Implemented ``storyPlace`` directive. (LP #665941)
+        
+        - Implemented ``clip`` attribute of ``path`` directive. See RML example 041.
+        
+        - Added ``h4``, ``h5``, and ``h6`` directives.
+        
+        - Implemented ``codesnippet`` directive.
+        
+        - Implemented ``pageBreakBefore``, ``frameBreakBefore``, ``textTransform``,
+          and ``endDots`` attributes for paragraph styles.
+        
+        - Added ``maxLineLength`` and ``newLineChars`` attributes to the ``pre``
+          directive.
+        
+        - Implemented ``pageNumber`` element for all ``draw*String`` elements.
+        
+        - Implemented ``NamedString`` directive.
+        
+        - Implemented ``startIndex`` and ``showIndex`` directive. Also hooked up
+          ``index`` in paragraphs properly. You can now create real book indexes.
+        
+        - Implemented ``ol``, ``ul``, and ``li`` directives, which allow highly
+          flexible lists to be created. Also implemented a complimentary ``listStyle``
+          directive.
+        
+        - Implemented the following doc-programming directives:
+        
+            * docAssert
+            * docAssign
+            * docElse
+            * docIf
+            * docExec
+            * docPara
+            * docWhile
+        
+        - Added ``encName`` attribute to ``registerCidFont`` directive.
+        
+        - Renamed ``bookmark`` to ``bookmarkPage``.
+        
+        - Created a new canvas directive called ``bookmark``.
+        
+        - Added ``img`` directive, which is a simple image flowable.
+        
+        - Implemented crop marks support fully.
+        
+        - Added ``pageLayout`` and ``pageMode`` to ``docInit`` directive.
+        
+        - Implemented all logging related directives.
+        
+        - Implemented ``color`` directive inside the ``initialize`` directive.
+        
+        - Renamed ``pdfInclude`` to documented ``includePdfPages`` and added `pages`
+          attribute, so that you can only include specific pages.
+        
+        - Don't show "doc" namespace in reference snippets.
+        
+        - Create a list of RML2PDF and z3c.rml differences.
+        
+        - Implemented the ``ABORT_ON_INVALID_DIRECTIVE`` flag, that when set ``True``
+          will raise a ``ValueError`` error on the first occurence of a bad tag.
+        
+        - Implemented ``setFontSize`` directive for page drawings.
+        
+        - Implemented ``plugInGraphic`` which allows inserting graphics rendered in
+          Python.
+        
+        - Added `href` and `destination` to table cells and rectangles.
+        
+        - Bug: Due to a logic error, bad directives were never properly detected and
+          logged about.
+        
+        - Bug: Overwriting the default paragraph styles did not work properly.
+        
+        - Bug: Specifying a color in any tag inside the paragraph would fail, if the
+          color was a referenced name.
+        
+        - Bug: Moved premature ``getName`` evaluation into runtime to properly handle
+          synamic content now. This is now properly done for any paragraph and
+          draw string variant.
+        
+        - Bug: Fixed DTD generator to properly ignore Text Nodes as attributes. Also
+          text nodes were not properly documented as element PCDATA.
+        
+        
+        1.1.0 (2012-12-18)
+        ------------------
+        
+        - Upgrade to ReportLab 2.6. This required some font changes and several
+          generated PDFs did not match, since some default fonts changed to sans-serif.
+        
+        - Added ``pdfInclude`` directive from Alex Garel. (LP #969399).
+        
+        - Switched to Pillow (from PIL).
+        
+        - Switched RML highlighting in RML Reference from SilverCity to Pygments.
+        
+        - Bug: Addressed a bug in ReportLab 2.6 that disallowed 3-D pie charts from
+          rendering.
+        
+        - Bug: Properly reset pdfform before rendering a document.
+        
+        - Bug: Reset fonts properly before a rendering.
+        
+        
         1.0.0 (2012-04-02)
         ------------------
         
@@ -36,6 +145,7 @@
           is updated, the border supports a border radius and the tag-para.rml sample
           has been updated.
         
+        
         0.9.0 (2010-07-22)
         ------------------
         

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-04-02 15:47:51 +0000
+++ buildout.cfg	2013-01-09 02:49:23 +0000
@@ -21,7 +21,6 @@
 eggs = ${test:eggs}
 
 [versions]
-# tag-textField test fails with reportlab 2.5, because of this change to PDFPattern:
-# http://two.pairlist.net/pipermail/reportlab-users/2010-January/009216.html
-reportlab = 2.4
-PIL = 1.1.7
+reportlab = 2.6
+Pillow = 1.7.8
+lxml = 3.0.2

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-27 17:31:39 +0000
+++ debian/changelog	2013-01-09 02:49:23 +0000
@@ -1,3 +1,10 @@
+z3c.rml (2.0.0-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * debian/control: Bump Standards-Version to 3.9.4.
+
+ -- Logan Rosen <[e-mail]>  Tue, 08 Jan 2013 21:40:32 -0500
+
 z3c.rml (1.0.0-0ubuntu2) quantal; urgency=low
 
   * debian/control: added the Homepage field. 

=== modified file 'debian/control'
--- debian/control	2012-09-27 17:31:39 +0000
+++ debian/control	2013-01-09 02:49:23 +0000
@@ -7,7 +7,7 @@
                python-all (>= 2.6.6-3~),
                python-setuptools,
                python-van.pydeb (>= 1.3.0-4)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 X-Python-Version: >= 2.5
 Homepage: http://pypi.python.org/pypi/z3c.rml/
 

=== modified file 'setup.py'
--- setup.py	2012-04-02 19:19:22 +0000
+++ setup.py	2013-01-09 02:49:23 +0000
@@ -21,7 +21,7 @@
 
 setup (
     name='z3c.rml',
-    version='1.0.0',
+    version='2.0.0',
     author = "Stephan Richter and the Zope Community",
     author_email = "[e-mail]",
     description = "An alternative implementation of RML",
@@ -46,12 +46,12 @@
     extras_require = dict(
         test = [
             'zope.pagetemplate',
-            'zope.testing',
-            'PIL'],
+            'Pillow'],
         pagetemplate = [
             'zope.pagetemplate']
         ),
     install_requires = [
+        'Pygments',
         'lxml',
         'pyPdf',
         'reportlab',

=== modified file 'src/z3c.rml.egg-info/PKG-INFO'
--- src/z3c.rml.egg-info/PKG-INFO	2012-04-02 15:47:51 +0000
+++ src/z3c.rml.egg-info/PKG-INFO	2013-01-09 02:49:23 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: z3c.rml
-Version: 1.0.0
+Version: 2.0.0
 Summary: An alternative implementation of RML
 Home-page: http://pypi.python.org/pypi/z3c.rml
 Author: Stephan Richter and the Zope Community
@@ -22,6 +22,115 @@
         CHANGES
         =======
         
+        2.0.0 (2012-12-21)
+        ------------------
+        
+        - Implemented ``saveState`` and ``restoreState`` directives. (LP #666194)
+        
+        - Implemented ``storyPlace`` directive. (LP #665941)
+        
+        - Implemented ``clip`` attribute of ``path`` directive. See RML example 041.
+        
+        - Added ``h4``, ``h5``, and ``h6`` directives.
+        
+        - Implemented ``codesnippet`` directive.
+        
+        - Implemented ``pageBreakBefore``, ``frameBreakBefore``, ``textTransform``,
+          and ``endDots`` attributes for paragraph styles.
+        
+        - Added ``maxLineLength`` and ``newLineChars`` attributes to the ``pre``
+          directive.
+        
+        - Implemented ``pageNumber`` element for all ``draw*String`` elements.
+        
+        - Implemented ``NamedString`` directive.
+        
+        - Implemented ``startIndex`` and ``showIndex`` directive. Also hooked up
+          ``index`` in paragraphs properly. You can now create real book indexes.
+        
+        - Implemented ``ol``, ``ul``, and ``li`` directives, which allow highly
+          flexible lists to be created. Also implemented a complimentary ``listStyle``
+          directive.
+        
+        - Implemented the following doc-programming directives:
+        
+            * docAssert
+            * docAssign
+            * docElse
+            * docIf
+            * docExec
+            * docPara
+            * docWhile
+        
+        - Added ``encName`` attribute to ``registerCidFont`` directive.
+        
+        - Renamed ``bookmark`` to ``bookmarkPage``.
+        
+        - Created a new canvas directive called ``bookmark``.
+        
+        - Added ``img`` directive, which is a simple image flowable.
+        
+        - Implemented crop marks support fully.
+        
+        - Added ``pageLayout`` and ``pageMode`` to ``docInit`` directive.
+        
+        - Implemented all logging related directives.
+        
+        - Implemented ``color`` directive inside the ``initialize`` directive.
+        
+        - Renamed ``pdfInclude`` to documented ``includePdfPages`` and added `pages`
+          attribute, so that you can only include specific pages.
+        
+        - Don't show "doc" namespace in reference snippets.
+        
+        - Create a list of RML2PDF and z3c.rml differences.
+        
+        - Implemented the ``ABORT_ON_INVALID_DIRECTIVE`` flag, that when set ``True``
+          will raise a ``ValueError`` error on the first occurence of a bad tag.
+        
+        - Implemented ``setFontSize`` directive for page drawings.
+        
+        - Implemented ``plugInGraphic`` which allows inserting graphics rendered in
+          Python.
+        
+        - Added `href` and `destination` to table cells and rectangles.
+        
+        - Bug: Due to a logic error, bad directives were never properly detected and
+          logged about.
+        
+        - Bug: Overwriting the default paragraph styles did not work properly.
+        
+        - Bug: Specifying a color in any tag inside the paragraph would fail, if the
+          color was a referenced name.
+        
+        - Bug: Moved premature ``getName`` evaluation into runtime to properly handle
+          synamic content now. This is now properly done for any paragraph and
+          draw string variant.
+        
+        - Bug: Fixed DTD generator to properly ignore Text Nodes as attributes. Also
+          text nodes were not properly documented as element PCDATA.
+        
+        
+        1.1.0 (2012-12-18)
+        ------------------
+        
+        - Upgrade to ReportLab 2.6. This required some font changes and several
+          generated PDFs did not match, since some default fonts changed to sans-serif.
+        
+        - Added ``pdfInclude`` directive from Alex Garel. (LP #969399).
+        
+        - Switched to Pillow (from PIL).
+        
+        - Switched RML highlighting in RML Reference from SilverCity to Pygments.
+        
+        - Bug: Addressed a bug in ReportLab 2.6 that disallowed 3-D pie charts from
+          rendering.
+        
+        - Bug: Properly reset pdfform before rendering a document.
+        
+        - Bug: Reset fonts properly before a rendering.
+        
+        
         1.0.0 (2012-04-02)
         ------------------
         
@@ -36,6 +145,7 @@
           is updated, the border supports a border radius and the tag-para.rml sample
           has been updated.
         
+        
         0.9.0 (2010-07-22)
         ------------------
         

=== modified file 'src/z3c.rml.egg-info/SOURCES.txt'
--- src/z3c.rml.egg-info/SOURCES.txt	2012-04-02 15:47:51 +0000
+++ src/z3c.rml.egg-info/SOURCES.txt	2013-01-09 02:49:23 +0000
@@ -16,37 +16,42 @@
 src/z3c.rml.egg-info/not-zip-safe
 src/z3c.rml.egg-info/requires.txt
 src/z3c.rml.egg-info/top_level.txt
-src/z3c/rml/DEPENDENCIES.cfg
 src/z3c/rml/README.txt
 src/z3c/rml/__init__.py
 src/z3c/rml/attr.py
 src/z3c/rml/canvas.py
 src/z3c/rml/chart.py
 src/z3c/rml/directive.py
+src/z3c/rml/doclogic.py
 src/z3c/rml/document.py
 src/z3c/rml/dtd.py
 src/z3c/rml/error.py
 src/z3c/rml/flowable.py
 src/z3c/rml/form.py
 src/z3c/rml/interfaces.py
+src/z3c/rml/list.py
 src/z3c/rml/occurence.py
 src/z3c/rml/page.py
 src/z3c/rml/pagetemplate.py
 src/z3c/rml/pagetemplate.txt
 src/z3c/rml/paraparser.py
+src/z3c/rml/pdfinclude.py
 src/z3c/rml/platypus.py
 src/z3c/rml/reference.pt
 src/z3c/rml/reference.py
+src/z3c/rml/rlfix.py
 src/z3c/rml/rml-reference.pdf
 src/z3c/rml/rml.dtd
 src/z3c/rml/rml2pdf.py
 src/z3c/rml/rml2pdfscript.py
 src/z3c/rml/special.py
+src/z3c/rml/storyplace.py
 src/z3c/rml/stylesheet.py
 src/z3c/rml/template.py
 src/z3c/rml/tests/__init__.py
 src/z3c/rml/tests/flowable.py
 src/z3c/rml/tests/module.py
+src/z3c/rml/tests/test_directive.py
 src/z3c/rml/tests/test_pagetemplate.py
 src/z3c/rml/tests/test_rml.py
 src/z3c/rml/tests/test_subprocess.py

=== modified file 'src/z3c.rml.egg-info/requires.txt'
--- src/z3c.rml.egg-info/requires.txt	2012-04-02 19:19:22 +0000
+++ src/z3c.rml.egg-info/requires.txt	2013-01-09 02:49:23 +0000
@@ -1,3 +1,4 @@
+Pygments
 lxml
 pyPdf
 reportlab
@@ -7,8 +8,7 @@
 
 [test]
 zope.pagetemplate
-zope.testing
-PIL
+Pillow
 
 [pagetemplate]
 zope.pagetemplate
\ No newline at end of file

=== removed file 'src/z3c/rml/DEPENDENCIES.cfg'
--- src/z3c/rml/DEPENDENCIES.cfg	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/DEPENDENCIES.cfg	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-zope.interface
-zope.pagetemplate
-zope.testing
-reportlab
-reportlab.graphics.barcode

=== modified file 'src/z3c/rml/README.txt'
--- src/z3c/rml/README.txt	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/README.txt	2013-01-09 02:49:23 +0000
@@ -2,10 +2,10 @@
 Reportlab Markup Language
 =========================
 
-This pacakge is a free implementation of the RML markup language developed by
+This package is a free implementation of the RML markup language developed by
 Reportlab. Unfortunately, full compliance cannot be immediately verified,
 since the RML User Guide is ambiguous, incomplete and even incorrect. This
-pacakge can also not support the commercial extensions to Reportlab.
+package can also not support the commercial extensions to Reportlab.
 
 In the course of implementing the specification, I made already some
 improvements for various tags and added others fully. I also tried hard to

=== modified file 'src/z3c/rml/__init__.py'
--- src/z3c/rml/__init__.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/__init__.py	2013-01-09 02:49:23 +0000
@@ -1,3 +1,4 @@
 
 # Hook up our custom paragraph parser.
 import z3c.rml.paraparser
+import z3c.rml.rlfix

=== modified file 'src/z3c/rml/attr.py'
--- src/z3c/rml/attr.py	2012-04-02 15:47:51 +0000
+++ src/z3c/rml/attr.py	2013-01-09 02:49:23 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """RML Attribute Implementation
 
-$Id: attr.py 121449 2011-04-19 16:00:38Z menesis $
+$Id: attr.py 128842 2012-12-21 05:38:51Z srichter $
 """
 __docformat__ = "reStructuredText"
 import cStringIO
@@ -37,12 +37,12 @@
 logger = logging.getLogger("z3c.rml")
 
 
-def getFileInfo(attr):
-    root = attr.context
+def getFileInfo(directive):
+    root = directive
     while root.parent:
         root = root.parent
     return '(file %s, line %i)' % (
-        root.filename, attr.context.element.sourceline)
+        root.filename, directive.element.sourceline)
 
 
 def getManager(context, interface=None):
@@ -87,7 +87,7 @@
             name = self.deprecatedName
             logger.warn(
                 u'Deprecated attribute "%s": %s %s' % (
-                name, self.deprecatedReason, getFileInfo(self)))
+                name, self.deprecatedReason, getFileInfo(self.context)))
         else:
             name = self.__name__
         # Extract the value.
@@ -102,14 +102,16 @@
 
 class BaseChoice(RMLAttribute):
     choices = {}
+    doLower = True
 
     def fromUnicode(self, value):
-        value = value.lower()
+        if self.doLower:
+            value = value.lower()
         if value in self.choices:
             return self.choices[value]
         raise ValueError(
             '%r not a valid value for attribute "%s". %s' % (
-            value, self.__name__, getFileInfo(self)))
+            value, self.__name__, getFileInfo(self.context)))
 
 
 class Combination(RMLAttribute):
@@ -127,7 +129,8 @@
             except ValueError:
                 pass
         raise ValueError(
-            '"%s" is not a valid value. %s' %(value, getFileInfo(self)))
+            '"%s" is not a valid value. %s' %(
+                value, getFileInfo(self.context)))
 
 
 class String(RMLAttribute, zope.schema.Bytes):
@@ -185,18 +188,46 @@
             (self.max_length is not None and len(result) > self.max_length)):
             raise ValueError(
                 'Length of sequence must be at least %s and at most %i. %s' % (
-                self.min_length, self.max_length, getFileInfo(self)))
+                self.min_length, self.max_length,
+                getFileInfo(self.context)))
         return result
 
 
+class IntegerSequence(Sequence):
+    """A sequence of integers."""
+
+    def fromUnicode(self, ustr):
+        ustr = ustr.strip()
+        pieces = self.splitre.split(ustr)
+        numbers = set([])
+        for piece in pieces:
+            # Ignore empty pieces.
+            if not piece:
+                continue
+            # The piece is a range.
+            if '-' in piece:
+                start, end = piece.split('-')
+                # Make range lower and upper bound inclusive.
+                numbers.update(range(int(start), int(end)+1))
+                continue
+            # The piece is just a number
+            numbers.add(int(piece))
+        return list(numbers)
+
 class Choice(BaseChoice):
     """A choice of several values. The values are always case-insensitive."""
 
-    def __init__(self, choices=None, *args, **kw):
+    def __init__(self, choices=None, doLower=True, *args, **kw):
         super(Choice, self).__init__(*args, **kw)
         if isinstance(choices, (tuple, list)):
-            choices = dict([(val.lower(), val) for val in choices])
+            choices = dict(
+                [(val.lower() if doLower else val, val) for val in choices])
+        else:
+            choices = dict(
+                [(key.lower() if doLower else key, val)
+                 for key, val in choices.items()])
         self.choices = choices
+        self.doLower = doLower
 
 
 class Boolean(BaseChoice):
@@ -220,7 +251,7 @@
 class Measurement(RMLAttribute):
     '''This field represents a length value.
 
-    The units "in" (inch), "cm", and "mm" are allowed. If no units are
+    The units "in" (inch), "cm", "mm", and "pt" are allowed. If no units are
     specified, the value is given in points/pixels.
     '''
     def __init__(self, allowPercentage=False, allowStar=False, *args, **kw):
@@ -232,6 +263,7 @@
 	(re.compile('^(-?[0-9\.]+)\s*in$'), reportlab.lib.units.inch),
 	(re.compile('^(-?[0-9\.]+)\s*cm$'), reportlab.lib.units.cm),
 	(re.compile('^(-?[0-9\.]+)\s*mm$'), reportlab.lib.units.mm),
+	(re.compile('^(-?[0-9\.]+)\s*pt$'), 1),
 	(re.compile('^(-?[0-9\.]+)\s*$'), 1)
         ]
 
@@ -251,7 +283,7 @@
                 return unit[1]*float(res.group(1))
         raise ValueError(
             'The value %r is not a valid measurement. %s' % (
-            value, getFileInfo(self)))
+            value, getFileInfo(self.context)))
 
 
 class File(Text):
@@ -277,7 +309,7 @@
             if result is None:
                 raise ValueError(
                     'The package-path-pair you specified was incorrect. %s' %(
-                    getFileInfo(self)))
+                    getFileInfo(self.context)))
             modulepath, path = result.groups()
             module = __import__(modulepath, {}, {}, (modulepath))
             value = os.path.join(os.path.dirname(module.__file__), path)
@@ -325,9 +357,13 @@
         self.acceptNone = acceptNone
 
     def fromUnicode(self, value):
-        if self.acceptNone and value == 'None':
+        if self.acceptNone and value.lower() == 'none':
             return None
         manager = getManager(self.context)
+
+        if value.startswith('rml:'):
+            value = manager.names[value[4:]]
+
         if value in manager.colors:
             return manager.colors[value]
         try:
@@ -336,7 +372,20 @@
         except:
             raise ValueError(
                 'The color specification "%s" is not valid. %s' % (
-                value, getFileInfo(self)))
+                value, getFileInfo(self.context)))
+
+def _getStyle(context, value):
+    manager = getManager(context)
+    for styles in (manager.styles,
+                   reportlab.lib.styles.getSampleStyleSheet().byName):
+        if value in styles:
+            return styles[value]
+        elif 'style.' + value in styles:
+            return styles['style.' + value]
+        elif value.startswith('style.') and value[6:] in styles:
+            return styles[value[6:]]
+    raise ValueError('Style %r could not be found. %s' % (
+        value, getFileInfo(context)))
 
 class Style(String):
     """Requires a valid style to be entered.
@@ -347,17 +396,23 @@
     default = reportlab.lib.styles.getSampleStyleSheet().byName['Normal']
 
     def fromUnicode(self, value):
-        manager = getManager(self.context)
-        for styles in (manager.styles,
-                       reportlab.lib.styles.getSampleStyleSheet().byName):
-            if value in styles:
-                return styles[value]
-            elif 'style.' + value in styles:
-                return styles['style.' + value]
-            elif value.startswith('style.') and value[6:] in styles:
-                return styles[value[6:]]
-        raise ValueError('Style %r could not be found. %s' % (
-            value, getFileInfo(self)))
+        return _getStyle(self.context, value)
+
+
+class Padding(Sequence):
+    """This attribute is specific for padding and will produce the proper
+    length of the padding sequence."""
+
+    def __init__(self, *args, **kw):
+        kw.update(dict(value_type=Integer(), min_length=1, max_length=4))
+        super(Padding, self).__init__(*args, **kw)
+
+    def fromUnicode(self, value):
+        seq = super(Padding, self).fromUnicode(value)
+        # pdfgen does not like a single paddign value.
+        if len(seq) == 1:
+            seq.append(seq[0])
+        return seq
 
 
 class Symbol(Text):
@@ -420,7 +475,7 @@
         return text.strip()
 
 
-class TextNodeSequence(Sequence):
+class TextNodeSequence(Sequence, TextNode):
     """A sequence of values retrieved from the element's content."""
 
     def get(self):
@@ -443,7 +498,7 @@
         if len(result) % self.columns != 0:
             raise ValueError(
                 'Number of elements must be divisible by %i. %s' %(
-                self.columns, getFileInfo(self)))
+                self.columns, getFileInfo(self.context)))
         return [result[i*self.columns:(i+1)*self.columns]
                 for i in range(len(result)/self.columns)]
 
@@ -456,28 +511,17 @@
 
     def __init__(self, *args, **kw):
         super(RawXMLContent, self).__init__(*args, **kw)
-        # Do it in here, since we have a recursive problem otherwise
-        from z3c.rml import special
-        self.handleElements = {'getName': special.GetName}
 
     def get(self):
-        # Replace what we can replace
-        for subElement in self.context.element.iterdescendants():
-            if subElement.tag in self.handleElements:
-                substitute = self.handleElements[subElement.tag](
-                    subElement, self.context)
-                substitute.process()
-        # Now create the text
         # ReportLab's paragraph parser does not like attributes from other
         # namespaces; sigh. So we have to improvize.
         text = etree.tounicode(self.context.element)
         text = text[text.find('>')+1:text.rfind('<')]
         return text
 
-
 class XMLContent(RawXMLContent):
     """Same as 'RawXMLContent', except that the whitespace is normalized."""
 
     def get(self):
-        result = super(XMLContent, self).get()
-        return result.strip().replace('\t', ' ')
+        text = super(XMLContent, self).get()
+        return text.strip().replace('\t', ' ')

=== modified file 'src/z3c/rml/canvas.py'
--- src/z3c/rml/canvas.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/canvas.py	2013-01-09 02:49:23 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """Page Drawing Related Element Processing
 
-$Id: canvas.py 114908 2010-07-22 02:23:18Z srichter $
+$Id: canvas.py 128843 2012-12-21 06:58:39Z srichter $
 """
 __docformat__ = "reStructuredText"
 import zope.interface
@@ -59,6 +59,22 @@
         getattr(canvas, self.callable)(**kwargs)
 
 
+class ISaveState(interfaces.IRMLDirectiveSignature):
+    """Saves the current canvas state."""
+
+class SaveState(CanvasRMLDirective):
+    signature = ISaveState
+    callable = 'saveState'
+
+
+class IRestoreState(interfaces.IRMLDirectiveSignature):
+    """Saves the current canvas state."""
+
+class RestoreState(CanvasRMLDirective):
+    signature = IRestoreState
+    callable = 'restoreState'
+
+
 class IDrawString(interfaces.IRMLDirectiveSignature):
     """Draws a simple string (left aligned) onto the canvas at the specified
     location."""
@@ -75,7 +91,7 @@
                      u'string.'),
         required=True)
 
-    text = attr.TextNode(
+    text = attr.RawXMLContent(
         title=u'Text',
         description=(u'The string/text that is put onto the canvas.'),
         required=True)
@@ -84,6 +100,31 @@
     signature = IDrawString
     callable = 'drawString'
 
+    def getPageNumber(self, elem, canvas):
+        return str(canvas.getPageNumber() + int(elem.get('countingFrom', 1)) - 1)
+
+    def getName(self, elem, canvas):
+        return attr.getManager(self).names[elem.get('id')]
+
+    handleElements = {'pageNumber': getPageNumber,
+                      'getName': getName}
+
+    def _getText(self, node, canvas):
+        text = node.text or u''
+        for sub in node.iterdescendants():
+            if sub.tag in self.handleElements:
+                text += self.handleElements[sub.tag](self, sub, canvas)
+            else:
+                self._getText(sub, canvas)
+        text += node.tail or u''
+        return text
+
+    def process(self):
+        canvas = attr.getManager(self, interfaces.ICanvasManager).canvas
+        kwargs = dict(self.getAttributeValues(attrMapping=self.attrMapping))
+        kwargs['text'] = self._getText(self.element, canvas).strip()
+        getattr(canvas, self.callable)(**kwargs)
+
 class IDrawRightString(IDrawString):
     """Draws a simple string (right aligned) onto the canvas at the specified
     location."""
@@ -180,6 +221,17 @@
         description=u'The radius of the rounded corners.',
         required=False)
 
+    href = attr.Text(
+        title=u'Link URL',
+        description=u'When specified, the rectangle becomes a link to that URL.',
+        required=False)
+
+    destination = attr.Text(
+        title=u'Link Destination',
+        description=(u'When specified, the rectangle becomes a link to that '
+                     u'destination.'),
+        required=False)
+
 class Rectangle(CanvasRMLDirective):
     signature = IRectangle
     callable = 'rect'
@@ -188,8 +240,24 @@
     def process(self):
         if 'round' in self.element.keys():
             self.callable = 'roundRect'
-        super(Rectangle, self).process()
+        kwargs = dict(self.getAttributeValues(attrMapping=self.attrMapping))
+        canvas = attr.getManager(self, interfaces.ICanvasManager).canvas
+        # Create a link
+        url = kwargs.pop('href', None)
+        if url:
+            canvas.linkURL(
+                url,
+                (kwargs['x'], kwargs['y'],
+                 kwargs['x']+kwargs['width'], kwargs['y']+kwargs['height']))
+        dest = kwargs.pop('destination', None)
+        if dest:
+            canvas.linkRect(
+                '', dest,
+                (kwargs['x'], kwargs['y'],
+                 kwargs['x']+kwargs['width'], kwargs['y']+kwargs['height']))
 
+        # Render the rectangle
+        getattr(canvas, self.callable)(**kwargs)
 
 class IGrid(interfaces.IRMLDirectiveSignature):
     """A shape to be drawn on the canvas."""
@@ -490,6 +558,13 @@
         default=False,
         required=False)
 
+    clip = attr.Boolean(
+        title=u'Clip Path',
+        description=(u"A flag specifying whether the path should clip "
+                     u"overlapping elements."),
+        default=False,
+        required=False)
+
 class Path(CanvasRMLDirective):
     signature = IPath
     factories = {
@@ -527,7 +602,10 @@
         if kwargs.pop('close', False):
             self.path.close()
 
-        canvas.drawPath(self.path, **kwargs)
+        if kwargs.pop('clip', False):
+            canvas.clipPath(self.path, **kwargs)
+        else:
+            canvas.drawPath(self.path, **kwargs)
 
 
 class IFill(interfaces.IRMLDirectiveSignature):
@@ -582,18 +660,38 @@
     attrMapping = {'name': 'psfontname'}
 
 
+class ISetFontSize(interfaces.IRMLDirectiveSignature):
+    """Set the font size."""
+
+    size = attr.Measurement(
+        title=u'Size',
+        description=(u'The font size.'),
+        required=True)
+
+    leading = attr.Measurement(
+        title=u'Leading',
+        description=(u'The font leading.'),
+        required=False)
+
+class SetFontSize(CanvasRMLDirective):
+    signature = ISetFontSize
+    callable = 'setFontSize'
+
+
 class IScale(interfaces.IRMLDirectiveSignature):
     """Scale the drawing using x and y scaling factors."""
 
     sx = attr.Float(
         title=u'X-Scaling-Factor',
         description=(u'The scaling factor applied on x-coordinates.'),
-        required=True)
+        default=1,
+        required=False)
 
     sy = attr.Float(
         title=u'Y-Scaling-Factor',
         description=(u'The scaling factor applied on y-coordinates.'),
-        required=True)
+        default=1,
+        required=False)
 
 class Scale(CanvasRMLDirective):
     signature = IScale
@@ -720,10 +818,87 @@
             canvas.setDash(kw['dash'])
 
 
+class IBookmark(interfaces.IRMLDirectiveSignature):
+    """
+    This creates a bookmark to the current page which can be referred to with
+    the given key elsewhere. (Used inside a page drawing.)
+    """
+
+    name = attr.Text(
+        title=u'Name',
+        description=u'The name of the bookmark.',
+        required=True)
+
+    fit = attr.Choice(
+        title=u'Fit',
+        description=u'The Fit Type.',
+        choices=('XYZ', 'Fit', 'FitH', 'FitV', 'FitR'),
+        required=False)
+
+    zoom = attr.Float(
+        title=u'Zoom',
+        description=u'The zoom level when clicking on the bookmark.',
+        required=False)
+
+    x = attr.Measurement(
+        title=u'X-Position',
+        description=u'The x-position.',
+        required=False)
+
+    y = attr.Measurement(
+        title=u'Y-Position',
+        description=u'The y-position.',
+        required=False)
+
+class Bookmark(CanvasRMLDirective):
+    signature = IBookmark
+
+    def process(self):
+        args = dict(self.getAttributeValues())
+        canvas = attr.getManager(self, interfaces.ICanvasManager).canvas
+        args['left'], args['top'] = canvas.absolutePosition(args['x'], args['y'])
+        canvas.bookmarkPage(**args)
+
+
+class IPlugInGraphic(interfaces.IRMLDirectiveSignature):
+    """Inserts a custom graphic developed in Python."""
+
+    module = attr.String(
+        title=u'Module',
+        description=u'The Python module in which the flowable is located.',
+        required=True)
+
+    function = attr.String(
+        title=u'Function',
+        description=(u'The name of the factory function within the module '
+                     u'that returns the custom flowable.'),
+        required=True)
+
+    params = attr.TextNode(
+        title=u'Parameters',
+        description=(u'A list of parameters encoded as a long string.'),
+        required=False)
+
+class PlugInGraphic(CanvasRMLDirective):
+    signature = IPlugInGraphic
+
+    def process(self):
+        modulePath, functionName, params = self.getAttributeValues(
+            valuesOnly=True)
+        module = __import__(modulePath, {}, {}, [modulePath])
+        function = getattr(module, functionName)
+        canvas = attr.getManager(self, interfaces.ICanvasManager).canvas
+        function(canvas, params)
+
+
 class IDrawing(interfaces.IRMLDirectiveSignature):
     """A container directive for all directives that draw directly on the
     cnavas."""
     occurence.containing(
+        # State Manipulation
+        occurence.ZeroOrMore('saveState', ISaveState),
+        occurence.ZeroOrMore('restoreState', IRestoreState),
+        # String Drawing
         occurence.ZeroOrMore('drawString', IDrawString),
         occurence.ZeroOrMore('drawRightString', IDrawRightString),
         occurence.ZeroOrMore('drawCenteredString', IDrawCenteredString),
@@ -744,6 +919,7 @@
         occurence.ZeroOrMore('fill', IFill),
         occurence.ZeroOrMore('stroke', IStroke),
         occurence.ZeroOrMore('setFont', ISetFont),
+        occurence.ZeroOrMore('setFontSize', ISetFontSize),
         occurence.ZeroOrMore('scale', IScale),
         occurence.ZeroOrMore('translate', ITranslate),
         occurence.ZeroOrMore('rotate', IRotate),
@@ -763,12 +939,19 @@
         occurence.ZeroOrMore('pieChart', chart.IPieChart),
         occurence.ZeroOrMore('pieChart3D', chart.IPieChart3D),
         occurence.ZeroOrMore('spiderChart', chart.ISpiderChart),
+        # Misc
+        occurence.ZeroOrMore('bookmark', IBookmark),
+        occurence.ZeroOrMore('plugInGraphic', IPlugInGraphic),
         )
 
 class Drawing(directive.RMLDirective):
     signature = IDrawing
 
     factories = {
+        # State Management
+        'saveState': SaveState,
+        'restoreState': RestoreState,
+        # Drawing Strings
         'drawString': DrawString,
         'drawRightString': DrawRightString,
         'drawCenteredString': DrawCenteredString,
@@ -794,6 +977,7 @@
         'fill': Fill,
         'stroke': Stroke,
         'setFont': SetFont,
+        'setFontSize': SetFontSize,
         'scale': Scale,
         'translate': Translate,
         'rotate': Rotate,
@@ -807,7 +991,10 @@
         'linePlot3D': chart.LinePlot3D,
         'pieChart': chart.PieChart,
         'pieChart3D': chart.PieChart3D,
-        'spiderChart': chart.SpiderChart
+        'spiderChart': chart.SpiderChart,
+        # Misc
+        'bookmark': Bookmark,
+        'plugInGraphic': PlugInGraphic,
         }
 
 

=== modified file 'src/z3c/rml/chart.py'
--- src/z3c/rml/chart.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/chart.py	2013-01-09 02:49:23 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """Chart Element Processing
 
-$Id: chart.py 114908 2010-07-22 02:23:18Z srichter $
+$Id: chart.py 128763 2012-12-18 21:44:52Z srichter $
 """
 __docformat__ = "reStructuredText"
 import reportlab.lib.formatters
@@ -1621,7 +1621,6 @@
         'slices': Slices3D,
         })
 
-
 class ISpiderChart(IChart):
     """A spider chart."""
     occurence.containing(

=== modified file 'src/z3c/rml/directive.py'
--- src/z3c/rml/directive.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/directive.py	2013-01-09 02:49:23 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """RML Directive Implementation
 
-$Id: directive.py 78750 2007-08-12 01:50:06Z rogerineichen $
+$Id: directive.py 128767 2012-12-19 02:00:30Z srichter $
 """
 __docformat__ = "reStructuredText"
 import logging
@@ -26,6 +26,7 @@
 logging.raiseExceptions = False
 logger = logging.getLogger("z3c.rml")
 
+ABORT_ON_INVALID_DIRECTIVE = False
 
 def DeprecatedDirective(iface, reason):
     zope.interface.directlyProvides(iface, interfaces.IDeprecatedDirective)
@@ -92,18 +93,21 @@
             # Ignore all comments
             if isinstance(element, etree._Comment):
                 continue
+            # Raise an error/log any unknown directive.
+            if element.tag not in self.factories:
+                msg = "Directive %r could not be processed and was " \
+                      "ignored. %s" %(element.tag, getFileInfo(self))
+                # Record any tags/elements that could not be processed.
+                logger.warn(msg)
+                if ABORT_ON_INVALID_DIRECTIVE:
+                    raise ValueError(msg)
+                continue
             if select is not None and element.tag not in select:
                 continue
             if ignore is not None and element.tag in ignore:
                 continue
-            # If the element is a directive, process it
-            if element.tag in self.factories:
-                directive = self.factories[element.tag](element, self)
-                directive.process()
-            else:
-                # Record any tags/elements that could not be processed.
-                logger.warn("Directive %r could not be processed and was "
-                            "ignored. %s" %(element.tag, getFileInfo(self)))
+            directive = self.factories[element.tag](element, self)
+            directive.process()
 
     def process(self):
         self.processSubDirectives()

=== added file 'src/z3c/rml/doclogic.py'
--- src/z3c/rml/doclogic.py	1970-01-01 00:00:00 +0000
+++ src/z3c/rml/doclogic.py	2013-01-09 02:49:23 +0000
@@ -0,0 +1,169 @@
+##############################################################################
+#
+# Copyright (c) 2012 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""``doc*`` directives.
+"""
+import reportlab.platypus
+from z3c.rml import attr, directive, flowable, interfaces, occurence
+
+class IDocAssign(interfaces.IRMLDirectiveSignature):
+    """Assign a value to the namesapce."""
+
+    var = attr.String(
+        title=u'Variable Name',
+        description=u'The name under which the value is stored.',
+        required=True)
+
+    expr = attr.String(
+        title=u'Expression',
+        description=u'The expression that creates the value when evaluated.',
+        required=True)
+
+class DocAssign(flowable.Flowable):
+    signature = IDocAssign
+    klass = reportlab.platypus.flowables.DocAssign
+
+
+class IDocExec(interfaces.IRMLDirectiveSignature):
+    """Execute a statement."""
+
+    stmt = attr.String(
+        title=u'Statement',
+        description=u'The statement to be executed.',
+        required=True)
+
+class DocExec(flowable.Flowable):
+    signature = IDocExec
+    klass = reportlab.platypus.flowables.DocExec
+
+
+class IDocPara(interfaces.IRMLDirectiveSignature):
+    """Create a paragraph with the value returned from the expression."""
+
+    expr = attr.String(
+        title=u'Expression',
+        description=u'The expression to be executed.',
+        required=True)
+
+    format = attr.String(
+        title=u'Format',
+        description=u'The format used to render the expression value.',
+        required=False)
+
+    style = attr.Style(
+        title=u'Style',
+        description=u'The style of the paragraph.',
+        required=False)
+
+    escape = attr.Boolean(
+        title=u'Escape Text',
+        description=u'When set (default) the expression value is escaped.',
+        required=False)
+
+class DocPara(flowable.Flowable):
+    signature = IDocPara
+    klass = reportlab.platypus.flowables.DocPara
+
+
+class IDocAssert(interfaces.IRMLDirectiveSignature):
+    """Assert a certain condition."""
+
+    cond = attr.String(
+        title=u'Condition',
+        description=u'The condition to be asserted.',
+        required=True)
+
+    format = attr.String(
+        title=u'Format',
+        description=u'The text displayed if assertion fails.',
+        required=False)
+
+class DocAssert(flowable.Flowable):
+    signature = IDocAssert
+    klass = reportlab.platypus.flowables.DocAssert
+
+
+class IDocElse(interfaces.IRMLDirectiveSignature):
+    """Starts 'else' block."""
+
+class DocElse(flowable.Flowable):
+    signature = IDocElse
+
+    def process(self):
+        if not isinstance(self.parent, DocIf):
+            raise ValueError("<docElse> can only be placed inside a <docIf>")
+        self.parent.flow = self.parent.elseFlow
+
+
+class IDocIf(flowable.IFlow):
+    """Display story flow based on the value of the condition."""
+
+    cond = attr.String(
+        title=u'Condition',
+        description=u'The condition to be tested.',
+        required=True)
+
+class DocIf(flowable.Flow):
+    signature = IDocAssert
+    klass = reportlab.platypus.flowables.DocIf
+
+    def __init__(self, *args, **kw):
+        super(flowable.Flow, self).__init__(*args, **kw)
+        self.thenFlow = self.flow = []
+        self.elseFlow = []
+
+    def process(self):
+        args = dict(self.getAttributeValues())
+        self.processSubDirectives()
+        dif = self.klass(
+            thenBlock = self.thenFlow, elseBlock = self.elseFlow, **args)
+        self.parent.flow.append(dif)
+
+class IDocWhile(flowable.IFlow):
+    """Repeat the included directives as long as the condition is true."""
+
+    cond = attr.String(
+        title=u'Condition',
+        description=u'The condition to be tested.',
+        required=True)
+
+class DocWhile(flowable.Flow):
+    signature = IDocAssert
+    klass = reportlab.platypus.flowables.DocWhile
+
+    def process(self):
+        args = dict(self.getAttributeValues())
+        self.processSubDirectives()
+        dwhile = self.klass(whileBlock = self.flow, **args)
+        self.parent.flow.append(dwhile)
+
+
+flowable.Flow.factories['docAssign'] = DocAssign
+flowable.Flow.factories['docExec'] = DocExec
+flowable.Flow.factories['docPara'] = DocPara
+flowable.Flow.factories['docAssert'] = DocAssert
+flowable.Flow.factories['docIf'] = DocIf
+flowable.Flow.factories['docElse'] = DocElse
+flowable.Flow.factories['docWhile'] = DocWhile
+
+flowable.IFlow.setTaggedValue(
+    'directives',
+    flowable.IFlow.getTaggedValue('directives') +
+    (occurence.ZeroOrMore('docAssign', IDocAssign),
+     occurence.ZeroOrMore('docExec', IDocExec),
+     occurence.ZeroOrMore('docPara', IDocPara),
+     occurence.ZeroOrMore('docIf', IDocIf),
+     occurence.ZeroOrMore('docElse', IDocElse),
+     occurence.ZeroOrMore('docWhile', IDocWhile),
+     )
+    )

=== modified file 'src/z3c/rml/document.py'
--- src/z3c/rml/document.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/document.py	2013-01-09 02:49:23 +0000
@@ -13,19 +13,23 @@
 ##############################################################################
 """RML ``document`` element
 
-$Id: document.py 114907 2010-07-22 01:59:57Z srichter $
+$Id: document.py 128841 2012-12-21 05:02:18Z srichter $
 """
 __docformat__ = "reStructuredText"
 import cStringIO
+import logging
 import sys
 import zope.interface
 import reportlab.pdfgen.canvas
 from reportlab.pdfbase import pdfmetrics, ttfonts, cidfonts
-from reportlab.lib import fonts
-
-from z3c.rml import attr, directive, interfaces, occurence
-from z3c.rml import canvas, stylesheet, template
-
+from reportlab.lib import colors, fonts
+from reportlab.platypus import tableofcontents
+
+from z3c.rml import attr, canvas, directive, doclogic, interfaces, list
+from z3c.rml import occurence, pdfinclude, special, storyplace, stylesheet
+from z3c.rml import template
+
+LOGGER_NAME = 'z3c.rml.render'
 
 class IRegisterType1Face(interfaces.IRMLDirectiveSignature):
     """Register a new Type 1 font face."""
@@ -141,13 +145,58 @@
                      u'be previously registered.'),
         required=True)
 
+    encName = attr.String(
+        title=u'Encoding Name',
+        description=(u'The name of the encoding to use for the font.'),
+        required=False)
+
 class RegisterCidFont(directive.RMLDirective):
     signature = IRegisterCidFont
+    attrMapping = {'faceName': 'face', 'encName': 'encoding'}
+
+    def process(self):
+        args = dict(self.getAttributeValues(attrMapping=self.attrMapping))
+        if 'encoding' in args:
+            font = cidfonts.CIDFont(**args)
+        else:
+            font = cidfonts.UnicodeCIDFont(**args)
+        pdfmetrics.registerFont(font)
+
+
+class IRegisterFontFamily(interfaces.IRMLDirectiveSignature):
+    """Register a new font family."""
+
+    name = attr.String(
+        title=u'Name',
+        description=(u'The name of the font family.'),
+        required=True)
+
+    normal = attr.String(
+        title=u'Normal Font Name',
+        description=(u'The name of the normal font variant.'),
+        required=False)
+
+    bold = attr.String(
+        title=u'Bold Font Name',
+        description=(u'The name of the bold font variant.'),
+        required=False)
+
+    italic = attr.String(
+        title=u'Italic Font Name',
+        description=(u'The name of the italic font variant.'),
+        required=False)
+
+    boldItalic = attr.String(
+        title=u'Bold/Italic Font Name',
+        description=(u'The name of the bold/italic font variant.'),
+        required=True)
+
+class RegisterFontFamily(directive.RMLDirective):
+    signature = IRegisterFontFamily
 
     def process(self):
         args = self.getAttributeValues(valuesOnly=True)
-        font = cidfonts.UnicodeCIDFont(*args)
-        pdfmetrics.registerFont(font)
+        pdfmetrics.registerFontFamily(*args)
 
 
 class IColorDefinition(interfaces.IRMLDirectiveSignature):
@@ -158,45 +207,264 @@
         description=(u'The id/name the color will be available under.'),
         required=True)
 
+    RGB = attr.Color(
+        title=u'RGB Color',
+        description=(u'The color value that is represented.'),
+        required=False)
+
+    CMYK = attr.Color(
+        title=u'CMYK Color',
+        description=(u'The color value that is represented.'),
+        required=False)
+
     value = attr.Color(
         title=u'Color',
         description=(u'The color value that is represented.'),
-        required=True)
-    attr.deprecated(
-        'RGB', value,
-        (u'Ensures compatibility with ReportLab RML. Please use '
-         u'the "value" attribute.'))
+        required=False)
+
+    spotName = attr.String(
+        title=u'Spot Name',
+        description=(u'The Spot Name of the CMYK color.'),
+        required=False)
+
+    density = attr.Float(
+        title=u'Density',
+        description=(u'The color density of the CMYK color.'),
+        min=0.0,
+        max=1.0,
+        required=False)
+
+    knockout = attr.String(
+        title=u'Knockout',
+        description=(u'The knockout of the CMYK color.'),
+        required=False)
+
+    alpha = attr.Float(
+        title=u'Alpha',
+        description=(u'The alpha channel of the color.'),
+        min=0.0,
+        max=1.0,
+        required=False)
 
 class ColorDefinition(directive.RMLDirective):
     signature = IColorDefinition
 
     def process(self):
-        id, value = self.getAttributeValues(valuesOnly=True)
+        kwargs = dict(self.getAttributeValues())
+        id = kwargs.pop('id')
+        for attrName in ('RGB', 'CMYK', 'value'):
+            color = kwargs.pop(attrName, None)
+            if color is not None:
+                # CMYK has additional attributes.
+                for name, value in kwargs.items():
+                    setattr(color, name, value)
+                manager = attr.getManager(self)
+                manager.colors[id] = color
+                return
+        raise ValueError('At least one color definition must be specified.')
+
+# Initialize also supports the <color> tag.
+stylesheet.Initialize.factories['color'] = ColorDefinition
+stylesheet.IInitialize.setTaggedValue(
+    'directives',
+    stylesheet.IInitialize.getTaggedValue('directives') +
+    (occurence.ZeroOrMore('color', IColorDefinition),)
+    )
+
+
+class IStartIndex(interfaces.IRMLDirectiveSignature):
+    """Start a new index."""
+
+    name = attr.String(
+        title=u'Name',
+        description=u'The name of the index.',
+        default='index',
+        required=True)
+
+    offset = attr.Integer(
+        title=u'Offset',
+        description=u'The counting offset.',
+        min=0,
+        required=False)
+
+    format = attr.Choice(
+        title=u'Format',
+        description=(u'The format the index is going to use.'),
+        choices=interfaces.LIST_FORMATS,
+        required=False)
+
+class StartIndex(directive.RMLDirective):
+    signature = IStartIndex
+
+    def process(self):
+        kwargs = dict(self.getAttributeValues())
+        name = kwargs['name']
         manager = attr.getManager(self)
-        manager.colors[id] = value
+        manager.indexes[name] = tableofcontents.SimpleIndex(**kwargs)
+
+
+class ICropMarks(interfaces.IRMLDirectiveSignature):
+    """Crop Marks specification"""
+
+    name = attr.String(
+        title=u'Name',
+        description=u'The name of the index.',
+        default='index',
+        required=True)
+
+    borderWidth = attr.Measurement(
+        title=u'Border Width',
+        description=u'The width of the crop mark border.',
+        required=False)
+
+    markColor = attr.Color(
+        title=u'Mark Color',
+        description=u'The color of the crop marks.',
+        required=False)
+
+    markWidth = attr.Measurement(
+        title=u'Mark Width',
+        description=u'The line width of the actual crop marks.',
+        required=False)
+
+    markLength = attr.Measurement(
+        title=u'Mark Length',
+        description=u'The length of the actual crop marks.',
+        required=False)
+
+    markLast = attr.Boolean(
+        title=u'Mark Last',
+        description=u'If set, marks are drawn after the content is rendered.',
+        required=False)
+
+    bleedWidth = attr.Measurement(
+        title=u'Bleed Width',
+        description=(u'The width of the page bleed.'),
+        required=False)
+
+class CropMarksProperties(object):
+    borderWidth = 36
+    markWidth = 0.5
+    markColor = colors.toColor('green')
+    markLength = 18
+    markLast = True
+    bleedWidth = 0
+
+class CropMarks(directive.RMLDirective):
+    signature = ICropMarks
+
+    def process(self):
+        cmp = CropMarksProperties()
+        for name, value in self.getAttributeValues():
+            setattr(cmp, name, value)
+        self.parent.parent.cropMarks = cmp
+
+class ILogConfig(interfaces.IRMLDirectiveSignature):
+    """Configure the render logger."""
+
+    level = attr.Choice(
+        title=u'Level',
+        description=u'The default log level.',
+        choices=interfaces.LOG_LEVELS,
+        doLower=False,
+        required=False)
+
+    format = attr.String(
+        title=u'Format',
+        description=u'The format of the log messages.',
+        required=False)
+
+    filename = attr.File(
+        title=u'File Name',
+        description=u'The path to the file that is being logged.',
+        doNotOpen=True,
+        required=True)
+
+    filemode = attr.Choice(
+        title=u'File Mode',
+        description=u'The mode to open the file in.',
+        choices={'WRITE': 'w', 'APPEND': 'a'},
+        default='a',
+        required=False)
+
+    datefmt = attr.String(
+        title=u'Date Format',
+        description=u'The format of the log message date.',
+        required=False)
+
+class LogConfig(directive.RMLDirective):
+    signature = ILogConfig
+
+    def process(self):
+        args = dict(self.getAttributeValues())
+        logger = logging.Logger(LOGGER_NAME)
+        handler = logging.FileHandler(args['filename'], args['filemode'])
+        formatter = logging.Formatter(
+            args.get('format'), args.get('datefmt'))
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+        if 'level' in args:
+            logger.setLevel(args['level'])
+        self.parent.parent.logger = logger
 
 
 class IDocInit(interfaces.IRMLDirectiveSignature):
     occurence.containing(
+        occurence.ZeroOrMore('color', IColorDefinition),
+        occurence.ZeroOrMore('name', special.IName),
         occurence.ZeroOrMore('registerType1Face', IRegisterType1Face),
         occurence.ZeroOrMore('registerFont', IRegisterFont),
+        occurence.ZeroOrMore('registerCidFont', IRegisterCidFont),
         occurence.ZeroOrMore('registerTTFont', IRegisterTTFont),
-        occurence.ZeroOrMore('registerCidFont', IRegisterCidFont),
-        occurence.ZeroOrMore('color', IColorDefinition),
+        occurence.ZeroOrMore('registerFontFamily', IRegisterFontFamily),
         occurence.ZeroOrMore('addMapping', IAddMapping),
+        occurence.ZeroOrMore('logConfig', ILogConfig),
+        occurence.ZeroOrMore('cropMarks', ICropMarks),
+        occurence.ZeroOrMore('startIndex', IStartIndex),
         )
 
+    pageMode = attr.Choice(
+        title=u'Page Mode',
+        description=(u'The page mode in which the document is opened in '
+                     u'the viewer.'),
+        choices=('UseNone', 'UseOutlines', 'UseThumbs', 'FullScreen'),
+        required=False)
+
+    pageLayout = attr.Choice(
+        title=u'Page Layout',
+        description=(u'The layout in which the pages are displayed in '
+                     u'the viewer.'),
+        choices=('SinglePage', 'OneColumn', 'TwoColumnLeft', 'TwoColumnRight'),
+        required=False)
+
+    useCropMarks = attr.Boolean(
+        title=u'Use Crop Marks',
+        description=u'A flag when set shows crop marks on the page.',
+        required=False)
+
+
 class DocInit(directive.RMLDirective):
     signature = IDocInit
     factories = {
+        'name': special.Name,
+        'color': ColorDefinition,
         'registerType1Face': RegisterType1Face,
         'registerFont': RegisterFont,
         'registerTTFont': RegisterTTFont,
         'registerCidFont': RegisterCidFont,
-        'color': ColorDefinition,
         'addMapping': AddMapping,
+        'logConfig': LogConfig,
+        'cropMarks': CropMarks,
+        'startIndex': StartIndex,
         }
 
+    def process(self):
+        kwargs = dict(self.getAttributeValues())
+        self.parent.cropMarks = kwargs.get('useCropMarks', False)
+        self.parent.pageMode = kwargs.get('pageMode')
+        self.parent.pageLayout = kwargs.get('pageLayout')
+        super(DocInit, self).process()
+
 
 class IDocument(interfaces.IRMLDirectiveSignature):
     occurence.containing(
@@ -252,11 +520,38 @@
         self.names = {}
         self.styles = {}
         self.colors = {}
+        self.indexes = {}
         self.postProcessors = []
-        self.filename = '<unknwon>'
+        self.filename = '<unknown>'
+        self.cropMarks = False
+        self.pageLayout = None
+        self.pageMode = None
+        self.logger = None
+
+    def _indexAdd(self, canvas, name, label):
+        self.indexes[name](canvas, name, label)
+
+    def _beforeDocument(self):
+        self._initCanvas(self.doc.canv)
+        self.canvas = self.doc.canv
+
+    def _initCanvas(self, canvas):
+        canvas._indexAdd = self._indexAdd
+        canvas.manager = self
+        if self.pageLayout:
+            canvas._doc._catalog.setPageLayout(self.pageLayout)
+        if self.pageMode:
+            canvas._doc._catalog.setPageMode(self.pageMode)
 
     def process(self, outputFile=None):
         """Process document"""
+        # Reset all reportlab global variables. This is very important for
+        # ReportLab not to fail.
+        reportlab.rl_config._reset()
+
+        # Add our colors mapping to the default ones.
+        colors.toColor.setExtraColorsNameSpace(self.colors)
+
         if outputFile is None:
             # TODO: This is relative to the input file *not* the CWD!!!
             outputFile = open(self.element.get('filename'), 'wb')
@@ -275,14 +570,17 @@
                 attrMapping={'compression': 'pageCompression',
                              'debug': 'verbosity'}
                 ))
+            kwargs['cropMarks'] = self.cropMarks
 
             self.canvas = reportlab.pdfgen.canvas.Canvas(tempOutput, **kwargs)
+            self._initCanvas(self.canvas)
             self.processSubDirectives(select=('pageInfo', 'pageDrawing'))
             self.canvas.save()
 
         # Handle Flowable-based documents.
         elif self.element.find('template') is not None:
             self.processSubDirectives(select=('template', 'story'))
+            self.doc.beforeDocument = self._beforeDocument
             self.doc.multiBuild(self.flowables)
 
         # Process all post processors
@@ -294,3 +592,6 @@
         tempOutput.seek(0)
         outputFile.write(tempOutput.getvalue())
 
+        # Cleanup.
+        colors.toColor.setExtraColorsNameSpace({})
+

=== modified file 'src/z3c/rml/dtd.py'
--- src/z3c/rml/dtd.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/dtd.py	2013-01-09 02:49:23 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """Generate a DTD from the code
 
-$Id: dtd.py 76810 2007-06-19 19:49:26Z srichter $
+$Id: dtd.py 128803 2012-12-20 14:19:44Z srichter $
 """
 __docformat__ = "reStructuredText"
 import zope.schema
@@ -36,15 +36,20 @@
         subElementList.append(
             occurence.tag + occurence2Symbol.get(occurence.__class__, '')
             )
-    fields = zope.schema.getFields(signature).keys()
-    if len(fields) == 1 and isinstance(fields[0], attr.TextNode):
-        subElementList.append('#PCDATA')
+    fields = zope.schema.getFieldsInOrder(signature)
+    for attrName, field in fields:
+        if isinstance(field, attr.TextNode):
+            subElementList.append('#PCDATA')
+            break
     subElementList = ','.join(subElementList)
     if subElementList:
         subElementList = ' (' + subElementList + ')'
     text = '\n<!ELEMENT %s%s>' %(name, subElementList)
     # Create a list of attributes for this element.
-    for attrName, field in zope.schema.getFieldsInOrder(signature):
+    for attrName, field in fields:
+        # Ignore text nodes, since they are not attributes.
+        if isinstance(field, attr.TextNode):
+            continue
         # Create the type
         if isinstance(field, attr.Choice):
             type = '(' + '|'.join(field.choices.keys()) + ')'

=== modified file 'src/z3c/rml/flowable.py'
--- src/z3c/rml/flowable.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/flowable.py	2013-01-09 02:49:23 +0000
@@ -13,10 +13,11 @@
 ##############################################################################
 """Flowable Element Processing
 
-$Id: flowable.py 84838 2008-03-21 12:32:58Z rogerineichen $
+$Id: flowable.py 128843 2012-12-21 06:58:39Z srichter $
 """
 __docformat__ = "reStructuredText"
 import copy
+import logging
 import re
 import reportlab.lib.styles
 import reportlab.platypus
@@ -24,7 +25,8 @@
 import reportlab.platypus.flowables
 import reportlab.platypus.tables
 import zope.schema
-from reportlab.lib import styles
+from reportlab.lib import styles, pygments2xpre
+from xml.sax.saxutils import unescape
 from z3c.rml import attr, directive, interfaces, occurence
 from z3c.rml import form, platypus, special, stylesheet
 
@@ -141,8 +143,7 @@
         description=(u'The paragraph style that is applied to the paragraph. '
                      u'See the ``paraStyle`` tag for creating a paragraph '
                      u'style.'),
-        default=reportlab.lib.styles.getSampleStyleSheet()['Normal'],
-        required=True)
+        required=False)
 
     bulletText = attr.String(
         title=u'Bullet Character',
@@ -185,19 +186,44 @@
 class IPreformatted(IMinimalParagraphBase):
     """A preformatted text, similar to the <pre> tag in HTML."""
 
+    style = attr.Style(
+        title=u'Style',
+        description=(u'The paragraph style that is applied to the paragraph. '
+                     u'See the ``paraStyle`` tag for creating a paragraph '
+                     u'style.'),
+        default=reportlab.lib.styles.getSampleStyleSheet()['Code'],
+        required=False)
+
     text = attr.RawXMLContent(
         title=u'Text',
         description=(u'The text that will be layed out.'),
         required=True)
 
+    maxLineLength = attr.Integer(
+        title=u'Max Line Length',
+        description=(u'The maximum number of characters on one line.'),
+        required=False)
+
+    newLineChars = attr.Text(
+        title=u'New Line Characters',
+        description=u'The characters placed at the beginning of a wrapped line',
+        required=False)
+
 class Preformatted(Flowable):
     signature = IPreformatted
     klass = reportlab.platypus.Preformatted
 
-
 class IXPreformatted(IParagraphBase):
     """A preformatted text that allows paragraph markup."""
 
+    style = attr.Style(
+        title=u'Style',
+        description=(u'The paragraph style that is applied to the paragraph. '
+                     u'See the ``paraStyle`` tag for creating a paragraph '
+                     u'style.'),
+        default=reportlab.lib.styles.getSampleStyleSheet()['Normal'],
+        required=False)
+
     text = attr.RawXMLContent(
         title=u'Text',
         description=(u'The text that will be layed out.'),
@@ -208,6 +234,36 @@
     klass = reportlab.platypus.XPreformatted
 
 
+class ICodeSnippet(IXPreformatted):
+    """A code snippet with text highlighting."""
+
+    style = attr.Style(
+        title=u'Style',
+        description=(u'The paragraph style that is applied to the paragraph. '
+                     u'See the ``paraStyle`` tag for creating a paragraph '
+                     u'style.'),
+        required=False)
+
+    language = attr.String(
+        title=u'Language',
+        description=u'The language the code snippet is written in.',
+        required=False)
+
+class CodeSnippet(XPreformatted):
+    signature = ICodeSnippet
+
+    def process(self):
+        args = dict(self.getAttributeValues())
+        lang = args.pop('language', None)
+        args['text'] = unescape(args['text'])
+        if lang is not None:
+            args['text'] = pygments2xpre.pygments2xpre(
+                args['text'], lang.lower())
+        if 'style' not in args:
+            args['style'] = attr._getStyle(self, 'Code')
+        self.parent.flow.append(self.klass(**args))
+
+
 class IParagraph(IParagraphBase, stylesheet.IBaseParagraphStyle):
     """Lays out an entire paragraph."""
 
@@ -219,6 +275,7 @@
 class Paragraph(Flowable):
     signature = IParagraph
     klass = reportlab.platypus.Paragraph
+    defaultStyle = 'Normal'
 
     styleAttributes = zope.schema.getFieldNames(stylesheet.IBaseParagraphStyle)
 
@@ -232,6 +289,8 @@
 
     def process(self):
         args = dict(self.getAttributeValues(ignore=self.styleAttributes))
+        if 'style' not in args:
+            args['style'] = attr._getStyle(self, self.defaultStyle)
         args['style'] = self.processStyle(args['style'])
         self.parent.flow.append(self.klass(**args))
 
@@ -239,61 +298,56 @@
 class ITitle(IParagraph):
     """The title is a simple paragraph with a special title style."""
 
-    style = attr.Style(
-        title=u'Style',
-        description=(u'The paragraph style that is applied to the paragraph. '
-                     u'See the ``paraStyle`` tag for creating a paragraph '
-                     u'style.'),
-        default=reportlab.lib.styles.getSampleStyleSheet()['Title'],
-        required=True)
-
 class Title(Paragraph):
     signature = ITitle
-
+    defaultStyle = 'Title'
 
 class IHeading1(IParagraph):
     """Heading 1 is a simple paragraph with a special heading 1 style."""
 
-    style = attr.Style(
-        title=u'Style',
-        description=(u'The paragraph style that is applied to the paragraph. '
-                     u'See the ``paraStyle`` tag for creating a paragraph '
-                     u'style.'),
-        default=reportlab.lib.styles.getSampleStyleSheet()['Heading1'],
-        required=True)
-
 class Heading1(Paragraph):
     signature = IHeading1
+    defaultStyle = 'Heading1'
 
 
 class IHeading2(IParagraph):
     """Heading 2 is a simple paragraph with a special heading 2 style."""
 
-    style = attr.Style(
-        title=u'Style',
-        description=(u'The paragraph style that is applied to the paragraph. '
-                     u'See the ``paraStyle`` tag for creating a paragraph '
-                     u'style.'),
-        default=reportlab.lib.styles.getSampleStyleSheet()['Heading2'],
-        required=True)
-
 class Heading2(Paragraph):
     signature = IHeading2
+    defaultStyle = 'Heading2'
 
 
 class IHeading3(IParagraph):
     """Heading 3 is a simple paragraph with a special heading 3 style."""
 
-    style = attr.Style(
-        title=u'Style',
-        description=(u'The paragraph style that is applied to the paragraph. '
-                     u'See the ``paraStyle`` tag for creating a paragraph '
-                     u'style.'),
-        default=reportlab.lib.styles.getSampleStyleSheet()['Heading3'],
-        required=True)
-
 class Heading3(Paragraph):
     signature = IHeading3
+    defaultStyle = 'Heading3'
+
+
+class IHeading4(IParagraph):
+    """Heading 4 is a simple paragraph with a special heading 4 style."""
+
+class Heading4(Paragraph):
+    signature = IHeading4
+    defaultStyle = 'Heading4'
+
+
+class IHeading5(IParagraph):
+    """Heading 5 is a simple paragraph with a special heading 5 style."""
+
+class Heading5(Paragraph):
+    signature = IHeading5
+    defaultStyle = 'Heading5'
+
+
+class IHeading6(IParagraph):
+    """Heading 6 is a simple paragraph with a special heading 6 style."""
+
+class Heading6(Paragraph):
+    signature = IHeading6
+    defaultStyle = 'Heading6'
 
 
 class ITableCell(interfaces.IRMLDirectiveSignature):
@@ -470,6 +524,18 @@
         description=u'The space of the line right of the cell.',
         required=False)
 
+    href = attr.Text(
+        title=u'Link URL',
+        description=u'When specified, the cell becomes a link to that URL.',
+        required=False)
+
+    destination = attr.Text(
+        title=u'Link Destination',
+        description=(u'When specified, the cell becomes a link to that '
+                     u'destination.'),
+        required=False)
+
+
 class TableCell(directive.RMLDirective):
     signature = ITableCell
     styleAttributesMapping = (
@@ -492,6 +558,8 @@
                         'lineLeftCap', 'lineLeftCount', 'lineLeftSpace')),
         ('LINEAFTER', ('lineRightThickness', 'lineRightColor',
                        'lineRightCap', 'lineRightCount', 'lineRightSpace')),
+        ('HREF', ('href',)),
+        ('DESTINATION', ('destination',)),
         )
 
     def processStyle(self):
@@ -755,7 +823,7 @@
         description=u'The maximum height the flowables are allotted.',
         default=None,
         required=False)
-    
+
 class KeepTogether(Flowable):
     signature = IKeepTogether
     klass = reportlab.platypus.flowables.KeepTogether
@@ -771,6 +839,50 @@
         frame = self.klass(flow.flow, **args)
         self.parent.flow.append(frame)
 
+class IImage(interfaces.IRMLDirectiveSignature):
+    """An image."""
+
+    src = attr.Image(
+        title=u'Image Source',
+        description=u'The file that is used to extract the image data.',
+        onlyOpen=True,
+        required=True)
+
+    width = attr.Measurement(
+        title=u'Image Width',
+        description=u'The width of the image.',
+        required=False)
+
+    height = attr.Measurement(
+        title=u'Image Height',
+        description=u'The height the image.',
+        required=False)
+
+    mask = attr.Color(
+        title=u'Mask',
+        description=u'The color mask used to render the image.',
+        required=False)
+
+    vAlign = attr.Choice(
+        title=u'Vertical Alignment',
+        description=u'The vertical alignment of the image.',
+        choices=interfaces.VALIGN_TEXT_CHOICES,
+        required=False)
+
+class Image(Flowable):
+    signature = IImage
+    klass = reportlab.platypus.flowables.Image
+    attrMapping = {'src': 'filename'}
+
+    def process(self):
+        args = dict(self.getAttributeValues(attrMapping=self.attrMapping))
+        vAlign = args.pop('vAlign', None)
+        img = self.klass(**args)
+        if vAlign:
+            img.vAlign = vAlign
+        self.parent.flow.append(img)
+
+
 class IImageAndFlowables(interfaces.IRMLDirectiveSignature):
     """An image with flowables around it."""
 
@@ -931,7 +1043,7 @@
         self.parent.flow.append(frame)
 
 
-class IBookmark(interfaces.IRMLDirectiveSignature):
+class IBookmarkPage(interfaces.IRMLDirectiveSignature):
     """
     This creates a bookmark to the current page which can be referred to with
     the given key elsewhere.
@@ -947,20 +1059,10 @@
         description=u'The name of the bookmark.',
         required=True)
 
-    fitType = attr.Choice(
-        title=u'Fit Type',
+    fit = attr.Choice(
+        title=u'Fit',
         description=u'The Fit Type.',
-        choices=('Fit', 'FitH', 'FitV', 'FitR'),
-        required=False)
-
-    left = attr.Measurement(
-        title=u'Left',
-        description=u'The left position.',
-        required=False)
-
-    right = attr.Measurement(
-        title=u'Right',
-        description=u'The right position.',
+        choices=('XYZ', 'Fit', 'FitH', 'FitV', 'FitR'),
         required=False)
 
     top = attr.Measurement(
@@ -968,6 +1070,16 @@
         description=u'The top position.',
         required=False)
 
+    bottom = attr.Measurement(
+        title=u'Bottom',
+        description=u'The bottom position.',
+        required=False)
+
+    left = attr.Measurement(
+        title=u'Left',
+        description=u'The left position.',
+        required=False)
+
     right = attr.Measurement(
         title=u'Right',
         description=u'The right position.',
@@ -978,10 +1090,39 @@
         description=u'The zoom level when clicking on the bookmark.',
         required=False)
 
+class BookmarkPage(Flowable):
+    signature = IBookmarkPage
+    klass = platypus.BookmarkPage
+    attrMapping = {'name': 'key', 'fitType': 'fit'}
+
+
+class IBookmark(interfaces.IRMLDirectiveSignature):
+    """
+    This creates a bookmark to the current page which can be referred to with
+    the given key elsewhere. (Used inside a story.)
+    """
+
+    name = attr.Text(
+        title=u'Name',
+        description=u'The name of the bookmark.',
+        required=True)
+
+    x = attr.Measurement(
+        title=u'X Coordinate',
+        description=u'The x-position of the bookmark.',
+        default=0,
+        required=False)
+
+    y = attr.Measurement(
+        title=u'Y Coordinate',
+        description=u'The y-position of the bookmark.',
+        default=0,
+        required=False)
+
 class Bookmark(Flowable):
     signature = IBookmark
-    klass = platypus.BookmarkPage
-    attrMapping = {'name': 'key', 'fitType': 'fit'}
+    klass = platypus.Bookmark
+    attrMapping = {'name': 'key', 'x': 'relativeX', 'y': 'relativeY'}
 
 
 class ILink(interfaces.IRMLDirectiveSignature):
@@ -1118,6 +1259,170 @@
     klass = platypus.OutlineAdd
 
 
+class NamedStringFlowable(reportlab.platypus.flowables.Flowable):
+
+    def __init__(self, manager, id, value):
+        reportlab.platypus.flowables.Flowable.__init__(self)
+        self.manager = manager
+        self.id = id
+        self.value = value
+
+    def wrap(self, *args):
+        return (0, 0)
+
+    def draw(self):
+        self.manager.names[self.id] = self.value
+
+
+class INamedString(interfaces.IRMLDirectiveSignature):
+    """Defines a name for a string."""
+
+    id = attr.String(
+        title=u'Id',
+        description=u'The id under which the value will be known.',
+        required=True)
+
+    value = attr.XMLContent(
+        title=u'Value',
+        description=u'The text that is displayed if the id is called.',
+        required=True)
+
+class NamedString(directive.RMLDirective):
+    signature = INamedString
+
+    def process(self):
+        id, value = self.getAttributeValues(valuesOnly=True)
+        manager = attr.getManager(self)
+        # We have to delay assigning values, otherwise the last one wins.
+        self.parent.flow.append(NamedStringFlowable(manager, id, value))
+
+
+class IShowIndex(interfaces.IRMLDirectiveSignature):
+    """Creates an index in the document."""
+
+    name = attr.String(
+        title=u'Name',
+        description=u'The name of the index.',
+        default='index',
+        required=False)
+
+    dot = attr.String(
+        title=u'Dot',
+        description=u'The character to use as a dot.',
+        required=False)
+
+    style = attr.Style(
+        title=u'Style',
+        description=u'The paragraph style that is applied to the index. ',
+        required=False)
+
+    tableStyle = attr.Style(
+        title=u'Table Style',
+        description=u'The table style that is applied to the index layout. ',
+        required=False)
+
+class ShowIndex(directive.RMLDirective):
+    signature = IShowIndex
+
+    def process(self):
+        args = dict(self.getAttributeValues())
+        manager = attr.getManager(self)
+        index = manager.indexes[args['name']]
+        args['format'] = index.formatFunc.__name__[8:]
+        args['offset'] = index.offset
+        index.setup(**args)
+        self.parent.flow.append(index)
+
+
+class IBaseLogCall(interfaces.IRMLDirectiveSignature):
+
+    message = attr.RawXMLContent(
+        title=u'Message',
+        description=u'The message to be logged.',
+        required=True)
+
+class LogCallFlowable(reportlab.platypus.flowables.Flowable):
+
+    def __init__(self, logger, level, message):
+        self.logger = logger
+        self.level = level
+        self.message = message
+
+    def wrap(self, *args):
+        return (0, 0)
+
+    def draw(self):
+        self.logger.log(self.level, self.message)
+
+class BaseLogCall(directive.RMLDirective):
+    signature = IBaseLogCall
+    level = None
+
+    def process(self):
+        message = self.getAttributeValues(
+            select=('message',), valuesOnly=True)[0]
+        manager = attr.getManager(self)
+        self.parent.flow.append(
+            LogCallFlowable(manager.logger, self.level, message))
+
+class ILog(IBaseLogCall):
+    """Log message at DEBUG level."""
+
+    level = attr.Choice(
+        title=u'Level',
+        description=u'The default log level.',
+        choices=interfaces.LOG_LEVELS,
+        doLower=False,
+        default=logging.INFO,
+        required=True)
+
+class Log(BaseLogCall):
+    signature = ILog
+
+    @property
+    def level(self):
+        return self.getAttributeValues(select=('level',), valuesOnly=True)[0]
+
+class IDebug(IBaseLogCall):
+    """Log message at DEBUG level."""
+
+class Debug(BaseLogCall):
+    signature = IDebug
+    level = logging.DEBUG
+
+
+class IInfo(IBaseLogCall):
+    """Log message at INFO level."""
+
+class Info(BaseLogCall):
+    signature = IInfo
+    level = logging.INFO
+
+
+class IWarning(IBaseLogCall):
+    """Log message at WARNING level."""
+
+class Warning(BaseLogCall):
+    signature = IWarning
+    level = logging.WARNING
+
+
+class IError(IBaseLogCall):
+    """Log message at ERROR level."""
+
+class Error(BaseLogCall):
+    signature = IError
+    level = logging.ERROR
+
+
+class ICritical(IBaseLogCall):
+    """Log message at CRITICAL level."""
+
+class Critical(BaseLogCall):
+    signature = ICritical
+    level = logging.CRITICAL
+
+
 class IFlow(interfaces.IRMLDirectiveSignature):
     """A list of flowables."""
     occurence.containing(
@@ -1125,6 +1430,7 @@
         occurence.ZeroOrMore('illustration', IIllustration),
         occurence.ZeroOrMore('pre', IPreformatted),
         occurence.ZeroOrMore('xpre', IXPreformatted),
+        occurence.ZeroOrMore('codesnippet', ICodeSnippet),
         occurence.ZeroOrMore('plugInFlowable', IPluginFlowable),
         occurence.ZeroOrMore('barCodeFlowable', IBarCodeFlowable),
         occurence.ZeroOrMore('outlineAdd', IOutlineAdd),
@@ -1132,6 +1438,9 @@
         occurence.ZeroOrMore('h1', IHeading1),
         occurence.ZeroOrMore('h2', IHeading2),
         occurence.ZeroOrMore('h3', IHeading3),
+        occurence.ZeroOrMore('h4', IHeading4),
+        occurence.ZeroOrMore('h5', IHeading5),
+        occurence.ZeroOrMore('h6', IHeading6),
         occurence.ZeroOrMore('para', IParagraph),
         occurence.ZeroOrMore('blockTable', IBlockTable),
         occurence.ZeroOrMore('nextFrame', INextFrame),
@@ -1141,14 +1450,24 @@
         occurence.ZeroOrMore('condPageBreak', IConditionalPageBreak),
         occurence.ZeroOrMore('keepInFrame', IKeepInFrame),
         occurence.ZeroOrMore('keepTogether', IKeepTogether),
+        occurence.ZeroOrMore('img', IImage),
         occurence.ZeroOrMore('imageAndFlowables', IImageAndFlowables),
         occurence.ZeroOrMore('pto', IPTO),
         occurence.ZeroOrMore('indent', IIndent),
         occurence.ZeroOrMore('fixedSize', IFixedSize),
+        occurence.ZeroOrMore('bookmarkPage', IBookmarkPage),
         occurence.ZeroOrMore('bookmark', IBookmark),
         occurence.ZeroOrMore('link', ILink),
         occurence.ZeroOrMore('hr', IHorizontalRow),
+        occurence.ZeroOrMore('showIndex', IShowIndex),
         occurence.ZeroOrMore('name', special.IName),
+        occurence.ZeroOrMore('namedString', INamedString),
+        occurence.ZeroOrMore('log', ILog),
+        occurence.ZeroOrMore('debug', IDebug),
+        occurence.ZeroOrMore('info', IInfo),
+        occurence.ZeroOrMore('warning', IWarning),
+        occurence.ZeroOrMore('error', IError),
+        occurence.ZeroOrMore('critical', ICritical),
         )
 
 class Flow(directive.RMLDirective):
@@ -1159,6 +1478,7 @@
         'illustration': Illustration,
         'pre': Preformatted,
         'xpre': XPreformatted,
+        'codesnippet': CodeSnippet,
         'plugInFlowable': PluginFlowable,
         'barCodeFlowable': BarCodeFlowable,
         'outlineAdd': OutlineAdd,
@@ -1167,6 +1487,9 @@
         'h1': Heading1,
         'h2': Heading2,
         'h3': Heading3,
+        'h4': Heading4,
+        'h5': Heading5,
+        'h6': Heading6,
         'para': Paragraph,
         # Table Flowable
         'blockTable': BlockTable,
@@ -1178,15 +1501,26 @@
         'condPageBreak': ConditionalPageBreak,
         'keepInFrame': KeepInFrame,
         'keepTogether': KeepTogether,
+        'img': Image,
         'imageAndFlowables': ImageAndFlowables,
         'pto': PTO,
         'indent': Indent,
         'fixedSize': FixedSize,
+        'bookmarkPage': BookmarkPage,
         'bookmark': Bookmark,
         'link': Link,
         'hr': HorizontalRow,
+        'showIndex': ShowIndex,
         # Special Elements
         'name': special.Name,
+        'namedString': NamedString,
+        # Logging
+        'log': Log,
+        'debug': Debug,
+        'info': Info,
+        'warning': Warning,
+        'error': Error,
+        'critical': Critical,
         }
 
     def __init__(self, *args, **kw):

=== modified file 'src/z3c/rml/form.py'
--- src/z3c/rml/form.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/form.py	2013-01-09 02:49:23 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """Page Drawing Related Element Processing
 
-$Id: form.py 74162 2007-04-16 04:16:37Z srichter $
+$Id: form.py 128806 2012-12-20 16:34:40Z srichter $
 """
 __docformat__ = "reStructuredText"
 import types
@@ -54,21 +54,6 @@
         description=u'The height of the barcode.',
         required=False)
 
-    strokeColor = attr.Color(
-        title=u'Stroke Color',
-        description=(u'The color of the line strokes in the area.'),
-        required=False)
-
-    strokeWidth = attr.Measurement(
-        title=u'Stroke Width',
-        description=u'The width of the line strokes in the area.',
-        required=False)
-
-    fillColor = attr.Color(
-        title=u'Fill Color',
-        description=(u'The color of the filled shapes in the area.'),
-        required=False)
-
     barStrokeColor = attr.Color(
         title=u'Bar Stroke Color',
         description=(u'The color of the line strokes in the barcode.'),
@@ -196,6 +181,12 @@
         description=(u'The color of human readable text.'),
         required=False)
 
+    # USPS4S
+    routing = attr.String(
+        title=u'Routing',
+        description=u'The routing information string.',
+        required=False)
+
 
 class IBarCode(IBarCodeBase):
     """A barcode graphic."""
@@ -212,7 +203,10 @@
         default=0,
         required=False)
 
-
+    isoScale = attr.Boolean(
+        title=u'Isometric Scaling',
+        description=u'When set, the aspect ration of the barcode is enforced.',
+        required=False)
 
 class BarCode(directive.RMLDirective):
     signature = IBarCode

=== modified file 'src/z3c/rml/interfaces.py'
--- src/z3c/rml/interfaces.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/interfaces.py	2013-01-09 02:49:23 +0000
@@ -12,10 +12,9 @@
 #
 ##############################################################################
 """RML to PDF Converter Interfaces
-
-$Id: interfaces.py 74195 2007-04-16 22:41:24Z srichter $
 """
 __docformat__ = "reStructuredText"
+import logging
 import reportlab.lib.enums
 import zope.interface
 import zope.schema
@@ -36,7 +35,16 @@
 VALIGN_TEXT_CHOICES = {
     'top': 'TOP', 'middle': 'MIDDLE', 'bottom': 'BOTTOM'}
 SPLIT_CHOICES = ('splitfirst', 'splitlast')
-
+TEXT_TRANSFORM_CHOICES = ('uppercase', 'lowercase')
+LIST_FORMATS = ('I', 'i', '123',  'ABC', 'abc')
+ORDERED_LIST_TYPES = ('I', 'i', '1', 'A', 'a')
+UNORDERED_BULLET_VALUES = ('circle', 'square', 'disc', 'diamond', 'rarrowhead')
+LOG_LEVELS = {
+    'DEBUG': logging.DEBUG,
+    'INFO': logging.INFO,
+    'WARNING': logging.WARNING,
+    'ERROR': logging.ERROR,
+    'CRITICAL': logging.CRITICAL}
 
 class IRML2PDF(zope.interface.Interface):
     """This is the main public API of z3c.rml"""

=== added file 'src/z3c/rml/list.py'
--- src/z3c/rml/list.py	1970-01-01 00:00:00 +0000
+++ src/z3c/rml/list.py	2013-01-09 02:49:23 +0000
@@ -0,0 +1,181 @@
+##############################################################################
+#
+# Copyright (c) 2012 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""``ul``, ``ol``, and ``li`` directives.
+"""
+__docformat__ = "reStructuredText"
+import copy
+import reportlab.lib.styles
+import reportlab.platypus
+import zope.schema
+from reportlab.platypus import flowables
+
+from z3c.rml import attr, directive, flowable, interfaces, occurence, stylesheet
+
+
+class IListItem(stylesheet.IMinimalListStyle, flowable.IFlow):
+    """A list item in an ordered or unordered list."""
+
+    style = attr.Style(
+        title=u'Style',
+        description=u'The list style that is applied to the list.',
+        required=False)
+
+class ListItem(flowable.Flow):
+    signature = IListItem
+    klass = reportlab.platypus.ListItem
+    attrMapping = {}
+
+    styleAttributes = zope.schema.getFieldNames(stylesheet.IMinimalListStyle)
+
+    def processStyle(self, style):
+        attrs = self.getAttributeValues(select=self.styleAttributes)
+        if attrs or not hasattr(style, 'value'):
+            style = copy.deepcopy(style)
+            # Sigh, this is needed since unordered list items expect the value.
+            style.value = style.start
+            for name, value in attrs:
+                setattr(style, name, value)
+        return style
+
+    def process(self):
+        self.processSubDirectives()
+        args = dict(self.getAttributeValues(ignore=self.styleAttributes))
+        if 'style' not in args:
+            args['style'] = self.parent.baseStyle
+        args['style'] = self.processStyle(args['style'])
+        li = self.klass(self.flow, **args)
+        self.parent.flow.append(li)
+
+
+class IOrderedListItem(IListItem):
+    """An ordered list item."""
+
+    value = attr.Integer(
+        title=u'Bullet Value',
+        description=u'The counter value.',
+        required=False)
+
+class OrderedListItem(ListItem):
+    signature = IOrderedListItem
+
+
+class IUnorderedListItem(IListItem):
+    """An ordered list item."""
+
+    value = attr.Choice(
+        title=u'Bullet Value',
+        description=u'The type of bullet character.',
+        choices=interfaces.UNORDERED_BULLET_VALUES,
+        required=False)
+
+class UnorderedListItem(ListItem):
+    signature = IUnorderedListItem
+
+    styleAttributes = ListItem.styleAttributes + ['value']
+
+
+class IListBase(stylesheet.IBaseListStyle):
+
+    style = attr.Style(
+        title=u'Style',
+        description=u'The list style that is applied to the list.',
+        required=False)
+
+class ListBase(directive.RMLDirective):
+    klass = reportlab.platypus.ListFlowable
+    factories = {'li': ListItem}
+    attrMapping = {}
+
+    styleAttributes = zope.schema.getFieldNames(stylesheet.IBaseListStyle)
+
+    def __init__(self, *args, **kw):
+        super(ListBase, self).__init__(*args, **kw)
+        self.flow = []
+
+    def processStyle(self, style):
+        attrs = self.getAttributeValues(
+            select=self.styleAttributes, attrMapping=self.attrMapping)
+        if attrs:
+            style = copy.deepcopy(style)
+            for name, value in attrs:
+                setattr(style, name, value)
+        return style
+
+    def process(self):
+        args = dict(self.getAttributeValues(
+                ignore=self.styleAttributes, attrMapping=self.attrMapping))
+        if 'style' not in args:
+            args['style'] = reportlab.lib.styles.ListStyle('List')
+        args['style'] = self.baseStyle = self.processStyle(args['style'])
+        self.processSubDirectives()
+        li = self.klass(self.flow, **args)
+        self.parent.flow.append(li)
+
+
+class IOrderedList(IListBase):
+    """An ordered list."""
+    occurence.containing(
+        occurence.ZeroOrMore('li', IOrderedListItem),
+        )
+
+    bulletType = attr.Choice(
+        title=u'Bullet Type',
+        description=u'The type of bullet formatting.',
+        choices=interfaces.ORDERED_LIST_TYPES,
+        doLower=False,
+        required=False)
+
+class OrderedList(ListBase):
+    signature = IOrderedList
+    factories = {'li': OrderedListItem}
+
+    styleAttributes = ListBase.styleAttributes + ['bulletType']
+
+
+class IUnorderedList(IListBase):
+    """And unordered list."""
+    occurence.containing(
+        occurence.ZeroOrMore('li', IUnorderedListItem),
+        )
+
+    value = attr.Choice(
+        title=u'Bullet Value',
+        description=u'The type of bullet character.',
+        choices=interfaces.UNORDERED_BULLET_VALUES,
+        default='disc',
+        required=False)
+
+class UnorderedList(ListBase):
+    signature = IUnorderedList
+    attrMapping = {'value': 'start'}
+    factories = {'li': UnorderedListItem}
+
+    def getAttributeValues(self, *args, **kw):
+        res = super(UnorderedList, self).getAttributeValues(*args, **kw)
+        res.append(('bulletType', 'bullet'))
+        return res
+
+flowable.Flow.factories['ol'] = OrderedList
+flowable.IFlow.setTaggedValue(
+    'directives',
+    flowable.IFlow.getTaggedValue('directives') +
+    (occurence.ZeroOrMore('ol', IOrderedList),)
+    )
+
+flowable.Flow.factories['ul'] = UnorderedList
+flowable.IFlow.setTaggedValue(
+    'directives',
+    flowable.IFlow.getTaggedValue('directives') +
+    (occurence.ZeroOrMore('ul', IUnorderedList),)
+    )

=== modified file 'src/z3c/rml/paraparser.py'
--- src/z3c/rml/paraparser.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/paraparser.py	2013-01-09 02:49:23 +0000
@@ -24,9 +24,12 @@
 import reportlab.platypus.paraparser
 
 
-class DynamicFragment(reportlab.platypus.paraparser.ParaFrag):
+class PageNumberFragment(reportlab.platypus.paraparser.ParaFrag):
     """A fragment whose `text` is computed at access time."""
 
+    def __init__(self, attributes):
+        reportlab.platypus.paraparser.ParaFrag.__init__(self)
+
     @property
     def text(self):
         # Guess 1: We're in a paragraph in a story.
@@ -43,18 +46,54 @@
         return str(canvas.getPageNumber())
 
 
+class GetNameFragment(reportlab.platypus.paraparser.ParaFrag):
+    """A fragment whose `text` is computed at access time."""
+
+    def __init__(self, attributes):
+        reportlab.platypus.paraparser.ParaFrag.__init__(self)
+        self.id = attributes['id']
+
+    @property
+    def text(self):
+        # Guess 1: We're in a paragraph in a story.
+        frame = inspect.currentframe(4)
+        canvas = frame.f_locals.get('canvas', None)
+
+        if canvas is None:
+            # Guess 2: We're in a template
+            canvas = frame.f_locals.get('canv', None)
+
+        if canvas is None:
+            raise Exception("Can't use <getName/> in this location.")
+
+        return canvas.manager.names[self.id]
+
+
 class Z3CParagraphParser(reportlab.platypus.paraparser.ParaParser):
     """Extensions to paragraph-internal XML parsing."""
 
-    def start_pageNumber(self, attributes):
-        frag = DynamicFragment()
+    def startDynamic(self, attributes, klass):
+        frag = klass(attributes)
         frag.__dict__.update(self._stack[-1].__dict__)
-        frag.fontName = reportlab.lib.fonts.tt2ps(frag.fontName, frag.bold, frag.italic)
+        frag.fontName = reportlab.lib.fonts.tt2ps(
+            frag.fontName, frag.bold, frag.italic)
         self.fragList.append(frag)
         self._stack.append(frag)
 
+    def endDynamic(self):
+        self._pop()
+
+    def start_pageNumber(self, attributes):
+        self.startDynamic(attributes, PageNumberFragment)
+
     def end_pageNumber(self):
-        self._pop()
+        self.endDynamic()
+
+    def start_getName(self, attributes):
+        self.startDynamic(attributes, GetNameFragment)
+
+    def end_getName(self):
+        self.endDynamic()
 
 
 # Monkey-patch reportlabs global parser instance. Wah.

=== added file 'src/z3c/rml/pdfinclude.py'
--- src/z3c/rml/pdfinclude.py	1970-01-01 00:00:00 +0000
+++ src/z3c/rml/pdfinclude.py	2013-01-09 02:49:23 +0000
@@ -0,0 +1,113 @@
+##############################################################################
+#
+# Copyright (c) 2012 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""``pdfInclude`` Directive.
+"""
+__docformat__ = "reStructuredText"
+try:
+    import pyPdf
+except ImportError:
+    pyPdf = None
+from reportlab.platypus import flowables
+
+from z3c.rml import attr, flowable, interfaces, occurence, page
+
+
+class IncludePdfPagesFlowable(flowables.Flowable):
+
+    def __init__(self, pdf_file, pages, mergeprocessor):
+        flowables.Flowable.__init__(self)
+        self.pdf_file = pdf_file
+        self.proc = mergeprocessor
+
+        pdf = pyPdf.PdfFileReader(pdf_file)
+        self.num_pages = pdf.getNumPages()
+        self.pages = pages if pages else range(1, self.num_pages+1)
+
+        self.width = 10<<32
+        self.height = 10<<32
+
+    def draw():
+        return NotImplementedError('PDFPages shall be drawn not me')
+
+    def split(self, availWidth, availheight):
+        result = []
+        for i in self.pages:
+            result.append(flowables.PageBreak())
+            result.append(PDFPageFlowable(self, i-1, availWidth, availheight))
+        return result
+
+
+class PDFPageFlowable(flowables.Flowable):
+
+    def __init__(self, parent, pagenumber, width, height):
+        flowables.Flowable.__init__(self)
+        self.parent = parent
+        self.pagenumber = pagenumber
+        self.width = width
+        self.height = height
+
+    def draw(self):
+        # FIXME : scale and rotate ?
+        # self.canv.addLiteral(self.page.getContents())
+        proc = self.parent.proc
+        outPage = self.canv.getPageNumber()-1
+        pageOperations = proc.operations.setdefault(outPage, [])
+        pageOperations.append((self.parent.pdf_file, self.pagenumber))
+        # flowable.NextPage()
+
+    def split(self, availWidth, availheight):
+        return [self]
+
+class IIncludePdfPages(interfaces.IRMLDirectiveSignature):
+    """Inserts a set of pages from a given PDF."""
+
+    filename = attr.File(
+        title=u'Path to file',
+        description=u'The pdf file to include.',
+        required=True)
+
+    pages = attr.IntegerSequence(
+        title=u'Pages',
+        description=u'A list of pages to insert.',
+        required=False)
+
+
+class IncludePdfPages(flowable.Flowable):
+    signature = IIncludePdfPages
+
+    def getProcessor(self):
+        manager = attr.getManager(self, interfaces.IPostProcessorManager)
+        procs = dict(manager.postProcessors)
+        if 'MERGE' not in procs:
+            proc = page.MergePostProcessor()
+            manager.postProcessors.append(('MERGE', proc))
+            return proc
+        return procs['MERGE']
+
+    def process(self):
+        if pyPdf is None:
+            raise Exception(
+                'pyPdf is not installed, so this feature is not available.')
+        args = dict(self.getAttributeValues())
+        proc = self.getProcessor()
+        self.parent.flow.append(
+            IncludePdfPagesFlowable(args['filename'], args.get('pages'), proc))
+
+
+flowable.Flow.factories['includePdfPages'] = IncludePdfPages
+flowable.IFlow.setTaggedValue(
+    'directives',
+    flowable.IFlow.getTaggedValue('directives') +
+    (occurence.ZeroOrMore('includePdfPages', IIncludePdfPages),)
+    )

=== modified file 'src/z3c/rml/platypus.py'
--- src/z3c/rml/platypus.py	2012-04-02 15:47:51 +0000
+++ src/z3c/rml/platypus.py	2013-01-09 02:49:23 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """Style Related Element Processing
 
-$Id: platypus.py 121449 2011-04-19 16:00:38Z menesis $
+$Id: platypus.py 128833 2012-12-21 02:02:02Z srichter $
 """
 __docformat__ = "reStructuredText"
 import reportlab.platypus.flowables
@@ -79,6 +79,11 @@
         self.canv.bookmarkPage(*self.args, **self.kw)
 
 
+class Bookmark(BaseFlowable):
+    def draw(self):
+        self.canv.bookmarkHorizontal(*self.args, **self.kw)
+
+
 class OutlineAdd(BaseFlowable):
     def draw(self):
         if self.kw.get('key', None) is None:

=== modified file 'src/z3c/rml/reference.pt'
--- src/z3c/rml/reference.pt	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/reference.pt	2013-01-09 02:49:23 +0000
@@ -112,7 +112,7 @@
         </drawCenteredString>
         <setFont name="Helvetica" size="24" />
         <drawCenteredString x="10.5cm" y="18.5cm">
-          Version 0.9
+          Version 2.0
         </drawCenteredString>
       </pageGraphics>
       <frame id="main" x1="3cm" y1="2cm" width="17cm" height="25.7cm" />
@@ -181,7 +181,7 @@
       <outlineAdd level="1" tal:content="directive/name">
         Element Name
       </outlineAdd>
-      <bookmark tal:attributes="name directive/id"/>
+      <bookmarkPage tal:attributes="name directive/id"/>
       <para style="deprecation"
             tal:condition="directive/deprecated">
         <b>Deprecated:</b>

=== modified file 'src/z3c/rml/reference.py'
--- src/z3c/rml/reference.py	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/reference.py	2013-01-09 02:49:23 +0000
@@ -13,23 +13,20 @@
 ##############################################################################
 """RML Reference Generator
 
-$Id: reference.py 114907 2010-07-22 01:59:57Z srichter $
+$Id: reference.py 128766 2012-12-19 01:37:16Z srichter $
 """
 __docformat__ = "reStructuredText"
 import copy
 import re
 import os
+import pygments.token
 import zope.schema
 import zope.schema.interfaces
 from lxml import etree
 from xml.sax import saxutils
+from pygments.lexers import XmlLexer
 from z3c.rml import attr, document, interfaces, pagetemplate
 
-try:
-    import SilverCity
-except ImportError:
-    SilverCity = None
-
 
 INPUT_URL = ('http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/'
              'rml/tests/input/%s')
@@ -41,10 +38,8 @@
     attr.TextNode, attr.TextNodeSequence, attr.TextNodeGrid,
     attr.RawXMLContent, attr.XMLContent)
 STYLES_FORMATTING = {
-     1 : ('<font textColor="red">', '</font>'),
-     #3 : ('<font textColor="blue">', '</font>'),
-     6 : ('<font textColor="blue">', '</font>'),
-    11 : ('<font textColor="red">', '</font>'),
+     pygments.token.Name.Tag : ('<font textColor="red">', '</font>'),
+     pygments.token.Literal.String : ('<font textColor="blue">', '</font>'),
     }
 EXAMPLE_NS = 'http://namespaces.zope.org/rml/doc'
 EXAMPLE_ATTR_NAME = '{%s}example' %EXAMPLE_NS
@@ -79,13 +74,11 @@
     return '\n'.join(result)
 
 def highlightRML(rml):
-    if SilverCity is None:
-        return saxutils.escape(rml)
-    lexer = SilverCity.XML.XMLLexer()
+    lexer = XmlLexer()
     styledRml = ''
-    for piece in lexer.tokenize_by_style(rml):
-        start, end = STYLES_FORMATTING.get(piece['style'], ('', ''))
-        styledRml += start + saxutils.escape(piece['text']) + end
+    for ttype, token in lexer.get_tokens(rml):
+        start, end = STYLES_FORMATTING.get(ttype, ('', ''))
+        styledRml += start + saxutils.escape(token) + end
     return styledRml
 
 
@@ -228,6 +221,8 @@
         for dirExamples in examples.values():
             for example in dirExamples:
                 xml = etree.tounicode(example['element']).strip()
+                xml = re.sub(
+                    ' ?xmlns:doc="http://namespaces.zope.org/rml/doc"', '', xml)
                 xml = dedent(xml)
                 xml = enforceColumns(xml, 80)
                 xml = highlightRML(xml)

=== added file 'src/z3c/rml/rlfix.py'
--- src/z3c/rml/rlfix.py	1970-01-01 00:00:00 +0000
+++ src/z3c/rml/rlfix.py	2013-01-09 02:49:23 +0000
@@ -0,0 +1,42 @@
+##############################################################################
+#
+# Copyright (c) 2012 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""ReportLab fixups.
+"""
+__docformat__ = "reStructuredText"
+from reportlab.pdfbase import pdfform
+from reportlab.pdfbase.pdfpattern import PDFPattern
+from reportlab.graphics import testshapes
+
+def resetPdfForm():
+    pdfform.PDFDOCENC = PDFPattern(pdfform.PDFDocEncodingPattern)
+    pdfform.ENCODING = PDFPattern(
+        pdfform.EncodingPattern, PDFDocEncoding=pdfform.PDFDOCENC)
+    pdfform.GLOBALFONTSDICTIONARY = pdfform.FormFontsDictionary()
+    pdfform.GLOBALRESOURCES = pdfform.FormResources()
+    pdfform.ZADB = PDFPattern(pdfform.ZaDbPattern)
+
+def resetFonts():
+    for f in testshapes._setup():
+        if f not in testshapes._FONTS:
+            testshapes._FONTS.append(f)
+
+def setSideLabels():
+    from reportlab.graphics.charts import piecharts
+    piecharts.Pie3d.sideLabels = 0
+setSideLabels()
+
+from reportlab.rl_config import register_reset
+register_reset(resetPdfForm)
+register_reset(resetFonts)
+del register_reset

=== modified file 'src/z3c/rml/rml-reference.pdf'
--- src/z3c/rml/rml-reference.pdf	2011-01-05 22:34:45 +0000
+++ src/z3c/rml/rml-reference.pdf	2013-01-09 02:49:23 +0000
@@ -23,12 +23,12 @@
 % 'Page1': class PDFPage 
 3 0 obj
 % Page dictionary
-<< /Contents 1007 0 R
+<< /Contents 1248 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -60,12 +60,12 @@
 % 'Page2': class PDFPage 
 6 0 obj
 % Page dictionary
-<< /Contents 1008 0 R
+<< /Contents 1249 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -88,12 +88,12 @@
 % 'Page3': class PDFPage 
 8 0 obj
 % Page dictionary
-<< /Contents 1009 0 R
+<< /Contents 1250 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -107,12 +107,12 @@
 % 'Page4': class PDFPage 
 9 0 obj
 % Page dictionary
-<< /Contents 1010 0 R
+<< /Contents 1251 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -159,9 +159,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 470.9469
+ 482.9469
  241.3961
- 482.9469 ]
+ 494.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -174,9 +174,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 470.9469
+ 482.9469
  297.6378
- 482.9469 ]
+ 494.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -189,9 +189,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 470.9469
- 322.6378
- 482.9469 ]
+ 482.9469
+ 323.1978
+ 494.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -203,10 +203,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 470.9469
- 322.6378
- 482.9469 ]
+ /Rect [ 323.1978
+ 482.9469
+ 323.1978
+ 494.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -219,9 +219,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 282.9469
+ 306.9469
  209.7361
- 294.9469 ]
+ 318.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -234,9 +234,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 282.9469
+ 306.9469
  297.6378
- 294.9469 ]
+ 318.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -249,9 +249,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 282.9469
- 322.6378
- 294.9469 ]
+ 306.9469
+ 323.1978
+ 318.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -263,10 +263,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 282.9469
- 322.6378
- 294.9469 ]
+ /Rect [ 323.1978
+ 306.9469
+ 323.1978
+ 318.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -279,9 +279,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 65.94685
+ 101.9469
  227.5161
- 77.94685 ]
+ 113.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -294,9 +294,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 65.94685
+ 101.9469
  297.6378
- 77.94685 ]
+ 113.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -309,9 +309,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 65.94685
- 322.6378
- 77.94685 ]
+ 101.9469
+ 323.1978
+ 113.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -323,10 +323,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 65.94685
- 322.6378
- 77.94685 ]
+ /Rect [ 323.1978
+ 101.9469
+ 323.1978
+ 113.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -345,12 +345,12 @@
  22 0 R
  23 0 R
  24 0 R ]
- /Contents 1011 0 R
+ /Contents 1252 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -367,12 +367,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 230 0 R
+ /Dest [ 229 0 R
  /Fit ]
  /Rect [ 56.69291
- 144.1969
+ 183.1969
  538.5827
- 156.1969 ]
+ 195.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -382,12 +382,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 75 0 R
+ /Dest [ 69 0 R
  /Fit ]
  /Rect [ 56.69291
- 132.1969
+ 171.1969
  538.5827
- 144.1969 ]
+ 183.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -400,9 +400,9 @@
  /Dest [ 166 0 R
  /Fit ]
  /Rect [ 56.69291
- 120.1969
+ 159.1969
  538.5827
- 132.1969 ]
+ 171.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -412,12 +412,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 815 0 R
+ /Dest [ 1015 0 R
  /Fit ]
  /Rect [ 56.69291
- 108.1969
+ 147.1969
  538.5827
- 120.1969 ]
+ 159.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -427,12 +427,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 68 0 R
+ /Dest [ 67 0 R
  /Fit ]
  /Rect [ 56.69291
- 96.19685
+ 135.1969
  538.5827
- 108.1969 ]
+ 147.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -442,12 +442,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 796 0 R
+ /Dest [ 981 0 R
  /Fit ]
  /Rect [ 56.69291
- 84.19685
+ 123.1969
  538.5827
- 96.19685 ]
+ 135.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -460,12 +460,12 @@
  29 0 R
  30 0 R
  31 0 R ]
- /Contents 1012 0 R
+ /Contents 1253 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -485,9 +485,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 470.9469
+ 518.9469
  227.5161
- 482.9469 ]
+ 530.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -500,9 +500,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 470.9469
+ 518.9469
  297.6378
- 482.9469 ]
+ 530.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -515,9 +515,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 470.9469
- 322.6378
- 482.9469 ]
+ 518.9469
+ 323.1978
+ 530.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -529,10 +529,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 470.9469
- 322.6378
- 482.9469 ]
+ /Rect [ 323.1978
+ 518.9469
+ 323.1978
+ 530.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -543,12 +543,12 @@
  34 0 R
  35 0 R
  36 0 R ]
- /Contents 1013 0 R
+ /Contents 1254 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -565,12 +565,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 230 0 R
+ /Dest [ 229 0 R
  /Fit ]
  /Rect [ 56.69291
- 432.1969
+ 473.1969
  538.5827
- 444.1969 ]
+ 485.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -580,12 +580,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 75 0 R
+ /Dest [ 69 0 R
  /Fit ]
  /Rect [ 56.69291
- 420.1969
+ 461.1969
  538.5827
- 432.1969 ]
+ 473.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -598,9 +598,9 @@
  /Dest [ 166 0 R
  /Fit ]
  /Rect [ 56.69291
- 408.1969
+ 449.1969
  538.5827
- 420.1969 ]
+ 461.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -610,12 +610,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 815 0 R
+ /Dest [ 1015 0 R
  /Fit ]
  /Rect [ 56.69291
- 396.1969
+ 437.1969
  538.5827
- 408.1969 ]
+ 449.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -625,12 +625,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 68 0 R
+ /Dest [ 67 0 R
  /Fit ]
  /Rect [ 56.69291
- 384.1969
+ 425.1969
  538.5827
- 396.1969 ]
+ 437.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -640,12 +640,12 @@
  0
  0 ]
  /Contents ()
- /Dest [ 796 0 R
+ /Dest [ 981 0 R
  /Fit ]
  /Rect [ 56.69291
- 372.1969
+ 413.1969
  538.5827
- 384.1969 ]
+ 425.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -658,9 +658,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 66.94685
+ 119.9469
  237.5161
- 78.94685 ]
+ 131.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -673,9 +673,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 66.94685
+ 119.9469
  297.6378
- 78.94685 ]
+ 131.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -688,9 +688,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 66.94685
- 322.6378
- 78.94685 ]
+ 119.9469
+ 323.1978
+ 131.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -702,10 +702,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 66.94685
- 322.6378
- 78.94685 ]
+ /Rect [ 323.1978
+ 119.9469
+ 323.1978
+ 131.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -722,12 +722,12 @@
  45 0 R
  46 0 R
  47 0 R ]
- /Contents 1014 0 R
+ /Contents 1255 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -741,12 +741,12 @@
 % 'Page9': class PDFPage 
 49 0 obj
 % Page dictionary
-<< /Contents 1015 0 R
+<< /Contents 1256 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -766,9 +766,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 458.9469
+ 545.9469
  223.0561
- 470.9469 ]
+ 557.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -781,9 +781,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 458.9469
+ 545.9469
  297.6378
- 470.9469 ]
+ 557.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -796,9 +796,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 458.9469
- 322.6378
- 470.9469 ]
+ 545.9469
+ 323.1978
+ 557.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -810,10 +810,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 458.9469
- 322.6378
- 470.9469 ]
+ /Rect [ 323.1978
+ 545.9469
+ 323.1978
+ 557.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -826,9 +826,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 356.9469
+ 455.9469
  223.0561
- 368.9469 ]
+ 467.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -841,9 +841,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 356.9469
+ 455.9469
  297.6378
- 368.9469 ]
+ 467.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -856,9 +856,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 356.9469
- 322.6378
- 368.9469 ]
+ 455.9469
+ 323.1978
+ 467.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -870,10 +870,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 356.9469
- 322.6378
- 368.9469 ]
+ /Rect [ 323.1978
+ 455.9469
+ 323.1978
+ 467.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -888,12 +888,12 @@
  55 0 R
  56 0 R
  57 0 R ]
- /Contents 1016 0 R
+ /Contents 1257 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -913,9 +913,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 125.9469
+ 294.9469
  263.0661
- 137.9469 ]
+ 306.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -928,9 +928,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 113.9469
+ 282.9469
  297.6378
- 125.9469 ]
+ 294.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -943,9 +943,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 113.9469
- 322.6378
- 125.9469 ]
+ 282.9469
+ 323.1978
+ 294.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -957,52 +957,44 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 113.9469
- 322.6378
- 125.9469 ]
+ /Rect [ 323.1978
+ 282.9469
+ 323.1978
+ 294.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Page11': class PDFPage 
+% 'Annot.NUMBER45': class PDFDictionary 
 63 0 obj
-% Page dictionary
-<< /Annots [ 59 0 R
- 60 0 R
- 61 0 R
- 62 0 R ]
- /Contents 1017 0 R
- /MediaBox [ 0
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-barCodeFlowable.rml) >>
+ /Border [ 0
  0
- 595.2756
- 841.8898 ]
- /Parent 1006 0 R
- /Resources << /Font 1 0 R
- /ProcSet [ /PDF
- /Text
- /ImageB
- /ImageC
- /ImageI ] >>
- /Rotate 0
- /Trans <<  >>
- /Type /Page >>
+ 0 ]
+ /Rect [ 150.2861
+ 216.9469
+ 263.0661
+ 228.9469 ]
+ /Subtype /Link
+ /Type /Annot >>
 endobj
-% 'Annot.NUMBER45': class PDFDictionary 
+% 'Annot.NUMBER46': class PDFDictionary 
 64 0 obj
 << /A << /S /URI
  /Type /Action
- /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-barCodeFlowable.rml) >>
+ /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-barCodeFlowable.pdf?view=auto) >>
  /Border [ 0
  0
  0 ]
- /Rect [ 150.2861
- 770.9469
- 263.0661
- 782.9469 ]
+ /Rect [ 297.6378
+ 204.9469
+ 297.6378
+ 216.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER46': class PDFDictionary 
+% 'Annot.NUMBER47': class PDFDictionary 
 65 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1011,13 +1003,13 @@
  0
  0 ]
  /Rect [ 297.6378
- 758.9469
- 297.6378
- 770.9469 ]
+ 204.9469
+ 323.1978
+ 216.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER47': class PDFDictionary 
+% 'Annot.NUMBER48': class PDFDictionary 
 66 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1025,41 +1017,30 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 297.6378
- 758.9469
- 322.6378
- 770.9469 ]
+ /Rect [ 323.1978
+ 204.9469
+ 323.1978
+ 216.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER48': class PDFDictionary 
+% 'Page11': class PDFPage 
 67 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-barCodeFlowable.pdf?view=auto) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 322.6378
- 758.9469
- 322.6378
- 770.9469 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Page12': class PDFPage 
-68 0 obj
 % Page dictionary
-<< /Annots [ 64 0 R
+<< /Annots [ 59 0 R
+ 60 0 R
+ 61 0 R
+ 62 0 R
+ 63 0 R
+ 64 0 R
  65 0 R
- 66 0 R
- 67 0 R ]
- /Contents 1018 0 R
+ 66 0 R ]
+ /Contents 1258 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -1071,19 +1052,39 @@
  /Type /Page >>
 endobj
 % 'Annot.NUMBER49': class LinkAnnotation 
+68 0 obj
+<< /Border [ 0
+ 0
+ 0 ]
+ /Contents ()
+ /Dest [ 449 0 R
+ /Fit ]
+ /Rect [ 56.69291
+ 154.1969
+ 538.5827
+ 166.1969 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Page12': class PDFPage 
 69 0 obj
-<< /Border [ 0
+% Page dictionary
+<< /Annots [ 68 0 R ]
+ /Contents 1259 0 R
+ /MediaBox [ 0
  0
- 0 ]
- /Contents ()
- /Dest [ 338 0 R
- /Fit ]
- /Rect [ 56.69291
- 705.1969
- 538.5827
- 717.1969 ]
- /Subtype /Link
- /Type /Annot >>
+ 595.2756
+ 841.8898 ]
+ /Parent 1247 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
 endobj
 % 'Annot.NUMBER50': class LinkAnnotation 
 70 0 obj
@@ -1094,9 +1095,9 @@
  /Dest [ 25 0 R
  /Fit ]
  /Rect [ 56.69291
- 518.1969
+ 693.1969
  538.5827
- 530.1969 ]
+ 705.1969 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1109,9 +1110,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 304.9469
+ 491.9469
  254.1661
- 316.9469 ]
+ 503.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1124,9 +1125,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 304.9469
+ 491.9469
  297.6378
- 316.9469 ]
+ 503.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1139,9 +1140,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 304.9469
- 322.6378
- 316.9469 ]
+ 491.9469
+ 323.1978
+ 503.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1153,54 +1154,44 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 304.9469
- 322.6378
- 316.9469 ]
+ /Rect [ 323.1978
+ 491.9469
+ 323.1978
+ 503.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Page13': class PDFPage 
+% 'Annot.NUMBER55': class PDFDictionary 
 75 0 obj
-% Page dictionary
-<< /Annots [ 69 0 R
- 70 0 R
- 71 0 R
- 72 0 R
- 73 0 R
- 74 0 R ]
- /Contents 1019 0 R
- /MediaBox [ 0
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
+ /Border [ 0
  0
- 595.2756
- 841.8898 ]
- /Parent 1006 0 R
- /Resources << /Font 1 0 R
- /ProcSet [ /PDF
- /Text
- /ImageB
- /ImageC
- /ImageI ] >>
- /Rotate 0
- /Trans <<  >>
- /Type /Page >>
+ 0 ]
+ /Rect [ 150.2861
+ 228.9469
+ 254.1661
+ 240.9469 ]
+ /Subtype /Link
+ /Type /Annot >>
 endobj
-% 'Annot.NUMBER55': class PDFDictionary 
+% 'Annot.NUMBER56': class PDFDictionary 
 76 0 obj
 << /A << /S /URI
  /Type /Action
- /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
+ /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
  /Border [ 0
  0
  0 ]
- /Rect [ 150.2861
- 746.9469
- 254.1661
- 758.9469 ]
+ /Rect [ 297.6378
+ 228.9469
+ 297.6378
+ 240.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER56': class PDFDictionary 
+% 'Annot.NUMBER57': class PDFDictionary 
 77 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1209,13 +1200,13 @@
  0
  0 ]
  /Rect [ 297.6378
- 746.9469
- 297.6378
- 758.9469 ]
+ 228.9469
+ 323.1978
+ 240.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER57': class PDFDictionary 
+% 'Annot.NUMBER58': class PDFDictionary 
 78 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1223,27 +1214,40 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 297.6378
- 746.9469
- 322.6378
- 758.9469 ]
+ /Rect [ 323.1978
+ 228.9469
+ 323.1978
+ 240.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER58': class PDFDictionary 
+% 'Page13': class PDFPage 
 79 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
- /Border [ 0
+% Page dictionary
+<< /Annots [ 70 0 R
+ 71 0 R
+ 72 0 R
+ 73 0 R
+ 74 0 R
+ 75 0 R
+ 76 0 R
+ 77 0 R
+ 78 0 R ]
+ /Contents 1260 0 R
+ /MediaBox [ 0
  0
- 0 ]
- /Rect [ 322.6378
- 746.9469
- 322.6378
- 758.9469 ]
- /Subtype /Link
- /Type /Annot >>
+ 595.2756
+ 841.8898 ]
+ /Parent 1247 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
 endobj
 % 'Annot.NUMBER59': class PDFDictionary 
 80 0 obj
@@ -1254,9 +1258,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 529.9469
+ 741.9469
  254.1661
- 541.9469 ]
+ 753.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1269,9 +1273,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 529.9469
+ 741.9469
  297.6378
- 541.9469 ]
+ 753.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1284,9 +1288,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 529.9469
- 322.6378
- 541.9469 ]
+ 741.9469
+ 323.1978
+ 753.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1298,10 +1302,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 529.9469
- 322.6378
- 541.9469 ]
+ /Rect [ 323.1978
+ 741.9469
+ 323.1978
+ 753.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1314,9 +1318,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 312.9469
+ 536.9469
  254.1661
- 324.9469 ]
+ 548.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1329,9 +1333,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 312.9469
+ 536.9469
  297.6378
- 324.9469 ]
+ 548.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1344,9 +1348,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 312.9469
- 322.6378
- 324.9469 ]
+ 536.9469
+ 323.1978
+ 548.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1358,60 +1362,44 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 312.9469
- 322.6378
- 324.9469 ]
+ /Rect [ 323.1978
+ 536.9469
+ 323.1978
+ 548.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Page14': class PDFPage 
+% 'Annot.NUMBER67': class PDFDictionary 
 88 0 obj
-% Page dictionary
-<< /Annots [ 76 0 R
- 77 0 R
- 78 0 R
- 79 0 R
- 80 0 R
- 81 0 R
- 82 0 R
- 83 0 R
- 84 0 R
- 85 0 R
- 86 0 R
- 87 0 R ]
- /Contents 1020 0 R
- /MediaBox [ 0
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
+ /Border [ 0
  0
- 595.2756
- 841.8898 ]
- /Parent 1006 0 R
- /Resources << /Font 1 0 R
- /ProcSet [ /PDF
- /Text
- /ImageB
- /ImageC
- /ImageI ] >>
- /Rotate 0
- /Trans <<  >>
- /Type /Page >>
+ 0 ]
+ /Rect [ 150.2861
+ 273.9469
+ 254.1661
+ 285.9469 ]
+ /Subtype /Link
+ /Type /Annot >>
 endobj
-% 'Annot.NUMBER67': class PDFDictionary 
+% 'Annot.NUMBER68': class PDFDictionary 
 89 0 obj
 << /A << /S /URI
  /Type /Action
- /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
+ /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
  /Border [ 0
  0
  0 ]
- /Rect [ 150.2861
- 746.9469
- 254.1661
- 758.9469 ]
+ /Rect [ 297.6378
+ 273.9469
+ 297.6378
+ 285.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER68': class PDFDictionary 
+% 'Annot.NUMBER69': class PDFDictionary 
 90 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1420,13 +1408,13 @@
  0
  0 ]
  /Rect [ 297.6378
- 746.9469
- 297.6378
- 758.9469 ]
+ 273.9469
+ 323.1978
+ 285.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER69': class PDFDictionary 
+% 'Annot.NUMBER70': class PDFDictionary 
 91 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1434,44 +1422,44 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 297.6378
- 746.9469
- 322.6378
- 758.9469 ]
+ /Rect [ 323.1978
+ 273.9469
+ 323.1978
+ 285.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER70': class PDFDictionary 
+% 'Annot.NUMBER71': class PDFDictionary 
 92 0 obj
 << /A << /S /URI
  /Type /Action
- /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
+ /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 746.9469
- 322.6378
- 758.9469 ]
+ /Rect [ 150.2861
+ 68.94685
+ 254.1661
+ 80.94685 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER71': class PDFDictionary 
+% 'Annot.NUMBER72': class PDFDictionary 
 93 0 obj
 << /A << /S /URI
  /Type /Action
- /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
+ /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
  /Border [ 0
  0
  0 ]
- /Rect [ 150.2861
- 529.9469
- 254.1661
- 541.9469 ]
+ /Rect [ 297.6378
+ 68.94685
+ 297.6378
+ 80.94685 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER72': class PDFDictionary 
+% 'Annot.NUMBER73': class PDFDictionary 
 94 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1480,13 +1468,13 @@
  0
  0 ]
  /Rect [ 297.6378
- 529.9469
- 297.6378
- 541.9469 ]
+ 68.94685
+ 323.1978
+ 80.94685 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER73': class PDFDictionary 
+% 'Annot.NUMBER74': class PDFDictionary 
 95 0 obj
 << /A << /S /URI
  /Type /Action
@@ -1494,27 +1482,47 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 297.6378
- 529.9469
- 322.6378
- 541.9469 ]
+ /Rect [ 323.1978
+ 68.94685
+ 323.1978
+ 80.94685 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
-% 'Annot.NUMBER74': class PDFDictionary 
+% 'Page14': class PDFPage 
 96 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
- /Border [ 0
+% Page dictionary
+<< /Annots [ 80 0 R
+ 81 0 R
+ 82 0 R
+ 83 0 R
+ 84 0 R
+ 85 0 R
+ 86 0 R
+ 87 0 R
+ 88 0 R
+ 89 0 R
+ 90 0 R
+ 91 0 R
+ 92 0 R
+ 93 0 R
+ 94 0 R
+ 95 0 R ]
+ /Contents 1261 0 R
+ /MediaBox [ 0
  0
- 0 ]
- /Rect [ 322.6378
- 529.9469
- 322.6378
- 541.9469 ]
- /Subtype /Link
- /Type /Annot >>
+ 595.2756
+ 841.8898 ]
+ /Parent 1247 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
 endobj
 % 'Annot.NUMBER75': class PDFDictionary 
 97 0 obj
@@ -1525,9 +1533,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 312.9469
+ 593.9469
  254.1661
- 324.9469 ]
+ 605.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1540,9 +1548,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 312.9469
+ 593.9469
  297.6378
- 324.9469 ]
+ 605.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1555,9 +1563,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 312.9469
- 322.6378
- 324.9469 ]
+ 593.9469
+ 323.1978
+ 605.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1569,10 +1577,10 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 312.9469
- 322.6378
- 324.9469 ]
+ /Rect [ 323.1978
+ 593.9469
+ 323.1978
+ 605.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1585,9 +1593,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 95.94685
+ 388.9469
  254.1661
- 107.9469 ]
+ 400.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1600,9 +1608,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 95.94685
+ 388.9469
  297.6378
- 107.9469 ]
+ 400.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1615,9 +1623,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 95.94685
- 322.6378
- 107.9469 ]
+ 388.9469
+ 323.1978
+ 400.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1629,38 +1637,94 @@
  /Border [ 0
  0
  0 ]
- /Rect [ 322.6378
- 95.94685
- 322.6378
- 107.9469 ]
+ /Rect [ 323.1978
+ 388.9469
+ 323.1978
+ 400.9469 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER83': class PDFDictionary 
+105 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 150.2861
+ 183.9469
+ 254.1661
+ 195.9469 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER84': class PDFDictionary 
+106 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 297.6378
+ 183.9469
+ 297.6378
+ 195.9469 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER85': class PDFDictionary 
+107 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 297.6378
+ 183.9469
+ 323.1978
+ 195.9469 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER86': class PDFDictionary 
+108 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 323.1978
+ 183.9469
+ 323.1978
+ 195.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
 % 'Page15': class PDFPage 
-105 0 obj
+109 0 obj
 % Page dictionary
-<< /Annots [ 89 0 R
- 90 0 R
- 91 0 R
- 92 0 R
- 93 0 R
- 94 0 R
- 95 0 R
- 96 0 R
- 97 0 R
+<< /Annots [ 97 0 R
  98 0 R
  99 0 R
  100 0 R
  101 0 R
  102 0 R
  103 0 R
- 104 0 R ]
- /Contents 1021 0 R
+ 104 0 R
+ 105 0 R
+ 106 0 R
+ 107 0 R
+ 108 0 R ]
+ /Contents 1262 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 1006 0 R
+ /Parent 1247 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -1671,66 +1735,6 @@
  /Trans <<  >>
  /Type /Page >>
 endobj
-% 'Annot.NUMBER83': class PDFDictionary 
-106 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://svn.zope.org/*checkout*/z3c.rml/trunk/src/z3c/rml/tests/input/tag-blockTableStyle.rml) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 150.2861
- 598.9469
- 254.1661
- 610.9469 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER84': class PDFDictionary 
-107 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 297.6378
- 598.9469
- 297.6378
- 610.9469 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER85': class PDFDictionary 
-108 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 297.6378
- 598.9469
- 322.6378
- 610.9469 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER86': class PDFDictionary 
-109 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://svn.zope.org/z3c.rml/trunk/src/z3c/rml/tests/expected/tag-blockTableStyle.pdf?view=auto) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 322.6378
- 598.9469
- 322.6378
- 610.9469 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
 % 'Annot.NUMBER87': class PDFDictionary 
 110 0 obj
 << /A << /S /URI
@@ -1740,9 +1744,9 @@
  0
  0 ]
  /Rect [ 150.2861
- 410.9469
+ 741.9469
  254.1661
- 422.9469 ]
+ 753.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1755,9 +1759,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 410.9469
+ 741.9469
  297.6378
- 422.9469 ]
+ 753.9469 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
@@ -1770,9 +1774,9 @@
  0
  0 ]
  /Rect [ 297.6378
- 410.9469
- 322.6378
- 422.9469 ]