Git commit bba40b05710c323bbd589c3d74ecc7e009310996 by Jaroslaw Staniek. Committed on 10/09/2018 at 20:22. Pushed by staniek into branch 'master'. Restore transliteration for German characters with umlauts GIT_SILENT Need because I used too old unidecode without this: https://github.com/avian2/unidecode/commit/b327a25be091761aab2b9e1c851d24d3= 1069360d M +3 -0 autotests/tools/IdentifierTest.cpp M +6 -6 src/tools/transliteration/transliteration_table.cpp https://commits.kde.org/kdb/bba40b05710c323bbd589c3d74ecc7e009310996 diff --git a/autotests/tools/IdentifierTest.cpp b/autotests/tools/Identifie= rTest.cpp index 0f65a8af..90632500 100644 --- a/autotests/tools/IdentifierTest.cpp +++ b/autotests/tools/IdentifierTest.cpp @@ -42,6 +42,9 @@ void IdentifierTest::testStringToIdentifier_data() QTest::newRow("Upper case") << "a A b2" << "a_A_b2"; QTest::newRow("non-alpha") << "1" << "_1"; QTest::newRow("non-latin1") << QString::fromUtf8("=C3=91=C2=A9=C3=86 = =E1=91=AB=E1=8A=82") << "NcAE_kexi"; + QTest::newRow("umlauts") + << QString::fromUtf8("Falsches =C3=9Cben von Xylophonmusik qu= =C3=A4lt jeden gr=C3=B6=C3=9Feren Zwerg") + << "Falsches_Ueben_von_Xylophonmusik_quaelt_jeden_groesseren_Z= werg"; } = void IdentifierTest::testStringToIdentifier() diff --git a/src/tools/transliteration/transliteration_table.cpp b/src/tool= s/transliteration/transliteration_table.cpp index 166b7e13..d03bdc6a 100644 --- a/src/tools/transliteration/transliteration_table.cpp +++ b/src/tools/transliteration/transliteration_table.cpp @@ -29,14 +29,14 @@ const char *const transliteration_table[TRANSLITERATION= _TABLE_SIZE + 1] =3D { /*00a8*/N/*=C2=A8*/,"c"/*=C2=A9*/,"a"/*=C2=AA*/,N/*=C2=AB*/,N/*=C2=AC*/,N/= *=C2=AD*/,"r"/*=C2=AE*/,N/*=C2=AF*/, /*00b0*/"deg"/*=C2=B0*/,N/*=C2=B1*/,"2"/*=C2=B2*/,"3"/*=C2=B3*/,N/*=C2=B4*= /,"u"/*=C2=B5*/,"P"/*=C2=B6*/,N/*=C2=B7*/, /*00b8*/N/*=C2=B8*/,"1"/*=C2=B9*/,"o"/*=C2=BA*/,N/*=C2=BB*/,"14"/*=C2=BC*/= ,"12"/*=C2=BD*/,"34"/*=C2=BE*/,N/*=C2=BF*/, -/*00c0*/"A"/*=C3=80*/,"A"/*=C3=81*/,"A"/*=C3=82*/,"A"/*=C3=83*/,"A"/*=C3= =84*/,"A"/*=C3=85*/,"AE"/*=C3=86*/,"C"/*=C3=87*/, +/*00c0*/"A"/*=C3=80*/,"A"/*=C3=81*/,"A"/*=C3=82*/,"A"/*=C3=83*/,"Ae"/*=C3= =84*/,"A"/*=C3=85*/,"AE"/*=C3=86*/,"C"/*=C3=87*/, /*00c8*/"E"/*=C3=88*/,"E"/*=C3=89*/,"E"/*=C3=8A*/,"E"/*=C3=8B*/,"I"/*=C3= =8C*/,"I"/*=C3=8D*/,"I"/*=C3=8E*/,"I"/*=C3=8F*/, -/*00d0*/"D"/*=C3=90*/,"N"/*=C3=91*/,"O"/*=C3=92*/,"O"/*=C3=93*/,"O"/*=C3= =94*/,"O"/*=C3=95*/,"O"/*=C3=96*/,"x"/*=C3=97*/, -/*00d8*/"O"/*=C3=98*/,"U"/*=C3=99*/,"U"/*=C3=9A*/,"U"/*=C3=9B*/,"U"/*=C3= =9C*/,"Y"/*=C3=9D*/,"Th"/*=C3=9E*/,"ss"/*=C3=9F*/, -/*00e0*/"a"/*=C3=A0*/,"a"/*=C3=A1*/,"a"/*=C3=A2*/,"a"/*=C3=A3*/,"a"/*=C3= =A4*/,"a"/*=C3=A5*/,"ae"/*=C3=A6*/,"c"/*=C3=A7*/, +/*00d0*/"D"/*=C3=90*/,"N"/*=C3=91*/,"O"/*=C3=92*/,"O"/*=C3=93*/,"O"/*=C3= =94*/,"O"/*=C3=95*/,"Oe"/*=C3=96*/,"x"/*=C3=97*/, +/*00d8*/"O"/*=C3=98*/,"U"/*=C3=99*/,"U"/*=C3=9A*/,"U"/*=C3=9B*/,"Ue"/*=C3= =9C*/,"Y"/*=C3=9D*/,"Th"/*=C3=9E*/,"ss"/*=C3=9F*/, +/*00e0*/"a"/*=C3=A0*/,"a"/*=C3=A1*/,"a"/*=C3=A2*/,"a"/*=C3=A3*/,"ae"/*=C3= =A4*/,"a"/*=C3=A5*/,"ae"/*=C3=A6*/,"c"/*=C3=A7*/, /*00e8*/"e"/*=C3=A8*/,"e"/*=C3=A9*/,"e"/*=C3=AA*/,"e"/*=C3=AB*/,"i"/*=C3= =AC*/,"i"/*=C3=AD*/,"i"/*=C3=AE*/,"i"/*=C3=AF*/, -/*00f0*/"d"/*=C3=B0*/,"n"/*=C3=B1*/,"o"/*=C3=B2*/,"o"/*=C3=B3*/,"o"/*=C3= =B4*/,"o"/*=C3=B5*/,"o"/*=C3=B6*/,N/*=C3=B7*/, -/*00f8*/"o"/*=C3=B8*/,"u"/*=C3=B9*/,"u"/*=C3=BA*/,"u"/*=C3=BB*/,"u"/*=C3= =BC*/,"y"/*=C3=BD*/,"th"/*=C3=BE*/,"y"/*=C3=BF*/, +/*00f0*/"d"/*=C3=B0*/,"n"/*=C3=B1*/,"o"/*=C3=B2*/,"o"/*=C3=B3*/,"o"/*=C3= =B4*/,"o"/*=C3=B5*/,"oe"/*=C3=B6*/,N/*=C3=B7*/, +/*00f8*/"o"/*=C3=B8*/,"u"/*=C3=B9*/,"u"/*=C3=BA*/,"u"/*=C3=BB*/,"ue"/*=C3= =BC*/,"y"/*=C3=BD*/,"th"/*=C3=BE*/,"y"/*=C3=BF*/, /*0100*/"A"/*=C4=80*/,"a"/*=C4=81*/,"A"/*=C4=82*/,"a"/*=C4=83*/,"A"/*=C4= =84*/,"a"/*=C4=85*/,"C"/*=C4=86*/,"c"/*=C4=87*/, /*0108*/"C"/*=C4=88*/,"c"/*=C4=89*/,"C"/*=C4=8A*/,"c"/*=C4=8B*/,"C"/*=C4= =8C*/,"c"/*=C4=8D*/,"D"/*=C4=8E*/,"d"/*=C4=8F*/, /*0110*/"D"/*=C4=90*/,"d"/*=C4=91*/,"E"/*=C4=92*/,"e"/*=C4=93*/,"E"/*=C4= =94*/,"e"/*=C4=95*/,"E"/*=C4=96*/,"e"/*=C4=97*/,