--- a/WinWorkstation.st	Fri Feb 13 01:38:00 2004 +0100
+++ b/WinWorkstation.st	Fri Feb 13 09:55:33 2004 +0100
@@ -4729,7 +4729,7 @@
 
 	switch (lplf->lfCharSet) {
 	    case ANSI_CHARSET:
-		s = "8859-1";
+		s = "ms-ansi";
 		break;
 	    case DEFAULT_CHARSET:
 		s = "ms-default";
@@ -11267,8 +11267,7 @@
     fdwPitchAndFamily  = FF_DONTCARE;
 
     fdwCharSet   = ANSI_CHARSET;
-    if ((encoding == @symbol('ms-ansi'))
-     || (encoding == @symbol('iso8859-1'))) {
+    if ((encoding == @symbol('ms-ansi'))) {
 	fdwCharSet   = ANSI_CHARSET;
     } else if (encoding == @symbol('ms-default')) {   
 	fdwCharSet   = DEFAULT_CHARSET;
@@ -11292,19 +11291,16 @@
     } else if (encoding == @symbol('ms-johab')) {   
 	fdwCharSet   = JOHAB_CHARSET;
     } else if ((encoding == @symbol('ms-hebrew'))
-	    || (encoding == @symbol('ms-cp1255'))  
-	    || (encoding == @symbol('iso8859-8'))) {   
+	    || (encoding == @symbol('ms-cp1255'))) {   
 	fdwCharSet   = HEBREW_CHARSET;
     } else if ((encoding == @symbol('ms-arabic'))   
 	    || (encoding == @symbol('ms-cp1256'))) {  
 	fdwCharSet   = ARABIC_CHARSET;
     } else if ((encoding == @symbol('ms-greek'))
-	    || (encoding == @symbol('ms-cp1253'))  
-	    || (encoding == @symbol('iso8859-7'))) {   
+	    || (encoding == @symbol('ms-cp1253'))) {   
 	fdwCharSet   = GREEK_CHARSET;
     } else if ((encoding == @symbol('ms-turkish'))
-	    || (encoding == @symbol('ms-cp1254'))  
-	    || (encoding == @symbol('iso8859-9'))) {   
+	    || (encoding == @symbol('ms-cp1254'))) {   
 	fdwCharSet   = TURKISH_CHARSET;
     } else if ((encoding == @symbol('ms-russian')) 
 	    || (encoding == @symbol('ms-cp1251'))) {   
@@ -11315,17 +11311,14 @@
     } 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'))) {   
 	fdwCharSet   = VIETNAMESE_CHARSET;
-    } else if ((encoding == @symbol('ms-thai'))
-	    || (encoding == @symbol('iso8859-1'))) {   
+    } else if ((encoding == @symbol('ms-thai'))) {   
 	fdwCharSet   = THAI_CHARSET;
-    } else if ((encoding == @symbol('ms-mac'))
-	    || (encoding == @symbol('iso8859-1'))) {   
+    } else if ((encoding == @symbol('ms-mac'))) {   
 	fdwCharSet   = MAC_CHARSET;
 #ifdef UNICODE_CHARSET
-    } else if ((encoding == @symbol('ms-unicode')) || (encoding == @symbol('iso8859-1'))) {   
+    } else if ((encoding == @symbol('ms-unicode'))) {   
 	fdwCharSet   = UNICODE_CHARSET;
 #endif
     }
@@ -15767,7 +15760,7 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.251 2004-02-12 00:07:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.252 2004-02-13 08:55:33 cg Exp $'
 ! !
 
 WinWorkstation initialize!