Add auto input slot option if none is provided.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index b2decaeefe79ac7a54085f98ae5cb57b2ecb490f..d6c0df1c038e11136f47d1b33f9dc253d09b4b48 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,13 @@
-CHANGES.txt - 05/29/2002
+CHANGES.txt - 05/31/2002
 ------------------------
 
 CHANGES IN CUPS V1.1.15
 
        - Updated the CUPS license agreement for the new MacOS
          and OpenSSL license exceptions.
+       - ppdOpen() and friends now add an "Auto" InputSlot
+         option if none is provided to automatically select the
+         correct tray.
        - Updated the ppdEmit() and ppdEmitFd() functions to
          (re)mark the correct PageSize or PageRegion option
          depending on the selected ManualFeed or InputSlot

diff --git a/cups/cups_C.h b/cups/cups_C.h
index 10e432ff7d40e31cbda8fb4e6fe7247eddb32b6b..32e1fa6b5df24822f45ee3a1527deac467835130 100644 (file)
--- a/cups/cups_C.h
+++ b/cups/cups_C.h
@@ -109,6 +109,7 @@
 "Filename(s)",
 "Print",
 "Options Installed",
+"Auto",
 "400 Your browser sent a request that this server could not understand.",
 "This server could not verify that you are authorized to access the resource.",
 "You must pay to access this server.",

diff --git a/cups/language.h b/cups/language.h
index 1cb743c24509b54ac7a08689d4b32e725b9a217c..9352539bef2fa7c5038bbc898aeeacdd7f6f710d 100644 (file)
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.h,v 1.26 2002/03/25 17:51:18 mike Exp $"
+ * "$Id: language.h,v 1.27 2002/05/31 19:07:18 mike Exp $"
  *
  *   Multi-language support for the Common UNIX Printing System (CUPS).
  *
@@ -153,6 +153,7 @@ typedef enum                        /**** Message Indices ****/
   CUPS_MSG_FILENAME,
   CUPS_MSG_PRINT,
   CUPS_MSG_OPTIONS_INSTALLED,
+  CUPS_MSG_AUTO,
   CUPS_MSG_HTTP_BASE = 200,
   CUPS_MSG_HTTP_END = 505,
   CUPS_MSG_MAX
@@ -223,5 +224,5 @@ extern cups_lang_t  *cupsLangGet(const char *language);
 #endif /* !_CUPS_LANGUAGE_H_ */
 
 /*
- * End of "$Id: language.h,v 1.26 2002/03/25 17:51:18 mike Exp $".
+ * End of "$Id: language.h,v 1.27 2002/05/31 19:07:18 mike Exp $".
  */

diff --git a/cups/ppd.c b/cups/ppd.c
index e7bd7bfa850462ebee98d6c089ce9bfdd4ba6e77..318ceb7c562e2e4c3d18fba4bbac88bc13149216 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.69 2002/05/23 17:54:13 mike Exp $"
+ * "$Id: ppd.c,v 1.70 2002/05/31 19:07:18 mike Exp $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -1368,6 +1368,31 @@ ppdOpen(FILE *fp)                /* I - File to read from */
     printf("Premature EOF at %lu...\n", (unsigned long)ftell(fp));
 #endif /* DEBUG */
 
+ /*
+  * Make sure that all PPD files with an InputSlot option have an
+  * "auto" choice that maps to no specific tray or media type.
+  */
+
+  if ((option = ppdFindOption(ppd, "InputSlot")) != NULL)
+  {
+    for (i = 0; i < option->num_choices; i ++)
+      if (option->choices[i].code == NULL || !option->choices[i].code[0])
+       break;
+
+    if (i >= option->num_choices)
+    {
+     /*
+      * No "auto" input slot, add one...
+      */
+
+      choice = ppd_add_choice(option, "Auto");
+
+      strlcpy(choice->text, cupsLangString(language, CUPS_MSG_AUTO),
+              sizeof(choice->text));
+      choice->code = NULL;
+    }
+  }
+
  /*
   * Set the option back-pointer for each choice...
   */
