Add more fallback fonts to the Java runtime, in order to get + * support for more scripts.
+ * + *The font configuration in Java doesn't include some Indic scripts, * even though MS Windows ships with fonts that cover these unicode - * ranges. - * - * To fix this, the fontconfig.properties template is copied to the JOSM + * ranges.
+ * + *To fix this, the fontconfig.properties template is copied to the JOSM * cache folder. Then, the additional entries are added to the font * configuration. Finally the system property "sun.awt.fontconfig" is set - * to the customized fontconfig.properties file. - * - * This is a crude hack, but better than no font display at all for these + * to the customized fontconfig.properties file.
+ * + *This is a crude hack, but better than no font display at all for these * languages. * There is no guarantee, that the template file @@ -465,5 +465,7 @@ * configuration (which is in a binary format). * Furthermore, the system property "sun.awt.fontconfig" is undocumented and - * may no longer work in future versions of Java. + * may no longer work in future versions of Java.
+ * + *Related Java bug: JDK-8008572
* * @param templateFileName file name of the fontconfig.properties template file Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 8097) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 8099) @@ -320,9 +320,10 @@ fontsAvail.add(p.getFileName().toString().toUpperCase()); } + fontsAvail.add(""); // for devanagari } catch (IOException ex) { + Main.error(ex, false); Main.warn("extended font config - failed to load available Fonts"); fontsAvail = null; } - fontsAvail.add(""); // for devanagari return fontsAvail; } @@ -333,13 +334,23 @@ def.add(new FontEntry("devanagari", "", "")); // just include in fallback list // font already defined in template - // Win 8 (and later) - def.add(new FontEntry("myanmar", "Myanmar Text", "MMRTEXT.TTF")); // ISO 639: my - - // Win 7 and later - def.add(new FontEntry("nko_tifinagh_vai_osmanya", "Ebrima", "EBRIMA.TTF")); // ISO 639: ber - def.add(new FontEntry("khmer1", "Khmer UI", "KHMERUI.TTF")); // ISO 639: km - def.add(new FontEntry("lao1", "Lao UI", "LAOUI.TTF")); // ISO 639: lo - - // Win Vista and later: + + // Windows scripts: https://msdn.microsoft.com/en-us/goglobal/bb688099.aspx + // IE default fonts: https://msdn.microsoft.com/en-us/library/ie/dn467844(v=vs.85).aspx + + // Windows 8/8.1 and later + def.add(new FontEntry("javanese", "Javanese Text", "JAVATEXT.TTF")); // ISO 639: jv + def.add(new FontEntry("leelawadee", "Leelawadee", "LEELAWAD.TTF")); // ISO 639: bug + def.add(new FontEntry("myanmar", "Myanmar Text", "MMRTEXT.TTF")); // ISO 639: my + def.add(new FontEntry("nirmala", "Nirmala UI", "NIRMALA.TTF")); // ISO 639: sat,srb + def.add(new FontEntry("segoeui", "Segoe UI", "SEGOEUI.TTF")); // ISO 639: lis + + // Windows 7 and later + def.add(new FontEntry("nko_tifinagh_vai_osmanya", "Ebrima", "EBRIMA.TTF")); // ISO 639: ber. Nko only since Win 8 + def.add(new FontEntry("khmer1", "Khmer UI", "KHMERUI.TTF")); // ISO 639: km + def.add(new FontEntry("lao1", "Lao UI", "LAOUI.TTF")); // ISO 639: lo + def.add(new FontEntry("tai_le", "Microsoft Tai Le", "TAILE.TTF")); // ISO 639: khb + def.add(new FontEntry("new_tai_lue", "Microsoft New Tai Lue", "NTHAILU.TTF")); // ISO 639: khb + + // Windows Vista and later: def.add(new FontEntry("ethiopic", "Nyala", "NYALA.TTF")); // ISO 639: am,gez,ti def.add(new FontEntry("tibetan", "Microsoft Himalaya", "HIMALAYA.TTF")); // ISO 639: bo,dz @@ -352,16 +363,19 @@ def.add(new FontEntry("oriya", "Kalinga", "KALINGA.TTF")); // ISO 639: or def.add(new FontEntry("sinhala", "Iskoola Pota", "ISKPOTA.TTF")); // ISO 639: si - - // Win XP and later + def.add(new FontEntry("yi", "Yi Baiti", "MSYI.TTF")); // ISO 639: ii + + // Windows XP and later def.add(new FontEntry("gujarati", "Shruti", "SHRUTI.TTF")); def.add(new FontEntry("kannada", "Tunga", "TUNGA.TTF")); - def.add(new FontEntry("gurmuhi", "Raavi", "RAAVI.TTF")); - def.add(new FontEntry("tamil", "Latha", "LATHA.TTF")); + def.add(new FontEntry("gurmukhi", "Raavi", "RAAVI.TTF")); def.add(new FontEntry("telugu", "Gautami", "GAUTAMI.TTF")); - def.add(new FontEntry("bengali", "Vrinda", "VRINDA.TTF")); + def.add(new FontEntry("bengali", "Vrinda", "VRINDA.TTF")); // since XP SP2 def.add(new FontEntry("syriac", "Estrangelo Edessa", "ESTRE.TTF")); // ISO 639: arc def.add(new FontEntry("thaana", "MV Boli", "MVBOLI.TTF")); // ISO 639: dv def.add(new FontEntry("malayalam", "Kartika", "KARTIKA.TTF")); // ISO 639: ml; since XP SP2 + // Windows 2000 and later + def.add(new FontEntry("tamil", "Latha", "LATHA.TTF")); + // Comes with MS Office & Outlook 2000. Good unicode coverage, so add if available. def.add(new FontEntry("arialuni", "Arial Unicode MS", "ARIALUNI.TTF")); @@ -369,4 +383,3 @@ return def; } - }