From 0b54846df9ff21d081e449564adc139b18c842a3 Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Sat, 21 Jul 2007 13:23:32 +0000
Subject: [PATCH] Move superscript from Endnotes to each individual report.

svn: r8751
---
 ChangeLog                          | 7 +++++++
 src/ReportBase/_Endnotes.py        | 2 --
 src/plugins/DetAncestralReport.py  | 5 ++++-
 src/plugins/DetDescendantReport.py | 5 ++++-
 src/plugins/IndivComplete.py       | 5 ++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index adf7dc2f8..d24631e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 	* src/plugins/ExtractCity.py: Add utilty to try to extract city, state, and
 	postal code from a place title
diff --git a/src/ReportBase/_Endnotes.py b/src/ReportBase/_Endnotes.py
index 42bd7ae66..270d77a8f 100644
--- a/src/ReportBase/_Endnotes.py
+++ b/src/ReportBase/_Endnotes.py
@@ -69,7 +69,6 @@ def cite_source(bibliography,obj):
     txt = ""
     slist = obj.get_source_references()
     if slist:
-        txt += '<super>'
         first = 1
         for ref in slist:
             if not first:
@@ -79,7 +78,6 @@ def cite_source(bibliography,obj):
             txt += "%d" % (cindex + 1)
             if rindex != None:
                 txt += "%s" % string.lowercase[rindex]
-        txt += '</super>'
     return txt
 
 def write_endnotes(bibliography,database,doc):
diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py
index cad71db74..d6a52b5d3 100644
--- a/src/plugins/DetAncestralReport.py
+++ b/src/plugins/DetAncestralReport.py
@@ -601,7 +601,10 @@ class DetAncestorReport(Report):
         if not obj or not self.includeSources:
             return ""
         
-        return Endnotes.cite_source(self.bibli,obj)
+        txt = Endnotes.cite_source(self.bibli,obj)
+        if txt:
+            txt = '<super>' + txt + '</super>'
+        return txt
 
 #------------------------------------------------------------------------
 #
diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py
index 32b9ac09e..065caf6b2 100644
--- a/src/plugins/DetDescendantReport.py
+++ b/src/plugins/DetDescendantReport.py
@@ -595,7 +595,10 @@ class DetDescendantReport(Report):
         if not obj or not self.includeSources:
             return ""
         
-        return Endnotes.cite_source(self.bibli,obj)
+        txt = Endnotes.cite_source(self.bibli,obj)
+        if txt:
+            txt = '<super>' + txt + '</super>'
+        return txt
 
 #------------------------------------------------------------------------
 #
diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py
index a1f10db31..6a3da1c47 100644
--- a/src/plugins/IndivComplete.py
+++ b/src/plugins/IndivComplete.py
@@ -112,7 +112,8 @@ class IndivCompleteReport(Report):
             text = '%s. ' % date
 
         description = event.get_description()
-        text = '%s%s. ' % (text,description)
+        if description:
+            text = '%s%s. ' % (text,description)
         endnotes = ""
         if self.use_srcs:
             endnotes = Endnotes.cite_source(self.bibli,event)
@@ -400,7 +401,9 @@ class IndivCompleteReport(Report):
         self.doc.start_paragraph('IDS-Normal')
         self.doc.write_text(text,mark)
         if endnotes:
+            self.doc.start_superscript()
             self.doc.write_text(endnotes)
+            self.doc.end_superscript()
         self.doc.end_paragraph()
         self.doc.end_cell()