Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11833 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index f5022f469a3bbd531fe500c4c6b770b8efc0587e..afe3a78cfe8927d5d5e94f67badb4451ad1187d3 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,11 @@
-CHANGES.txt - 1.7.3 - 2014-04-10
+CHANGES.txt - 1.7.3 - 2014-04-24
 --------------------------------
 
 CHANGES IN CUPS V1.7.3
 
+       - Fixed mapping of OutputBin values such as "Tray1"
+         (<rdar://problem/16685606>)
+
 
 CHANGES IN CUPS V1.7.2
 

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index ceae66df9098260c913339b69d760f55f395909e..d97518a35299bd94daf94b4a99a758a4e94a3fb5 100644 (file)
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -2719,6 +2719,8 @@ pwg_unppdize_name(const char *ppd,        /* I - PPD keyword */
     if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
        _cups_isupper(ppd[1]) && ptr < end)
       *ptr++ = '-';
+    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      *ptr++ = '-';
   }
 
   *ptr = '\0';