diff --git a/gramps/plugins/textreport/detancestralreport.py b/gramps/plugins/textreport/detancestralreport.py index adb8e1f20..9cc1cfadd 100644 --- a/gramps/plugins/textreport/detancestralreport.py +++ b/gramps/plugins/textreport/detancestralreport.py @@ -48,6 +48,7 @@ _ = glocale.translation.gettext from gramps.gen.errors import ReportError from gramps.gen.lib import (EventType, FamilyRelType, Person, NoteType, EventRoleType) +from gramps.gen.utils.alive import probably_alive from gramps.gen.utils.db import get_participant_from_event from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, FONT_SERIF, @@ -333,13 +334,15 @@ class DetAncestorReport(Report): if text: self.doc.write_text_citation(text) - text = self.__narrator.get_died_string(self.calcageflag) - if text: - self.doc.write_text_citation(text) + # Write Death and/or Burial text only if not probably alive + if not probably_alive(person, self.database): + text = self.__narrator.get_died_string(self.calcageflag) + if text: + self.doc.write_text_citation(text) - text = self.__narrator.get_buried_string() - if text: - self.doc.write_text_citation(text) + text = self.__narrator.get_buried_string() + if text: + self.doc.write_text_citation(text) if self.verbose: self.write_parents(person) @@ -629,9 +632,11 @@ class DetAncestorReport(Report): self.__narrator.get_born_string() or self.__narrator.get_christened_string() or self.__narrator.get_baptised_string()) - self.doc.write_text_citation( - self.__narrator.get_died_string() or - self.__narrator.get_buried_string()) + # Write Death and/or Burial text only if not probably alive + if not probably_alive(child, self.database): + self.doc.write_text_citation( + self.__narrator.get_died_string() or + self.__narrator.get_buried_string()) # if the list_children_spouses option is selected: if self.list_children_spouses: # get the family of the child that contains the spouse @@ -767,13 +772,15 @@ class DetAncestorReport(Report): if text: self.doc.write_text_citation(text) - text = self.__narrator.get_died_string(self.calcageflag) - if text: - self.doc.write_text_citation(text) + # Write Death and/or Burial text only if not probably alive + if not probably_alive(ind, self.database): + text = self.__narrator.get_died_string(self.calcageflag) + if text: + self.doc.write_text_citation(text) - text = self.__narrator.get_buried_string() - if text: - self.doc.write_text_citation(text) + text = self.__narrator.get_buried_string() + if text: + self.doc.write_text_citation(text) self.write_parents(ind) diff --git a/gramps/plugins/textreport/detdescendantreport.py b/gramps/plugins/textreport/detdescendantreport.py index ac36a488a..de644c843 100644 --- a/gramps/plugins/textreport/detdescendantreport.py +++ b/gramps/plugins/textreport/detdescendantreport.py @@ -50,6 +50,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext from gramps.gen.errors import ReportError from gramps.gen.lib import FamilyRelType, Person, NoteType +from gramps.gen.utils.alive import probably_alive from gramps.gen.plug.menu import (BooleanOption, NumberOption, PersonOption, EnumeratedListOption) from gramps.gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, @@ -725,9 +726,11 @@ class DetDescendantReport(Report): self.__narrator.get_born_string() or self.__narrator.get_christened_string() or self.__narrator.get_baptised_string()) - self.doc.write_text_citation( - self.__narrator.get_died_string() or - self.__narrator.get_buried_string()) + # Write Death and/or Burial text only if not probably alive + if not probably_alive(child, self.database): + self.doc.write_text_citation( + self.__narrator.get_died_string() or + self.__narrator.get_buried_string()) # if the list_children_spouses option is selected: if self.list_children_spouses: # get the family of the child that contains the spouse @@ -856,13 +859,15 @@ class DetDescendantReport(Report): if text: self.doc.write_text_citation(text) - text = self.__narrator.get_died_string(self.calcageflag) - if text: - self.doc.write_text_citation(text) + # Write Death and/or Burial text only if not probably alive + if not probably_alive(person, self.database): + text = self.__narrator.get_died_string(self.calcageflag) + if text: + self.doc.write_text_citation(text) - text = self.__narrator.get_buried_string() - if text: - self.doc.write_text_citation(text) + text = self.__narrator.get_buried_string() + if text: + self.doc.write_text_citation(text) if self.verbose: self.__write_parents(person)