Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove STRANGE output due to line spacing in pdf

Browse Source 
svn: r12553
This commit is contained in:
Benny Malengier 2009-05-20 11:18:51 +00:00
parent 068b3157f0
commit bb7920b0c0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/lib/libcairodoc.py
View File

@ -477,9 +477,10 @@ class GtkDocParagraph(GtkDocBaseElement):
layout.set_attributes(self._attrlist) layout.set_attributes(self._attrlist)
layout_width, layout_height = layout.get_pixel_size() layout_width, layout_height = layout.get_pixel_size()
line_count = layout.get_line_count() line_count = layout.get_line_count()
spacing = layout.get_spacing() / pango.SCALE
# if all paragraph fits we don't need to cut # if all paragraph fits we don't need to cut
if layout_height <= text_height: if layout_height - spacing <= text_height:
paragraph_height = layout_height + t_margin + (2 * v_padding) paragraph_height = layout_height + t_margin + (2 * v_padding)
if height - paragraph_height > b_margin: if height - paragraph_height > b_margin:
paragraph_height += b_margin paragraph_height += b_margin
@ -493,10 +494,13 @@ class GtkDocParagraph(GtkDocBaseElement):
return (None, self), 0 return (None, self), 0
lineiter = layout.get_iter() lineiter = layout.get_iter()
linenr = 0 linenr = 0
linerange = lineiter.get_line_yrange() linerange = lineiter.get_line_yrange()
# 2. if nothing fits, move to next page without split # 2. if nothing fits, move to next page without split
if linerange[1] - linerange[0] > text_height * pango.SCALE: # there is a spacing above and under the text
if linerange[1] - linerange[0] + 2.*spacing \
> text_height * pango.SCALE:
return (None, self), 0 return (None, self), 0
# 3. split the paragraph # 3. split the paragraph
@ -512,7 +516,8 @@ class GtkDocParagraph(GtkDocBaseElement):
lineiter.next_line() lineiter.next_line()
linenr += 1 linenr += 1
linerange = lineiter.get_line_yrange() linerange = lineiter.get_line_yrange()
if linerange[1] - startheight > text_height * pango.SCALE: if linerange[1] - startheight + 2.*spacing \
> text_height * pango.SCALE:
splitline = linenr splitline = linenr
break break
endheight = linerange[1] endheight = linerange[1]