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

* src/docgen/LPRDoc.py: Properly use space above/below.

Browse Source 
svn: r5386
This commit is contained in:
Alex Roitman
2005-11-09 22:34:39 +00:00
parent ebe0d065e6
commit 0adb92f1d7
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/ChangeLog
View File

@@ -9,6 +9,7 @@
* src/gramps.glade: Support space above/below paragraph. * src/gramps.glade: Support space above/below paragraph.
* src/Report.py: Minor tweaks for file selection. * src/Report.py: Minor tweaks for file selection.
* src/docgen//OpenOfficeDoc.py: Correct output for spacing. * src/docgen//OpenOfficeDoc.py: Correct output for spacing.
* src/docgen/LPRDoc.py: Properly use space above/below.
2005-11-09 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-11-09 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/DbPrompter.py (DbPrompter): Use Combo to list multiple rcecent files * src/DbPrompter.py (DbPrompter): Use Combo to list multiple rcecent files

14
gramps2/src/docgen/LPRDoc.py
View File

@@ -80,7 +80,7 @@ _SUPER_ELEVATION_FRACTION = 0.3
_SUPER_SIZE_REDUCTION = 2 _SUPER_SIZE_REDUCTION = 2
# Factor which multiplies the font size to get line spacing for the font # Factor which multiplies the font size to get line spacing for the font
_EXTRA_SPACING_FACTOR = 1.1 _EXTRA_SPACING_FACTOR = 1.2
# Grey color to use for box shadows # Grey color to use for box shadows
_SHADOW_COLOR = (192,192,192) _SHADOW_COLOR = (192,192,192)
@@ -383,8 +383,10 @@ class GnomePrintParagraph:
end_word = len(textlist) end_word = len(textlist)
self.lines.append((start_piece,start_word,end_piece,end_word,avail_width)) self.lines.append((start_piece,start_word,end_piece,end_word,avail_width))
self.height = nlines * self.fontstyle.get_size() * _EXTRA_SPACING_FACTOR \ self.height = nlines * self.fontstyle.get_size() \
+ cm2u(self.style.get_padding()) * _EXTRA_SPACING_FACTOR \
+ cm2u(self.style.get_top_margin()
+self.style.get_bottom_margin())
def get_lines(self): def get_lines(self):
""" """
@@ -839,8 +841,8 @@ class LPRDoc(BaseDoc.BaseDoc):
x = left_margin x = left_margin
y = self.y y = self.y
#if y != self.top_margin: if y != self.top_margin:
# y = y - cm2u(paragraph.style.get_padding()) y = y - cm2u(paragraph.style.get_top_margin())
# Loop over lines which were assembled by paragraph.format() # Loop over lines which were assembled by paragraph.format()
for (start_piece,start_word,end_piece,end_word,avail_width) \ for (start_piece,start_word,end_piece,end_word,avail_width) \
@@ -911,7 +913,7 @@ class LPRDoc(BaseDoc.BaseDoc):
x = left_margin x = left_margin
x = x - cm2u(paragraph.style.get_left_margin()) x = x - cm2u(paragraph.style.get_left_margin())
#y = y - cm2u(paragraph.style.get_padding()) y = y - cm2u(paragraph.style.get_bottom_margin())
return (x,y) return (x,y)
def output_table(self): def output_table(self):