len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 05:02:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "genlang: Explicitly decompose all display strings"

Browse source 
This reverts commit 4bc336b8be.

Reason for revert:  Font coverage for decomposed diacritics is actually *worse* than using fully composed characters.

Change-Id: Ide37dadd5e9883c1c764ffa35f7e64a7ba91d705
This commit is contained in:
Solomon Peachy 2025-10-22 09:28:35 -04:00 • committed by Gerrit Rockbox
parent 4bc336b8be
commit af7f45bac0
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/genlang
View file

@ -9,9 +9,6 @@
# #
# Copyright (C) 2006 - 2008 by Daniel Stenberg # Copyright (C) 2006 - 2008 by Daniel Stenberg
# #
use utf8;
use Unicode::Normalize;
use Encode qw( encode_utf8 );
# See apps/language.c (TODO: Use common include for both) # See apps/language.c (TODO: Use common include for both)
# Cookie and binary version for the binary lang file # Cookie and binary version for the binary lang file
@ -325,8 +322,6 @@ for (keys %users) {
# #
open(LANG, "<$input") || die "Error: couldn't read language file named $input\n"; open(LANG, "<$input") || die "Error: couldn't read language file named $input\n";
binmode(LANG, ":utf8");
my @phrase; my @phrase;
my $langoptions = 0; my $langoptions = 0;
@ -615,7 +610,7 @@ elsif($binary || $binvoice) {
$langoptions); # magic lang file header $langoptions); # magic lang file header
} }
if($binvoice) { if($binvoice) {
open(OUTV, ">$binvoice") or die "Error: Can't create $binvoice"; open(OUTV, ">$binvoice") or die "Error: Can't create $binary";
binmode OUTV; binmode OUTV;
printf OUTV ("%c%c%c%c", $VOICE_COOKIE, $LANGUAGE_VERSION, $target_id, printf OUTV ("%c%c%c%c", $VOICE_COOKIE, $LANGUAGE_VERSION, $target_id,
$langoptions); # magic lang file header $langoptions); # magic lang file header
@ -651,19 +646,17 @@ elsif($binary || $binvoice) {
if($dest && $n < 0x8000 && $binary) { if($dest && $n < 0x8000 && $binary) {
$dest =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes $dest =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes
$dest = encode_utf8(NFD($dest)); # Decompose
# Now, make sure we get the number from the english sort order: # Now, make sure we get the number from the english sort order:
$idnum = $idmap[$_]{$name}; $idnum = $idmap[$_]{$name};
printf OUTF ("%c%c%s\x00", (($idnum>>8)&0xff), ($idnum&0xff), $dest); printf OUTF ("%c%c%s\x00", ($idnum>>8), ($idnum&0xff), $dest);
} }
if($voice && $binvoice) { if($voice && $binvoice) {
$voice =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes $voice =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes
$voice = encode_utf8($voice);
# Now, make sure we get the number from the english sort order: # Now, make sure we get the number from the english sort order:
$idnum = $idmap[$_]{$name}; $idnum = $idmap[$_]{$name};
printf OUTV ("%c%c%s\x00", (($idnum>>8)&0xff), ($idnum&0xff), $voice); printf OUTV ("%c%c%s\x00", ($idnum>>8), ($idnum&0xff), $voice);
} }
} }
} }