revert the previous patch about the support of <pageNumber /> in para tag, this imple...

bzr revid: stw-9f0e8efdd83695fc5ffab2d3dd8e12a37f815a70

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index d282204..11b5736 100755 (executable)
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -177,7 +177,6 @@ class _rml_doc(object):
                return result
 
        def render(self, out):
-               self.canvas = canvas.Canvas(out)
                el = self.dom.documentElement.getElementsByTagName('docinit')
                if el:
                        self.docinit(el)
@@ -193,8 +192,8 @@ class _rml_doc(object):
                if len(el):
                        pt_obj = _rml_template(out, el[0], self, images=self.images, path=self.path)
                        pt_obj.render(self.dom.documentElement.getElementsByTagName('story'))
-                       del self.canvas
                else:
+                       self.canvas = canvas.Canvas(out)
                        pd = self.dom.documentElement.getElementsByTagName('pageDrawing')[0]
                        pd_obj = _rml_canvas(self.canvas, None, self, self.images, path=self.path)
                        pd_obj.render(pd)
@@ -419,12 +418,8 @@ class _rml_flowable(object):
                                        newNode = self.doc.dom.createTextNode(self.styles.names.get(n.getAttribute('id'),'Unknown name'))
                                        node.insertBefore(newNode, n)
                                        node.removeChild(n)
-                                       n = newNode
                                elif n.localName == 'pageNumber':
-                                       newNode = self.doc.dom.createTextNode(str(self.doc.canvas.getPageNumber()))
-                                       node.insertBefore(newNode, n)
-                                       node.removeChild(n)
-                                       n = newNode
+                                       rc += '<pageNumber/>'            # TODO: change this !
                                else:
                                        #CHECKME: I wonder if this is useful since we don't stock the result. Maybe for the getName tag?
                                        self._textual(n)
@@ -715,7 +710,7 @@ if __name__=="__main__":
        if len(sys.argv)>1:
                if sys.argv[1]=='--help':
                        trml2pdf_help()
-               print parseString(file(sys.argv[1], 'r').read())
+               print parseString(file(sys.argv[1], 'r').read()),
        else:
                print 'Usage: trml2pdf input.rml >output.pdf'
                print 'Try \'trml2pdf --help\' for more information.'