From 5ee6d863e07b04bf6bcc8f13b9a42eb7bc4868e6 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Fri, 18 Jul 2003 13:43:13 +0000 Subject: [PATCH] * src/docgen/OpenOfficeDoc.py (_write_styles_file): Switch paragraph alignment to "start" and "end" (was "left and "right"). * src/plugins/AncestorReport.py: Change prefixed style name ("AHN-"). Needed because HTML gets confised by ":" in the class name. * src/plugins/Ancestors.py: Likewise ("AR-"). * src/plugins/DescendReport.py: Likewise ("DR-"). * src/plugins/DetAncestralReport.py: Likewise ("DAR-"). * src/plugins/DetDescendantReport.py: Likewise ("DDR-"). * src/plugins/FtmStyleAncestors.py: Likewise ("FTA-"). * src/plugins/FtmStyleDescendants.py: Likewise ("FTD-"). * src/plugins/FamilyGroup.py: Likewise ("FGR-"). * src/plugins/CustomBookText.py: Likewise ("CBT-"). * src/plugins/SimpleBookTitle.py: Likewise ("SBT-"). * src/plugins/IndivSummary.py: Likewise ("IVS-"). * src/plugins/IndivComplete.py: Likewise ("IDS-"). svn: r1903 --- ChangeLog | 17 ++++ src/docgen/OpenOfficeDoc.py | 4 +- src/plugins/AncestorReport.py | 12 +-- src/plugins/Ancestors.py | 72 ++++++++-------- src/plugins/CustomBookText.py | 12 +-- src/plugins/DescendReport.py | 8 +- src/plugins/DetAncestralReport.py | 32 ++++---- src/plugins/DetDescendantReport.py | 32 ++++---- src/plugins/FamilyGroup.py | 128 ++++++++++++++--------------- src/plugins/FtmStyleAncestors.py | 34 ++++---- src/plugins/FtmStyleDescendants.py | 58 ++++++------- src/plugins/IndivComplete.py | 90 ++++++++++---------- src/plugins/IndivSummary.py | 97 +++++++++++----------- src/plugins/SimpleBookTitle.py | 8 +- 14 files changed, 308 insertions(+), 296 deletions(-) diff --git a/ChangeLog b/ChangeLog index c36c3b6c2..517c1598d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,21 @@ 2003-07-18 Alex Roitman + * src/docgen/OpenOfficeDoc.py (_write_styles_file): Switch paragraph + alignment to "start" and "end" (was "left and "right"). + * src/plugins/AncestorReport.py: Change prefixed style name ("AHN-"). + Needed because HTML gets confised by ":" in the class name. + * src/plugins/Ancestors.py: Likewise ("AR-"). + * src/plugins/DescendReport.py: Likewise ("DR-"). + * src/plugins/DetAncestralReport.py: Likewise ("DAR-"). + * src/plugins/DetDescendantReport.py: Likewise ("DDR-"). + * src/plugins/FtmStyleAncestors.py: Likewise ("FTA-"). + * src/plugins/FtmStyleDescendants.py: Likewise ("FTD-"). + * src/plugins/FamilyGroup.py: Likewise ("FGR-"). + * src/plugins/CustomBookText.py: Likewise ("CBT-"). + * src/plugins/SimpleBookTitle.py: Likewise ("SBT-"). + * src/plugins/IndivSummary.py: Likewise ("IVS-"). + * src/plugins/IndivComplete.py: Likewise ("IDS-"). + +2003-07-17 Alex Roitman * src/gramps_main.py (open_example): Fix destination name when copying files (was directory name). * doc/gramps-manual/C/gramps-manual.xml: Reflect name change for diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py index d38013bfc..286058341 100644 --- a/src/docgen/OpenOfficeDoc.py +++ b/src/docgen/OpenOfficeDoc.py @@ -416,9 +416,9 @@ class OpenOfficeDoc(TextDoc.TextDoc): align = style.get_alignment() if align == TextDoc.PARA_ALIGN_LEFT: - self.f.write('fo:text-align="left" ') + self.f.write('fo:text-align="start" ') elif align == TextDoc.PARA_ALIGN_RIGHT: - self.f.write('fo:text-align="right" ') + self.f.write('fo:text-align="end" ') elif align == TextDoc.PARA_ALIGN_CENTER: self.f.write('fo:text-align="center" ') self.f.write('style:justify-single-word="false" ') diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py index 03e78fe24..cdc4dffc2 100644 --- a/src/plugins/AncestorReport.py +++ b/src/plugins/AncestorReport.py @@ -79,7 +79,7 @@ class AncestorReport(Report.Report): self.filter(self.start,1) name = self.start.getPrimaryName().getRegularName() - self.doc.start_paragraph("AHN:Title") + self.doc.start_paragraph("AHN-Title") title = _("Ahnentafel Report for %s") % name self.doc.write_text(title) self.doc.end_paragraph() @@ -92,13 +92,13 @@ class AncestorReport(Report.Report): if generation == 0 or key >= ( 1 << 30): if self.pgbrk and generation > 0: self.doc.page_break() - self.doc.start_paragraph("AHN:Generation") + self.doc.start_paragraph("AHN-Generation") t = _("%s Generation") % AncestorReport.gen[generation+1] self.doc.write_text(t) self.doc.end_paragraph() generation = generation + 1 - self.doc.start_paragraph("AHN:Entry","%s." % str(key)) + self.doc.start_paragraph("AHN-Entry","%s." % str(key)) person = self.map[key] name = person.getPrimaryName().getRegularName() @@ -391,7 +391,7 @@ def _make_default_style(default_style): para.set_header_level(1) para.set(pad=0.5) para.set_description(_('The style used for the title of the page.')) - default_style.add_style("AHN:Title",para) + default_style.add_style("AHN-Title",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=14,italic=1) @@ -400,12 +400,12 @@ def _make_default_style(default_style): para.set_header_level(2) para.set(pad=0.5) para.set_description(_('The style used for the generation header.')) - default_style.add_style("AHN:Generation",para) + default_style.add_style("AHN-Generation",para) para = TextDoc.ParagraphStyle() para.set(first_indent=-1.0,lmargin=1.0,pad=0.25) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("AHN:Entry",para) + default_style.add_style("AHN-Entry",para) #------------------------------------------------------------------------ # diff --git a/src/plugins/Ancestors.py b/src/plugins/Ancestors.py index 72271a9d5..0aa9293dc 100644 --- a/src/plugins/Ancestors.py +++ b/src/plugins/Ancestors.py @@ -57,12 +57,12 @@ class ComprehensiveAncestorsReport (Report.Report): table = TextDoc.TableStyle () table.set_column_widths ([15, 85]) table.set_width (100) - doc.add_table_style ("AR:PersonNoSpouse", table) + doc.add_table_style ("AR-PersonNoSpouse", table) table = TextDoc.TableStyle () table.set_column_widths ([10, 15, 75]) table.set_width (100) - doc.add_table_style ("AR:ChildNoSpouse", table) + doc.add_table_style ("AR-ChildNoSpouse", table) for nspouse in range (1, 3): table = TextDoc.TableStyle () @@ -70,18 +70,18 @@ class ComprehensiveAncestorsReport (Report.Report): widths = [15, 100 - 15 * (nspouse + 1)] widths.extend ([15] * nspouse) table.set_column_widths (widths) - doc.add_table_style ("AR:PersonWithSpouse%d" % nspouse, table) + doc.add_table_style ("AR-PersonWithSpouse%d" % nspouse, table) table = TextDoc.TableStyle () table.set_width (100) widths = [10, 15, 90 - 15 * (nspouse + 1)] widths.extend ([15] * nspouse) table.set_column_widths (widths) - doc.add_table_style ("AR:ChildWithSpouse%d"% nspouse, table) + doc.add_table_style ("AR-ChildWithSpouse%d"% nspouse, table) cell = TextDoc.TableCellStyle () cell.set_padding (1) # each side makes 2cm, the size of the photo - doc.add_cell_style ("AR:PaddedCell", cell) + doc.add_cell_style ("AR-PaddedCell", cell) cell = TextDoc.TableCellStyle () cell.set_padding (0.1) @@ -89,15 +89,15 @@ class ComprehensiveAncestorsReport (Report.Report): cell.set_top_border (1) cell.set_right_border (1) cell.set_bottom_border (1) - doc.add_cell_style ("AR:NoPhoto", cell) + doc.add_cell_style ("AR-NoPhoto", cell) cell = TextDoc.TableCellStyle () cell.set_padding (0.1) - doc.add_cell_style ("AR:Photo", cell) + doc.add_cell_style ("AR-Photo", cell) cell = TextDoc.TableCellStyle () cell.set_padding (0.1) - doc.add_cell_style ("AR:Entry", cell) + doc.add_cell_style ("AR-Entry", cell) if output: self.standalone = 1 @@ -111,12 +111,12 @@ class ComprehensiveAncestorsReport (Report.Report): self.sources = [] name = self.person_name (self.start) - self.doc.start_paragraph("AR:Title") + self.doc.start_paragraph("AR-Title") title = _("Ancestors of %s") % name self.doc.write_text(title) self.doc.end_paragraph() - self.doc.start_paragraph ("AR:Heading") + self.doc.start_paragraph ("AR-Heading") self.doc.write_text ("Generation 1") self.doc.end_paragraph () @@ -127,11 +127,11 @@ class ComprehensiveAncestorsReport (Report.Report): self.generation (self.max_generations, families, [self.start]) if len (self.sources) > 0: - self.doc.start_paragraph ("AR:Heading") + self.doc.start_paragraph ("AR-Heading") self.doc.write_text ("Sources") self.doc.end_paragraph () - self.doc.start_paragraph ("AR:Entry") + self.doc.start_paragraph ("AR-Entry") i = 1 for source in self.sources: self.doc.write_text ("[%d] %s\n" % (i, source.getTitle ())) @@ -181,7 +181,7 @@ class ComprehensiveAncestorsReport (Report.Report): children = family.getChildList () if len (children): - ret.append ((self.doc.start_paragraph, ['AR:ChildTitle'])) + ret.append ((self.doc.start_paragraph, ['AR-ChildTitle'])) ret.append ((self.doc.write_text, ['Their children:'])) ret.append ((self.doc.end_paragraph, [])) @@ -204,7 +204,7 @@ class ComprehensiveAncestorsReport (Report.Report): if len (people): if self.pgbrk: self.doc.page_break() - self.doc.start_paragraph ("AR:Heading") + self.doc.start_paragraph ("AR-Heading") if thisgen > 4: n = thisgen - 3 if n % 10 == 1 and n != 11: @@ -297,9 +297,9 @@ class ComprehensiveAncestorsReport (Report.Report): 'right', 2, 2])) if suppress_children and len (already_described): - style = "AR:Child" + style = "AR-Child" else: - style = "AR:Person" + style = "AR-Person" if len (spouse): style += "WithSpouse%d" % len (spouse) else: @@ -310,24 +310,24 @@ class ComprehensiveAncestorsReport (Report.Report): if suppress_children and len (already_described): # Can't do proper formatting with TextDoc, so cheat. - ret.append ((self.doc.start_cell, ["AR:PaddedCell"])) + ret.append ((self.doc.start_cell, ["AR-PaddedCell"])) ret.append ((self.doc.end_cell, [])) if len (photos) == 0: - ret.append ((self.doc.start_cell, ["AR:NoPhoto"])) - ret.append ((self.doc.start_paragraph, ["AR:NoPhotoText"])) + ret.append ((self.doc.start_cell, ["AR-NoPhoto"])) + ret.append ((self.doc.start_paragraph, ["AR-NoPhotoText"])) ret.append ((self.doc.write_text, ["(no photo)"])) ret.append ((self.doc.end_paragraph, [])) ret.append ((self.doc.end_cell, [])) else: - ret.append ((self.doc.start_cell, ["AR:Photo"])) + ret.append ((self.doc.start_cell, ["AR-Photo"])) for photo in photos[:1]: ret.append ((self.doc.add_photo, [photo.ref.getPath (), 'left', 2, 2])) ret.append ((self.doc.end_cell, [])) - ret.append ((self.doc.start_cell, ["AR:Entry"])) - ret.append ((self.doc.start_paragraph, ["AR:Entry"])) + ret.append ((self.doc.start_cell, ["AR-Entry"])) + ret.append ((self.doc.start_paragraph, ["AR-Entry"])) ret.append ((self.doc.write_text, [name])) if short_form: ret.append ((self.doc.write_text, [" (mentioned above)."])) @@ -338,7 +338,7 @@ class ComprehensiveAncestorsReport (Report.Report): ret.append ((self.doc.end_cell, [])) for s in spouse: - ret.append ((self.doc.start_cell, ["AR:Photo"])) + ret.append ((self.doc.start_cell, ["AR-Photo"])) ret.append (s) ret.append ((self.doc.end_cell, [])) @@ -650,7 +650,7 @@ class ComprehensiveAncestorsReport (Report.Report): paras.insert (0, (self.doc.end_paragraph, [])) paras.insert (0, (self.doc.write_text, [note[:para_end]])) - paras.insert (0, (self.doc.start_paragraph, ['AR:Details'])) + paras.insert (0, (self.doc.start_paragraph, ['AR-Details'])) return paras def long_notes (self, person, suppress_children = 0, @@ -665,7 +665,7 @@ class ComprehensiveAncestorsReport (Report.Report): events = person.getEventList () addresses = person.getAddressList () if (len (events) + len (addresses) + len (names)) > 0: - paras.append ((self.doc.start_paragraph, ['AR:SubEntry'])) + paras.append ((self.doc.start_paragraph, ['AR-SubEntry'])) paras.append ((self.doc.write_text, ["More about " + self.first_name_or_nick (person) + @@ -673,18 +673,18 @@ class ComprehensiveAncestorsReport (Report.Report): paras.append ((self.doc.end_paragraph, [])) for name in names: - paras.append ((self.doc.start_paragraph, ['AR:Details'])) + paras.append ((self.doc.start_paragraph, ['AR-Details'])) paras.append ((self.doc.write_text, [name.getType () + ': ' + name.getRegularName ()])) paras.append ((self.doc.end_paragraph, [])) for event in events: - paras.append ((self.doc.start_paragraph, ['AR:Details'])) + paras.append ((self.doc.start_paragraph, ['AR-Details'])) paras.append ((self.doc.write_text, [self.event_info (event)])) paras.append ((self.doc.end_paragraph, [])) for address in addresses: - paras.append ((self.doc.start_paragraph, ['AR:Details'])) + paras.append ((self.doc.start_paragraph, ['AR-Details'])) paras.append ((self.doc.write_text, [self.address_info (address)])) paras.append ((self.doc.end_paragraph, [])) @@ -700,7 +700,7 @@ def _make_default_style(default_style): para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set(pad=0.5) para.set_description(_('The style used for the title of the page.')) - default_style.add_style("AR:Title",para) + default_style.add_style("AR-Title",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=14,italic=1) @@ -710,38 +710,38 @@ def _make_default_style(default_style): para.set(pad=0.5) para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set_description(_('The style used for the generation header.')) - default_style.add_style("AR:Heading",para) + default_style.add_style("AR-Heading",para) para = TextDoc.ParagraphStyle() para.set(lmargin=1.0,pad=0.25) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("AR:Entry",para) + default_style.add_style("AR-Entry",para) para = TextDoc.ParagraphStyle () para.set_description(_('Text style for missing photo.')) - default_style.add_style("AR:NoPhotoText", para) + default_style.add_style("AR-NoPhotoText", para) details_font = TextDoc.FontStyle() details_font.set(face=TextDoc.FONT_SANS_SERIF,size=8,italic=1) para = TextDoc.ParagraphStyle() para.set(lmargin=1.5,pad=0,font = details_font) para.set_description(_('Style for details about a person.')) - default_style.add_style("AR:Details",para) + default_style.add_style("AR-Details",para) para = TextDoc.ParagraphStyle() para.set(lmargin=1.0,pad=0.25) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("AR:SubEntry",para) + default_style.add_style("AR-SubEntry",para) para = TextDoc.ParagraphStyle() para.set(pad=0.05) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("AR:Endnotes",para) + default_style.add_style("AR-Endnotes",para) para = TextDoc.ParagraphStyle() para.set(lmargin=2.5,pad=0.05) para.set_description(_('Introduction to the children.')) - default_style.add_style("AR:ChildTitle",para) + default_style.add_style("AR-ChildTitle",para) #------------------------------------------------------------------------ diff --git a/src/plugins/CustomBookText.py b/src/plugins/CustomBookText.py index eab22dd35..34df2f8a9 100644 --- a/src/plugins/CustomBookText.py +++ b/src/plugins/CustomBookText.py @@ -79,15 +79,15 @@ class CustomText(Report.Report): if self.newpage: self.doc.page_break() - self.doc.start_paragraph('CBT:Initial') + self.doc.start_paragraph('CBT-Initial') self.doc.write_text(self.top_text) self.doc.end_paragraph() - self.doc.start_paragraph('CBT:Middle') + self.doc.start_paragraph('CBT-Middle') self.doc.write_text(self.middle_text) self.doc.end_paragraph() - self.doc.start_paragraph('CBT:Final') + self.doc.start_paragraph('CBT-Final') self.doc.write_text(self.bottom_text) self.doc.end_paragraph() @@ -104,7 +104,7 @@ def _make_default_style(default_style): para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set(pad=0.5) para.set_description(_('The style used for the first portion of the custom text.')) - default_style.add_style("CBT:Initial",para) + default_style.add_style("CBT-Initial",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=12,bold=0,italic=0) @@ -113,7 +113,7 @@ def _make_default_style(default_style): para.set(pad=0.5) para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set_description(_('The style used for the middle portion of the custom text.')) - default_style.add_style("CBT:Middle",para) + default_style.add_style("CBT-Middle",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=12,bold=0,italic=0) @@ -122,7 +122,7 @@ def _make_default_style(default_style): para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set(pad=0.5) para.set_description(_('The style used for the last portion of the custom text.')) - default_style.add_style("CBT:Final",para) + default_style.add_style("CBT-Final",para) #------------------------------------------------------------------------ # diff --git a/src/plugins/DescendReport.py b/src/plugins/DescendReport.py index f7eeb4494..a4798d836 100644 --- a/src/plugins/DescendReport.py +++ b/src/plugins/DescendReport.py @@ -88,7 +88,7 @@ class DescendantReport: def write_report(self): if self.newpage: self.doc.page_break() - self.doc.start_paragraph("DR:Title") + self.doc.start_paragraph("DR-Title") name = self.person.getPrimaryName().getRegularName() self.doc.write_text(_("Descendants of %s") % name) self.dump_dates(self.person) @@ -100,7 +100,7 @@ class DescendantReport: def dump(self,level,person): if level != 0: - self.doc.start_paragraph("DR:Level%d" % level) + self.doc.start_paragraph("DR-Level%d" % level) self.doc.write_text("%d." % level) self.doc.write_text(person.getPrimaryName().getRegularName()) self.dump_dates(person) @@ -291,7 +291,7 @@ def _make_default_style(default_style): p.set_header_level(1) p.set_font(f) p.set_description(_("The style used for the title of the page.")) - default_style.add_style("DR:Title",p) + default_style.add_style("DR-Title",p) f = TextDoc.FontStyle() for i in range(1,32): @@ -299,7 +299,7 @@ def _make_default_style(default_style): p.set_font(f) p.set_left_margin(max(10.0,float(i-1))) p.set_description(_("The style used for the level %d display.") % i) - default_style.add_style("DR:Level%d" % i,p) + default_style.add_style("DR-Level%d" % i,p) #------------------------------------------------------------------------ # diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index 576d70782..98d112652 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -110,7 +110,7 @@ class DetAncestorReport(Report.Report): num_children= len(family.getChildList()) if num_children > 0: - self.doc.start_paragraph("DAR:ChildTitle") + self.doc.start_paragraph("DAR-ChildTitle") if family.getMother() != None: mother= family.getMother().getPrimaryName().getRegularName() else: mother= "unknown" @@ -125,7 +125,7 @@ class DetAncestorReport(Report.Report): self.doc.end_paragraph() for child in family.getChildList(): - self.doc.start_paragraph("DAR:ChildList") + self.doc.start_paragraph("DAR-ChildList") name= child.getPrimaryName().getRegularName() birth= child.getBirth() death= child.getDeath() @@ -197,7 +197,7 @@ class DetAncestorReport(Report.Report): def write_person(self, key, rptOptions): """Output birth, death, parentage, marriage and notes information """ - self.doc.start_paragraph("DAR:Entry","%s." % str(key)) + self.doc.start_paragraph("DAR-Entry","%s." % str(key)) person = self.map[key] if rptOptions.addImages == reportOptions.Yes: @@ -239,12 +239,12 @@ class DetAncestorReport(Report.Report): if key == 1: self.write_mate(person, rptOptions) if person.getNote() != "" and rptOptions.includeNotes == reportOptions.Yes: - self.doc.start_paragraph("DAR:NoteHeader") + self.doc.start_paragraph("DAR-NoteHeader") self.doc.start_bold() self.doc.write_text(_("Notes for %s" % name)) self.doc.end_bold() self.doc.end_paragraph() - self.doc.start_paragraph("DAR:Entry") + self.doc.start_paragraph("DAR-Entry") self.doc.write_text(person.getNote()) self.doc.end_paragraph() @@ -534,7 +534,7 @@ class DetAncestorReport(Report.Report): firstName= fam.getFather().getPrimaryName().getFirstName() if person != "": - self.doc.start_paragraph("DAR:Entry") + self.doc.start_paragraph("DAR-Entry") if rptOptions.addImages == reportOptions.Yes: self.insert_images(ind, rptOptions.imageAttrTag) @@ -593,7 +593,7 @@ class DetAncestorReport(Report.Report): numPhotos= numPhotos + 1 if numPhotos == 1: - self.doc.start_paragraph("DAR:Entry") + self.doc.start_paragraph("DAR-Entry") self.doc.add_photo(photo.ref.getPath(), vlist[0], \ float(vlist[1]), float(vlist[2])) #self.doc.end_paragraph() @@ -601,7 +601,7 @@ class DetAncestorReport(Report.Report): elif vlist[0] == 'row': numPhotos= numPhotos + 1 if numPhotos == 1: - self.doc.start_paragraph("DAR:Entry") + self.doc.start_paragraph("DAR-Entry") self.doc.add_photo(photo.ref.getPath(), vlist[0], \ float(vlist[1]), float(vlist[2])) @@ -623,7 +623,7 @@ class DetAncestorReport(Report.Report): rptOpt = self.rptOpt name = self.start.getPrimaryName().getRegularName() - self.doc.start_paragraph("DAR:Title") + self.doc.start_paragraph("DAR-Title") title = _("Detailed Ancestral Report for %s") % name self.doc.write_text(title) self.doc.end_paragraph() @@ -637,7 +637,7 @@ class DetAncestorReport(Report.Report): if generation == 0 or key >= 2**generation: if self.pgbrk and generation > 0: self.doc.page_break() - self.doc.start_paragraph("DAR:Generation") + self.doc.start_paragraph("DAR-Generation") t = _("%s Generation") % DetAncestorReport.gen[generation+1] self.doc.write_text(t) self.doc.end_paragraph() @@ -675,7 +675,7 @@ def _make_default_style(default_style): para.set_font(font) para.set_header_level(1) para.set(pad=0.5) - default_style.add_style("DAR:Title",para) + default_style.add_style("DAR-Title",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=14,italic=1) @@ -683,7 +683,7 @@ def _make_default_style(default_style): para.set_font(font) para.set_header_level(2) para.set(pad=0.5) - default_style.add_style("DAR:Generation",para) + default_style.add_style("DAR-Generation",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=10,italic=0, bold=0) @@ -692,22 +692,22 @@ def _make_default_style(default_style): #para.set_header_level(3) para.set_left_margin(0.0) # in centimeters para.set(pad=0.5) - default_style.add_style("DAR:ChildTitle",para) + default_style.add_style("DAR-ChildTitle",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=9) para = TextDoc.ParagraphStyle() para.set_font(font) para.set(first_indent=0.0,lmargin=0.0,pad=0.25) - default_style.add_style("DAR:ChildList",para) + default_style.add_style("DAR-ChildList",para) para = TextDoc.ParagraphStyle() para.set(first_indent=0.0,lmargin=0.0,pad=0.25) - default_style.add_style("DAR:NoteHeader",para) + default_style.add_style("DAR-NoteHeader",para) para = TextDoc.ParagraphStyle() para.set(first_indent=0.5,lmargin=0.0,pad=0.25) - default_style.add_style("DAR:Entry",para) + default_style.add_style("DAR-Entry",para) table = TextDoc.TableStyle() table.set_width(1000) diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index c670edc9f..10130e0f5 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -115,7 +115,7 @@ class DetDescendantReport(Report.Report): num_children= len(family.getChildList()) if num_children > 0: - self.doc.start_paragraph("DDR:ChildTitle") + self.doc.start_paragraph("DDR-ChildTitle") if family.getMother() != None: mother= family.getMother().getPrimaryName().getRegularName() else: mother= "unknown" @@ -130,7 +130,7 @@ class DetDescendantReport(Report.Report): self.doc.end_paragraph() for child in family.getChildList(): - self.doc.start_paragraph("DDR:ChildList") + self.doc.start_paragraph("DDR-ChildList") name= child.getPrimaryName().getRegularName() birth= child.getBirth() death= child.getDeath() @@ -204,7 +204,7 @@ class DetDescendantReport(Report.Report): def write_person(self, key, rptOptions): """Output birth, death, parentage, marriage and notes information """ - self.doc.start_paragraph("DDR:Entry","%s." % str(key)) + self.doc.start_paragraph("DDR-Entry","%s." % str(key)) person = self.map[key] if rptOptions.addImages == reportOptions.Yes: @@ -246,12 +246,12 @@ class DetDescendantReport(Report.Report): self.write_mate(person, rptOptions) if person.getNote() != "" and rptOptions.includeNotes == reportOptions.Yes: - self.doc.start_paragraph("DDR:NoteHeader") + self.doc.start_paragraph("DDR-NoteHeader") self.doc.start_bold() self.doc.write_text(_("Notes for %s" % name)) self.doc.end_bold() self.doc.end_paragraph() - self.doc.start_paragraph("DDR:Entry") + self.doc.start_paragraph("DDR-Entry") self.doc.write_text(person.getNote()) self.doc.end_paragraph() @@ -531,7 +531,7 @@ class DetDescendantReport(Report.Report): mateFirstName = mate.getPrimaryName().getFirstName() if mate: - self.doc.start_paragraph("DDR:Entry") + self.doc.start_paragraph("DDR-Entry") if rptOptions.addImages == reportOptions.Yes: self.insert_images(mate, rptOptions.imageAttrTag) @@ -586,7 +586,7 @@ class DetDescendantReport(Report.Report): numPhotos= numPhotos + 1 if numPhotos == 1: - self.doc.start_paragraph("DDR:Entry") + self.doc.start_paragraph("DDR-Entry") self.doc.add_photo(photo.ref.getPath(), vlist[0], \ float(vlist[1]), float(vlist[2])) #self.doc.end_paragraph() @@ -594,7 +594,7 @@ class DetDescendantReport(Report.Report): elif vlist[0] == 'row': numPhotos= numPhotos + 1 if numPhotos == 1: - self.doc.start_paragraph("DDR:Entry") + self.doc.start_paragraph("DDR-Entry") self.doc.add_photo(photo.ref.getPath(), vlist[0], \ float(vlist[1]), float(vlist[2])) @@ -629,7 +629,7 @@ class DetDescendantReport(Report.Report): if fam.getFather() != None: spouseName= fam.getFather().getPrimaryName().getFirstName() - self.doc.start_paragraph("DDR:Title") + self.doc.start_paragraph("DDR-Title") if spouseName != "": name = spouseName + " and " + name @@ -645,7 +645,7 @@ class DetDescendantReport(Report.Report): for generation in xrange(len(self.genKeys)): if self.pgbrk and generation > 0: self.doc.page_break() - self.doc.start_paragraph("DDR:Generation") + self.doc.start_paragraph("DDR-Generation") t = _("%s Generation") % DetDescendantReport.gen[generation+1] self.doc.write_text(t) self.doc.end_paragraph() @@ -683,7 +683,7 @@ def _make_default_style(default_style): para.set_font(font) para.set_header_level(1) para.set(pad=0.5) - default_style.add_style("DDR:Title",para) + default_style.add_style("DDR-Title",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=14,italic=1) @@ -691,7 +691,7 @@ def _make_default_style(default_style): para.set_font(font) para.set_header_level(2) para.set(pad=0.5) - default_style.add_style("DDR:Generation",para) + default_style.add_style("DDR-Generation",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=10,italic=0, bold=0) @@ -700,22 +700,22 @@ def _make_default_style(default_style): #para.set_header_level(3) para.set_left_margin(0.0) # in centimeters para.set(pad=0.5) - default_style.add_style("DDR:ChildTitle",para) + default_style.add_style("DDR-ChildTitle",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=9) para = TextDoc.ParagraphStyle() para.set_font(font) para.set(first_indent=0.0,lmargin=0.0,pad=0.25) - default_style.add_style("DDR:ChildList",para) + default_style.add_style("DDR-ChildList",para) para = TextDoc.ParagraphStyle() para.set(first_indent=0.0,lmargin=0.0,pad=0.25) - default_style.add_style("DDR:NoteHeader",para) + default_style.add_style("DDR-NoteHeader",para) para = TextDoc.ParagraphStyle() para.set(first_indent=0.5,lmargin=0.0,pad=0.25) - default_style.add_style("DDR:Entry",para) + default_style.add_style("DDR-Entry",para) table = TextDoc.TableStyle() table.set_width(1000) diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py index 44eeb2f8c..d3d4f736f 100644 --- a/src/plugins/FamilyGroup.py +++ b/src/plugins/FamilyGroup.py @@ -66,41 +66,41 @@ class FamilyGroup: cell.set_bottom_border(1) cell.set_right_border(1) cell.set_left_border(1) - self.doc.add_cell_style('FGR:ParentHead',cell) + self.doc.add_cell_style('FGR-ParentHead',cell) cell = TextDoc.TableCellStyle() cell.set_padding(0.1) cell.set_bottom_border(1) cell.set_left_border(1) - self.doc.add_cell_style('FGR:TextContents',cell) + self.doc.add_cell_style('FGR-TextContents',cell) cell = TextDoc.TableCellStyle() cell.set_padding(0.1) cell.set_bottom_border(0) cell.set_left_border(1) cell.set_padding(0.1) - self.doc.add_cell_style('FGR:TextChild1',cell) + self.doc.add_cell_style('FGR-TextChild1',cell) cell = TextDoc.TableCellStyle() cell.set_padding(0.1) cell.set_bottom_border(1) cell.set_left_border(1) cell.set_padding(0.1) - self.doc.add_cell_style('FGR:TextChild2',cell) + self.doc.add_cell_style('FGR-TextChild2',cell) cell = TextDoc.TableCellStyle() cell.set_padding(0.1) cell.set_bottom_border(1) cell.set_right_border(1) cell.set_left_border(1) - self.doc.add_cell_style('FGR:TextContentsEnd',cell) + self.doc.add_cell_style('FGR-TextContentsEnd',cell) cell = TextDoc.TableCellStyle() cell.set_padding(0.2) cell.set_bottom_border(1) cell.set_right_border(1) cell.set_left_border(1) - self.doc.add_cell_style('FGR:ChildName',cell) + self.doc.add_cell_style('FGR-ChildName',cell) table = TextDoc.TableStyle() table.set_width(100) @@ -108,7 +108,7 @@ class FamilyGroup: table.set_column_width(0,20) table.set_column_width(1,40) table.set_column_width(2,40) - self.doc.add_table_style('FGR:ParentTable',table) + self.doc.add_table_style('FGR-ParentTable',table) table = TextDoc.TableStyle() table.set_width(100) @@ -117,7 +117,7 @@ class FamilyGroup: table.set_column_width(1,18) table.set_column_width(2,35) table.set_column_width(3,40) - self.doc.add_table_style('FGR:ChildTable',table) + self.doc.add_table_style('FGR-ChildTable',table) def end(self): if self.standalone: @@ -133,10 +133,10 @@ class FamilyGroup: else: id = _("Wife") - self.doc.start_table(id,'FGR:ParentTable') + self.doc.start_table(id,'FGR-ParentTable') self.doc.start_row() - self.doc.start_cell('FGR:ParentHead',3) - self.doc.start_paragraph('FGR:ParentName') + self.doc.start_cell('FGR-ParentHead',3) + self.doc.start_paragraph('FGR-ParentName') self.doc.write_text(id + ': ') self.doc.write_text(person.getPrimaryName().getRegularName()) self.doc.end_paragraph() @@ -147,36 +147,36 @@ class FamilyGroup: death = person.getDeath() self.doc.start_row() - self.doc.start_cell("FGR:TextContents") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContents") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(_("Birth")) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell("FGR:TextContents") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContents") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(birth.getDate()) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell("FGR:TextContentsEnd") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContentsEnd") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(birth.getPlaceName()) self.doc.end_paragraph() self.doc.end_cell() self.doc.end_row() self.doc.start_row() - self.doc.start_cell("FGR:TextContents") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContents") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(_("Death")) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell("FGR:TextContents") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContents") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(death.getDate()) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell("FGR:TextContentsEnd") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContentsEnd") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(death.getPlaceName()) self.doc.end_paragraph() self.doc.end_cell() @@ -193,26 +193,26 @@ class FamilyGroup: mother_name = family.getMother().getPrimaryName().getRegularName() self.doc.start_row() - self.doc.start_cell("FGR:TextContents") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContents") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(_("Father")) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell("FGR:TextContentsEnd",2) - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContentsEnd",2) + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(father_name) self.doc.end_paragraph() self.doc.end_cell() self.doc.end_row() self.doc.start_row() - self.doc.start_cell("FGR:TextContents") - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContents") + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(_("Mother")) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell("FGR:TextContentsEnd",2) - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell("FGR-TextContentsEnd",2) + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(mother_name) self.doc.end_paragraph() self.doc.end_cell() @@ -229,21 +229,21 @@ class FamilyGroup: place = "" self.doc.start_row() self.doc.start_cell(text) - self.doc.start_paragraph('FGR:Normal') + self.doc.start_paragraph('FGR-Normal') self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FGR:TextContents') - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell('FGR-TextContents') + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(name) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FGR:TextContents') - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell('FGR-TextContents') + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(date) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FGR:TextContentsEnd') - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell('FGR-TextContentsEnd') + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(place) self.doc.end_paragraph() self.doc.end_cell() @@ -252,27 +252,27 @@ class FamilyGroup: def dump_child(self,index,person): self.doc.start_row() - self.doc.start_cell('FGR:TextChild1') - self.doc.start_paragraph('FGR:ChildText') + self.doc.start_cell('FGR-TextChild1') + self.doc.start_paragraph('FGR-ChildText') if person.getGender() == RelLib.Person.male: self.doc.write_text("%dM" % index) else: self.doc.write_text("%dF" % index) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FGR:ChildName',3) - self.doc.start_paragraph('FGR:ChildText') + self.doc.start_cell('FGR-ChildName',3) + self.doc.start_paragraph('FGR-ChildText') self.doc.write_text(person.getPrimaryName().getRegularName()) self.doc.end_paragraph() self.doc.end_cell() self.doc.end_row() families = len(person.getFamilyList()) - self.dump_child_event('FGR:TextChild1','Birth',person.getBirth()) + self.dump_child_event('FGR-TextChild1','Birth',person.getBirth()) if families == 0: - self.dump_child_event('FGR:TextChild2',_('Death'),person.getDeath()) + self.dump_child_event('FGR-TextChild2',_('Death'),person.getDeath()) else: - self.dump_child_event('FGR:TextChild1',_('Death'),person.getDeath()) + self.dump_child_event('FGR-TextChild1',_('Death'),person.getDeath()) index = 1 for family in person.getFamilyList(): @@ -282,26 +282,26 @@ class FamilyGroup: else: spouse = family.getFather() self.doc.start_row() - self.doc.start_cell('FGR:TextChild1') - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell('FGR-TextChild1') + self.doc.start_paragraph('FGR-Normal') self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FGR:TextContents') - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell('FGR-TextContents') + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(_("Spouse")) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FGR:TextContentsEnd',2) - self.doc.start_paragraph('FGR:Normal') + self.doc.start_cell('FGR-TextContentsEnd',2) + self.doc.start_paragraph('FGR-Normal') self.doc.write_text(spouse.getPrimaryName().getRegularName()) self.doc.end_paragraph() self.doc.end_cell() self.doc.end_row() if index == families: - self.dump_child_event('FGR:TextChild2',_("Married"),m) + self.dump_child_event('FGR-TextChild2',_("Married"),m) else: - self.dump_child_event('FGR:TextChild1',_("Married"),m) + self.dump_child_event('FGR-TextChild1',_("Married"),m) #-------------------------------------------------------------------- # @@ -312,24 +312,24 @@ class FamilyGroup: if self.newpage: self.doc.page_break() - self.doc.start_paragraph('FGR:Title') + self.doc.start_paragraph('FGR-Title') self.doc.write_text(_("Family Group Report")) self.doc.end_paragraph() if self.family: self.dump_parent(self.family.getFather()) - self.doc.start_paragraph("FGR:blank") + self.doc.start_paragraph("FGR-blank") self.doc.end_paragraph() self.dump_parent(self.family.getMother()) length = len(self.family.getChildList()) if length > 0: - self.doc.start_paragraph("FGR:blank") + self.doc.start_paragraph("FGR-blank") self.doc.end_paragraph() - self.doc.start_table('FGR:Children','FGR:ChildTable') + self.doc.start_table('FGR-Children','FGR-ChildTable') self.doc.start_row() - self.doc.start_cell('FGR:ParentHead',4) - self.doc.start_paragraph('FGR:ParentName') + self.doc.start_cell('FGR-ParentHead',4) + self.doc.start_paragraph('FGR-ParentName') self.doc.write_text(_("Children")) self.doc.end_paragraph() self.doc.end_cell() @@ -597,7 +597,7 @@ def _make_default_style(default_style): font = TextDoc.FontStyle() font.set_size(4) para.set_font(font) - default_style.add_style('FGR:blank',para) + default_style.add_style('FGR-blank',para) font = TextDoc.FontStyle() font.set_type_face(TextDoc.FONT_SANS_SERIF) @@ -606,7 +606,7 @@ def _make_default_style(default_style): para = TextDoc.ParagraphStyle() para.set_font(font) para.set_description(_("The style used for the title of the page.")) - default_style.add_style('FGR:Title',para) + default_style.add_style('FGR-Title',para) font = TextDoc.FontStyle() font.set_type_face(TextDoc.FONT_SERIF) @@ -615,7 +615,7 @@ def _make_default_style(default_style): para = TextDoc.ParagraphStyle() para.set_font(font) para.set_description(_('The basic style used for the text display.')) - default_style.add_style('FGR:Normal',para) + default_style.add_style('FGR-Normal',para) font = TextDoc.FontStyle() font.set_type_face(TextDoc.FONT_SANS_SERIF) @@ -624,7 +624,7 @@ def _make_default_style(default_style): para = TextDoc.ParagraphStyle() para.set_font(font) para.set_description(_('The style used for the text related to the children.')) - default_style.add_style('FGR:ChildText',para) + default_style.add_style('FGR-ChildText',para) font = TextDoc.FontStyle() font.set_type_face(TextDoc.FONT_SANS_SERIF) @@ -633,7 +633,7 @@ def _make_default_style(default_style): para = TextDoc.ParagraphStyle() para.set_font(font) para.set_description(_("The style used for the parent's name")) - default_style.add_style('FGR:ParentName',para) + default_style.add_style('FGR-ParentName',para) def _build_spouse_map(person): """Create a mapping of all spouse names:families to be put diff --git a/src/plugins/FtmStyleAncestors.py b/src/plugins/FtmStyleAncestors.py index 7373b0df7..42e120fc7 100644 --- a/src/plugins/FtmStyleAncestors.py +++ b/src/plugins/FtmStyleAncestors.py @@ -80,7 +80,7 @@ class FtmAncestorReport(Report.Report): self.apply_filter(self.start,1) name = self.start.getPrimaryName().getRegularName() - self.doc.start_paragraph("FTA:Title") + self.doc.start_paragraph("FTA-Title") title = _("Ancestors of %s") % name self.doc.write_text(title) self.doc.end_paragraph() @@ -93,14 +93,14 @@ class FtmAncestorReport(Report.Report): if old_gen != generation: if self.pgbrk and generation > 1: self.doc.page_break() - self.doc.start_paragraph("FTA:Generation") + self.doc.start_paragraph("FTA-Generation") t = _("Generation No. %d") % generation self.doc.write_text(t) self.doc.end_paragraph() old_gen = generation pri_name = person.getPrimaryName() - self.doc.start_paragraph("FTA:Entry","%d." % key) + self.doc.start_paragraph("FTA-Entry","%d." % key) name = pri_name.getRegularName() self.doc.start_bold() self.doc.write_text(name) @@ -198,7 +198,7 @@ class FtmAncestorReport(Report.Report): if not keys: return - self.doc.start_paragraph('FTA:Generation') + self.doc.start_paragraph('FTA-Generation') self.doc.write_text(_('Endnotes')) self.doc.end_paragraph() @@ -207,7 +207,7 @@ class FtmAncestorReport(Report.Report): srcref = self.sref_map[key] base = srcref.getBase() - self.doc.start_paragraph('FTA:Endnotes',"%d." % key) + self.doc.start_paragraph('FTA-Endnotes',"%d." % key) self.doc.write_text(base.getTitle()) for item in [ base.getAuthor(), base.getPubInfo(), base.getCallNumber(), @@ -254,12 +254,12 @@ class FtmAncestorReport(Report.Report): note = person.getNote() if not note.strip(): return - self.doc.start_paragraph('FTA:SubEntry') + self.doc.start_paragraph('FTA-SubEntry') self.doc.write_text(_('Notes for %(person)s:') % { 'person' : person.getPrimaryName().getRegularName()} ) self.doc.end_paragraph() for line in note.split('\n'): - self.doc.start_paragraph('FTA:Details') + self.doc.start_paragraph('FTA-Details') self.doc.write_text(line.strip()) self.doc.end_paragraph() @@ -269,12 +269,12 @@ class FtmAncestorReport(Report.Report): ncount = 0 for name in person.getAlternateNames(): if first: - self.doc.start_paragraph('FTA:SubEntry') + self.doc.start_paragraph('FTA-SubEntry') self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : person.getPrimaryName().getRegularName() }) self.doc.end_paragraph() first = 0 - self.doc.start_paragraph('FTA:Details') + self.doc.start_paragraph('FTA-Details') self.doc.write_text(_('Name %(count)d: %(name)s%(endnotes)s') % { 'count' : ncount, 'name' : name.getRegularName(), 'endnotes' : self.endnotes(name), @@ -289,14 +289,14 @@ class FtmAncestorReport(Report.Report): if not date and not place: continue if first: - self.doc.start_paragraph('FTA:SubEntry') + self.doc.start_paragraph('FTA-SubEntry') name = person.getPrimaryName().getRegularName() self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : name }) self.doc.end_paragraph() first = 0 - self.doc.start_paragraph('FTA:Details') + self.doc.start_paragraph('FTA-Details') if date and place: self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s') % { 'event_name' : event.getName(), @@ -731,7 +731,7 @@ def _make_default_style(default_style): para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set(pad=0.5) para.set_description(_('The style used for the title of the page.')) - default_style.add_style("FTA:Title",para) + default_style.add_style("FTA-Title",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=14,italic=1) @@ -741,27 +741,27 @@ def _make_default_style(default_style): para.set(pad=0.5) para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set_description(_('The style used for the generation header.')) - default_style.add_style("FTA:Generation",para) + default_style.add_style("FTA-Generation",para) para = TextDoc.ParagraphStyle() para.set(first_indent=-1.0,lmargin=1.0,pad=0.25) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTA:Entry",para) + default_style.add_style("FTA-Entry",para) para = TextDoc.ParagraphStyle() para.set(lmargin=1.0,pad=0.05) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTA:Details",para) + default_style.add_style("FTA-Details",para) para = TextDoc.ParagraphStyle() para.set(lmargin=1.0,pad=0.25) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTA:SubEntry",para) + default_style.add_style("FTA-SubEntry",para) para = TextDoc.ParagraphStyle() para.set(pad=0.05) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTA:Endnotes",para) + default_style.add_style("FTA-Endnotes",para) #------------------------------------------------------------------------ diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py index 83a2deeea..05de32f16 100644 --- a/src/plugins/FtmStyleDescendants.py +++ b/src/plugins/FtmStyleDescendants.py @@ -77,10 +77,10 @@ class FtmDescendantReport(Report.Report): tbl.set_column_width(0,10) tbl.set_column_width(1,5) tbl.set_column_width(2,85) - self.doc.add_table_style('FTD:ChildTable',tbl) + self.doc.add_table_style('FTD-ChildTable',tbl) cell = TextDoc.TableCellStyle() - self.doc.add_cell_style('FTD:Normal',cell) + self.doc.add_cell_style('FTD-Normal',cell) def apply_filter(self,person,index,generation=1): @@ -108,7 +108,7 @@ class FtmDescendantReport(Report.Report): self.apply_filter(self.start,1) name = self.start.getPrimaryName().getRegularName() - self.doc.start_paragraph("FTD:Title") + self.doc.start_paragraph("FTD-Title") title = _("Descendants of %s") % name self.doc.write_text(title) self.doc.end_paragraph() @@ -119,7 +119,7 @@ class FtmDescendantReport(Report.Report): for generation in generations: if self.pgbrk and generation > 1: self.doc.page_break() - self.doc.start_paragraph("FTD:Generation") + self.doc.start_paragraph("FTD-Generation") t = _("Generation No. %d") % generation self.doc.write_text(t) self.doc.end_paragraph() @@ -130,7 +130,7 @@ class FtmDescendantReport(Report.Report): person = self.anc_map[key] pri_name = person.getPrimaryName() - self.doc.start_paragraph("FTD:Entry","%d." % key) + self.doc.start_paragraph("FTD-Entry","%d." % key) name = pri_name.getRegularName() self.doc.start_bold() self.doc.write_text(name) @@ -231,7 +231,7 @@ class FtmDescendantReport(Report.Report): if not keys: return - self.doc.start_paragraph('FTD:Generation') + self.doc.start_paragraph('FTD-Generation') self.doc.write_text(_('Endnotes')) self.doc.end_paragraph() @@ -240,7 +240,7 @@ class FtmDescendantReport(Report.Report): srcref = self.sref_map[key] base = srcref.getBase() - self.doc.start_paragraph('FTD:Endnotes',"%d." % key) + self.doc.start_paragraph('FTD-Endnotes',"%d." % key) self.doc.write_text(base.getTitle()) for item in [ base.getAuthor(), base.getPubInfo(), base.getCallNumber(), @@ -287,12 +287,12 @@ class FtmDescendantReport(Report.Report): note = person.getNote() if not note.strip(): return - self.doc.start_paragraph('FTD:SubEntry') + self.doc.start_paragraph('FTD-SubEntry') self.doc.write_text(_('Notes for %(person)s:') % { 'person' : person.getPrimaryName().getRegularName()} ) self.doc.end_paragraph() for line in note.split('\n'): - self.doc.start_paragraph('FTD:Details') + self.doc.start_paragraph('FTD-Details') self.doc.write_text(line.strip()) self.doc.end_paragraph() @@ -302,12 +302,12 @@ class FtmDescendantReport(Report.Report): ncount = 1 for name in person.getAlternateNames(): if first: - self.doc.start_paragraph('FTD:SubEntry') + self.doc.start_paragraph('FTD-SubEntry') self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : person.getPrimaryName().getRegularName() }) self.doc.end_paragraph() first = 0 - self.doc.start_paragraph('FTD:Details') + self.doc.start_paragraph('FTD-Details') self.doc.write_text(_('Name %(count)d: %(name)s%(endnotes)s') % { 'count' : ncount, 'name' : name.getRegularName(), 'endnotes' : self.endnotes(name), @@ -322,13 +322,13 @@ class FtmDescendantReport(Report.Report): if not date and not place: continue if first: - self.doc.start_paragraph('FTD:SubEntry') + self.doc.start_paragraph('FTD-SubEntry') name = person.getPrimaryName().getRegularName() self.doc.write_text(_('More about %(person_name)s:') % { 'person_name' : name }) self.doc.end_paragraph() first = 0 - self.doc.start_paragraph('FTD:Details') + self.doc.start_paragraph('FTD-Details') if date and place: self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s') % { 'event_name' : event.getName(), @@ -366,12 +366,12 @@ class FtmDescendantReport(Report.Report): if not date and not place: continue if first: - self.doc.start_paragraph('FTD:SubEntry') + self.doc.start_paragraph('FTD-SubEntry') self.doc.write_text(_('More about %(husband)s and %(wife)s:') % { 'husband' : husband, 'wife' : wife }) self.doc.end_paragraph() first = 0 - self.doc.start_paragraph('FTD:Details') + self.doc.start_paragraph('FTD-Details') if date and place: self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s') % { 'event_name' : event.getName(), @@ -414,30 +414,30 @@ class FtmDescendantReport(Report.Report): if first: first = 0 - self.doc.start_paragraph('FTD:SubEntry') + self.doc.start_paragraph('FTD-SubEntry') if spouse: self.doc.write_text(_('Children of %(person_name)s and %(spouse_name)s are:') % { 'person_name' : name, 'spouse_name' : spouse.getPrimaryName().getRegularName() }) else: self.doc.write_text(_('Children of %(person_name)s are:') % { 'person_name' : name }) self.doc.end_paragraph() - self.doc.start_table(family.getId(),'FTD:ChildTable') + self.doc.start_table(family.getId(),'FTD-ChildTable') self.doc.start_row() - self.doc.start_cell('FTD:Normal') - self.doc.start_paragraph('FTD:Details') + self.doc.start_cell('FTD-Normal') + self.doc.start_paragraph('FTD-Details') self.doc.write_text("%d." % index) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FTD:Normal') - self.doc.start_paragraph('FTD:Details') + self.doc.start_cell('FTD-Normal') + self.doc.start_paragraph('FTD-Details') self.doc.write_text("%s." % string.lower(Utils.roman(child_index))) self.doc.end_paragraph() self.doc.end_cell() - self.doc.start_cell('FTD:Normal') - self.doc.start_paragraph('FTD:Details') + self.doc.start_cell('FTD-Normal') + self.doc.start_paragraph('FTD-Details') death = child.getDeath() dplace = death.getPlaceName() @@ -1140,7 +1140,7 @@ def _make_default_style(default_style): para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set(pad=0.5) para.set_description(_('The style used for the title of the page.')) - default_style.add_style("FTD:Title",para) + default_style.add_style("FTD-Title",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=14,italic=1) @@ -1150,27 +1150,27 @@ def _make_default_style(default_style): para.set(pad=0.5) para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set_description(_('The style used for the generation header.')) - default_style.add_style("FTD:Generation",para) + default_style.add_style("FTD-Generation",para) para = TextDoc.ParagraphStyle() para.set(first_indent=-1.0,lmargin=1.0,pad=0.25) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTD:Entry",para) + default_style.add_style("FTD-Entry",para) para = TextDoc.ParagraphStyle() para.set(lmargin=1.0,pad=0.05) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTD:Details",para) + default_style.add_style("FTD-Details",para) para = TextDoc.ParagraphStyle() para.set(lmargin=1.0,pad=0.25) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTD:SubEntry",para) + default_style.add_style("FTD-SubEntry",para) para = TextDoc.ParagraphStyle() para.set(pad=0.05) para.set_description(_('The basic style used for the text display.')) - default_style.add_style("FTD:Endnotes",para) + default_style.add_style("FTD-Endnotes",para) #------------------------------------------------------------------------ diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py index b54ece7f1..08d993b2d 100644 --- a/src/plugins/IndivComplete.py +++ b/src/plugins/IndivComplete.py @@ -90,26 +90,26 @@ class IndivComplete(Report.Report): tbl.set_columns(2) tbl.set_column_width(0,20) tbl.set_column_width(1,80) - self.d.add_table_style("IDS:IndTable",tbl) + self.d.add_table_style("IDS-IndTable",tbl) tbl = TextDoc.TableStyle() tbl.set_width(100) tbl.set_columns(2) tbl.set_column_width(0,50) tbl.set_column_width(1,50) - self.d.add_table_style("IDS:ParentsTable",tbl) + self.d.add_table_style("IDS-ParentsTable",tbl) cell = TextDoc.TableCellStyle() cell.set_top_border(1) cell.set_bottom_border(1) - self.d.add_cell_style("IDS:TableHead",cell) + self.d.add_cell_style("IDS-TableHead",cell) cell = TextDoc.TableCellStyle() - self.d.add_cell_style("IDS:NormalCell",cell) + self.d.add_cell_style("IDS-NormalCell",cell) cell = TextDoc.TableCellStyle() cell.set_longlist(1) - self.d.add_cell_style("IDS:ListCell",cell) + self.d.add_cell_style("IDS-ListCell",cell) def end(self): if self.standalone: @@ -159,26 +159,26 @@ class IndivComplete(Report.Report): note = self.person.getNote() if note == '': return - self.d.start_table('note','IDS:IndTable') + self.d.start_table('note','IDS-IndTable') self.d.start_row() - self.d.start_cell('IDS:TableHead',2) - self.d.start_paragraph('IDS:TableTitle') + self.d.start_cell('IDS-TableHead',2) + self.d.start_paragraph('IDS-TableTitle') self.d.write_text(_('Notes')) self.d.end_paragraph() self.d.end_cell() self.d.end_row() self.d.start_row() - self.d.start_cell('IDS:NormalCell',2) + self.d.start_cell('IDS-NormalCell',2) for line in string.split(note,'\n'): - self.d.start_paragraph('IDS:Normal') + self.d.start_paragraph('IDS-Normal') self.d.write_text(line) self.d.end_paragraph() self.d.end_cell() self.d.end_row() self.d.end_table() - self.d.start_paragraph("IDS:Normal") + self.d.start_paragraph("IDS-Normal") self.d.end_paragraph() def write_alt_parents(self): @@ -186,10 +186,10 @@ class IndivComplete(Report.Report): if len(self.person.getParentList()) < 2: return - self.d.start_table("altparents","IDS:IndTable") + self.d.start_table("altparents","IDS-IndTable") self.d.start_row() - self.d.start_cell("IDS:TableHead",2) - self.d.start_paragraph("IDS:TableTitle") + self.d.start_cell("IDS-TableHead",2) + self.d.start_paragraph("IDS-TableTitle") self.d.write_text(_("Alternate Parents")) self.d.end_paragraph() self.d.end_cell() @@ -216,7 +216,7 @@ class IndivComplete(Report.Report): self.write_p_entry(_('Mother'),'','') self.d.end_table() - self.d.start_paragraph("IDS:Normal") + self.d.start_paragraph("IDS-Normal") self.d.end_paragraph() def write_alt_names(self): @@ -224,10 +224,10 @@ class IndivComplete(Report.Report): if len(self.person.getAlternateNames()) < 1: return - self.d.start_table("altparents","IDS:IndTable") + self.d.start_table("altparents","IDS-IndTable") self.d.start_row() - self.d.start_cell("IDS:TableHead",2) - self.d.start_paragraph("IDS:TableTitle") + self.d.start_cell("IDS-TableHead",2) + self.d.start_paragraph("IDS-TableTitle") self.d.write_text(_("Alternate Names")) self.d.end_paragraph() self.d.end_cell() @@ -245,7 +245,7 @@ class IndivComplete(Report.Report): self.normal_cell(text) self.d.end_row() self.d.end_table() - self.d.start_paragraph('IDS:Normal') + self.d.start_paragraph('IDS-Normal') self.d.end_paragraph() def write_families(self): @@ -253,10 +253,10 @@ class IndivComplete(Report.Report): if len(self.person.getFamilyList()) == 0: return - self.d.start_table("three","IDS:IndTable") + self.d.start_table("three","IDS-IndTable") self.d.start_row() - self.d.start_cell("IDS:TableHead",2) - self.d.start_paragraph("IDS:TableTitle") + self.d.start_cell("IDS-TableHead",2) + self.d.start_paragraph("IDS-TableTitle") self.d.write_text(_("Marriages/Children")) self.d.end_paragraph() self.d.end_cell() @@ -268,8 +268,8 @@ class IndivComplete(Report.Report): else: spouse = family.getFather() self.d.start_row() - self.d.start_cell("IDS:NormalCell",2) - self.d.start_paragraph("IDS:Spouse") + self.d.start_cell("IDS-NormalCell",2) + self.d.start_paragraph("IDS-Spouse") if spouse: text = spouse.getPrimaryName().getRegularName() else: @@ -287,8 +287,8 @@ class IndivComplete(Report.Report): self.d.start_row() self.normal_cell(_("Children")) - self.d.start_cell("IDS:ListCell") - self.d.start_paragraph("IDS:Normal") + self.d.start_cell("IDS-ListCell") + self.d.start_paragraph("IDS-Normal") first = 1 for child in family.getChildList(): @@ -301,7 +301,7 @@ class IndivComplete(Report.Report): self.d.end_cell() self.d.end_row() self.d.end_table() - self.d.start_paragraph('IDS:Normal') + self.d.start_paragraph('IDS-Normal') self.d.end_paragraph() def write_sources(self): @@ -309,10 +309,10 @@ class IndivComplete(Report.Report): if len(self.slist) == 0: return - self.d.start_table("three","IDS:IndTable") + self.d.start_table("three","IDS-IndTable") self.d.start_row() - self.d.start_cell("IDS:TableHead",2) - self.d.start_paragraph("IDS:TableTitle") + self.d.start_cell("IDS-TableHead",2) + self.d.start_paragraph("IDS-TableTitle") self.d.write_text(_("Sources")) self.d.end_paragraph() self.d.end_cell() @@ -327,10 +327,10 @@ class IndivComplete(Report.Report): self.d.end_table() def write_facts(self): - self.d.start_table("two","IDS:IndTable") + self.d.start_table("two","IDS-IndTable") self.d.start_row() - self.d.start_cell("IDS:TableHead",2) - self.d.start_paragraph("IDS:TableTitle") + self.d.start_cell("IDS-TableHead",2) + self.d.start_paragraph("IDS-TableTitle") self.d.write_text(_("Individual Facts")) self.d.end_paragraph() self.d.end_cell() @@ -341,12 +341,12 @@ class IndivComplete(Report.Report): for event in event_list: self.write_fact(event) self.d.end_table() - self.d.start_paragraph("IDS:Normal") + self.d.start_paragraph("IDS-Normal") self.d.end_paragraph() def normal_cell(self,text): - self.d.start_cell('IDS:NormalCell') - self.d.start_paragraph('IDS:Normal') + self.d.start_cell('IDS-NormalCell') + self.d.start_paragraph('IDS-Normal') self.d.write_text(text) self.d.end_paragraph() self.d.end_cell() @@ -374,22 +374,22 @@ class IndivComplete(Report.Report): photo_list = self.person.getPhotoList() name = self.person.getPrimaryName().getRegularName() - self.d.start_paragraph("IDS:Title") + self.d.start_paragraph("IDS-Title") self.d.write_text(_("Summary of %s") % name) self.d.end_paragraph() - self.d.start_paragraph("IDS:Normal") + self.d.start_paragraph("IDS-Normal") self.d.end_paragraph() if len(photo_list) > 0: object = photo_list[0].getReference() if object.getMimeType()[0:5] == "image": file = object.getPath() - self.d.start_paragraph("IDS:Normal") + self.d.start_paragraph("IDS-Normal") self.d.add_photo(file,"row",4.0,4.0) self.d.end_paragraph() - self.d.start_table("one","IDS:IndTable") + self.d.start_table("one","IDS-IndTable") self.d.start_row() self.normal_cell("%s:" % _("Name")) @@ -437,7 +437,7 @@ class IndivComplete(Report.Report): self.d.end_row() self.d.end_table() - self.d.start_paragraph("IDS:Normal") + self.d.start_paragraph("IDS-Normal") self.d.end_paragraph() self.write_alt_names() @@ -657,7 +657,7 @@ def _make_default_style(default_style): p.set_alignment(TextDoc.PARA_ALIGN_CENTER) p.set_font(font) p.set_description(_("The style used for the title of the page.")) - default_style.add_style("IDS:Title",p) + default_style.add_style("IDS-Title",p) font = TextDoc.FontStyle() font.set_bold(1) @@ -667,7 +667,7 @@ def _make_default_style(default_style): p = TextDoc.ParagraphStyle() p.set_font(font) p.set_description(_("The style used for category labels.")) - default_style.add_style("IDS:TableTitle",p) + default_style.add_style("IDS-TableTitle",p) font = TextDoc.FontStyle() font.set_bold(1) @@ -676,14 +676,14 @@ def _make_default_style(default_style): p = TextDoc.ParagraphStyle() p.set_font(font) p.set_description(_("The style used for the spouse's name.")) - default_style.add_style("IDS:Spouse",p) + default_style.add_style("IDS-Spouse",p) font = TextDoc.FontStyle() font.set_size(12) p = TextDoc.ParagraphStyle() p.set_font(font) p.set_description(_('The basic style used for the text display.')) - default_style.add_style("IDS:Normal",p) + default_style.add_style("IDS-Normal",p) #------------------------------------------------------------------------ diff --git a/src/plugins/IndivSummary.py b/src/plugins/IndivSummary.py index c362432bb..d4fccb3c8 100644 --- a/src/plugins/IndivSummary.py +++ b/src/plugins/IndivSummary.py @@ -90,19 +90,19 @@ class IndivSummary(Report.Report): tbl.set_columns(2) tbl.set_column_width(0,20) tbl.set_column_width(1,80) - self.d.add_table_style("IVS:IndTable",tbl) + self.d.add_table_style("IVS-IndTable",tbl) cell = TextDoc.TableCellStyle() cell.set_top_border(1) cell.set_bottom_border(1) - self.d.add_cell_style("IVS:TableHead",cell) + self.d.add_cell_style("IVS-TableHead",cell) cell = TextDoc.TableCellStyle() - self.d.add_cell_style("IVS:NormalCell",cell) + self.d.add_cell_style("IVS-NormalCell",cell) cell = TextDoc.TableCellStyle() cell.set_longlist(1) - self.d.add_cell_style("IVS:ListCell",cell) + self.d.add_cell_style("IVS-ListCell",cell) def end(self): if self.standalone: @@ -127,14 +127,14 @@ class IndivSummary(Report.Report): val = date + " in " + place + ". " + description self.d.start_row() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text(name) self.d.end_paragraph() self.d.end_cell() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text(val) self.d.end_paragraph() self.d.end_cell() @@ -147,12 +147,12 @@ class IndivSummary(Report.Report): #-------------------------------------------------------------------- def write_families(self): - self.d.start_paragraph("IVS:Normal") + self.d.start_paragraph("IVS-Normal") self.d.end_paragraph() - self.d.start_table("three","IVS:IndTable") + self.d.start_table("three","IVS-IndTable") self.d.start_row() - self.d.start_cell("IVS:TableHead",2) - self.d.start_paragraph("IVS:TableTitle") + self.d.start_cell("IVS-TableHead",2) + self.d.start_paragraph("IVS-TableTitle") self.d.write_text(_("Marriages/Children")) self.d.end_paragraph() self.d.end_cell() @@ -164,8 +164,8 @@ class IndivSummary(Report.Report): else: spouse = family.getFather() self.d.start_row() - self.d.start_cell("IVS:NormalCell",2) - self.d.start_paragraph("IVS:Spouse") + self.d.start_cell("IVS-NormalCell",2) + self.d.start_paragraph("IVS-Spouse") if spouse: self.d.write_text(spouse.getPrimaryName().getRegularName()) else: @@ -180,14 +180,14 @@ class IndivSummary(Report.Report): child_list = family.getChildList() if len(child_list) > 0: self.d.start_row() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text(_("Children")) self.d.end_paragraph() self.d.end_cell() - self.d.start_cell("IVS:ListCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-ListCell") + self.d.start_paragraph("IVS-Normal") first = 1 for child in family.getChildList(): @@ -209,46 +209,46 @@ class IndivSummary(Report.Report): photo_list = self.person.getPhotoList() name = self.person.getPrimaryName().getRegularName() - self.d.start_paragraph("IVS:Title") + self.d.start_paragraph("IVS-Title") self.d.write_text(_("Summary of %s") % name) self.d.end_paragraph() - self.d.start_paragraph("IVS:Normal") + self.d.start_paragraph("IVS-Normal") self.d.end_paragraph() if len(photo_list) > 0: object = photo_list[0].getReference() if object.getMimeType()[0:5] == "image": file = object.getPath() - self.d.start_paragraph("IVS:Normal") + self.d.start_paragraph("IVS-Normal") self.d.add_photo(file,"row",4.0,4.0) self.d.end_paragraph() - self.d.start_table("one","IVS:IndTable") + self.d.start_table("one","IVS-IndTable") self.d.start_row() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text("%s:" % _("Name")) self.d.end_paragraph() self.d.end_cell() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text(self.person.getPrimaryName().getRegularName()) self.d.end_paragraph() self.d.end_cell() self.d.end_row() self.d.start_row() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text("%s:" % _("Gender")) self.d.end_paragraph() self.d.end_cell() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") if self.person.getGender() == RelLib.Person.male: self.d.write_text(_("Male")) else: @@ -274,41 +274,41 @@ class IndivSummary(Report.Report): mother = "" self.d.start_row() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text("%s:" % _("Father")) self.d.end_paragraph() self.d.end_cell() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text(father) self.d.end_paragraph() self.d.end_cell() self.d.end_row() self.d.start_row() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text("%s:" % _("Mother")) self.d.end_paragraph() self.d.end_cell() - self.d.start_cell("IVS:NormalCell") - self.d.start_paragraph("IVS:Normal") + self.d.start_cell("IVS-NormalCell") + self.d.start_paragraph("IVS-Normal") self.d.write_text(mother) self.d.end_paragraph() self.d.end_cell() self.d.end_row() self.d.end_table() - self.d.start_paragraph("IVS:Normal") + self.d.start_paragraph("IVS-Normal") self.d.end_paragraph() - self.d.start_table("two","IVS:IndTable") + self.d.start_table("two","IVS-IndTable") self.d.start_row() - self.d.start_cell("IVS:TableHead",2) - self.d.start_paragraph("IVS:TableTitle") + self.d.start_cell("IVS-TableHead",2) + self.d.start_paragraph("IVS-TableTitle") self.d.write_text(_("Individual Facts")) self.d.end_paragraph() self.d.end_cell() @@ -586,7 +586,7 @@ def _make_default_style(default_style): p.set_alignment(TextDoc.PARA_ALIGN_CENTER) p.set_font(font) p.set_description(_("The style used for the title of the page.")) - default_style.add_style("IVS:Title",p) + default_style.add_style("IVS-Title",p) font = TextDoc.FontStyle() font.set_bold(1) @@ -596,7 +596,7 @@ def _make_default_style(default_style): p = TextDoc.ParagraphStyle() p.set_font(font) p.set_description(_("The style used for category labels.")) - default_style.add_style("IVS:TableTitle",p) + default_style.add_style("IVS-TableTitle",p) font = TextDoc.FontStyle() font.set_bold(1) @@ -605,14 +605,14 @@ def _make_default_style(default_style): p = TextDoc.ParagraphStyle() p.set_font(font) p.set_description(_("The style used for the spouse's name.")) - default_style.add_style("IVS:Spouse",p) + default_style.add_style("IVS-Spouse",p) font = TextDoc.FontStyle() font.set_size(12) p = TextDoc.ParagraphStyle() p.set_font(font) p.set_description(_('The basic style used for the text display.')) - default_style.add_style("IVS:Normal",p) + default_style.add_style("IVS-Normal",p) #------------------------------------------------------------------------ # @@ -644,8 +644,3 @@ register_book_item( _make_default_style ) - - - - - diff --git a/src/plugins/SimpleBookTitle.py b/src/plugins/SimpleBookTitle.py index cbdf98cdf..7b867cd02 100644 --- a/src/plugins/SimpleBookTitle.py +++ b/src/plugins/SimpleBookTitle.py @@ -73,11 +73,11 @@ class SimpleBookTitle(Report.Report): if self.newpage: self.doc.page_break() - self.doc.start_paragraph('SBT:Title') + self.doc.start_paragraph('SBT-Title') self.doc.write_text(self.title_string) self.doc.end_paragraph() - self.doc.start_paragraph('SBT:Subtitle') + self.doc.start_paragraph('SBT-Subtitle') self.doc.write_text(self.copyright_string) self.doc.end_paragraph() @@ -95,7 +95,7 @@ def _make_default_style(default_style): para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set(pad=0.5) para.set_description(_('The style used for the title of the page.')) - default_style.add_style("SBT:Title",para) + default_style.add_style("SBT-Title",para) font = TextDoc.FontStyle() font.set(face=TextDoc.FONT_SANS_SERIF,size=14,italic=1) @@ -105,7 +105,7 @@ def _make_default_style(default_style): para.set(pad=0.5) para.set_alignment(TextDoc.PARA_ALIGN_CENTER) para.set_description(_('The style used for the subtitle.')) - default_style.add_style("SBT:Subtitle",para) + default_style.add_style("SBT-Subtitle",para) #------------------------------------------------------------------------ #