2 files changed, 258 insertions, 258 deletions
diff --git a/configure.ac b/configure.ac
index 722f0b1..d437b0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ dnl Set up debug compile args if the user requested it
 dnl ===========================
 AS_IF([test "x$with_debug" == "xyes"],
       [AC_MSG_WARN([*** Building with debug support!])
-	     CXXFLAGS="$CXXFLAGS -Wall -Werror -Wno-invalid-source-encoding -g $NO_UNDEFINED_PARAM"
+	     CXXFLAGS="$CXXFLAGS -Wall -Werror -g $NO_UNDEFINED_PARAM"
 	     HUGIN_PARM=""]
 )
 
diff --git a/plugingui/utf8.cc b/plugingui/utf8.cc
index a14fd43..b11addf 100644
--- a/plugingui/utf8.cc
+++ b/plugingui/utf8.cc
@@ -29,266 +29,266 @@
 UTF8::UTF8()
 {
 	// Encode Map
-	map_encode["\x80"] = "Т\x80";
-	map_encode["\x81"] = "Т\x81";
-	map_encode["\x82"] = "Т\x82";
-	map_encode["\x83"] = "Т\x83";
-	map_encode["\x84"] = "Т\x84";
-	map_encode["\x85"] = "Т\x85";
-	map_encode["\x86"] = "Т\x86";
-	map_encode["\x87"] = "Т\x87";
-	map_encode["\x88"] = "Т\x88";
-	map_encode["\x89"] = "Т\x89";
-	map_encode["\x8a"] = "Т\x8a";
-	map_encode["\x8b"] = "Т\x8b";
-	map_encode["\x8c"] = "Т\x8c";
-	map_encode["\x8d"] = "Т\x8d";
-	map_encode["\x8e"] = "Т\x8e";
-	map_encode["\x8f"] = "Т\x8f";
-	map_encode["\x90"] = "Т\x90";
-	map_encode["\x91"] = "Т\x91";
-	map_encode["\x92"] = "Т\x92";
-	map_encode["\x93"] = "Т\x93";
-	map_encode["\x94"] = "Т\x94";
-	map_encode["\x95"] = "Т\x95";
-	map_encode["\x96"] = "Т\x96";
-	map_encode["\x97"] = "Т\x97";
-	map_encode["\x98"] = "Т\x98";
-	map_encode["\x99"] = "Т\x99";
-	map_encode["\x9a"] = "Т\x9a";
-	map_encode["\x9b"] = "Т\x9b";
-	map_encode["\x9c"] = "Т\x9c";
-	map_encode["\x9d"] = "Т\x9d";
-	map_encode["\x9e"] = "Т\x9e";
-	map_encode["\x9f"] = "Т\x9f";
-	map_encode[" "] = "Т ";
-	map_encode["Ё"] = "ТЁ";
-	map_encode["Ђ"] = "ТЂ";
-	map_encode["Ѓ"] = "ТЃ";
-	map_encode["Є"] = "ТЄ";
-	map_encode["Ѕ"] = "ТЅ";
-	map_encode["І"] = "ТІ";
-	map_encode["Ї"] = "ТЇ";
-	map_encode["Ј"] = "ТЈ";
-	map_encode["Љ"] = "ТЉ";
-	map_encode["Њ"] = "ТЊ";
-	map_encode["Ћ"] = "ТЋ";
-	map_encode["Ќ"] = "ТЌ";
-	map_encode[""] = "Т";
-	map_encode["Ў"] = "ТЎ";
-	map_encode["Џ"] = "ТЏ";
-	map_encode["А"] = "ТА";
-	map_encode["Б"] = "ТБ";
-	map_encode["В"] = "ТВ";
-	map_encode["Г"] = "ТГ";
-	map_encode["Д"] = "ТД";
-	map_encode["Е"] = "ТЕ";
-	map_encode["Ж"] = "ТЖ";
-	map_encode["З"] = "ТЗ";
-	map_encode["И"] = "ТИ";
-	map_encode["Й"] = "ТЙ";
-	map_encode["К"] = "ТК";
-	map_encode["Л"] = "ТЛ";
-	map_encode["М"] = "ТМ";
-	map_encode["Н"] = "ТН";
-	map_encode["О"] = "ТО";
-	map_encode["П"] = "ТП";
-	map_encode["Р"] = "У\x80";
-	map_encode["С"] = "У\x81";
-	map_encode["Т"] = "У\x82";
-	map_encode["У"] = "У\x83";
-	map_encode["Ф"] = "У\x84";
-	map_encode["Х"] = "У\x85";
-	map_encode["Ц"] = "У\x86";
-	map_encode["Ч"] = "У\x87";
-	map_encode["Ш"] = "У\x88";
-	map_encode["Щ"] = "У\x89";
-	map_encode["Ъ"] = "У\x8a";
-	map_encode["Ы"] = "У\x8b";
-	map_encode["Ь"] = "У\x8c";
-	map_encode["Э"] = "У\x8d";
-	map_encode["Ю"] = "У\x8e";
-	map_encode["Я"] = "У\x8f";
-	map_encode["а"] = "У\x90";
-	map_encode["б"] = "У\x91";
-	map_encode["в"] = "У\x92";
-	map_encode["г"] = "У\x93";
-	map_encode["д"] = "У\x94";
-	map_encode["е"] = "У\x95";
-	map_encode["ж"] = "У\x96";
-	map_encode["з"] = "У\x97";
-	map_encode["и"] = "У\x98";
-	map_encode["й"] = "У\x99";
-	map_encode["к"] = "У\x9a";
-	map_encode["л"] = "У\x9b";
-	map_encode["м"] = "У\x9c";
-	map_encode["н"] = "У\x9d";
-	map_encode["о"] = "У\x9e";
-	map_encode["п"] = "У\x9f";
-	map_encode["р"] = "У ";
-	map_encode["с"] = "УЁ";
-	map_encode["т"] = "УЂ";
-	map_encode["у"] = "УЃ";
-	map_encode["ф"] = "УЄ";
-	map_encode["х"] = "УЅ";
-	map_encode["ц"] = "УІ";
-	map_encode["ч"] = "УЇ";
-	map_encode["ш"] = "УЈ";
-	map_encode["щ"] = "УЉ";
-	map_encode["ъ"] = "УЊ";
-	map_encode["ы"] = "УЋ";
-	map_encode["ь"] = "УЌ";
-	map_encode["э"] = "У";
-	map_encode["ю"] = "УЎ";
-	map_encode["я"] = "УЏ";
-	map_encode["№"] = "УА";
-	map_encode["ё"] = "УБ";
-	map_encode["ђ"] = "УВ";
-	map_encode["ѓ"] = "УГ";
-	map_encode["є"] = "УД";
-	map_encode["ѕ"] = "УЕ";
-	map_encode["і"] = "УЖ";
-	map_encode["ї"] = "УЗ";
-	map_encode["ј"] = "УИ";
-	map_encode["љ"] = "УЙ";
-	map_encode["њ"] = "УК";
-	map_encode["ћ"] = "УЛ";
-	map_encode["ќ"] = "УМ";
-	map_encode["§"] = "УН";
-	map_encode["ў"] = "УО";
-	map_encode["џ"] = "УП";
+	map_encode["\x80"] = "\xc2\x80";
+	map_encode["\x81"] = "\xc2\x81";
+	map_encode["\x82"] = "\xc2\x82";
+	map_encode["\x83"] = "\xc2\x83";
+	map_encode["\x84"] = "\xc2\x84";
+	map_encode["\x85"] = "\xc2\x85";
+	map_encode["\x86"] = "\xc2\x86";
+	map_encode["\x87"] = "\xc2\x87";
+	map_encode["\x88"] = "\xc2\x88";
+	map_encode["\x89"] = "\xc2\x89";
+	map_encode["\x8a"] = "\xc2\x8a";
+	map_encode["\x8b"] = "\xc2\x8b";
+	map_encode["\x8c"] = "\xc2\x8c";
+	map_encode["\x8d"] = "\xc2\x8d";
+	map_encode["\x8e"] = "\xc2\x8e";
+	map_encode["\x8f"] = "\xc2\x8f";
+	map_encode["\x90"] = "\xc2\x90";
+	map_encode["\x91"] = "\xc2\x91";
+	map_encode["\x92"] = "\xc2\x92";
+	map_encode["\x93"] = "\xc2\x93";
+	map_encode["\x94"] = "\xc2\x94";
+	map_encode["\x95"] = "\xc2\x95";
+	map_encode["\x96"] = "\xc2\x96";
+	map_encode["\x97"] = "\xc2\x97";
+	map_encode["\x98"] = "\xc2\x98";
+	map_encode["\x99"] = "\xc2\x99";
+	map_encode["\x9a"] = "\xc2\x9a";
+	map_encode["\x9b"] = "\xc2\x9b";
+	map_encode["\x9c"] = "\xc2\x9c";
+	map_encode["\x9d"] = "\xc2\x9d";
+	map_encode["\x9e"] = "\xc2\x9e";
+	map_encode["\x9f"] = "\xc2\x9f";
+	map_encode["\xa0"] = "\xc2\xa0";
+	map_encode["\xa1"] = "\xc2\xa1";
+	map_encode["\xa2"] = "\xc2\xa2";
+	map_encode["\xa3"] = "\xc2\xa3";
+	map_encode["\xa4"] = "\xc2\xa4";
+	map_encode["\xa5"] = "\xc2\xa5";
+	map_encode["\xa6"] = "\xc2\xa6";
+	map_encode["\xa7"] = "\xc2\xa7";
+	map_encode["\xa8"] = "\xc2\xa8";
+	map_encode["\xa9"] = "\xc2\xa9";
+	map_encode["\xaa"] = "\xc2\xaa";
+	map_encode["\xab"] = "\xc2\xab";
+	map_encode["\xac"] = "\xc2\xac";
+	map_encode["\xad"] = "\xc2\xad";
+	map_encode["\xae"] = "\xc2\xae";
+	map_encode["\xaf"] = "\xc2\xaf";
+	map_encode["\xb0"] = "\xc2\xb0";
+	map_encode["\xb1"] = "\xc2\xb1";
+	map_encode["\xb2"] = "\xc2\xb2";
+	map_encode["\xb3"] = "\xc2\xb3";
+	map_encode["\xb4"] = "\xc2\xb4";
+	map_encode["\xb5"] = "\xc2\xb5";
+	map_encode["\xb6"] = "\xc2\xb6";
+	map_encode["\xb7"] = "\xc2\xb7";
+	map_encode["\xb8"] = "\xc2\xb8";
+	map_encode["\xb9"] = "\xc2\xb9";
+	map_encode["\xba"] = "\xc2\xba";
+	map_encode["\xbb"] = "\xc2\xbb";
+	map_encode["\xbc"] = "\xc2\xbc";
+	map_encode["\xbd"] = "\xc2\xbd";
+	map_encode["\xbe"] = "\xc2\xbe";
+	map_encode["\xbf"] = "\xc2\xbf";
+	map_encode["\xc0"] = "\xc3\x80";
+	map_encode["\xc1"] = "\xc3\x81";
+	map_encode["\xc2"] = "\xc3\x82";
+	map_encode["\xc3"] = "\xc3\x83";
+	map_encode["\xc4"] = "\xc3\x84";
+	map_encode["\xc5"] = "\xc3\x85";
+	map_encode["\xc6"] = "\xc3\x86";
+	map_encode["\xc7"] = "\xc3\x87";
+	map_encode["\xc8"] = "\xc3\x88";
+	map_encode["\xc9"] = "\xc3\x89";
+	map_encode["\xca"] = "\xc3\x8a";
+	map_encode["\xcb"] = "\xc3\x8b";
+	map_encode["\xcc"] = "\xc3\x8c";
+	map_encode["\xcd"] = "\xc3\x8d";
+	map_encode["\xce"] = "\xc3\x8e";
+	map_encode["\xcf"] = "\xc3\x8f";
+	map_encode["\xd0"] = "\xc3\x90";
+	map_encode["\xd1"] = "\xc3\x91";
+	map_encode["\xd2"] = "\xc3\x92";
+	map_encode["\xd3"] = "\xc3\x93";
+	map_encode["\xd4"] = "\xc3\x94";
+	map_encode["\xd5"] = "\xc3\x95";
+	map_encode["\xd6"] = "\xc3\x96";
+	map_encode["\xd7"] = "\xc3\x97";
+	map_encode["\xd8"] = "\xc3\x98";
+	map_encode["\xd9"] = "\xc3\x99";
+	map_encode["\xda"] = "\xc3\x9a";
+	map_encode["\xdb"] = "\xc3\x9b";
+	map_encode["\xdc"] = "\xc3\x9c";
+	map_encode["\xdd"] = "\xc3\x9d";
+	map_encode["\xde"] = "\xc3\x9e";
+	map_encode["\xdf"] = "\xc3\x9f";
+	map_encode["\xe0"] = "\xc3\xa0";
+	map_encode["\xe1"] = "\xc3\xa1";
+	map_encode["\xe2"] = "\xc3\xa2";
+	map_encode["\xe3"] = "\xc3\xa3";
+	map_encode["\xe4"] = "\xc3\xa4";
+	map_encode["\xe5"] = "\xc3\xa5";
+	map_encode["\xe6"] = "\xc3\xa6";
+	map_encode["\xe7"] = "\xc3\xa7";
+	map_encode["\xe8"] = "\xc3\xa8";
+	map_encode["\xe9"] = "\xc3\xa9";
+	map_encode["\xea"] = "\xc3\xaa";
+	map_encode["\xeb"] = "\xc3\xab";
+	map_encode["\xec"] = "\xc3\xac";
+	map_encode["\xed"] = "\xc3\xad";
+	map_encode["\xee"] = "\xc3\xae";
+	map_encode["\xef"] = "\xc3\xaf";
+	map_encode["\xf0"] = "\xc3\xb0";
+	map_encode["\xf1"] = "\xc3\xb1";
+	map_encode["\xf2"] = "\xc3\xb2";
+	map_encode["\xf3"] = "\xc3\xb3";
+	map_encode["\xf4"] = "\xc3\xb4";
+	map_encode["\xf5"] = "\xc3\xb5";
+	map_encode["\xf6"] = "\xc3\xb6";
+	map_encode["\xf7"] = "\xc3\xb7";
+	map_encode["\xf8"] = "\xc3\xb8";
+	map_encode["\xf9"] = "\xc3\xb9";
+	map_encode["\xfa"] = "\xc3\xba";
+	map_encode["\xfb"] = "\xc3\xbb";
+	map_encode["\xfc"] = "\xc3\xbc";
+	map_encode["\xfd"] = "\xc3\xbd";
+	map_encode["\xfe"] = "\xc3\xbe";
+	map_encode["\xff"] = "\xc3\xbf";
 
 	// Decode Map
-	map_decode["Т\x80"] = "\x80";
-	map_decode["Т\x81"] = "\x81";
-	map_decode["Т\x82"] = "\x82";
-	map_decode["Т\x83"] = "\x83";
-	map_decode["Т\x84"] = "\x84";
-	map_decode["Т\x85"] = "\x85";
-	map_decode["Т\x86"] = "\x86";
-	map_decode["Т\x87"] = "\x87";
-	map_decode["Т\x88"] = "\x88";
-	map_decode["Т\x89"] = "\x89";
-	map_decode["Т\x8a"] = "\x8a";
-	map_decode["Т\x8b"] = "\x8b";
-	map_decode["Т\x8c"] = "\x8c";
-	map_decode["Т\x8d"] = "\x8d";
-	map_decode["Т\x8e"] = "\x8e";
-	map_decode["Т\x8f"] = "\x8f";
-	map_decode["Т\x90"] = "\x90";
-	map_decode["Т\x91"] = "\x91";
-	map_decode["Т\x92"] = "\x92";
-	map_decode["Т\x93"] = "\x93";
-	map_decode["Т\x94"] = "\x94";
-	map_decode["Т\x95"] = "\x95";
-	map_decode["Т\x96"] = "\x96";
-	map_decode["Т\x97"] = "\x97";
-	map_decode["Т\x98"] = "\x98";
-	map_decode["Т\x99"] = "\x99";
-	map_decode["Т\x9a"] = "\x9a";
-	map_decode["Т\x9b"] = "\x9b";
-	map_decode["Т\x9c"] = "\x9c";
-	map_decode["Т\x9d"] = "\x9d";
-	map_decode["Т\x9e"] = "\x9e";
-	map_decode["Т\x9f"] = "\x9f";
-	map_decode["Т "] = " ";
-	map_decode["ТЁ"] = "Ё";
-	map_decode["ТЂ"] = "Ђ";
-	map_decode["ТЃ"] = "Ѓ";
-	map_decode["ТЄ"] = "Є";
-	map_decode["ТЅ"] = "Ѕ";
-	map_decode["ТІ"] = "І";
-	map_decode["ТЇ"] = "Ї";
-	map_decode["ТЈ"] = "Ј";
-	map_decode["ТЉ"] = "Љ";
-	map_decode["ТЊ"] = "Њ";
-	map_decode["ТЋ"] = "Ћ";
-	map_decode["ТЌ"] = "Ќ";
-	map_decode["Т"] = "";
-	map_decode["ТЎ"] = "Ў";
-	map_decode["ТЏ"] = "Џ";
-	map_decode["ТА"] = "А";
-	map_decode["ТБ"] = "Б";
-	map_decode["ТВ"] = "В";
-	map_decode["ТГ"] = "Г";
-	map_decode["ТД"] = "Д";
-	map_decode["ТЕ"] = "Е";
-	map_decode["ТЖ"] = "Ж";
-	map_decode["ТЗ"] = "З";
-	map_decode["ТИ"] = "И";
-	map_decode["ТЙ"] = "Й";
-	map_decode["ТК"] = "К";
-	map_decode["ТЛ"] = "Л";
-	map_decode["ТМ"] = "М";
-	map_decode["ТН"] = "Н";
-	map_decode["ТО"] = "О";
-	map_decode["ТП"] = "П";
-	map_decode["У\x80"] = "Р";
-	map_decode["У\x81"] = "С";
-	map_decode["У\x82"] = "Т";
-	map_decode["У\x83"] = "У";
-	map_decode["У\x84"] = "Ф";
-	map_decode["У\x85"] = "Х";
-	map_decode["У\x86"] = "Ц";
-	map_decode["У\x87"] = "Ч";
-	map_decode["У\x88"] = "Ш";
-	map_decode["У\x89"] = "Щ";
-	map_decode["У\x8a"] = "Ъ";
-	map_decode["У\x8b"] = "Ы";
-	map_decode["У\x8c"] = "Ь";
-	map_decode["У\x8d"] = "Э";
-	map_decode["У\x8e"] = "Ю";
-	map_decode["У\x8f"] = "Я";
-	map_decode["У\x90"] = "а";
-	map_decode["У\x91"] = "б";
-	map_decode["У\x92"] = "в";
-	map_decode["У\x93"] = "г";
-	map_decode["У\x94"] = "д";
-	map_decode["У\x95"] = "е";
-	map_decode["У\x96"] = "ж";
-	map_decode["У\x97"] = "з";
-	map_decode["У\x98"] = "и";
-	map_decode["У\x99"] = "й";
-	map_decode["У\x9a"] = "к";
-	map_decode["У\x9b"] = "л";
-	map_decode["У\x9c"] = "м";
-	map_decode["У\x9d"] = "н";
-	map_decode["У\x9e"] = "о";
-	map_decode["У\x9f"] = "п";
-	map_decode["У "] = "р";
-	map_decode["УЁ"] = "с";
-	map_decode["УЂ"] = "т";
-	map_decode["УЃ"] = "у";
-	map_decode["УЄ"] = "ф";
-	map_decode["УЅ"] = "х";
-	map_decode["УІ"] = "ц";
-	map_decode["УЇ"] = "ч";
-	map_decode["УЈ"] = "ш";
-	map_decode["УЉ"] = "щ";
-	map_decode["УЊ"] = "ъ";
-	map_decode["УЋ"] = "ы";
-	map_decode["УЌ"] = "ь";
-	map_decode["У"] = "э";
-	map_decode["УЎ"] = "ю";
-	map_decode["УЏ"] = "я";
-	map_decode["УА"] = "№";
-	map_decode["УБ"] = "ё";
-	map_decode["УВ"] = "ђ";
-	map_decode["УГ"] = "ѓ";
-	map_decode["УД"] = "є";
-	map_decode["УЕ"] = "ѕ";
-	map_decode["УЖ"] = "і";
-	map_decode["УЗ"] = "ї";
-	map_decode["УИ"] = "ј";
-	map_decode["УЙ"] = "љ";
-	map_decode["УК"] = "њ";
-	map_decode["УЛ"] = "ћ";
-	map_decode["УМ"] = "ќ";
-	map_decode["УН"] = "§";
-	map_decode["УО"] = "ў";
-	map_decode["УП"] = "џ";
+	map_decode["\xc2\x80"] = "\x80";
+	map_decode["\xc2\x81"] = "\x81";
+	map_decode["\xc2\x82"] = "\x82";
+	map_decode["\xc2\x83"] = "\x83";
+	map_decode["\xc2\x84"] = "\x84";
+	map_decode["\xc2\x85"] = "\x85";
+	map_decode["\xc2\x86"] = "\x86";
+	map_decode["\xc2\x87"] = "\x87";
+	map_decode["\xc2\x88"] = "\x88";
+	map_decode["\xc2\x89"] = "\x89";
+	map_decode["\xc2\x8a"] = "\x8a";
+	map_decode["\xc2\x8b"] = "\x8b";
+	map_decode["\xc2\x8c"] = "\x8c";
+	map_decode["\xc2\x8d"] = "\x8d";
+	map_decode["\xc2\x8e"] = "\x8e";
+	map_decode["\xc2\x8f"] = "\x8f";
+	map_decode["\xc2\x90"] = "\x90";
+	map_decode["\xc2\x91"] = "\x91";
+	map_decode["\xc2\x92"] = "\x92";
+	map_decode["\xc2\x93"] = "\x93";
+	map_decode["\xc2\x94"] = "\x94";
+	map_decode["\xc2\x95"] = "\x95";
+	map_decode["\xc2\x96"] = "\x96";
+	map_decode["\xc2\x97"] = "\x97";
+	map_decode["\xc2\x98"] = "\x98";
+	map_decode["\xc2\x99"] = "\x99";
+	map_decode["\xc2\x9a"] = "\x9a";
+	map_decode["\xc2\x9b"] = "\x9b";
+	map_decode["\xc2\x9c"] = "\x9c";
+	map_decode["\xc2\x9d"] = "\x9d";
+	map_decode["\xc2\x9e"] = "\x9e";
+	map_decode["\xc2\x9f"] = "\x9f";
+	map_decode["\xc2\xa0"] = "\xa0";
+	map_decode["\xc2\xa1"] = "\xa1";
+	map_decode["\xc2\xa2"] = "\xa2";
+	map_decode["\xc2\xa3"] = "\xa3";
+	map_decode["\xc2\xa4"] = "\xa4";
+	map_decode["\xc2\xa5"] = "\xa5";
+	map_decode["\xc2\xa6"] = "\xa6";
+	map_decode["\xc2\xa7"] = "\xa7";
+	map_decode["\xc2\xa8"] = "\xa8";
+	map_decode["\xc2\xa9"] = "\xa9";
+	map_decode["\xc2\xaa"] = "\xaa";
+	map_decode["\xc2\xab"] = "\xab";
+	map_decode["\xc2\xac"] = "\xac";
+	map_decode["\xc2\xad"] = "\xad";
+	map_decode["\xc2\xae"] = "\xae";
+	map_decode["\xc2\xaf"] = "\xaf";
+	map_decode["\xc2\xb0"] = "\xb0";
+	map_decode["\xc2\xb1"] = "\xb1";
+	map_decode["\xc2\xb2"] = "\xb2";
+	map_decode["\xc2\xb3"] = "\xb3";
+	map_decode["\xc2\xb4"] = "\xb4";
+	map_decode["\xc2\xb5"] = "\xb5";
+	map_decode["\xc2\xb6"] = "\xb6";
+	map_decode["\xc2\xb7"] = "\xb7";
+	map_decode["\xc2\xb8"] = "\xb8";
+	map_decode["\xc2\xb9"] = "\xb9";
+	map_decode["\xc2\xba"] = "\xba";
+	map_decode["\xc2\xbb"] = "\xbb";
+	map_decode["\xc2\xbc"] = "\xbc";
+	map_decode["\xc2\xbd"] = "\xbd";
+	map_decode["\xc2\xbe"] = "\xbe";
+	map_decode["\xc2\xbf"] = "\xbf";
+	map_decode["\xc3\x80"] = "\xc0";
+	map_decode["\xc3\x81"] = "\xc1";
+	map_decode["\xc3\x82"] = "\xc2";
+	map_decode["\xc3\x83"] = "\xc3";
+	map_decode["\xc3\x84"] = "\xc4";
+	map_decode["\xc3\x85"] = "\xc5";
+	map_decode["\xc3\x86"] = "\xc6";
+	map_decode["\xc3\x87"] = "\xc7";
+	map_decode["\xc3\x88"] = "\xc8";
+	map_decode["\xc3\x89"] = "\xc9";
+	map_decode["\xc3\x8a"] = "\xca";
+	map_decode["\xc3\x8b"] = "\xcb";
+	map_decode["\xc3\x8c"] = "\xcc";
+	map_decode["\xc3\x8d"] = "\xcd";
+	map_decode["\xc3\x8e"] = "\xce";
+	map_decode["\xc3\x8f"] = "\xcf";
+	map_decode["\xc3\x90"] = "\xd0";
+	map_decode["\xc3\x91"] = "\xd1";
+	map_decode["\xc3\x92"] = "\xd2";
+	map_decode["\xc3\x93"] = "\xd3";
+	map_decode["\xc3\x94"] = "\xd4";
+	map_decode["\xc3\x95"] = "\xd5";
+	map_decode["\xc3\x96"] = "\xd6";
+	map_decode["\xc3\x97"] = "\xd7";
+	map_decode["\xc3\x98"] = "\xd8";
+	map_decode["\xc3\x99"] = "\xd9";
+	map_decode["\xc3\x9a"] = "\xda";
+	map_decode["\xc3\x9b"] = "\xdb";
+	map_decode["\xc3\x9c"] = "\xdc";
+	map_decode["\xc3\x9d"] = "\xdd";
+	map_decode["\xc3\x9e"] = "\xde";
+	map_decode["\xc3\x9f"] = "\xdf";
+	map_decode["\xc3\xa0"] = "\xe0";
+	map_decode["\xc3\xa1"] = "\xe1";
+	map_decode["\xc3\xa2"] = "\xe2";
+	map_decode["\xc3\xa3"] = "\xe3";
+	map_decode["\xc3\xa4"] = "\xe4";
+	map_decode["\xc3\xa5"] = "\xe5";
+	map_decode["\xc3\xa6"] = "\xe6";
+	map_decode["\xc3\xa7"] = "\xe7";
+	map_decode["\xc3\xa8"] = "\xe8";
+	map_decode["\xc3\xa9"] = "\xe9";
+	map_decode["\xc3\xaa"] = "\xea";
+	map_decode["\xc3\xab"] = "\xeb";
+	map_decode["\xc3\xac"] = "\xec";
+	map_decode["\xc3\xad"] = "\xed";
+	map_decode["\xc3\xae"] = "\xee";
+	map_decode["\xc3\xaf"] = "\xef";
+	map_decode["\xc3\xb0"] = "\xf0";
+	map_decode["\xc3\xb1"] = "\xf1";
+	map_decode["\xc3\xb2"] = "\xf2";
+	map_decode["\xc3\xb3"] = "\xf3";
+	map_decode["\xc3\xb4"] = "\xf4";
+	map_decode["\xc3\xb5"] = "\xf5";
+	map_decode["\xc3\xb6"] = "\xf6";
+	map_decode["\xc3\xb7"] = "\xf7";
+	map_decode["\xc3\xb8"] = "\xf8";
+	map_decode["\xc3\xb9"] = "\xf9";
+	map_decode["\xc3\xba"] = "\xfa";
+	map_decode["\xc3\xbb"] = "\xfb";
+	map_decode["\xc3\xbc"] = "\xfc";
+	map_decode["\xc3\xbd"] = "\xfd";
+	map_decode["\xc3\xbe"] = "\xfe";
+	map_decode["\xc3\xbf"] = "\xff";
 	// FIXME: This is just a hack to make Goran Mekic's name work.
-	map_decode["Ф\x87"] = "c";
+	map_decode["\xc4\x87"] = "c";
 }
 
 std::string UTF8::fromLatin1(std::string const& s)