Import CUPS v1.7.3

[thirdparty/cups.git] / cups / ppd-cache.c

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 307d9e9bf5bce827f12eae25f5261e6294543e24..75eef2d9c85fbd48d599e1a13f70cd9ba92dd0ed 100644 (file)
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd-cache.c 4274 2013-04-09 20:10:23Z msweet $"
+ * "$Id: ppd-cache.c 11833 2014-04-24 15:04:15Z msweet $"
  *
  *   PPD cache implementation for CUPS.
  *
@@ -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';
@@ -2726,5 +2728,5 @@ pwg_unppdize_name(const char *ppd,        /* I - PPD keyword */
 
 
 /*
- * End of "$Id: ppd-cache.c 4274 2013-04-09 20:10:23Z msweet $".
+ * End of "$Id: ppd-cache.c 11833 2014-04-24 15:04:15Z msweet $".
  */