From 60195424a5ba74e3341518f46201a37c598f9a7e Mon Sep 17 00:00:00 2001 From: martin-s Date: Wed, 24 Aug 2011 16:19:06 +0000 Subject: [PATCH] Add:Core:Mode replacements for special chars, fixes #917|Thanks mvglasgow git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4706 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/linguistics.c | 160 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 149 insertions(+), 11 deletions(-) diff --git a/navit/navit/linguistics.c b/navit/navit/linguistics.c index 2b17c57..2ceedeb 100644 --- a/navit/navit/linguistics.c +++ b/navit/navit/linguistics.c @@ -8,36 +8,52 @@ static const char *special[][3]={ /* Capital Diacritics */ /* ¨ Diaresis */ {"Ä","A","AE"}, +{"Ë","E"}, +{"Ï","I"}, {"Ö","O","OE"}, {"Ü","U","UE"}, +{"Ÿ","Y"}, /* ˝ Double Acute Accent */ -{"Ő","O"}, -{"Ű","U"}, +{"Ő","O","Ö"}, +{"Ű","U","Ü"}, /* ´ Acute Accent */ {"Á","A"}, {"Ć","C"}, {"É","E"}, {"Í","I"}, +{"Ĺ","L"}, {"Ń","N"}, {"Ó","O"}, +{"Ŕ","R"}, {"Ś","S"}, {"Ú","U"}, {"Ý","Y"}, {"Ź","Z"}, -/* ˛ Ogonek */ +/* ˛ Ogonek (nosinė) */ {"Ą","A"}, {"Ę","E"}, +{"Į","I"}, +{"Ų","U"}, /* ˙ Dot */ +{"Ċ","C"}, +{"Ė","E"}, +{"Ġ","G"}, +{"İ","I"}, +{"Ŀ","L"}, {"Ż","Z"}, /* – Stroke */ +{"Đ","D","DJ"}, /* Croatian Dj, not to be confused with the similar-looking Icelandic Eth */ +{"Ħ","H"}, {"Ł","L"}, +{"Ŧ","T"}, /* ˚ Ring */ {"Å","A","AA"}, {"Ů","U"}, -/* ˇ Caron */ +/* ˇ Caron (haček, paukščiukas) */ {"Č","C"}, {"Ď","D"}, {"Ě","E"}, +{"Ľ","L"}, {"Ň","N"}, {"Ř","R"}, {"Š","S"}, @@ -45,51 +61,173 @@ static const char *special[][3]={ {"Ž","Z"}, /* / Slash */ {"Ø","O","OE"}, +/* ¯ Macron */ +{"Ā","A","AA"}, +{"Ē","E","EE"}, +{"Ī","I","II"}, +{"Ō","O","OO"}, +{"Ū","U","UU"}, +/* ˘ Brevis */ +{"Ă","A"}, +{"Ĕ","E"}, +{"Ğ","G"}, +{"Ĭ","I"}, +{"Ŏ","O"}, +{"Ŭ","U"}, +/* ^ Circumflex */ +{"Â","A"}, +{"Ĉ","C"}, +{"Ê","E"}, +{"Ĝ","G"}, +{"Ĥ","H"}, +{"Î","I"}, +{"Ĵ","J"}, +{"Ô","O"}, +{"Ŝ","S"}, +{"Û","U"}, +{"Ŵ","W"}, +{"Ŷ","Y"}, +/* ¸ Cedilla */ +{"Ç","C"}, +{"Ģ","G","GJ"}, +{"Ķ","K","KJ"}, +{"Ļ","L","LJ"}, +{"Ņ","N","NJ"}, +{"Ŗ","R"}, +{"Ş","S"}, +{"Ţ","T"}, +/* ~ Tilde */ +{"Ã","A"}, +{"Ĩ","I"}, +{"Ñ","N"}, +{"Õ","O"}, +{"Ũ","U"}, +/* ` Grave */ +{"À","A"}, +{"È","E"}, +{"Ì","I"}, +{"Ò","O"}, +{"Ù","U"}, /* ligatures */ {"Æ","A","AE"}, +{"IJ","IJ"}, +{"Œ","O","OE"}, +/* special letters */ +{"Ð","D","DH"}, /* Icelandic Eth, not to be confused with the similar-looking Croatian Dj */ +{"Ŋ","N","NG"}, +{"Þ","T","TH"}, /* Small Diacritics */ /* ¨ Diaresis */ {"ä","a","ae"}, +{"ë","e"}, +{"ï","i"}, {"ö","o","oe"}, {"ü","u","ue"}, +{"ÿ","y"}, /* ˝ Double Acute Accent */ -{"ő","o"}, -{"ű","u"}, +{"ő","o","ö"}, +{"ű","u","ü"}, /* ´ Acute Accent */ {"á","a"}, {"ć","c"}, {"é","e"}, {"í","i"}, +{"ĺ","l"}, {"ń","n"}, {"ó","o"}, +{"ŕ","r"}, {"ś","s"}, {"ú","u"}, {"ý","y"}, {"ź","z"}, -/* ˛ Ogonek */ +/* ˛ Ogonek (nosinė) */ {"ą","a"}, {"ę","e"}, -/* ˙ Dot */ +{"į","i"}, +{"ų","u"}, +/* ˙ Dot (and dotless i) */ +{"ċ","c"}, +{"ė","e"}, +{"ġ","g"}, +{"ı","i"}, +{"ŀ","l"}, {"ż","z"}, /* – Stroke */ +{"đ","d","dj"}, +{"ħ","h"}, {"ł","l"}, +{"ŧ","t"}, /* ˚ Ring */ -{"ů","u"}, {"å","a", "aa"}, -/* ˇ Caron */ +{"ů","u"}, +/* ˇ Caron (haček, paukščiukas) */ {"č","c"}, {"ď","d"}, {"ě","e"}, -{"Ň","N"}, +{"ľ","l"}, +{"ň","n"}, {"ř","r"}, {"š","s"}, {"ť","t"}, {"ž","z"}, /* / Slash */ {"ø","o", "oe"}, +/* Macron */ +{"ā","a","aa"}, +{"ē","e","ee"}, +{"ī","i","ii"}, +{"ō","o","oo"}, +{"ū","u","uu"}, +/* ˘ Brevis */ +{"ă","a"}, +{"ĕ","e"}, +{"ğ","g"}, +{"ĭ","i"}, +{"ŏ","o"}, +{"ŭ","u"}, +/* ^ Circumflex */ +{"â","a"}, +{"ĉ","c"}, +{"ê","e"}, +{"ĝ","g"}, +{"ĥ","h"}, +{"î","i"}, +{"ĵ","j"}, +{"ô","o"}, +{"ŝ","s"}, +{"û","u"}, +{"ŵ","w"}, +{"ŷ","y"}, +/* ¸ Cedilla */ +{"ç","c"}, +{"ģ","g","gj"}, +{"ķ","k","kj"}, +{"ļ","l","lj"}, +{"ņ","n","nj"}, +{"ŗ","r"}, +{"ş","s"}, +{"ţ","t"}, +/* ~ Tilde */ +{"ã","a"}, +{"ĩ","i"}, +{"õ","o"}, +{"ñ","n"}, +{"ũ","u"}, +/* ` Grave */ +{"à","a"}, +{"è","e"}, +{"ì","i"}, +{"ò","o"}, +{"ù","u"}, /* ligatures */ {"æ","a","ae"}, +{"ij","ij"}, +{"œ","o","oe"}, {"ß","s","ss"}, +/* special letters */ +{"ð","d","dh"}, +{"ŋ","n","ng"}, +{"þ","t","th"}, }; char * -- 2.7.4