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