Skip to content

Commit

Permalink
Handle ª
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelhorne committed Jul 18, 2024
1 parent 518e5fb commit 04a8baa
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions ged2site
Original file line number Diff line number Diff line change
Expand Up @@ -3681,10 +3681,14 @@ sub print_person
} else {
$bio .= '.';
$end_of_sentence = 1;
push @phrases, $phrase;
$bio_dt->append(conjunction(map { $_->as_string() } @phrases))->append('.');
$phrase = Data::Text->new();
@phrases = ();
if($phrase->length()) {
push @phrases, $phrase;
$phrase = Data::Text->new();
}
if(scalar(@phrases)) {
$bio_dt->append(conjunction(map { $_->as_string() } @phrases))->append('.');
@phrases = ();
}
}
} elsif($dateofbaptism || $placeofbaptism) {
die; # I don't this code can be reached
Expand Down Expand Up @@ -10860,7 +10864,7 @@ sub place {
$address = undef;
}

$place =~ s/\.$//;
$place =~ s/[\.,]+$//; # remove trailing full stops and commas
$place =~ s/\s\s+/ /;

return if(lc($place) eq 'unknown');
Expand Down Expand Up @@ -14307,6 +14311,7 @@ sub wide_to_html

$string =~ s/\xc2\xa3/£/g;
$string =~ s/\xc2\xa9/©/g;
$string =~ s/\xc2\xaa/ª/g; # ª
$string =~ s/\xc2\xab/"/g; # «
$string =~ s/\xc2\xae/®/g;
$string =~ s/\xc2\xbb/"/g; # »
Expand Down Expand Up @@ -14351,6 +14356,7 @@ sub wide_to_html
$string =~ s/\N{U+00A0}/ /g;
$string =~ s/\N{U+00A3}/£/g,
$string =~ s/\N{U+00A9}/©/g;
$string =~ s/\N{U+00AA}/ª/g, # ª
$string =~ s/\N{U+00AB}/"/g; # «
$string =~ s/\N{U+00AE}/®/g;
$string =~ s/\N{U+00BB}/"/g; # »
Expand Down Expand Up @@ -14438,6 +14444,7 @@ sub wide_to_html

$string =~ s/Á/Á/g;
$string =~ s/å/å/g;
$string =~ s/ª/ª/g;
$string =~ s/š/š/g;
$string =~ s/Š/Š/g;
$string =~ s/č/č/g;
Expand Down Expand Up @@ -14579,6 +14586,7 @@ sub wide_to_xml
$string =~ s/š/š/g;
$string =~ s/û/ô/g;
$string =~ s/ö/ö/g;
$string =~ s/ª/&#0x0AA;/g; # ª
$string =~ s/ø/ø/g; # ø
$string =~ s/ž/ž/g;
$string =~ s/Š/Š/g;
Expand All @@ -14601,6 +14609,7 @@ sub wide_to_xml

$string =~ s/\xc2\xa3/£/g; # £
$string =~ s/\xc2\xa9/©/g;
$string =~ s/\xc2\xaa/ª/g; # ª
$string =~ s/\xc2\xab/"/g; # «
$string =~ s/\xc2\xae/®/g;
$string =~ s/\xc3\x81/Á/g; # Á
Expand Down Expand Up @@ -14719,6 +14728,7 @@ sub wide_to_xml

$string =~ s/['\x98]/'/g;
$string =~ s/©/©/g;
$string =~ s/ª/&#0xAA;/g;
$string =~ s/®/®/g;
$string =~ s/å/å/g;
$string =~ s/š/š/g;
Expand Down

0 comments on commit 04a8baa

Please sign in to comment.