Move superscript from Endnotes to each individual report.

svn: r8751
This commit is contained in:
Brian Matherly 2007-07-21 13:23:32 +00:00
parent 2c92fd968b
commit 0b54846df9
5 changed files with 19 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2007-07-21 Brian Matherly <brian@gramps-project.org>
* src/plugins/IndivComplete.py:
* src/plugins/DetDescendantReport.py:
* src/plugins/DetAncestralReport.py:
* src/ReportBase/_Endnotes.py:
Move superscript from Endnotes to each individual report.
2007-07-20 Don Allingham <don@gramps-project.org> 2007-07-20 Don Allingham <don@gramps-project.org>
* src/plugins/ExtractCity.py: Add utilty to try to extract city, state, and * src/plugins/ExtractCity.py: Add utilty to try to extract city, state, and
postal code from a place title postal code from a place title

View File

@ -69,7 +69,6 @@ def cite_source(bibliography,obj):
txt = "" txt = ""
slist = obj.get_source_references() slist = obj.get_source_references()
if slist: if slist:
txt += '<super>'
first = 1 first = 1
for ref in slist: for ref in slist:
if not first: if not first:
@ -79,7 +78,6 @@ def cite_source(bibliography,obj):
txt += "%d" % (cindex + 1) txt += "%d" % (cindex + 1)
if rindex != None: if rindex != None:
txt += "%s" % string.lowercase[rindex] txt += "%s" % string.lowercase[rindex]
txt += '</super>'
return txt return txt
def write_endnotes(bibliography,database,doc): def write_endnotes(bibliography,database,doc):

View File

@ -601,7 +601,10 @@ class DetAncestorReport(Report):
if not obj or not self.includeSources: if not obj or not self.includeSources:
return "" return ""
return Endnotes.cite_source(self.bibli,obj) txt = Endnotes.cite_source(self.bibli,obj)
if txt:
txt = '<super>' + txt + '</super>'
return txt
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #

View File

@ -595,7 +595,10 @@ class DetDescendantReport(Report):
if not obj or not self.includeSources: if not obj or not self.includeSources:
return "" return ""
return Endnotes.cite_source(self.bibli,obj) txt = Endnotes.cite_source(self.bibli,obj)
if txt:
txt = '<super>' + txt + '</super>'
return txt
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #

View File

@ -112,7 +112,8 @@ class IndivCompleteReport(Report):
text = '%s. ' % date text = '%s. ' % date
description = event.get_description() description = event.get_description()
text = '%s%s. ' % (text,description) if description:
text = '%s%s. ' % (text,description)
endnotes = "" endnotes = ""
if self.use_srcs: if self.use_srcs:
endnotes = Endnotes.cite_source(self.bibli,event) endnotes = Endnotes.cite_source(self.bibli,event)
@ -400,7 +401,9 @@ class IndivCompleteReport(Report):
self.doc.start_paragraph('IDS-Normal') self.doc.start_paragraph('IDS-Normal')
self.doc.write_text(text,mark) self.doc.write_text(text,mark)
if endnotes: if endnotes:
self.doc.start_superscript()
self.doc.write_text(endnotes) self.doc.write_text(endnotes)
self.doc.end_superscript()
self.doc.end_paragraph() self.doc.end_paragraph()
self.doc.end_cell() self.doc.end_cell()