Mercurial Mercurial > hg-public > reportlab / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
platypus: added bulletOffsetY inspired by haraldarminmassa@gmail.com
authorrgbecker
Wed, 03 Oct 2007 10:31:55 +0000
changeset 2860 3f14d66194c2
parent 2859 549607d9b60d
child 2861 2096955de8cf
platypus: added bulletOffsetY inspired by haraldarminmassa@gmail.com
reportlab/platypus/paragraph.py file | annotate | diff | comparison | revisions
reportlab/platypus/paraparser.py file | annotate | diff | comparison | revisions
reportlab/test/test_paragraphs.py file | annotate | diff | comparison | revisions
reportlab/test/test_platypus_paraparser.py file | annotate | diff | comparison | revisions 
--- a/reportlab/platypus/paragraph.py	Wed Oct 03 09:07:34 2007 +0000
+++ b/reportlab/platypus/paragraph.py	Wed Oct 03 10:31:55 2007 +0000
@@ -372,7 +372,7 @@
 
 def _drawBullet(canvas, offset, cur_y, bulletText, style):
     '''draw a bullet text could be a simple string or a frag list'''
-    tx2 = canvas.beginText(style.bulletIndent, cur_y)
+    tx2 = canvas.beginText(style.bulletIndent, cur_y+getattr(style,"bulletOffsetY",0))
     tx2.setFont(style.bulletFontName, style.bulletFontSize)
     tx2.setFillColor(hasattr(style,'bulletColor') and style.bulletColor or style.textColor)
     if isinstance(bulletText,basestring):
--- a/reportlab/platypus/paraparser.py	Wed Oct 03 09:07:34 2007 +0000
+++ b/reportlab/platypus/paraparser.py	Wed Oct 03 10:31:55 2007 +0000
@@ -112,6 +112,7 @@
                 'spacea': ('spaceAfter', _num),
                 'bfont': ('bulletFontName', None),
                 'bfontsize': ('bulletFontSize',_num),
+                'boffsety': ('bulletOffsetY',_num),
                 'bindent': ('bulletIndent',_num),
                 'bcolor': ('bulletColor',toColor),
                 'color':('textColor',toColor),
@@ -126,6 +127,7 @@
                 'face': ('bulletFontName', None),
                 'size': ('bulletFontSize',_num),
                 'fontsize': ('bulletFontSize',_num),
+                'offsety': ('bulletOffsetY',_num),
                 'indent': ('bulletIndent',_num),
                 'color': ('bulletColor',toColor),
                 'fg': ('bulletColor',toColor),
--- a/reportlab/test/test_paragraphs.py	Wed Oct 03 09:07:34 2007 +0000
+++ b/reportlab/test/test_paragraphs.py	Wed Oct 03 10:31:55 2007 +0000
@@ -129,7 +129,7 @@
         story.append(Paragraph('''This uses a font size of 3cm: Here comes <font face="Courier" size="3cm">Courier 3cm</font> and normal again.''', styNormal, caseSensitive=0))
         story.append(Paragraph('''This is just a very long silly text to see if the <FONT face="Courier">caseSensitive</FONT> flag also works if the paragraph is <EM>very</EM> long. '''*20, styNormal, caseSensitive=0))
         story.append(Indenter("1cm"))
-        story.append(Paragraph("<para><bullet bulletIndent='-1cm'><seq id='s0'/>)</bullet>Indented list. %s</para>" % randomText(), styNormal))
+        story.append(Paragraph("<para><bullet bulletIndent='-1cm' bulletOffsetY='2'><seq id='s0'/>)</bullet>Indented list bulletOffsetY=2. %s</para>" % randomText(), styNormal))
         story.append(Paragraph("<para><bullet bulletIndent='-1cm'><seq id='s0'/>)</bullet>Indented list. %s</para>" % randomText(), styNormal))
         story.append(Paragraph("<para><bullet bulletIndent='-1cm'><seq id='s0'/>)</bullet>Indented list. %s</para>" % randomText(), styNormal))
         story.append(Indenter("1cm"))
@@ -144,7 +144,7 @@
         story.append(Paragraph("<para><bullet bulletIndent='-1cm'><seq id='s0'/>)</bullet>Indented list. %s</para>" % randomText(), styNormal))
         story.append(Paragraph("<para><bullet bulletIndent='-1cm'><seq id='s0'/>)</bullet>Indented list. %s</para>" % randomText(), styNormal))
         story.append(Indenter("1cm"))
-        story.append(XPreformatted("<para backcolor=pink><bullet bulletIndent='-1cm'><seq id='s1'/>)</bullet>Indented list.</para>", styNormal))
+        story.append(XPreformatted("<para backcolor=pink boffsety='-3'><bullet bulletIndent='-1cm'><seq id='s1'/>)</bullet>Indented list bulletOffsetY=-3.</para>", styNormal))
         story.append(XPreformatted("<para backcolor=pink><bullet bulletIndent='-1cm'><seq id='s1'/>)</bullet>Indented list.</para>", styNormal))
         story.append(Indenter("-1cm"))
         story.append(Paragraph("<para><bullet bulletIndent='-1cm'><seq id='s0'/>)</bullet>Indented list. %s</para>" % randomText(), styNormal))
--- a/reportlab/test/test_platypus_paraparser.py	Wed Oct 03 09:07:34 2007 +0000
+++ b/reportlab/test/test_platypus_paraparser.py	Wed Oct 03 10:31:55 2007 +0000
@@ -27,6 +27,7 @@
         style.bulletFontName = black
         style.bulletFontName='Times-Roman'
         style.bulletFontSize=12
+        style.bulletOffsetY=3
         self.style = style        
 
     def testPlain(self):
reportlab