#i101552 update the win-gfb unicode->language list

1 files changed, 70 insertions, 39 deletions

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c991d1db2be0..932d1749396d 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -319,7 +319,8 @@ RawFontData::RawFontData( HDC hDC, DWORD nTableTag )
 
 // ===========================================================================
 // platform specific font substitution hooks for glyph fallback enhancement
-// TODO: move into i18n module (maybe merge with svx/ucsubset.*)
+// TODO: move into i18n module (maybe merge with svx/ucsubset.*
+//       or merge with i18nutil/source/utility/unicode_data.h)
 struct Unicode2LangType
 {
     sal_UCS4 mnMinCode;
@@ -333,47 +334,77 @@ struct Unicode2LangType
 // map unicode ranges to languages supported by OOo
 // NOTE: due to the binary search used this list must be sorted by mnMinCode
 static Unicode2LangType aLangFromCodeChart[]= {
-    {0x0000, 0x007f, LANGUAGE_ENGLISH},             // Basic Latin
-    {0x0080, 0x024f, LANGUAGE_ENGLISH},             // Latin Extended-A and Latin Extended-B
-    {0x0250, 0x02af, LANGUAGE_SYSTEM},              // IPA Extensions
-    {0x0370, 0x03ff, LANGUAGE_GREEK},               // Greek
-    {0x0590, 0x05ff, LANGUAGE_HEBREW},              // Hebrew
-    {0x0600, 0x06ff, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic
-    {0x0900, 0x097f, LANGUAGE_HINDI},               // Devanagari
-    {0x0980, 0x09ff, LANGUAGE_BENGALI},             // Bengali
-    {0x0a80, 0x0aff, LANGUAGE_GUJARATI},            // Gujarati
-    {0x0b00, 0x0b7f, LANGUAGE_ORIYA},               // Oriya
-    {0x0b80, 0x0bff, LANGUAGE_TAMIL},               // Tamil
-    {0x0e00, 0x0e7f, LANGUAGE_THAI},                // Thai
-    {0x0e80, 0x0eff, LANGUAGE_LAO},                 // Lao
-    {0x1000, 0x109f, LANGUAGE_BURMESE},             // Burmese
-    {0x1100, 0x11ff, LANGUAGE_KOREAN},              // Hangul Jamo, Korean-specific
-    {0x1780, 0x17ff, LANGUAGE_KHMER},               // Khmer
-    {0x1e00, 0x1eff, LANGUAGE_ENGLISH},             // Latin Extended Additional
-    {0x2c60, 0x2c7f, LANGUAGE_ENGLISH},             // Latin Extended-C
-    {0x2e80, 0x2fff, LANGUAGE_CHINESE_SIMPLIFIED},  // CJK Radicals Supplement + Kangxi Radical + Ideographic Description Characters
+    {0x0000, 0x007F, LANGUAGE_ENGLISH},             // Basic Latin
+    {0x0080, 0x024F, LANGUAGE_ENGLISH},             // Latin Extended-A and Latin Extended-B
+    {0x0250, 0x02AF, LANGUAGE_SYSTEM},              // IPA Extensions
+    {0x0370, 0x03FF, LANGUAGE_GREEK},               // Greek
+    {0x0590, 0x05FF, LANGUAGE_HEBREW},              // Hebrew
+    {0x0600, 0x06FF, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic
+    {0x0900, 0x097F, LANGUAGE_HINDI},               // Devanagari
+    {0x0980, 0x09FF, LANGUAGE_BENGALI},             // Bengali
+    {0x0A80, 0x0AFF, LANGUAGE_GUJARATI},            // Gujarati
+    {0x0B00, 0x0B7F, LANGUAGE_ORIYA},               // Oriya
+    {0x0B80, 0x0BFF, LANGUAGE_TAMIL},               // Tamil
+    {0x0C00, 0x0C7F, LANGUAGE_TELUGU},              // Telugu
+    {0x0C80, 0x0CFF, LANGUAGE_KANNADA},             // Kannada
+    {0x0D00, 0x0D7F, LANGUAGE_MALAYALAM},           // Malayalam
+    {0x0D80, 0x0D7F, LANGUAGE_SINHALESE_SRI_LANKA}, // Sinhala
+    {0x0E00, 0x0E7F, LANGUAGE_THAI},                // Thai
+    {0x0E80, 0x0EFF, LANGUAGE_LAO},                 // Lao
+    {0x0F00, 0x0FFF, LANGUAGE_TIBETAN},             // Tibetan
+    {0x1000, 0x109F, LANGUAGE_BURMESE},             // Burmese
+    {0x10A0, 0x10FF, LANGUAGE_GEORGIAN},            // Georgian
+    {0x1100, 0x11FF, LANGUAGE_KOREAN},              // Hangul Jamo, Korean-specific
+//  {0x1200, 0x139F, LANGUAGE_AMHARIC_ETHIOPIA},    // Ethiopic
+//  {0x1200, 0x139F, LANGUAGE_TIGRIGNA_ETHIOPIA},   // Ethiopic
+    {0x13A0, 0x13FF, LANGUAGE_CHEROKEE_UNITED_STATES}, // Cherokee
+//  {0x1400, 0x167F, LANGUAGE_CANADIAN_ABORIGINAL}, // Canadian Aboriginial Syllabics
+//  {0x1680, 0x169F, LANGUAGE_OGHAM},               // Ogham
+//  {0x16A0, 0x16F0, LANGUAGE_RUNIC},               // Runic
+//  {0x1700, 0x171F, LANGUAGE_TAGALOG},             // Tagalog
+//  {0x1720, 0x173F, LANGUAGE_HANUNOO},             // Hanunoo
+//  {0x1740, 0x175F, LANGUAGE_BUHID},               // Buhid
+//  {0x1760, 0x177F, LANGUAGE_TAGBANWA},            // Tagbanwa
+    {0x1780, 0x17FF, LANGUAGE_KHMER},               // Khmer
+    {0x18A0, 0x18AF, LANGUAGE_MONGOLIAN},           // Mongolian
+//  {0x1900, 0x194F, LANGUAGE_LIMBU},               // Limbu
+//  {0x1950, 0x197F, LANGUAGE_TAILE},               // Tai Le
+//  {0x1980, 0x19DF, LANGUAGE_TAILUE},              // Tai Lue
+    {0x19E0, 0x19FF, LANGUAGE_KHMER},               // Khmer Symbols
+//  {0x1A00, 0x1A1F, LANGUAGE_BUGINESE},            // Buginese/Lontara
+//  {0x1B00, 0x1B7F, LANGUAGE_BALINESE},            // Balinese
+//  {0x1D00, 0x1DFF, LANGUAGE_NONE},                // Phonetic Symbols
+    {0x1E00, 0x1EFF, LANGUAGE_ENGLISH},             // Latin Extended Additional
+    {0x1F00, 0x1FFF, LANGUAGE_GREEK},               // Greek Extended
+    {0x2C60, 0x2C7F, LANGUAGE_ENGLISH},             // Latin Extended-C
+    {0x2E80, 0x2FFf, LANGUAGE_CHINESE_SIMPLIFIED},  // CJK Radicals Supplement + Kangxi Radical + Ideographic Description Characters
     {0x3000, 0x303F, LANGUAGE_DEFAULT_CJK},         // CJK Symbols and punctuation
     {0x3040, 0x30FF, LANGUAGE_JAPANESE},            // Japanese Hiragana + Katakana
-    {0x3100, 0x312f, LANGUAGE_CHINESE_TRADITIONAL}, // Bopomofo
-    {0x3130, 0x318f, LANGUAGE_KOREAN},              // Hangul Compatibility Jamo, Kocrean-specific
-    {0x3190, 0x319f, LANGUAGE_JAPANESE},            // Kanbun
-    {0x31a0, 0x31bf, LANGUAGE_CHINESE_TRADITIONAL}, // Bopomofo Extended
-    {0x31c0, 0x31ef, LANGUAGE_DEFAULT_CJK},         // CJK Ideographs
-    {0x31f0, 0x31ff, LANGUAGE_JAPANESE},            // Japanese Katakana Phonetic Extensions
-    {0x3400, 0x4dbf, LANGUAGE_DEFAULT_CJK},         // CJK Unified Ideographs Extension A
-    {0x4e00, 0x9fcf, LANGUAGE_DEFAULT_CJK},         // Unified CJK Ideographs
-    {0xa720, 0xa7ff, LANGUAGE_ENGLISH},             // Latin Extended-D
-    {0xac00, 0xd7af, LANGUAGE_KOREAN},              // Hangul Syllables, Kocrean-specific
+    {0x3100, 0x312F, LANGUAGE_CHINESE_TRADITIONAL}, // Bopomofo
+    {0x3130, 0x318F, LANGUAGE_KOREAN},              // Hangul Compatibility Jamo, Kocrean-specific
+    {0x3190, 0x319F, LANGUAGE_JAPANESE},            // Kanbun
+    {0x31A0, 0x31BF, LANGUAGE_CHINESE_TRADITIONAL}, // Bopomofo Extended
+    {0x31C0, 0x31EF, LANGUAGE_DEFAULT_CJK},         // CJK Ideographs
+    {0x31F0, 0x31FF, LANGUAGE_JAPANESE},            // Japanese Katakana Phonetic Extensions
+    {0x3200, 0x321F, LANGUAGE_KOREAN},
+    {0x3220, 0x325F, LANGUAGE_DEFAULT_CJK},
+    {0x3260, 0x327F, LANGUAGE_KOREAN},
+    {0x3280, 0x32CF, LANGUAGE_DEFAULT_CJK},
+    {0x32d0, 0x32FF, LANGUAGE_JAPANESE},            // Japanese Circled Katakana
+    {0x3400, 0x4DBF, LANGUAGE_DEFAULT_CJK},         // CJK Unified Ideographs Extension A
+    {0x4E00, 0x9FCF, LANGUAGE_DEFAULT_CJK},         // Unified CJK Ideographs
+    {0xA720, 0xA7FF, LANGUAGE_ENGLISH},             // Latin Extended-D
+    {0xAC00, 0xD7AF, LANGUAGE_KOREAN},              // Hangul Syllables, Korean-specific
     {0xF900, 0xFAFF, LANGUAGE_DEFAULT_CJK},         // CJK Compatibility Ideographs
-    {0xfb00, 0xfb4f, LANGUAGE_HEBREW},              // Hibrew present forms
-    {0xfb50, 0xfdff, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic Presentation Forms-A
-    {0xfe70, 0xfefe, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic Presentation Forms-B
-    {0xff65, 0xff9f, LANGUAGE_JAPANESE},            // Japanese Halfwidth Katakana variant
-    {0xffa0, 0xffDC, LANGUAGE_KOREAN},              // Kocrean halfwidth hangual variant
-    {0x10140, 0x1018f, LANGUAGE_GREEK},             // Ancient Greak numbers
-    {0x1d200, 0x1d24f, LANGUAGE_GREEK},             // Ancient Greek Musical
-    {0x20000, 0x2a6df, LANGUAGE_DEFAULT_CJK},       // CJK Unified Ideographs Extension B
-    {0x2f800, 0x2fa1f, LANGUAGE_DEFAULT_CJK}        // CJK Compatibility Ideographs Supplement
+    {0xFB00, 0xFB4F, LANGUAGE_HEBREW},              // Hebrew present forms
+    {0xFB50, 0xFDFF, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic Presentation Forms-A
+    {0xFE70, 0xFEFE, LANGUAGE_ARABIC_PRIMARY_ONLY}, // Arabic Presentation Forms-B
+    {0xFF65, 0xFF9F, LANGUAGE_JAPANESE},            // Japanese Halfwidth Katakana variant
+    {0xFFA0, 0xFFDC, LANGUAGE_KOREAN},              // Kocrean halfwidth hangual variant
+    {0x10140, 0x1018F, LANGUAGE_GREEK},             // Ancient Greak numbers
+    {0x1D200, 0x1D24F, LANGUAGE_GREEK},             // Ancient Greek Musical
+    {0x20000, 0x2A6DF, LANGUAGE_DEFAULT_CJK},       // CJK Unified Ideographs Extension B
+    {0x2F800, 0x2FA1F, LANGUAGE_DEFAULT_CJK}        // CJK Compatibility Ideographs Supplement
 };
 
 // get language matching to the missing char