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

* src/docgen/HtmlDoc.py: Properly build style declaration.

Browse Source 
* src/plugins/FtmStyleDescendants.py: Setup before opening.


svn: r1721
This commit is contained in:
Alex Roitman 2003-06-13 16:17:45 +00:00
parent dad0cc144e
commit 218bffffdb
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2003-06-13 Tim Waugh <twaugh@redhat.com> 2003-06-13 Tim Waugh <twaugh@redhat.com>
* src/docgen/OpenOfficeDoc.py: Escape special XML characters. * src/docgen/OpenOfficeDoc.py: Escape special XML characters.
* src/docgen/HtmlDoc.py: Properly build style declaration.
* src/plugins/FtmStyleDescendants.py: Setup before opening.
2003-06-12 Tim Waugh <twaugh@redhat.com> 2003-06-12 Tim Waugh <twaugh@redhat.com>
* src/docgen/OpenOfficeDoc.py: Surround images by paragraph tags * src/docgen/OpenOfficeDoc.py: Surround images by paragraph tags

6
src/docgen/HtmlDoc.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000 Donald N. Allingham # Copyright (C) 2000-2003 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -91,7 +91,7 @@ class HtmlDoc(TextDoc.TextDoc):
self.base = "" self.base = ""
self.load_template() self.load_template()
self.build_header() self.build_header()
self.build_style_declaration() self.style_declaration = None
self.image_dir = "images" self.image_dir = "images"
else: else:
self.meta = source.meta self.meta = source.meta
@ -235,6 +235,8 @@ class HtmlDoc(TextDoc.TextDoc):
else: else:
line = self.file_header line = self.file_header
self.f.write(line) self.f.write(line)
if not self.style_declaration:
self.build_style_declaration()
self.f.write(self.style_declaration) self.f.write(self.style_declaration)
def build_header(self): def build_header(self):

3
src/plugins/FtmStyleDescendants.py
View File

@ -60,6 +60,7 @@ class FtmDescendantReport(Report.Report):
self.max_generations = max self.max_generations = max
self.pgbrk = pgbrk self.pgbrk = pgbrk
self.doc = doc self.doc = doc
self.setup()
if output: if output:
self.standalone = 1 self.standalone = 1
self.doc.open(output) self.doc.open(output)
@ -82,7 +83,6 @@ class FtmDescendantReport(Report.Report):
cell = TextDoc.TableCellStyle() cell = TextDoc.TableCellStyle()
self.doc.add_cell_style('Normal',cell) self.doc.add_cell_style('Normal',cell)
def apply_filter(self,person,index,generation=1): def apply_filter(self,person,index,generation=1):
if person == None or generation > self.max_generations: if person == None or generation > self.max_generations:
@ -102,7 +102,6 @@ class FtmDescendantReport(Report.Report):
def write_report(self): def write_report(self):
self.setup()
self.apply_filter(self.start,1) self.apply_filter(self.start,1)
name = self.start.getPrimaryName().getRegularName() name = self.start.getPrimaryName().getRegularName()