Changeset 8099 in josm

Timestamp:

2015-02-22T23:04:55+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10989 - add support for more languages on recent version of Windows:

• Yi, 2m (ii, Win Vista)
• Tai Lü, 700k (khb, Win 7)
• Lisu, 940k (lis, Win 8)
• Buginese, 5m (bug, Win 8.1)
• Javanese, 82m (jav, Win 8.1)
• Santali, 6m (sat, Win 8.1: Ol Chiki script)
• Sora, 250k (srb, Win 8.1: Sora Sompeng script)

+ fix potential NPE, improve javadoc

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHookUnixoid.java (modified) (2 diffs)
• PlatformHookWindows.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -447 +447 @@
 
     /**
-     * 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,
+     * <p>Add more fallback fonts to the Java runtime, in order to get
+     * support for more scripts.</p>
+     *
+     * <p>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.</p>
+     *
+     * <p>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.</p>
+     *
+     * <p>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 +465 @@
      * 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.</p>
+     *
+     * <p>Related Java bug: <a href="https://bugs.openjdk.java.net/browse/JDK-8008572">JDK-8008572</a></p>
      *
      * @param templateFileName file name of the fontconfig.properties template file

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -320 +320 @@
                 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 +334 @@
         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 +363 @@
         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 +383 @@
         return def;
     }
-
 }