diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 67470d460..d455a3469 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2003-12-03 Alex Roitman + * src/plugins/ReadGedcom.py (parse_source): Stop TEXT messing + up the title; add ABBR to the note field (was ignored). + 2003-12-02 Don Allingham * src/PeopleView.py (PeopleView.clear_person_tabs): initialize the model2page map with the default list, instead of clearing it. diff --git a/gramps2/src/plugins/ReadGedcom.py b/gramps2/src/plugins/ReadGedcom.py index 5578ce1cc..56ef19868 100644 --- a/gramps2/src/plugins/ReadGedcom.py +++ b/gramps2/src/plugins/ReadGedcom.py @@ -469,11 +469,12 @@ class GedcomParser: note = "%s\n%s %s%s" % (note,matches[1],matches[2],d) else: note = "%s %s%s" % (matches[1],matches[2],d) - title = matches[2] + d - title = string.replace(title,'\n',' ') - self.source.setTitle(title) elif matches[1] == "ABBR": - pass + d = self.parse_continue_data(level+1) + if note: + note = "%s\n%s %s%s" % (note,matches[1],matches[2],d) + else: + note = "%s %s%s" % (matches[1],matches[2],d) else: if note: note = "%s\n%s %s" % (note,matches[1],matches[2])