Skip to content

Commit

Permalink
Handle more non-ascii characters
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelhorne committed Oct 1, 2024
1 parent 86163e7 commit 511361d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions gedcom
Original file line number Diff line number Diff line change
Expand Up @@ -4845,7 +4845,7 @@ sub print_person
}

if(($count == 0) || !places_are_the_same({ person => $person, first => $residence, second => $residencelist[$count - 1] })) {
if($birth && $dateofbirth && $rdate && (datecmp($rdate, $dateofbirth) == 0) &&
if($birth && $dateofbirth && $rdate && ($rdate !~ /^\d{3,4}$/) && (datecmp($rdate, $dateofbirth) == 0) &&
places_are_the_same({ person => $person, first => $birth, second => $residence})) {
# This residence record is for the place of birth, which is
# printed elsewhere
Expand Down Expand Up @@ -13325,7 +13325,7 @@ sub wide_to_html
$string =~ s/\xc3\x81/Á/g; # Á
$string =~ s/\xc3\x83/Î/g; # Î
$string =~ s/\xc3\x9e/Þ/g; # Þ
$string =~ s/\xc3\xa1/á/g;
$string =~ s/\xc3\xa1/á/g; # á
$string =~ s/\xc3\xa2/â/g;
$string =~ s/\xc3\xa4/ä/g;
$string =~ s/\xc3\xa9/é/g;
Expand Down Expand Up @@ -13377,7 +13377,7 @@ sub wide_to_html
$string =~ s/\N{U+00C9}/É/g;
$string =~ s/\N{U+00D6}/Ö/g; # Ö
$string =~ s/\N{U+00DF}/ß/g; # ß
$string =~ s/\N{U+00E1}/á;/g;
$string =~ s/\N{U+00E1}/á/g; # á
$string =~ s/\N{U+00E2}/â/g;
$string =~ s/\N{U+00E4}/ä/g;
$string =~ s/\N{U+00E5}/å/g; # å
Expand All @@ -13388,6 +13388,7 @@ sub wide_to_html
$string =~ s/\N{U+00EE}/î/g;
$string =~ s/\N{U+00EF}/ï/g; # ï
$string =~ s/\N{U+00F0}/ð/g; # ð
$string =~ s/\N{U+00F1}/ñ/g; # ñ
$string =~ s/\N{U+00F4}/ô/g; # ô
$string =~ s/\N{U+00F6}/ö/g;
$string =~ s/\N{U+00F8}/ø/g; # ø
Expand Down Expand Up @@ -13748,7 +13749,7 @@ sub dbpedia
}
}
}
warn ">>>>>>>>>> dbpedia allowig possibility $uri" if($opts{'w'});
warn ">>>>>>>>>> dbpedia allowing possibility $uri" if($opts{'w'});
}
}
$Data::Dumper::Maxdepth = 0;
Expand Down

0 comments on commit 511361d

Please sign in to comment.