2002/07/20 04:07:05

darcs-hash:20040130064922-2ba56-653786a2ae68c06e3e1b9f6d501036686b955285.gz

diff --git a/CHANGES b/CHANGES
index a35d35f..e0eb78b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -302,3 +302,4 @@
 
 18-Jul megacz HTTP.java: Basic Proxy-Authorization support
 
+19-Jul megacz POSIX.java: font fix
\ No newline at end of file

diff --git a/src/org/xwt/plat/POSIX.java b/src/org/xwt/plat/POSIX.java
index e336a01..794be06 100644 (file)
--- a/src/org/xwt/plat/POSIX.java
+++ b/src/org/xwt/plat/POSIX.java
@@ -259,16 +259,20 @@ public class POSIX extends GCJ {
 
         for(int k=0; k<fonts.length; k++) {
             String s = fonts[k].toLowerCase();
-            StringTokenizer st = new StringTokenizer(s, "-", false);
+            StringTokenizer st = new StringTokenizer(s, "-", true);
             String[] font = new String[st.countTokens()];
             
             try {
-                for(int i=0; st.hasMoreTokens(); i++) font[i] = st.nextToken();
+                int i = 0;
+                while(st.hasMoreTokens()) {
+                    String s2 = st.nextToken();
+                    if (!s2.equals("-")) font[i++] = s2;
+                }
 
                 // limit to iso8559 until we can do I18N properly....
-                if (font.length > 13) {
+                if (i > 13) {
                     if (!font[13].equals("iso8559")) continue;
-                    if (font.length < 15 || !font[14].equals("1")) continue;
+                    if (i < 15 || !font[14].equals("1")) continue;
                 }
 
                 String name = font[1];