A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd

Revert "genlang: Explicitly decompose all display strings"

This reverts commit 4bc336b8be4d70123b3af1e2e29f649a219e3045.

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

Change-Id: Ide37dadd5e9883c1c764ffa35f7e64a7ba91d705

authored by

Solomon Peachy and committed by
Gerrit Rockbox
af7f45ba 4bc336b8

+3 -10
+3 -10
tools/genlang
··· 9 9 # 10 10 # Copyright (C) 2006 - 2008 by Daniel Stenberg 11 11 # 12 - use utf8; 13 - use Unicode::Normalize; 14 - use Encode qw( encode_utf8 ); 15 12 16 13 # See apps/language.c (TODO: Use common include for both) 17 14 # Cookie and binary version for the binary lang file ··· 325 322 # 326 323 327 324 open(LANG, "<$input") || die "Error: couldn't read language file named $input\n"; 328 - binmode(LANG, ":utf8"); 329 - 330 325 my @phrase; 331 326 my $langoptions = 0; 332 327 ··· 615 610 $langoptions); # magic lang file header 616 611 } 617 612 if($binvoice) { 618 - open(OUTV, ">$binvoice") or die "Error: Can't create $binvoice"; 613 + open(OUTV, ">$binvoice") or die "Error: Can't create $binary"; 619 614 binmode OUTV; 620 615 printf OUTV ("%c%c%c%c", $VOICE_COOKIE, $LANGUAGE_VERSION, $target_id, 621 616 $langoptions); # magic lang file header ··· 651 646 652 647 if($dest && $n < 0x8000 && $binary) { 653 648 $dest =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes 654 - $dest = encode_utf8(NFD($dest)); # Decompose 655 649 656 650 # Now, make sure we get the number from the english sort order: 657 651 $idnum = $idmap[$_]{$name}; 658 652 659 - printf OUTF ("%c%c%s\x00", (($idnum>>8)&0xff), ($idnum&0xff), $dest); 653 + printf OUTF ("%c%c%s\x00", ($idnum>>8), ($idnum&0xff), $dest); 660 654 } 661 655 if($voice && $binvoice) { 662 656 $voice =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes 663 - $voice = encode_utf8($voice); 664 657 # Now, make sure we get the number from the english sort order: 665 658 $idnum = $idmap[$_]{$name}; 666 - printf OUTV ("%c%c%s\x00", (($idnum>>8)&0xff), ($idnum&0xff), $voice); 659 + printf OUTV ("%c%c%s\x00", ($idnum>>8), ($idnum&0xff), $voice); 667 660 } 668 661 } 669 662 }