From a734ffe73027c9eaff6679179e8351d8b95ca6c0 Mon Sep 17 00:00:00 2001 From: stw <> Date: Wed, 4 Jun 2008 14:05:55 +0000 Subject: [PATCH] * blockTableStyle has a new tag, blockSpan. It supports the concept of spanning of RML, but it isn't specified in the same way as HTML bzr revid: stw-25e00dcd9d3208d87432379c2917ebcff0d06b6e --- bin/report/render/rml2pdf/trml2pdf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 594bd6ec4ed..11b5736045d 100755 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -98,6 +98,8 @@ class _rml_styles(object): styles.append(('LEADING', start, stop, utils.unit_get(node.getAttribute('length')))) elif node.localName=='blockAlignment': styles.append(('ALIGNMENT', start, stop, str(node.getAttribute('value')))) + elif node.localName=='blockSpan': + styles.append(('SPAN', start, stop)) elif node.localName=='blockLeftPadding': styles.append(('LEFTPADDING', start, stop, utils.unit_get(node.getAttribute('length')))) elif node.localName=='blockRightPadding': @@ -457,8 +459,8 @@ class _rml_flowable(object): colwidths = [utils.unit_get(f.strip()) for f in node.getAttribute('colWidths').split(',')] if node.hasAttribute('rowHeights'): rowheights = [utils.unit_get(f.strip()) for f in node.getAttribute('rowHeights').split(',')] - if len(rowheights) == 1: - rowheights = rowheights[0] + if len(rowheights) == 1: + rowheights = rowheights[0] table = platypus.Table(data = data, colWidths=colwidths, rowHeights=rowheights, **(utils.attr_get(node, ['splitByRow'] ,{'repeatRows':'int','repeatCols':'int'}))) if node.hasAttribute('style'): table.setStyle(self.styles.table_styles[node.getAttribute('style')])