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

Paragraph leader

Browse Source 
svn: r2960
This commit is contained in:
Alex Roitman
2004-03-03 16:59:47 +00:00
parent 7cefc87005
commit d4c79ff3ac
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,6 +377,8 @@ class LPRDoc(BaseDoc.BaseDoc):
#set paragraph variables so we know that we are in a paragraph #set paragraph variables so we know that we are in a paragraph
self.paragraph = GnomePrintParagraph(self.style_list[style_name]) self.paragraph = GnomePrintParagraph(self.style_list[style_name])
self.__paragraph_text = "" self.__paragraph_text = ""
if leader:
self.__paragraph_text += leader + " "
self.__paragraph_directive = "" self.__paragraph_directive = ""
def end_paragraph(self): def end_paragraph(self):
@@ -615,9 +617,11 @@ class LPRDoc(BaseDoc.BaseDoc):
def __advance_line(self, y): def __advance_line(self, y):
new_y = y - _LINE_SPACING new_y = y - _LINE_SPACING
if y < self.bottom_margin: if y < self.bottom_margin:
x = self.__x
self.end_page() self.end_page()
self.start_page() self.start_page()
new_y = self.__y new_y = self.__y
self.__x = x
return new_y return new_y
def write_paragraph(self,paragraph,x,y,left_margin,right_margin): def write_paragraph(self,paragraph,x,y,left_margin,right_margin):
@@ -653,12 +657,6 @@ class LPRDoc(BaseDoc.BaseDoc):
y = self.__advance_line() y = self.__advance_line()
x = self.__x x = self.__x
return return
elif directive == _PAGE_BREAK:
self.end_page()
self.start_page()
x = self.__x
y = self.__y
return
#all text will fit within the width provided #all text will fit within the width provided
if not text: if not text:
@@ -745,11 +743,10 @@ class LPRDoc(BaseDoc.BaseDoc):
#is table width larger than the width of the paper? #is table width larger than the width of the paper?
if __min_table_width > (self.right_margin - self.left_margin): if __min_table_width > (self.right_margin - self.left_margin):
print "Table does not fit onto the page.\n" print "Table does not fit onto the page.\n"
#for now we will assume left justification of tables #for now we will assume left justification of tables
#output data in table #output data in table
__min_y=self.__y #need to keep track of tallest column of
#text in each row
for __row_num in range(len(self.__table_data)): for __row_num in range(len(self.__table_data)):
__row = self.__table_data[__row_num] __row = self.__table_data[__row_num]
__x = self.left_margin #reset so that x is at margin __x = self.left_margin #reset so that x is at margin
@@ -757,23 +754,18 @@ class LPRDoc(BaseDoc.BaseDoc):
if self.__y - __max_vspace[__row_num] < self.bottom_margin: if self.__y - __max_vspace[__row_num] < self.bottom_margin:
self.end_page() self.end_page()
self.start_page() self.start_page()
__min_y = self.__y
col_y = self.__y # all columns start at the same height
for __col in range(self.__ncols): for __col in range(self.__ncols):
if not self.__cell_widths[__row_num][__col]: if not self.__cell_widths[__row_num][__col]:
continue continue
if not __row[__col]: self.__y = col_y
continue
for paragraph in __row[__col]: for paragraph in __row[__col]:
__nothing, __y = self.write_paragraph(paragraph, __nothing, self.__y = self.write_paragraph(paragraph,
self.__x, self.__y, __x, self.__x, self.__y, __x,
__x + self.__cell_widths[__row_num][__col]) __x + self.__cell_widths[__row_num][__col])
__x = __x + self.__cell_widths[__row_num][__col] # set up margin for this row __x = __x + self.__cell_widths[__row_num][__col] # set up margin for this row
if __y < __min_y: # if we go below current lowest
__min_y=__y # column
self.__y=__min_y #reset so that we do not overwrite
#function to print text to a printer #function to print text to a printer
def __do_print(self,dialog, job): def __do_print(self,dialog, job):