Merge branch 'feature/evenOdd' into develop

kgrodzicki · kgrodzicki · commit 6d0594a959a3 · 2011-07-15T10:51:51.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ testrender/output/
 .coverage
 htmlcov/
 xhtml2pdf.egg-info
+*.pdf
diff --git a/test/cookbook.py b/test/cookbook.py
@@ -24,9 +24,8 @@
 Most people know how to write a page with HTML and CSS. Why not using these skills to dynamically generate PDF documents using it? The "pisa" project http://www.htmltopdf.org enables you to to this quite simple.
 """
 
-import cStringIO
-import ho.pisa as pisa
-import os
+from xhtml2pdf import pisa
+import cStringIO as StringIO
 
 # Shortcut for dumping all logs to the screen
 pisa.showLogging()
@@ -40,7 +39,7 @@ def HTML2PDF(data, filename, open=False):
     """
 
     pdf = pisa.CreatePDF(
-        cStringIO.StringIO(data),
+        StringIO.StringIO(data),
         file(filename, "wb"))
 
     if open and (not pdf.err):
@@ -72,4 +71,4 @@ def HTML2PDF(data, filename, open=False):
     </body></html>
     """
 
-    HTML2PDF(HTMLTEST, "test.pdf", open=True)
+    HTML2PDF(HTMLTEST, "test.pdf", open=False)
diff --git a/test/test-template-even-odd.html b/test/test-template-even-odd.html
diff --git a/test/testEvenOddPage.py b/test/testEvenOddPage.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#############################################
+## (C)opyright by Dirk Holtwick            ##
+## All rights reserved                     ##
+#############################################
+
+__version__ = "$Revision: 176 $"
+__author__ = "$Author: kgrodzicki $"
+__date__ = "$Date: 2011-01-15 10:11:47 +0100 (Fr, 15 July 2011) $"
+
+"""
+HTML/CSS to PDF converter
+Test for support left/right (even/odd) pages
+"""
+
+from cookbook import HTML2PDF
+
+if __name__ == "__main__":
+    xhtml = open('test-template-even-odd.html')
+    HTML2PDF(xhtml.read(), "testEvenOdd.pdf")
diff --git a/xhtml2pdf/w3c/cssParser.py b/xhtml2pdf/w3c/cssParser.py
@@ -639,6 +639,7 @@ def _parseAtPage(self, src):
         page, src = self._getIdent(src)
         if src[:1] == ':':
             pseudopage, src = self._getIdent(src[1:])
+            page = page + '_' + pseudopage
         else:
             pseudopage = None
 
diff --git a/xhtml2pdf/xhtml2pdf_reportlab.py b/xhtml2pdf/xhtml2pdf_reportlab.py
@@ -26,6 +26,7 @@
 from reportlab.platypus.tables import Table, TableStyle
 from xhtml2pdf.reportlab_paragraph import Paragraph
 from xhtml2pdf.util import getUID, getBorderStyle
+from types import StringType, TupleType, ListType, IntType
 import StringIO
 import cgi
 import copy
@@ -49,6 +50,19 @@
 
 MAX_IMAGE_RATIO = 0.95
 
+class PTCycle(list):
+    def __init__(self):
+        self._restart = 0
+        self._idx = 0
+        list.__init__(self)
+
+    def cyclicIterator(self):
+        while 1:
+            yield self[self._idx]
+            self._idx += 1
+            if self._idx>=len(self):
+                self._idx = self._restart
+
 class PmlMaxHeightMixIn:
 
     def setMaxHeight(self, availHeight):
@@ -114,6 +128,51 @@ def afterFlowable(self, flowable):
                 cgi.escape(copy.deepcopy(flowable.text), 1),
                 self.page))
 
+    def handle_nextPageTemplate(self,pt):
+        ''' if pt has also templates for even and odd page convert it to list '''
+        if self._has_template_for_name(pt + '_left') and self._has_template_for_name(pt + '_right'):
+            pt = [pt + '_left', pt + '_right']
+
+        '''On endPage change to the page template with name or index pt'''
+        if type(pt) is StringType:
+            if hasattr(self, '_nextPageTemplateCycle'): del self._nextPageTemplateCycle
+            for t in self.pageTemplates:
+                if t.id == pt:
+                    self._nextPageTemplateIndex = self.pageTemplates.index(t)
+                    return
+            raise ValueError, "can't find template('%s')"%pt
+        elif type(pt) is IntType:
+            if hasattr(self, '_nextPageTemplateCycle'): del self._nextPageTemplateCycle
+            self._nextPageTemplateIndex = pt
+        elif type(pt) in (ListType, TupleType):
+            #used for alternating left/right pages
+            #collect the refs to the template objects, complain if any are bad
+            c = PTCycle()
+            for ptn in pt:
+                if ptn=='*':    #special case name used to short circuit the iteration
+                    c._restart = len(c)
+                    continue
+                for t in self.pageTemplates:
+                    if t.id == ptn.strip():
+                        c.append(t)
+                        break
+            if not c:
+                raise ValueError("No valid page templates in cycle")
+            elif c._restart>len(c):
+                raise ValueError("Invalid cycle restart position")
+
+            #ensure we start on the first one$
+            self._nextPageTemplateCycle = c.cyclicIterator()
+        else:
+            raise TypeError("Argument pt should be string or integer or list")
+
+    def _has_template_for_name(self, name):
+        result = False
+        for template in self.pageTemplates:
+            if template.id == name.strip():
+                result = True
+        return result
+
 class PmlPageTemplate(PageTemplate):
 
     def __init__(self, **kw):