@@ -2029,5 +2054,5 @@ ppd_fix(char *string)             /* IO - String to fix */
 
 
 /*
- * End of "$Id: ppd.c,v 1.69 2002/05/23 17:54:13 mike Exp $".
+ * End of "$Id: ppd.c,v 1.70 2002/05/31 19:07:18 mike Exp $".
  */

diff --git a/locale/C/cups_C b/locale/C/cups_C
index 03622db7e65aa68e1daa8a8157c56134ba4d8e1d..85cd4e261160ae21ec1f881b4a6011411667830c 100644 (file)
--- a/locale/C/cups_C
+++ b/locale/C/cups_C
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Options Installed
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/be/cups_be b/locale/be/cups_be
index 354853fdee44131be0ef60003be59c2188324a43..102b2786bfdca0e2894acf48dface1f528511079 100644 (file)
--- a/locale/be/cups_be
+++ b/locale/be/cups_be
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Options Installed
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/cs/cups_cs b/locale/cs/cups_cs
index 09a5ce35fb05d5fb0efaa1a47c5827d19e136b9d..c35fd7c5507c2648b606160f8691cdbb9c8490b7 100644 (file)
--- a/locale/cs/cups_cs
+++ b/locale/cs/cups_cs
@@ -109,6 +109,7 @@ Nahoøe
 Soubor(y)
 Tisk
 Options Installed
+Auto
 400 Vá¹ prohlíŸeè odeslal poŸadavek, kterému tento server nerozumí.
 Server nemohl ovìøit, zda máte oprávnìní pøistupovat k tomuto zdroji.
 Pøístup k tomuto serveru je placený.

diff --git a/locale/de/cups_de b/locale/de/cups_de
index 489912c7e914459e6b2c24bc8925034754b415b9..62f7aefd527fc7a0cea620abaf4312fda7ed739b 100644 (file)
--- a/locale/de/cups_de
+++ b/locale/de/cups_de
@@ -109,6 +109,7 @@ Oberseite
 Dateiname(s)
 Druker
 Installierte Optionen
+Automatisch
 400 Der Server versteht die Anfrage Ihres Browsers nicht. 
 Der Server konnte nicht Ihre Berechtigung überprüfen, diese Ressource zu benutzen. 
 Sie müssen bezahlen, um auf diesen Server zuzugreifen. 

diff --git a/locale/en/cups_en b/locale/en/cups_en
index 1f1e70d9a019fc108b297cbccc4d70fc38b87077..f73a2e5040a8158985622827ca56ce979e0f0f39 100644 (file)
--- a/locale/en/cups_en
+++ b/locale/en/cups_en
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Options Installed
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/es/cups_es b/locale/es/cups_es
index 6fda2fc80c1ead01c1ea635a3726a7cc862f03c6..b5b514d8dfee23add5b5a49c7d718297c807de40 100644 (file)
--- a/locale/es/cups_es
+++ b/locale/es/cups_es
@@ -109,6 +109,7 @@ Tapa
 Nombre(s)
 Impresión 
 Opciones instaladas
+Automático
 400 Su browser envió una petición que este servidor no podría entender. 
 Este servidor no podría verificar que le autoricen a tener acceso al recurso. 
 Usted debe pagar tener acceso a este servidor. 

diff --git a/locale/fr/cups_fr b/locale/fr/cups_fr
index 8ff29a48b3db70bc65a81f7539fff6d790adbde6..ee52b6a716d1806bc6a6bdc7b342616522c3e542 100644 (file)
--- a/locale/fr/cups_fr
+++ b/locale/fr/cups_fr
@@ -109,6 +109,7 @@ Haut
 Nom du ficher(s)
 Imprimer
 Options installées
+Automatique
 400 Votre browser a envoyé une demande que ce serveur ne pouvait pas comprendre. 
 Ce serveur ne pouvait pas vérifier que vous êtes autoriséz à accéder à la ressource. 
 Vous devez payer pour accéder à ce serveur. 

