Minor changes.
--- a/reportlab/lib/randomtext.py Thu Jan 18 17:25:46 2001 +0000
+++ b/reportlab/lib/randomtext.py Fri Jan 19 08:41:22 2001 +0000
@@ -2,9 +2,12 @@
#copyright ReportLab Inc. 2000
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/lib/randomtext.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/lib/randomtext.py,v 1.3 2001/01/02 15:17:42 johnprecedo Exp $
-__version__=''' $Id: randomtext.py,v 1.3 2001/01/02 15:17:42 johnprecedo Exp $ '''
+#$Header: /tmp/reportlab/reportlab/lib/randomtext.py,v 1.4 2001/01/19 08:41:22 dinu_gherman Exp $
+
+__version__=''' $Id: randomtext.py,v 1.4 2001/01/19 08:41:22 dinu_gherman Exp $ '''
+
import string
+
###############################################################################
# generates so-called 'Greek Text' for use in filling documents.
###############################################################################
@@ -125,7 +128,6 @@
'Pantone[TM]', 'service bureau', 'imagesetter']
-
def randomText(theme=STARTUP):
#this may or may not be appropriate in your company
from random import randint, choice
--- a/reportlab/platypus/doctemplate.py Thu Jan 18 17:25:46 2001 +0000
+++ b/reportlab/platypus/doctemplate.py Fri Jan 19 08:41:22 2001 +0000
@@ -1,8 +1,10 @@
#copyright ReportLab Inc. 2000
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/platypus/doctemplate.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/platypus/doctemplate.py,v 1.33 2000/12/17 10:51:55 rgbecker Exp $
-__version__=''' $Id: doctemplate.py,v 1.33 2000/12/17 10:51:55 rgbecker Exp $ '''
+#$Header: /tmp/reportlab/reportlab/platypus/doctemplate.py,v 1.34 2001/01/19 08:41:22 dinu_gherman Exp $
+
+__version__=''' $Id: doctemplate.py,v 1.34 2001/01/19 08:41:22 dinu_gherman Exp $ '''
+
__doc__="""
This module contains the core structure of platypus.
@@ -26,18 +28,22 @@
the page template for the next page (which by default is the one being used
for the current frame).
"""
+
from reportlab.platypus.flowables import *
from reportlab.platypus.paragraph import Paragraph
from reportlab.platypus.frames import Frame
from reportlab.lib.pagesizes import DEFAULT_PAGE_SIZE
import reportlab.lib.sequencer
+
from types import *
import sys
+
def _doNothing(canvas, doc):
"Dummy callback for onPage"
pass
+
class IndexingFlowable0(Flowable):
"""Abstract interface definition for flowables which might
hold references to other pages or themselves be targets
@@ -64,6 +70,7 @@
"""Called after build ends but before isSatisfied"""
pass
+
class ActionFlowable(Flowable):
'''This Flowable is never drawn, it can be used for data driven controls
For example to change a page template (from one column to two, for example)
@@ -104,6 +111,7 @@
def __call__(self):
return self
+
FrameBreak = ActionFlowable('frameEnd')
PageBegin = ActionFlowable('pageBegin')
@@ -113,6 +121,7 @@
def __init__(self,pt):
ActionFlowable.__init__(self,('nextPageTemplate',pt))
+
class PageTemplate:
"""
essentially a list of Frames and an onPage routine to call at the start
@@ -142,6 +151,7 @@
this page."""
pass
+
class BaseDocTemplate:
"""
First attempt at defining a document template class.
@@ -573,6 +583,7 @@
'''called after a flowable has been rendered'''
pass
+
class SimpleDocTemplate(BaseDocTemplate):
"""A special case document template that will handle many simple documents.
See documentation for BaseDocTemplate. No pageTemplates are required
@@ -583,6 +594,7 @@
page may can be built using this special approach.
"""
_invalidInitArgs = ('pageTemplates',)
+
def handle_pageBegin(self):
'''override base method to add a change of page template after the firstpage.
'''
@@ -612,6 +624,7 @@
self.pageTemplates[1].beforeDrawPage = self.onLaterPages
BaseDocTemplate.build(self,flowables)
+
##########################################################
##
## testing
@@ -640,6 +653,7 @@
output = output+'.'
return output
+
if __name__ == '__main__':
def myFirstPage(canvas, doc):
--- a/reportlab/platypus/frames.py Thu Jan 18 17:25:46 2001 +0000
+++ b/reportlab/platypus/frames.py Fri Jan 19 08:41:22 2001 +0000
@@ -1,11 +1,16 @@
#copyright ReportLab Inc. 2000
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/platypus/frames.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/platypus/frames.py,v 1.11 2000/12/13 23:31:18 aaron_watters Exp $
-__version__=''' $Id: frames.py,v 1.11 2000/12/13 23:31:18 aaron_watters Exp $ '''
+#$Header: /tmp/reportlab/reportlab/platypus/frames.py,v 1.12 2001/01/19 08:41:22 dinu_gherman Exp $
+
+__version__=''' $Id: frames.py,v 1.12 2001/01/19 08:41:22 dinu_gherman Exp $ '''
+
__doc__="""
"""
-_geomAttr=('x1','y1','width','height', 'leftPadding', 'bottomPadding', 'rightPadding', 'topPadding')
+
+_geomAttr=('x1', 'y1', 'width', 'height', 'leftPadding', 'bottomPadding', 'rightPadding', 'topPadding')
+
+
class Frame:
'''
A Frame is a piece of space in a document that is filled by the
@@ -72,7 +77,7 @@
else:
self.__dict__[a] = v
- def _geom(self):
+ def _geom(self):
self._x2 = self._x1 + self._width
self._y2 = self._y1 + self._height
#efficiency
@@ -81,7 +86,7 @@
self._aW = self._x2 - self._x1 - self._leftPadding - self._rightPadding
self._aH = self._y2 - self._y1p - self._topPadding
- def _reset(self):
+ def _reset(self):
#drawing starts at top left
self._x = self._x1 + self._leftPadding
self._y = self._y2 - self._topPadding
@@ -134,7 +139,6 @@
del flowable.canv
return r
-
def drawBoundary(self,canv):
"draw the frame boundary as a rectangle (primarily for debugging)."
canv.rect(