Skip to content

Commit

Permalink
Fixed text in books
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelhorne committed Nov 12, 2023
1 parent 62cec2a commit b88abf3
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions gedcom
Original file line number Diff line number Diff line change
Expand Up @@ -3034,6 +3034,16 @@ sub print_person
$same_occupation_as_father = $occupations[0];
@occupations = ();
} else {
if((!$aob) && (!$aod) && ($mother || $father)) {
if($phrase->length()) {
push @phrases, $phrase;
}
if(scalar(@phrases)) {
$bio->append(conjunction(map { $_->as_string() } @phrases))->append('. ');
$phrase = Data::Text->new();
@phrases = ();
}
}
my $article;
if($occupations[0] =~ /^[aeiou]/i) {
$article = 'an';
Expand All @@ -3042,7 +3052,8 @@ sub print_person
}

if(scalar(@phrases) == 0) {
$phrase->set("$firstname ");
$phrase->set("$noun ");
$noun = $pronoun;
if(is_alive(person => $person)) {
$phrase->append('is ');
} else {
Expand All @@ -3061,7 +3072,7 @@ sub print_person
}
}

if(($dateofbaptism || $placeofbaptism) && !($mother || $father) && $relationship) {
if(($dateofbaptism || $placeofbaptism) && !($mother || $father)) {
complain({ person => $person, warning => 'Baptism information not used to determine a parent' });
}

Expand Down Expand Up @@ -3119,9 +3130,9 @@ sub print_person
}

if(scalar(@phrases) == 0) {
$phrase->set($pronoun);
$phrase->set("$pronoun ");
}
$phrase->append(i18n({ person => $person, format => ' was born' }));
$phrase->append(i18n({ person => $person, format => 'was born' }));
$phrase->append($birth_place) if($birth_place);

if($dateofbirth) {
Expand Down

0 comments on commit b88abf3

Please sign in to comment.