From e809ecd3d58900ecd3010b0a6efd77ec67e70de0 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 6 Dec 2007 12:14:03 +0000
Subject: [PATCH] Fix endFrame tag and add tags last to frame to force the
 frame to be the last one

bzr revid: ced-c9b429ab628c867351beeaba59bd810ef9bb08cd
---
 bin/report/render/rml2pdf/trml2pdf.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 5ffdfe6519a..2b41493ca9b 100755
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -592,12 +592,13 @@ class _rml_flowable(object):
 			return platypus.NextPageTemplate(str(node.getAttribute('name')))
 		elif node.localName=='nextFrame':
 			return platypus.CondPageBreak(1000)           # TODO: change the 1000 !
+		elif node.localName == 'setNextFrame':
+			from reportlab.platypus.doctemplate import NextFrameFlowable
+			return NextFrameFlowable(str(node.getAttribute('name')))
 		elif node.localName == 'currentFrame':
-			#return platypus.CondPageBreak(1000)           # TODO: change the 1000 !
 			from reportlab.platypus.doctemplate import CurrentFrameFlowable
 			return CurrentFrameFlowable(str(node.getAttribute('name')))
 		elif node.localName == 'frameEnd':
-			return False
 			return EndFrameFlowable()
 		else:
 			sys.stderr.write('Warning: flowable not yet implemented: %s !\n' % (node.localName,))
@@ -661,6 +662,8 @@ class _rml_template(object):
 			frames = []
 			for frame_el in pt.getElementsByTagName('frame'):
 				frame = platypus.Frame( **(utils.attr_get(frame_el, ['x1','y1', 'width','height', 'leftPadding', 'rightPadding', 'bottomPadding', 'topPadding'], {'id':'str', 'showBoundary':'bool'})) )
+				if utils.attr_get(frame_el, ['last']):
+					frame.lastFrame = True
 				frames.append( frame )
 			gr = pt.getElementsByTagName('pageGraphics')
 			if len(gr):