diff --git a/locale/he/cups_he b/locale/he/cups_he
index 15ed0886a8ce22b21ad850c3d5dd2946ce7c87a4..139993ea38ce5550cc881178045202b0d4dfd2fd 100644 (file)
--- a/locale/he/cups_he
+++ b/locale/he/cups_he
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Options Installed
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/it/cups_it b/locale/it/cups_it
index d19606fae878f4832bb26b8512cf1690f93b47a9..dc1663a3f5b340183f631f872e9b6d2eaa44687c 100644 (file)
--- a/locale/it/cups_it
+++ b/locale/it/cups_it
@@ -109,6 +109,7 @@ Superiore
 Nome/i file
 Stampa
 Opzioni installate
+Automatico
 400 Il vostro browser ha inviato una richiesta che non può essere eseguita su questo server.
 Questo server non ha potuto verificare la vostra autorizzazione ad accedere alla risorsa.
 L'accesso a questo servizio è a pagamento.

diff --git a/locale/ru_RU.cp1251/cups_ru_RU.cp1251 b/locale/ru_RU.cp1251/cups_ru_RU.cp1251
index 354853fdee44131be0ef60003be59c2188324a43..102b2786bfdca0e2894acf48dface1f528511079 100644 (file)
--- a/locale/ru_RU.cp1251/cups_ru_RU.cp1251
+++ b/locale/ru_RU.cp1251/cups_ru_RU.cp1251
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Options Installed
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/ru_RU.koi8r/cups_ru_RU.koi8r b/locale/ru_RU.koi8r/cups_ru_RU.koi8r
index 5785af64cd27f3f40dcdd0e0f958b9bdb5e57033..e1db3f4fc0a472912456ba90253f8e6a8ec916fd 100644 (file)
--- a/locale/ru_RU.koi8r/cups_ru_RU.koi8r
+++ b/locale/ru_RU.koi8r/cups_ru_RU.koi8r
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Installed Options
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/sv/cups_sv b/locale/sv/cups_sv
index 774a760e063c0f3a27bfbc392605f2ac1a01d641..702032bb59fba45d0d9ee3f3bb88584e0f6b96b3 100644 (file)
--- a/locale/sv/cups_sv
+++ b/locale/sv/cups_sv
@@ -109,6 +109,7 @@ Upptill
 Filnamn
 Print
 Options Installed
+Auto
 400 Din bläddrare skickade en begäran som den här tjänstehanteraren inte förstår.
 Den här tjänstehanteraren kan inte verifiera att du har tillstånd att använda tjänsten.
 Du måste betala för att använda denna tjänst.

diff --git a/locale/uk/cups_uk b/locale/uk/cups_uk
index 35997d4e5340cad2d7476c75cdf159b6deb1627e..f9ff9801458cfc0fbb51874e2cbc7c9f426b8b2a 100644 (file)
--- a/locale/uk/cups_uk
+++ b/locale/uk/cups_uk
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Installed Options
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/uk_UA.cp1251/cups_uk_UA.cp1251 b/locale/uk_UA.cp1251/cups_uk_UA.cp1251
index 90be64670aaa6d6b612a4f0413872c38155e550d..6d5d6c8d6c1e92f45a10c9930976cc6fbb9aaa97 100644 (file)
--- a/locale/uk_UA.cp1251/cups_uk_UA.cp1251
+++ b/locale/uk_UA.cp1251/cups_uk_UA.cp1251
@@ -109,6 +109,7 @@ Top
 Filename(s)
 Print
 Installed Options
+Auto
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.

diff --git a/locale/zh_CN/cups_zh_CN b/locale/zh_CN/cups_zh_CN
index f82229e95b5e9e56a19241d6248194ef4883ceeb..6511496b0895ebfcea9d239038e0ce8862a1511e 100644 (file)
--- a/locale/zh_CN/cups_zh_CN
+++ b/locale/zh_CN/cups_zh_CN
@@ -109,6 +109,7 @@ Gamma 校正：
 文件名
 打印
 Options Installed
+Auto
 400 您的浏览器发送了一个本服务器不理解的请求。
 本服务器无法确认您有权访问该资源。
 您必须付费来访问本服务器。