From 45305377fa86de2508db7c9c9130b612aea6a9df Mon Sep 17 00:00:00 2001 From: stw <> Date: Mon, 9 Jun 2008 10:46:41 +0000 Subject: [PATCH] revert the previous patch about the support of in para tag, this implementation doesn't work with a lot of pages bzr revid: stw-9f0e8efdd83695fc5ffab2d3dd8e12a37f815a70 --- bin/report/render/rml2pdf/trml2pdf.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index d282204e27a..11b5736045d 100755 --- 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 += '' # 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.'