--- a/WinWorkstation.st	Sat Feb 07 18:31:39 2004 +0100
+++ b/WinWorkstation.st	Sat Feb 07 18:45:35 2004 +0100
@@ -11267,43 +11267,62 @@
     fdwPitchAndFamily  = FF_DONTCARE;
 
     fdwCharSet   = ANSI_CHARSET;
-    if ((encoding == @symbol(ms-ansi)) || (encoding == @symbol('iso8859-1'))) {
+    if ((encoding == @symbol(ms-ansi))
+     || (encoding == @symbol('iso8859-1'))) {
 	fdwCharSet   = ANSI_CHARSET;
     } else if (encoding == @symbol(ms-default)) {   
 	fdwCharSet   = DEFAULT_CHARSET;
-    } else if (encoding == @symbol(ms-symbol)) {   
+    } else if ((encoding == @symbol(ms-symbol))
+	    || (encoding == @symbol('misc-fontspecific'))) {   
 	fdwCharSet   = SYMBOL_CHARSET;
-    } else if ((encoding == @symbol(ms-shiftjis)) || (encoding == @symbol('jisx0208.1983'))){   
+    } else if ((encoding == @symbol(ms-shiftjis))
+	    || (encoding == @symbol('jisx0208.1983-0'))){   
 	fdwCharSet   = SHIFTJIS_CHARSET;
-    } else if ((encoding == @symbol(ms-gb2312)) || (encoding == @symbol('gb2312.1980'))) {   
+    } else if ((encoding == @symbol(ms-gb2312))
+	    || (encoding == @symbol('gb2312.1980-0'))) {   
 	fdwCharSet   = GB2312_CHARSET;
-    } else if ((encoding == @symbol(ms-hangeul)) || (encoding == @symbol('ksc5601.1987'))) {   
+    } else if ((encoding == @symbol(ms-hangeul))
+	    || (encoding == @symbol('ksc5601.1987-0'))) {   
 	fdwCharSet   = HANGEUL_CHARSET;
-    } else if ((encoding == @symbol(ms-chinesebig5)) || (encoding == @symbol('big'))) {   
+    } else if ((encoding == @symbol(ms-chinesebig5))
+	    || (encoding == @symbol('big5'))) {   
 	fdwCharSet   = CHINESEBIG5_CHARSET;
     } else if (encoding == @symbol(ms-oem)) {   
 	fdwCharSet   = OEM_CHARSET;
     } else if (encoding == @symbol(ms-johab)) {   
 	fdwCharSet   = JOHAB_CHARSET;
-    } else if ((encoding == @symbol(ms-hebrew)) || (encoding == @symbol('iso8859-8'))) {   
+    } else if ((encoding == @symbol(ms-hebrew))
+	    || (encoding == @symbol('ms-cp1255'))  
+	    || (encoding == @symbol('iso8859-8'))) {   
 	fdwCharSet   = HEBREW_CHARSET;
-    } else if (encoding == @symbol(ms-arabic)) {   
+    } else if ((encoding == @symbol(ms-arabic))   
+	    || (encoding == @symbol('ms-cp1256'))) {  
 	fdwCharSet   = ARABIC_CHARSET;
-    } else if ((encoding == @symbol(ms-greek)) || (encoding == @symbol('iso8859-7'))) {   
+    } else if ((encoding == @symbol(ms-greek))
+	    || (encoding == @symbol('ms-cp1253'))  
+	    || (encoding == @symbol('iso8859-7'))) {   
 	fdwCharSet   = GREEK_CHARSET;
-    } else if ((encoding == @symbol(ms-turkish)) || (encoding == @symbol('iso8859-9'))) {   
+    } else if ((encoding == @symbol(ms-turkish))
+	    || (encoding == @symbol('ms-cp1254'))  
+	    || (encoding == @symbol('iso8859-9'))) {   
 	fdwCharSet   = TURKISH_CHARSET;
-    } else if ((encoding == @symbol(ms-russian)) || (encoding == @symbol('cp1251'))) {   
+    } else if ((encoding == @symbol(ms-russian)) 
+	    || (encoding == @symbol('ms-cp1251'))) {   
 	fdwCharSet   = RUSSIAN_CHARSET;
-    } else if (encoding == @symbol(ms-easteurope)) {   
+    } else if ((encoding == @symbol(ms-easteurope))  
+	    || (encoding == @symbol('ms-cp1250'))) {  
 	fdwCharSet   = EASTEUROPE_CHARSET;
-    } else if (encoding == @symbol(ms-baltic)) {   
+    } else if ((encoding == @symbol(ms-baltic))   
+	    || (encoding == @symbol('ms-cp1257'))) {  
 	fdwCharSet   = BALTIC_CHARSET;
-    } else if ((encoding == @symbol(ms-VIETNAMESE)) || (encoding == @symbol('iso8859-1'))) {   
+    } else if ((encoding == @symbol(ms-VIETNAMESE)) 
+	    || (encoding == @symbol('iso8859-1'))) {   
 	fdwCharSet   = VIETNAMESE_CHARSET;
-    } else if ((encoding == @symbol(ms-THAI)) || (encoding == @symbol('iso8859-1'))) {   
+    } else if ((encoding == @symbol(ms-THAI))
+	    || (encoding == @symbol('iso8859-1'))) {   
 	fdwCharSet   = THAI_CHARSET;
-    } else if ((encoding == @symbol(ms-MAC)) || (encoding == @symbol('iso8859-1'))) {   
+    } else if ((encoding == @symbol(ms-MAC))
+	    || (encoding == @symbol('iso8859-1'))) {   
 	fdwCharSet   = MAC_CHARSET;
 #ifdef UNICODE_CHARSET
     } else if ((encoding == @symbol(ms-UNICODE)) || (encoding == @symbol('iso8859-1'))) {   
@@ -15748,7 +15767,7 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.248 2004-02-07 17:31:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.249 2004-02-07 17:45:35 cg Exp $'
 ! !
 
 WinWorkstation initialize!