From 28dc889abb70e76d2b737f2824ed23c0d8554cd0 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 12 Apr 2007 02:29:52 +0000 Subject: [PATCH] 2007-04-11 Don Allingham * src/GrampsDb/_WriteGedcom.py (GedcomWriter.write_source_ref): replace newlines with semicolons on output. svn: r8378 --- ChangeLog | 4 ++++ src/GrampsDb/_WriteGedcom.py | 2 +- src/ManagedWindow.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e36a04d33..c92663e14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-04-11 Don Allingham + * src/GrampsDb/_WriteGedcom.py (GedcomWriter.write_source_ref): replace + newlines with semicolons on output. + 2007-04-10 Don Allingham * src/GrampsDb/_ReadGedcom.py: add hack to force illegal "BET ABT" to be read as "EST BET" diff --git a/src/GrampsDb/_WriteGedcom.py b/src/GrampsDb/_WriteGedcom.py index 8da5d4453..75153b593 100644 --- a/src/GrampsDb/_WriteGedcom.py +++ b/src/GrampsDb/_WriteGedcom.py @@ -1388,7 +1388,7 @@ class GedcomWriter(UpdateCallback): # Reference to the source self.writeln("%d SOUR @%s@" % (level,src.get_gramps_id())) if ref.get_page() != "": - page_text = self.cnvtxt(ref.get_page()) + page_text = self.cnvtxt(ref.get_page().replace('\n',' ; ')) self.writeln('%d PAGE %s' % (level+1,page_text)) conf = ref.get_confidence_level() # Cap the maximum level diff --git a/src/ManagedWindow.py b/src/ManagedWindow.py index 5faa09039..3949497df 100644 --- a/src/ManagedWindow.py +++ b/src/ManagedWindow.py @@ -26,6 +26,7 @@ # #------------------------------------------------------------------------- from cStringIO import StringIO +from xml.sax.saxutils import escape #------------------------------------------------------------------------- # @@ -395,7 +396,6 @@ class ManagedWindow: #------------------------------------------------------------------------- def set_titles(window,title,t,msg=None): if title: - print escape(t) title.set_text('%s' % escape(t)) title.set_use_markup(True) if msg: