diff --git a/ChangeLog b/ChangeLog index 705ddc6c2..17a47588d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2003-06-21 Tim Waugh + * src/plugins/Ancestors.py (person_name): Handle titles and suffices. + 2003-06-19 Tim Waugh * Makefile.am, doc/Makefile.am, doc/omf.make, doc/xmldocs.make: Fixes so that 'make distcheck' succeeds. diff --git a/src/plugins/Ancestors.py b/src/plugins/Ancestors.py index 9e3d31f18..18c6dcde3 100644 --- a/src/plugins/Ancestors.py +++ b/src/plugins/Ancestors.py @@ -411,8 +411,12 @@ class AncestorsReport (Report.Report): return 'Mr.' def person_name (self, person): - name = '' primary = person.getPrimaryName () + + name = primary.getTitle () + if name: + name += ' ' + first = primary.getFirstName () last = primary.getSurname () first_replaced = first.replace ('?', '') @@ -427,6 +431,10 @@ class AncestorsReport (Report.Report): else: name += ' ' + last + suffix = primary.getSuffix () + if suffix: + name += ', ' + suffix + type = primary.getType () if type != 'Birth Name': name += ' (%s)' % type