PPD files using the MacStandard encoding did not work.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10094 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index 083af38700472506da7a432eec6174d5f5060112..d2ddac4a35c3abc4e2936fd9808c5a20c8c2b8e9 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -5,6 +5,7 @@ CHANGES IN CUPS V1.5.1
 
        - Documentation updates (STR #3885, STR #3946)
        - Build fixes (STR #3956)
+       - PPD files using the MacStandard encoding did not work.
        - The web interface did not work on some platforms (STR #3902)
        - The lpstat command would crash when then "-u" option was used by a
          non-administrator (STR #3953)

diff --git a/cups/language.c b/cups/language.c
index ffc9cd1262cb910518ff740e8c30d214caf448da..092da4690a67434a50b82704b1eff57cc974825c 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -80,7 +80,7 @@ static const char * const lang_encodings[] =
                          "cp1256",             "cp1257",
                          "cp1258",             "koi8-r",
                          "koi8-u",             "iso-8859-11",
-                         "iso-8859-16",        "mac-roman",
+                         "iso-8859-16",        "mac",
                          "unknown",            "unknown",
                          "unknown",            "unknown",
                          "unknown",            "unknown",