Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.3.4@4306 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES.txt

@@ -1,202 +1,6 @@
-CHANGES.txt - 2008-04-01
+CHANGES.txt - 2007-10-30
 ------------------------
 
-CHANGES IN CUPS V1.3.7
-
-	- CVE-2008-0047: cgiCompileSearch buffer overflow (STR #2729)
-	- CVE-2008-1373: CUPS GIF image filter overflow (STR #2765)
-	- Updated the "make check" tests to do a more thorough
-	  automated test.
-	- cups-driverd complained about missing directories (STR
-	  #2777)
-	- cupsaddsmb would leave the Samba username and password on
-	  disk if no Windows drivers were installed (STR #2779)
-	- The Linux USB backend used 100% CPU when a printer was
-	  disconnected (STR #2769)
-	- The sample raster drivers did not properly handle SIGTERM
-	  (STR #2770)
-	- The scheduler sent notify_post() messages too often on
-	  Mac OS X.
-	- Kerberos access to the web interface did not work
-	  (STR #2748)
-	- The scheduler did not support "AuthType Default" in IPP
-	  policies (STR #2749)
-	- The scheduler did not support the "HideImplicitMembers"
-	  directive as documented (STR #2760)
-	- "make check" didn't return a non-zero exit code on
-	  error (STR #2758)
-	- The scheduler incorrectly logged AUTH_foo environment
-	  variables in debug mode (STR #2751)
-	- The image filters inverted PBM files (STR #2746)
-	- cupsctl would crash if the scheduler was not running
-	  (STR #2741)
-	- The scheduler could crash when printing using a port
-	  monitor (STR #2742)
-	- The scheduler would crash if PAM was broken (STR #2734)
-	- The image filters did not work with some CMYK JPEG files
-	  produced by Adobe applications (STR #2727)
-	- The Mac OS X USB backend did not work with printers that
-	  did not report a make or model.
-	- The job-sheets option was not encoded properly (STR #2715)
-	- The scheduler incorrectly complained about missing LSB
-	  PPD directories.
-
-
-CHANGES IN CUPS V1.3.6
-
-	- Documentation updates (STR #2646, STR #2647, STR #2649)
-	- Fixed a problem with the web interface "Use Kerberos
-	  Authentication" check box (STR #2703)
-	- The scheduler unconditionally overwrote the printer-state-
-	  message with "process-name failed" when a filter or backend
-	  failed, preventing a useful error message from being shown
-	  to the user.
-	- Policies on CUPS-Move-Job didn't work as expected (STR
-	  #2699)
-	- The configure script only supported D-BUS on Linux
-	  (STR #2702)
-	- The scheduler did not support </LimitExcept> (STR #2701)
-	- The scheduler did not reset the job-hold-until attribute
-	  after a job's hold time was reached.
-	- The scheduler did not support printer supply attributes
-	  (STR #1307)
-	- The Kerberos credentials provided by some Windows KDCs
-	  were still too large - now use a dynamic buffer to
-	  support credentials up to 64k in size (STR #2695)
-	- Printing a test page from the web interface incorrectly
-	  defaulted to the "guest" user (STR #2688)
-	- The cupsEncodeOptions2() function did not parse multiple-
-	  value attribute values properly (STR #2690)
-	- The scheduler incorrectly sent printer-stopped events for
-	  status updates from the print filters (STR #2680)
-	- The IPP backend could crash when handling printer errors
-	  (STR #2667)
-	- Multi-file jobs did not print to remote CUPS servers
-	  (STR #2673)
-	- The scheduler did not provide the Apple language ID to
-	  job filters.
-	- Kerberos authentication did not work with the web
-	  interface (STR #2606, STR #2669)
-	- The requesing-user-name-allowed and -denied functionality
-	  did not work for Kerberos-authenticated usernames (STR
-	  #2670)
-	- CUPS didn't compile on HP-UX 11i (STR #2679)
-	- cupsEncodeOptions2() did not handle option values like
-	  "What's up, doc?" properly.
-	- Added lots of memory allocation checks (Fortify)
-	- The scheduler would crash if it was unable to add a job
-	  file (Fortify)
-	- ppdOpen*() did not check all memory allocations (Coverity)
-	- ippReadIO() did not check all memory allocations (Coverity)
-	- The PostScript filter did not detect read errors (Coverity)
-	- The scheduler did not check for a missing job-sheets-completed
-	  attribute when sending an event notification (Coverity)
-	- "Set Printer Options" might not work with raw queues (Coverity)
-	- cupsRasterInterpretPPD() could crash on certain PostScript
-	  errors (Coverity)
-	- The USB backend did not check for back-channel support
-	  properly on all systems (Coverity)
-	- Fixed memory leaks in the GIF and PNM image loading code
-	  (Coverity)
-	- Removed some dead code in the CUPS API and scheduler (Coverity)
-	- Fixed two overflow bugs in the HP-GL/2 filter (Coverity)
-	- Fixed another ASN1 string parsing bug (STR #2665)
-	- The RSS notifier directory was not installed with the
-	  correct permissions.
-	- The standard CUPS backends could use 100% CPU while waiting
-	  for print data (STR #2664)
-	- Filename-based MIME rules did not work (STR #2659)
-	- The cups-polld program did not exit if the scheduler crashed
-	  (STR #2640)
-	- The scheduler would crash if you tried to set the port-monitor
-	  on a raw queue (STR #2639)
-	- The scheduler could crash if a polled remote printer was
-	  converted to a class (STR #2656)
-	- The web interface and cupsctl did not correctly reflect
-	  the "allow printing from the Internet" state (STR #2650)
-	- The scheduler incorrectly treated MIME types as case-
-	  sensitive (STR #2657)
-	- The Java support classes did not send UTF-8 strings to
-	  the scheduler (STR #2651)
-	- The CGI code did not handle interrupted POST requests
-	  properly (STR #2652)
-	- The PostScript filter incorrectly handled number-up when
-	  the number of pages was evenly divisible by the number-up
-	  value.
-	- The PDF filter incorrectly filtered pages when page-ranges
-	  and number-up were both specified (STR #2643)
-	- The IPP backend did not handle printing of pictwps files
-	  to a non-Mac CUPS server properly.
-	- The scheduler did not detect network interface changes
-	  on operating systems other than Mac OS X (STR #2631)
-	- The scheduler now logs the UNIX error message when it
-	  is unable to create a request file such as a print job.
-	- Added support for --enable-pie on Mac OS X.
-
-
-CHANGES IN CUPS V1.3.5
-
-	- The SNMP backend did not check for negative string
-	  lengths (STR #2589)
-	- The scheduler incorrectly removed auth-info attributes,
-	  potentially leading to a loss of all options for a job.
-	- The scheduler stopped sending CUPS browse packets on a
-	  restart when using fixed addresses (STR #2618)
-	- Fixed PDF filter security issues (CVE-2007-4352
-	  CVE-2007-5392 CVE-2007-5393)
-	- Changing settings would always change the DefaultAuthType
-	  and Allow lines (STR #2580)
-	- The scheduler would crash when submitting an undefined
-	  format file from Samba with LogLevel debug2 (STR #2600)
-	- The scheduler did not use poll() when epoll() was not
-	  supported by the running kernel (STR #2582)
-	- Fixed a compile problem with Heimdal Kerberos (STR #2592)
-	- The USB backend now retries connections to a printer
-	  indefinitely rather than stopping the queue.
-	- Printers with untranslated JCL options were not exported
-	  to Samba correctly (STR #2570)
-	- The USB backend did not work with some Minolta USB
-	  printers (STR #2604)
-	- The strcasecmp() emulation code did not compile (STR
-	  #2612)
-	- The scheduler would crash if a job was sent to an empty
-	  class (STR #2605)
-	- The lpc command did not work in non-UTF-8 locales (STR
-	  #2595)
-	- Subscriptions for printer-stopped events also received
-	  other state changes (STR #2572)
-	- cupstestppd incorrectly reported translation errors for
-	  the "en" locale.
-	- ppdOpen() did not handle custom options properly when the
-	  Custom attribute appeared before the OpenUI for that
-	  option.
-	- The scheduler could crash when deleting a printer or
-	  listing old jobs.
-	- The Mac OS X USB backend did not allow for requeuing of
-	  jobs submitted to a class.
-	- lpmove didn't accept a job ID by itself.
-	- The scheduler incorrectly removed job history information
-	  for remote print jobs.
-	- The scheduler incorrectly sent the
-	  "com.apple.printerListChanged" message for printer state
-	  changes.
-	- The PostScript filter drew the page borders (when enabled)
-	  outside the imageable area.
-	- The LPD and IPP backends did not default to the correct
-	  port numbers when using alternate scheme names.
-	- The scheduler incorrectly deleted hardwired remote
-	  printers on system sleep.
-	- The scheduler would abort if a bad browse protocol name
-	  was listed in the cupsd.conf file.
-	- The online cupsd.conf help file incorrectly showed
-	  "dns-sd" instead of "dnssd" for Bonjour sharing.
-	- The scheduler could crash changing the port-monitor value.
-	- The scheduler generated CoreFoundation errors when run as
-	  a background process.
-	- When printing with number-up > 1, it was possible to get
-	  an extra blank page.
-
-
 CHANGES IN CUPS V1.3.4
 
 	- Documentation updates (STR #2560, STR #2563, STR #2569)

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.3.7 - 2008-04-01
+INSTALL - CUPS v1.3.2 - 2007-09-18
 ----------------------------------
 
 This file describes how to compile and install CUPS from source
@@ -31,8 +31,9 @@ BEFORE YOU BEGIN
     compile and run without these, however you'll miss out on
     many of the features provided by CUPS.
 
-    Kerberos support requires MIT Kerberos 1.6.3 or later or
-    or Heimdal Kerberos, along with the corresponding GSSAPI
+    Kerberos support requires a very recent version of the MIT
+    implementation with the krb5_cc_new_unique() function or the
+    Heimdal implementation, along with the corresponding GSSAPI
     pieces.
 
     Also, please note that CUPS no longer includes the
@@ -46,7 +47,7 @@ COMPILING FROM SUBVERSION
 
     The CUPS Subversion repository doesn't hold a copy of the
     pre-built configure script.  You'll need to run the GNU
-    autoconf software (2.60 or higher) before compiling the
+    autoconf software (2.52 or higher) before compiling the
     software from Subversion:
 
 	autoconf -f

Makedefs.in

@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -108,17 +108,17 @@ INSTALLSTATIC	=	@INSTALLSTATIC@
 #               for extra debug info)
 #
 
-ALL_CFLAGS	=	-I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
-ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+ALL_CFLAGS	=	$(CFLAGS) $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
+			$(OPTIONS)
 ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
-CFLAGS		=	@CPPFLAGS@ @CFLAGS@
+CFLAGS		=	-I.. @CPPFLAGS@ @CFLAGS@ \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 COMMONLIBS	=	@LIBS@
 CUPSDLIBS	=	@CUPSDLIBS@
-CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+CXXFLAGS	=	-I.. $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 CXXLIBS		=	@CXXLIBS@
 DSOFLAGS	=	@DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
@@ -258,7 +258,7 @@ DBUSDIR		=	@DBUSDIR@
 
 .cxx.o:
 	echo Compiling $<...
-	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+	$(CXX) $(ARCHFLAGS) $(OPTIM) $(CXXFLAGS) -c $<
 
 .man.1 .man.1m .man.5 .man.7 .man.8:
 	echo Linking $<...

Makefile

@@ -31,10 +31,6 @@ DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
 
 all:
 	chmod +x cups-config
-	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
-	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
-	echo Using LDFLAGS="$(LDFLAGS)"
-	echo Using LIBS="$(LIBS)"
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
 		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
@@ -58,10 +54,10 @@ clean:
 
 distclean:	clean
 	$(RM) Makedefs config.h config.log config.status
-	$(RM) cups-config
-	$(RM) conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
-	$(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html
-	$(RM) init/cups.sh init/cups-lpd init/org.cups.cups-lpd.plist
+	$(RM) cups-config conf/cupsd.conf conf/pam.std
+	$(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html
+	$(RM) doc/index.html
+	$(RM) init/cups.sh init/cups-lpd
 	$(RM) man/client.conf.man
 	$(RM) man/cups-deviced.man man/cups-driverd.man
 	$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v1.3.7 - 2008-04-01
+README - CUPS v1.3.2 - 2007-09-18
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
@@ -153,9 +153,9 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2008 Apple Inc.  All Rights Reserved.
-    CUPS, the CUPS logo, and the Common UNIX Printing System are
-    trademarks of Apple Inc.
+    CUPS is Copyright 2007 by Apple Inc.  CUPS, the CUPS logo, and
+    the Common UNIX Printing System are the trademark property of
+    Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
 

backend/ieee1284.c

@@ -64,23 +64,19 @@ backendGetDeviceID(
     char       *uri,			/* O - Device URI */
     int        uri_size)		/* I - Size of buffer */
 {
-#ifdef __APPLE__ /* This function is a no-op */
-  return (-1);
-
-#else /* Get the device ID from the specified file descriptor... */
   char	*attr,				/* 1284 attribute */
   	*delim,				/* 1284 delimiter */
 	*uriptr,			/* Pointer into URI */
 	manufacturer[256],		/* Manufacturer string */
 	serial_number[1024];		/* Serial number string */
   int	manulen;			/* Length of manufacturer string */
-#  ifdef __linux
+#ifdef __linux
   int	length;				/* Length of device ID info */
   int   got_id = 0;
-#  endif /* __linux */
-#  if defined(__sun) && defined(ECPPIOC_GETDEVID)
+#endif /* __linux */
+#if defined(__sun) && defined(ECPPIOC_GETDEVID)
   struct ecpp_device_id did;		/* Device ID buffer */
-#  endif /* __sun && ECPPIOC_GETDEVID */
+#endif /* __sun && ECPPIOC_GETDEVID */
 
 
   DEBUG_printf(("backendGetDeviceID(fd=%d, device_id=%p, device_id_size=%d, "
@@ -110,7 +106,7 @@ backendGetDeviceID(
 
     *device_id = '\0';
 
-#  ifdef __linux
+#ifdef __linux
   if (ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
   {
    /*
@@ -125,6 +121,7 @@ backendGetDeviceID(
     {
       char	devparport[16];		/* /dev/parportN */
       int	devparportfd,		/* File descriptor for raw device */
+		status,			/* ioctl status */
 		mode;			/* Port mode */
 
 
@@ -145,7 +142,7 @@ backendGetDeviceID(
 
 	if (!ioctl(devparportfd, PPCLAIM))
 	{
-          fcntl(devparportfd, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK);
+          fcntl(devparport, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK);
 
 	  mode = IEEE1284_MODE_COMPAT;
 
@@ -217,13 +214,13 @@ backendGetDeviceID(
       memmove(device_id, device_id + 2, length);
       device_id[length] = '\0';
     }
-#    ifdef DEBUG
+#  ifdef DEBUG
     else
       printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
-#    endif /* DEBUG */
-#  endif /* __linux */
+#  endif /* DEBUG */
+#endif /* __linux */
 
-#   if defined(__sun) && defined(ECPPIOC_GETDEVID)
+#if defined(__sun) && defined(ECPPIOC_GETDEVID)
     did.mode = ECPP_CENTRONICS;
     did.len  = device_id_size - 1;
     did.rlen = 0;
@@ -240,11 +237,11 @@ backendGetDeviceID(
       else
 	device_id[device_id_size - 1] = '\0';
     }
-#    ifdef DEBUG
+#  ifdef DEBUG
     else
       printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
-#    endif /* DEBUG */
-#  endif /* __sun && ECPPIOC_GETDEVID */
+#  endif /* DEBUG */
+#endif /* __sun && ECPPIOC_GETDEVID */
   }
 
   DEBUG_printf(("backendGetDeviceID: device_id=\"%s\"\n", device_id));
@@ -373,7 +370,6 @@ backendGetDeviceID(
   }
 
   return (0);
-#endif /* __APPLE__ */
 }
 
 
@@ -479,41 +475,15 @@ backendGetMakeModel(
 
     if (mfg)
     {
-     /*
-      * Skip leading whitespace...
-      */
-
-      while (isspace(*mfg & 255))
-        mfg ++;
-
-     /*
-      * Map common bad names to the ones we use for driver selection...
-      */
-
       if (!strncasecmp(mfg, "Hewlett-Packard", 15))
 	strlcpy(make_model, "HP", make_model_size);
       else if (!strncasecmp(mfg, "Lexmark International", 21))
 	strlcpy(make_model, "Lexmark", make_model_size);
       else
-      {
-       /*
-        * Use the manufacturer that is supplied...
-	*/
-
 	strlcpy(make_model, mfg, make_model_size);
 
-	if ((delim = strchr(make_model, ';')) != NULL)
-	  *delim = '\0';
-
-       /*
-        * But strip trailing whitespace...
-	*/
-
-	for (delim = make_model + strlen(make_model) - 1;
-	     delim > make_model && *delim == ' ';
-	     delim --)
-	  *delim = '\0';
-      }
+      if ((delim = strchr(make_model, ';')) != NULL)
+	*delim = '\0';
 
       if (!strncasecmp(make_model, mdl, strlen(make_model)))
       {
@@ -529,9 +499,6 @@ backendGetMakeModel(
 	* Concatenate the make and model...
 	*/
 
-        while (isspace(*mdl & 255))
-	  mdl ++;
-
 	strlcat(make_model, " ", make_model_size);
 	strlcat(make_model, mdl, make_model_size);
       }
@@ -542,9 +509,6 @@ backendGetMakeModel(
       * Just copy model string, since it has the manufacturer...
       */
 
-      while (isspace(*mdl & 255))
-	mdl ++;
-
       strlcpy(make_model, mdl, make_model_size);
     }
   }
@@ -554,9 +518,6 @@ backendGetMakeModel(
     * Use description...
     */
 
-    while (isspace(*attr & 255))
-      attr ++;
-
     if (!strncasecmp(attr, "Hewlett-Packard hp ", 19))
     {
      /*
@@ -592,11 +553,6 @@ backendGetMakeModel(
   if ((delim = strchr(make_model, ';')) != NULL)
     *delim = '\0';
 
-  for (delim = make_model + strlen(make_model) - 1;
-       delim > make_model && *delim == ' ';
-       delim --)
-    *delim = '\0';
-
  /*
   * Strip trailing whitespace...
   */

backend/ipp.c

@@ -3,7 +3,7 @@
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -236,9 +236,6 @@ main(int  argc,				/* I - Number of command-line args */
     return (CUPS_BACKEND_STOP);
   }
 
-  if (!port)
-    port = IPP_PORT;			/* Default to port 631 */
-
   if (!strcmp(method, "https"))
     cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
   else
@@ -521,8 +518,8 @@ main(int  argc,				/* I - Number of command-line args */
 	              _("INFO: Unable to contact printer, queuing on next "
 			"printer in class...\n"));
 
-        if (tmpfilename[0])
-	  unlink(tmpfilename);
+        if (argc == 6 || strcmp(filename, argv[6]))
+	  unlink(filename);
 
        /*
         * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -579,8 +576,8 @@ main(int  argc,				/* I - Number of command-line args */
 
   if (job_cancelled)
   {
-    if (tmpfilename[0])
-      unlink(tmpfilename);
+    if (argc == 6 || strcmp(filename, argv[6]))
+      unlink(filename);
 
     return (CUPS_BACKEND_FAILED);
   }
@@ -765,8 +762,8 @@ main(int  argc,				/* I - Number of command-line args */
       ippDelete(supported);
       httpClose(http);
 
-      if (tmpfilename[0])
-	unlink(tmpfilename);
+      if (argc == 6 || strcmp(filename, argv[6]))
+	unlink(filename);
 
      /*
       * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -865,13 +862,12 @@ main(int  argc,				/* I - Number of command-line args */
     num_options = cupsParseOptions(argv[5], 0, &options);
 
 #ifdef __APPLE__
-    if (!strcasecmp(final_content_type, "application/pictwps") &&
-        num_files == 1)
+    if (!strcasecmp(content_type, "application/pictwps") && num_files == 1)
     {
       if (format_sup != NULL)
       {
 	for (i = 0; i < format_sup->num_values; i ++)
-	  if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
+	  if (!strcasecmp(content_type, format_sup->values[i].string.text))
 	    break;
       }
 
@@ -882,18 +878,10 @@ main(int  argc,				/* I - Number of command-line args */
 	* so convert the document to PostScript...
 	*/
 
-	if (run_pictwps_filter(argv, files[0]))
-	{
-	  if (pstmpname[0])
-	    unlink(pstmpname);
-
-	  if (tmpfilename[0])
-	    unlink(tmpfilename);
-
+	if (run_pictwps_filter(argv, filename))
 	  return (CUPS_BACKEND_FAILED);
-        }
 
-        files[0] = pstmpname;
+        filename = pstmpname;
 
        /*
 	* Change the MIME type to application/postscript and change the
@@ -1689,6 +1677,7 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
 
     _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
 		    strerror(errno));
+    unlink(filename);
     if (ppdfile)
       unlink(ppdfile);
     return (-1);
@@ -1703,6 +1692,7 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
     _cupsLangPrintf(stderr, _("ERROR: Unable to wait for pictwpstops: %s\n"),
 		    strerror(errno));
     close(fd);
+    unlink(filename);
     if (ppdfile)
       unlink(ppdfile);
     return (-1);
@@ -1722,6 +1712,7 @@ run_pictwps_filter(char       **argv,	/* I - Command-line arguments */
       _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d!\n"),
 		      status);
 
+    unlink(filename);
     return (status);
   }
 

backend/lpd.c

@@ -201,9 +201,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 		  hostname, sizeof(hostname), &port,
 		  resource, sizeof(resource));
 
-  if (!port)
-    port = 515;				/* Default to port 515 */
-
   if (!username[0])
   {
    /*

backend/pap.c

@@ -1,7 +1,7 @@
 /*
 * "$Id$"
 *
-* Copyright 2004-2008 Apple Inc. All rights reserved.
+* © Copyright 2004 Apple Computer, Inc. All rights reserved.
 * 
 * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
 * Inc. ("Apple") in consideration of your agreement to the following
@@ -70,16 +70,6 @@
 *  signalHandler()	 - handle SIGINT to close the session before quiting.
 */
 
-/*
- * This backend uses deprecated APIs for AppleTalk; we know this, so
- * silence any warnings about it...
- */
-
-#ifdef MAC_OS_X_VERSION_MIN_REQUIRED
-#  undef MAC_OS_X_VERSION_MIN_REQUIRED
-#endif /* MAX_OS_X_VERSION_MIN_REQUIRED */
-#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_0
-
 #include <config.h>
 
 #include <stdio.h>
@@ -95,17 +85,17 @@
 #include <sys/time.h>
 #include <sys/errno.h>
 
-#include <cups/cups.h>
-#include <cups/backend.h>
-#include <cups/sidechannel.h>
-#include <cups/i18n.h>
-
 #include <netat/appletalk.h>
 #include <netat/atp.h>
 #include <netat/ddp.h>
 #include <netat/nbp.h>
 #include <netat/pap.h>
 
+#include <cups/cups.h>
+#include <cups/backend.h>
+#include <cups/sidechannel.h>
+#include <cups/i18n.h>
+
 #include <libkern/OSByteOrder.h>
 
 #ifdef HAVE_APPLETALK_AT_PROTO_H

backend/runloop.c

@@ -3,7 +3,7 @@
  *
  *   Common run loop APIs for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -216,7 +216,7 @@ backendRunLoop(
       FD_SET(CUPS_SC_FD, &input);
 
     FD_ZERO(&output);
-    if (print_bytes || (!use_bc && !side_cb))
+    if (print_bytes || !use_bc)
       FD_SET(device_fd, &output);
 
     if (use_bc || side_cb)

backend/snmp.c

@@ -1064,38 +1064,18 @@ asn1_get_string(
     char          *string,		/* I  - String buffer */
     int           strsize)		/* I  - String buffer size */
 {
-  if (length < 0)
+  if (length < strsize)
   {
-   /*
-    * Disallow negative lengths!
-    */
-
-    fprintf(stderr, "ERROR: Bad ASN1 string length %d!\n", length);
-    *string = '\0';
-  }
-  else if (length < strsize)
-  {
-   /*
-    * String is smaller than the buffer...
-    */
-
-    if (length > 0)
-      memcpy(string, *buffer, length);
-
+    memcpy(string, *buffer, length);
     string[length] = '\0';
   }
   else
   {
-   /*
-    * String is larger than the buffer...
-    */
-
-    memcpy(string, *buffer, strsize - 1);
+    memcpy(string, buffer, strsize - 1);
     string[strsize - 1] = '\0';
   }
 
-  if (length > 0)
-    (*buffer) += length;
+  (*buffer) += length;
 
   return (string);
 }

backend/usb-darwin.c

@@ -1,7 +1,7 @@
 /*
 * "$Id$"
 *
-* Copyright 2005-2008 Apple Inc. All rights reserved.
+* Copyright � 2005-2007 Apple Inc. All rights reserved.
 *
 * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
 * Inc. ("Apple") in consideration of your agreement to the following
@@ -83,7 +83,6 @@
 #include <fcntl.h>
 #include <termios.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <libgen.h>
 #include <mach/mach.h>
@@ -92,7 +91,6 @@
 #include <cups/debug.h>
 #include <cups/sidechannel.h>
 #include <cups/i18n.h>
-#include "backend-private.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/usb/IOUSBLib.h>
@@ -316,8 +314,7 @@ print_device(const char *uri,		/* I - Device URI */
   OSStatus	  status;		/* Function results */
   pthread_t	  read_thread_id,	/* Read thread */
 		  sidechannel_thread_id;/* Side-channel thread */
-  int		  have_sidechannel = 0;	/* Was the side-channel thread started? */
-  struct stat     sidechannel_info;	/* Side-channel file descriptor info */
+  int		  sidechannel_started = 0;/* Was the side-channel thread started? */
   char		  print_buffer[8192],	/* Print data buffer */
 		  *print_ptr;		/* Pointer into print data buffer */
   UInt32	  location;		/* Unique location in bus topology */
@@ -332,17 +329,6 @@ print_device(const char *uri,		/* I - Device URI */
   struct timespec cond_timeout;		/* pthread condition timeout */
 
 
- /*
-  * See if the side-channel descriptor is valid...
-  */
-
-  have_sidechannel = !fstat(CUPS_SC_FD, &sidechannel_info) &&
-                     S_ISSOCK(sidechannel_info.st_mode);
-
- /*
-  * Localize using CoreFoundation...
-  */
-
   setup_cfLanguage();
 
   parse_options(options, serial, sizeof(serial), &location, &g.wait_eof);
@@ -456,14 +442,21 @@ print_device(const char *uri,		/* I - Device URI */
   }
 
  /*
-  * Start the side channel thread if the descriptor is valid...
+  * Start the side channel thread only if the descriptor is valid
+  * (i.e. it's not when the backend is used for auto-setup)...
   */
 
   pthread_mutex_init(&g.readwrite_lock_mutex, NULL);
   pthread_cond_init(&g.readwrite_lock_cond, NULL);
   g.readwrite_lock = 1;
 
-  if (have_sidechannel)
+  FD_ZERO(&input_set);
+  FD_SET(CUPS_SC_FD, &input_set);
+
+  stimeout.tv_sec  = 0;
+  stimeout.tv_usec = 0;
+
+  if ((select(CUPS_SC_FD+1, &input_set, NULL, NULL, &stimeout)) >= 0)
   {
     g.sidechannel_thread_stop = 0;
     g.sidechannel_thread_done = 0;
@@ -476,6 +469,8 @@ print_device(const char *uri,		/* I - Device URI */
       _cupsLangPuts(stderr, _("WARNING: Couldn't create side channel\n"));
       return CUPS_BACKEND_STOP;
     }
+
+    sidechannel_started = 1;
   }
 
  /*
@@ -674,7 +669,7 @@ print_device(const char *uri,		/* I - Device URI */
   * Wait for the side channel thread to exit...
   */
 
-  if (have_sidechannel)
+  if (sidechannel_started)
   {
     close(CUPS_SC_FD);
     pthread_mutex_lock(&g.readwrite_lock_mutex);
@@ -1009,21 +1004,25 @@ static Boolean list_device_cb(void *refcon,
     {
       CFStringRef make = NULL,  model = NULL, serial = NULL;
       char uristr[1024], makestr[1024], modelstr[1024], serialstr[1024];
-      char optionsstr[1024], idstr[1024], make_modelstr[1024];
+      char optionsstr[1024], idstr[1024];
 
       copy_deviceinfo(deviceIDString, &make, &model, &serial);
-      CFStringGetCString(deviceIDString, idstr, sizeof(idstr),
-                         kCFStringEncodingUTF8);
-      backendGetMakeModel(idstr, make_modelstr, sizeof(make_modelstr));
 
       modelstr[0] = '/';
 
-      if (!CFStringGetCString(make, makestr, sizeof(makestr),
-			      kCFStringEncodingUTF8))
+      CFStringGetCString(deviceIDString, idstr, sizeof(idstr),
+                         kCFStringEncodingUTF8);
+
+      if (make)
+        CFStringGetCString(make, makestr, sizeof(makestr),
+	                   kCFStringEncodingUTF8);
+      else
         strcpy(makestr, "Unknown");
 
-      if (!CFStringGetCString(model, &modelstr[1], sizeof(modelstr)-1,
-			      kCFStringEncodingUTF8))
+      if (model)
+	CFStringGetCString(model, &modelstr[1], sizeof(modelstr)-1,
+      			   kCFStringEncodingUTF8);
+      else
         strcpy(modelstr + 1, "Printer");
 
       optionsstr[0] = '\0';
@@ -1038,8 +1037,18 @@ static Boolean list_device_cb(void *refcon,
       httpAssembleURI(HTTP_URI_CODING_ALL, uristr, sizeof(uristr), "usb", NULL, makestr, 0, modelstr);
       strncat(uristr, optionsstr, sizeof(uristr));
 
-      printf("direct %s \"%s\" \"%s USB\" \"%s\"\n", uristr, make_modelstr,
-             make_modelstr, idstr);
+     /*
+      * Fix common HP 1284 bug...
+      */
+
+      if (!strcasecmp(makestr, "Hewlett-Packard"))
+        strcpy(makestr, "HP");
+
+      if (!strncasecmp(modelstr + 1, "hp ", 3))
+        _cups_strcpy(modelstr + 1, modelstr + 4);
+
+      printf("direct %s \"%s %s\" \"%s %s USB\" \"%s\"\n", uristr, makestr,
+             &modelstr[1], makestr, &modelstr[1], idstr);
 
       release_deviceinfo(&make, &model, &serial);
       CFRelease(deviceIDString);
@@ -1141,22 +1150,6 @@ static void status_timer_cb(CFRunLoopTimerRef timer,
 {
   fputs("STATE: +offline-error\n", stderr);
   _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
-
-  if (getenv("CLASS") != NULL)
-  {
-   /*
-    * If the CLASS environment variable is set, the job was submitted
-    * to a class and not to a specific queue.  In this case, we want
-    * to abort immediately so that the job can be requeued on the next
-    * available printer in the class.
-    *
-    * Sleep 5 seconds to keep the job from requeuing too rapidly...
-    */
-
-    sleep(5);
-
-    exit(CUPS_BACKEND_FAILED);
-  }
 }
 
 
@@ -1175,19 +1168,9 @@ static void copy_deviceinfo(CFStringRef deviceIDString,
   CFStringRef serialKeys[] = { CFSTR("SN:"),  CFSTR("SERN:"), NULL };
 
   if (make != NULL)
-  {
-    if ((*make = copy_value_for_key(deviceIDString, makeKeys)) == NULL)
-      *make = CFStringCreateWithCString(kCFAllocatorDefault, "Unknown",
-                                        kCFStringEncodingUTF8);
-  }
-
+    *make = copy_value_for_key(deviceIDString, makeKeys);
   if (model != NULL)
-  {
-    if ((*model = copy_value_for_key(deviceIDString, modelKeys)) == NULL)
-      *model = CFStringCreateWithCString(kCFAllocatorDefault, "Printer",
-                                         kCFStringEncodingUTF8);
-  }
-
+    *model = copy_value_for_key(deviceIDString, modelKeys);
   if (serial != NULL)
     *serial = copy_value_for_key(deviceIDString, serialKeys);
 }
@@ -1680,7 +1663,7 @@ static void parse_options(char *options,
 
 /*!
  * @function	setup_cfLanguage
- * @abstract	Convert the contents of the CUPS 'APPLE_LANGUAGE' environment
+ * @abstract	Convert the contents of the CUPS 'LANG' environment
  *		variable into a one element CF array of languages.
  *
  * @discussion	Each submitted job comes with a natural language. CUPS passes
@@ -1696,9 +1679,7 @@ static void setup_cfLanguage(void)
   CFArrayRef	langArray = NULL;
   const char	*requestedLang = NULL;
 
-  if ((requestedLang = getenv("APPLE_LANGUAGE")) == NULL)
-    requestedLang = getenv("LANG");
-
+  requestedLang = getenv("LANG");
   if (requestedLang != NULL)
   {
     lang[0] = CFStringCreateWithCString(kCFAllocatorDefault, requestedLang, kCFStringEncodingUTF8);
@@ -1711,7 +1692,7 @@ static void setup_cfLanguage(void)
     CFRelease(langArray);
   }
   else
-    fputs("DEBUG: usb: LANG and APPLE_LANGUAGE environment variables missing.\n", stderr);
+    fputs("DEBUG: usb: LANG environment variable missing.\n", stderr);
 }
 
 #pragma mark -

backend/usb-unix.c

@@ -90,8 +90,8 @@ print_device(const char *uri,		/* I - Device URI */
 
     use_bc = strcasecmp(hostname, "Brother") &&
              strcasecmp(hostname, "Canon") &&
-             strncasecmp(hostname, "Konica", 6) &&
-             strncasecmp(hostname, "Minolta", 7);
+             strcasecmp(hostname, "Konica Minolta") &&
+             strcasecmp(hostname, "Minolta");
 #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
 
     if ((device_fd = open_device(uri, &use_bc)) == -1)
@@ -345,7 +345,7 @@ open_device(const char *uri,		/* I - Device URI */
     * Find the correct USB device...
     */
 
-    for (;;)
+    do
     {
       for (busy = 0, i = 0; i < 16; i ++)
       {
@@ -414,11 +414,21 @@ open_device(const char *uri,		/* I - Device URI */
       */
 
       if (busy)
+      {
 	_cupsLangPuts(stderr,
 	              _("INFO: Printer busy; will retry in 5 seconds...\n"));
-
-      sleep(5);
+	sleep(5);
+      }
     }
+    while (busy);
+
+   /*
+    * Couldn't find the printer, return "no such device or address"...
+    */
+
+    errno = ENODEV;
+
+    return (-1);
   }
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
   {
@@ -515,7 +525,7 @@ open_device(const char *uri,		/* I - Device URI */
   }
 #else
   {
-    if (*use_bc)
+    if (use_bc)
       fd = open(uri + 4, O_RDWR | O_EXCL);
     else
       fd = -1;

berkeley/lpc.c

@@ -230,6 +230,7 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
   ipp_t		*request,		/* IPP Request */
 		*response;		/* IPP Response */
   ipp_attribute_t *attr;		/* Current attribute */
+  cups_lang_t	*language;		/* Default language */
   char		*printer,		/* Printer name */
 		*device,		/* Device URI */
                 *delimiter;		/* Char search result */
@@ -262,7 +263,18 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
   *    attributes-natural-language
   */
 
-  request = ippNewRequest(CUPS_GET_PRINTERS);
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_GET_PRINTERS;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
 
   ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                 "requested-attributes", sizeof(requested) / sizeof(requested[0]),

cgi-bin/admin.c

@@ -3,7 +3,7 @@
  *
  *   Administration CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1333,12 +1333,12 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 			*remote_printers,
 					/* REMOTE_PRINTERS value */
 			*share_printers,/* SHARE_PRINTERS value */
-			*user_cancel_any;
-					/* USER_CANCEL_ANY value */
 #ifdef HAVE_GSSAPI
-    char		default_auth_type[255];
+			*default_auth_type,
 					/* DefaultAuthType value */
 #endif /* HAVE_GSSAPI */
+			*user_cancel_any;
+					/* USER_CANCEL_ANY value */
 
 
    /*
@@ -1351,6 +1351,11 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     remote_printers   = cgiGetVariable("REMOTE_PRINTERS") ? "1" : "0";
     share_printers    = cgiGetVariable("SHARE_PRINTERS") ? "1" : "0";
     user_cancel_any   = cgiGetVariable("USER_CANCEL_ANY") ? "1" : "0";
+#ifdef HAVE_GSSAPI
+    default_auth_type = cgiGetVariable("KERBEROS") ? "Negotiate" : "Basic";
+
+    fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
+#endif /* HAVE_GSSAPI */
 
    /*
     * Get the current server settings...
@@ -1367,27 +1372,6 @@ do_config_server(http_t *http)		/* I - HTTP connection */
       return;
     }
 
-#ifdef HAVE_GSSAPI
-   /*
-    * Get authentication settings...
-    */
-
-    if (cgiGetVariable("KERBEROS"))
-      strlcpy(default_auth_type, "Negotiate", sizeof(default_auth_type));
-    else
-    {
-      const char *val = cupsGetOption("DefaultAuthType", num_settings,
-                                      settings);
-
-      if (val && !strcasecmp(val, "Negotiate"))
-        strlcpy(default_auth_type, "Basic", sizeof(default_auth_type));
-      else
-        strlcpy(default_auth_type, val, sizeof(default_auth_type));
-    }
-
-    fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
-#endif /* HAVE_GSSAPI */
-
    /*
     * See if the settings have changed...
     */
@@ -1650,15 +1634,14 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * Allocate memory and load the file into a string buffer...
     */
 
-    if ((buffer = calloc(1, info.st_size + 1)) != NULL)
-    {
-      cupsFileRead(cupsd, buffer, info.st_size);
-      cgiSetVariable("CUPSDCONF", buffer);
-      free(buffer);
-    }
+    buffer = calloc(1, info.st_size + 1);
 
+    cupsFileRead(cupsd, buffer, info.st_size);
     cupsFileClose(cupsd);
 
+    cgiSetVariable("CUPSDCONF", buffer);
+    free(buffer);
+
    /*
     * Then get the default cupsd.conf file and put that into a string as
     * well...
@@ -1669,39 +1652,37 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
     {
-      if ((buffer = calloc(1, 2 * info.st_size + 1)) != NULL)
+      buffer = calloc(1, 2 * info.st_size + 1);
+      bufend = buffer + 2 * info.st_size - 1;
+
+      for (bufptr = buffer;
+           bufptr < bufend && (ch = cupsFileGetChar(cupsd)) != EOF;)
       {
-	bufend = buffer + 2 * info.st_size - 1;
-
-	for (bufptr = buffer;
-	     bufptr < bufend && (ch = cupsFileGetChar(cupsd)) != EOF;)
+        if (ch == '\\' || ch == '\"')
 	{
-	  if (ch == '\\' || ch == '\"')
-	  {
-	    *bufptr++ = '\\';
-	    *bufptr++ = ch;
-	  }
-	  else if (ch == '\n')
-	  {
-	    *bufptr++ = '\\';
-	    *bufptr++ = 'n';
-	  }
-	  else if (ch == '\t')
-	  {
-	    *bufptr++ = '\\';
-	    *bufptr++ = 't';
-	  }
-	  else if (ch >= ' ')
-	    *bufptr++ = ch;
+	  *bufptr++ = '\\';
+	  *bufptr++ = ch;
 	}
-
-	*bufptr = '\0';
-
-	cgiSetVariable("CUPSDCONF_DEFAULT", buffer);
-	free(buffer);
+	else if (ch == '\n')
+	{
+	  *bufptr++ = '\\';
+	  *bufptr++ = 'n';
+	}
+	else if (ch == '\t')
+	{
+	  *bufptr++ = '\\';
+	  *bufptr++ = 't';
+	}
+	else if (ch >= ' ')
+	  *bufptr++ = ch;
       }
 
+      *bufptr = '\0';
+
       cupsFileClose(cupsd);
+
+      cgiSetVariable("CUPSDCONF_DEFAULT", buffer);
+      free(buffer);
     }
 
    /*
@@ -3090,7 +3071,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
     * Binary protocol support...
     */
 
-    if (ppd && ppd->protocols && strstr(ppd->protocols, "BCP"))
+    if (ppd->protocols && strstr(ppd->protocols, "BCP"))
     {
       protocol = ppdFindAttr(ppd, "cupsProtocol", NULL);
 

cgi-bin/ipp-var.c

@@ -3,7 +3,7 @@
  *
  *   CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -158,8 +158,6 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
     for (i = 0; i < num_attrs; i ++)
       free(attrs[i]);
   }
-
-  fclose(in);
 }
 
 
@@ -525,7 +523,8 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
   * See who is logged in...
   */
 
-  user = getenv("REMOTE_USER");
+  if ((user = getenv("REMOTE_USER")) == NULL)
+    user = "guest";
 
  /*
   * Locate the test page file...
@@ -563,9 +562,8 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
 
-  if (user)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-		 "requesting-user-name", NULL, user);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, user);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
                NULL, "Test Page");
@@ -595,11 +593,6 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
     snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
     cgiSetVariable("refresh_page", refresh);
   }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
 
   cgiStartHTML(cgiText(_("Print Test Page")));
 

cgi-bin/jobs.c

@@ -3,7 +3,7 @@
  *
  *   Job status CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -185,11 +185,6 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
     cgiFormEncode(url + 6, getenv("HTTP_REFERER"), sizeof(url) - 6);
     cgiSetVariable("refresh_page", url);
   }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
 
   cgiStartHTML(cgiText(_("Jobs")));
 

cgi-bin/printers.c

@@ -3,7 +3,7 @@
  *
  *   Printer status CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -280,11 +280,6 @@ print_command(http_t     *http,		/* I - Connection to server */
     snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
     cgiSetVariable("refresh_page", refresh);
   }
-  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
-  {
-    puts("Status: 401\n");
-    exit(0);
-  }
 
   cgiStartHTML(cgiText(_("Printer Maintenance")));
 

cgi-bin/search.c

@@ -3,7 +3,7 @@
  *
  *   Search routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -53,8 +53,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
   * Allocate a regular expression storage structure...
   */
 
-  if ((re = (regex_t *)calloc(1, sizeof(regex_t))) == NULL)
-    return (NULL);
+  re = (regex_t *)calloc(1, sizeof(regex_t));
 
  /*
   * Allocate a buffer to hold the regular expression string, starting
@@ -66,11 +65,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
   if (slen < 1024)
     slen = 1024;
 
-  if ((s = (char *)malloc(slen)) == NULL)
-  {
-    free(re);
-    return (NULL);
-  }
+  s = (char *)malloc(slen);
 
  /*
   * Copy the query string to the regular expression, handling basic
@@ -167,9 +162,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
       * string + RE overhead...
       */
 
-      wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
-      if (lword)
-        wlen += strlen(lword);
+      wlen = (sptr - s) + 4 * wlen + 2 * strlen(prefix) + 4;
 
       if (wlen > slen)
       {
@@ -234,13 +227,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
         char *lword2;			/* New "last word" */
 
 
-        if ((lword2 = strdup(sword)) == NULL)
-	{
-	  free(lword);
-	  free(s);
-	  free(re);
-	  return (NULL);
-	}
+        lword2 = strdup(sword);
 
         strcpy(sptr, ".*|.*");
 	sptr += 5;

cgi-bin/template.c

@@ -3,7 +3,7 @@
  *
  *   CGI template function.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -53,13 +53,6 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
   fprintf(stderr, "DEBUG2: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
           tmpl ? tmpl : "(null)");
 
- /*
-  * Range check input...
-  */
-
-  if (!tmpl || !out)
-    return;
-
  /*
   * Open the template file...
   */

cgi-bin/var.c

@@ -3,7 +3,7 @@
  *
  *   CGI form variable and array functions.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -322,15 +322,9 @@ cgiSetArray(const char *name,		/* I - Name of variable */
   {
     if (element >= var->avalues)
     {
-      const char **temp;		/* Temporary pointer */
-
-      temp = (const char **)realloc((void *)(var->values),
-                                    sizeof(char *) * (element + 16));
-      if (!temp)
-        return;
-
       var->avalues = element + 16;
-      var->values  = temp;
+      var->values  = (const char **)realloc((void *)(var->values),
+                                            sizeof(char *) * var->avalues);
     }
 
     if (element >= var->nvalues)
@@ -368,15 +362,9 @@ cgiSetSize(const char *name,		/* I - Name of variable */
 
   if (size >= var->avalues)
   {
-    const char **temp;			/* Temporary pointer */
-
-    temp = (const char **)realloc((void *)(var->values),
-				  sizeof(char *) * (size + 16));
-    if (!temp)
-      return;
-
     var->avalues = size + 16;
-    var->values  = temp;
+    var->values  = (const char **)realloc((void *)(var->values),
+                                          sizeof(char *) * var->avalues);
   }
 
   if (size > var->nvalues)
@@ -438,7 +426,7 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 		 int        element,	/* I - Array element number */
                  const char *value)	/* I - Variable value */
 {
-  _cgi_var_t	*var;			/* New variable */
+  _cgi_var_t	*var;				/* New variable */
 
 
   if (name == NULL || value == NULL || element < 0 || element > 100000)
@@ -450,29 +438,19 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 
   if (form_count >= form_alloc)
   {
-    _cgi_var_t	*temp_vars;		/* Temporary form pointer */
-
-
     if (form_alloc == 0)
-      temp_vars = malloc(sizeof(_cgi_var_t) * 16);
+      form_vars = malloc(sizeof(_cgi_var_t) * 16);
     else
-      temp_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));
+      form_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));
 
-    if (!temp_vars)
-      return;
-
-    form_vars  = temp_vars;
     form_alloc += 16;
   }
 
-  var = form_vars + form_count;
-
-  if ((var->values = calloc(element + 1, sizeof(char *))) == NULL)
-    return;
-
+  var                  = form_vars + form_count;
   var->name            = strdup(name);
   var->nvalues         = element + 1;
   var->avalues         = element + 1;
+  var->values          = calloc(element + 1, sizeof(char *));
   var->values[element] = strdup(value);
 
   form_count ++;
@@ -806,15 +784,11 @@ cgi_initialize_post(void)
 
   for (tbytes = 0; tbytes < length; tbytes += nbytes)
     if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
-    {
       if (errno != EAGAIN)
       {
         free(data);
         return (0);
       }
-      else
-        nbytes = 0;
-    }
 
   data[length] = '\0';
 

conf/cupsd.conf.in

@@ -29,12 +29,14 @@ DefaultAuthType Basic
 # Restrict access to the server...
 <Location />
   Order allow,deny
+  Allow localhost
 </Location>
 
 # Restrict access to the admin pages...
 <Location /admin>
 @ENCRYPTION_REQUIRED@
   Order allow,deny
+  Allow localhost
 </Location>
 
 # Restrict access to configuration files...
@@ -42,6 +44,7 @@ DefaultAuthType Basic
   AuthType Default
   Require user @SYSTEM
   Order allow,deny
+  Allow localhost
 </Location>
 
 # Set the default printer/job policies...

config-scripts/cups-common.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 7329 2008-02-20 00:32:58Z mike $"
+dnl "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -19,9 +19,12 @@ AC_PREREQ(2.60)
 dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
-dnl Version number information...
-CUPS_VERSION="1.3.7"
+dnl Versio number information...
+CUPS_VERSION="1.3.3"
 CUPS_REVISION=""
+#if test -z "$CUPS_REVISION" -a -d .svn; then
+#	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+#fi
 
 AC_SUBST(CUPS_VERSION)
 AC_SUBST(CUPS_REVISION)
@@ -180,66 +183,37 @@ esac
 
 AC_SUBST(ARFLAGS)
 
-dnl Prep libraries specifically for cupsd and backends...
+dnl Extra platform-specific libraries...
 BACKLIBS=""
 CUPSDLIBS=""
-AC_SUBST(BACKLIBS)
-AC_SUBST(CUPSDLIBS)
-
-dnl See if we have POSIX ACL support...
-SAVELIBS="$LIBS"
-LIBS=""
-AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
-CUPSDLIBS="$CUPSDLIBS $LIBS"
-LIBS="$SAVELIBS"
-
-dnl Check for DBUS support
-if test -d /etc/dbus-1; then
-	DBUSDIR="/etc/dbus-1"
-else
-	DBUSDIR=""
-fi
-
-AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
-AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
-	DBUSDIR="$withval")
-
-if test "x$enable_dbus" != xno; then
-	AC_PATH_PROG(PKGCONFIG, pkg-config)
-	if test "x$PKGCONFIG" != x; then
-		AC_MSG_CHECKING(for DBUS)
-		if $PKGCONFIG --exists dbus-1; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_DBUS)
-			CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
-			CUPSDLIBS="$CUPSDLIBS `$PKGCONFIG --libs dbus-1`"
-			AC_CHECK_LIB(dbus-1,
-			    dbus_message_iter_init_append,
-			    AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
-			    `$PKGCONFIG --libs dbus-1`)
-		else
-			AC_MSG_RESULT(no)
-			DBUSDIR=""
-		fi
-	fi
-fi
-
-AC_SUBST(DBUSDIR)
-
-dnl Extra platform-specific libraries...
+DBUSDIR=""
 CUPS_DEFAULT_PRINTADMIN_AUTH="@SYSTEM"
 CUPS_SYSTEM_AUTHKEY=""
+
+AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
+
 FONTS="fonts"
+AC_SUBST(FONTS)
 LEGACY_BACKENDS="parallel scsi"
+AC_SUBST(LEGACY_BACKENDS)
 
 case $uname in
         Darwin*)
 		FONTS=""
 		LEGACY_BACKENDS=""
-                BACKLIBS="$BACKLIBS -framework IOKit"
-                CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration"
+                BACKLIBS="-framework IOKit"
+                CUPSDLIBS="-sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration"
                 LIBS="-framework CoreFoundation $LIBS"
 
+		dnl Check for CFLocaleCreateCanonicalLocaleIdentifierFromString...
+		AC_MSG_CHECKING(for CFLocaleCreateCanonicalLocaleIdentifierFromString)
+		if test "$uname" = "Darwin" -a $uversion -ge 70; then
+			AC_DEFINE(HAVE_CF_LOCALE_ID)
+			AC_MSG_RESULT(yes)
+		else
+			AC_MSG_RESULT(no)
+		fi
+
 		dnl Check for framework headers...
 		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
 		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
@@ -264,14 +238,54 @@ case $uname in
 			CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"])
 		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
                 ;;
+
+	Linux*)
+		dnl Check for DBUS support
+		if test "x$enable_dbus" != xno; then
+			AC_PATH_PROG(PKGCONFIG, pkg-config)
+			if test "x$PKGCONFIG" != x; then
+				AC_MSG_CHECKING(for DBUS)
+				if $PKGCONFIG --exists dbus-1; then
+					AC_MSG_RESULT(yes)
+					AC_DEFINE(HAVE_DBUS)
+					CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
+					CUPSDLIBS="`$PKGCONFIG --libs dbus-1`"
+					AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ], dbusdir="$withval", dbusdir="/etc/dbus-1")
+					DBUSDIR="$dbusdir"
+					AC_CHECK_LIB(dbus-1,
+					    dbus_message_iter_init_append,
+					    AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
+				else
+					AC_MSG_RESULT(no)
+				fi
+			fi
+		fi
+		;;
 esac
 
 AC_SUBST(CUPS_DEFAULT_PRINTADMIN_AUTH)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTADMIN_AUTH, "$CUPS_DEFAULT_PRINTADMIN_AUTH")
 AC_SUBST(CUPS_SYSTEM_AUTHKEY)
-AC_SUBST(FONTS)
-AC_SUBST(LEGACY_BACKENDS)
+
+dnl See if we have POSIX ACL support...
+SAVELIBS="$LIBS"
+LIBS=""
+AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
+CUPSDLIBS="$CUPSDLIBS $LIBS"
+LIBS="$SAVELIBS"
+
+AC_SUBST(BACKLIBS)
+AC_SUBST(CUPSDLIBS)
+AC_SUBST(DBUSDIR)
+
+dnl New default port definition for IPP...
+AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
+	DEFAULT_IPP_PORT="$withval",
+	DEFAULT_IPP_PORT="631")
+
+AC_SUBST(DEFAULT_IPP_PORT)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 7329 2008-02-20 00:32:58Z mike $".
+dnl End of "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $".
 dnl

config-scripts/cups-compiler.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-compiler.m4 7353 2008-02-28 00:54:04Z mike $"
+dnl "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -98,61 +98,36 @@ if test -n "$GCC"; then
 		fi
 	fi
 
-	# Generate position-independent code as needed...
 	if test $PICFLAG = 1 -a $uname != AIX; then
     		OPTIM="-fPIC $OPTIM"
 	fi
 
-	# The -fstack-protector option is available with some versions of
-	# GCC and adds "stack canaries" which detect when the return address
-	# has been overwritten, preventing many types of exploit attacks.
-	AC_MSG_CHECKING(if GCC supports -fstack-protector)
-	OLDCFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -fstack-protector"
-	AC_TRY_COMPILE(,,
-		OPTIM="$OPTIM -fstack-protector"
-		AC_MSG_RESULT(yes),
-		AC_MSG_RESULT(no))
-	CFLAGS="$OLDCFLAGS"
+	case $uname in
+		Linux*)
+			if test x$enable_pie = xyes; then
+				PIEFLAGS="-pie -fPIE"
+			fi
 
-	# The -pie option is available with some versions of GCC and adds
-	# randomization of addresses, which avoids another class of exploits
-	# that depend on a fixed address for common functions.
-	if test x$enable_pie = xyes; then
-		AC_MSG_CHECKING(if GCC supports -pie)
-		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -pie -fPIE"
-		AC_TRY_COMPILE(,,
-			PIEFLAGS="-pie -fPIE"
-			AC_MSG_RESULT(yes),
-			AC_MSG_RESULT(no, ignoring --enable-pie))
-		CFLAGS="$OLDCFLAGS"
-	fi
+			if test x$enable_relro = xyes; then
+				RELROFLAGS="-Wl,-z,relro"
+			fi
+			;;
+
+		*)
+			if test x$enable_pie = xyes; then
+				echo "Sorry, --enable-pie is not supported on this OS!"
+			fi
+			;;
+	esac
 
 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
 		OPTIM="-Wall -Wno-format-y2k $OPTIM"
-		# Additional warning options for development testing...
-		if test -d .svn; then
-			OPTIM="-Wshadow -Wunused $OPTIM"
-		fi
+		# Additional warning options for alpha testing...
+		OPTIM="-Wshadow -Wunused $OPTIM"
 	fi
 
 	case "$uname" in
-		Darwin*)
-			# -D_FORTIFY_SOURCE=2 adds additional object size
-			# checking, basically wrapping all string functions
-			# with buffer-limited ones.  Not strictly needed for
-			# CUPS since we already use buffer-limited calls, but
-			# this will catch any additions that are broken.		
-			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-
-			if test x$enable_pie = xyes; then
-				# GCC 4 on Mac OS X needs -Wl,-pie as well
-				LDFLAGS="$LDFLAGS -Wl,-pie"
-			fi
-			;;
-
 		HP-UX*)
 			if test "x$enable_32bit" = xyes; then
 				# Build 32-bit libraries, 64-bit base...
@@ -226,12 +201,6 @@ if test -n "$GCC"; then
 			;;
 
 		Linux*)
-			# The -z relro option is provided by the Linux linker command to
-			# make relocatable data read-only.
-			if test x$enable_relro = xyes; then
-				RELROFLAGS="-Wl,-z,relro"
-			fi
-
 			if test "x$enable_32bit" = xyes; then
 				# Build 32-bit libraries, 64-bit base...
 				if test -z "$with_arch32flags"; then
@@ -499,8 +468,8 @@ else
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
 			echo "cups-bugs@cups.org with uname and compiler options needed"
-			echo "for your platform, or set the CFLAGS, CXXFLAGS, and LDFLAGS"
-			echo "environment variables before running configure."
+			echo "for your platform, or set the CFLAGS and CXXFLAGS"
+			echo "environment variable before running configure."
 			;;
 	esac
 fi
@@ -529,5 +498,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id: cups-compiler.m4 7353 2008-02-28 00:54:04Z mike $".
+dnl End of "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $".
 dnl

config-scripts/cups-defaults.m4

@@ -1,10 +1,10 @@
 dnl
-dnl "$Id: cups-defaults.m4 7296 2008-02-12 00:20:32Z mike $"
+dnl "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $"
 dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -337,14 +337,6 @@ AC_ARG_WITH(snmp-community, [  --with-snmp-community   set SNMP community, defau
 AC_SUBST(CUPS_SNMP_ADDRESS)
 AC_SUBST(CUPS_SNMP_COMMUNITY)
 
-dnl New default port definition for IPP...
-AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
-	DEFAULT_IPP_PORT="$withval",
-	DEFAULT_IPP_PORT="631")
-
-AC_SUBST(DEFAULT_IPP_PORT)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
-
 dnl
-dnl End of "$Id: cups-defaults.m4 7296 2008-02-12 00:20:32Z mike $".
+dnl End of "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $".
 dnl

config-scripts/cups-gssapi.m4

@@ -23,26 +23,14 @@ LIBGSSAPI=""
 if test x$enable_gssapi != xno; then
 	AC_PATH_PROG(KRB5CONFIG, krb5-config)
 	if test "x$KRB5CONFIG" != x; then
-		case "$uname" in
-			Darwin)
-				# Mac OS X weak-links to the Kerberos framework...
-				LIBGSSAPI="-weak_framework Kerberos"
-				;;
-			SunOS*)
-				# Solaris has a non-standard krb5-config, don't use it!
-				AC_CHECK_LIB(gss, gss_display_status,
-					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-					CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS"		
-					CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS"		
-					LIBGSSAPI="-lgss `$KRB5CONFIG --libs`")
-				;;
-			*)
-				# Other platforms just ask for GSSAPI
-				CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"		
-				CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"		
-				LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-				;;
-		esac
+		if test "x$uname" = "xDarwin"; then
+			# Mac OS X weak-links to the Kerberos framework...
+			LIBGSSAPI="-weak_framework Kerberos"
+		else
+			CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"		
+			CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"		
+			LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
+		fi
 		AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
 	else
 		# Check for vendor-specific implementations...

config-scripts/cups-network.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4 7140 2007-12-19 01:47:57Z mike $"
+dnl "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -29,6 +29,24 @@ fi
 AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include <sys/socket.h>])
 AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H))
 
+if test "$uname" = "SunOS"; then
+	case "$uversion" in
+		55* | 56*)
+			maxfiles=1024
+			;;
+		*)
+			maxfiles=4096
+			;;
+	esac
+else
+	maxfiles=4096
+fi
+
+AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler ],
+	maxfiles=$withval)
+
+AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
+
 CUPS_DEFAULT_DOMAINSOCKET=""
 
 dnl Domain socket support...
@@ -66,5 +84,5 @@ AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
 	[#include <netat/appletalk.h>])
 
 dnl
-dnl End of "$Id: cups-network.m4 7140 2007-12-19 01:47:57Z mike $".
+dnl End of "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $".
 dnl

config.h.in

@@ -76,6 +76,13 @@
 #define CUPS_DEFAULT_MAX_COPIES	100
 
 
+/*
+ * Maximum number of file descriptors to support.
+ */
+
+#define CUPS_MAX_FDS		4096
+
+
 /*
  * Do we have domain socket support?
  */
@@ -438,6 +445,13 @@
 #undef HAVE_CFBUNDLEPRIV_H
 
 
+/*
+ * Do we have CFLocaleCreateCanonicalLocaleIdentifierFromString()?
+ */
+
+#undef HAVE_CF_LOCALE_ID
+
+
 /*
  * Do we have MacOSX 10.4's mbr_XXX functions()?
  */

cups/Makefile

@@ -91,6 +91,7 @@ HEADERS	=	\
 		dir.h \
 		file.h \
 		http.h \
+		i18n.h \
 		ipp.h \
 		language.h \
 		ppd.h \

cups/adminutil.c

@@ -4,7 +4,7 @@
  *   Administration utility API definitions for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -291,7 +291,7 @@ cupsAdminCreateWindowsPPD(
 	return (NULL);
       }
 
-      if (sscanf(line, "*%40s%*[ \t]%40[^:/]", option, choice) != 2)
+      if (sscanf(line, "*%40s%*[ \t]%40[^/]", option, choice) != 2)
       {
         snprintf(line, sizeof(line),
 	         _cupsLangString(language,
@@ -808,9 +808,6 @@ cupsAdminExportSamba(
   if (have_drivers == 0)
   {
     _cupsSetError(IPP_NOT_FOUND, message);
-
-    unlink(authfile);
-
     return (0);
   }
 
@@ -959,7 +956,7 @@ _cupsAdminGetServerSettings(
     while (cupsFileGetConf(cupsd, line, sizeof(line), &value, &linenum))
     {
       if (!value && strncmp(line, "</", 2))
-        value = line + strlen(line);
+        continue;
 
       if (!strcasecmp(line, "Port") || !strcasecmp(line, "Listen"))
       {
@@ -1060,7 +1057,7 @@ _cupsAdminGetServerSettings(
 	in_admin_location = 0;
 	in_location       = 0;
       }
-      else if (!strcasecmp(line, "Allow") &&
+      else if (!strcasecmp(line, "Allow") && in_admin_location &&
                strcasecmp(value, "localhost") && strcasecmp(value, "127.0.0.1")
 #ifdef AF_LOCAL
 	       && *value != '/'
@@ -1070,9 +1067,9 @@ _cupsAdminGetServerSettings(
 #endif /* AF_INET6 */
 	       )
       {
-        if (in_admin_location)
-	  remote_admin = 1;
-        else if (!strcasecmp(value, "all"))
+	remote_admin = 1;
+
+	if (!strcasecmp(value, "all"))
 	  remote_any = 1;
       }
       else if (line[0] != '<' && !in_location && !in_policy)
@@ -1581,6 +1578,8 @@ _cupsAdminSetServerSettings(
 	if (remote_admin)
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
+	else
+	  cupsFilePuts(temp, "  Allow localhost\n");
       }
       else if (in_conf_location && remote_admin >= 0)
       {
@@ -1598,6 +1597,8 @@ _cupsAdminSetServerSettings(
 	if (remote_admin)
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
+	else
+	  cupsFilePuts(temp, "  Allow localhost\n");
       }
       else if (in_root_location && (remote_admin >= 0 || share_printers >= 0))
       {
@@ -1618,6 +1619,8 @@ _cupsAdminSetServerSettings(
 	if (remote_admin > 0 || share_printers > 0)
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
+	else
+	  cupsFilePuts(temp, "  Allow localhost\n");
       }
 
       in_admin_location = 0;
@@ -1696,8 +1699,7 @@ _cupsAdminSetServerSettings(
     else if ((((in_admin_location || in_conf_location || in_root_location) &&
                remote_admin >= 0) ||
               (in_root_location && share_printers >= 0)) &&
-             (((!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny")) &&
-	       !strcasecmp(value, "@LOCAL")) ||
+             (!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny") ||
 	      !strcasecmp(line, "Order")))
       continue;
     else if (in_cancel_job == 2)
@@ -1838,6 +1840,8 @@ _cupsAdminSetServerSettings(
 
     if (remote_admin > 0 || share_printers > 0)
       cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");
+    else
+      cupsFilePuts(temp, "  Allow localhost\n");
 
     cupsFilePuts(temp, "</Location>\n");
   }
@@ -1854,6 +1858,8 @@ _cupsAdminSetServerSettings(
 
     if (remote_admin)
       cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");
+    else
+      cupsFilePuts(temp, "  Allow localhost\n");
 
     cupsFilePuts(temp, "</Location>\n");
   }
@@ -1867,12 +1873,14 @@ _cupsAdminSetServerSettings(
       cupsFilePuts(temp, "# Restrict access to the configuration files...\n");
 
     cupsFilePuts(temp, "<Location /admin/conf>\n"
-                       "  AuthType Default\n"
+                       "  AuthType Basic\n"
                        "  Require user @SYSTEM\n"
                        "  Order allow,deny\n");
 
     if (remote_admin)
       cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");
+    else
+      cupsFilePuts(temp, "  Allow localhost\n");
 
     cupsFilePuts(temp, "</Location>\n");
   }
@@ -1903,7 +1911,7 @@ _cupsAdminSetServerSettings(
 		       "CUPS-Add-Class CUPS-Delete-Class "
 		       "CUPS-Accept-Jobs CUPS-Reject-Jobs "
 		       "CUPS-Set-Default CUPS-Add-Device CUPS-Delete-Device>\n"
-                       "    AuthType Default\n"
+                       "    AuthType Basic\n"
 		       "    Require user @SYSTEM\n"
                        "    Order deny,allow\n"
                        "</Limit>\n");

cups/auth.c

@@ -3,7 +3,7 @@
  *
  *   Authentication functions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -91,7 +91,8 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
   const char	*password;		/* Password string */
   char		prompt[1024],		/* Prompt for user */
 		realm[HTTP_MAX_VALUE],	/* realm="xyz" string */
-		nonce[HTTP_MAX_VALUE];	/* nonce="xyz" string */
+		nonce[HTTP_MAX_VALUE],	/* nonce="xyz" string */
+		encode[4096];		/* Encoded username:password */
   int		localauth;		/* Local authentication result */
   _cups_globals_t *cg;			/* Global data */
 
@@ -300,40 +301,14 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     if (major_status == GSS_S_CONTINUE_NEEDED)
       DEBUG_gss_printf(major_status, minor_status, "Continuation needed!");
 
-    if (output_token.length > 0 && output_token.length <= 65536)
+    if (output_token.length)
     {
-     /*
-      * Allocate the authorization string since Windows KDCs can have
-      * arbitrarily large credentials...
-      */
-
-      int authsize = 10 +				/* "Negotiate " */
-                     output_token.length * 4 / 3 + 1 +	/* Base64 */
-		     1;					/* nul */
-
-      httpSetAuthString(http, NULL, NULL);
-
-      if ((http->authstring = malloc(authsize)) == NULL)
-      {
-        http->authstring = http->_authstring;
-	authsize         = sizeof(http->_authstring);
-      }
-
-      strcpy(http->authstring, "Negotiate ");
-      httpEncode64_2(http->authstring + 10, authsize - 10, output_token.value,
+      httpEncode64_2(encode, sizeof(encode), output_token.value,
 		     output_token.length);
+      httpSetAuthString(http, "Negotiate", encode);
  
       major_status = gss_release_buffer(&minor_status, &output_token);
     }
-    else
-    {
-      DEBUG_printf(("cupsDoAuthentication: Kerberos credentials too large - "
-                    "%d bytes!\n", output_token.length));
-
-      major_status = gss_release_buffer(&minor_status, &output_token);
-
-      return (-1);
-    }
 #endif /* HAVE_GSSAPI */
   }
   else if (strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6))
@@ -342,9 +317,6 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     * Basic authentication...
     */
 
-    char	encode[256];		/* Base64 buffer */
-
-
     httpEncode64_2(encode, sizeof(encode), http->userpass,
                    (int)strlen(http->userpass));
     httpSetAuthString(http, "Basic", encode);
@@ -355,8 +327,7 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     * Digest authentication...
     */
 
-    char	encode[33],		/* MD5 buffer */
-		digest[1024];		/* Digest auth data */
+    char digest[1024];			/* Digest auth data */
 
 
     httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "realm", realm);

cups/cups.h

@@ -59,10 +59,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION		1.0307
+#  define CUPS_VERSION		1.0303
 #  define CUPS_VERSION_MAJOR	1
 #  define CUPS_VERSION_MINOR	3
-#  define CUPS_VERSION_PATCH	7
+#  define CUPS_VERSION_PATCH	3
 #  define CUPS_DATE_ANY		-1
 
 

cups/emit.c

@@ -3,7 +3,7 @@
  *
  *   PPD code emission routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -106,24 +106,15 @@ ppdCollect2(ppd_file_t    *ppd,		/* I - PPD file data */
   DEBUG_printf(("ppdCollect2(ppd=%p, section=%d, min_order=%f, choices=%p)\n",
                 ppd, section, min_order, choices));
 
-  if (!ppd || !choices)
-  {
-    if (choices)
-      *choices = NULL;
-
+  if (ppd == NULL)
     return (0);
-  }
 
  /*
   * Allocate memory for up to 1000 selected choices...
   */
 
-  count = 0;
-  if ((collect = calloc(sizeof(ppd_choice_t *), 1000)) == NULL)
-  {
-    *choices = NULL;
-    return (0);
-  }
+  count   = 0;
+  collect = calloc(sizeof(ppd_choice_t *), 1000);
 
  /*
   * Loop through all options and add choices as needed...

cups/encode.c

@@ -3,7 +3,7 @@
  *
  *   Option encoding routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -43,100 +43,97 @@
 
 static const _ipp_option_t ipp_options[] =
 {
-  { 1, "auth-info",		IPP_TAG_TEXT,		IPP_TAG_JOB },
-  { 1, "auth-info-required",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "blackplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "blackplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "brightness",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "brightness-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "columns",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "columns-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "copies",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "copies-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "document-format",	IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
-  { 0, "document-format-default", IPP_TAG_MIMETYPE,	IPP_TAG_PRINTER },
-  { 1, "finishings",		IPP_TAG_ENUM,		IPP_TAG_JOB },
-  { 1, "finishings-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "fitplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "fitplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "gamma",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 1, "job-sheets",		IPP_TAG_NAME,		IPP_TAG_JOB },
-  { 1, "job-sheets-default",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },
-  { 0, "landscape",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 1, "media",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
-  { 0, "mirror",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "mirror-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "natural-scaling",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "natural-scaling-default", IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "notify-charset",	IPP_TAG_CHARSET,	IPP_TAG_SUBSCRIPTION },
-  { 1, "notify-events",		IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
-  { 1, "notify-events-default",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "notify-lease-duration",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-lease-duration-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER },
-  { 0, "notify-natural-language", IPP_TAG_LANGUAGE,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-pull-method",	IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-recipient-uri",	IPP_TAG_URI,		IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-time-interval",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
-  { 0, "notify-user-data",	IPP_TAG_STRING,		IPP_TAG_SUBSCRIPTION },
-  { 0, "number-up",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "number-up-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "orientation-requested",	IPP_TAG_ENUM,		IPP_TAG_JOB },
-  { 0, "orientation-requested-default", IPP_TAG_ENUM,	IPP_TAG_PRINTER },
-  { 0, "page-bottom",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-bottom-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "page-left",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-left-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 1, "page-ranges",		IPP_TAG_RANGE,		IPP_TAG_JOB },
-  { 1, "page-ranges-default",	IPP_TAG_RANGE,		IPP_TAG_PRINTER },
-  { 0, "page-right",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-right-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "page-top",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "page-top-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "penwidth",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "penwidth-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "port-monitor",		IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "ppi",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "ppi-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "prettyprint",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "prettyprint-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "print-quality",		IPP_TAG_ENUM,		IPP_TAG_JOB },
-  { 0, "print-quality-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "printer-error-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "printer-info",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
-  { 0, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "printer-is-shared",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "printer-location",	IPP_TAG_TEXT,		IPP_TAG_PRINTER },
-  { 0, "printer-make-and-model", IPP_TAG_TEXT,		IPP_TAG_PRINTER },
-  { 0, "printer-more-info",	IPP_TAG_URI,		IPP_TAG_PRINTER },
-  { 0, "printer-op-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "printer-resolution",	IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
-  { 0, "printer-state",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "printer-state-change-time", IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 1, "printer-state-reasons",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "printer-type",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "printer-uri",		IPP_TAG_URI,		IPP_TAG_OPERATION },
-  { 0, "queued-job-count",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "raw",			IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
-  { 1, "requesting-user-name-allowed", IPP_TAG_NAME,	IPP_TAG_PRINTER },
-  { 1, "requesting-user-name-denied", IPP_TAG_NAME,	IPP_TAG_PRINTER },
-  { 0, "resolution",		IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
-  { 0, "resolution-default",	IPP_TAG_RESOLUTION,	IPP_TAG_PRINTER },
-  { 0, "saturation",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "saturation-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "scaling",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "scaling-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
-  { 0, "sides-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "wrap",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
-  { 0, "wrap-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER }
+  { "auth-info",		IPP_TAG_TEXT,		IPP_TAG_JOB },
+  { "auth-info-required",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "blackplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "blackplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "brightness",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "brightness-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "columns",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "columns-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "copies",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "copies-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "document-format",		IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
+  { "document-format-default",	IPP_TAG_MIMETYPE,	IPP_TAG_PRINTER },
+  { "finishings",		IPP_TAG_ENUM,		IPP_TAG_JOB },
+  { "finishings-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "fitplot",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "fitplot-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "gamma",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-page-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-quota-period",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "job-uuid",			IPP_TAG_URI,		IPP_TAG_JOB },
+  { "landscape",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "media",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
+  { "mirror",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "mirror-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "natural-scaling",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "natural-scaling-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "notify-charset",		IPP_TAG_CHARSET,	IPP_TAG_SUBSCRIPTION },
+  { "notify-events",		IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
+  { "notify-events-default",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "notify-lease-duration",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
+  { "notify-lease-duration-default", IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "notify-natural-language",	IPP_TAG_LANGUAGE,	IPP_TAG_SUBSCRIPTION },
+  { "notify-pull-method",	IPP_TAG_KEYWORD,	IPP_TAG_SUBSCRIPTION },
+  { "notify-recipient-uri",	IPP_TAG_URI,		IPP_TAG_SUBSCRIPTION },
+  { "notify-time-interval",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
+  { "notify-user-data",		IPP_TAG_STRING,		IPP_TAG_SUBSCRIPTION },
+  { "number-up",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "number-up-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "orientation-requested",	IPP_TAG_ENUM,		IPP_TAG_JOB },
+  { "orientation-requested-default", IPP_TAG_ENUM,	IPP_TAG_PRINTER },
+  { "page-bottom",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-bottom-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "page-left",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-left-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "page-ranges",		IPP_TAG_RANGE,		IPP_TAG_JOB },
+  { "page-ranges-default",	IPP_TAG_RANGE,		IPP_TAG_PRINTER },
+  { "page-right",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-right-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "page-top",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "page-top-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "penwidth",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "penwidth-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "ppi",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "ppi-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "prettyprint",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "prettyprint-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "print-quality",		IPP_TAG_ENUM,		IPP_TAG_JOB },
+  { "print-quality-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "printer-error-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { "printer-info",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
+  { "printer-is-accepting-jobs",IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "printer-is-shared",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
+  { "printer-location",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
+  { "printer-make-and-model",	IPP_TAG_TEXT,		IPP_TAG_PRINTER },
+  { "printer-more-info",	IPP_TAG_URI,		IPP_TAG_PRINTER },
+  { "printer-op-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { "printer-resolution",	IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
+  { "printer-state",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "printer-state-change-time",IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "printer-state-reasons",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "printer-type",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
+  { "printer-uri",		IPP_TAG_URI,		IPP_TAG_OPERATION },
+  { "queued-job-count",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "raw",			IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
+  { "requesting-user-name-allowed",	IPP_TAG_NAME,	IPP_TAG_PRINTER },
+  { "requesting-user-name-denied",	IPP_TAG_NAME,	IPP_TAG_PRINTER },
+  { "resolution",		IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
+  { "resolution-default",	IPP_TAG_RESOLUTION,	IPP_TAG_PRINTER },
+  { "saturation",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "saturation-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "scaling",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { "scaling-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
+  { "sides-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
+  { "wrap",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { "wrap-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER }
 };
 
 
@@ -194,8 +191,7 @@ cupsEncodeOptions2(
   char		*s,			/* Pointer into option value */
 		*val,			/* Pointer to option value */
 		*copy,			/* Copy of option value */
-		*sep,			/* Option separator */
-		quote;			/* Quote character */
+		*sep;			/* Option separator */
   ipp_attribute_t *attr;		/* IPP attribute */
   ipp_tag_t	value_tag;		/* IPP value tag */
   cups_option_t	*option;		/* Current option */
@@ -287,28 +283,41 @@ cupsEncodeOptions2(
     * Count the number of values...
     */
 
-    if (match && match->multivalue)
+    for (count = 1, sep = option->value; *sep; sep ++)
     {
-      for (count = 1, sep = option->value, quote = 0; *sep; sep ++)
+      if (*sep == '\'')
       {
-	if (*sep == quote)
-	  quote = 0;
-	else if (!quote && (*sep == '\'' || *sep == '\"'))
-	{
-	 /*
-	  * Skip quoted option value...
-	  */
+       /*
+        * Skip quoted option value...
+	*/
 
-	  quote = *sep++;
-	}
-	else if (*sep == ',' && !quote)
-	  count ++;
-	else if (*sep == '\\' && sep[1])
+        sep ++;
+
+        while (*sep && *sep != '\'')
 	  sep ++;
+
+	if (!*sep)
+	  sep --;
       }
+      else if (*sep == '\"')
+      {
+       /*
+        * Skip quoted option value...
+	*/
+
+        sep ++;
+
+        while (*sep && *sep != '\"')
+	  sep ++;
+
+	if (!*sep)
+	  sep --;
+      }
+      else if (*sep == ',')
+        count ++;
+      else if (*sep == '\\' && sep[1])
+        sep ++;
     }
-    else
-      count = 1;
 
     DEBUG_printf(("cupsEncodeOptions2: option = \'%s\', count = %d\n",
                   option->name, count));
@@ -380,47 +389,16 @@ cupsEncodeOptions2(
     * Scan the value string for values...
     */
 
-    for (j = 0, sep = val; j < count; val = sep, j ++)
+    for (j = 0; j < count; val = sep, j ++)
     {
      /*
       * Find the end of this value and mark it if needed...
       */
 
-      if (count > 1)
-      {
-	for (quote = 0; *sep; sep ++)
-	{
-	  if (*sep == quote)
-	  {
-	   /*
-	    * Finish quoted value...
-	    */
-
-	    quote = 0;
-	  }
-	  else if (!quote && (*sep == '\'' || *sep == '\"'))
-	  {
-	   /*
-	    * Handle quoted option value...
-	    */
-
-	    quote = *sep;
-	  }
-	  else if (*sep == ',' && count > 1)
-	    break;
-	  else if (*sep == '\\' && sep[1])
-	  {
-	   /*
-	    * Skip quoted character...
-	    */
-
-	    sep ++;
-	  }
-	}
-
-	if (*sep == ',')
-	  *sep++ = '\0';
-      }
+      if ((sep = strchr(val, ',')) != NULL)
+	*sep++ = '\0';
+      else
+	sep = val + strlen(val);
 
      /*
       * Copy the option value(s) over as needed by the type...
@@ -434,7 +412,7 @@ cupsEncodeOptions2(
 	    * Integer/enumeration value...
 	    */
 
-            attr->values[j].integer = strtol(val, &s, 10);
+            attr->values[j].integer = strtol(val, &s, 0);
 
             DEBUG_printf(("cupsEncodeOptions2: Added integer option value %d...\n",
 	                  attr->values[j].integer));
@@ -476,12 +454,12 @@ cupsEncodeOptions2(
 	      s = val;
 	    }
 	    else
-	      attr->values[j].range.lower = strtol(val, &s, 10);
+	      attr->values[j].range.lower = strtol(val, &s, 0);
 
 	    if (*s == '-')
 	    {
 	      if (s[1])
-		attr->values[j].range.upper = strtol(s + 1, NULL, 10);
+		attr->values[j].range.upper = strtol(s + 1, NULL, 0);
 	      else
 		attr->values[j].range.upper = 2147483647;
             }
@@ -498,10 +476,10 @@ cupsEncodeOptions2(
 	    * Resolution...
 	    */
 
-	    attr->values[j].resolution.xres = strtol(val, &s, 10);
+	    attr->values[j].resolution.xres = strtol(val, &s, 0);
 
 	    if (*s == 'x')
-	      attr->values[j].resolution.yres = strtol(s + 1, &s, 10);
+	      attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
 	    else
 	      attr->values[j].resolution.yres = attr->values[j].resolution.xres;
 
@@ -520,7 +498,7 @@ cupsEncodeOptions2(
 	    */
 
             attr->values[j].unknown.length = (int)strlen(val);
-	    attr->values[j].unknown.data   = strdup(val);
+	    attr->values[j].unknown.data   = _cupsStrAlloc(val);
 
             DEBUG_printf(("cupsEncodeOptions2: Added octet-string value \"%s\"...\n",
 	                  attr->values[j].unknown.data));

cups/http-addrlist.c

@@ -3,7 +3,7 @@
  *
  *   HTTP address list routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -202,11 +202,9 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
     * Domain socket address...
     */
 
-    if ((first = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t))) != NULL)
-    {
-      first->addr.un.sun_family = AF_LOCAL;
-      strlcpy(first->addr.un.sun_path, hostname, sizeof(first->addr.un.sun_path));
-    }
+    first = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
+    first->addr.un.sun_family = AF_LOCAL;
+    strlcpy(first->addr.un.sun_path, hostname, sizeof(first->addr.un.sun_path));
   }
   else
 #endif /* AF_LOCAL */

cups/http-private.h

@@ -26,6 +26,12 @@
 #  include <config.h>
 
 #  ifdef __sun
+/*
+ * Define FD_SETSIZE to CUPS_MAX_FDS on Solaris to get the correct version of
+ * select() for large numbers of file descriptors.
+ */
+
+#    define FD_SETSIZE	CUPS_MAX_FDS
 #    include <sys/select.h>
 #  endif /* __sun */
 

cups/http-support.c

@@ -55,8 +55,7 @@
 
 static const char * const http_days[7] =
 			{
-			  "Sun",
-			  "Mon",
+			  "Sun",			  "Mon",
 			  "Tue",
 			  "Wed",
 			  "Thu",
@@ -1283,7 +1282,7 @@ http_copy_encode(char       *dst,	/* O - Destination buffer */
 		 const char *term,	/* I - Terminating characters */
 		 int        encode)	/* I - %-encode reserved chars? */
 {
-  static const char hex[] = "0123456789ABCDEF";
+  static const char *hex = "0123456789ABCDEF";
 
 
   while (*src && dst < dstend)

cups/http.c

@@ -3,7 +3,7 @@
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -402,11 +402,9 @@ httpConnectEncrypt(
   * Allocate memory for the structure...
   */
 
-  if ((http = calloc(sizeof(http_t), 1)) == NULL)
-  {
-    httpAddrFreeList(addrlist);
+  http = calloc(sizeof(http_t), 1);
+  if (http == NULL)
     return (NULL);
-  }
 
   http->version  = HTTP_1_1;
   http->blocking = 1;
@@ -1737,15 +1735,9 @@ httpSetAuthString(http_t     *http,	/* I - HTTP connection */
     */
 
     int len = (int)strlen(scheme) + (data ? (int)strlen(data) + 1 : 0) + 1;
-    char *temp;
 
     if (len > (int)sizeof(http->_authstring))
-    {
-      if ((temp = malloc(len)) == NULL)
-        len = sizeof(http->_authstring);
-      else
-        http->authstring = temp;
-    }
+      http->authstring = malloc(len);
 
     if (data)
       snprintf(http->authstring, len, "%s %s", scheme, data);

cups/i18n.h

@@ -82,10 +82,6 @@ typedef struct _cups_vmap_s		/**** VBCS Charmap Struct ****/
  * Prototypes...
  */
 
-#ifdef __APPLE__
-extern const char	*_cupsAppleLanguage(const char *locale, char *language,
-			                    size_t langsize);
-#endif /* __APPLE__ */
 extern void		_cupsCharmapFlush(void);
 extern void		_cupsCharmapFree(const cups_encoding_t encoding);
 extern void		*_cupsCharmapGet(const cups_encoding_t encoding);

cups/ipp-private.h

@@ -3,7 +3,7 @@
  *
  *   Private IPP definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -40,7 +40,6 @@ extern "C" {
 
 typedef struct				/**** Attribute mapping data ****/
 {
-  int		multivalue;		/* Option has multiple values? */
   const char	*name;			/* Option/attribute name */
   ipp_tag_t	value_tag;		/* Value tag for this attribute */
   ipp_tag_t	group_tag;		/* Group tag for this attribute */

cups/ipp.c

@@ -4,7 +4,7 @@
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -361,12 +361,7 @@ ippAddOctetString(ipp_t      *ipp,	/* I - IPP message */
 
   if (data)
   {
-    if ((attr->values[0].unknown.data = malloc(datalen)) == NULL)
-    {
-      ippDeleteAttribute(ipp, attr);
-      return (NULL);
-    }
-
+    attr->values[0].unknown.data = malloc(datalen);
     memcpy(attr->values[0].unknown.data, data, datalen);
   }
 
@@ -1019,7 +1014,7 @@ ippReadIO(void       *src,		/* I - Data source */
           ipp_t      *ipp)		/* I - IPP data */
 {
   int			n;		/* Length of data */
-  unsigned char		buffer[IPP_MAX_LENGTH + 1],
+  unsigned char		buffer[IPP_MAX_LENGTH],
 					/* Data buffer */
 			string[IPP_MAX_NAME],
 					/* Small string buffer */
@@ -1187,15 +1182,17 @@ ippReadIO(void       *src,		/* I - Data source */
 
 	      attr->value_tag = tag;
 	    }
-	    else if (value_tag >= IPP_TAG_TEXTLANG &&
-		     value_tag <= IPP_TAG_MIMETYPE)
+	    else if (value_tag == IPP_TAG_STRING ||
+    		     (value_tag >= IPP_TAG_TEXTLANG &&
+		      value_tag <= IPP_TAG_MIMETYPE))
             {
 	     /*
 	      * String values can sometimes come across in different
 	      * forms; accept sets of differing values...
 	      */
 
-	      if (tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE)
+	      if (tag != IPP_TAG_STRING &&
+    		  (tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE))
 	        return (IPP_ERROR);
             }
 	    else if (value_tag != tag)
@@ -1280,11 +1277,7 @@ ippReadIO(void       *src,		/* I - Data source */
             if (ipp->current)
 	      ipp->prev = ipp->current;
 
-	    if ((attr = ipp->current = _ippAddAttr(ipp, 1)) == NULL)
-	    {
-	      DEBUG_puts("ippReadIO: unable to allocate attribute!");
-	      return (IPP_ERROR);
-	    }
+	    attr = ipp->current = _ippAddAttr(ipp, 1);
 
 	    DEBUG_printf(("ippReadIO: name=\'%s\', ipp->current=%p, ipp->prev=%p\n",
 	                  buffer, ipp->current, ipp->prev));
@@ -1332,7 +1325,6 @@ ippReadIO(void       *src,		/* I - Data source */
 
                 value->integer = n;
 	        break;
-
 	    case IPP_TAG_BOOLEAN :
 		if (n != 1)
 		{
@@ -1348,10 +1340,10 @@ ippReadIO(void       *src,		/* I - Data source */
 
                 value->boolean = buffer[0];
 	        break;
-
 	    case IPP_TAG_TEXT :
 	    case IPP_TAG_NAME :
 	    case IPP_TAG_KEYWORD :
+	    case IPP_TAG_STRING :
 	    case IPP_TAG_URI :
 	    case IPP_TAG_URISCHEME :
 	    case IPP_TAG_CHARSET :
@@ -1374,7 +1366,6 @@ ippReadIO(void       *src,		/* I - Data source */
 		DEBUG_printf(("ippReadIO: value = \'%s\'\n",
 		              value->string.text));
 	        break;
-
 	    case IPP_TAG_DATE :
 		if (n != 11)
 		{
@@ -1388,7 +1379,6 @@ ippReadIO(void       *src,		/* I - Data source */
 		  return (IPP_ERROR);
 		}
 	        break;
-
 	    case IPP_TAG_RESOLUTION :
 		if (n != 9)
 		{
@@ -1411,7 +1401,6 @@ ippReadIO(void       *src,		/* I - Data source */
                 value->resolution.units =
 		    (ipp_res_t)buffer[8];
 	        break;
-
 	    case IPP_TAG_RANGE :
 		if (n != 8)
 		{
@@ -1432,7 +1421,6 @@ ippReadIO(void       *src,		/* I - Data source */
 		    (((((buffer[4] << 8) | buffer[5]) << 8) | buffer[6]) << 8) |
 		    buffer[7];
 	        break;
-
 	    case IPP_TAG_TEXTLANG :
 	    case IPP_TAG_NAMELANG :
 	        if (n >= sizeof(buffer) || n < 4)
@@ -1550,7 +1538,7 @@ ippReadIO(void       *src,		/* I - Data source */
 		break;
 
             default : /* Other unsupported values */
-		if (n > IPP_MAX_LENGTH)
+		if (n > sizeof(buffer))
 		{
 		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
 		  return (IPP_ERROR);
@@ -1559,12 +1547,7 @@ ippReadIO(void       *src,		/* I - Data source */
                 value->unknown.length = n;
 	        if (n > 0)
 		{
-		  if ((value->unknown.data = malloc(n)) == NULL)
-		  {
-		    DEBUG_puts("ippReadIO: Unable to allocate value");
-		    return (IPP_ERROR);
-		  }
-
+		  value->unknown.data = malloc(n);
 	          if ((*cb)(src, value->unknown.data, n) < n)
 		  {
 	            DEBUG_puts("ippReadIO: Unable to read unsupported value!");
@@ -1958,6 +1941,7 @@ ippWriteIO(void       *dst,		/* I - Destination */
 	    case IPP_TAG_TEXT :
 	    case IPP_TAG_NAME :
 	    case IPP_TAG_KEYWORD :
+	    case IPP_TAG_STRING :
 	    case IPP_TAG_URI :
 	    case IPP_TAG_URISCHEME :
 	    case IPP_TAG_CHARSET :
@@ -2415,8 +2399,7 @@ ippWriteIO(void       *dst,		/* I - Destination */
 	    return (IPP_ERROR);
 	  }
 
-          DEBUG_printf(("ippWriteIO: wrote %d bytes\n",
-	                (int)(bufptr - buffer)));
+          DEBUG_printf(("ippWriteIO: wrote %d bytes\n", bufptr - buffer));
 
 	 /*
           * If blocking is disabled, stop here...
@@ -2524,6 +2507,7 @@ _ippFreeAttr(ipp_attribute_t *attr)	/* I - Attribute to free */
     case IPP_TAG_TEXT :
     case IPP_TAG_NAME :
     case IPP_TAG_KEYWORD :
+    case IPP_TAG_STRING :
     case IPP_TAG_URI :
     case IPP_TAG_URISCHEME :
     case IPP_TAG_CHARSET :
@@ -2562,13 +2546,6 @@ _ippFreeAttr(ipp_attribute_t *attr)	/* I - Attribute to free */
           ippDelete(value->collection);
 	break;
 
-    case IPP_TAG_STRING :
-	for (i = 0, value = attr->values;
-	     i < attr->num_values;
-	     i ++, value ++)
-	  free(value->unknown.data);
-        break;
-
     default :
         if (!((int)attr->value_tag & IPP_TAG_COPY))
 	{
@@ -2657,6 +2634,7 @@ ipp_length(ipp_t *ipp,			/* I - IPP message or collection */
       case IPP_TAG_TEXT :
       case IPP_TAG_NAME :
       case IPP_TAG_KEYWORD :
+      case IPP_TAG_STRING :
       case IPP_TAG_URI :
       case IPP_TAG_URISCHEME :
       case IPP_TAG_CHARSET :
@@ -2744,7 +2722,7 @@ ipp_read_http(http_t      *http,	/* I - Client connection */
   
 
   DEBUG_printf(("ipp_read_http(http=%p, buffer=%p, length=%d)\n",
-                http, buffer, (int)length));
+                http, buffer, length));
 
  /*
   * Loop until all bytes are read...

cups/language.c

@@ -3,7 +3,7 @@
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -16,8 +16,6 @@
  *
  * Contents:
  *
- *   _cupsAppleLanguage()   - Get the Apple language identifier associated
- *                            with a locale ID.
  *   _cupsEncodingName()    - Return the character encoding name string
  *                            for the given encoding enumeration.
  *   cupsLangDefault()      - Return the default language.
@@ -67,6 +65,26 @@ static pthread_mutex_t	lang_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* HAVE_PTHREAD_H */
 static cups_lang_t	*lang_cache = NULL;
 					/* Language string cache */
+
+
+/*
+ * Local functions...
+ */
+
+#ifdef __APPLE__
+static const char	*appleLangDefault(void);
+#endif /* __APPLE__ */
+static cups_lang_t	*cups_cache_lookup(const char *name,
+			                   cups_encoding_t encoding);
+static int		cups_message_compare(_cups_message_t *m1,
+			                     _cups_message_t *m2);
+static void		cups_unquote(char *d, const char *s);
+
+
+/*
+ * Local globals...
+ */
+
 static const char * const lang_encodings[] =
 			{		/* Encoding strings */
 			  "us-ascii",		"iso-8859-1",
@@ -137,123 +155,6 @@ static const char * const lang_encodings[] =
 			  "euc-kr",		"euc-tw"
 			};
 
-#ifdef __APPLE__
-typedef struct
-{
-  const char * const language;		/* Language ID */
-  const char * const locale;		/* Locale ID */
-} _apple_language_locale_t;
-
-static const _apple_language_locale_t apple_language_locale[] =
-{					/* Locale to language ID LUT */
-  { "en"	, "en_US" },
-  { "nb"	, "no"    },
-  { "zh-Hans"	, "zh_CN" },
-  { "zh-Hant"	, "zh_TW" }
-};
-#endif /* __APPLE__ */
-
-
-/*
- * Local functions...
- */
-
-#ifdef __APPLE__
-static const char	*appleLangDefault(void);
-#endif /* __APPLE__ */
-static cups_lang_t	*cups_cache_lookup(const char *name,
-			                   cups_encoding_t encoding);
-static int		cups_message_compare(_cups_message_t *m1,
-			                     _cups_message_t *m2);
-static void		cups_unquote(char *d, const char *s);
-
-
-#ifdef __APPLE__
-/*
- *   _cupsAppleLanguage()   - Get the Apple language identifier associated
- *                            with a locale ID.
- */
-
-const char *				/* O - Language ID */
-_cupsAppleLanguage(const char *locale,	/* I - Locale ID */
-                   char       *language,/* I - Language ID buffer */
-                   size_t     langsize)	/* I - Size of language ID buffer */
-{
-  int		i;			/* Looping var */
-  CFStringRef	localeid,		/* CF locale identifier */
-		langid;			/* CF language identifier */
-
-
- /*
-  * Copy the locale name and convert, as needed, to the Apple-specific
-  * locale identifier...
-  */
-
-  switch (strlen(locale))
-  {
-    default :
-        /*
-	 * Invalid locale...
-	 */
-
-	 strlcpy(language, "en", langsize);
-	 break;
-
-    case 2 :
-        strlcpy(language, locale, langsize);
-        break;
-
-    case 5 :
-        strlcpy(language, locale, langsize);
-
-	if (language[2] == '-')
-	{
-	 /*
-	  * Convert ll-cc to ll_CC...
-	  */
-
-	  language[2] = '_';
-	  language[3] = toupper(language[3] & 255);
-	  language[4] = toupper(language[4] & 255);
-	}
-	break;
-  }
-
-  for (i = 0;
-       i < (int)(sizeof(apple_language_locale) /
-		 sizeof(apple_language_locale[0]));
-       i ++)
-    if (!strcmp(locale, apple_language_locale[i].locale))
-    {
-      strlcpy(language, apple_language_locale[i].language, sizeof(language));
-      break;
-    }
-
- /*
-  * Attempt to map the locale ID to a language ID...
-  */
-
-  if ((localeid = CFStringCreateWithCString(kCFAllocatorDefault, language,
-                                            kCFStringEncodingASCII)) != NULL)
-  {
-    if ((langid = CFLocaleCreateCanonicalLanguageIdentifierFromString(
-                      kCFAllocatorDefault, localeid)) != NULL)
-    {
-      CFStringGetCString(langid, language, langsize, kCFStringEncodingASCII);
-      CFRelease(langid);
-    }
-
-    CFRelease(localeid);
-  }
-
- /*
-  * Return what we got...
-  */
-
-  return (language);
-}
-#endif /* __APPLE__ */
-
 
 /*
  * '_cupsEncodingName()' - Return the character encoding name string
@@ -975,12 +876,7 @@ _cupsMessageLoad(const char *filename)	/* I - Message catalog to load */
 	return (a);
       }
 
-      if ((m->id = strdup(ptr)) == NULL)
-      {
-        free(m);
-        cupsFileClose(fp);
-	return (a);
-      }
+      m->id = strdup(ptr);
     }
     else if (s[0] == '\"' && m)
     {
@@ -1028,11 +924,7 @@ _cupsMessageLoad(const char *filename)	/* I - Message catalog to load */
       * Set the string...
       */
 
-      if ((m->str = strdup(ptr)) == NULL)
-      {
-        cupsFileClose(fp);
-	return (a);
-      }
+      m->str = strdup(ptr);
     }
   }
 
@@ -1081,6 +973,30 @@ _cupsMessageLookup(cups_array_t *a,	/* I - Message array */
 
 
 #ifdef __APPLE__
+/*
+ * Code & data to translate OSX's language names to their ISO 639-1 locale.
+ *
+ * The first version uses the new CoreFoundation API added in 10.3 (Panther),
+ * the second is for 10.2 (Jaguar).
+ */
+
+#  ifdef HAVE_CF_LOCALE_ID
+
+typedef struct
+{
+  const char * const name;		/* Language name */
+  const char * const locale;		/* Locale name */
+} _apple_name_locale_t;
+
+static const _apple_name_locale_t apple_name_locale[] =
+{
+  { "en"	, "en_US" },
+  { "nb"	, "no"    },
+  { "zh-Hans"	, "zh_CN" },
+  { "zh-Hant"	, "zh_TW" }
+};
+
+
 /*
  * 'appleLangDefault()' - Get the default locale string.
  */
@@ -1151,15 +1067,14 @@ appleLangDefault(void)
 	    */
 
 	    for (i = 0;
-		 i < (int)(sizeof(apple_language_locale) /
-		           sizeof(apple_language_locale[0]));
-		 i ++)
+		 i < sizeof(apple_name_locale) / sizeof(apple_name_locale[0]);
+		 i++)
 	    {
-	      if (!strcmp(cg->language, apple_language_locale[i].language))
+	      if (!strcmp(cg->language, apple_name_locale[i].name))
 	      {
 		DEBUG_printf(("appleLangDefault: mapping \"%s\" to \"%s\"...\n",
-			      cg->language, apple_language_locale[i].locale));
-		strlcpy(cg->language, apple_language_locale[i].locale, 
+			      cg->language, apple_name_locale[i].locale));
+		strlcpy(cg->language, apple_name_locale[i].locale, 
 			sizeof(cg->language));
 		break;
 	      }
@@ -1195,6 +1110,166 @@ appleLangDefault(void)
 
   return (cg->language);
 }
+#  else
+/*
+ * Code & data to translate OSX 10.2's language names to their ISO 639-1
+ * locale.
+ */
+
+typedef struct
+{
+  const char * const name;		/* Language name */
+  const char * const locale;		/* Locale name */
+} _apple_name_locale_t;
+
+static const _apple_name_locale_t apple_name_locale[] =
+{
+  { "English"     , "en_US.UTF-8" },	{ "French"     , "fr.UTF-8" },
+  { "German"      , "de.UTF-8" },	{ "Italian"    , "it.UTF-8" },  
+  { "Dutch"       , "nl.UTF-8" },	{ "Swedish"    , "sv.UTF-8" },
+  { "Spanish"     , "es.UTF-8" },	{ "Danish"     , "da.UTF-8" },  
+  { "Portuguese"  , "pt.UTF-8" },	{ "Norwegian"  , "no.UTF-8" },
+  { "Hebrew"      , "he.UTF-8" },	{ "Japanese"   , "ja.UTF-8" },  
+  { "Arabic"      , "ar.UTF-8" },	{ "Finnish"    , "fi.UTF-8" },
+  { "Greek"       , "el.UTF-8" },	{ "Icelandic"  , "is.UTF-8" },  
+  { "Maltese"     , "mt.UTF-8" },	{ "Turkish"    , "tr.UTF-8" },
+  { "Croatian"    , "hr.UTF-8" },	{ "Chinese"    , "zh.UTF-8" },  
+  { "Urdu"        , "ur.UTF-8" },	{ "Hindi"      , "hi.UTF-8" },
+  { "Thai"        , "th.UTF-8" },	{ "Korean"     , "ko.UTF-8" },  
+  { "Lithuanian"  , "lt.UTF-8" },	{ "Polish"     , "pl.UTF-8" },
+  { "Hungarian"   , "hu.UTF-8" },	{ "Estonian"   , "et.UTF-8" },  
+  { "Latvian"     , "lv.UTF-8" },	{ "Sami"       , "se.UTF-8" },
+  { "Faroese"     , "fo.UTF-8" },	{ "Farsi"      , "fa.UTF-8" },  
+  { "Russian"     , "ru.UTF-8" },	{ "Chinese"    , "zh.UTF-8" },
+  { "Dutch"       , "nl.UTF-8" },	{ "Irish"      , "ga.UTF-8" },  
+  { "Albanian"    , "sq.UTF-8" },	{ "Romanian"   , "ro.UTF-8" },
+  { "Czech"       , "cs.UTF-8" },	{ "Slovak"     , "sk.UTF-8" },  
+  { "Slovenian"   , "sl.UTF-8" },	{ "Yiddish"    , "yi.UTF-8" },
+  { "Serbian"     , "sr.UTF-8" },	{ "Macedonian" , "mk.UTF-8" },  
+  { "Bulgarian"   , "bg.UTF-8" },	{ "Ukrainian"  , "uk.UTF-8" },
+  { "Byelorussian", "be.UTF-8" },	{ "Uzbek"      , "uz.UTF-8" },  
+  { "Kazakh"      , "kk.UTF-8" },	{ "Azerbaijani", "az.UTF-8" },
+  { "Azerbaijani" , "az.UTF-8" },	{ "Armenian"   , "hy.UTF-8" },  
+  { "Georgian"    , "ka.UTF-8" },	{ "Moldavian"  , "mo.UTF-8" },
+  { "Kirghiz"     , "ky.UTF-8" },	{ "Tajiki"     , "tg.UTF-8" },  
+  { "Turkmen"     , "tk.UTF-8" },	{ "Mongolian"  , "mn.UTF-8" },
+  { "Mongolian"   , "mn.UTF-8" },	{ "Pashto"     , "ps.UTF-8" },  
+  { "Kurdish"     , "ku.UTF-8" },	{ "Kashmiri"   , "ks.UTF-8" },
+  { "Sindhi"      , "sd.UTF-8" },	{ "Tibetan"    , "bo.UTF-8" },  
+  { "Nepali"      , "ne.UTF-8" },	{ "Sanskrit"   , "sa.UTF-8" },
+  { "Marathi"     , "mr.UTF-8" },	{ "Bengali"    , "bn.UTF-8" },  
+  { "Assamese"    , "as.UTF-8" },	{ "Gujarati"   , "gu.UTF-8" },
+  { "Punjabi"     , "pa.UTF-8" },	{ "Oriya"      , "or.UTF-8" },  
+  { "Malayalam"   , "ml.UTF-8" },	{ "Kannada"    , "kn.UTF-8" },
+  { "Tamil"       , "ta.UTF-8" },	{ "Telugu"     , "te.UTF-8" },  
+  { "Sinhalese"   , "si.UTF-8" },	{ "Burmese"    , "my.UTF-8" },
+  { "Khmer"       , "km.UTF-8" },	{ "Lao"        , "lo.UTF-8" },  
+  { "Vietnamese"  , "vi.UTF-8" },	{ "Indonesian" , "id.UTF-8" },
+  { "Tagalog"     , "tl.UTF-8" },	{ "Malay"      , "ms.UTF-8" },  
+  { "Malay"       , "ms.UTF-8" },	{ "Amharic"    , "am.UTF-8" },
+  { "Tigrinya"    , "ti.UTF-8" },	{ "Oromo"      , "om.UTF-8" },  
+  { "Somali"      , "so.UTF-8" },	{ "Swahili"    , "sw.UTF-8" },
+  { "Kinyarwanda" , "rw.UTF-8" },	{ "Rundi"      , "rn.UTF-8" },  
+  { "Nyanja"      , "" },		{ "Malagasy"   , "mg.UTF-8" },
+  { "Esperanto"   , "eo.UTF-8" },	{ "Welsh"      , "cy.UTF-8" },  
+  { "Basque"      , "eu.UTF-8" },	{ "Catalan"    , "ca.UTF-8" },
+  { "Latin"       , "la.UTF-8" },	{ "Quechua"    , "qu.UTF-8" },  
+  { "Guarani"     , "gn.UTF-8" },	{ "Aymara"     , "ay.UTF-8" },
+  { "Tatar"       , "tt.UTF-8" },	{ "Uighur"     , "ug.UTF-8" },  
+  { "Dzongkha"    , "dz.UTF-8" },	{ "Javanese"   , "jv.UTF-8" },
+  { "Sundanese"   , "su.UTF-8" },	{ "Galician"   , "gl.UTF-8" },  
+  { "Afrikaans"   , "af.UTF-8" },	{ "Breton"     , "br.UTF-8" },
+  { "Inuktitut"   , "iu.UTF-8" },	{ "Scottish"   , "gd.UTF-8" },  
+  { "Manx"        , "gv.UTF-8" },	{ "Irish"      , "ga.UTF-8" },
+  { "Tongan"      , "to.UTF-8" },	{ "Greek"      , "el.UTF-8" },  
+  { "Greenlandic" , "kl.UTF-8" },	{ "Azerbaijani", "az.UTF-8" }
+};
+
+
+/*
+ * 'appleLangDefault()' - Get the default locale string.
+ */
+
+static const char *			/* O - Locale string */
+appleLangDefault(void)
+{
+  int			i;		/* Looping var */
+  CFPropertyListRef 	localizationList;
+					/* List of localization data */
+  CFStringRef		localizationName;
+					/* Current name */
+  char			buff[256];	/* Temporary buffer */
+  _cups_globals_t	*cg = _cupsGlobals();
+  					/* Pointer to library globals */
+  char			*lang;		/* LANG environment variable */
+
+
+ /*
+  * Only do the lookup and translation the first time.
+  */
+
+  if (!cg->language[0])
+  {
+    if ((lang = getenv("LANG")))
+      strlcpy(cg->language, lang, sizeof(cg->language));
+    else
+    {
+      localizationList =
+          CFPreferencesCopyAppValue(CFSTR("AppleLanguages"),
+                                    kCFPreferencesCurrentApplication);
+
+      if (localizationList != NULL)
+      {
+	if (CFGetTypeID(localizationList) == CFArrayGetTypeID() &&
+	    CFArrayGetCount(localizationList) > 0)
+	{
+	  localizationName = CFArrayGetValueAtIndex(localizationList, 0);
+
+	  if (localizationName != NULL &&
+              CFGetTypeID(localizationName) == CFStringGetTypeID())
+	  {
+	    CFIndex length = CFStringGetLength(localizationName);
+
+	    if (length <= sizeof(buff) &&
+		CFStringGetCString(localizationName, buff, sizeof(buff),
+	                           kCFStringEncodingASCII))
+	    {
+	      buff[sizeof(buff) - 1] = '\0';
+
+	      for (i = 0;
+		   i < sizeof(apple_name_locale) / sizeof(apple_name_locale[0]);
+		   i++)
+	      {
+		if (!strcasecmp(buff, apple_name_locale[i].name))
+		{
+		  strlcpy(cg->language, apple_name_locale[i].locale, 
+			  sizeof(cg->language));
+		  break;
+		}
+	      }
+	    }
+	  }
+	}
+
+	CFRelease(localizationList);
+      }
+    }
+  
+   /*
+    * If we didn't find the language, default to en_US...
+    */
+
+    if (!cg->language[0])
+      strlcpy(cg->language, apple_name_locale[0].locale, sizeof(cg->language));
+  }
+
+ /*
+  * Return the cached locale...
+  */
+
+  return (cg->language);
+}
+#  endif /* HAVE_CF_LOCALE_ID */
 #endif /* __APPLE__ */
 
 

cups/libcups.exp

@@ -1,7 +1,6 @@
 __cups_strcpy
 __cupsAdminGetServerSettings
 __cupsAdminSetServerSettings
-__cupsAppleLanguage
 __cupsCharmapFlush
 __cupsCharmapFree
 __cupsCharmapGet

cups/options.c

@@ -3,7 +3,7 @@
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -470,28 +470,18 @@ cupsParseOptions(
   char	*copyarg,			/* Copy of input string */
 	*ptr,				/* Pointer into string */
 	*name,				/* Pointer to name */
-	*value,				/* Pointer to value */
-	quote;				/* Quote character */
+	*value;				/* Pointer to value */
 
 
- /*
-  * Range check input...
-  */
-
-  if (!arg)
-    return (num_options);
-
-  if (!options || num_options < 0)
+  if (arg == NULL || options == NULL || num_options < 0)
     return (0);
 
  /*
   * Make a copy of the argument string and then divide it up...
   */
 
-  if ((copyarg = strdup(arg)) == NULL)
-    return (num_options);
-
-  ptr = copyarg;
+  copyarg     = strdup(arg);
+  ptr         = copyarg;
 
  /*
   * Skip leading spaces...
@@ -511,7 +501,7 @@ cupsParseOptions(
     */
 
     name = ptr;
-    while (!isspace(*ptr & 255) && *ptr != '=' && *ptr)
+    while (!isspace(*ptr & 255) && *ptr != '=' && *ptr != '\0')
       ptr ++;
 
    /*
@@ -531,10 +521,10 @@ cupsParseOptions(
     if (*ptr != '=')
     {
      /*
-      * Boolean option...
+      * Start of another option...
       */
 
-      if (!strncasecmp(name, "no", 2))
+      if (strncasecmp(name, "no", 2) == 0)
         num_options = cupsAddOption(name + 2, "false", num_options,
 	                            options);
       else
@@ -549,18 +539,38 @@ cupsParseOptions(
 
     *ptr++ = '\0';
 
-    if (*ptr == '\'' || *ptr == '\"')
+    if (*ptr == '\'')
     {
      /*
       * Quoted string constant...
       */
 
-      quote = *ptr++;
+      ptr ++;
       value = ptr;
 
-      while (*ptr != quote && *ptr)
+      while (*ptr != '\'' && *ptr != '\0')
       {
-        if (*ptr == '\\' && ptr[1])
+        if (*ptr == '\\')
+	  _cups_strcpy(ptr, ptr + 1);
+
+        ptr ++;
+      }
+
+      if (*ptr != '\0')
+        *ptr++ = '\0';
+    }
+    else if (*ptr == '\"')
+    {
+     /*
+      * Double-quoted string constant...
+      */
+
+      ptr ++;
+      value = ptr;
+
+      while (*ptr != '\"' && *ptr != '\0')
+      {
+        if (*ptr == '\\')
 	  _cups_strcpy(ptr, ptr + 1);
 
         ptr ++;
@@ -593,7 +603,7 @@ cupsParseOptions(
 	      break;
 	  }
         }
-        else if (*ptr == '\\' && ptr[1])
+        else if (*ptr == '\\')
 	  _cups_strcpy(ptr, ptr + 1);
 
       if (*ptr != '\0')
@@ -607,9 +617,9 @@ cupsParseOptions(
 
       value = ptr;
 
-      while (!isspace(*ptr & 255) && *ptr)
+      while (!isspace(*ptr & 255) && *ptr != '\0')
       {
-        if (*ptr == '\\' && ptr[1])
+        if (*ptr == '\\')
 	  _cups_strcpy(ptr, ptr + 1);
 
         ptr ++;

cups/ppd.c

@@ -3,7 +3,7 @@
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -454,9 +454,6 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
   cups_encoding_t	encoding;	/* Encoding of PPD file */
   _cups_globals_t	*cg = _cupsGlobals();
 					/* Global data */
-  char			custom_name[PPD_MAX_NAME];
-					/* CustomFoo attribute name */
-  ppd_attr_t		*custom_attr;	/* CustomFoo attribute */
   static const char * const ui_keywords[] =
 			{
 #ifdef CUPS_USE_FULL_UI_KEYWORDS_LIST
@@ -814,13 +811,6 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
         profile = realloc(ppd->profiles, sizeof(ppd_profile_t) *
 	                                 (ppd->num_profiles + 1));
 
-      if (!profile)
-      {
-        cg->ppd_status = PPD_ALLOC_ERROR;
-
-	goto error;
-      }
-
       ppd->profiles     = profile;
       profile           += ppd->num_profiles;
       ppd->num_profiles ++;
@@ -1015,14 +1005,44 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
     }
     else if (!strncmp(keyword, "Custom", 6) && !strcmp(name, "True") && !option)
     {
-      ppd_option_t	*custom_option;	/* Custom option */
-
       DEBUG_puts("Processing Custom option...");
 
      /*
       * Get the option and custom option...
       */
 
+      if ((option = ppdFindOption(ppd, keyword + 6)) == NULL)
+      {
+        int		groupidx = -1;	/* Index for current group */
+	ppd_group_t	*gtemp;		/* Temporary group */
+
+
+        DEBUG_printf(("%s option not found for %s...\n", keyword + 6, keyword));
+
+        if (group)
+          groupidx = group - ppd->groups; /* Save index for current group */
+
+	if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
+	                           encoding)) == NULL)
+	{
+	  DEBUG_puts("Unable to get general group!");
+
+	  goto error;
+	}
+
+        if (group)
+          group = ppd->groups + groupidx; /* Restore group pointer */
+
+	if ((option = ppd_get_option(gtemp, keyword + 6)) == NULL)
+	{
+	  DEBUG_printf(("Unable to get %s option!\n", keyword + 6));
+
+          cg->ppd_status = PPD_ALLOC_ERROR;
+
+	  goto error;
+	}
+      }
+
       if (!ppd_get_coption(ppd, keyword + 6))
       {
         cg->ppd_status = PPD_ALLOC_ERROR;
@@ -1030,18 +1050,63 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 	goto error;
       }
 
-      if (option && !strcasecmp(option->keyword, keyword + 6))
-        custom_option = option;
-      else
-        custom_option = ppdFindOption(ppd, keyword + 6);
+     /*
+      * Add the "custom" option...
+      */
 
-      if (custom_option)
+      if ((choice = ppd_add_choice(option, "Custom")) == NULL)
       {
+	DEBUG_puts("Unable to add Custom choice!");
+
+        cg->ppd_status = PPD_ALLOC_ERROR;
+
+	goto error;
+      }
+
+      strlcpy(choice->text, text[0] ? text : _("Custom"),
+              sizeof(choice->text));
+
+      choice->code = string;
+      string       = NULL;		/* Don't add as an attribute below */
+      option       = NULL;
+
+     /*
+      * Now process custom page sizes specially...
+      */
+
+      if (!strcmp(keyword, "CustomPageSize"))
+      {
+	ppd->variable_sizes = 1;
+
        /*
-	* Add the "custom" option...
+	* Add a "Custom" page size entry...
 	*/
 
-	if ((choice = ppd_add_choice(custom_option, "Custom")) == NULL)
+	ppd_add_size(ppd, "Custom");
+
+	if ((option = ppdFindOption(ppd, "PageRegion")) == NULL)
+	{
+	  int		groupidx = -1;	/* Index to current group */
+	  ppd_group_t	*gtemp;		/* Temporary group */
+
+          if (group)
+            groupidx = group - ppd->groups; /* Save index for current group */
+
+	  if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
+				     encoding)) == NULL)
+	  {
+	    DEBUG_puts("Unable to get general group!");
+
+	    goto error;
+	  }
+
+          if (group)
+            group = ppd->groups + groupidx; /* Restore group pointer */
+
+	  option = ppd_get_option(gtemp, "PageRegion");
+        }
+
+	if ((choice = ppd_add_choice(option, "Custom")) == NULL)
 	{
 	  DEBUG_puts("Unable to add Custom choice!");
 
@@ -1052,43 +1117,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 
 	strlcpy(choice->text, text[0] ? text : _("Custom"),
 		sizeof(choice->text));
-
-	choice->code = strdup(string);
-      }
-
-     /*
-      * Now process custom page sizes specially...
-      */
-
-      if (!strcmp(keyword, "CustomPageSize"))
-      {
-       /*
-	* Add a "Custom" page size entry...
-	*/
-
-	ppd->variable_sizes = 1;
-
-	ppd_add_size(ppd, "Custom");
-
-	if (option && !strcasecmp(option->keyword, "PageRegion"))
-	  custom_option = option;
-	else
-	  custom_option = ppdFindOption(ppd, "PageRegion");
-
-        if (custom_option)
-	{
-	  if ((choice = ppd_add_choice(custom_option, "Custom")) == NULL)
-	  {
-	    DEBUG_puts("Unable to add Custom choice!");
-
-	    cg->ppd_status = PPD_ALLOC_ERROR;
-
-	    goto error;
-	  }
-
-	  strlcpy(choice->text, text[0] ? text : _("Custom"),
-		  sizeof(choice->text));
-        }
+        option = NULL;
       }
     }
     else if (!strcmp(keyword, "LandscapeOrientation"))
@@ -1109,12 +1138,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 	}
 
       ppd->num_emulations = count;
-      if ((ppd->emulations = calloc(count, sizeof(ppd_emul_t))) == NULL)
-      {
-        cg->ppd_status = PPD_ALLOC_ERROR;
-
-	goto error;
-      }
+      ppd->emulations     = calloc(count, sizeof(ppd_emul_t));
 
       for (i = 0, sptr = string; i < count; i ++)
       {
@@ -1276,33 +1300,6 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 
       ppd_free(string);
       string = NULL;
-
-     /*
-      * Add a custom option choice if we have already seen a CustomFoo
-      * attribute...
-      */
-
-      if (!strcasecmp(name, "PageRegion"))
-        strcpy(custom_name, "CustomPageSize");
-      else
-        snprintf(custom_name, sizeof(custom_name), "Custom%s", name);
-
-      if ((custom_attr = ppdFindAttr(ppd, custom_name, "True")) != NULL)
-      {
-	if ((choice = ppd_add_choice(option, "Custom")) == NULL)
-	{
-	  DEBUG_puts("Unable to add Custom choice!");
-
-	  cg->ppd_status = PPD_ALLOC_ERROR;
-
-	  goto error;
-	}
-
-	strlcpy(choice->text,
-	        custom_attr->text[0] ? custom_attr->text : _("Custom"),
-		sizeof(choice->text));
-        choice->code = strdup(custom_attr->value);
-      }
     }
     else if (!strcmp(keyword, "JCLOpenUI"))
     {
@@ -1382,30 +1379,6 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 
       ppd_free(string);
       string = NULL;
-
-     /*
-      * Add a custom option choice if we have already seen a CustomFoo
-      * attribute...
-      */
-
-      snprintf(custom_name, sizeof(custom_name), "Custom%s", name);
-
-      if ((custom_attr = ppdFindAttr(ppd, custom_name, "True")) != NULL)
-      {
-	if ((choice = ppd_add_choice(option, "Custom")) == NULL)
-	{
-	  DEBUG_puts("Unable to add Custom choice!");
-
-	  cg->ppd_status = PPD_ALLOC_ERROR;
-
-	  goto error;
-	}
-
-	strlcpy(choice->text,
-	        custom_attr->text[0] ? custom_attr->text : _("Custom"),
-		sizeof(choice->text));
-        choice->code = strdup(custom_attr->value);
-      }
     }
     else if (!strcmp(keyword, "CloseUI") || !strcmp(keyword, "JCLCloseUI"))
     {
@@ -1878,12 +1851,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
       * Add the option choice...
       */
 
-      if ((choice = ppd_add_choice(option, name)) == NULL)
-      {
-        cg->ppd_status = PPD_ALLOC_ERROR;
-
-	goto error;
-      }
+      choice = ppd_add_choice(option, name);
 
       if (text[0])
         cupsCharsetToUTF8((cups_utf8_t *)choice->text, text,

cups/request.c

@@ -17,7 +17,6 @@
  * Contents:
  *
  *   cupsDoFileRequest() - Do an IPP request with a file.
- *   cupsDoIORequest()   - Do an IPP request with file descriptors.
  *   cupsDoRequest()     - Do an IPP request.
  *   _cupsSetError()     - Set the last IPP status code and status-message.
  *   _cupsSetHTTPError() - Set the last error using the HTTP status.

cups/string.c

@@ -613,7 +613,7 @@ _cups_strcasecmp(const char *s,	/* I - First string */
 #ifndef HAVE_STRNCASECMP
 int					/* O - Result of comparison (-1, 0, or 1) */
 _cups_strncasecmp(const char *s,	/* I - First string */
-                  const char *t,	/* I - Second string */
+                 vconst char *t,	/* I - Second string */
 		  size_t     n)		/* I - Maximum number of characters to compare */
 {
   while (*s != '\0' && *t != '\0' && n > 0)

cups/testcups.c

@@ -106,7 +106,6 @@ main(int  argc,				/* I - Number of command-line arguments */
   {
     status = 1;
     puts("FAIL");
-    return (1);
   }
   else
     puts("PASS");

cups/transcode.c

@@ -3,7 +3,7 @@
  *
  *   Transcoding support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -132,6 +132,8 @@ _cupsCharmapFlush(void)
     vnext = vmap->next;
 
     free_vbcs_charmap(vmap);
+
+    free(vmap);
   }
 
   vmap_cache = NULL;
@@ -328,8 +330,13 @@ cupsCharsetToUTF8(
 
   if (encoding < CUPS_ENCODING_SBCS_END)
     bytes = conv_sbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
-  else
+  else if (encoding < CUPS_ENCODING_VBCS_END)
     bytes = conv_vbcs_to_utf8(dest, (cups_sbcs_t *)src, maxout, encoding);
+  else
+  {
+    DEBUG_puts("    Bad encoding, returning -1");
+    bytes = -1;
+  }
 
 #ifdef HAVE_PTHREAD_H
   pthread_mutex_unlock(&map_mutex);
@@ -430,8 +437,10 @@ cupsUTF8ToCharset(
 
   if (encoding < CUPS_ENCODING_SBCS_END)
     bytes = conv_utf8_to_sbcs((cups_sbcs_t *)dest, src, maxout, encoding);
-  else
+  else if (encoding < CUPS_ENCODING_VBCS_END)
     bytes = conv_utf8_to_vbcs((cups_sbcs_t *)dest, src, maxout, encoding);
+  else
+    bytes = -1;
 
 #ifdef HAVE_PTHREAD_H
   pthread_mutex_unlock(&map_mutex);
@@ -1459,8 +1468,6 @@ get_vbcs_charmap(
   {
     DEBUG_puts("    Unable to get charmap count!");
 
-    cupsFileClose(fp);
-
     return (NULL);
   }
 
@@ -1472,9 +1479,8 @@ get_vbcs_charmap(
 
   if ((vmap = (_cups_vmap_t *)calloc(1, sizeof(_cups_vmap_t))) == NULL)
   {
-    DEBUG_puts("    Unable to allocate memory!");
-
     cupsFileClose(fp);
+    DEBUG_puts("    Unable to allocate memory!");
 
     return (NULL);
   }

cups/util.c

@@ -846,6 +846,9 @@ cupsGetPPD2(http_t     *http,		/* I - HTTP connection */
 
   close(fd);
 
+  if (http2 != http)
+    httpClose(http2);
+
  /*
   * See if we actually got the file or an error...
   */
@@ -874,9 +877,6 @@ cupsGetPPD2(http_t     *http,		/* I - HTTP connection */
     return (NULL);
   }
 
-  if (http2 != http)
-    httpClose(http2);
-
  /*
   * Return the PPD file...
   */

data/testprint.ps

@@ -14,7 +14,7 @@
 %
 %   PostScript test page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 2007-2008 Apple Inc.
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2007 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
@@ -573,10 +573,10 @@ gsave
   pageHeight 8 mul			% Move down...
   2 copy moveto				% Position text
   smallFont setfont			% Font
-  (Copyright 2007-2008 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the) show
+  (Copyright 2007 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the trademark) show
   pageHeight 2 add sub			% Move down...
   2 copy moveto				% Position text
-  (trademark property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
+  (property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
   pageHeight 2 mul 4 add sub		% Move down...
   moveto				% Position text
   (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show
@@ -593,6 +593,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: testprint.ps 7158 2008-01-02 21:23:11Z mike $".
+% End of "$Id: testprint.ps 6649 2007-07-11 21:46:42Z mike $".
 %
 %%EOF

doc/Makefile

@@ -217,14 +217,18 @@ install:	all $(INSTALL_LANGUAGES)
 
 install-languages:
 	for lang in $(LANGUAGES); do \
-		if test -d $$lang; then \
-			$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
-			$(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang 2>/dev/null || true; \
-			$(INSTALL_MAN) $$lang/cups.css $(DOCDIR)/$$lang 2>/dev/null || true; \
-			for file in $(WEBBUTTONS); do \
-				$(INSTALL_MAN) $$lang/$$file $(DOCDIR)/$$lang/images 2>/dev/null || true; \
-			done \
+		$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
+		if test -f $$lang/index.html; then \
+			$(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang; \
 		fi; \
+		if test -f $$lang/cups.css; then \
+			$(INSTALL_MAN) $$lang/cups.css $(DOCDIR)/$$lang; \
+		fi; \
+		for file in $(WEBBUTTONS); do \
+			if test -f $$lang/$$file; then \
+				$(INSTALL_MAN) $$lang/$$file $(DOCDIR)/$$lang/images; \
+			fi; \
+		done \
 	done
 
 

doc/help/ref-cupsd-conf.html.in

@@ -31,8 +31,7 @@ process using the startup script for your operating system:</P>
 
 	<LI>MacOS X:
 	<PRE CLASS="command">
-sudo launchctl unload /System/Library/LaunchDaemons/org.cups.cupsd.plist
-sudo launchctl load /System/Library/LaunchDaemons/org.cups.cupsd.plist
+/System/Library/StartupItems/PrintingServices/PrintingServices restart
 	</PRE></LI>
 
 </UL>
@@ -511,10 +510,10 @@ printers. The default is to not include any options.</P>
 BrowseLocalProtocols all
 BrowseLocalProtocols none
 BrowseLocalProtocols cups
-BrowseLocalProtocols dnssd
+BrowseLocalProtocols dns-sd
 BrowseLocalProtocols ldap
 BrowseLocalProtocols slp
-BrowseLocalProtocols cups dnssd
+BrowseLocalProtocols cups dns-sd
 </PRE>
 
 <H3>Description</H3>
@@ -604,10 +603,10 @@ on all of the systems that you want to see.
 BrowseProtocols all
 BrowseProtocols none
 BrowseProtocols cups
-BrowseProtocols dnssd
+BrowseProtocols dns-sd
 BrowseProtocols ldap
 BrowseProtocols slp
-BrowseProtocols cups dnssd
+BrowseProtocols cups dns-sd
 </PRE>
 
 <H3>Description</H3>
@@ -690,10 +689,10 @@ The default is to not include any options.</P>
 BrowseRemoteProtocols all
 BrowseRemoteProtocols none
 BrowseRemoteProtocols cups
-BrowseRemoteProtocols dnssd
+BrowseRemoteProtocols dns-sd
 BrowseRemoteProtocols ldap
 BrowseRemoteProtocols slp
-BrowseRemoteProtocols cups dnssd
+BrowseRemoteProtocols cups dns-sd
 </PRE>
 
 <H3>Description</H3>

doc/help/spec-ipp.html

@@ -11,7 +11,7 @@
 
   CUPS IPP specification for the Common UNIX Printing System (CUPS).
 
-  Copyright 2007-2008 by Apple Inc.
+  Copyright 2007 by Apple Inc.
   Copyright 1997-2007 by Easy Software Products.
 
   These coded instructions, statements, and computer programs are the
@@ -2251,101 +2251,6 @@ the system.
 <p>The job-sheets-supported attribute specifies the available banner files.
 There will always be at least one banner file available called "none".
 
-<h4><a name="marker-change-time">marker-change-time (integer)</a></h4>
-
-<p>The marker-change-time attribute specifies the printer-up-time value when
-the last change to the marker-colors, marker-levels, marker-names, or
-marker-types attributes was made.</p>
-
-<h4><a name="marker-colors">marker-colors (1setof name(MAX))</a></h4>
-
-<p>The marker-colors attribute specifies the color(s) for each supply in the
-printer. It is only available when the driver provides supply levels. The
-color is either "none" or one or more hex-encoded sRGB colors of the form
-"#RRGGBB".</p>
-
-<h4><a name="marker-levels">marker-levels (1setof integer(-1:100))</a></h4>
-
-<p>The marker-levels attribute specifies the current supply levels for the
-printer. It is only available when the driver provides supply levels. A
-value of -1 indicates the level is unknown, while values from 0 to 100
-indicate the corresponding percentage.</p>
-
-<h4><a name="marker-names">marker-names (1setof name(MAX))</a></h4>
-
-<p>The marker-names attribute specifies the name(s) for each supply in the
-printer. It is only available when the driver provides supply levels.</p>
-
-<h4><a name="marker-types">marker-types (1setof type3 keyword)</a></h4>
-
-<p>The marker-types attribute specifies the type(s) of each supply in the
-printer. It is only available when the driver provides supply levels. The
-following (RFC 3805) types are currently supported:</p>
-
-<ul>
-
-	<li><tt>toner</tt></li>
-
-	<li><tt>wasteToner</tt></li>
-
-	<li><tt>ink</tt></li>
-
-	<li><tt>inkCartridge</tt></li>
-
-	<li><tt>inkRibbon</tt></li>
-
-	<li><tt>wasteInk</tt></li>
-
-	<li><tt>opc</tt></li>
-
-	<li><tt>developer</tt></li>
-
-	<li><tt>fuserOil</tt></li>
-
-	<li><tt>solidWax</tt></li>
-
-	<li><tt>ribbonWax</tt></li>
-
-	<li><tt>wasteWax</tt></li>
-
-	<li><tt>fuser</tt></li>
-
-	<li><tt>coronaWire</tt></li>
-
-	<li><tt>fuserOilWick</tt></li>
-
-	<li><tt>cleanerUnit</tt></li>
-
-	<li><tt>fuserCleaningPad</tt></li>
-
-	<li><tt>transferUnit</tt></li>
-
-	<li><tt>tonerCartridge</tt></li>
-
-	<li><tt>fuserOiler</tt></li>
-
-	<li><tt>water</tt></li>
-
-	<li><tt>wasteWater</tt></li>
-
-	<li><tt>bindingSupply</tt></li>
-
-	<li><tt>bandingSupply</tt></li>
-
-	<li><tt>stichingWire</tt></li>
-
-	<li><tt>shrinkWrap</tt></li>
-
-	<li><tt>paperWrap</tt></li>
-
-	<li><tt>staples</tt></li>
-
-	<li><tt>inserts</tt></li>
-
-	<li><tt>covers</tt></li>
-
-</ul>
-
 <h4><a name="port-monitor">port-monitor" (name(127))</a></h4>
 
 <p>The port-monitor attribute specifies the port monitor to use when printing

doc/help/spec-ppd.html

@@ -8,7 +8,7 @@
 </head>
 <body>
 <!--
-  "$Id: spec-ppd.html 7273 2008-01-30 19:21:55Z mike $"
+  "$Id: spec-ppd.html 7050 2007-10-31 18:35:56Z mike $"
 
   CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
 
@@ -1204,7 +1204,7 @@ list of locale names ("en", "en_US", "fr_CA", etc.)</p>
 
 <pre class='command'>
 <em>*% Specify Canadian, UK, and US English, and Candian and French French</em> 
-*cupsLanguages: "en_CA en_UK en_US fr_CA fr_FR"
+*cupsLanguages: "en_CA en_UK en_US fr_CA fr_CA"
 </pre>
 
 <h3><a name='cupsManualCopies'>cupsManualCopies</a></h3>

doc/index.html.in

@@ -112,9 +112,9 @@ assistance:</P>
 WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are
-trademarks of <A HREF="http://www.apple.com">Apple Inc.</A> CUPS is
-copyright 2007-2008 Apple Inc. All rights reserved.</SMALL></P>
+<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
+trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
 
 </TD>
 

filter/hpgl-input.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 input processing for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -48,7 +48,6 @@ ParseCommand(FILE    *fp,	/* I - File to read from */
 		i;		/* Looping var */
   char		buf[262144],	/* String buffer */
 		*bufptr;	/* Pointer into buffer */
-  float		temp;		/* Temporary parameter value */
   static param_t p[MAX_PARAMS];	/* Parameter buffer */
 
 
@@ -213,10 +212,10 @@ ParseCommand(FILE    *fp,	/* I - File to read from */
       case '-' :
       case '+' :
           ungetc(ch, fp);
-          if (fscanf(fp, "%f", &temp) == 1 && num_params < MAX_PARAMS)
+          fscanf(fp, "%f", &(p[num_params].value.number));
+          if (num_params < MAX_PARAMS)
           {
-            p[num_params].type         = PARAM_RELATIVE;
-            p[num_params].value.number = temp;
+            p[num_params].type = PARAM_RELATIVE;
             num_params ++;
           }
           break;
@@ -232,10 +231,10 @@ ParseCommand(FILE    *fp,	/* I - File to read from */
       case '9' :
       case '.' :
           ungetc(ch, fp);
-          if (fscanf(fp, "%f", &temp) == 1 && num_params < MAX_PARAMS)
+          fscanf(fp, "%f", &(p[num_params].value.number));
+          if (num_params < MAX_PARAMS)
           {
-            p[num_params].type         = PARAM_ABSOLUTE;
-            p[num_params].value.number = temp;
+            p[num_params].type = PARAM_ABSOLUTE;
             num_params ++;
           }
           break;

filter/image-bmp.c

@@ -3,7 +3,7 @@
  *
  *   BMP image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -179,22 +179,9 @@ _cupsImageReadBMP(
 
   cupsImageSetMaxTiles(img, 0);
 
+  in  = malloc(img->xsize * 3);
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(img->xsize * 3)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    free(in);
-    fclose(fp);
-    return (1);
-  }
+  out = malloc(img->xsize * bpp);
 
  /*
   * Read the image data...

filter/image-gif.c

@@ -3,7 +3,7 @@
  *
  *   GIF image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -37,7 +37,6 @@
 
 #define GIF_INTERLACE	0x40
 #define GIF_COLORMAP	0x80
-#define GIF_MAX_BITS	12
 
 typedef cups_ib_t	gif_cmap_t[256][4];
 typedef short		gif_table_t[4096];
@@ -463,14 +462,8 @@ gif_read_image(FILE         *fp,	/* I - Input file */
   pass      = 0;
   code_size = getc(fp);
 
-  if (code_size > GIF_MAX_BITS || !pixels)
-    return (-1);
-
   if (gif_read_lzw(fp, 1, code_size) < 0)
-  {
-    free(pixels);
     return (-1);
-  }
 
   temp = pixels;
   while ((pixel = gif_read_lzw(fp, 0, code_size)) >= 0)

filter/image-jpeg.c

@@ -47,8 +47,8 @@ _cupsImageReadJPEG(
   struct jpeg_error_mgr	jerr;		/* Error handler info */
   cups_ib_t		*in,		/* Input pixels */
 			*out;		/* Output pixels */
-  jpeg_saved_marker_ptr	marker;		/* Pointer to marker data */
-  int			psjpeg = 0;	/* Non-zero if Photoshop CMYK JPEG */
+  char			header[16];	/* Photoshop JPEG header */
+  int			psjpeg;		/* Non-zero if Photoshop JPEG */
   static const char	*cspaces[] =
 			{		/* JPEG colorspaces... */
 			  "JCS_UNKNOWN",
@@ -60,31 +60,24 @@ _cupsImageReadJPEG(
 			};
 
 
+ /*
+  * Read the first 16 bytes to determine if this is a Photoshop JPEG file...
+  */
+
+  fread(header, sizeof(header), 1, fp);
+  rewind(fp);
+
+  psjpeg = memcmp(header + 6, "Photoshop ", 10) == 0;
+
  /*
   * Read the JPEG header...
   */
 
   cinfo.err = jpeg_std_error(&jerr);
   jpeg_create_decompress(&cinfo);
-  jpeg_save_markers(&cinfo, JPEG_APP0 + 14, 0xffff); /* Adobe JPEG */
   jpeg_stdio_src(&cinfo, fp);
   jpeg_read_header(&cinfo, 1);
 
- /*
-  * Parse any Adobe APPE data embedded in the JPEG file.  Since Adobe doesn't
-  * bother following standards, we have to invert the CMYK JPEG data written by
-  * Adobe apps...
-  */
-
-  for (marker = cinfo.marker_list; marker; marker = marker->next)
-    if (marker->marker == (JPEG_APP0 + 14) && marker->data_length >= 12 &&
-        !memcmp(marker->data, "Adobe", 5) && marker->data[11] == 2)
-    {
-      fputs("DEBUG: Adobe CMYK JPEG detected (inverting color values)\n",
-	    stderr);
-      psjpeg = 1;
-    }
-
   cinfo.quantize_colors = 0;
 
   fprintf(stderr, "DEBUG: num_components = %d\n", cinfo.num_components);

filter/image-photocd.c

@@ -7,7 +7,7 @@
  *   is only YCC encoded.  Support for the higher resolution images will
  *   require a lot of extra code...
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -99,33 +99,11 @@ _cupsImageReadPhotoCD(
   cupsImageSetMaxTiles(img, 0);
 
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(768 * 3)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(768 * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
+  in  = malloc(768 * 3);
+  out = malloc(768 * bpp);
 
   if (bpp > 1)
-  {
-    if ((rgb = malloc(768 * 3)) == NULL)
-    {
-      fputs("DEBUG: Unable to allocate memory!\n", stderr);
-      fclose(fp);
-      free(in);
-      free(out);
-      return (1);
-    }
-  }
+    rgb = malloc(768 * 3);
   else
     rgb = NULL;
 
@@ -163,9 +141,6 @@ _cupsImageReadPhotoCD(
       free(in);
       free(out);
 
-      if (bpp > 1)
-        free(rgb);
-
       return (-1);
     }
 

filter/image-pix.c

@@ -3,7 +3,7 @@
  *
  *   Alias PIX image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -95,22 +95,9 @@ _cupsImageReadPIX(
 
   cupsImageSetMaxTiles(img, 0);
 
+  in  = malloc(img->xsize * (depth / 8));
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(img->xsize * (depth / 8))) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
+  out = malloc(img->xsize * bpp);
 
  /*
   * Read the image data...

filter/image-pnm.c

@@ -3,7 +3,7 @@
  *
  *   Portable Any Map file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -67,13 +67,7 @@ _cupsImageReadPNM(
   *   max sample
   */
 
-  if ((lineptr = fgets(line, sizeof(line), fp)) == NULL)
-  {
-    fputs("DEBUG: Bad PNM header!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
+  lineptr = fgets(line, sizeof(line), fp);
   lineptr ++;
 
   format = atoi(lineptr);
@@ -153,21 +147,8 @@ _cupsImageReadPNM(
   cupsImageSetMaxTiles(img, 0);
 
   bpp = cupsImageGetDepth(img);
-
-  if ((in = malloc(img->xsize * 3)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
+  in  = malloc(img->xsize * 3);
+  out = malloc(img->xsize * bpp);
 
  /*
   * Read the image file...
@@ -178,11 +159,6 @@ _cupsImageReadPNM(
     switch (format)
     {
       case 1 :
-          for (x = img->xsize, inptr = in; x > 0; x --, inptr ++)
-            if (fscanf(fp, "%d", &val) == 1)
-              *inptr = val ? 0 : 255;
-          break;
-
       case 2 :
           for (x = img->xsize, inptr = in; x > 0; x --, inptr ++)
             if (fscanf(fp, "%d", &val) == 1)
@@ -208,9 +184,9 @@ _cupsImageReadPNM(
                x --, inptr ++)
           {
             if (*outptr & bit)
-              *inptr = 0;
-            else
               *inptr = 255;
+            else
+              *inptr = 0;
 
             if (bit > 1)
               bit >>= 1;

filter/image-sgi.c

@@ -3,7 +3,7 @@
  *
  *   SGI image file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -77,6 +77,7 @@ _cupsImageReadSGI(
     fprintf(stderr, "DEBUG: Bad SGI image dimensions %ux%ux%u!\n",
             sgip->xsize, sgip->ysize, sgip->zsize);
     sgiClose(sgip);
+    fclose(fp);
     return (1);
   }
 
@@ -91,32 +92,10 @@ _cupsImageReadSGI(
   cupsImageSetMaxTiles(img, 0);
 
   bpp = cupsImageGetDepth(img);
+  in  = malloc(img->xsize * sgip->zsize);
+  out = malloc(img->xsize * bpp);
 
-  if ((in = malloc(img->xsize * sgip->zsize)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    sgiClose(sgip);
-    return (1);
-  }
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    sgiClose(sgip);
-    free(in);
-    return (1);
-  }
-
-  if ((rows[0] = calloc(img->xsize * sgip->zsize,
-                        sizeof(unsigned short))) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    sgiClose(sgip);
-    free(in);
-    free(out);
-    return (1);
-  }
-
+  rows[0] = calloc(img->xsize * sgip->zsize, sizeof(unsigned short));
   for (i = 1; i < sgip->zsize; i ++)
     rows[i] = rows[0] + i * img->xsize;
 

filter/image-sgilib.c

@@ -4,7 +4,7 @@
  *   SGI image file format library routines for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -250,20 +250,8 @@ sgiOpenFile(FILE *file,			/* I - File to open */
 
           fseek(sgip->file, 512, SEEK_SET);
 
-          if ((sgip->table = calloc(sgip->zsize, sizeof(long *))) == NULL)
-	  {
-	    free(sgip);
-	    return (NULL);
-	  }
-
-          if ((sgip->table[0] = calloc(sgip->ysize * sgip->zsize,
-	                               sizeof(long))) == NULL)
-          {
-	    free(sgip->table);
-	    free(sgip);
-	    return (NULL);
-	  }
-
+          sgip->table    = calloc(sgip->zsize, sizeof(long *));
+          sgip->table[0] = calloc(sgip->ysize * sgip->zsize, sizeof(long));
           for (i = 1; i < sgip->zsize; i ++)
             sgip->table[i] = sgip->table[0] + i * sgip->ysize;
 
@@ -345,39 +333,12 @@ sgiOpenFile(FILE *file,			/* I - File to open */
 
               sgip->firstrow = ftell(sgip->file);
               sgip->nextrow  = ftell(sgip->file);
-              if ((sgip->table = calloc(sgip->zsize, sizeof(long *))) == NULL)
-	      {
-	        free(sgip);
-		return (NULL);
-	      }
-
-              if ((sgip->table[0] = calloc(sgip->ysize * sgip->zsize,
-	                                   sizeof(long))) == NULL)
-              {
-	        free(sgip->table);
-		free(sgip);
-		return (NULL);
-	      }
-
+              sgip->table    = calloc(sgip->zsize, sizeof(long *));
+              sgip->table[0] = calloc(sgip->ysize * sgip->zsize, sizeof(long));
               for (i = 1; i < sgip->zsize; i ++)
         	sgip->table[i] = sgip->table[0] + i * sgip->ysize;
-
-              if ((sgip->length = calloc(sgip->zsize, sizeof(long *))) == NULL)
-	      {
-	        free(sgip->table);
-		free(sgip);
-		return (NULL);
-	      }
-
-              if ((sgip->length[0] = calloc(sgip->ysize * sgip->zsize,
-	                                    sizeof(long))) == NULL)
-              {
-	        free(sgip->length);
-		free(sgip->table);
-		free(sgip);
-		return (NULL);
-	      }
-
+              sgip->length    = calloc(sgip->zsize, sizeof(long *));
+              sgip->length[0] = calloc(sgip->ysize * sgip->zsize, sizeof(long));
               for (i = 1; i < sgip->zsize; i ++)
         	sgip->length[i] = sgip->length[0] + i * sgip->ysize;
               break;

filter/image-sun.c

@@ -3,7 +3,7 @@
  *
  *   Sun Raster image file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -152,32 +152,9 @@ _cupsImageReadSunRaster(
     in = malloc(img->xsize * 3 + 1);
   }
 
-  if (!in)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    return (1);
-  }
-
-  bpp = cupsImageGetDepth(img);
-
-  if ((out = malloc(img->xsize * bpp)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    return (1);
-  }
-
-  if ((scanline = malloc(scanwidth)) == NULL)
-  {
-    fputs("DEBUG: Unable to allocate memory!\n", stderr);
-    fclose(fp);
-    free(in);
-    free(out);
-    return (1);
-  }
-
+  bpp       = cupsImageGetDepth(img);
+  out       = malloc(img->xsize * bpp);
+  scanline  = malloc(scanwidth);
   run_count = 0;
   run_value = 0;
 

filter/image.c

@@ -3,7 +3,7 @@
  *
  *   Base image support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -320,10 +320,15 @@ cupsImageOpen(
   */
 
   if ((fp = fopen(filename, "r")) == NULL)
-    return (NULL);
+  {
+/*    perror("ERROR: Unable to open image file");
+*/    return (NULL);
+  }
 
   if (fread(header, 1, sizeof(header), fp) == 0)
   {
+/*    perror("ERROR: Unable to read image file header");
+*/
     fclose(fp);
     return (NULL);
   }
@@ -341,7 +346,8 @@ cupsImageOpen(
 
   if (img == NULL)
   {
-    fclose(fp);
+/*    perror("ERROR: Unable to allocate memory for image file");
+*/    fclose(fp);
     return (NULL);
   }
 
@@ -395,7 +401,8 @@ cupsImageOpen(
 #endif /* HAVE_LIBTIFF */
   else
   {
-    fclose(fp);
+/*    fputs("ERROR: Unknown image file format!");
+*/    fclose(fp);
     status = -1;
   }
 
@@ -722,11 +729,8 @@ get_tile(cups_image_t *img,		/* I - Image */
 
     DEBUG_printf(("Creating tile array (%dx%d)\n", xtiles, ytiles));
 
-    if ((img->tiles = calloc(sizeof(cups_itile_t *), ytiles)) == NULL)
-      return (NULL);
-
-    if ((tile = calloc(sizeof(cups_itile_t), xtiles * ytiles)) == NULL)
-      return (NULL);
+    img->tiles = calloc(sizeof(cups_itile_t *), ytiles);
+    tile       = calloc(sizeof(cups_itile_t), xtiles * ytiles);
 
     for (tiley = 0; tiley < ytiles; tiley ++)
     {
@@ -747,23 +751,13 @@ get_tile(cups_image_t *img,		/* I - Image */
   {
     if (img->num_ics < img->max_ics)
     {
-      if ((ic = calloc(sizeof(cups_ic_t) +
-                       bpp * CUPS_TILE_SIZE * CUPS_TILE_SIZE, 1)) == NULL)
-      {
-        if (img->num_ics == 0)
-	  return (NULL);
+      ic         = calloc(sizeof(cups_ic_t) + bpp * CUPS_TILE_SIZE *
+                                              CUPS_TILE_SIZE, 1);
+      ic->pixels = ((cups_ib_t *)ic) + sizeof(cups_ic_t);
 
-        flush_tile(img);
-	ic = img->first;
-      }
-      else
-      {
-	ic->pixels = ((cups_ib_t *)ic) + sizeof(cups_ic_t);
+      img->num_ics ++;
 
-	img->num_ics ++;
-
-	DEBUG_printf(("Allocated cache tile %d (%p)...\n", img->num_ics, ic));
-      }
+      DEBUG_printf(("Allocated cache tile %d (%p)...\n", img->num_ics, ic));
     }
     else
     {

filter/interpret.c

@@ -3,7 +3,7 @@
  *
  *   PPD command interpreter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -571,7 +571,7 @@ _cupsRasterExecPS(
           break;
     }
 
-    if (obj && obj->type == CUPS_PS_OTHER)
+    if (obj->type == CUPS_PS_OTHER)
       break;
   }
 

filter/pstops.c

@@ -3,7 +3,7 @@
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -164,27 +164,27 @@ static void		cancel_job(int sig);
 static int		check_range(pstops_doc_t *doc, int page);
 static void		copy_bytes(cups_file_t *fp, off_t offset,
 			           size_t length);
-static ssize_t		copy_comments(cups_file_t *fp, pstops_doc_t *doc,
+static size_t		copy_comments(cups_file_t *fp, pstops_doc_t *doc,
 			              ppd_file_t *ppd, char *line,
-				      ssize_t linelen, size_t linesize);
+				      size_t linelen, size_t linesize);
 static void		copy_dsc(cups_file_t *fp, pstops_doc_t *doc,
-			         ppd_file_t *ppd, char *line, ssize_t linelen,
+			         ppd_file_t *ppd, char *line, size_t linelen,
 				 size_t linesize);
 static void		copy_non_dsc(cups_file_t *fp, pstops_doc_t *doc,
 			             ppd_file_t *ppd, char *line,
-				     ssize_t linelen, size_t linesize);
-static ssize_t		copy_page(cups_file_t *fp, pstops_doc_t *doc,
+				     size_t linelen, size_t linesize);
+static size_t		copy_page(cups_file_t *fp, pstops_doc_t *doc,
 			          ppd_file_t *ppd, int number, char *line,
-				  ssize_t linelen, size_t linesize);
-static ssize_t		copy_prolog(cups_file_t *fp, pstops_doc_t *doc,
+				  size_t linelen, size_t linesize);
+static size_t		copy_prolog(cups_file_t *fp, pstops_doc_t *doc,
 			            ppd_file_t *ppd, char *line,
-				    ssize_t linelen, size_t linesize);
-static ssize_t		copy_setup(cups_file_t *fp, pstops_doc_t *doc,
+				    size_t linelen, size_t linesize);
+static size_t		copy_setup(cups_file_t *fp, pstops_doc_t *doc,
 			           ppd_file_t *ppd, char *line,
-				   ssize_t linelen, size_t linesize);
-static ssize_t		copy_trailer(cups_file_t *fp, pstops_doc_t *doc,
+				   size_t linelen, size_t linesize);
+static size_t		copy_trailer(cups_file_t *fp, pstops_doc_t *doc,
 			             ppd_file_t *ppd, int number, char *line,
-				     ssize_t linelen, size_t linesize);
+				     size_t linelen, size_t linesize);
 static void		do_prolog(pstops_doc_t *doc, ppd_file_t *ppd);
 static void 		do_setup(pstops_doc_t *doc, ppd_file_t *ppd);
 static void		doc_printf(pstops_doc_t *doc, const char *format, ...)
@@ -203,7 +203,7 @@ static char		*parse_text(const char *start, char **end, char *buffer,
 static void		set_pstops_options(pstops_doc_t *doc, ppd_file_t *ppd,
 			                   char *argv[], int num_options,
 			                   cups_option_t *options);
-static ssize_t		skip_page(cups_file_t *fp, char *line, ssize_t linelen,
+static size_t		skip_page(cups_file_t *fp, char *line, size_t linelen,
 				  size_t linesize);
 static void		start_nup(pstops_doc_t *doc, int number,
 				  int show_border, const int *bounding_box);
@@ -581,12 +581,12 @@ copy_bytes(cups_file_t *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_comments(cups_file_t  *fp,		/* I - File to read from */
               pstops_doc_t *doc,	/* I - Document info */
 	      ppd_file_t   *ppd,	/* I - PPD file */
               char         *line,	/* I - Line buffer */
-	      ssize_t      linelen,	/* I - Length of initial line */
+	      size_t       linelen,	/* I - Length of initial line */
 	      size_t       linesize)	/* I - Size of line buffer */
 {
   int	saw_bounding_box,		/* Saw %%BoundingBox: comment? */
@@ -809,7 +809,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
          pstops_doc_t *doc,		/* I - Document info */
          ppd_file_t   *ppd,		/* I - PPD file */
 	 char         *line,		/* I - Line buffer */
-	 ssize_t      linelen,		/* I - Length of initial line */
+	 size_t       linelen,		/* I - Length of initial line */
 	 size_t       linesize)		/* I - Size of line buffer */
 {
   int		number;			/* Page number */
@@ -889,8 +889,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
   * Finish up the last page(s)...
   */
 
-  if (number && is_not_last_page(number) && cupsArrayLast(doc->pages) &&
-      check_range(doc, (number - 1) / doc->number_up + 1))
+  if (number && is_not_last_page(number) && cupsArrayLast(doc->pages))
   {
     pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
 
@@ -931,7 +930,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
 
   number = doc->slow_order ? 0 : doc->page;
 
-  if (doc->temp && !JobCanceled && cupsArrayCount(doc->pages) > 0)
+  if (doc->temp && !JobCanceled)
   {
     int	copy;				/* Current copy */
 
@@ -1069,7 +1068,7 @@ copy_non_dsc(cups_file_t  *fp,		/* I - File to read from */
              pstops_doc_t *doc,		/* I - Document info */
              ppd_file_t   *ppd,		/* I - PPD file */
 	     char         *line,	/* I - Line buffer */
-	     ssize_t      linelen,	/* I - Length of initial line */
+	     size_t       linelen,	/* I - Length of initial line */
 	     size_t       linesize)	/* I - Size of line buffer */
 {
   int	copy;				/* Current copy */
@@ -1245,13 +1244,13 @@ copy_non_dsc(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_page(cups_file_t  *fp,		/* I - File to read from */
           pstops_doc_t *doc,		/* I - Document info */
           ppd_file_t   *ppd,		/* I - PPD file */
 	  int          number,		/* I - Current page number */
 	  char         *line,		/* I - Line buffer */
-	  ssize_t      linelen,		/* I - Length of initial line */
+	  size_t       linelen,		/* I - Length of initial line */
 	  size_t       linesize)	/* I - Size of line buffer */
 {
   char		label[256],		/* Page label string */
@@ -1714,12 +1713,12 @@ copy_page(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_prolog(cups_file_t  *fp,		/* I - File to read from */
             pstops_doc_t *doc,		/* I - Document info */
             ppd_file_t   *ppd,		/* I - PPD file */
 	    char         *line,		/* I - Line buffer */
-	    ssize_t      linelen,	/* I - Length of initial line */
+	    size_t       linelen,	/* I - Length of initial line */
 	    size_t       linesize)	/* I - Size of line buffer */
 {
   while (strncmp(line, "%%BeginProlog", 13))
@@ -1768,12 +1767,12 @@ copy_prolog(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_setup(cups_file_t  *fp,		/* I - File to read from */
            pstops_doc_t *doc,		/* I - Document info */
            ppd_file_t   *ppd,		/* I - PPD file */
 	   char         *line,		/* I - Line buffer */
-	   ssize_t      linelen,	/* I - Length of initial line */
+	   size_t       linelen,	/* I - Length of initial line */
 	   size_t       linesize)	/* I - Size of line buffer */
 {
   while (strncmp(line, "%%BeginSetup", 12))
@@ -1833,13 +1832,13 @@ copy_setup(cups_file_t  *fp,		/* I - File to read from */
  * On return, "line" will contain the next line in the file, if any.
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 copy_trailer(cups_file_t  *fp,		/* I - File to read from */
              pstops_doc_t *doc,		/* I - Document info */
              ppd_file_t   *ppd,		/* I - PPD file */
 	     int          number,	/* I - Number of pages */
 	     char         *line,	/* I - Line buffer */
-	     ssize_t      linelen,	/* I - Length of initial line */
+	     size_t       linelen,	/* I - Length of initial line */
 	     size_t       linesize)	/* I - Size of line buffer */
 {
  /*
@@ -2712,10 +2711,10 @@ set_pstops_options(
  * 'skip_page()' - Skip past a page that won't be printed...
  */
 
-static ssize_t				/* O - Length of next line */
+static size_t				/* O - Length of next line */
 skip_page(cups_file_t *fp,		/* I - File to read from */
           char        *line,		/* I - Line buffer */
-	  ssize_t     linelen,		/* I - Length of initial line */
+	  size_t      linelen,		/* I - Length of initial line */
           size_t      linesize)		/* I - Size of line buffer */
 {
   int	level;				/* Embedded document level */
@@ -2786,11 +2785,8 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
 		tx, ty;			/* Translation values for subpage */
   float		pagew,			/* Printable width of page */
 		pagel;			/* Printable height of page */
-  int		bboxx,			/* BoundingBox X origin */
-		bboxy,			/* BoundingBox Y origin */
-		bboxw,			/* BoundingBox width */
+  int		bboxw,			/* BoundingBox width */
 		bboxl;			/* BoundingBox height */
-  float		margin = 0;		/* Current margin for border */
 
 
   if (doc->number_up > 1)
@@ -2805,22 +2801,17 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
 
   if (doc->fitplot)
   {
-    bboxx = bounding_box[0];
-    bboxy = bounding_box[1];
     bboxw = bounding_box[2] - bounding_box[0];
     bboxl = bounding_box[3] - bounding_box[1];
   }
   else
   {
-    bboxx = 0;
-    bboxy = 0;
     bboxw = PageWidth;
     bboxl = PageLength;
   }
 
   fprintf(stderr, "DEBUG: pagew = %.1f, pagel = %.1f\n", pagew, pagel);
-  fprintf(stderr, "DEBUG: bboxx = %d, bboxy = %d, bboxw = %d, bboxl = %d\n",
-          bboxx, bboxy, bboxw, bboxl);
+  fprintf(stderr, "DEBUG: bboxw = %d, bboxl = %d\n", bboxw, bboxl);
   fprintf(stderr, "DEBUG: PageLeft = %.1f, PageRight = %.1f\n",
           PageLeft, PageRight);
   fprintf(stderr, "DEBUG: PageTop = %.1f, PageBottom = %.1f\n",
@@ -3138,7 +3129,8 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
   if (doc->page_border && show_border)
   {
     int		rects;			/* Number of border rectangles */
-    float	fscale;			/* Scaling value for points */
+    float	fscale,			/* Scaling value for points */
+		margin;			/* Current margin for borders */
 
 
     rects  = (doc->page_border & PSTOPS_BORDERDOUBLE) ? 2 : 1;
@@ -3161,10 +3153,10 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
     for (; rects > 0; rects --, margin += 2 * fscale)
       if (doc->number_up > 1)
 	doc_printf(doc, "%.1f %.1f %.1f %.1f ESPrs\n",
-		   margin,
-		   margin,
-		   bboxw - 2 * margin,
-		   bboxl - 2 * margin);
+		   margin - 2.25 * fscale,
+		   margin - 2.25 * fscale,
+		   bboxw + 4.5 * fscale - 2 * margin,
+		   bboxl + 4.5 * fscale - 2 * margin);
       else
 	doc_printf(doc, "%.1f %.1f %.1f %.1f ESPrs\n",
         	   PageLeft + margin,
@@ -3182,22 +3174,21 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
   if (doc->fitplot)
   {
    /*
-    * Offset the page by its bounding box...
+    * Clip the page that follows to the bounding box of the page...
     */
 
     doc_printf(doc, "%d %d translate\n", -bounding_box[0],
                -bounding_box[1]);
+    doc_printf(doc, "%d %d %d %d ESPrc\n", bounding_box[0], bounding_box[1],
+               bboxw, bboxl);
   }
-
-  if (doc->fitplot || doc->number_up > 1)
+  else if (doc->number_up > 1)
   {
    /*
-    * Clip the page to the page's bounding box...
+    * Clip the page that follows to the default page size...
     */
 
-    doc_printf(doc, "%.1f %.1f %.1f %.1f ESPrc\n",
-               bboxx + margin, bboxy + margin,
-               bboxw - 2 * margin, bboxl - 2 * margin);
+    doc_printf(doc, "0 0 %d %d ESPrc\n", bboxw, bboxl);
   }
 }
 

filter/rastertoepson.c

@@ -4,7 +4,7 @@
  *   EPSON ESC/P and ESC/P2 filter for the Common UNIX Printing System
  *   (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -77,8 +77,7 @@ int		DotBit,			/* Bit in buffers */
 		LineCount,		/* # of lines processed */
 		EvenOffset,		/* Offset into 'even' buffers */
 		OddOffset,		/* Offset into 'odd' buffers */
-		Shingling,		/* Shingle output? */
-		Canceled;		/* Has the current job been canceled? */
+		Shingling;		/* Shingle output? */
 
 
 /*
@@ -86,15 +85,15 @@ int		DotBit,			/* Bit in buffers */
  */
 
 void	Setup(void);
-void	StartPage(const ppd_file_t *ppd, const cups_page_header2_t *header);
-void	EndPage(const cups_page_header2_t *header);
+void	StartPage(const ppd_file_t *ppd, const cups_page_header_t *header);
+void	EndPage(const cups_page_header_t *header);
 void	Shutdown(void);
 
 void	CancelJob(int sig);
 void	CompressData(const unsigned char *line, int length, int plane,
 	             int type, int xstep, int ystep);
-void	OutputLine(const cups_page_header2_t *header);
-void	OutputRows(const cups_page_header2_t *header, int row);
+void	OutputLine(const cups_page_header_t *header);
+void	OutputRows(const cups_page_header_t *header, int row);
 
 
 /*
@@ -124,17 +123,37 @@ Setup(void)
 
 void
 StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
-          const cups_page_header2_t *header)	/* I - Page header */
+          const cups_page_header_t *header)	/* I - Page header */
 {
   int	n, t;					/* Numbers */
   int	plane;					/* Looping var */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;			/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
+ /*
+  * Register a signal handler to eject the current page if the
+  * job is cancelled.
+  */
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, CancelJob);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = CancelJob;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, CancelJob);
+#endif /* HAVE_SIGSET */
+
  /*
   * Send a reset sequence.
   */
 
-  if (ppd && ppd->nickname && strstr(ppd->nickname, "OKIDATA") != NULL)
+  if (ppd->nickname && strstr(ppd->nickname, "OKIDATA") != NULL)
     printf("\033{A");	/* Set EPSON emulation mode */
 
   printf("\033@");
@@ -145,7 +164,7 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
 
   EjectPage = header->Margins[0] || header->Margins[1];
     
-  switch (Model)
+  switch (ppd->model_number)
   {
     case EPSON_9PIN :
     case EPSON_24PIN :
@@ -177,7 +196,7 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
 	DotColumns = header->HWResolution[0] / 60;
         Shingling  = 0;
 
-        if (Model == EPSON_9PIN)
+        if (ppd->model_number == EPSON_9PIN)
 	  printf("\033\063\030");	/* Set line feed */
 	else
 	  switch (header->HWResolution[0])
@@ -232,11 +251,8 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
 	putchar(n);
 	putchar(n >> 8);
 
-        if (ppd)
-	  t = (ppd->sizes[1].length - ppd->sizes[1].top) *
-	      header->HWResolution[1] / 72.0;
-        else
-	  t = 0;
+	t = (ppd->sizes[1].length - ppd->sizes[1].top) *
+	    header->HWResolution[1] / 72.0;
 
 	pwrite("\033(c\004\000", 5);		/* Top & bottom margins */
 	putchar(t);
@@ -277,35 +293,18 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
   * Allocate memory for a line/row of graphics...
   */
 
-  if ((Planes[0] = malloc(header->cupsBytesPerLine)) == NULL)
-  {
-    fputs("ERROR: Unable to allocate memory!\n", stderr);
-    exit(1);
-  }
-
+  Planes[0] = malloc(header->cupsBytesPerLine);
   for (plane = 1; plane < NumPlanes; plane ++)
     Planes[plane] = Planes[0] + plane * header->cupsBytesPerLine / NumPlanes;
 
   if (header->cupsCompression || DotBytes)
-  {
-    if ((CompBuffer = calloc(2, header->cupsWidth)) == NULL)
-    {
-      fputs("ERROR: Unable to allocate memory!\n", stderr);
-      exit(1);
-    }
-  }
+    CompBuffer = calloc(2, header->cupsWidth);
   else
     CompBuffer = NULL;
 
   if (DotBytes)
   {
-    if ((LineBuffers[0] = calloc(DotBytes,
-                                 header->cupsWidth * (Shingling + 1))) == NULL)
-    {
-      fputs("ERROR: Unable to allocate memory!\n", stderr);
-      exit(1);
-    }
-
+    LineBuffers[0] = calloc(DotBytes, header->cupsWidth * (Shingling + 1));
     LineBuffers[1] = LineBuffers[0] + DotBytes * header->cupsWidth;
     DotBit         = 128;
     LineCount      = 0;
@@ -320,7 +319,7 @@ StartPage(const ppd_file_t         *ppd,	/* I - PPD file */
  */
 
 void
-EndPage(const cups_page_header2_t *header)	/* I - Page header */
+EndPage(const cups_page_header_t *header)	/* I - Page header */
 {
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;			/* Actions for POSIX signals */
@@ -358,6 +357,22 @@ EndPage(const cups_page_header2_t *header)	/* I - Page header */
     putchar(12);		/* Form feed */
   fflush(stdout);
 
+ /*
+  * Unregister the signal handler...
+  */
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, SIG_IGN);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = SIG_IGN;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, SIG_IGN);
+#endif /* HAVE_SIGSET */
+
  /*
   * Free memory...
   */
@@ -394,9 +409,31 @@ Shutdown(void)
 void
 CancelJob(int sig)			/* I - Signal */
 {
+  int	i;				/* Looping var */
+
+
   (void)sig;
 
-  Canceled = 1;
+ /*
+  * Send out lots of NUL bytes to clear out any pending raster data...
+  */
+
+  if (DotBytes)
+    i = DotBytes * 360 * 8;
+  else
+    i = 720;
+
+  for (; i > 0; i --)
+    putchar(0);
+
+ /*
+  * End the current page and exit...
+  */
+
+  EndPage(NULL);
+  Shutdown();
+
+  exit(0);
 }
 
 
@@ -613,7 +650,7 @@ CompressData(const unsigned char *line,	/* I - Data to compress */
  */
 
 void
-OutputLine(const cups_page_header2_t *header)	/* I - Page header */
+OutputLine(const cups_page_header_t *header)	/* I - Page header */
 {
   if (header->cupsRowCount)
   {
@@ -781,7 +818,7 @@ OutputLine(const cups_page_header2_t *header)	/* I - Page header */
  */
 
 void
-OutputRows(const cups_page_header2_t *header,	/* I - Page image header */
+OutputRows(const cups_page_header_t *header,	/* I - Page image header */
            int                      row)	/* I - Row number (0 or 1) */
 {
   unsigned	i, n;				/* Looping vars */
@@ -955,19 +992,16 @@ OutputRows(const cups_page_header2_t *header,	/* I - Page image header */
  * 'main()' - Main entry and processing of driver.
  */
 
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+int				/* O - Exit status */
+main(int  argc,			/* I - Number of command-line arguments */
+     char *argv[])		/* I - Command-line arguments */
 {
-  int			fd;		/* File descriptor */
-  cups_raster_t		*ras;		/* Raster stream for printing */
-  cups_page_header2_t	header;		/* Page header from file */
-  ppd_file_t		*ppd;		/* PPD file */
-  int			page;		/* Current page */
-  int			y;		/* Current line */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+  int			fd;	/* File descriptor */
+  cups_raster_t		*ras;	/* Raster stream for printing */
+  cups_page_header_t	header;	/* Page header from file */
+  ppd_file_t		*ppd;	/* PPD file */
+  int			page;	/* Current page */
+  int			y;	/* Current line */
 
 
  /*
@@ -1010,25 +1044,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   ras = cupsRasterOpen(fd, CUPS_RASTER_READ);
 
- /*
-  * Register a signal handler to eject the current page if the
-  * job is cancelled.
-  */
-
-  Canceled = 0;
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, CancelJob);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = CancelJob;
-  sigaction(SIGTERM, &action, NULL);
-#else
-  signal(SIGTERM, CancelJob);
-#endif /* HAVE_SIGSET */
-
  /*
   * Initialize the print device...
   */
@@ -1045,15 +1060,12 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   page = 0;
 
-  while (cupsRasterReadHeader2(ras, &header))
+  while (cupsRasterReadHeader(ras, &header))
   {
    /*
     * Write a status message with the page number and number of copies.
     */
 
-    if (Canceled)
-      break;
-
     page ++;
 
     fprintf(stderr, "PAGE: %d %d\n", page, header.NumCopies);
@@ -1074,9 +1086,6 @@ main(int  argc,				/* I - Number of command-line arguments */
       * Let the user know how far we have progressed...
       */
 
-      if (Canceled)
-	break;
-
       if ((y & 127) == 0)
         fprintf(stderr, _("INFO: Printing page %d, %d%% complete...\n"), page,
 	        100 * y / header.cupsHeight);
@@ -1100,9 +1109,6 @@ main(int  argc,				/* I - Number of command-line arguments */
     */
 
     EndPage(&header);
-
-    if (Canceled)
-      break;
   }
 
  /*

filter/rastertohp.c

@@ -4,7 +4,7 @@
  *   Hewlett-Packard Page Control Language filter for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -52,8 +52,7 @@ int		NumPlanes,		/* Number of color planes */
 		ColorBits,		/* Number of bits per color */
 		Feed,			/* Number of lines to skip */
 		Duplex,			/* Current duplex mode */
-		Page,			/* Current page number */
-		Canceled;		/* Has the current job been canceled? */
+		Page;			/* Current page number */
 
 
 /*
@@ -61,13 +60,13 @@ int		NumPlanes,		/* Number of color planes */
  */
 
 void	Setup(void);
-void	StartPage(ppd_file_t *ppd, cups_page_header2_t *header);
+void	StartPage(ppd_file_t *ppd, cups_page_header_t *header);
 void	EndPage(void);
 void	Shutdown(void);
 
 void	CancelJob(int sig);
 void	CompressData(unsigned char *line, int length, int plane, int type);
-void	OutputLine(cups_page_header2_t *header);
+void	OutputLine(cups_page_header_t *header);
 
 
 /*
@@ -92,11 +91,31 @@ Setup(void)
 
 void
 StartPage(ppd_file_t         *ppd,	/* I - PPD file */
-          cups_page_header2_t *header)	/* I - Page header */
+          cups_page_header_t *header)	/* I - Page header */
 {
   int	plane;				/* Looping var */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;		/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
+ /*
+  * Register a signal handler to eject the current page if the
+  * job is cancelled.
+  */
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, CancelJob);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = CancelJob;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, CancelJob);
+#endif /* HAVE_SIGSET */
+
  /*
   * Show page device dictionary...
   */
@@ -258,7 +277,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
   * Set graphics mode...
   */
 
-  if (ppd && ppd->model_number == 2)
+  if (ppd->model_number == 2)
   {
    /*
     * Figure out the number of color planes...
@@ -363,12 +382,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
   * Allocate memory for a line of graphics...
   */
 
-  if ((Planes[0] = malloc(header->cupsBytesPerLine)) == NULL)
-  {
-    fputs("ERROR: Unable to allocate memory!\n", stderr);
-    exit(1);
-  }
-
+  Planes[0] = malloc(header->cupsBytesPerLine);
   for (plane = 1; plane < NumPlanes; plane ++)
     Planes[plane] = Planes[0] + plane * header->cupsBytesPerLine / NumPlanes;
 
@@ -391,6 +405,11 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
 void
 EndPage(void)
 {
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;	/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+
+
  /*
   * Eject the current page...
   */
@@ -412,6 +431,22 @@ EndPage(void)
 
   fflush(stdout);
 
+ /*
+  * Unregister the signal handler...
+  */
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, SIG_IGN);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = SIG_IGN;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, SIG_IGN);
+#endif /* HAVE_SIGSET */
+
  /*
   * Free memory...
   */
@@ -449,9 +484,26 @@ Shutdown(void)
 void
 CancelJob(int sig)			/* I - Signal */
 {
+  int	i;				/* Looping var */
+
+
   (void)sig;
 
-  Canceled = 1;
+ /*
+  * Send out lots of NUL bytes to clear out any pending raster data...
+  */
+
+  for (i = 0; i < 600; i ++)
+    putchar(0);
+
+ /*
+  * End the current page and exit...
+  */
+
+  EndPage();
+  Shutdown();
+
+  exit(0);
 }
 
 
@@ -591,7 +643,7 @@ CompressData(unsigned char *line,	/* I - Data to compress */
  */
 
 void
-OutputLine(cups_page_header2_t *header)	/* I - Page header */
+OutputLine(cups_page_header_t *header)	/* I - Page header */
 {
   int		plane,			/* Current plane */
 		bytes,			/* Bytes to write */
@@ -674,18 +726,15 @@ OutputLine(cups_page_header2_t *header)	/* I - Page header */
  * 'main()' - Main entry and processing of driver.
  */
 
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+int			/* O - Exit status */
+main(int  argc,		/* I - Number of command-line arguments */
+     char *argv[])	/* I - Command-line arguments */
 {
-  int			fd;		/* File descriptor */
-  cups_raster_t		*ras;		/* Raster stream for printing */
-  cups_page_header2_t	header;		/* Page header from file */
-  int			y;		/* Current line */
-  ppd_file_t		*ppd;		/* PPD file */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+  int			fd;	/* File descriptor */
+  cups_raster_t		*ras;	/* Raster stream for printing */
+  cups_page_header_t	header;	/* Page header from file */
+  int			y;	/* Current line */
+  ppd_file_t		*ppd;	/* PPD file */
 
 
  /*
@@ -728,25 +777,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   ras = cupsRasterOpen(fd, CUPS_RASTER_READ);
 
- /*
-  * Register a signal handler to eject the current page if the
-  * job is cancelled.
-  */
-
-  Canceled = 0;
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, CancelJob);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = CancelJob;
-  sigaction(SIGTERM, &action, NULL);
-#else
-  signal(SIGTERM, CancelJob);
-#endif /* HAVE_SIGSET */
-
  /*
   * Initialize the print device...
   */
@@ -761,15 +791,12 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   Page = 0;
 
-  while (cupsRasterReadHeader2(ras, &header))
+  while (cupsRasterReadHeader(ras, &header))
   {
    /*
     * Write a status message with the page number and number of copies.
     */
 
-    if (Canceled)
-      break;
-
     Page ++;
 
     fprintf(stderr, "PAGE: %d %d\n", Page, header.NumCopies);
@@ -790,9 +817,6 @@ main(int  argc,				/* I - Number of command-line arguments */
       * Let the user know how far we have progressed...
       */
 
-      if (Canceled)
-	break;
-
       if ((y & 127) == 0)
         fprintf(stderr, _("INFO: Printing page %d, %d%% complete...\n"), Page,
 	        100 * y / header.cupsHeight);
@@ -820,9 +844,6 @@ main(int  argc,				/* I - Number of command-line arguments */
     */
 
     EndPage();
-
-    if (Canceled)
-      break;
   }
 
  /*

filter/rastertolabel.c

@@ -3,7 +3,7 @@
  *
  *   Label printer filter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -90,10 +90,10 @@ int		ModelNumber,		/* cupsModelNumber attribute */
  */
 
 void	Setup(ppd_file_t *ppd);
-void	StartPage(ppd_file_t *ppd, cups_page_header2_t *header);
-void	EndPage(ppd_file_t *ppd, cups_page_header2_t *header);
+void	StartPage(ppd_file_t *ppd, cups_page_header_t *header);
+void	EndPage(ppd_file_t *ppd, cups_page_header_t *header);
 void	CancelJob(int sig);
-void	OutputLine(ppd_file_t *ppd, cups_page_header2_t *header, int y);
+void	OutputLine(ppd_file_t *ppd, cups_page_header_t *header, int y);
 void	PCLCompress(unsigned char *line, int length);
 void	ZPLCompress(char repeat_char, int repeat_count);
 
@@ -166,10 +166,13 @@ Setup(ppd_file_t *ppd)			/* I - PPD file */
 
 void
 StartPage(ppd_file_t         *ppd,	/* I - PPD file */
-          cups_page_header2_t *header)	/* I - Page header */
+          cups_page_header_t *header)	/* I - Page header */
 {
   ppd_choice_t	*choice;		/* Marked choice */
   int		length;			/* Actual label length */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;		/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
  /*
@@ -223,6 +226,23 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
   fprintf(stderr, "DEBUG: cupsRowFeed = %d\n", header->cupsRowFeed);
   fprintf(stderr, "DEBUG: cupsRowStep = %d\n", header->cupsRowStep);
 
+ /*
+  * Register a signal handler to eject the current page if the
+  * job is canceled.
+  */
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, CancelJob);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = CancelJob;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, CancelJob);
+#endif /* HAVE_SIGSET */
+
   switch (ModelNumber)
   {
     case DYMO_3x0 :
@@ -478,7 +498,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
 
 void
 EndPage(ppd_file_t *ppd,		/* I - PPD file */
-        cups_page_header2_t *header)	/* I - Page header */
+        cups_page_header_t *header)	/* I - Page header */
 {
   int		val;			/* Option value */
   ppd_choice_t	*choice;		/* Marked choice */
@@ -712,6 +732,22 @@ EndPage(ppd_file_t *ppd,		/* I - PPD file */
 
   fflush(stdout);
 
+ /*
+  * Unregister the signal handler...
+  */
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, SIG_IGN);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = SIG_IGN;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, SIG_IGN);
+#endif /* HAVE_SIGSET */
+
  /*
   * Free memory...
   */
@@ -743,7 +779,7 @@ CancelJob(int sig)			/* I - Signal */
 
 void
 OutputLine(ppd_file_t         *ppd,	/* I - PPD file */
-           cups_page_header2_t *header,	/* I - Page header */
+           cups_page_header_t *header,	/* I - Page header */
            int                y)	/* I - Line number */
 {
   int		i;			/* Looping var */
@@ -1109,14 +1145,11 @@ main(int  argc,				/* I - Number of command-line arguments */
 {
   int			fd;		/* File descriptor */
   cups_raster_t		*ras;		/* Raster stream for printing */
-  cups_page_header2_t	header;		/* Page header from file */
+  cups_page_header_t	header;		/* Page header from file */
   int			y;		/* Current line */
   ppd_file_t		*ppd;		/* PPD file */
   int			num_options;	/* Number of options */
   cups_option_t		*options;	/* Options */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
  /*
@@ -1159,25 +1192,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   ras = cupsRasterOpen(fd, CUPS_RASTER_READ);
 
- /*
-  * Register a signal handler to eject the current page if the
-  * job is cancelled.
-  */
-
-  Canceled = 0;
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, CancelJob);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = CancelJob;
-  sigaction(SIGTERM, &action, NULL);
-#else
-  signal(SIGTERM, CancelJob);
-#endif /* HAVE_SIGSET */
-
  /*
   * Open the PPD file and apply options...
   */
@@ -1200,17 +1214,15 @@ main(int  argc,				/* I - Number of command-line arguments */
   * Process pages as needed...
   */
 
-  Page = 0;
+  Page      = 0;
+  Canceled = 0;
 
-  while (cupsRasterReadHeader2(ras, &header))
+  while (cupsRasterReadHeader(ras, &header))
   {
    /*
     * Write a status message with the page number and number of copies.
     */
 
-    if (Canceled)
-      break;
-
     Page ++;
 
     fprintf(stderr, "PAGE: %d 1\n", Page);
@@ -1231,9 +1243,6 @@ main(int  argc,				/* I - Number of command-line arguments */
       * Let the user know how far we have progressed...
       */
 
-      if (Canceled)
-	break;
-
       if ((y & 15) == 0)
         fprintf(stderr, _("INFO: Printing page %d, %d%% complete...\n"), Page,
 	        100 * y / header.cupsHeight);

locale/checkpo.c

@@ -50,7 +50,8 @@ main(int  argc,				/* I - Number of command-line args */
 			*strfmts;	/* Format strings in msgstr */
   char			*idfmt,		/* Current msgid format string */
 			*strfmt;	/* Current msgstr format string */
-  int			fmtidx;		/* Format index */
+  int			fmtidx,		/* Format index */
+			fmtcount;	/* Format count */
   int			status,		/* Exit status */
 			pass,		/* Pass/fail status */
 			untranslated;	/* Untranslated messages */
@@ -134,6 +135,8 @@ main(int  argc,				/* I - Number of command-line args */
 
 	  if (!idfmt || strcmp(strfmt, idfmt))
 	    break;
+
+	  fmtcount ++;
 	}
 
         if (cupsArrayCount(strfmts) != cupsArrayCount(idfmts) || strfmt)

man/cupsd.conf.man.in

@@ -3,7 +3,7 @@
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2008 by Apple Inc.
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsd.conf 5 "Common UNIX Printing System" "2 January 2008" "Apple Inc."
+.TH cupsd.conf 5 "Common UNIX Printing System" "6 June 2006" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -230,12 +230,6 @@ DefaultPolicy policy-name
 .br
 Specifies the default access policy to use.
 .TP 5
-DefaultShared Yes
-.TP 5
-DefaultShared No
-.br
-Specifies whether local printers are shared by default.
-.TP 5
 Deny all
 .TP 5
 Deny none
@@ -612,7 +606,7 @@ Specifies the user name or ID that is used when running external programs.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2008 by Apple Inc.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

man/lpadmin.man

@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpadmin.man 7163 2008-01-02 23:08:19Z mike $"
+.\" "$Id: lpadmin.man 6649 2007-07-11 21:46:42Z mike $"
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2008 by Apple Inc.
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH lpadmin 8 "Common UNIX Printing System" "2 January 2008" "Apple Inc."
+.TH lpadmin 8 "Common UNIX Printing System" "13 July 2006" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -81,6 +81,12 @@ and is intended for providing support for legacy printer drivers.
 Sets a standard System V interface script or PPD file from the
 \fImodel\fR directory.
 .TP 5
+-o name=value
+.br
+Sets a PPD or server option for the printer. PPD options can be
+listed using the \fI-l\fR option with the \fIlpoptions(1)\fR
+command.
+.TP 5
 -o job-k-limit=value
 .br
 Sets the kilobyte limit for per-user quotas. The value is an
@@ -103,23 +109,10 @@ integer number of seconds; 86,400 seconds are in one day.
 .br
 Sets the default banner page(s) to use for print jobs.
 .TP 5
--o name=value
-.br
-Sets a PPD option for the printer. PPD options can be
-listed using the \fI-l\fR option with the \fIlpoptions(1)\fR
-command.
-.TP 5
--o name-default=value
-.br
-Sets a default server-side option for the printer. Any print-time
-option can be defaulted, e.g. "-o cpi-default=17" to set the default
-"cpi" option value to 17.
-.TP 5
 -o port-monitor=name
 .br
 Sets the binary communications program to use when printing,
-"none", "bcp", or "tbcp". The default program is "none". The
-specified port monitor must be listed in the printer's PPD file.
+"none", "bcp", or "tbcp". The default program is "none".
 .TP 5
 -o printer-error-policy=name
 .br
@@ -201,7 +194,7 @@ System V or Solaris printing system configuration options.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2008 by Apple Inc.
+Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: lpadmin.man 7163 2008-01-02 23:08:19Z mike $".
+.\" End of "$Id: lpadmin.man 6649 2007-07-11 21:46:42Z mike $".
 .\"

man/lpq.man

@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: lpq.man 7163 2008-01-02 23:08:19Z mike $"
+.\" "$Id: lpq.man 6649 2007-07-11 21:46:42Z mike $"
 .\"
 .\"   lpq man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2008 by Apple Inc.
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH lpq 1 "Common UNIX Printing System" "2 January 2008" "Apple Inc."
+.TH lpq 1 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lpq \- show printer queue status
 .SH SYNOPSIS
@@ -33,7 +33,7 @@ no printer or class is specified on the command-line.
 .LP
 The \fI+interval\fR option allows you to continuously report the
 jobs in the queue until the queue is empty; the list of jobs is
-show once every \fIinterval\fR seconds.
+show one every \fIinterval\fR seconds.
 .SH OPTIONS
 \fIlpq\fR supports the following options:
 .TP 5
@@ -66,7 +66,7 @@ Requests a more verbose (long) reporting format.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2008 by Apple Inc.
+Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: lpq.man 7163 2008-01-02 23:08:19Z mike $".
+.\" End of "$Id: lpq.man 6649 2007-07-11 21:46:42Z mike $".
 .\"

notifier/Makefile

@@ -3,7 +3,7 @@
 #
 #   Notifier makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -44,7 +44,7 @@ install:	all
 	for file in $(TARGETS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/notifier; \
 	done
-	$(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
+	$(INSTALL_DIR) -m 755 $(CACHEDIR)/rss
 	-chgrp $(CUPS_GROUP) $(CACHEDIR)/rss
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \

packaging/cups.list.in

@@ -4,7 +4,7 @@
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -16,7 +16,7 @@
 
 # Product information
 %product Common UNIX Printing System
-%copyright 2007-2008 by Apple Inc.
+%copyright 2007 by Apple Inc.
 %vendor Apple Inc.
 #%license LICENSE.txt
 %readme LICENSE.txt

packaging/cups.spec.in

@@ -5,7 +5,7 @@
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the

pdftops/Stream.cxx

@@ -1274,26 +1274,23 @@ CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
   columns = columnsA;
   if (columns < 1) {
     columns = 1;
-  } else if (columns > INT_MAX - 2) {
-    columns = INT_MAX - 2;
+  }
+  if (columns + 4 <= 0) {
+    columns = INT_MAX - 4;
   }
   rows = rowsA;
   endOfBlock = endOfBlockA;
   black = blackA;
-  // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
-  // ---> max codingLine size = columns + 1
-  // refLine has one extra guard entry at the end
-  // ---> max refLine size = columns + 2
-  codingLine = (int *)gmallocn(columns + 1, sizeof(int));
-  refLine = (int *)gmallocn(columns + 2, sizeof(int));
+  refLine = (short *)gmallocn(columns + 4, sizeof(short));
+  codingLine = (short *)gmallocn(columns + 3, sizeof(short));
 
   eof = gFalse;
   row = 0;
   nextLine2D = encoding < 0;
   inputBits = 0;
-  codingLine[0] = columns;
-  a0i = 1;
-  outputBits = 0;
+  codingLine[0] = 0;
+  codingLine[1] = refLine[2] = columns;
+  a0 = 1;
 
   buf = EOF;
 }
@@ -1312,9 +1309,9 @@ void CCITTFaxStream::reset() {
   row = 0;
   nextLine2D = encoding < 0;
   inputBits = 0;
-  codingLine[0] = columns;
-  a0i = 1;
-  outputBits = 0;
+  codingLine[0] = 0;
+  codingLine[1] = refLine[2] = columns;
+  a0 = 1;
   buf = EOF;
 
   // skip any initial zero bits and end-of-line marker, and get the 2D
@@ -1331,230 +1328,165 @@ void CCITTFaxStream::reset() {
   }
 }
 
-inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
-  if (a1 > codingLine[a0i]) {
-    if (a1 > columns) {
-      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-      err = gTrue;
-      a1 = columns;
-    }
-    if ((a0i & 1) ^ blackPixels) {
-      ++a0i;
-    }
-    codingLine[a0i] = a1;
-  }
-}
-
-inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
-  if (a1 > codingLine[a0i]) {
-    if (a1 > columns) {
-      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-      err = gTrue;
-      a1 = columns;
-    }
-    if ((a0i & 1) ^ blackPixels) {
-      ++a0i;
-    }
-    codingLine[a0i] = a1;
-  } else if (a1 < codingLine[a0i]) {
-    if (a1 < 0) {
-      error(getPos(), "Invalid CCITTFax code");
-      err = gTrue;
-      a1 = 0;
-    }
-    while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
-      --a0i;
-    }
-    codingLine[a0i] = a1;
-  }
-}
-
-
 int CCITTFaxStream::lookChar() {
   short code1, code2, code3;
-  int b1i, blackPixels, i, bits;
-  GBool gotEOL;
+  int a0New;
+  GBool err, gotEOL;
+  int ret;
+  int bits, i;
 
-  if (buf != EOF) {
-    return buf;
+  // if at eof just return EOF
+  if (eof && codingLine[a0] >= columns) {
+    return EOF;
   }
 
   // read the next row
-  if (outputBits == 0) {
-
-    // if at eof just return EOF
-    if (eof) {
-      return EOF;
-    }
-
-    err = gFalse;
+  err = gFalse;
+  if (codingLine[a0] >= columns) {
 
     // 2-D encoding
     if (nextLine2D) {
       for (i = 0; codingLine[i] < columns; ++i)
 	refLine[i] = codingLine[i];
-      refLine[i++] = columns;
-      refLine[i] = columns;
-      codingLine[0] = 0;
-      a0i = 0;
-      b1i = 0;
-      blackPixels = 0;
-      // invariant:
-      // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
-      //                                                             <= columns
-      // exception at left edge:
-      //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
-      // exception at right edge:
-      //   refLine[b1i] = refLine[b1i+1] = columns is possible
-      while (codingLine[a0i] < columns) {
+      refLine[i] = refLine[i + 1] = columns;
+      b1 = 1;
+      a0New = codingLine[a0 = 0] = 0;
+      do {
 	code1 = getTwoDimCode();
 	switch (code1) {
 	case twoDimPass:
-	  addPixels(refLine[b1i + 1], blackPixels);
-	  if (refLine[b1i + 1] < columns) {
-	    b1i += 2;
+	  if (refLine[b1] < columns) {
+	    a0New = refLine[b1 + 1];
+	    b1 += 2;
 	  }
 	  break;
 	case twoDimHoriz:
-	  code1 = code2 = 0;
-	  if (blackPixels) {
-	    do {
-	      code1 += code3 = getBlackCode();
-	    } while (code3 >= 64);
-	    do {
-	      code2 += code3 = getWhiteCode();
-	    } while (code3 >= 64);
-	  } else {
+	  if ((a0 & 1) == 0) {
+	    code1 = code2 = 0;
 	    do {
 	      code1 += code3 = getWhiteCode();
 	    } while (code3 >= 64);
 	    do {
 	      code2 += code3 = getBlackCode();
 	    } while (code3 >= 64);
+	  } else {
+	    code1 = code2 = 0;
+	    do {
+	      code1 += code3 = getBlackCode();
+	    } while (code3 >= 64);
+	    do {
+	      code2 += code3 = getWhiteCode();
+	    } while (code3 >= 64);
 	  }
-	  addPixels(codingLine[a0i] + code1, blackPixels);
-	  if (codingLine[a0i] < columns) {
-	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
-	  }
-	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	    b1i += 2;
-	  }
-	  break;
-	case twoDimVertR3:
-	  addPixels(refLine[b1i] + 3, blackPixels);
-	  blackPixels ^= 1;
-	  if (codingLine[a0i] < columns) {
-	    ++b1i;
-	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	      b1i += 2;
-	    }
-	  }
-	  break;
-	case twoDimVertR2:
-	  addPixels(refLine[b1i] + 2, blackPixels);
-	  blackPixels ^= 1;
-	  if (codingLine[a0i] < columns) {
-	    ++b1i;
-	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	      b1i += 2;
-	    }
-	  }
-	  break;
-	case twoDimVertR1:
-	  addPixels(refLine[b1i] + 1, blackPixels);
-	  blackPixels ^= 1;
-	  if (codingLine[a0i] < columns) {
-	    ++b1i;
-	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	      b1i += 2;
-	    }
+	  if (code1 > 0 || code2 > 0) {
+	    codingLine[a0 + 1] = a0New + code1;
+	    ++a0;
+	    a0New = codingLine[a0 + 1] = codingLine[a0] + code2;
+	    ++a0;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
 	  }
 	  break;
 	case twoDimVert0:
-	  addPixels(refLine[b1i], blackPixels);
-	  blackPixels ^= 1;
-	  if (codingLine[a0i] < columns) {
-	    ++b1i;
-	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	      b1i += 2;
-	    }
+	  a0New = codingLine[++a0] = refLine[b1];
+	  if (refLine[b1] < columns) {
+	    ++b1;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
 	  }
 	  break;
-	case twoDimVertL3:
-	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
-	  blackPixels ^= 1;
-	  if (codingLine[a0i] < columns) {
-	    if (b1i > 0) {
-	      --b1i;
-	    } else {
-	      ++b1i;
-	    }
-	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	      b1i += 2;
-	    }
-	  }
-	  break;
-	case twoDimVertL2:
-	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
-	  blackPixels ^= 1;
-	  if (codingLine[a0i] < columns) {
-	    if (b1i > 0) {
-	      --b1i;
-	    } else {
-	      ++b1i;
-	    }
-	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	      b1i += 2;
-  	    }
+	case twoDimVertR1:
+	  a0New = codingLine[++a0] = refLine[b1] + 1;
+	  if (refLine[b1] < columns) {
+	    ++b1;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
 	  }
 	  break;
 	case twoDimVertL1:
-	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
-	  blackPixels ^= 1;
-	  if (codingLine[a0i] < columns) {
-	    if (b1i > 0) {
-	      --b1i;
-	    } else {
-	      ++b1i;
-	    }
-	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-	      b1i += 2;
-	    }
+	  if (a0 == 0 || refLine[b1] - 1 > a0New) {
+	    a0New = codingLine[++a0] = refLine[b1] - 1;
+	    --b1;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
+	  }
+	  break;
+	case twoDimVertR2:
+	  a0New = codingLine[++a0] = refLine[b1] + 2;
+	  if (refLine[b1] < columns) {
+	    ++b1;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
+	  }
+	  break;
+	case twoDimVertL2:
+	  if (a0 == 0 || refLine[b1] - 2 > a0New) {
+	    a0New = codingLine[++a0] = refLine[b1] - 2;
+	    --b1;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
+	  }
+	  break;
+	case twoDimVertR3:
+	  a0New = codingLine[++a0] = refLine[b1] + 3;
+	  if (refLine[b1] < columns) {
+	    ++b1;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
+	  }
+	  break;
+	case twoDimVertL3:
+	  if (a0 == 0 || refLine[b1] - 3 > a0New) {
+	    a0New = codingLine[++a0] = refLine[b1] - 3;
+	    --b1;
+	    while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
+	      b1 += 2;
 	  }
 	  break;
 	case EOF:
-	  addPixels(columns, 0);
 	  eof = gTrue;
-	  break;
+	  codingLine[a0 = 0] = columns;
+	  return EOF;
 	default:
 	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-	  addPixels(columns, 0);
 	  err = gTrue;
 	  break;
 	}
-      }
+      } while (codingLine[a0] < columns);
 
     // 1-D encoding
     } else {
-      codingLine[0] = 0;
-      a0i = 0;
-      blackPixels = 0;
-      while (codingLine[a0i] < columns) {
+      codingLine[a0 = 0] = 0;
+      while (1) {
 	code1 = 0;
-	if (blackPixels) {
-	  do {
-	    code1 += code3 = getBlackCode();
-	  } while (code3 >= 64);
-	} else {
-	  do {
-	    code1 += code3 = getWhiteCode();
-	  } while (code3 >= 64);
-	}
-	addPixels(codingLine[a0i] + code1, blackPixels);
-	blackPixels ^= 1;
+	do {
+	  code1 += code3 = getWhiteCode();
+	} while (code3 >= 64);
+	codingLine[a0+1] = codingLine[a0] + code1;
+	++a0;
+	if (codingLine[a0] >= columns)
+	  break;
+	code2 = 0;
+	do {
+	  code2 += code3 = getBlackCode();
+	} while (code3 >= 64);
+	codingLine[a0+1] = codingLine[a0] + code2;
+	++a0;
+	if (codingLine[a0] >= columns)
+	  break;
       }
     }
 
+    if (codingLine[a0] != columns) {
+      error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]);
+      // force the row to be the correct length
+      while (codingLine[a0] > columns) {
+	--a0;
+      }
+      codingLine[++a0] = columns;
+      err = gTrue;
+    }
+
     // byte-align the row
     if (byteAlign) {
       inputBits &= ~7;
@@ -1613,17 +1545,14 @@ int CCITTFaxStream::lookChar() {
     // this if we know the stream contains end-of-line markers because
     // the "just plow on" technique tends to work better otherwise
     } else if (err && endOfLine) {
-      while (1) {
-	code1 = lookBits(13);
+      do {
 	if (code1 == EOF) {
 	  eof = gTrue;
 	  return EOF;
 	}
-	if ((code1 >> 1) == 0x001) {
-	  break;
-	}
 	eatBits(1);
-      }
+	code1 = lookBits(13);
+      } while ((code1 >> 1) != 0x001);
       eatBits(12); 
       if (encoding > 0) {
 	eatBits(1);
@@ -1631,11 +1560,11 @@ int CCITTFaxStream::lookChar() {
       }
     }
 
-    // set up for output
-    if (codingLine[0] > 0) {
-      outputBits = codingLine[a0i = 0];
-    } else {
-      outputBits = codingLine[a0i = 1];
+    a0 = 0;
+    outputBits = codingLine[1] - codingLine[0];
+    if (outputBits == 0) {
+      a0 = 1;
+      outputBits = codingLine[2] - codingLine[1];
     }
 
     ++row;
@@ -1643,43 +1572,39 @@ int CCITTFaxStream::lookChar() {
 
   // get a byte
   if (outputBits >= 8) {
-    buf = (a0i & 1) ? 0x00 : 0xff;
-    outputBits -= 8;
-    if (outputBits == 0 && codingLine[a0i] < columns) {
-      ++a0i;
-      outputBits = codingLine[a0i] - codingLine[a0i - 1];
+    ret = ((a0 & 1) == 0) ? 0xff : 0x00;
+    if ((outputBits -= 8) == 0) {
+      ++a0;
+      if (codingLine[a0] < columns) {
+	outputBits = codingLine[a0 + 1] - codingLine[a0];
+      }
     }
   } else {
     bits = 8;
-    buf = 0;
+    ret = 0;
     do {
       if (outputBits > bits) {
-	buf <<= bits;
-	if (!(a0i & 1)) {
-	  buf |= 0xff >> (8 - bits);
-	}
-	outputBits -= bits;
+	i = bits;
 	bits = 0;
-      } else {
-	buf <<= outputBits;
-	if (!(a0i & 1)) {
-	  buf |= 0xff >> (8 - outputBits);
+	if ((a0 & 1) == 0) {
+	  ret |= 0xff >> (8 - i);
 	}
+	outputBits -= i;
+      } else {
+	i = outputBits;
 	bits -= outputBits;
+	if ((a0 & 1) == 0) {
+	  ret |= (0xff >> (8 - i)) << bits;
+	}
 	outputBits = 0;
-	if (codingLine[a0i] < columns) {
-	  ++a0i;
-	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
-	} else if (bits > 0) {
-	  buf <<= bits;
-	  bits = 0;
+	++a0;
+	if (codingLine[a0] < columns) {
+	  outputBits = codingLine[a0 + 1] - codingLine[a0];
 	}
       }
-    } while (bits);
-  }
-  if (black) {
-    buf ^= 0xff;
+    } while (bits > 0 && codingLine[a0] < columns);
   }
+  buf = black ? (ret ^ 0xff) : ret;
   return buf;
 }
 
@@ -1721,9 +1646,6 @@ short CCITTFaxStream::getWhiteCode() {
   code = 0; // make gcc happy
   if (endOfBlock) {
     code = lookBits(12);
-    if (code == EOF) {
-      return 1;
-    }
     if ((code >> 5) == 0) {
       p = &whiteTab1[code];
     } else {
@@ -1736,9 +1658,6 @@ short CCITTFaxStream::getWhiteCode() {
   } else {
     for (n = 1; n <= 9; ++n) {
       code = lookBits(n);
-      if (code == EOF) {
-	return 1;
-      }
       if (n < 9) {
 	code <<= 9 - n;
       }
@@ -1750,9 +1669,6 @@ short CCITTFaxStream::getWhiteCode() {
     }
     for (n = 11; n <= 12; ++n) {
       code = lookBits(n);
-      if (code == EOF) {
-	return 1;
-      }
       if (n < 12) {
 	code <<= 12 - n;
       }
@@ -1778,12 +1694,9 @@ short CCITTFaxStream::getBlackCode() {
   code = 0; // make gcc happy
   if (endOfBlock) {
     code = lookBits(13);
-    if (code == EOF) {
-      return 1;
-    }
     if ((code >> 7) == 0) {
       p = &blackTab1[code];
-    } else if ((code >> 9) == 0 && (code >> 7) != 0) {
+    } else if ((code >> 9) == 0) {
       p = &blackTab2[(code >> 1) - 64];
     } else {
       p = &blackTab3[code >> 7];
@@ -1795,9 +1708,6 @@ short CCITTFaxStream::getBlackCode() {
   } else {
     for (n = 2; n <= 6; ++n) {
       code = lookBits(n);
-      if (code == EOF) {
-	return 1;
-      }
       if (n < 6) {
 	code <<= 6 - n;
       }
@@ -1809,9 +1719,6 @@ short CCITTFaxStream::getBlackCode() {
     }
     for (n = 7; n <= 12; ++n) {
       code = lookBits(n);
-      if (code == EOF) {
-	return 1;
-      }
       if (n < 12) {
 	code <<= 12 - n;
       }
@@ -1825,9 +1732,6 @@ short CCITTFaxStream::getBlackCode() {
     }
     for (n = 10; n <= 13; ++n) {
       code = lookBits(n);
-      if (code == EOF) {
-	return 1;
-      }
       if (n < 13) {
 	code <<= 13 - n;
       }
@@ -2050,12 +1954,6 @@ void DCTStream::reset() {
     // allocate a buffer for the whole image
     bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
     bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
-    if (bufWidth <= 0 || bufHeight <= 0 ||
-	bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
-      error(getPos(), "Invalid image size in DCT stream");
-      y = height;
-      return;
-    }
     for (i = 0; i < numComps; ++i) {
       frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int));
       memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
@@ -3117,11 +3015,6 @@ GBool DCTStream::readScanInfo() {
   }
   scanInfo.firstCoeff = str->getChar();
   scanInfo.lastCoeff = str->getChar();
-  if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
-      scanInfo.firstCoeff > scanInfo.lastCoeff) {
-    error(getPos(), "Bad DCT coefficient numbers in scan info block");
-    return gFalse;
-  }
   c = str->getChar();
   scanInfo.ah = (c >> 4) & 0x0f;
   scanInfo.al = c & 0x0f;

pdftops/Stream.h

@@ -519,15 +519,13 @@ private:
   int row;			// current row
   int inputBuf;			// input buffer
   int inputBits;		// number of bits in input buffer
-  int *codingLine;		// coding line changing elements
-  int *refLine;			// reference line changing elements
-  int a0i;			// index into codingLine
-  GBool err;			// error on current line
+  short *refLine;		// reference line changing elements
+  int b1;			// index into refLine
+  short *codingLine;		// coding line changing elements
+  int a0;			// index into codingLine
   int outputBits;		// remaining ouput bits
   int buf;			// character buffer
 
-  void addPixels(int a1, int black);
-  void addPixelsNeg(int a1, int black);
   short getTwoDimCode();
   short getWhiteCode();
   short getBlackCode();

pdftops/pdftops.cxx

@@ -308,7 +308,8 @@ main(int  argc,				// I - Number of command-line args
     // write PostScript file
     psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(),
                             doc->getCatalog(), 1, doc->getNumPages(),
-			    psModePS, 0, 0, 0, 0, gFalse, NULL);
+			    psModePS, 0, 0, 0, 0, gFalse,
+			    cupsGetOption("page-ranges", num_options, options));
     if (psOut->isOk())
       doc->displayPages(psOut, 1, doc->getNumPages(), 72.0, 72.0, 0,
                         gTrue, gFalse, gFalse);

ppd/deskjet.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for DeskJet Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertohp"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *UIConstraints: *PageSize A3 *InputSlot Envelope
 *UIConstraints: *InputSlot Envelope *PageSize A3
 *UIConstraints: *PageSize A4 *InputSlot Envelope
@@ -402,7 +404,7 @@
 *ko.Translation ModelName/HP DeskJet Series: ""
 *ko.Translation ShortNickName/HP DeskJet Series: ""
 *ko.Translation NickName/HP DeskJet Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize Executive/Executive - 7.25x10.5in: ""
@@ -434,42 +436,6 @@
 *ko.MediaType Special/Special Paper: ""
 *ko.MediaType Transparency/투명 용지: ""
 *ko.MediaType Glossy/광택지: ""
-*nl.Translation Manufacturer/HP: ""
-*nl.Translation ModelName/HP DeskJet Series: ""
-*nl.Translation ShortNickName/HP DeskJet Series: ""
-*nl.Translation NickName/HP DeskJet Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize Executive/Executive - 7.25x10.5in: ""
-*nl.PageSize Tabloid/Tabloid - 11x17in: ""
-*nl.PageSize A3/A3 - 297x420mm: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize A5/A5 - 148x210mm: ""
-*nl.PageSize B5/B5 - 182x257mm: ""
-*nl.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
-*nl.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
-*nl.PageSize EnvC5/C5 Envelope - 162x229mm: ""
-*nl.PageSize EnvDL/DL Envelope - 110x220mm: ""
-*nl.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
-*nl.Translation ColorModel/Kleurenmodus: ""
-*nl.ColorModel Gray/Grayscale: ""
-*nl.ColorModel RGB/Kleur: ""
-*nl.ColorModel CMYK/CMYK: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 150dpi/150dpi: ""
-*nl.Resolution 300dpi/300dpi: ""
-*nl.Resolution 600dpi/600 DPI Grayscale: ""
-*nl.Translation InputSlot/Media Source: ""
-*nl.InputSlot Tray/Tray: ""
-*nl.InputSlot Manual/Handmatig: ""
-*nl.InputSlot Envelope/Envelope Feed: ""
-*nl.Translation MediaType/Media Type: ""
-*nl.MediaType Plain/Normaal papier: ""
-*nl.MediaType Bond/Briefpapier: ""
-*nl.MediaType Special/Special Paper: ""
-*nl.MediaType Transparency/Transparency: ""
-*nl.MediaType Glossy/Glanzend papier: ""
 *no.Translation Manufacturer/HP: ""
 *no.Translation ModelName/HP DeskJet Series: ""
 *no.Translation ShortNickName/HP DeskJet Series: ""
@@ -542,42 +508,42 @@
 *pt.MediaType Special/Special Paper: ""
 *pt.MediaType Transparency/Transparência: ""
 *pt.MediaType Glossy/Papel acetinado: ""
-*pt_BR.Translation Manufacturer/HP: ""
-*pt_BR.Translation ModelName/HP DeskJet Series: ""
-*pt_BR.Translation ShortNickName/HP DeskJet Series: ""
-*pt_BR.Translation NickName/HP DeskJet Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize Executive/Executive - 7.25x10.5in: ""
-*pt_BR.PageSize Tabloid/Tabloid - 11x17in: ""
-*pt_BR.PageSize A3/A3 - 297x420mm: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize A5/A5 - 148x210mm: ""
-*pt_BR.PageSize B5/B5 - 182x257mm: ""
-*pt_BR.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
-*pt_BR.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
-*pt_BR.PageSize EnvC5/C5 Envelope - 162x229mm: ""
-*pt_BR.PageSize EnvDL/DL Envelope - 110x220mm: ""
-*pt_BR.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
-*pt_BR.Translation ColorModel/Modo Cor: ""
-*pt_BR.ColorModel Gray/Grayscale: ""
-*pt_BR.ColorModel RGB/Inativo: ""
-*pt_BR.ColorModel CMYK/CMYK: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 150dpi/150dpi: ""
-*pt_BR.Resolution 300dpi/300dpi: ""
-*pt_BR.Resolution 600dpi/600 DPI Grayscale: ""
-*pt_BR.Translation InputSlot/Media Source: ""
-*pt_BR.InputSlot Tray/Tray: ""
-*pt_BR.InputSlot Manual/Alimentação Manual: ""
-*pt_BR.InputSlot Envelope/Envelope Feed: ""
-*pt_BR.Translation MediaType/Media Type: ""
-*pt_BR.MediaType Plain/Papel normal: ""
-*pt_BR.MediaType Bond/Papel bond: ""
-*pt_BR.MediaType Special/Special Paper: ""
-*pt_BR.MediaType Transparency/Transparência: ""
-*pt_BR.MediaType Glossy/Papel acetinado: ""
+*pt_PT.Translation Manufacturer/HP: ""
+*pt_PT.Translation ModelName/HP DeskJet Series: ""
+*pt_PT.Translation ShortNickName/HP DeskJet Series: ""
+*pt_PT.Translation NickName/HP DeskJet Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_PT.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_PT.PageSize A3/A3 - 297x420mm: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize A5/A5 - 148x210mm: ""
+*pt_PT.PageSize B5/B5 - 182x257mm: ""
+*pt_PT.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_PT.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_PT.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_PT.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_PT.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_PT.Translation ColorModel/Modo Cor: ""
+*pt_PT.ColorModel Gray/Grayscale: ""
+*pt_PT.ColorModel RGB/Inativo: ""
+*pt_PT.ColorModel CMYK/CMYK: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 150dpi/150dpi: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Resolution 600dpi/600 DPI Grayscale: ""
+*pt_PT.Translation InputSlot/Media Source: ""
+*pt_PT.InputSlot Tray/Tray: ""
+*pt_PT.InputSlot Manual/Alimentação Manual: ""
+*pt_PT.InputSlot Envelope/Envelope Feed: ""
+*pt_PT.Translation MediaType/Media Type: ""
+*pt_PT.MediaType Plain/Papel normal: ""
+*pt_PT.MediaType Bond/Papel bond: ""
+*pt_PT.MediaType Special/Special Paper: ""
+*pt_PT.MediaType Transparency/Transparência: ""
+*pt_PT.MediaType Glossy/Papel acetinado: ""
 *sv.Translation Manufacturer/HP: ""
 *sv.Translation ModelName/HP DeskJet Series: ""
 *sv.Translation ShortNickName/HP DeskJet Series: ""
@@ -618,7 +584,7 @@
 *zh.Translation ModelName/HP DeskJet Series: ""
 *zh.Translation ShortNickName/HP DeskJet Series: ""
 *zh.Translation NickName/HP DeskJet Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize Executive/Executive - 7.25x10.5in: ""
@@ -654,7 +620,7 @@
 *zh_TW.Translation ModelName/HP DeskJet Series: ""
 *zh_TW.Translation ShortNickName/HP DeskJet Series: ""
 *zh_TW.Translation NickName/HP DeskJet Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize Executive/Executive - 7.25x10.5in: ""
@@ -722,4 +688,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of DESKJET.PPD, 32862 bytes.
+*% End of DESKJET.PPD, 31445 bytes.

ppd/dymo.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for Label Printer with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w81h252
@@ -262,7 +264,7 @@
 *ko.Translation ModelName/Dymo Label Printer: ""
 *ko.Translation ShortNickName/Dymo Label Printer: ""
 *ko.Translation NickName/Dymo Label Printer, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
 *ko.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
 *ko.PageSize w54h144/Return Address - 3/4x2in: ""
@@ -281,29 +283,6 @@
 *ko.cupsDarkness Medium/Medium: ""
 *ko.cupsDarkness Normal/Normal: ""
 *ko.cupsDarkness Dark/Dark: ""
-*nl.Translation Manufacturer/Dymo: ""
-*nl.Translation ModelName/Dymo Label Printer: ""
-*nl.Translation ShortNickName/Dymo Label Printer: ""
-*nl.Translation NickName/Dymo Label Printer, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
-*nl.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
-*nl.PageSize w54h144/Return Address - 3/4x2in: ""
-*nl.PageSize w167h288/Shipping Address - 2 5/16x4in: ""
-*nl.PageSize w162h540/Internet Postage 2-Part - 2 1/4x7 1/2in: ""
-*nl.PageSize w162h504/Internet Postage 3-Part - 2 1/4x7in: ""
-*nl.PageSize w41h248/File Folder - 9/16x3 7/16in: ""
-*nl.PageSize w41h144/Hanging Folder - 9/16x2in: ""
-*nl.PageSize w153h198/3.5" Disk - 2 1/8x2 3/4in: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 136dpi/136dpi: ""
-*nl.Resolution 203dpi/203dpi: ""
-*nl.Resolution 300dpi/300dpi: ""
-*nl.Translation cupsDarkness/Darkness: ""
-*nl.cupsDarkness Light/Light: ""
-*nl.cupsDarkness Medium/Medium: ""
-*nl.cupsDarkness Normal/Normal: ""
-*nl.cupsDarkness Dark/Dark: ""
 *no.Translation Manufacturer/Dymo: ""
 *no.Translation ModelName/Dymo Label Printer: ""
 *no.Translation ShortNickName/Dymo Label Printer: ""
@@ -350,29 +329,29 @@
 *pt.cupsDarkness Medium/Medium: ""
 *pt.cupsDarkness Normal/Normal: ""
 *pt.cupsDarkness Dark/Dark: ""
-*pt_BR.Translation Manufacturer/Dymo: ""
-*pt_BR.Translation ModelName/Dymo Label Printer: ""
-*pt_BR.Translation ShortNickName/Dymo Label Printer: ""
-*pt_BR.Translation NickName/Dymo Label Printer, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
-*pt_BR.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
-*pt_BR.PageSize w54h144/Return Address - 3/4x2in: ""
-*pt_BR.PageSize w167h288/Shipping Address - 2 5/16x4in: ""
-*pt_BR.PageSize w162h540/Internet Postage 2-Part - 2 1/4x7 1/2in: ""
-*pt_BR.PageSize w162h504/Internet Postage 3-Part - 2 1/4x7in: ""
-*pt_BR.PageSize w41h248/File Folder - 9/16x3 7/16in: ""
-*pt_BR.PageSize w41h144/Hanging Folder - 9/16x2in: ""
-*pt_BR.PageSize w153h198/3.5" Disk - 2 1/8x2 3/4in: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 136dpi/136dpi: ""
-*pt_BR.Resolution 203dpi/203dpi: ""
-*pt_BR.Resolution 300dpi/300dpi: ""
-*pt_BR.Translation cupsDarkness/Darkness: ""
-*pt_BR.cupsDarkness Light/Light: ""
-*pt_BR.cupsDarkness Medium/Medium: ""
-*pt_BR.cupsDarkness Normal/Normal: ""
-*pt_BR.cupsDarkness Dark/Dark: ""
+*pt_PT.Translation Manufacturer/Dymo: ""
+*pt_PT.Translation ModelName/Dymo Label Printer: ""
+*pt_PT.Translation ShortNickName/Dymo Label Printer: ""
+*pt_PT.Translation NickName/Dymo Label Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
+*pt_PT.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
+*pt_PT.PageSize w54h144/Return Address - 3/4x2in: ""
+*pt_PT.PageSize w167h288/Shipping Address - 2 5/16x4in: ""
+*pt_PT.PageSize w162h540/Internet Postage 2-Part - 2 1/4x7 1/2in: ""
+*pt_PT.PageSize w162h504/Internet Postage 3-Part - 2 1/4x7in: ""
+*pt_PT.PageSize w41h248/File Folder - 9/16x3 7/16in: ""
+*pt_PT.PageSize w41h144/Hanging Folder - 9/16x2in: ""
+*pt_PT.PageSize w153h198/3.5" Disk - 2 1/8x2 3/4in: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 136dpi/136dpi: ""
+*pt_PT.Resolution 203dpi/203dpi: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Translation cupsDarkness/Darkness: ""
+*pt_PT.cupsDarkness Light/Light: ""
+*pt_PT.cupsDarkness Medium/Medium: ""
+*pt_PT.cupsDarkness Normal/Normal: ""
+*pt_PT.cupsDarkness Dark/Dark: ""
 *sv.Translation Manufacturer/Dymo: ""
 *sv.Translation ModelName/Dymo Label Printer: ""
 *sv.Translation ShortNickName/Dymo Label Printer: ""
@@ -400,7 +379,7 @@
 *zh.Translation ModelName/Dymo Label Printer: ""
 *zh.Translation ShortNickName/Dymo Label Printer: ""
 *zh.Translation NickName/Dymo Label Printer, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
 *zh.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
 *zh.PageSize w54h144/Return Address - 3/4x2in: ""
@@ -423,7 +402,7 @@
 *zh_TW.Translation ModelName/Dymo Label Printer: ""
 *zh_TW.Translation ShortNickName/Dymo Label Printer: ""
 *zh_TW.Translation NickName/Dymo Label Printer, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
 *zh_TW.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
 *zh_TW.PageSize w54h144/Return Address - 3/4x2in: ""
@@ -478,4 +457,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of DYMO.PPD, 23640 bytes.
+*% End of DYMO.PPD, 22651 bytes.

ppd/epson24.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for 24-Pin Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -189,7 +191,7 @@
 *ko.Translation ModelName/Epson 24-Pin Series: ""
 *ko.Translation ShortNickName/Epson 24-Pin Series: ""
 *ko.Translation NickName/Epson 24-Pin Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -200,21 +202,6 @@
 *ko.Resolution 180dpi/180dpi: ""
 *ko.Resolution 360x180dpi/360x180dpi: ""
 *ko.Resolution 360x180dpi/360x180dpi: ""
-*nl.Translation Manufacturer/Epson: ""
-*nl.Translation ModelName/Epson 24-Pin Series: ""
-*nl.Translation ShortNickName/Epson 24-Pin Series: ""
-*nl.Translation NickName/Epson 24-Pin Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 60dpi/60dpi: ""
-*nl.Resolution 120x60dpi/120x60dpi: ""
-*nl.Resolution 180dpi/180dpi: ""
-*nl.Resolution 360x180dpi/360x180dpi: ""
-*nl.Resolution 360x180dpi/360x180dpi: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson 24-Pin Series: ""
 *no.Translation ShortNickName/Epson 24-Pin Series: ""
@@ -245,21 +232,21 @@
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
-*pt_BR.Translation Manufacturer/Epson: ""
-*pt_BR.Translation ModelName/Epson 24-Pin Series: ""
-*pt_BR.Translation ShortNickName/Epson 24-Pin Series: ""
-*pt_BR.Translation NickName/Epson 24-Pin Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 60dpi/60dpi: ""
-*pt_BR.Resolution 120x60dpi/120x60dpi: ""
-*pt_BR.Resolution 180dpi/180dpi: ""
-*pt_BR.Resolution 360x180dpi/360x180dpi: ""
-*pt_BR.Resolution 360x180dpi/360x180dpi: ""
+*pt_PT.Translation Manufacturer/Epson: ""
+*pt_PT.Translation ModelName/Epson 24-Pin Series: ""
+*pt_PT.Translation ShortNickName/Epson 24-Pin Series: ""
+*pt_PT.Translation NickName/Epson 24-Pin Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 60dpi/60dpi: ""
+*pt_PT.Resolution 120x60dpi/120x60dpi: ""
+*pt_PT.Resolution 180dpi/180dpi: ""
+*pt_PT.Resolution 360x180dpi/360x180dpi: ""
+*pt_PT.Resolution 360x180dpi/360x180dpi: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson 24-Pin Series: ""
 *sv.Translation ShortNickName/Epson 24-Pin Series: ""
@@ -279,7 +266,7 @@
 *zh.Translation ModelName/Epson 24-Pin Series: ""
 *zh.Translation ShortNickName/Epson 24-Pin Series: ""
 *zh.Translation NickName/Epson 24-Pin Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -294,7 +281,7 @@
 *zh_TW.Translation ModelName/Epson 24-Pin Series: ""
 *zh_TW.Translation ShortNickName/Epson 24-Pin Series: ""
 *zh_TW.Translation NickName/Epson 24-Pin Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -341,4 +328,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of EPSON24.PPD, 15694 bytes.
+*% End of EPSON24.PPD, 15121 bytes.

ppd/epson9.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for 9-Pin Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -173,7 +175,7 @@
 *ko.Translation ModelName/Epson 9-Pin Series: ""
 *ko.Translation ShortNickName/Epson 9-Pin Series: ""
 *ko.Translation NickName/Epson 9-Pin Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -182,19 +184,6 @@
 *ko.Resolution 60x720dpi/60x720dpi: ""
 *ko.Resolution 120x72dpi/120x72dpi: ""
 *ko.Resolution 240x72dpi/240x72dpi: ""
-*nl.Translation Manufacturer/Epson: ""
-*nl.Translation ModelName/Epson 9-Pin Series: ""
-*nl.Translation ShortNickName/Epson 9-Pin Series: ""
-*nl.Translation NickName/Epson 9-Pin Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 60x720dpi/60x720dpi: ""
-*nl.Resolution 120x72dpi/120x72dpi: ""
-*nl.Resolution 240x72dpi/240x72dpi: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson 9-Pin Series: ""
 *no.Translation ShortNickName/Epson 9-Pin Series: ""
@@ -221,19 +210,19 @@
 *pt.Resolution 60x720dpi/60x720dpi: ""
 *pt.Resolution 120x72dpi/120x72dpi: ""
 *pt.Resolution 240x72dpi/240x72dpi: ""
-*pt_BR.Translation Manufacturer/Epson: ""
-*pt_BR.Translation ModelName/Epson 9-Pin Series: ""
-*pt_BR.Translation ShortNickName/Epson 9-Pin Series: ""
-*pt_BR.Translation NickName/Epson 9-Pin Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 60x720dpi/60x720dpi: ""
-*pt_BR.Resolution 120x72dpi/120x72dpi: ""
-*pt_BR.Resolution 240x72dpi/240x72dpi: ""
+*pt_PT.Translation Manufacturer/Epson: ""
+*pt_PT.Translation ModelName/Epson 9-Pin Series: ""
+*pt_PT.Translation ShortNickName/Epson 9-Pin Series: ""
+*pt_PT.Translation NickName/Epson 9-Pin Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 60x720dpi/60x720dpi: ""
+*pt_PT.Resolution 120x72dpi/120x72dpi: ""
+*pt_PT.Resolution 240x72dpi/240x72dpi: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson 9-Pin Series: ""
 *sv.Translation ShortNickName/Epson 9-Pin Series: ""
@@ -251,7 +240,7 @@
 *zh.Translation ModelName/Epson 9-Pin Series: ""
 *zh.Translation ShortNickName/Epson 9-Pin Series: ""
 *zh.Translation NickName/Epson 9-Pin Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -264,7 +253,7 @@
 *zh_TW.Translation ModelName/Epson 9-Pin Series: ""
 *zh_TW.Translation ShortNickName/Epson 9-Pin Series: ""
 *zh_TW.Translation NickName/Epson 9-Pin Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -309,4 +298,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of EPSON9.PPD, 14325 bytes.
+*% End of EPSON9.PPD, 13823 bytes.

ppd/intelbar.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for IntelliBar Label Printer with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,15 +30,15 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *CustominTearInterval True: "<</cupsRowCount 2 1 roll>>setpagedevice"
-*ParamCustominTearInterval Interval: 1 int 1 99
 *CustominCutInterval True: "<</cupsRowStep 2 1 roll>>setpagedevice"
-*ParamCustominCutInterval Interval: 1 int 1 99
 *cupsVersion: 1.3
 *cupsModelNumber: 32
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *UIConstraints: *inPrintMode Standard *inCutInterval
 *UIConstraints: *inCutInterval *inPrintMode Standard
 *UIConstraints: *inPrintMode Standard *inTearInterval
@@ -254,10 +254,6 @@
 *da.inCutInterval 8/Every 8 Labels: ""
 *da.inCutInterval 9/Every 9 Labels: ""
 *da.inCutInterval 10/Every 10 Labels: ""
-*da.CustominTearInterval True/CustominTearInterval: ""
-*da.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*da.CustominCutInterval True/CustominCutInterval: ""
-*da.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *de.Translation Manufacturer/Intellitech: ""
 *de.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *de.Translation ShortNickName/Intellibar Label Printer: ""
@@ -342,10 +338,6 @@
 *de.inCutInterval 8/Every 8 Labels: ""
 *de.inCutInterval 9/Every 9 Labels: ""
 *de.inCutInterval 10/Every 10 Labels: ""
-*de.CustominTearInterval True/CustominTearInterval: ""
-*de.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*de.CustominCutInterval True/CustominCutInterval: ""
-*de.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *es.Translation Manufacturer/Intellitech: ""
 *es.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *es.Translation ShortNickName/Intellibar Label Printer: ""
@@ -430,10 +422,6 @@
 *es.inCutInterval 8/Every 8 Labels: ""
 *es.inCutInterval 9/Every 9 Labels: ""
 *es.inCutInterval 10/Every 10 Labels: ""
-*es.CustominTearInterval True/CustominTearInterval: ""
-*es.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*es.CustominCutInterval True/CustominCutInterval: ""
-*es.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *fi.Translation Manufacturer/Intellitech: ""
 *fi.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *fi.Translation ShortNickName/Intellibar Label Printer: ""
@@ -518,10 +506,6 @@
 *fi.inCutInterval 8/Every 8 Labels: ""
 *fi.inCutInterval 9/Every 9 Labels: ""
 *fi.inCutInterval 10/Every 10 Labels: ""
-*fi.CustominTearInterval True/CustominTearInterval: ""
-*fi.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*fi.CustominCutInterval True/CustominCutInterval: ""
-*fi.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *fr.Translation Manufacturer/Intellitech: ""
 *fr.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *fr.Translation ShortNickName/Intellibar Label Printer: ""
@@ -606,10 +590,6 @@
 *fr.inCutInterval 8/Every 8 Labels: ""
 *fr.inCutInterval 9/Every 9 Labels: ""
 *fr.inCutInterval 10/Every 10 Labels: ""
-*fr.CustominTearInterval True/CustominTearInterval: ""
-*fr.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*fr.CustominCutInterval True/CustominCutInterval: ""
-*fr.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *it.Translation Manufacturer/Intellitech: ""
 *it.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *it.Translation ShortNickName/Intellibar Label Printer: ""
@@ -694,10 +674,6 @@
 *it.inCutInterval 8/Every 8 Labels: ""
 *it.inCutInterval 9/Every 9 Labels: ""
 *it.inCutInterval 10/Every 10 Labels: ""
-*it.CustominTearInterval True/CustominTearInterval: ""
-*it.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*it.CustominCutInterval True/CustominCutInterval: ""
-*it.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *ja.Translation Manufacturer/Intellitech: ""
 *ja.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *ja.Translation ShortNickName/Intellibar Label Printer: ""
@@ -782,15 +758,11 @@
 *ja.inCutInterval 8/Every 8 Labels: ""
 *ja.inCutInterval 9/Every 9 Labels: ""
 *ja.inCutInterval 10/Every 10 Labels: ""
-*ja.CustominTearInterval True/CustominTearInterval: ""
-*ja.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*ja.CustominCutInterval True/CustominCutInterval: ""
-*ja.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *ko.Translation Manufacturer/Intellitech: ""
 *ko.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *ko.Translation ShortNickName/Intellibar Label Printer: ""
 *ko.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize w288h432/4.00x6.00": ""
 *ko.Translation Resolution/Resolution: ""
 *ko.Resolution 300dpi/300dpi: ""
@@ -870,98 +842,6 @@
 *ko.inCutInterval 8/Every 8 Labels: ""
 *ko.inCutInterval 9/Every 9 Labels: ""
 *ko.inCutInterval 10/Every 10 Labels: ""
-*ko.CustominTearInterval True/CustominTearInterval: ""
-*ko.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*ko.CustominCutInterval True/CustominCutInterval: ""
-*ko.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
-*nl.Translation Manufacturer/Intellitech: ""
-*nl.Translation ModelName/Intellitech IntelliBar Label Printer: ""
-*nl.Translation ShortNickName/Intellibar Label Printer: ""
-*nl.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize w288h432/4.00x6.00": ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 300dpi/300dpi: ""
-*nl.Translation PrinterSettings/Printer Settings: ""
-*nl.Translation inPrintDensity/Print Density: ""
-*nl.inPrintDensity Default/Printerstandaard: ""
-*nl.inPrintDensity -15/-15: ""
-*nl.inPrintDensity -14/-14: ""
-*nl.inPrintDensity -13/-13: ""
-*nl.inPrintDensity -12/-12: ""
-*nl.inPrintDensity -11/-11: ""
-*nl.inPrintDensity -10/-10: ""
-*nl.inPrintDensity -9/-9: ""
-*nl.inPrintDensity -8/-8: ""
-*nl.inPrintDensity -7/-7: ""
-*nl.inPrintDensity -6/-6: ""
-*nl.inPrintDensity -5/-5: ""
-*nl.inPrintDensity -4/-4: ""
-*nl.inPrintDensity -3/-3: ""
-*nl.inPrintDensity -2/-2: ""
-*nl.inPrintDensity -1/-1: ""
-*nl.inPrintDensity 0/0: ""
-*nl.inPrintDensity 1/1: ""
-*nl.inPrintDensity 2/2: ""
-*nl.inPrintDensity 3/3: ""
-*nl.inPrintDensity 4/4: ""
-*nl.inPrintDensity 5/5: ""
-*nl.inPrintDensity 6/6: ""
-*nl.inPrintDensity 7/7: ""
-*nl.inPrintDensity 8/8: ""
-*nl.inPrintDensity 9/9: ""
-*nl.inPrintDensity 10/10: ""
-*nl.inPrintDensity 11/11: ""
-*nl.inPrintDensity 12/12: ""
-*nl.inPrintDensity 13/13: ""
-*nl.inPrintDensity 14/14: ""
-*nl.inPrintDensity 15/15: ""
-*nl.Translation inPrintRate/Print Speed: ""
-*nl.inPrintRate Default/Printerstandaard: ""
-*nl.inPrintRate 15/15 mm/sec.: ""
-*nl.inPrintRate 20/20 mm/sec.: ""
-*nl.inPrintRate 30/30 mm/sec.: ""
-*nl.inPrintRate 40/40 mm/sec.: ""
-*nl.inPrintRate 60/60 mm/sec.: ""
-*nl.inPrintRate 80/80 mm/sec.: ""
-*nl.inPrintRate 100/100 mm/sec.: ""
-*nl.inPrintRate 120/120 mm/sec.: ""
-*nl.inPrintRate 150/150 mm/sec.: ""
-*nl.inPrintRate 200/200 mm/sec.: ""
-*nl.inPrintRate 250/250 mm/sec.: ""
-*nl.inPrintRate 300/300 mm/sec.: ""
-*nl.Translation inPrintMode/Print Mode: ""
-*nl.inPrintMode Standard/Standard: ""
-*nl.inPrintMode Tear/Tear: ""
-*nl.inPrintMode Cut/Cut: ""
-*nl.Translation inTearInterval/Print and Tear: ""
-*nl.inTearInterval None/Disabled: ""
-*nl.inTearInterval 1/Every Label: ""
-*nl.inTearInterval 2/Every 2 Labels: ""
-*nl.inTearInterval 3/Every 3 Labels: ""
-*nl.inTearInterval 4/Every 4 Labels: ""
-*nl.inTearInterval 5/Every 5 Labels: ""
-*nl.inTearInterval 6/Every 6 Labels: ""
-*nl.inTearInterval 7/Every 7 Labels: ""
-*nl.inTearInterval 8/Every 8 Labels: ""
-*nl.inTearInterval 9/Every 9 Labels: ""
-*nl.inTearInterval 10/Every 10 Labels: ""
-*nl.Translation inCutInterval/Print and Cut: ""
-*nl.inCutInterval None/Disabled: ""
-*nl.inCutInterval 1/Every Label: ""
-*nl.inCutInterval 2/Every 2 Labels: ""
-*nl.inCutInterval 3/Every 3 Labels: ""
-*nl.inCutInterval 4/Every 4 Labels: ""
-*nl.inCutInterval 5/Every 5 Labels: ""
-*nl.inCutInterval 6/Every 6 Labels: ""
-*nl.inCutInterval 7/Every 7 Labels: ""
-*nl.inCutInterval 8/Every 8 Labels: ""
-*nl.inCutInterval 9/Every 9 Labels: ""
-*nl.inCutInterval 10/Every 10 Labels: ""
-*nl.CustominTearInterval True/CustominTearInterval: ""
-*nl.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*nl.CustominCutInterval True/CustominCutInterval: ""
-*nl.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *no.Translation Manufacturer/Intellitech: ""
 *no.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *no.Translation ShortNickName/Intellibar Label Printer: ""
@@ -1046,10 +926,6 @@
 *no.inCutInterval 8/Every 8 Labels: ""
 *no.inCutInterval 9/Every 9 Labels: ""
 *no.inCutInterval 10/Every 10 Labels: ""
-*no.CustominTearInterval True/CustominTearInterval: ""
-*no.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*no.CustominCutInterval True/CustominCutInterval: ""
-*no.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *pt.Translation Manufacturer/Intellitech: ""
 *pt.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *pt.Translation ShortNickName/Intellibar Label Printer: ""
@@ -1134,98 +1010,90 @@
 *pt.inCutInterval 8/Every 8 Labels: ""
 *pt.inCutInterval 9/Every 9 Labels: ""
 *pt.inCutInterval 10/Every 10 Labels: ""
-*pt.CustominTearInterval True/CustominTearInterval: ""
-*pt.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*pt.CustominCutInterval True/CustominCutInterval: ""
-*pt.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
-*pt_BR.Translation Manufacturer/Intellitech: ""
-*pt_BR.Translation ModelName/Intellitech IntelliBar Label Printer: ""
-*pt_BR.Translation ShortNickName/Intellibar Label Printer: ""
-*pt_BR.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize w288h432/4.00x6.00": ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 300dpi/300dpi: ""
-*pt_BR.Translation PrinterSettings/Printer Settings: ""
-*pt_BR.Translation inPrintDensity/Print Density: ""
-*pt_BR.inPrintDensity Default/Rápido: ""
-*pt_BR.inPrintDensity -15/-15: ""
-*pt_BR.inPrintDensity -14/-14: ""
-*pt_BR.inPrintDensity -13/-13: ""
-*pt_BR.inPrintDensity -12/-12: ""
-*pt_BR.inPrintDensity -11/-11: ""
-*pt_BR.inPrintDensity -10/-10: ""
-*pt_BR.inPrintDensity -9/-9: ""
-*pt_BR.inPrintDensity -8/-8: ""
-*pt_BR.inPrintDensity -7/-7: ""
-*pt_BR.inPrintDensity -6/-6: ""
-*pt_BR.inPrintDensity -5/-5: ""
-*pt_BR.inPrintDensity -4/-4: ""
-*pt_BR.inPrintDensity -3/-3: ""
-*pt_BR.inPrintDensity -2/-2: ""
-*pt_BR.inPrintDensity -1/-1: ""
-*pt_BR.inPrintDensity 0/0: ""
-*pt_BR.inPrintDensity 1/1: ""
-*pt_BR.inPrintDensity 2/2: ""
-*pt_BR.inPrintDensity 3/3: ""
-*pt_BR.inPrintDensity 4/4: ""
-*pt_BR.inPrintDensity 5/5: ""
-*pt_BR.inPrintDensity 6/6: ""
-*pt_BR.inPrintDensity 7/7: ""
-*pt_BR.inPrintDensity 8/8: ""
-*pt_BR.inPrintDensity 9/9: ""
-*pt_BR.inPrintDensity 10/10: ""
-*pt_BR.inPrintDensity 11/11: ""
-*pt_BR.inPrintDensity 12/12: ""
-*pt_BR.inPrintDensity 13/13: ""
-*pt_BR.inPrintDensity 14/14: ""
-*pt_BR.inPrintDensity 15/15: ""
-*pt_BR.Translation inPrintRate/Print Speed: ""
-*pt_BR.inPrintRate Default/Rápido: ""
-*pt_BR.inPrintRate 15/15 mm/sec.: ""
-*pt_BR.inPrintRate 20/20 mm/sec.: ""
-*pt_BR.inPrintRate 30/30 mm/sec.: ""
-*pt_BR.inPrintRate 40/40 mm/sec.: ""
-*pt_BR.inPrintRate 60/60 mm/sec.: ""
-*pt_BR.inPrintRate 80/80 mm/sec.: ""
-*pt_BR.inPrintRate 100/100 mm/sec.: ""
-*pt_BR.inPrintRate 120/120 mm/sec.: ""
-*pt_BR.inPrintRate 150/150 mm/sec.: ""
-*pt_BR.inPrintRate 200/200 mm/sec.: ""
-*pt_BR.inPrintRate 250/250 mm/sec.: ""
-*pt_BR.inPrintRate 300/300 mm/sec.: ""
-*pt_BR.Translation inPrintMode/Print Mode: ""
-*pt_BR.inPrintMode Standard/Standard: ""
-*pt_BR.inPrintMode Tear/Tear: ""
-*pt_BR.inPrintMode Cut/Cut: ""
-*pt_BR.Translation inTearInterval/Print and Tear: ""
-*pt_BR.inTearInterval None/Disabled: ""
-*pt_BR.inTearInterval 1/Every Label: ""
-*pt_BR.inTearInterval 2/Every 2 Labels: ""
-*pt_BR.inTearInterval 3/Every 3 Labels: ""
-*pt_BR.inTearInterval 4/Every 4 Labels: ""
-*pt_BR.inTearInterval 5/Every 5 Labels: ""
-*pt_BR.inTearInterval 6/Every 6 Labels: ""
-*pt_BR.inTearInterval 7/Every 7 Labels: ""
-*pt_BR.inTearInterval 8/Every 8 Labels: ""
-*pt_BR.inTearInterval 9/Every 9 Labels: ""
-*pt_BR.inTearInterval 10/Every 10 Labels: ""
-*pt_BR.Translation inCutInterval/Print and Cut: ""
-*pt_BR.inCutInterval None/Disabled: ""
-*pt_BR.inCutInterval 1/Every Label: ""
-*pt_BR.inCutInterval 2/Every 2 Labels: ""
-*pt_BR.inCutInterval 3/Every 3 Labels: ""
-*pt_BR.inCutInterval 4/Every 4 Labels: ""
-*pt_BR.inCutInterval 5/Every 5 Labels: ""
-*pt_BR.inCutInterval 6/Every 6 Labels: ""
-*pt_BR.inCutInterval 7/Every 7 Labels: ""
-*pt_BR.inCutInterval 8/Every 8 Labels: ""
-*pt_BR.inCutInterval 9/Every 9 Labels: ""
-*pt_BR.inCutInterval 10/Every 10 Labels: ""
-*pt_BR.CustominTearInterval True/CustominTearInterval: ""
-*pt_BR.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*pt_BR.CustominCutInterval True/CustominCutInterval: ""
-*pt_BR.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
+*pt_PT.Translation Manufacturer/Intellitech: ""
+*pt_PT.Translation ModelName/Intellitech IntelliBar Label Printer: ""
+*pt_PT.Translation ShortNickName/Intellibar Label Printer: ""
+*pt_PT.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize w288h432/4.00x6.00": ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Translation PrinterSettings/Printer Settings: ""
+*pt_PT.Translation inPrintDensity/Print Density: ""
+*pt_PT.inPrintDensity Default/Rápido: ""
+*pt_PT.inPrintDensity -15/-15: ""
+*pt_PT.inPrintDensity -14/-14: ""
+*pt_PT.inPrintDensity -13/-13: ""
+*pt_PT.inPrintDensity -12/-12: ""
+*pt_PT.inPrintDensity -11/-11: ""
+*pt_PT.inPrintDensity -10/-10: ""
+*pt_PT.inPrintDensity -9/-9: ""
+*pt_PT.inPrintDensity -8/-8: ""
+*pt_PT.inPrintDensity -7/-7: ""
+*pt_PT.inPrintDensity -6/-6: ""
+*pt_PT.inPrintDensity -5/-5: ""
+*pt_PT.inPrintDensity -4/-4: ""
+*pt_PT.inPrintDensity -3/-3: ""
+*pt_PT.inPrintDensity -2/-2: ""
+*pt_PT.inPrintDensity -1/-1: ""
+*pt_PT.inPrintDensity 0/0: ""
+*pt_PT.inPrintDensity 1/1: ""
+*pt_PT.inPrintDensity 2/2: ""
+*pt_PT.inPrintDensity 3/3: ""
+*pt_PT.inPrintDensity 4/4: ""
+*pt_PT.inPrintDensity 5/5: ""
+*pt_PT.inPrintDensity 6/6: ""
+*pt_PT.inPrintDensity 7/7: ""
+*pt_PT.inPrintDensity 8/8: ""
+*pt_PT.inPrintDensity 9/9: ""
+*pt_PT.inPrintDensity 10/10: ""
+*pt_PT.inPrintDensity 11/11: ""
+*pt_PT.inPrintDensity 12/12: ""
+*pt_PT.inPrintDensity 13/13: ""
+*pt_PT.inPrintDensity 14/14: ""
+*pt_PT.inPrintDensity 15/15: ""
+*pt_PT.Translation inPrintRate/Print Speed: ""
+*pt_PT.inPrintRate Default/Rápido: ""
+*pt_PT.inPrintRate 15/15 mm/sec.: ""
+*pt_PT.inPrintRate 20/20 mm/sec.: ""
+*pt_PT.inPrintRate 30/30 mm/sec.: ""
+*pt_PT.inPrintRate 40/40 mm/sec.: ""
+*pt_PT.inPrintRate 60/60 mm/sec.: ""
+*pt_PT.inPrintRate 80/80 mm/sec.: ""
+*pt_PT.inPrintRate 100/100 mm/sec.: ""
+*pt_PT.inPrintRate 120/120 mm/sec.: ""
+*pt_PT.inPrintRate 150/150 mm/sec.: ""
+*pt_PT.inPrintRate 200/200 mm/sec.: ""
+*pt_PT.inPrintRate 250/250 mm/sec.: ""
+*pt_PT.inPrintRate 300/300 mm/sec.: ""
+*pt_PT.Translation inPrintMode/Print Mode: ""
+*pt_PT.inPrintMode Standard/Standard: ""
+*pt_PT.inPrintMode Tear/Tear: ""
+*pt_PT.inPrintMode Cut/Cut: ""
+*pt_PT.Translation inTearInterval/Print and Tear: ""
+*pt_PT.inTearInterval None/Disabled: ""
+*pt_PT.inTearInterval 1/Every Label: ""
+*pt_PT.inTearInterval 2/Every 2 Labels: ""
+*pt_PT.inTearInterval 3/Every 3 Labels: ""
+*pt_PT.inTearInterval 4/Every 4 Labels: ""
+*pt_PT.inTearInterval 5/Every 5 Labels: ""
+*pt_PT.inTearInterval 6/Every 6 Labels: ""
+*pt_PT.inTearInterval 7/Every 7 Labels: ""
+*pt_PT.inTearInterval 8/Every 8 Labels: ""
+*pt_PT.inTearInterval 9/Every 9 Labels: ""
+*pt_PT.inTearInterval 10/Every 10 Labels: ""
+*pt_PT.Translation inCutInterval/Print and Cut: ""
+*pt_PT.inCutInterval None/Disabled: ""
+*pt_PT.inCutInterval 1/Every Label: ""
+*pt_PT.inCutInterval 2/Every 2 Labels: ""
+*pt_PT.inCutInterval 3/Every 3 Labels: ""
+*pt_PT.inCutInterval 4/Every 4 Labels: ""
+*pt_PT.inCutInterval 5/Every 5 Labels: ""
+*pt_PT.inCutInterval 6/Every 6 Labels: ""
+*pt_PT.inCutInterval 7/Every 7 Labels: ""
+*pt_PT.inCutInterval 8/Every 8 Labels: ""
+*pt_PT.inCutInterval 9/Every 9 Labels: ""
+*pt_PT.inCutInterval 10/Every 10 Labels: ""
 *sv.Translation Manufacturer/Intellitech: ""
 *sv.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *sv.Translation ShortNickName/Intellibar Label Printer: ""
@@ -1310,15 +1178,11 @@
 *sv.inCutInterval 8/Every 8 Labels: ""
 *sv.inCutInterval 9/Every 9 Labels: ""
 *sv.inCutInterval 10/Every 10 Labels: ""
-*sv.CustominTearInterval True/CustominTearInterval: ""
-*sv.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*sv.CustominCutInterval True/CustominCutInterval: ""
-*sv.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *zh.Translation Manufacturer/Intellitech: ""
 *zh.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *zh.Translation ShortNickName/Intellibar Label Printer: ""
 *zh.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize w288h432/4.00x6.00": ""
 *zh.Translation Resolution/Resolution: ""
 *zh.Resolution 300dpi/300dpi: ""
@@ -1398,15 +1262,11 @@
 *zh.inCutInterval 8/Every 8 Labels: ""
 *zh.inCutInterval 9/Every 9 Labels: ""
 *zh.inCutInterval 10/Every 10 Labels: ""
-*zh.CustominTearInterval True/CustominTearInterval: ""
-*zh.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*zh.CustominCutInterval True/CustominCutInterval: ""
-*zh.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *zh_TW.Translation Manufacturer/Intellitech: ""
 *zh_TW.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *zh_TW.Translation ShortNickName/Intellibar Label Printer: ""
 *zh_TW.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize w288h432/4.00x6.00": ""
 *zh_TW.Translation Resolution/Resolution: ""
 *zh_TW.Resolution 300dpi/300dpi: ""
@@ -1486,10 +1346,6 @@
 *zh_TW.inCutInterval 8/Every 8 Labels: ""
 *zh_TW.inCutInterval 9/Every 9 Labels: ""
 *zh_TW.inCutInterval 10/Every 10 Labels: ""
-*zh_TW.CustominTearInterval True/CustominTearInterval: ""
-*zh_TW.ParamCustominTearInterval Interval/ParamCustominTearInterval: ""
-*zh_TW.CustominCutInterval True/CustominCutInterval: ""
-*zh_TW.ParamCustominCutInterval Interval/ParamCustominCutInterval: ""
 *DefaultFont: Courier
 *Font AvantGarde-Book: Standard "(1.05)" Standard ROM
 *Font AvantGarde-BookOblique: Standard "(1.05)" Standard ROM
@@ -1526,4 +1382,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of INTELBAR.PPD, 60389 bytes.
+*% End of INTELBAR.PPD, 53625 bytes.

ppd/laserjet.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for LaserJet Series PCL 4/5 with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertohp"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *UIConstraints: *Duplex *Option1 False
 *UIConstraints: *Option1 False *Duplex
 *UIConstraints: *PageSize A3 *InputSlot Envelope
@@ -419,7 +421,7 @@
 *ko.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *ko.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
 *ko.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize Executive/Executive - 7.25x10.5in: ""
@@ -453,44 +455,6 @@
 *ko.Translation Option1/Duplexer: ""
 *ko.Option1 False/설치 안됨: ""
 *ko.Option1 True/설치됨: ""
-*nl.Translation Manufacturer/HP: ""
-*nl.Translation ModelName/HP LaserJet Series PCL 4/5: ""
-*nl.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
-*nl.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize Executive/Executive - 7.25x10.5in: ""
-*nl.PageSize Tabloid/Tabloid - 11x17in: ""
-*nl.PageSize A3/A3 - 297x420mm: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize A5/A5 - 148x210mm: ""
-*nl.PageSize B5/B5 - 182x257mm: ""
-*nl.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
-*nl.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
-*nl.PageSize EnvC5/C5 Envelope - 162x229mm: ""
-*nl.PageSize EnvDL/DL Envelope - 110x220mm: ""
-*nl.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 150dpi/150dpi: ""
-*nl.Resolution 300dpi/300dpi: ""
-*nl.Resolution 600dpi/600dpi: ""
-*nl.Translation InputSlot/Media Source: ""
-*nl.InputSlot Default/Printerstandaard: ""
-*nl.InputSlot Tray1/Lade 1: ""
-*nl.InputSlot Tray2/Lade 2: ""
-*nl.InputSlot Tray3/Lade 3: ""
-*nl.InputSlot Tray4/Lade 4: ""
-*nl.InputSlot Manual/Handmatig: ""
-*nl.InputSlot Envelope/Envelope Feed: ""
-*nl.Translation Duplex/Dubbelzijdig afdrukken: ""
-*nl.Duplex None/Off (1-Sided): ""
-*nl.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
-*nl.Duplex DuplexTumble/Short-Edge (Landscape): ""
-*nl.Translation InstallableOptions/Installable Options: ""
-*nl.Translation Option1/Duplexer: ""
-*nl.Option1 False/Niet geïnstalleerd: ""
-*nl.Option1 True/Installed: ""
 *no.Translation Manufacturer/HP: ""
 *no.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *no.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
@@ -567,44 +531,44 @@
 *pt.Translation Option1/Duplexer: ""
 *pt.Option1 False/Não instalado: ""
 *pt.Option1 True/Instalada: ""
-*pt_BR.Translation Manufacturer/HP: ""
-*pt_BR.Translation ModelName/HP LaserJet Series PCL 4/5: ""
-*pt_BR.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
-*pt_BR.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize Executive/Executive - 7.25x10.5in: ""
-*pt_BR.PageSize Tabloid/Tabloid - 11x17in: ""
-*pt_BR.PageSize A3/A3 - 297x420mm: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize A5/A5 - 148x210mm: ""
-*pt_BR.PageSize B5/B5 - 182x257mm: ""
-*pt_BR.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
-*pt_BR.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
-*pt_BR.PageSize EnvC5/C5 Envelope - 162x229mm: ""
-*pt_BR.PageSize EnvDL/DL Envelope - 110x220mm: ""
-*pt_BR.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 150dpi/150dpi: ""
-*pt_BR.Resolution 300dpi/300dpi: ""
-*pt_BR.Resolution 600dpi/600dpi: ""
-*pt_BR.Translation InputSlot/Media Source: ""
-*pt_BR.InputSlot Default/Rápido: ""
-*pt_BR.InputSlot Tray1/Bandeja 1: ""
-*pt_BR.InputSlot Tray2/Bandeja 2: ""
-*pt_BR.InputSlot Tray3/Bandeja 3: ""
-*pt_BR.InputSlot Tray4/Bandeja 4: ""
-*pt_BR.InputSlot Manual/Alimentação Manual: ""
-*pt_BR.InputSlot Envelope/Envelope Feed: ""
-*pt_BR.Translation Duplex/Impressão em Frente e Verso: ""
-*pt_BR.Duplex None/Off (1-Sided): ""
-*pt_BR.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
-*pt_BR.Duplex DuplexTumble/Short-Edge (Landscape): ""
-*pt_BR.Translation InstallableOptions/Installable Options: ""
-*pt_BR.Translation Option1/Duplexer: ""
-*pt_BR.Option1 False/Não instalado: ""
-*pt_BR.Option1 True/Instalada: ""
+*pt_PT.Translation Manufacturer/HP: ""
+*pt_PT.Translation ModelName/HP LaserJet Series PCL 4/5: ""
+*pt_PT.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
+*pt_PT.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize Executive/Executive - 7.25x10.5in: ""
+*pt_PT.PageSize Tabloid/Tabloid - 11x17in: ""
+*pt_PT.PageSize A3/A3 - 297x420mm: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize A5/A5 - 148x210mm: ""
+*pt_PT.PageSize B5/B5 - 182x257mm: ""
+*pt_PT.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
+*pt_PT.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
+*pt_PT.PageSize EnvC5/C5 Envelope - 162x229mm: ""
+*pt_PT.PageSize EnvDL/DL Envelope - 110x220mm: ""
+*pt_PT.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 150dpi/150dpi: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Resolution 600dpi/600dpi: ""
+*pt_PT.Translation InputSlot/Media Source: ""
+*pt_PT.InputSlot Default/Rápido: ""
+*pt_PT.InputSlot Tray1/Bandeja 1: ""
+*pt_PT.InputSlot Tray2/Bandeja 2: ""
+*pt_PT.InputSlot Tray3/Bandeja 3: ""
+*pt_PT.InputSlot Tray4/Bandeja 4: ""
+*pt_PT.InputSlot Manual/Alimentação Manual: ""
+*pt_PT.InputSlot Envelope/Envelope Feed: ""
+*pt_PT.Translation Duplex/Impressão em Frente e Verso: ""
+*pt_PT.Duplex None/Off (1-Sided): ""
+*pt_PT.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
+*pt_PT.Duplex DuplexTumble/Short-Edge (Landscape): ""
+*pt_PT.Translation InstallableOptions/Installable Options: ""
+*pt_PT.Translation Option1/Duplexer: ""
+*pt_PT.Option1 False/Não instalado: ""
+*pt_PT.Option1 True/Instalada: ""
 *sv.Translation Manufacturer/HP: ""
 *sv.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *sv.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
@@ -647,7 +611,7 @@
 *zh.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *zh.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
 *zh.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize Executive/Executive - 7.25x10.5in: ""
@@ -685,7 +649,7 @@
 *zh_TW.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *zh_TW.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
 *zh_TW.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize Executive/Executive - 7.25x10.5in: ""
@@ -755,4 +719,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of LASERJET.PPD, 34859 bytes.
+*% End of LASERJET.PPD, 33308 bytes.

ppd/okidat24.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for 24-Pin Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -189,7 +191,7 @@
 *ko.Translation ModelName/Oki 24-Pin Series: ""
 *ko.Translation ShortNickName/Oki 24-Pin Series: ""
 *ko.Translation NickName/Oki 24-Pin Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -200,21 +202,6 @@
 *ko.Resolution 180dpi/180dpi: ""
 *ko.Resolution 360x180dpi/360x180dpi: ""
 *ko.Resolution 360dpi/360dpi: ""
-*nl.Translation Manufacturer/Oki: ""
-*nl.Translation ModelName/Oki 24-Pin Series: ""
-*nl.Translation ShortNickName/Oki 24-Pin Series: ""
-*nl.Translation NickName/Oki 24-Pin Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 60dpi/60dpi: ""
-*nl.Resolution 120x60dpi/120x60dpi: ""
-*nl.Resolution 180dpi/180dpi: ""
-*nl.Resolution 360x180dpi/360x180dpi: ""
-*nl.Resolution 360dpi/360dpi: ""
 *no.Translation Manufacturer/Oki: ""
 *no.Translation ModelName/Oki 24-Pin Series: ""
 *no.Translation ShortNickName/Oki 24-Pin Series: ""
@@ -245,21 +232,21 @@
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
 *pt.Resolution 360dpi/360dpi: ""
-*pt_BR.Translation Manufacturer/Oki: ""
-*pt_BR.Translation ModelName/Oki 24-Pin Series: ""
-*pt_BR.Translation ShortNickName/Oki 24-Pin Series: ""
-*pt_BR.Translation NickName/Oki 24-Pin Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 60dpi/60dpi: ""
-*pt_BR.Resolution 120x60dpi/120x60dpi: ""
-*pt_BR.Resolution 180dpi/180dpi: ""
-*pt_BR.Resolution 360x180dpi/360x180dpi: ""
-*pt_BR.Resolution 360dpi/360dpi: ""
+*pt_PT.Translation Manufacturer/Oki: ""
+*pt_PT.Translation ModelName/Oki 24-Pin Series: ""
+*pt_PT.Translation ShortNickName/Oki 24-Pin Series: ""
+*pt_PT.Translation NickName/Oki 24-Pin Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 60dpi/60dpi: ""
+*pt_PT.Resolution 120x60dpi/120x60dpi: ""
+*pt_PT.Resolution 180dpi/180dpi: ""
+*pt_PT.Resolution 360x180dpi/360x180dpi: ""
+*pt_PT.Resolution 360dpi/360dpi: ""
 *sv.Translation Manufacturer/Oki: ""
 *sv.Translation ModelName/Oki 24-Pin Series: ""
 *sv.Translation ShortNickName/Oki 24-Pin Series: ""
@@ -279,7 +266,7 @@
 *zh.Translation ModelName/Oki 24-Pin Series: ""
 *zh.Translation ShortNickName/Oki 24-Pin Series: ""
 *zh.Translation NickName/Oki 24-Pin Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -294,7 +281,7 @@
 *zh_TW.Translation ModelName/Oki 24-Pin Series: ""
 *zh_TW.Translation ShortNickName/Oki 24-Pin Series: ""
 *zh_TW.Translation NickName/Oki 24-Pin Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -341,4 +328,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of OKIDAT24.PPD, 15444 bytes.
+*% End of OKIDAT24.PPD, 14887 bytes.

ppd/okidata9.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for 9-Pin Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -173,7 +175,7 @@
 *ko.Translation ModelName/Oki 9-Pin Series: ""
 *ko.Translation ShortNickName/Oki 9-Pin Series: ""
 *ko.Translation NickName/Oki 9-Pin Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -182,19 +184,6 @@
 *ko.Resolution 60x720dpi/60x720dpi: ""
 *ko.Resolution 120x72dpi/120x72dpi: ""
 *ko.Resolution 240x72dpi/240x72dpi: ""
-*nl.Translation Manufacturer/Oki: ""
-*nl.Translation ModelName/Oki 9-Pin Series: ""
-*nl.Translation ShortNickName/Oki 9-Pin Series: ""
-*nl.Translation NickName/Oki 9-Pin Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 60x720dpi/60x720dpi: ""
-*nl.Resolution 120x72dpi/120x72dpi: ""
-*nl.Resolution 240x72dpi/240x72dpi: ""
 *no.Translation Manufacturer/Oki: ""
 *no.Translation ModelName/Oki 9-Pin Series: ""
 *no.Translation ShortNickName/Oki 9-Pin Series: ""
@@ -221,19 +210,19 @@
 *pt.Resolution 60x720dpi/60x720dpi: ""
 *pt.Resolution 120x72dpi/120x72dpi: ""
 *pt.Resolution 240x72dpi/240x72dpi: ""
-*pt_BR.Translation Manufacturer/Oki: ""
-*pt_BR.Translation ModelName/Oki 9-Pin Series: ""
-*pt_BR.Translation ShortNickName/Oki 9-Pin Series: ""
-*pt_BR.Translation NickName/Oki 9-Pin Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 60x720dpi/60x720dpi: ""
-*pt_BR.Resolution 120x72dpi/120x72dpi: ""
-*pt_BR.Resolution 240x72dpi/240x72dpi: ""
+*pt_PT.Translation Manufacturer/Oki: ""
+*pt_PT.Translation ModelName/Oki 9-Pin Series: ""
+*pt_PT.Translation ShortNickName/Oki 9-Pin Series: ""
+*pt_PT.Translation NickName/Oki 9-Pin Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 60x720dpi/60x720dpi: ""
+*pt_PT.Resolution 120x72dpi/120x72dpi: ""
+*pt_PT.Resolution 240x72dpi/240x72dpi: ""
 *sv.Translation Manufacturer/Oki: ""
 *sv.Translation ModelName/Oki 9-Pin Series: ""
 *sv.Translation ShortNickName/Oki 9-Pin Series: ""
@@ -251,7 +240,7 @@
 *zh.Translation ModelName/Oki 9-Pin Series: ""
 *zh.Translation ShortNickName/Oki 9-Pin Series: ""
 *zh.Translation NickName/Oki 9-Pin Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -264,7 +253,7 @@
 *zh_TW.Translation ModelName/Oki 9-Pin Series: ""
 *zh_TW.Translation ShortNickName/Oki 9-Pin Series: ""
 *zh_TW.Translation NickName/Oki 9-Pin Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -309,4 +298,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of OKIDATA9.PPD, 14201 bytes.
+*% End of OKIDATA9.PPD, 13707 bytes.

ppd/sample.drv

@@ -1,17 +1,4 @@
-//
-// "$Id$"
-//
-//   Driver info file for CUPS-supplied PPDs.
-//
-//   Copyright 2007 by Apple Inc.
-//   Copyright 1993-2006 by Easy Software Products.
-//
-//   These coded instructions, statements, and computer programs are the
-//   property of Apple Inc. and are protected by Federal copyright
-//   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-//   which should have been included with this file.  If this file is
-//   file is missing or damaged, see the license at "http://www.cups.org/".
-//
+// CUPS PPD Compiler v1.1.1
 
 // Include necessary files...
 #include <font.defs>
@@ -1112,7 +1099,3 @@ Version "1.3"
 	Choice "Never/Never" ""
   }
 }
-
-//
-// End of "$Id$".
-//

ppd/stcolor.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for Stylus Color Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 2
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -233,7 +235,7 @@
 *ko.Translation ModelName/Epson Stylus Color Series: ""
 *ko.Translation ShortNickName/Epson Stylus Color Series: ""
 *ko.Translation NickName/Epson Stylus Color Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -248,25 +250,6 @@
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
-*nl.Translation Manufacturer/Epson: ""
-*nl.Translation ModelName/Epson Stylus Color Series: ""
-*nl.Translation ShortNickName/Epson Stylus Color Series: ""
-*nl.Translation NickName/Epson Stylus Color Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 180dpi/180dpi: ""
-*nl.Resolution 360dpi/360dpi: ""
-*nl.Resolution 720dpi/720dpi: ""
-*nl.Translation ColorModel/Kleurenmodus: ""
-*nl.ColorModel CMYK/CMYK: ""
-*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson Stylus Color Series: ""
 *no.Translation ShortNickName/Epson Stylus Color Series: ""
@@ -305,25 +288,25 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_BR.Translation Manufacturer/Epson: ""
-*pt_BR.Translation ModelName/Epson Stylus Color Series: ""
-*pt_BR.Translation ShortNickName/Epson Stylus Color Series: ""
-*pt_BR.Translation NickName/Epson Stylus Color Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 180dpi/180dpi: ""
-*pt_BR.Resolution 360dpi/360dpi: ""
-*pt_BR.Resolution 720dpi/720dpi: ""
-*pt_BR.Translation ColorModel/Modo Cor: ""
-*pt_BR.ColorModel CMYK/CMYK: ""
-*pt_BR.ColorModel Gray/Grayscale: ""
+*pt_PT.Translation Manufacturer/Epson: ""
+*pt_PT.Translation ModelName/Epson Stylus Color Series: ""
+*pt_PT.Translation ShortNickName/Epson Stylus Color Series: ""
+*pt_PT.Translation NickName/Epson Stylus Color Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 180dpi/180dpi: ""
+*pt_PT.Resolution 360dpi/360dpi: ""
+*pt_PT.Resolution 720dpi/720dpi: ""
+*pt_PT.Translation ColorModel/Modo Cor: ""
+*pt_PT.ColorModel CMYK/CMYK: ""
+*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson Stylus Color Series: ""
 *sv.Translation ShortNickName/Epson Stylus Color Series: ""
@@ -347,7 +330,7 @@
 *zh.Translation ModelName/Epson Stylus Color Series: ""
 *zh.Translation ShortNickName/Epson Stylus Color Series: ""
 *zh.Translation NickName/Epson Stylus Color Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -366,7 +349,7 @@
 *zh_TW.Translation ModelName/Epson Stylus Color Series: ""
 *zh_TW.Translation ShortNickName/Epson Stylus Color Series: ""
 *zh_TW.Translation NickName/Epson Stylus Color Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -417,4 +400,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STCOLOR.PPD, 18987 bytes.
+*% End of STCOLOR.PPD, 18258 bytes.

ppd/stcolor2.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for New Stylus Color Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 4
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -233,7 +235,7 @@
 *ko.Translation ModelName/Epson New Stylus Color Series: ""
 *ko.Translation ShortNickName/Epson New Stylus Color Series: ""
 *ko.Translation NickName/Epson New Stylus Color Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -248,25 +250,6 @@
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
-*nl.Translation Manufacturer/Epson: ""
-*nl.Translation ModelName/Epson New Stylus Color Series: ""
-*nl.Translation ShortNickName/Epson New Stylus Color Series: ""
-*nl.Translation NickName/Epson New Stylus Color Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 180dpi/180dpi: ""
-*nl.Resolution 360dpi/360dpi: ""
-*nl.Resolution 720dpi/720dpi: ""
-*nl.Translation ColorModel/Kleurenmodus: ""
-*nl.ColorModel CMYK/CMYK: ""
-*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson New Stylus Color Series: ""
 *no.Translation ShortNickName/Epson New Stylus Color Series: ""
@@ -305,25 +288,25 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_BR.Translation Manufacturer/Epson: ""
-*pt_BR.Translation ModelName/Epson New Stylus Color Series: ""
-*pt_BR.Translation ShortNickName/Epson New Stylus Color Series: ""
-*pt_BR.Translation NickName/Epson New Stylus Color Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 180dpi/180dpi: ""
-*pt_BR.Resolution 360dpi/360dpi: ""
-*pt_BR.Resolution 720dpi/720dpi: ""
-*pt_BR.Translation ColorModel/Modo Cor: ""
-*pt_BR.ColorModel CMYK/CMYK: ""
-*pt_BR.ColorModel Gray/Grayscale: ""
+*pt_PT.Translation Manufacturer/Epson: ""
+*pt_PT.Translation ModelName/Epson New Stylus Color Series: ""
+*pt_PT.Translation ShortNickName/Epson New Stylus Color Series: ""
+*pt_PT.Translation NickName/Epson New Stylus Color Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 180dpi/180dpi: ""
+*pt_PT.Resolution 360dpi/360dpi: ""
+*pt_PT.Resolution 720dpi/720dpi: ""
+*pt_PT.Translation ColorModel/Modo Cor: ""
+*pt_PT.ColorModel CMYK/CMYK: ""
+*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson New Stylus Color Series: ""
 *sv.Translation ShortNickName/Epson New Stylus Color Series: ""
@@ -347,7 +330,7 @@
 *zh.Translation ModelName/Epson New Stylus Color Series: ""
 *zh.Translation ShortNickName/Epson New Stylus Color Series: ""
 *zh.Translation NickName/Epson New Stylus Color Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -366,7 +349,7 @@
 *zh_TW.Translation ModelName/Epson New Stylus Color Series: ""
 *zh_TW.Translation ShortNickName/Epson New Stylus Color Series: ""
 *zh_TW.Translation NickName/Epson New Stylus Color Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -417,4 +400,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STCOLOR2.PPD, 19185 bytes.
+*% End of STCOLOR2.PPD, 18444 bytes.

ppd/stphoto.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for Stylus Photo Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 3
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -233,7 +235,7 @@
 *ko.Translation ModelName/Epson Stylus Photo Series: ""
 *ko.Translation ShortNickName/Epson Stylus Photo Series: ""
 *ko.Translation NickName/Epson Stylus Photo Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -248,25 +250,6 @@
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
-*nl.Translation Manufacturer/Epson: ""
-*nl.Translation ModelName/Epson Stylus Photo Series: ""
-*nl.Translation ShortNickName/Epson Stylus Photo Series: ""
-*nl.Translation NickName/Epson Stylus Photo Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 180dpi/180dpi: ""
-*nl.Resolution 360dpi/360dpi: ""
-*nl.Resolution 720dpi/720dpi: ""
-*nl.Translation ColorModel/Kleurenmodus: ""
-*nl.ColorModel CMYK/CMYK: ""
-*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson Stylus Photo Series: ""
 *no.Translation ShortNickName/Epson Stylus Photo Series: ""
@@ -305,25 +288,25 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_BR.Translation Manufacturer/Epson: ""
-*pt_BR.Translation ModelName/Epson Stylus Photo Series: ""
-*pt_BR.Translation ShortNickName/Epson Stylus Photo Series: ""
-*pt_BR.Translation NickName/Epson Stylus Photo Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 180dpi/180dpi: ""
-*pt_BR.Resolution 360dpi/360dpi: ""
-*pt_BR.Resolution 720dpi/720dpi: ""
-*pt_BR.Translation ColorModel/Modo Cor: ""
-*pt_BR.ColorModel CMYK/CMYK: ""
-*pt_BR.ColorModel Gray/Grayscale: ""
+*pt_PT.Translation Manufacturer/Epson: ""
+*pt_PT.Translation ModelName/Epson Stylus Photo Series: ""
+*pt_PT.Translation ShortNickName/Epson Stylus Photo Series: ""
+*pt_PT.Translation NickName/Epson Stylus Photo Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 180dpi/180dpi: ""
+*pt_PT.Resolution 360dpi/360dpi: ""
+*pt_PT.Resolution 720dpi/720dpi: ""
+*pt_PT.Translation ColorModel/Modo Cor: ""
+*pt_PT.ColorModel CMYK/CMYK: ""
+*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson Stylus Photo Series: ""
 *sv.Translation ShortNickName/Epson Stylus Photo Series: ""
@@ -347,7 +330,7 @@
 *zh.Translation ModelName/Epson Stylus Photo Series: ""
 *zh.Translation ShortNickName/Epson Stylus Photo Series: ""
 *zh.Translation NickName/Epson Stylus Photo Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -366,7 +349,7 @@
 *zh_TW.Translation ModelName/Epson Stylus Photo Series: ""
 *zh_TW.Translation ShortNickName/Epson Stylus Photo Series: ""
 *zh_TW.Translation NickName/Epson Stylus Photo Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -417,4 +400,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STPHOTO.PPD, 18988 bytes.
+*% End of STPHOTO.PPD, 18259 bytes.

ppd/stphoto2.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for New Stylus Photo Series with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 5
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -233,7 +235,7 @@
 *ko.Translation ModelName/Epson New Stylus Photo Series: ""
 *ko.Translation ShortNickName/Epson New Stylus Photo Series: ""
 *ko.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize Letter/Letter - 8.5x11in: ""
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
@@ -248,25 +250,6 @@
 *ko.Translation ColorModel/컬러 모델: ""
 *ko.ColorModel CMYK/CMYK: ""
 *ko.ColorModel Gray/Grayscale: ""
-*nl.Translation Manufacturer/Epson: ""
-*nl.Translation ModelName/Epson New Stylus Photo Series: ""
-*nl.Translation ShortNickName/Epson New Stylus Photo Series: ""
-*nl.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 180dpi/180dpi: ""
-*nl.Resolution 360dpi/360dpi: ""
-*nl.Resolution 720dpi/720dpi: ""
-*nl.Translation ColorModel/Kleurenmodus: ""
-*nl.ColorModel CMYK/CMYK: ""
-*nl.ColorModel Gray/Grayscale: ""
 *no.Translation Manufacturer/Epson: ""
 *no.Translation ModelName/Epson New Stylus Photo Series: ""
 *no.Translation ShortNickName/Epson New Stylus Photo Series: ""
@@ -305,25 +288,25 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_BR.Translation Manufacturer/Epson: ""
-*pt_BR.Translation ModelName/Epson New Stylus Photo Series: ""
-*pt_BR.Translation ShortNickName/Epson New Stylus Photo Series: ""
-*pt_BR.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 180dpi/180dpi: ""
-*pt_BR.Resolution 360dpi/360dpi: ""
-*pt_BR.Resolution 720dpi/720dpi: ""
-*pt_BR.Translation ColorModel/Modo Cor: ""
-*pt_BR.ColorModel CMYK/CMYK: ""
-*pt_BR.ColorModel Gray/Grayscale: ""
+*pt_PT.Translation Manufacturer/Epson: ""
+*pt_PT.Translation ModelName/Epson New Stylus Photo Series: ""
+*pt_PT.Translation ShortNickName/Epson New Stylus Photo Series: ""
+*pt_PT.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
+*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
+*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
+*pt_PT.PageSize A4/A4 - 210x297mm: ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 180dpi/180dpi: ""
+*pt_PT.Resolution 360dpi/360dpi: ""
+*pt_PT.Resolution 720dpi/720dpi: ""
+*pt_PT.Translation ColorModel/Modo Cor: ""
+*pt_PT.ColorModel CMYK/CMYK: ""
+*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson New Stylus Photo Series: ""
 *sv.Translation ShortNickName/Epson New Stylus Photo Series: ""
@@ -347,7 +330,7 @@
 *zh.Translation ModelName/Epson New Stylus Photo Series: ""
 *zh.Translation ShortNickName/Epson New Stylus Photo Series: ""
 *zh.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize Letter/Letter - 8.5x11in: ""
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
@@ -366,7 +349,7 @@
 *zh_TW.Translation ModelName/Epson New Stylus Photo Series: ""
 *zh_TW.Translation ShortNickName/Epson New Stylus Photo Series: ""
 *zh_TW.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize Letter/Letter - 8.5x11in: ""
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
@@ -417,4 +400,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STPHOTO2.PPD, 19186 bytes.
+*% End of STPHOTO2.PPD, 18445 bytes.

ppd/zebra.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for ZPL Label Printer with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 18
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -2092,7 +2094,7 @@
 *ko.Translation ModelName/Zebra ZPL Label Printer: ""
 *ko.Translation ShortNickName/Zebra ZPL Label Printer: ""
 *ko.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize w90h18/1.25x0.25": ""
 *ko.PageSize w90h162/1.25x2.25": ""
 *ko.PageSize w108h18/1.50x0.25": ""
@@ -2319,237 +2321,6 @@
 *ko.zeErrorReprint Saved/빠르게: ""
 *ko.zeErrorReprint Always/Always: ""
 *ko.zeErrorReprint Never/Never: ""
-*nl.Translation Manufacturer/Zebra: ""
-*nl.Translation ModelName/Zebra ZPL Label Printer: ""
-*nl.Translation ShortNickName/Zebra ZPL Label Printer: ""
-*nl.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize w90h18/1.25x0.25": ""
-*nl.PageSize w90h162/1.25x2.25": ""
-*nl.PageSize w108h18/1.50x0.25": ""
-*nl.PageSize w108h36/1.50x0.50": ""
-*nl.PageSize w108h72/1.50x1.00": ""
-*nl.PageSize w108h144/1.50x2.00": ""
-*nl.PageSize w144h26/2.00x0.37": ""
-*nl.PageSize w144h36/2.00x0.50": ""
-*nl.PageSize w144h72/2.00x1.00": ""
-*nl.PageSize w144h90/2.00x1.25": ""
-*nl.PageSize w144h288/2.00x4.00": ""
-*nl.PageSize w144h396/2.00x5.50": ""
-*nl.PageSize w162h36/2.25x0.50": ""
-*nl.PageSize w162h90/2.25x1.25": ""
-*nl.PageSize w162h288/2.25x4.00": ""
-*nl.PageSize w162h396/2.25x5.50": ""
-*nl.PageSize w171h396/2.38x5.50": ""
-*nl.PageSize w180h72/2.50x1.00": ""
-*nl.PageSize w180h144/2.50x2.00": ""
-*nl.PageSize w198h90/2.75x1.25": ""
-*nl.PageSize w216h72/3.00x1.00": ""
-*nl.PageSize w216h90/3.00x1.25": ""
-*nl.PageSize w216h144/3.00x2.00": ""
-*nl.PageSize w216h216/3.00x3.00": ""
-*nl.PageSize w216h360/3.00x5.00": ""
-*nl.PageSize w234h144/3.25x2.00": ""
-*nl.PageSize w234h360/3.25x5.00": ""
-*nl.PageSize w234h396/3.25x5.50": ""
-*nl.PageSize w234h419/3.25x5.83": ""
-*nl.PageSize w234h563/3.25x7.83": ""
-*nl.PageSize w252h72/3.50x1.00": ""
-*nl.PageSize w288h72/4.00x1.00": ""
-*nl.PageSize w288h144/4.00x2.00": ""
-*nl.PageSize w288h180/4.00x2.50": ""
-*nl.PageSize w288h216/4.00x3.00": ""
-*nl.PageSize w288h288/4.00x4.00": ""
-*nl.PageSize w288h360/4.00x5.00": ""
-*nl.PageSize w288h432/4.00x6.00": ""
-*nl.PageSize w288h468/4.00x6.50": ""
-*nl.PageSize w288h936/4.00x13.00": ""
-*nl.PageSize w432h72/6.00x1.00": ""
-*nl.PageSize w432h144/6.00x2.00": ""
-*nl.PageSize w432h216/6.00x3.00": ""
-*nl.PageSize w432h288/6.00x4.00": ""
-*nl.PageSize w432h360/6.00x5.00": ""
-*nl.PageSize w432h432/6.00x6.00": ""
-*nl.PageSize w432h468/6.00x6.50": ""
-*nl.PageSize w576h72/8.00x1.00": ""
-*nl.PageSize w576h144/8.00x2.00": ""
-*nl.PageSize w576h216/8.00x3.00": ""
-*nl.PageSize w576h288/8.00x4.00": ""
-*nl.PageSize w576h360/8.00x5.00": ""
-*nl.PageSize w576h432/8.00x6.00": ""
-*nl.PageSize w576h468/8.00x6.50": ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 203dpi/203dpi: ""
-*nl.Resolution 300dpi/300dpi: ""
-*nl.Resolution 600dpi/600dpi: ""
-*nl.Translation zeMediaTracking/Media Tracking: ""
-*nl.zeMediaTracking Continuous/Continuous: ""
-*nl.zeMediaTracking Web/Non-continuous (Web sensing): ""
-*nl.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
-*nl.Translation MediaType/Media Type: ""
-*nl.MediaType Saved/Printerstandaard: ""
-*nl.MediaType Thermal/Thermal Transfer Media: ""
-*nl.MediaType Direct/Direct Thermal Media: ""
-*nl.Translation PrinterSettings/Printer Settings: ""
-*nl.Translation Darkness/Darkness: ""
-*nl.Darkness -1/Printerstandaard: ""
-*nl.Darkness 1/1: ""
-*nl.Darkness 2/2: ""
-*nl.Darkness 3/3: ""
-*nl.Darkness 4/4: ""
-*nl.Darkness 5/5: ""
-*nl.Darkness 6/6: ""
-*nl.Darkness 7/7: ""
-*nl.Darkness 8/8: ""
-*nl.Darkness 9/9: ""
-*nl.Darkness 10/10: ""
-*nl.Darkness 11/11: ""
-*nl.Darkness 12/12: ""
-*nl.Darkness 13/13: ""
-*nl.Darkness 14/14: ""
-*nl.Darkness 15/15: ""
-*nl.Darkness 16/16: ""
-*nl.Darkness 17/17: ""
-*nl.Darkness 18/18: ""
-*nl.Darkness 19/19: ""
-*nl.Darkness 20/20: ""
-*nl.Darkness 21/21: ""
-*nl.Darkness 22/22: ""
-*nl.Darkness 23/23: ""
-*nl.Darkness 24/24: ""
-*nl.Darkness 25/25: ""
-*nl.Darkness 26/26: ""
-*nl.Darkness 27/27: ""
-*nl.Darkness 28/28: ""
-*nl.Darkness 29/29: ""
-*nl.Darkness 30/30: ""
-*nl.Translation zePrintRate/Print Rate: ""
-*nl.zePrintRate Default/Printerstandaard: ""
-*nl.zePrintRate 1/1 inch/sec.: ""
-*nl.zePrintRate 2/2 inches/sec.: ""
-*nl.zePrintRate 3/3 inches/sec.: ""
-*nl.zePrintRate 4/4 inches/sec.: ""
-*nl.zePrintRate 5/5 inches/sec.: ""
-*nl.zePrintRate 6/6 inches/sec.: ""
-*nl.zePrintRate 7/7 inches/sec.: ""
-*nl.zePrintRate 8/8 inches/sec.: ""
-*nl.zePrintRate 9/9 inches/sec.: ""
-*nl.zePrintRate 10/10 inches/sec.: ""
-*nl.zePrintRate 11/11 inches/sec.: ""
-*nl.zePrintRate 12/12 inches/sec.: ""
-*nl.Translation zeLabelTop/Label Top: ""
-*nl.zeLabelTop 200/Printerstandaard: ""
-*nl.zeLabelTop -120/-120: ""
-*nl.zeLabelTop -115/-115: ""
-*nl.zeLabelTop -110/-110: ""
-*nl.zeLabelTop -105/-105: ""
-*nl.zeLabelTop -100/-100: ""
-*nl.zeLabelTop -95/-95: ""
-*nl.zeLabelTop -90/-90: ""
-*nl.zeLabelTop -85/-85: ""
-*nl.zeLabelTop -80/-80: ""
-*nl.zeLabelTop -75/-75: ""
-*nl.zeLabelTop -70/-70: ""
-*nl.zeLabelTop -65/-65: ""
-*nl.zeLabelTop -60/-60: ""
-*nl.zeLabelTop -55/-55: ""
-*nl.zeLabelTop -50/-50: ""
-*nl.zeLabelTop -45/-45: ""
-*nl.zeLabelTop -40/-40: ""
-*nl.zeLabelTop -35/-35: ""
-*nl.zeLabelTop -30/-30: ""
-*nl.zeLabelTop -25/-25: ""
-*nl.zeLabelTop -20/-20: ""
-*nl.zeLabelTop -15/-15: ""
-*nl.zeLabelTop -10/-10: ""
-*nl.zeLabelTop -5/-5: ""
-*nl.zeLabelTop 0/0: ""
-*nl.zeLabelTop 5/5: ""
-*nl.zeLabelTop 10/10: ""
-*nl.zeLabelTop 15/15: ""
-*nl.zeLabelTop 20/20: ""
-*nl.zeLabelTop 25/25: ""
-*nl.zeLabelTop 30/30: ""
-*nl.zeLabelTop 35/35: ""
-*nl.zeLabelTop 40/40: ""
-*nl.zeLabelTop 45/45: ""
-*nl.zeLabelTop 50/50: ""
-*nl.zeLabelTop 55/55: ""
-*nl.zeLabelTop 60/60: ""
-*nl.zeLabelTop 65/65: ""
-*nl.zeLabelTop 70/70: ""
-*nl.zeLabelTop 75/75: ""
-*nl.zeLabelTop 80/80: ""
-*nl.zeLabelTop 85/85: ""
-*nl.zeLabelTop 90/90: ""
-*nl.zeLabelTop 95/95: ""
-*nl.zeLabelTop 100/100: ""
-*nl.zeLabelTop 105/105: ""
-*nl.zeLabelTop 110/110: ""
-*nl.zeLabelTop 115/115: ""
-*nl.zeLabelTop 120/120: ""
-*nl.Translation zePrintMode/Print Mode: ""
-*nl.zePrintMode Saved/Printerstandaard: ""
-*nl.zePrintMode Tear/Tear-Off: ""
-*nl.zePrintMode Peel/Peel-Off: ""
-*nl.zePrintMode Rewind/Rewind: ""
-*nl.zePrintMode Applicator/Applicator: ""
-*nl.zePrintMode Cutter/Cutter: ""
-*nl.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
-*nl.zeTearOffPosition 1000/Printerstandaard: ""
-*nl.zeTearOffPosition -120/-120: ""
-*nl.zeTearOffPosition -115/-115: ""
-*nl.zeTearOffPosition -110/-110: ""
-*nl.zeTearOffPosition -105/-105: ""
-*nl.zeTearOffPosition -100/-100: ""
-*nl.zeTearOffPosition -95/-95: ""
-*nl.zeTearOffPosition -90/-90: ""
-*nl.zeTearOffPosition -85/-85: ""
-*nl.zeTearOffPosition -80/-80: ""
-*nl.zeTearOffPosition -75/-75: ""
-*nl.zeTearOffPosition -70/-70: ""
-*nl.zeTearOffPosition -65/-65: ""
-*nl.zeTearOffPosition -60/-60: ""
-*nl.zeTearOffPosition -55/-55: ""
-*nl.zeTearOffPosition -50/-50: ""
-*nl.zeTearOffPosition -45/-45: ""
-*nl.zeTearOffPosition -40/-40: ""
-*nl.zeTearOffPosition -35/-35: ""
-*nl.zeTearOffPosition -30/-30: ""
-*nl.zeTearOffPosition -25/-25: ""
-*nl.zeTearOffPosition -20/-20: ""
-*nl.zeTearOffPosition -15/-15: ""
-*nl.zeTearOffPosition -10/-10: ""
-*nl.zeTearOffPosition -5/-5: ""
-*nl.zeTearOffPosition 0/0: ""
-*nl.zeTearOffPosition 5/5: ""
-*nl.zeTearOffPosition 10/10: ""
-*nl.zeTearOffPosition 15/15: ""
-*nl.zeTearOffPosition 20/20: ""
-*nl.zeTearOffPosition 25/25: ""
-*nl.zeTearOffPosition 30/30: ""
-*nl.zeTearOffPosition 35/35: ""
-*nl.zeTearOffPosition 40/40: ""
-*nl.zeTearOffPosition 45/45: ""
-*nl.zeTearOffPosition 50/50: ""
-*nl.zeTearOffPosition 55/55: ""
-*nl.zeTearOffPosition 60/60: ""
-*nl.zeTearOffPosition 65/65: ""
-*nl.zeTearOffPosition 70/70: ""
-*nl.zeTearOffPosition 75/75: ""
-*nl.zeTearOffPosition 80/80: ""
-*nl.zeTearOffPosition 85/85: ""
-*nl.zeTearOffPosition 90/90: ""
-*nl.zeTearOffPosition 95/95: ""
-*nl.zeTearOffPosition 100/100: ""
-*nl.zeTearOffPosition 105/105: ""
-*nl.zeTearOffPosition 110/110: ""
-*nl.zeTearOffPosition 115/115: ""
-*nl.zeTearOffPosition 120/120: ""
-*nl.Translation zeErrorReprint/Reprint After Error: ""
-*nl.zeErrorReprint Saved/Printerstandaard: ""
-*nl.zeErrorReprint Always/Always: ""
-*nl.zeErrorReprint Never/Never: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra ZPL Label Printer: ""
 *no.Translation ShortNickName/Zebra ZPL Label Printer: ""
@@ -3012,237 +2783,237 @@
 *pt.zeErrorReprint Saved/Rápido: ""
 *pt.zeErrorReprint Always/Always: ""
 *pt.zeErrorReprint Never/Never: ""
-*pt_BR.Translation Manufacturer/Zebra: ""
-*pt_BR.Translation ModelName/Zebra ZPL Label Printer: ""
-*pt_BR.Translation ShortNickName/Zebra ZPL Label Printer: ""
-*pt_BR.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize w90h18/1.25x0.25": ""
-*pt_BR.PageSize w90h162/1.25x2.25": ""
-*pt_BR.PageSize w108h18/1.50x0.25": ""
-*pt_BR.PageSize w108h36/1.50x0.50": ""
-*pt_BR.PageSize w108h72/1.50x1.00": ""
-*pt_BR.PageSize w108h144/1.50x2.00": ""
-*pt_BR.PageSize w144h26/2.00x0.37": ""
-*pt_BR.PageSize w144h36/2.00x0.50": ""
-*pt_BR.PageSize w144h72/2.00x1.00": ""
-*pt_BR.PageSize w144h90/2.00x1.25": ""
-*pt_BR.PageSize w144h288/2.00x4.00": ""
-*pt_BR.PageSize w144h396/2.00x5.50": ""
-*pt_BR.PageSize w162h36/2.25x0.50": ""
-*pt_BR.PageSize w162h90/2.25x1.25": ""
-*pt_BR.PageSize w162h288/2.25x4.00": ""
-*pt_BR.PageSize w162h396/2.25x5.50": ""
-*pt_BR.PageSize w171h396/2.38x5.50": ""
-*pt_BR.PageSize w180h72/2.50x1.00": ""
-*pt_BR.PageSize w180h144/2.50x2.00": ""
-*pt_BR.PageSize w198h90/2.75x1.25": ""
-*pt_BR.PageSize w216h72/3.00x1.00": ""
-*pt_BR.PageSize w216h90/3.00x1.25": ""
-*pt_BR.PageSize w216h144/3.00x2.00": ""
-*pt_BR.PageSize w216h216/3.00x3.00": ""
-*pt_BR.PageSize w216h360/3.00x5.00": ""
-*pt_BR.PageSize w234h144/3.25x2.00": ""
-*pt_BR.PageSize w234h360/3.25x5.00": ""
-*pt_BR.PageSize w234h396/3.25x5.50": ""
-*pt_BR.PageSize w234h419/3.25x5.83": ""
-*pt_BR.PageSize w234h563/3.25x7.83": ""
-*pt_BR.PageSize w252h72/3.50x1.00": ""
-*pt_BR.PageSize w288h72/4.00x1.00": ""
-*pt_BR.PageSize w288h144/4.00x2.00": ""
-*pt_BR.PageSize w288h180/4.00x2.50": ""
-*pt_BR.PageSize w288h216/4.00x3.00": ""
-*pt_BR.PageSize w288h288/4.00x4.00": ""
-*pt_BR.PageSize w288h360/4.00x5.00": ""
-*pt_BR.PageSize w288h432/4.00x6.00": ""
-*pt_BR.PageSize w288h468/4.00x6.50": ""
-*pt_BR.PageSize w288h936/4.00x13.00": ""
-*pt_BR.PageSize w432h72/6.00x1.00": ""
-*pt_BR.PageSize w432h144/6.00x2.00": ""
-*pt_BR.PageSize w432h216/6.00x3.00": ""
-*pt_BR.PageSize w432h288/6.00x4.00": ""
-*pt_BR.PageSize w432h360/6.00x5.00": ""
-*pt_BR.PageSize w432h432/6.00x6.00": ""
-*pt_BR.PageSize w432h468/6.00x6.50": ""
-*pt_BR.PageSize w576h72/8.00x1.00": ""
-*pt_BR.PageSize w576h144/8.00x2.00": ""
-*pt_BR.PageSize w576h216/8.00x3.00": ""
-*pt_BR.PageSize w576h288/8.00x4.00": ""
-*pt_BR.PageSize w576h360/8.00x5.00": ""
-*pt_BR.PageSize w576h432/8.00x6.00": ""
-*pt_BR.PageSize w576h468/8.00x6.50": ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 203dpi/203dpi: ""
-*pt_BR.Resolution 300dpi/300dpi: ""
-*pt_BR.Resolution 600dpi/600dpi: ""
-*pt_BR.Translation zeMediaTracking/Media Tracking: ""
-*pt_BR.zeMediaTracking Continuous/Continuous: ""
-*pt_BR.zeMediaTracking Web/Non-continuous (Web sensing): ""
-*pt_BR.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
-*pt_BR.Translation MediaType/Media Type: ""
-*pt_BR.MediaType Saved/Rápido: ""
-*pt_BR.MediaType Thermal/Thermal Transfer Media: ""
-*pt_BR.MediaType Direct/Direct Thermal Media: ""
-*pt_BR.Translation PrinterSettings/Printer Settings: ""
-*pt_BR.Translation Darkness/Darkness: ""
-*pt_BR.Darkness -1/Rápido: ""
-*pt_BR.Darkness 1/1: ""
-*pt_BR.Darkness 2/2: ""
-*pt_BR.Darkness 3/3: ""
-*pt_BR.Darkness 4/4: ""
-*pt_BR.Darkness 5/5: ""
-*pt_BR.Darkness 6/6: ""
-*pt_BR.Darkness 7/7: ""
-*pt_BR.Darkness 8/8: ""
-*pt_BR.Darkness 9/9: ""
-*pt_BR.Darkness 10/10: ""
-*pt_BR.Darkness 11/11: ""
-*pt_BR.Darkness 12/12: ""
-*pt_BR.Darkness 13/13: ""
-*pt_BR.Darkness 14/14: ""
-*pt_BR.Darkness 15/15: ""
-*pt_BR.Darkness 16/16: ""
-*pt_BR.Darkness 17/17: ""
-*pt_BR.Darkness 18/18: ""
-*pt_BR.Darkness 19/19: ""
-*pt_BR.Darkness 20/20: ""
-*pt_BR.Darkness 21/21: ""
-*pt_BR.Darkness 22/22: ""
-*pt_BR.Darkness 23/23: ""
-*pt_BR.Darkness 24/24: ""
-*pt_BR.Darkness 25/25: ""
-*pt_BR.Darkness 26/26: ""
-*pt_BR.Darkness 27/27: ""
-*pt_BR.Darkness 28/28: ""
-*pt_BR.Darkness 29/29: ""
-*pt_BR.Darkness 30/30: ""
-*pt_BR.Translation zePrintRate/Print Rate: ""
-*pt_BR.zePrintRate Default/Rápido: ""
-*pt_BR.zePrintRate 1/1 inch/sec.: ""
-*pt_BR.zePrintRate 2/2 inches/sec.: ""
-*pt_BR.zePrintRate 3/3 inches/sec.: ""
-*pt_BR.zePrintRate 4/4 inches/sec.: ""
-*pt_BR.zePrintRate 5/5 inches/sec.: ""
-*pt_BR.zePrintRate 6/6 inches/sec.: ""
-*pt_BR.zePrintRate 7/7 inches/sec.: ""
-*pt_BR.zePrintRate 8/8 inches/sec.: ""
-*pt_BR.zePrintRate 9/9 inches/sec.: ""
-*pt_BR.zePrintRate 10/10 inches/sec.: ""
-*pt_BR.zePrintRate 11/11 inches/sec.: ""
-*pt_BR.zePrintRate 12/12 inches/sec.: ""
-*pt_BR.Translation zeLabelTop/Label Top: ""
-*pt_BR.zeLabelTop 200/Rápido: ""
-*pt_BR.zeLabelTop -120/-120: ""
-*pt_BR.zeLabelTop -115/-115: ""
-*pt_BR.zeLabelTop -110/-110: ""
-*pt_BR.zeLabelTop -105/-105: ""
-*pt_BR.zeLabelTop -100/-100: ""
-*pt_BR.zeLabelTop -95/-95: ""
-*pt_BR.zeLabelTop -90/-90: ""
-*pt_BR.zeLabelTop -85/-85: ""
-*pt_BR.zeLabelTop -80/-80: ""
-*pt_BR.zeLabelTop -75/-75: ""
-*pt_BR.zeLabelTop -70/-70: ""
-*pt_BR.zeLabelTop -65/-65: ""
-*pt_BR.zeLabelTop -60/-60: ""
-*pt_BR.zeLabelTop -55/-55: ""
-*pt_BR.zeLabelTop -50/-50: ""
-*pt_BR.zeLabelTop -45/-45: ""
-*pt_BR.zeLabelTop -40/-40: ""
-*pt_BR.zeLabelTop -35/-35: ""
-*pt_BR.zeLabelTop -30/-30: ""
-*pt_BR.zeLabelTop -25/-25: ""
-*pt_BR.zeLabelTop -20/-20: ""
-*pt_BR.zeLabelTop -15/-15: ""
-*pt_BR.zeLabelTop -10/-10: ""
-*pt_BR.zeLabelTop -5/-5: ""
-*pt_BR.zeLabelTop 0/0: ""
-*pt_BR.zeLabelTop 5/5: ""
-*pt_BR.zeLabelTop 10/10: ""
-*pt_BR.zeLabelTop 15/15: ""
-*pt_BR.zeLabelTop 20/20: ""
-*pt_BR.zeLabelTop 25/25: ""
-*pt_BR.zeLabelTop 30/30: ""
-*pt_BR.zeLabelTop 35/35: ""
-*pt_BR.zeLabelTop 40/40: ""
-*pt_BR.zeLabelTop 45/45: ""
-*pt_BR.zeLabelTop 50/50: ""
-*pt_BR.zeLabelTop 55/55: ""
-*pt_BR.zeLabelTop 60/60: ""
-*pt_BR.zeLabelTop 65/65: ""
-*pt_BR.zeLabelTop 70/70: ""
-*pt_BR.zeLabelTop 75/75: ""
-*pt_BR.zeLabelTop 80/80: ""
-*pt_BR.zeLabelTop 85/85: ""
-*pt_BR.zeLabelTop 90/90: ""
-*pt_BR.zeLabelTop 95/95: ""
-*pt_BR.zeLabelTop 100/100: ""
-*pt_BR.zeLabelTop 105/105: ""
-*pt_BR.zeLabelTop 110/110: ""
-*pt_BR.zeLabelTop 115/115: ""
-*pt_BR.zeLabelTop 120/120: ""
-*pt_BR.Translation zePrintMode/Print Mode: ""
-*pt_BR.zePrintMode Saved/Rápido: ""
-*pt_BR.zePrintMode Tear/Tear-Off: ""
-*pt_BR.zePrintMode Peel/Peel-Off: ""
-*pt_BR.zePrintMode Rewind/Rewind: ""
-*pt_BR.zePrintMode Applicator/Applicator: ""
-*pt_BR.zePrintMode Cutter/Cutter: ""
-*pt_BR.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
-*pt_BR.zeTearOffPosition 1000/Rápido: ""
-*pt_BR.zeTearOffPosition -120/-120: ""
-*pt_BR.zeTearOffPosition -115/-115: ""
-*pt_BR.zeTearOffPosition -110/-110: ""
-*pt_BR.zeTearOffPosition -105/-105: ""
-*pt_BR.zeTearOffPosition -100/-100: ""
-*pt_BR.zeTearOffPosition -95/-95: ""
-*pt_BR.zeTearOffPosition -90/-90: ""
-*pt_BR.zeTearOffPosition -85/-85: ""
-*pt_BR.zeTearOffPosition -80/-80: ""
-*pt_BR.zeTearOffPosition -75/-75: ""
-*pt_BR.zeTearOffPosition -70/-70: ""
-*pt_BR.zeTearOffPosition -65/-65: ""
-*pt_BR.zeTearOffPosition -60/-60: ""
-*pt_BR.zeTearOffPosition -55/-55: ""
-*pt_BR.zeTearOffPosition -50/-50: ""
-*pt_BR.zeTearOffPosition -45/-45: ""
-*pt_BR.zeTearOffPosition -40/-40: ""
-*pt_BR.zeTearOffPosition -35/-35: ""
-*pt_BR.zeTearOffPosition -30/-30: ""
-*pt_BR.zeTearOffPosition -25/-25: ""
-*pt_BR.zeTearOffPosition -20/-20: ""
-*pt_BR.zeTearOffPosition -15/-15: ""
-*pt_BR.zeTearOffPosition -10/-10: ""
-*pt_BR.zeTearOffPosition -5/-5: ""
-*pt_BR.zeTearOffPosition 0/0: ""
-*pt_BR.zeTearOffPosition 5/5: ""
-*pt_BR.zeTearOffPosition 10/10: ""
-*pt_BR.zeTearOffPosition 15/15: ""
-*pt_BR.zeTearOffPosition 20/20: ""
-*pt_BR.zeTearOffPosition 25/25: ""
-*pt_BR.zeTearOffPosition 30/30: ""
-*pt_BR.zeTearOffPosition 35/35: ""
-*pt_BR.zeTearOffPosition 40/40: ""
-*pt_BR.zeTearOffPosition 45/45: ""
-*pt_BR.zeTearOffPosition 50/50: ""
-*pt_BR.zeTearOffPosition 55/55: ""
-*pt_BR.zeTearOffPosition 60/60: ""
-*pt_BR.zeTearOffPosition 65/65: ""
-*pt_BR.zeTearOffPosition 70/70: ""
-*pt_BR.zeTearOffPosition 75/75: ""
-*pt_BR.zeTearOffPosition 80/80: ""
-*pt_BR.zeTearOffPosition 85/85: ""
-*pt_BR.zeTearOffPosition 90/90: ""
-*pt_BR.zeTearOffPosition 95/95: ""
-*pt_BR.zeTearOffPosition 100/100: ""
-*pt_BR.zeTearOffPosition 105/105: ""
-*pt_BR.zeTearOffPosition 110/110: ""
-*pt_BR.zeTearOffPosition 115/115: ""
-*pt_BR.zeTearOffPosition 120/120: ""
-*pt_BR.Translation zeErrorReprint/Reprint After Error: ""
-*pt_BR.zeErrorReprint Saved/Rápido: ""
-*pt_BR.zeErrorReprint Always/Always: ""
-*pt_BR.zeErrorReprint Never/Never: ""
+*pt_PT.Translation Manufacturer/Zebra: ""
+*pt_PT.Translation ModelName/Zebra ZPL Label Printer: ""
+*pt_PT.Translation ShortNickName/Zebra ZPL Label Printer: ""
+*pt_PT.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize w90h18/1.25x0.25": ""
+*pt_PT.PageSize w90h162/1.25x2.25": ""
+*pt_PT.PageSize w108h18/1.50x0.25": ""
+*pt_PT.PageSize w108h36/1.50x0.50": ""
+*pt_PT.PageSize w108h72/1.50x1.00": ""
+*pt_PT.PageSize w108h144/1.50x2.00": ""
+*pt_PT.PageSize w144h26/2.00x0.37": ""
+*pt_PT.PageSize w144h36/2.00x0.50": ""
+*pt_PT.PageSize w144h72/2.00x1.00": ""
+*pt_PT.PageSize w144h90/2.00x1.25": ""
+*pt_PT.PageSize w144h288/2.00x4.00": ""
+*pt_PT.PageSize w144h396/2.00x5.50": ""
+*pt_PT.PageSize w162h36/2.25x0.50": ""
+*pt_PT.PageSize w162h90/2.25x1.25": ""
+*pt_PT.PageSize w162h288/2.25x4.00": ""
+*pt_PT.PageSize w162h396/2.25x5.50": ""
+*pt_PT.PageSize w171h396/2.38x5.50": ""
+*pt_PT.PageSize w180h72/2.50x1.00": ""
+*pt_PT.PageSize w180h144/2.50x2.00": ""
+*pt_PT.PageSize w198h90/2.75x1.25": ""
+*pt_PT.PageSize w216h72/3.00x1.00": ""
+*pt_PT.PageSize w216h90/3.00x1.25": ""
+*pt_PT.PageSize w216h144/3.00x2.00": ""
+*pt_PT.PageSize w216h216/3.00x3.00": ""
+*pt_PT.PageSize w216h360/3.00x5.00": ""
+*pt_PT.PageSize w234h144/3.25x2.00": ""
+*pt_PT.PageSize w234h360/3.25x5.00": ""
+*pt_PT.PageSize w234h396/3.25x5.50": ""
+*pt_PT.PageSize w234h419/3.25x5.83": ""
+*pt_PT.PageSize w234h563/3.25x7.83": ""
+*pt_PT.PageSize w252h72/3.50x1.00": ""
+*pt_PT.PageSize w288h72/4.00x1.00": ""
+*pt_PT.PageSize w288h144/4.00x2.00": ""
+*pt_PT.PageSize w288h180/4.00x2.50": ""
+*pt_PT.PageSize w288h216/4.00x3.00": ""
+*pt_PT.PageSize w288h288/4.00x4.00": ""
+*pt_PT.PageSize w288h360/4.00x5.00": ""
+*pt_PT.PageSize w288h432/4.00x6.00": ""
+*pt_PT.PageSize w288h468/4.00x6.50": ""
+*pt_PT.PageSize w288h936/4.00x13.00": ""
+*pt_PT.PageSize w432h72/6.00x1.00": ""
+*pt_PT.PageSize w432h144/6.00x2.00": ""
+*pt_PT.PageSize w432h216/6.00x3.00": ""
+*pt_PT.PageSize w432h288/6.00x4.00": ""
+*pt_PT.PageSize w432h360/6.00x5.00": ""
+*pt_PT.PageSize w432h432/6.00x6.00": ""
+*pt_PT.PageSize w432h468/6.00x6.50": ""
+*pt_PT.PageSize w576h72/8.00x1.00": ""
+*pt_PT.PageSize w576h144/8.00x2.00": ""
+*pt_PT.PageSize w576h216/8.00x3.00": ""
+*pt_PT.PageSize w576h288/8.00x4.00": ""
+*pt_PT.PageSize w576h360/8.00x5.00": ""
+*pt_PT.PageSize w576h432/8.00x6.00": ""
+*pt_PT.PageSize w576h468/8.00x6.50": ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 203dpi/203dpi: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Resolution 600dpi/600dpi: ""
+*pt_PT.Translation zeMediaTracking/Media Tracking: ""
+*pt_PT.zeMediaTracking Continuous/Continuous: ""
+*pt_PT.zeMediaTracking Web/Non-continuous (Web sensing): ""
+*pt_PT.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
+*pt_PT.Translation MediaType/Media Type: ""
+*pt_PT.MediaType Saved/Rápido: ""
+*pt_PT.MediaType Thermal/Thermal Transfer Media: ""
+*pt_PT.MediaType Direct/Direct Thermal Media: ""
+*pt_PT.Translation PrinterSettings/Printer Settings: ""
+*pt_PT.Translation Darkness/Darkness: ""
+*pt_PT.Darkness -1/Rápido: ""
+*pt_PT.Darkness 1/1: ""
+*pt_PT.Darkness 2/2: ""
+*pt_PT.Darkness 3/3: ""
+*pt_PT.Darkness 4/4: ""
+*pt_PT.Darkness 5/5: ""
+*pt_PT.Darkness 6/6: ""
+*pt_PT.Darkness 7/7: ""
+*pt_PT.Darkness 8/8: ""
+*pt_PT.Darkness 9/9: ""
+*pt_PT.Darkness 10/10: ""
+*pt_PT.Darkness 11/11: ""
+*pt_PT.Darkness 12/12: ""
+*pt_PT.Darkness 13/13: ""
+*pt_PT.Darkness 14/14: ""
+*pt_PT.Darkness 15/15: ""
+*pt_PT.Darkness 16/16: ""
+*pt_PT.Darkness 17/17: ""
+*pt_PT.Darkness 18/18: ""
+*pt_PT.Darkness 19/19: ""
+*pt_PT.Darkness 20/20: ""
+*pt_PT.Darkness 21/21: ""
+*pt_PT.Darkness 22/22: ""
+*pt_PT.Darkness 23/23: ""
+*pt_PT.Darkness 24/24: ""
+*pt_PT.Darkness 25/25: ""
+*pt_PT.Darkness 26/26: ""
+*pt_PT.Darkness 27/27: ""
+*pt_PT.Darkness 28/28: ""
+*pt_PT.Darkness 29/29: ""
+*pt_PT.Darkness 30/30: ""
+*pt_PT.Translation zePrintRate/Print Rate: ""
+*pt_PT.zePrintRate Default/Rápido: ""
+*pt_PT.zePrintRate 1/1 inch/sec.: ""
+*pt_PT.zePrintRate 2/2 inches/sec.: ""
+*pt_PT.zePrintRate 3/3 inches/sec.: ""
+*pt_PT.zePrintRate 4/4 inches/sec.: ""
+*pt_PT.zePrintRate 5/5 inches/sec.: ""
+*pt_PT.zePrintRate 6/6 inches/sec.: ""
+*pt_PT.zePrintRate 7/7 inches/sec.: ""
+*pt_PT.zePrintRate 8/8 inches/sec.: ""
+*pt_PT.zePrintRate 9/9 inches/sec.: ""
+*pt_PT.zePrintRate 10/10 inches/sec.: ""
+*pt_PT.zePrintRate 11/11 inches/sec.: ""
+*pt_PT.zePrintRate 12/12 inches/sec.: ""
+*pt_PT.Translation zeLabelTop/Label Top: ""
+*pt_PT.zeLabelTop 200/Rápido: ""
+*pt_PT.zeLabelTop -120/-120: ""
+*pt_PT.zeLabelTop -115/-115: ""
+*pt_PT.zeLabelTop -110/-110: ""
+*pt_PT.zeLabelTop -105/-105: ""
+*pt_PT.zeLabelTop -100/-100: ""
+*pt_PT.zeLabelTop -95/-95: ""
+*pt_PT.zeLabelTop -90/-90: ""
+*pt_PT.zeLabelTop -85/-85: ""
+*pt_PT.zeLabelTop -80/-80: ""
+*pt_PT.zeLabelTop -75/-75: ""
+*pt_PT.zeLabelTop -70/-70: ""
+*pt_PT.zeLabelTop -65/-65: ""
+*pt_PT.zeLabelTop -60/-60: ""
+*pt_PT.zeLabelTop -55/-55: ""
+*pt_PT.zeLabelTop -50/-50: ""
+*pt_PT.zeLabelTop -45/-45: ""
+*pt_PT.zeLabelTop -40/-40: ""
+*pt_PT.zeLabelTop -35/-35: ""
+*pt_PT.zeLabelTop -30/-30: ""
+*pt_PT.zeLabelTop -25/-25: ""
+*pt_PT.zeLabelTop -20/-20: ""
+*pt_PT.zeLabelTop -15/-15: ""
+*pt_PT.zeLabelTop -10/-10: ""
+*pt_PT.zeLabelTop -5/-5: ""
+*pt_PT.zeLabelTop 0/0: ""
+*pt_PT.zeLabelTop 5/5: ""
+*pt_PT.zeLabelTop 10/10: ""
+*pt_PT.zeLabelTop 15/15: ""
+*pt_PT.zeLabelTop 20/20: ""
+*pt_PT.zeLabelTop 25/25: ""
+*pt_PT.zeLabelTop 30/30: ""
+*pt_PT.zeLabelTop 35/35: ""
+*pt_PT.zeLabelTop 40/40: ""
+*pt_PT.zeLabelTop 45/45: ""
+*pt_PT.zeLabelTop 50/50: ""
+*pt_PT.zeLabelTop 55/55: ""
+*pt_PT.zeLabelTop 60/60: ""
+*pt_PT.zeLabelTop 65/65: ""
+*pt_PT.zeLabelTop 70/70: ""
+*pt_PT.zeLabelTop 75/75: ""
+*pt_PT.zeLabelTop 80/80: ""
+*pt_PT.zeLabelTop 85/85: ""
+*pt_PT.zeLabelTop 90/90: ""
+*pt_PT.zeLabelTop 95/95: ""
+*pt_PT.zeLabelTop 100/100: ""
+*pt_PT.zeLabelTop 105/105: ""
+*pt_PT.zeLabelTop 110/110: ""
+*pt_PT.zeLabelTop 115/115: ""
+*pt_PT.zeLabelTop 120/120: ""
+*pt_PT.Translation zePrintMode/Print Mode: ""
+*pt_PT.zePrintMode Saved/Rápido: ""
+*pt_PT.zePrintMode Tear/Tear-Off: ""
+*pt_PT.zePrintMode Peel/Peel-Off: ""
+*pt_PT.zePrintMode Rewind/Rewind: ""
+*pt_PT.zePrintMode Applicator/Applicator: ""
+*pt_PT.zePrintMode Cutter/Cutter: ""
+*pt_PT.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
+*pt_PT.zeTearOffPosition 1000/Rápido: ""
+*pt_PT.zeTearOffPosition -120/-120: ""
+*pt_PT.zeTearOffPosition -115/-115: ""
+*pt_PT.zeTearOffPosition -110/-110: ""
+*pt_PT.zeTearOffPosition -105/-105: ""
+*pt_PT.zeTearOffPosition -100/-100: ""
+*pt_PT.zeTearOffPosition -95/-95: ""
+*pt_PT.zeTearOffPosition -90/-90: ""
+*pt_PT.zeTearOffPosition -85/-85: ""
+*pt_PT.zeTearOffPosition -80/-80: ""
+*pt_PT.zeTearOffPosition -75/-75: ""
+*pt_PT.zeTearOffPosition -70/-70: ""
+*pt_PT.zeTearOffPosition -65/-65: ""
+*pt_PT.zeTearOffPosition -60/-60: ""
+*pt_PT.zeTearOffPosition -55/-55: ""
+*pt_PT.zeTearOffPosition -50/-50: ""
+*pt_PT.zeTearOffPosition -45/-45: ""
+*pt_PT.zeTearOffPosition -40/-40: ""
+*pt_PT.zeTearOffPosition -35/-35: ""
+*pt_PT.zeTearOffPosition -30/-30: ""
+*pt_PT.zeTearOffPosition -25/-25: ""
+*pt_PT.zeTearOffPosition -20/-20: ""
+*pt_PT.zeTearOffPosition -15/-15: ""
+*pt_PT.zeTearOffPosition -10/-10: ""
+*pt_PT.zeTearOffPosition -5/-5: ""
+*pt_PT.zeTearOffPosition 0/0: ""
+*pt_PT.zeTearOffPosition 5/5: ""
+*pt_PT.zeTearOffPosition 10/10: ""
+*pt_PT.zeTearOffPosition 15/15: ""
+*pt_PT.zeTearOffPosition 20/20: ""
+*pt_PT.zeTearOffPosition 25/25: ""
+*pt_PT.zeTearOffPosition 30/30: ""
+*pt_PT.zeTearOffPosition 35/35: ""
+*pt_PT.zeTearOffPosition 40/40: ""
+*pt_PT.zeTearOffPosition 45/45: ""
+*pt_PT.zeTearOffPosition 50/50: ""
+*pt_PT.zeTearOffPosition 55/55: ""
+*pt_PT.zeTearOffPosition 60/60: ""
+*pt_PT.zeTearOffPosition 65/65: ""
+*pt_PT.zeTearOffPosition 70/70: ""
+*pt_PT.zeTearOffPosition 75/75: ""
+*pt_PT.zeTearOffPosition 80/80: ""
+*pt_PT.zeTearOffPosition 85/85: ""
+*pt_PT.zeTearOffPosition 90/90: ""
+*pt_PT.zeTearOffPosition 95/95: ""
+*pt_PT.zeTearOffPosition 100/100: ""
+*pt_PT.zeTearOffPosition 105/105: ""
+*pt_PT.zeTearOffPosition 110/110: ""
+*pt_PT.zeTearOffPosition 115/115: ""
+*pt_PT.zeTearOffPosition 120/120: ""
+*pt_PT.Translation zeErrorReprint/Reprint After Error: ""
+*pt_PT.zeErrorReprint Saved/Rápido: ""
+*pt_PT.zeErrorReprint Always/Always: ""
+*pt_PT.zeErrorReprint Never/Never: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra ZPL Label Printer: ""
 *sv.Translation ShortNickName/Zebra ZPL Label Printer: ""
@@ -3478,7 +3249,7 @@
 *zh.Translation ModelName/Zebra ZPL Label Printer: ""
 *zh.Translation ShortNickName/Zebra ZPL Label Printer: ""
 *zh.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize w90h18/1.25x0.25": ""
 *zh.PageSize w90h162/1.25x2.25": ""
 *zh.PageSize w108h18/1.50x0.25": ""
@@ -3709,7 +3480,7 @@
 *zh_TW.Translation ModelName/Zebra ZPL Label Printer: ""
 *zh_TW.Translation ShortNickName/Zebra ZPL Label Printer: ""
 *zh_TW.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize w90h18/1.25x0.25": ""
 *zh_TW.PageSize w90h162/1.25x2.25": ""
 *zh_TW.PageSize w108h18/1.50x0.25": ""
@@ -3972,4 +3743,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRA.PPD, 145610 bytes.
+*% End of ZEBRA.PPD, 138038 bytes.

ppd/zebracpl.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for CPCL Label Printer with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 19
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -1023,7 +1025,7 @@
 *ko.Translation ModelName/Zebra CPCL Label Printer: ""
 *ko.Translation ShortNickName/Zebra CPCL Label Printer: ""
 *ko.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize w144h72/2.00x1.00": ""
 *ko.PageSize w144h90/2.00x1.25": ""
 *ko.PageSize w144h144/2.00x2.00": ""
@@ -1134,121 +1136,6 @@
 *ko.zeErrorReprint Saved/빠르게: ""
 *ko.zeErrorReprint Always/Always: ""
 *ko.zeErrorReprint Never/Never: ""
-*nl.Translation Manufacturer/Zebra: ""
-*nl.Translation ModelName/Zebra CPCL Label Printer: ""
-*nl.Translation ShortNickName/Zebra CPCL Label Printer: ""
-*nl.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize w144h72/2.00x1.00": ""
-*nl.PageSize w144h90/2.00x1.25": ""
-*nl.PageSize w144h144/2.00x2.00": ""
-*nl.PageSize w144h216/2.00x3.00": ""
-*nl.PageSize w209h72/2.9 x 1": ""
-*nl.PageSize w288h144/4.00x2.00": ""
-*nl.PageSize w288h216/4.00x3.00": ""
-*nl.PageSize w288h288/4.00x4.00": ""
-*nl.PageSize w288h360/4.00x5.00": ""
-*nl.PageSize w288h432/4.00x6.00": ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 203dpi/203dpi: ""
-*nl.Translation zeMediaTracking/Media Tracking: ""
-*nl.zeMediaTracking Continuous/Continuous: ""
-*nl.zeMediaTracking Web/Non-continuous (Web sensing): ""
-*nl.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
-*nl.Translation PrinterSettings/Printer Settings: ""
-*nl.Translation Darkness/Darkness: ""
-*nl.Darkness -1/Printerstandaard: ""
-*nl.Darkness 1/1: ""
-*nl.Darkness 2/2: ""
-*nl.Darkness 3/3: ""
-*nl.Darkness 4/4: ""
-*nl.Darkness 5/5: ""
-*nl.Darkness 6/6: ""
-*nl.Darkness 7/7: ""
-*nl.Darkness 8/8: ""
-*nl.Darkness 9/9: ""
-*nl.Darkness 10/10: ""
-*nl.Darkness 11/11: ""
-*nl.Darkness 12/12: ""
-*nl.Darkness 13/13: ""
-*nl.Darkness 14/14: ""
-*nl.Darkness 15/15: ""
-*nl.Darkness 16/16: ""
-*nl.Darkness 17/17: ""
-*nl.Darkness 18/18: ""
-*nl.Darkness 19/19: ""
-*nl.Darkness 20/20: ""
-*nl.Darkness 21/21: ""
-*nl.Darkness 22/22: ""
-*nl.Darkness 23/23: ""
-*nl.Darkness 24/24: ""
-*nl.Darkness 25/25: ""
-*nl.Darkness 26/26: ""
-*nl.Darkness 27/27: ""
-*nl.Darkness 28/28: ""
-*nl.Darkness 29/29: ""
-*nl.Darkness 30/30: ""
-*nl.Translation zePrintRate/Print Rate: ""
-*nl.zePrintRate Default/Printerstandaard: ""
-*nl.zePrintRate 1/1 inch/sec.: ""
-*nl.zePrintRate 2/2 inches/sec.: ""
-*nl.zePrintRate 3/3 inches/sec.: ""
-*nl.zePrintRate 4/4 inches/sec.: ""
-*nl.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
-*nl.zeTearOffPosition 1000/Printerstandaard: ""
-*nl.zeTearOffPosition -120/-120: ""
-*nl.zeTearOffPosition -115/-115: ""
-*nl.zeTearOffPosition -110/-110: ""
-*nl.zeTearOffPosition -105/-105: ""
-*nl.zeTearOffPosition -100/-100: ""
-*nl.zeTearOffPosition -95/-95: ""
-*nl.zeTearOffPosition -90/-90: ""
-*nl.zeTearOffPosition -85/-85: ""
-*nl.zeTearOffPosition -80/-80: ""
-*nl.zeTearOffPosition -75/-75: ""
-*nl.zeTearOffPosition -70/-70: ""
-*nl.zeTearOffPosition -65/-65: ""
-*nl.zeTearOffPosition -60/-60: ""
-*nl.zeTearOffPosition -55/-55: ""
-*nl.zeTearOffPosition -50/-50: ""
-*nl.zeTearOffPosition -45/-45: ""
-*nl.zeTearOffPosition -40/-40: ""
-*nl.zeTearOffPosition -35/-35: ""
-*nl.zeTearOffPosition -30/-30: ""
-*nl.zeTearOffPosition -25/-25: ""
-*nl.zeTearOffPosition -20/-20: ""
-*nl.zeTearOffPosition -15/-15: ""
-*nl.zeTearOffPosition -10/-10: ""
-*nl.zeTearOffPosition -5/-5: ""
-*nl.zeTearOffPosition 0/0: ""
-*nl.zeTearOffPosition 5/5: ""
-*nl.zeTearOffPosition 10/10: ""
-*nl.zeTearOffPosition 15/15: ""
-*nl.zeTearOffPosition 20/20: ""
-*nl.zeTearOffPosition 25/25: ""
-*nl.zeTearOffPosition 30/30: ""
-*nl.zeTearOffPosition 35/35: ""
-*nl.zeTearOffPosition 40/40: ""
-*nl.zeTearOffPosition 45/45: ""
-*nl.zeTearOffPosition 50/50: ""
-*nl.zeTearOffPosition 55/55: ""
-*nl.zeTearOffPosition 60/60: ""
-*nl.zeTearOffPosition 65/65: ""
-*nl.zeTearOffPosition 70/70: ""
-*nl.zeTearOffPosition 75/75: ""
-*nl.zeTearOffPosition 80/80: ""
-*nl.zeTearOffPosition 85/85: ""
-*nl.zeTearOffPosition 90/90: ""
-*nl.zeTearOffPosition 95/95: ""
-*nl.zeTearOffPosition 100/100: ""
-*nl.zeTearOffPosition 105/105: ""
-*nl.zeTearOffPosition 110/110: ""
-*nl.zeTearOffPosition 115/115: ""
-*nl.zeTearOffPosition 120/120: ""
-*nl.Translation zeErrorReprint/Reprint After Error: ""
-*nl.zeErrorReprint Saved/Printerstandaard: ""
-*nl.zeErrorReprint Always/Always: ""
-*nl.zeErrorReprint Never/Never: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra CPCL Label Printer: ""
 *no.Translation ShortNickName/Zebra CPCL Label Printer: ""
@@ -1479,121 +1366,121 @@
 *pt.zeErrorReprint Saved/Rápido: ""
 *pt.zeErrorReprint Always/Always: ""
 *pt.zeErrorReprint Never/Never: ""
-*pt_BR.Translation Manufacturer/Zebra: ""
-*pt_BR.Translation ModelName/Zebra CPCL Label Printer: ""
-*pt_BR.Translation ShortNickName/Zebra CPCL Label Printer: ""
-*pt_BR.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize w144h72/2.00x1.00": ""
-*pt_BR.PageSize w144h90/2.00x1.25": ""
-*pt_BR.PageSize w144h144/2.00x2.00": ""
-*pt_BR.PageSize w144h216/2.00x3.00": ""
-*pt_BR.PageSize w209h72/2.9 x 1": ""
-*pt_BR.PageSize w288h144/4.00x2.00": ""
-*pt_BR.PageSize w288h216/4.00x3.00": ""
-*pt_BR.PageSize w288h288/4.00x4.00": ""
-*pt_BR.PageSize w288h360/4.00x5.00": ""
-*pt_BR.PageSize w288h432/4.00x6.00": ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 203dpi/203dpi: ""
-*pt_BR.Translation zeMediaTracking/Media Tracking: ""
-*pt_BR.zeMediaTracking Continuous/Continuous: ""
-*pt_BR.zeMediaTracking Web/Non-continuous (Web sensing): ""
-*pt_BR.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
-*pt_BR.Translation PrinterSettings/Printer Settings: ""
-*pt_BR.Translation Darkness/Darkness: ""
-*pt_BR.Darkness -1/Rápido: ""
-*pt_BR.Darkness 1/1: ""
-*pt_BR.Darkness 2/2: ""
-*pt_BR.Darkness 3/3: ""
-*pt_BR.Darkness 4/4: ""
-*pt_BR.Darkness 5/5: ""
-*pt_BR.Darkness 6/6: ""
-*pt_BR.Darkness 7/7: ""
-*pt_BR.Darkness 8/8: ""
-*pt_BR.Darkness 9/9: ""
-*pt_BR.Darkness 10/10: ""
-*pt_BR.Darkness 11/11: ""
-*pt_BR.Darkness 12/12: ""
-*pt_BR.Darkness 13/13: ""
-*pt_BR.Darkness 14/14: ""
-*pt_BR.Darkness 15/15: ""
-*pt_BR.Darkness 16/16: ""
-*pt_BR.Darkness 17/17: ""
-*pt_BR.Darkness 18/18: ""
-*pt_BR.Darkness 19/19: ""
-*pt_BR.Darkness 20/20: ""
-*pt_BR.Darkness 21/21: ""
-*pt_BR.Darkness 22/22: ""
-*pt_BR.Darkness 23/23: ""
-*pt_BR.Darkness 24/24: ""
-*pt_BR.Darkness 25/25: ""
-*pt_BR.Darkness 26/26: ""
-*pt_BR.Darkness 27/27: ""
-*pt_BR.Darkness 28/28: ""
-*pt_BR.Darkness 29/29: ""
-*pt_BR.Darkness 30/30: ""
-*pt_BR.Translation zePrintRate/Print Rate: ""
-*pt_BR.zePrintRate Default/Rápido: ""
-*pt_BR.zePrintRate 1/1 inch/sec.: ""
-*pt_BR.zePrintRate 2/2 inches/sec.: ""
-*pt_BR.zePrintRate 3/3 inches/sec.: ""
-*pt_BR.zePrintRate 4/4 inches/sec.: ""
-*pt_BR.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
-*pt_BR.zeTearOffPosition 1000/Rápido: ""
-*pt_BR.zeTearOffPosition -120/-120: ""
-*pt_BR.zeTearOffPosition -115/-115: ""
-*pt_BR.zeTearOffPosition -110/-110: ""
-*pt_BR.zeTearOffPosition -105/-105: ""
-*pt_BR.zeTearOffPosition -100/-100: ""
-*pt_BR.zeTearOffPosition -95/-95: ""
-*pt_BR.zeTearOffPosition -90/-90: ""
-*pt_BR.zeTearOffPosition -85/-85: ""
-*pt_BR.zeTearOffPosition -80/-80: ""
-*pt_BR.zeTearOffPosition -75/-75: ""
-*pt_BR.zeTearOffPosition -70/-70: ""
-*pt_BR.zeTearOffPosition -65/-65: ""
-*pt_BR.zeTearOffPosition -60/-60: ""
-*pt_BR.zeTearOffPosition -55/-55: ""
-*pt_BR.zeTearOffPosition -50/-50: ""
-*pt_BR.zeTearOffPosition -45/-45: ""
-*pt_BR.zeTearOffPosition -40/-40: ""
-*pt_BR.zeTearOffPosition -35/-35: ""
-*pt_BR.zeTearOffPosition -30/-30: ""
-*pt_BR.zeTearOffPosition -25/-25: ""
-*pt_BR.zeTearOffPosition -20/-20: ""
-*pt_BR.zeTearOffPosition -15/-15: ""
-*pt_BR.zeTearOffPosition -10/-10: ""
-*pt_BR.zeTearOffPosition -5/-5: ""
-*pt_BR.zeTearOffPosition 0/0: ""
-*pt_BR.zeTearOffPosition 5/5: ""
-*pt_BR.zeTearOffPosition 10/10: ""
-*pt_BR.zeTearOffPosition 15/15: ""
-*pt_BR.zeTearOffPosition 20/20: ""
-*pt_BR.zeTearOffPosition 25/25: ""
-*pt_BR.zeTearOffPosition 30/30: ""
-*pt_BR.zeTearOffPosition 35/35: ""
-*pt_BR.zeTearOffPosition 40/40: ""
-*pt_BR.zeTearOffPosition 45/45: ""
-*pt_BR.zeTearOffPosition 50/50: ""
-*pt_BR.zeTearOffPosition 55/55: ""
-*pt_BR.zeTearOffPosition 60/60: ""
-*pt_BR.zeTearOffPosition 65/65: ""
-*pt_BR.zeTearOffPosition 70/70: ""
-*pt_BR.zeTearOffPosition 75/75: ""
-*pt_BR.zeTearOffPosition 80/80: ""
-*pt_BR.zeTearOffPosition 85/85: ""
-*pt_BR.zeTearOffPosition 90/90: ""
-*pt_BR.zeTearOffPosition 95/95: ""
-*pt_BR.zeTearOffPosition 100/100: ""
-*pt_BR.zeTearOffPosition 105/105: ""
-*pt_BR.zeTearOffPosition 110/110: ""
-*pt_BR.zeTearOffPosition 115/115: ""
-*pt_BR.zeTearOffPosition 120/120: ""
-*pt_BR.Translation zeErrorReprint/Reprint After Error: ""
-*pt_BR.zeErrorReprint Saved/Rápido: ""
-*pt_BR.zeErrorReprint Always/Always: ""
-*pt_BR.zeErrorReprint Never/Never: ""
+*pt_PT.Translation Manufacturer/Zebra: ""
+*pt_PT.Translation ModelName/Zebra CPCL Label Printer: ""
+*pt_PT.Translation ShortNickName/Zebra CPCL Label Printer: ""
+*pt_PT.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize w144h72/2.00x1.00": ""
+*pt_PT.PageSize w144h90/2.00x1.25": ""
+*pt_PT.PageSize w144h144/2.00x2.00": ""
+*pt_PT.PageSize w144h216/2.00x3.00": ""
+*pt_PT.PageSize w209h72/2.9 x 1": ""
+*pt_PT.PageSize w288h144/4.00x2.00": ""
+*pt_PT.PageSize w288h216/4.00x3.00": ""
+*pt_PT.PageSize w288h288/4.00x4.00": ""
+*pt_PT.PageSize w288h360/4.00x5.00": ""
+*pt_PT.PageSize w288h432/4.00x6.00": ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 203dpi/203dpi: ""
+*pt_PT.Translation zeMediaTracking/Media Tracking: ""
+*pt_PT.zeMediaTracking Continuous/Continuous: ""
+*pt_PT.zeMediaTracking Web/Non-continuous (Web sensing): ""
+*pt_PT.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
+*pt_PT.Translation PrinterSettings/Printer Settings: ""
+*pt_PT.Translation Darkness/Darkness: ""
+*pt_PT.Darkness -1/Rápido: ""
+*pt_PT.Darkness 1/1: ""
+*pt_PT.Darkness 2/2: ""
+*pt_PT.Darkness 3/3: ""
+*pt_PT.Darkness 4/4: ""
+*pt_PT.Darkness 5/5: ""
+*pt_PT.Darkness 6/6: ""
+*pt_PT.Darkness 7/7: ""
+*pt_PT.Darkness 8/8: ""
+*pt_PT.Darkness 9/9: ""
+*pt_PT.Darkness 10/10: ""
+*pt_PT.Darkness 11/11: ""
+*pt_PT.Darkness 12/12: ""
+*pt_PT.Darkness 13/13: ""
+*pt_PT.Darkness 14/14: ""
+*pt_PT.Darkness 15/15: ""
+*pt_PT.Darkness 16/16: ""
+*pt_PT.Darkness 17/17: ""
+*pt_PT.Darkness 18/18: ""
+*pt_PT.Darkness 19/19: ""
+*pt_PT.Darkness 20/20: ""
+*pt_PT.Darkness 21/21: ""
+*pt_PT.Darkness 22/22: ""
+*pt_PT.Darkness 23/23: ""
+*pt_PT.Darkness 24/24: ""
+*pt_PT.Darkness 25/25: ""
+*pt_PT.Darkness 26/26: ""
+*pt_PT.Darkness 27/27: ""
+*pt_PT.Darkness 28/28: ""
+*pt_PT.Darkness 29/29: ""
+*pt_PT.Darkness 30/30: ""
+*pt_PT.Translation zePrintRate/Print Rate: ""
+*pt_PT.zePrintRate Default/Rápido: ""
+*pt_PT.zePrintRate 1/1 inch/sec.: ""
+*pt_PT.zePrintRate 2/2 inches/sec.: ""
+*pt_PT.zePrintRate 3/3 inches/sec.: ""
+*pt_PT.zePrintRate 4/4 inches/sec.: ""
+*pt_PT.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
+*pt_PT.zeTearOffPosition 1000/Rápido: ""
+*pt_PT.zeTearOffPosition -120/-120: ""
+*pt_PT.zeTearOffPosition -115/-115: ""
+*pt_PT.zeTearOffPosition -110/-110: ""
+*pt_PT.zeTearOffPosition -105/-105: ""
+*pt_PT.zeTearOffPosition -100/-100: ""
+*pt_PT.zeTearOffPosition -95/-95: ""
+*pt_PT.zeTearOffPosition -90/-90: ""
+*pt_PT.zeTearOffPosition -85/-85: ""
+*pt_PT.zeTearOffPosition -80/-80: ""
+*pt_PT.zeTearOffPosition -75/-75: ""
+*pt_PT.zeTearOffPosition -70/-70: ""
+*pt_PT.zeTearOffPosition -65/-65: ""
+*pt_PT.zeTearOffPosition -60/-60: ""
+*pt_PT.zeTearOffPosition -55/-55: ""
+*pt_PT.zeTearOffPosition -50/-50: ""
+*pt_PT.zeTearOffPosition -45/-45: ""
+*pt_PT.zeTearOffPosition -40/-40: ""
+*pt_PT.zeTearOffPosition -35/-35: ""
+*pt_PT.zeTearOffPosition -30/-30: ""
+*pt_PT.zeTearOffPosition -25/-25: ""
+*pt_PT.zeTearOffPosition -20/-20: ""
+*pt_PT.zeTearOffPosition -15/-15: ""
+*pt_PT.zeTearOffPosition -10/-10: ""
+*pt_PT.zeTearOffPosition -5/-5: ""
+*pt_PT.zeTearOffPosition 0/0: ""
+*pt_PT.zeTearOffPosition 5/5: ""
+*pt_PT.zeTearOffPosition 10/10: ""
+*pt_PT.zeTearOffPosition 15/15: ""
+*pt_PT.zeTearOffPosition 20/20: ""
+*pt_PT.zeTearOffPosition 25/25: ""
+*pt_PT.zeTearOffPosition 30/30: ""
+*pt_PT.zeTearOffPosition 35/35: ""
+*pt_PT.zeTearOffPosition 40/40: ""
+*pt_PT.zeTearOffPosition 45/45: ""
+*pt_PT.zeTearOffPosition 50/50: ""
+*pt_PT.zeTearOffPosition 55/55: ""
+*pt_PT.zeTearOffPosition 60/60: ""
+*pt_PT.zeTearOffPosition 65/65: ""
+*pt_PT.zeTearOffPosition 70/70: ""
+*pt_PT.zeTearOffPosition 75/75: ""
+*pt_PT.zeTearOffPosition 80/80: ""
+*pt_PT.zeTearOffPosition 85/85: ""
+*pt_PT.zeTearOffPosition 90/90: ""
+*pt_PT.zeTearOffPosition 95/95: ""
+*pt_PT.zeTearOffPosition 100/100: ""
+*pt_PT.zeTearOffPosition 105/105: ""
+*pt_PT.zeTearOffPosition 110/110: ""
+*pt_PT.zeTearOffPosition 115/115: ""
+*pt_PT.zeTearOffPosition 120/120: ""
+*pt_PT.Translation zeErrorReprint/Reprint After Error: ""
+*pt_PT.zeErrorReprint Saved/Rápido: ""
+*pt_PT.zeErrorReprint Always/Always: ""
+*pt_PT.zeErrorReprint Never/Never: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra CPCL Label Printer: ""
 *sv.Translation ShortNickName/Zebra CPCL Label Printer: ""
@@ -1713,7 +1600,7 @@
 *zh.Translation ModelName/Zebra CPCL Label Printer: ""
 *zh.Translation ShortNickName/Zebra CPCL Label Printer: ""
 *zh.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize w144h72/2.00x1.00": ""
 *zh.PageSize w144h90/2.00x1.25": ""
 *zh.PageSize w144h144/2.00x2.00": ""
@@ -1828,7 +1715,7 @@
 *zh_TW.Translation ModelName/Zebra CPCL Label Printer: ""
 *zh_TW.Translation ShortNickName/Zebra CPCL Label Printer: ""
 *zh_TW.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize w144h72/2.00x1.00": ""
 *zh_TW.PageSize w144h90/2.00x1.25": ""
 *zh_TW.PageSize w144h144/2.00x2.00": ""
@@ -1975,4 +1862,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRACPL.PPD, 71686 bytes.
+*% End of ZEBRACPL.PPD, 67894 bytes.

ppd/zebraep1.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for EPL1 Label Printer with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 16
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -888,7 +890,7 @@
 *ko.Translation ModelName/Zebra EPL1 Label Printer: ""
 *ko.Translation ShortNickName/Zebra EPL1 Label Printer: ""
 *ko.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize w90h18/1.25x0.25": ""
 *ko.PageSize w90h162/1.25x2.25": ""
 *ko.PageSize w108h18/1.50x0.25": ""
@@ -972,94 +974,6 @@
 *ko.zePrintRate 1.5/1.5 inch/sec.: ""
 *ko.zePrintRate 2/2 inches/sec.: ""
 *ko.zePrintRate 2.5/2.5 inches/sec.: ""
-*nl.Translation Manufacturer/Zebra: ""
-*nl.Translation ModelName/Zebra EPL1 Label Printer: ""
-*nl.Translation ShortNickName/Zebra EPL1 Label Printer: ""
-*nl.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize w90h18/1.25x0.25": ""
-*nl.PageSize w90h162/1.25x2.25": ""
-*nl.PageSize w108h18/1.50x0.25": ""
-*nl.PageSize w108h36/1.50x0.50": ""
-*nl.PageSize w108h72/1.50x1.00": ""
-*nl.PageSize w108h144/1.50x2.00": ""
-*nl.PageSize w144h26/2.00x0.37": ""
-*nl.PageSize w144h36/2.00x0.50": ""
-*nl.PageSize w144h72/2.00x1.00": ""
-*nl.PageSize w144h90/2.00x1.25": ""
-*nl.PageSize w144h288/2.00x4.00": ""
-*nl.PageSize w144h396/2.00x5.50": ""
-*nl.PageSize w162h36/2.25x0.50": ""
-*nl.PageSize w162h90/2.25x1.25": ""
-*nl.PageSize w162h288/2.25x4.00": ""
-*nl.PageSize w162h396/2.25x5.50": ""
-*nl.PageSize w171h396/2.38x5.50": ""
-*nl.PageSize w180h72/2.50x1.00": ""
-*nl.PageSize w180h144/2.50x2.00": ""
-*nl.PageSize w198h90/2.75x1.25": ""
-*nl.PageSize w216h72/3.00x1.00": ""
-*nl.PageSize w216h90/3.00x1.25": ""
-*nl.PageSize w216h144/3.00x2.00": ""
-*nl.PageSize w216h216/3.00x3.00": ""
-*nl.PageSize w216h360/3.00x5.00": ""
-*nl.PageSize w234h144/3.25x2.00": ""
-*nl.PageSize w234h360/3.25x5.00": ""
-*nl.PageSize w234h396/3.25x5.50": ""
-*nl.PageSize w234h419/3.25x5.83": ""
-*nl.PageSize w234h563/3.25x7.83": ""
-*nl.PageSize w252h72/3.50x1.00": ""
-*nl.PageSize w288h72/4.00x1.00": ""
-*nl.PageSize w288h144/4.00x2.00": ""
-*nl.PageSize w288h180/4.00x2.50": ""
-*nl.PageSize w288h216/4.00x3.00": ""
-*nl.PageSize w288h288/4.00x4.00": ""
-*nl.PageSize w288h360/4.00x5.00": ""
-*nl.PageSize w288h432/4.00x6.00": ""
-*nl.PageSize w288h468/4.00x6.50": ""
-*nl.PageSize w288h936/4.00x13.00": ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 203dpi/203dpi: ""
-*nl.Resolution 300dpi/300dpi: ""
-*nl.Resolution 600dpi/600dpi: ""
-*nl.Translation PrinterSettings/Printer Settings: ""
-*nl.Translation Darkness/Darkness: ""
-*nl.Darkness -1/Printerstandaard: ""
-*nl.Darkness 1/1: ""
-*nl.Darkness 2/2: ""
-*nl.Darkness 3/3: ""
-*nl.Darkness 4/4: ""
-*nl.Darkness 5/5: ""
-*nl.Darkness 6/6: ""
-*nl.Darkness 7/7: ""
-*nl.Darkness 8/8: ""
-*nl.Darkness 9/9: ""
-*nl.Darkness 10/10: ""
-*nl.Darkness 11/11: ""
-*nl.Darkness 12/12: ""
-*nl.Darkness 13/13: ""
-*nl.Darkness 14/14: ""
-*nl.Darkness 15/15: ""
-*nl.Darkness 16/16: ""
-*nl.Darkness 17/17: ""
-*nl.Darkness 18/18: ""
-*nl.Darkness 19/19: ""
-*nl.Darkness 20/20: ""
-*nl.Darkness 21/21: ""
-*nl.Darkness 22/22: ""
-*nl.Darkness 23/23: ""
-*nl.Darkness 24/24: ""
-*nl.Darkness 25/25: ""
-*nl.Darkness 26/26: ""
-*nl.Darkness 27/27: ""
-*nl.Darkness 28/28: ""
-*nl.Darkness 29/29: ""
-*nl.Darkness 30/30: ""
-*nl.Translation zePrintRate/Print Rate: ""
-*nl.zePrintRate Default/Printerstandaard: ""
-*nl.zePrintRate 1/1 inch/sec.: ""
-*nl.zePrintRate 1.5/1.5 inch/sec.: ""
-*nl.zePrintRate 2/2 inches/sec.: ""
-*nl.zePrintRate 2.5/2.5 inches/sec.: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra EPL1 Label Printer: ""
 *no.Translation ShortNickName/Zebra EPL1 Label Printer: ""
@@ -1236,94 +1150,94 @@
 *pt.zePrintRate 1.5/1.5 inch/sec.: ""
 *pt.zePrintRate 2/2 inches/sec.: ""
 *pt.zePrintRate 2.5/2.5 inches/sec.: ""
-*pt_BR.Translation Manufacturer/Zebra: ""
-*pt_BR.Translation ModelName/Zebra EPL1 Label Printer: ""
-*pt_BR.Translation ShortNickName/Zebra EPL1 Label Printer: ""
-*pt_BR.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize w90h18/1.25x0.25": ""
-*pt_BR.PageSize w90h162/1.25x2.25": ""
-*pt_BR.PageSize w108h18/1.50x0.25": ""
-*pt_BR.PageSize w108h36/1.50x0.50": ""
-*pt_BR.PageSize w108h72/1.50x1.00": ""
-*pt_BR.PageSize w108h144/1.50x2.00": ""
-*pt_BR.PageSize w144h26/2.00x0.37": ""
-*pt_BR.PageSize w144h36/2.00x0.50": ""
-*pt_BR.PageSize w144h72/2.00x1.00": ""
-*pt_BR.PageSize w144h90/2.00x1.25": ""
-*pt_BR.PageSize w144h288/2.00x4.00": ""
-*pt_BR.PageSize w144h396/2.00x5.50": ""
-*pt_BR.PageSize w162h36/2.25x0.50": ""
-*pt_BR.PageSize w162h90/2.25x1.25": ""
-*pt_BR.PageSize w162h288/2.25x4.00": ""
-*pt_BR.PageSize w162h396/2.25x5.50": ""
-*pt_BR.PageSize w171h396/2.38x5.50": ""
-*pt_BR.PageSize w180h72/2.50x1.00": ""
-*pt_BR.PageSize w180h144/2.50x2.00": ""
-*pt_BR.PageSize w198h90/2.75x1.25": ""
-*pt_BR.PageSize w216h72/3.00x1.00": ""
-*pt_BR.PageSize w216h90/3.00x1.25": ""
-*pt_BR.PageSize w216h144/3.00x2.00": ""
-*pt_BR.PageSize w216h216/3.00x3.00": ""
-*pt_BR.PageSize w216h360/3.00x5.00": ""
-*pt_BR.PageSize w234h144/3.25x2.00": ""
-*pt_BR.PageSize w234h360/3.25x5.00": ""
-*pt_BR.PageSize w234h396/3.25x5.50": ""
-*pt_BR.PageSize w234h419/3.25x5.83": ""
-*pt_BR.PageSize w234h563/3.25x7.83": ""
-*pt_BR.PageSize w252h72/3.50x1.00": ""
-*pt_BR.PageSize w288h72/4.00x1.00": ""
-*pt_BR.PageSize w288h144/4.00x2.00": ""
-*pt_BR.PageSize w288h180/4.00x2.50": ""
-*pt_BR.PageSize w288h216/4.00x3.00": ""
-*pt_BR.PageSize w288h288/4.00x4.00": ""
-*pt_BR.PageSize w288h360/4.00x5.00": ""
-*pt_BR.PageSize w288h432/4.00x6.00": ""
-*pt_BR.PageSize w288h468/4.00x6.50": ""
-*pt_BR.PageSize w288h936/4.00x13.00": ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 203dpi/203dpi: ""
-*pt_BR.Resolution 300dpi/300dpi: ""
-*pt_BR.Resolution 600dpi/600dpi: ""
-*pt_BR.Translation PrinterSettings/Printer Settings: ""
-*pt_BR.Translation Darkness/Darkness: ""
-*pt_BR.Darkness -1/Rápido: ""
-*pt_BR.Darkness 1/1: ""
-*pt_BR.Darkness 2/2: ""
-*pt_BR.Darkness 3/3: ""
-*pt_BR.Darkness 4/4: ""
-*pt_BR.Darkness 5/5: ""
-*pt_BR.Darkness 6/6: ""
-*pt_BR.Darkness 7/7: ""
-*pt_BR.Darkness 8/8: ""
-*pt_BR.Darkness 9/9: ""
-*pt_BR.Darkness 10/10: ""
-*pt_BR.Darkness 11/11: ""
-*pt_BR.Darkness 12/12: ""
-*pt_BR.Darkness 13/13: ""
-*pt_BR.Darkness 14/14: ""
-*pt_BR.Darkness 15/15: ""
-*pt_BR.Darkness 16/16: ""
-*pt_BR.Darkness 17/17: ""
-*pt_BR.Darkness 18/18: ""
-*pt_BR.Darkness 19/19: ""
-*pt_BR.Darkness 20/20: ""
-*pt_BR.Darkness 21/21: ""
-*pt_BR.Darkness 22/22: ""
-*pt_BR.Darkness 23/23: ""
-*pt_BR.Darkness 24/24: ""
-*pt_BR.Darkness 25/25: ""
-*pt_BR.Darkness 26/26: ""
-*pt_BR.Darkness 27/27: ""
-*pt_BR.Darkness 28/28: ""
-*pt_BR.Darkness 29/29: ""
-*pt_BR.Darkness 30/30: ""
-*pt_BR.Translation zePrintRate/Print Rate: ""
-*pt_BR.zePrintRate Default/Rápido: ""
-*pt_BR.zePrintRate 1/1 inch/sec.: ""
-*pt_BR.zePrintRate 1.5/1.5 inch/sec.: ""
-*pt_BR.zePrintRate 2/2 inches/sec.: ""
-*pt_BR.zePrintRate 2.5/2.5 inches/sec.: ""
+*pt_PT.Translation Manufacturer/Zebra: ""
+*pt_PT.Translation ModelName/Zebra EPL1 Label Printer: ""
+*pt_PT.Translation ShortNickName/Zebra EPL1 Label Printer: ""
+*pt_PT.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize w90h18/1.25x0.25": ""
+*pt_PT.PageSize w90h162/1.25x2.25": ""
+*pt_PT.PageSize w108h18/1.50x0.25": ""
+*pt_PT.PageSize w108h36/1.50x0.50": ""
+*pt_PT.PageSize w108h72/1.50x1.00": ""
+*pt_PT.PageSize w108h144/1.50x2.00": ""
+*pt_PT.PageSize w144h26/2.00x0.37": ""
+*pt_PT.PageSize w144h36/2.00x0.50": ""
+*pt_PT.PageSize w144h72/2.00x1.00": ""
+*pt_PT.PageSize w144h90/2.00x1.25": ""
+*pt_PT.PageSize w144h288/2.00x4.00": ""
+*pt_PT.PageSize w144h396/2.00x5.50": ""
+*pt_PT.PageSize w162h36/2.25x0.50": ""
+*pt_PT.PageSize w162h90/2.25x1.25": ""
+*pt_PT.PageSize w162h288/2.25x4.00": ""
+*pt_PT.PageSize w162h396/2.25x5.50": ""
+*pt_PT.PageSize w171h396/2.38x5.50": ""
+*pt_PT.PageSize w180h72/2.50x1.00": ""
+*pt_PT.PageSize w180h144/2.50x2.00": ""
+*pt_PT.PageSize w198h90/2.75x1.25": ""
+*pt_PT.PageSize w216h72/3.00x1.00": ""
+*pt_PT.PageSize w216h90/3.00x1.25": ""
+*pt_PT.PageSize w216h144/3.00x2.00": ""
+*pt_PT.PageSize w216h216/3.00x3.00": ""
+*pt_PT.PageSize w216h360/3.00x5.00": ""
+*pt_PT.PageSize w234h144/3.25x2.00": ""
+*pt_PT.PageSize w234h360/3.25x5.00": ""
+*pt_PT.PageSize w234h396/3.25x5.50": ""
+*pt_PT.PageSize w234h419/3.25x5.83": ""
+*pt_PT.PageSize w234h563/3.25x7.83": ""
+*pt_PT.PageSize w252h72/3.50x1.00": ""
+*pt_PT.PageSize w288h72/4.00x1.00": ""
+*pt_PT.PageSize w288h144/4.00x2.00": ""
+*pt_PT.PageSize w288h180/4.00x2.50": ""
+*pt_PT.PageSize w288h216/4.00x3.00": ""
+*pt_PT.PageSize w288h288/4.00x4.00": ""
+*pt_PT.PageSize w288h360/4.00x5.00": ""
+*pt_PT.PageSize w288h432/4.00x6.00": ""
+*pt_PT.PageSize w288h468/4.00x6.50": ""
+*pt_PT.PageSize w288h936/4.00x13.00": ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 203dpi/203dpi: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Resolution 600dpi/600dpi: ""
+*pt_PT.Translation PrinterSettings/Printer Settings: ""
+*pt_PT.Translation Darkness/Darkness: ""
+*pt_PT.Darkness -1/Rápido: ""
+*pt_PT.Darkness 1/1: ""
+*pt_PT.Darkness 2/2: ""
+*pt_PT.Darkness 3/3: ""
+*pt_PT.Darkness 4/4: ""
+*pt_PT.Darkness 5/5: ""
+*pt_PT.Darkness 6/6: ""
+*pt_PT.Darkness 7/7: ""
+*pt_PT.Darkness 8/8: ""
+*pt_PT.Darkness 9/9: ""
+*pt_PT.Darkness 10/10: ""
+*pt_PT.Darkness 11/11: ""
+*pt_PT.Darkness 12/12: ""
+*pt_PT.Darkness 13/13: ""
+*pt_PT.Darkness 14/14: ""
+*pt_PT.Darkness 15/15: ""
+*pt_PT.Darkness 16/16: ""
+*pt_PT.Darkness 17/17: ""
+*pt_PT.Darkness 18/18: ""
+*pt_PT.Darkness 19/19: ""
+*pt_PT.Darkness 20/20: ""
+*pt_PT.Darkness 21/21: ""
+*pt_PT.Darkness 22/22: ""
+*pt_PT.Darkness 23/23: ""
+*pt_PT.Darkness 24/24: ""
+*pt_PT.Darkness 25/25: ""
+*pt_PT.Darkness 26/26: ""
+*pt_PT.Darkness 27/27: ""
+*pt_PT.Darkness 28/28: ""
+*pt_PT.Darkness 29/29: ""
+*pt_PT.Darkness 30/30: ""
+*pt_PT.Translation zePrintRate/Print Rate: ""
+*pt_PT.zePrintRate Default/Rápido: ""
+*pt_PT.zePrintRate 1/1 inch/sec.: ""
+*pt_PT.zePrintRate 1.5/1.5 inch/sec.: ""
+*pt_PT.zePrintRate 2/2 inches/sec.: ""
+*pt_PT.zePrintRate 2.5/2.5 inches/sec.: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra EPL1 Label Printer: ""
 *sv.Translation ShortNickName/Zebra EPL1 Label Printer: ""
@@ -1416,7 +1330,7 @@
 *zh.Translation ModelName/Zebra EPL1 Label Printer: ""
 *zh.Translation ShortNickName/Zebra EPL1 Label Printer: ""
 *zh.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize w90h18/1.25x0.25": ""
 *zh.PageSize w90h162/1.25x2.25": ""
 *zh.PageSize w108h18/1.50x0.25": ""
@@ -1504,7 +1418,7 @@
 *zh_TW.Translation ModelName/Zebra EPL1 Label Printer: ""
 *zh_TW.Translation ShortNickName/Zebra EPL1 Label Printer: ""
 *zh_TW.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize w90h18/1.25x0.25": ""
 *zh_TW.PageSize w90h162/1.25x2.25": ""
 *zh_TW.PageSize w108h18/1.50x0.25": ""
@@ -1624,4 +1538,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRAEP1.PPD, 62118 bytes.
+*% End of ZEBRAEP1.PPD, 59283 bytes.

ppd/zebraep2.ppd

@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *% PPD file for EPL2 Label Printer with CUPS.
-*% Created by the CUPS PPD Compiler v1.2.4.
+*% Created by the CUPS PPD Compiler v1.2.0.
 *% Copyright 2007 by Apple Inc.
 *% Copyright 1997-2007 by Easy Software Products.
 *% 
@@ -30,11 +30,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(ESP Ghostscript)"
+*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 17
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -955,7 +957,7 @@
 *ko.Translation ModelName/Zebra EPL2 Label Printer: ""
 *ko.Translation ShortNickName/Zebra EPL2 Label Printer: ""
 *ko.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
-*ko.Translation PageSize/Page Size: ""
+*ko.Translation PageSize/Media Size: ""
 *ko.PageSize w90h18/1.25x0.25": ""
 *ko.PageSize w90h162/1.25x2.25": ""
 *ko.PageSize w108h18/1.50x0.25": ""
@@ -1047,102 +1049,6 @@
 *ko.zePrintRate 4/4 inches/sec.: ""
 *ko.zePrintRate 5/5 inches/sec.: ""
 *ko.zePrintRate 6/6 inches/sec.: ""
-*nl.Translation Manufacturer/Zebra: ""
-*nl.Translation ModelName/Zebra EPL2 Label Printer: ""
-*nl.Translation ShortNickName/Zebra EPL2 Label Printer: ""
-*nl.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
-*nl.Translation PageSize/Media Size: ""
-*nl.PageSize w90h18/1.25x0.25": ""
-*nl.PageSize w90h162/1.25x2.25": ""
-*nl.PageSize w108h18/1.50x0.25": ""
-*nl.PageSize w108h36/1.50x0.50": ""
-*nl.PageSize w108h72/1.50x1.00": ""
-*nl.PageSize w108h144/1.50x2.00": ""
-*nl.PageSize w144h26/2.00x0.37": ""
-*nl.PageSize w144h36/2.00x0.50": ""
-*nl.PageSize w144h72/2.00x1.00": ""
-*nl.PageSize w144h90/2.00x1.25": ""
-*nl.PageSize w144h288/2.00x4.00": ""
-*nl.PageSize w144h396/2.00x5.50": ""
-*nl.PageSize w162h36/2.25x0.50": ""
-*nl.PageSize w162h90/2.25x1.25": ""
-*nl.PageSize w162h288/2.25x4.00": ""
-*nl.PageSize w162h396/2.25x5.50": ""
-*nl.PageSize w171h396/2.38x5.50": ""
-*nl.PageSize w180h72/2.50x1.00": ""
-*nl.PageSize w180h144/2.50x2.00": ""
-*nl.PageSize w198h90/2.75x1.25": ""
-*nl.PageSize w216h72/3.00x1.00": ""
-*nl.PageSize w216h90/3.00x1.25": ""
-*nl.PageSize w216h144/3.00x2.00": ""
-*nl.PageSize w216h216/3.00x3.00": ""
-*nl.PageSize w216h360/3.00x5.00": ""
-*nl.PageSize w234h144/3.25x2.00": ""
-*nl.PageSize w234h360/3.25x5.00": ""
-*nl.PageSize w234h396/3.25x5.50": ""
-*nl.PageSize w234h419/3.25x5.83": ""
-*nl.PageSize w234h563/3.25x7.83": ""
-*nl.PageSize w252h72/3.50x1.00": ""
-*nl.PageSize w288h72/4.00x1.00": ""
-*nl.PageSize w288h144/4.00x2.00": ""
-*nl.PageSize w288h180/4.00x2.50": ""
-*nl.PageSize w288h216/4.00x3.00": ""
-*nl.PageSize w288h288/4.00x4.00": ""
-*nl.PageSize w288h360/4.00x5.00": ""
-*nl.PageSize w288h432/4.00x6.00": ""
-*nl.PageSize w288h468/4.00x6.50": ""
-*nl.PageSize w288h936/4.00x13.00": ""
-*nl.Translation Resolution/Resolution: ""
-*nl.Resolution 203dpi/203dpi: ""
-*nl.Resolution 300dpi/300dpi: ""
-*nl.Resolution 600dpi/600dpi: ""
-*nl.Translation MediaType/Media Type: ""
-*nl.MediaType Saved/Printerstandaard: ""
-*nl.MediaType Thermal/Thermal Transfer Media: ""
-*nl.MediaType Direct/Direct Thermal Media: ""
-*nl.Translation PrinterSettings/Printer Settings: ""
-*nl.Translation Darkness/Darkness: ""
-*nl.Darkness -1/Printerstandaard: ""
-*nl.Darkness 1/1: ""
-*nl.Darkness 2/2: ""
-*nl.Darkness 3/3: ""
-*nl.Darkness 4/4: ""
-*nl.Darkness 5/5: ""
-*nl.Darkness 6/6: ""
-*nl.Darkness 7/7: ""
-*nl.Darkness 8/8: ""
-*nl.Darkness 9/9: ""
-*nl.Darkness 10/10: ""
-*nl.Darkness 11/11: ""
-*nl.Darkness 12/12: ""
-*nl.Darkness 13/13: ""
-*nl.Darkness 14/14: ""
-*nl.Darkness 15/15: ""
-*nl.Darkness 16/16: ""
-*nl.Darkness 17/17: ""
-*nl.Darkness 18/18: ""
-*nl.Darkness 19/19: ""
-*nl.Darkness 20/20: ""
-*nl.Darkness 21/21: ""
-*nl.Darkness 22/22: ""
-*nl.Darkness 23/23: ""
-*nl.Darkness 24/24: ""
-*nl.Darkness 25/25: ""
-*nl.Darkness 26/26: ""
-*nl.Darkness 27/27: ""
-*nl.Darkness 28/28: ""
-*nl.Darkness 29/29: ""
-*nl.Darkness 30/30: ""
-*nl.Translation zePrintRate/Print Rate: ""
-*nl.zePrintRate Default/Printerstandaard: ""
-*nl.zePrintRate 1/1 inch/sec.: ""
-*nl.zePrintRate 1.5/1.5 inch/sec.: ""
-*nl.zePrintRate 2/2 inches/sec.: ""
-*nl.zePrintRate 2.5/2.5 inches/sec.: ""
-*nl.zePrintRate 3/3 inches/sec.: ""
-*nl.zePrintRate 4/4 inches/sec.: ""
-*nl.zePrintRate 5/5 inches/sec.: ""
-*nl.zePrintRate 6/6 inches/sec.: ""
 *no.Translation Manufacturer/Zebra: ""
 *no.Translation ModelName/Zebra EPL2 Label Printer: ""
 *no.Translation ShortNickName/Zebra EPL2 Label Printer: ""
@@ -1335,102 +1241,102 @@
 *pt.zePrintRate 4/4 inches/sec.: ""
 *pt.zePrintRate 5/5 inches/sec.: ""
 *pt.zePrintRate 6/6 inches/sec.: ""
-*pt_BR.Translation Manufacturer/Zebra: ""
-*pt_BR.Translation ModelName/Zebra EPL2 Label Printer: ""
-*pt_BR.Translation ShortNickName/Zebra EPL2 Label Printer: ""
-*pt_BR.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
-*pt_BR.Translation PageSize/Media Size: ""
-*pt_BR.PageSize w90h18/1.25x0.25": ""
-*pt_BR.PageSize w90h162/1.25x2.25": ""
-*pt_BR.PageSize w108h18/1.50x0.25": ""
-*pt_BR.PageSize w108h36/1.50x0.50": ""
-*pt_BR.PageSize w108h72/1.50x1.00": ""
-*pt_BR.PageSize w108h144/1.50x2.00": ""
-*pt_BR.PageSize w144h26/2.00x0.37": ""
-*pt_BR.PageSize w144h36/2.00x0.50": ""
-*pt_BR.PageSize w144h72/2.00x1.00": ""
-*pt_BR.PageSize w144h90/2.00x1.25": ""
-*pt_BR.PageSize w144h288/2.00x4.00": ""
-*pt_BR.PageSize w144h396/2.00x5.50": ""
-*pt_BR.PageSize w162h36/2.25x0.50": ""
-*pt_BR.PageSize w162h90/2.25x1.25": ""
-*pt_BR.PageSize w162h288/2.25x4.00": ""
-*pt_BR.PageSize w162h396/2.25x5.50": ""
-*pt_BR.PageSize w171h396/2.38x5.50": ""
-*pt_BR.PageSize w180h72/2.50x1.00": ""
-*pt_BR.PageSize w180h144/2.50x2.00": ""
-*pt_BR.PageSize w198h90/2.75x1.25": ""
-*pt_BR.PageSize w216h72/3.00x1.00": ""
-*pt_BR.PageSize w216h90/3.00x1.25": ""
-*pt_BR.PageSize w216h144/3.00x2.00": ""
-*pt_BR.PageSize w216h216/3.00x3.00": ""
-*pt_BR.PageSize w216h360/3.00x5.00": ""
-*pt_BR.PageSize w234h144/3.25x2.00": ""
-*pt_BR.PageSize w234h360/3.25x5.00": ""
-*pt_BR.PageSize w234h396/3.25x5.50": ""
-*pt_BR.PageSize w234h419/3.25x5.83": ""
-*pt_BR.PageSize w234h563/3.25x7.83": ""
-*pt_BR.PageSize w252h72/3.50x1.00": ""
-*pt_BR.PageSize w288h72/4.00x1.00": ""
-*pt_BR.PageSize w288h144/4.00x2.00": ""
-*pt_BR.PageSize w288h180/4.00x2.50": ""
-*pt_BR.PageSize w288h216/4.00x3.00": ""
-*pt_BR.PageSize w288h288/4.00x4.00": ""
-*pt_BR.PageSize w288h360/4.00x5.00": ""
-*pt_BR.PageSize w288h432/4.00x6.00": ""
-*pt_BR.PageSize w288h468/4.00x6.50": ""
-*pt_BR.PageSize w288h936/4.00x13.00": ""
-*pt_BR.Translation Resolution/Resolution: ""
-*pt_BR.Resolution 203dpi/203dpi: ""
-*pt_BR.Resolution 300dpi/300dpi: ""
-*pt_BR.Resolution 600dpi/600dpi: ""
-*pt_BR.Translation MediaType/Media Type: ""
-*pt_BR.MediaType Saved/Rápido: ""
-*pt_BR.MediaType Thermal/Thermal Transfer Media: ""
-*pt_BR.MediaType Direct/Direct Thermal Media: ""
-*pt_BR.Translation PrinterSettings/Printer Settings: ""
-*pt_BR.Translation Darkness/Darkness: ""
-*pt_BR.Darkness -1/Rápido: ""
-*pt_BR.Darkness 1/1: ""
-*pt_BR.Darkness 2/2: ""
-*pt_BR.Darkness 3/3: ""
-*pt_BR.Darkness 4/4: ""
-*pt_BR.Darkness 5/5: ""
-*pt_BR.Darkness 6/6: ""
-*pt_BR.Darkness 7/7: ""
-*pt_BR.Darkness 8/8: ""
-*pt_BR.Darkness 9/9: ""
-*pt_BR.Darkness 10/10: ""
-*pt_BR.Darkness 11/11: ""
-*pt_BR.Darkness 12/12: ""
-*pt_BR.Darkness 13/13: ""
-*pt_BR.Darkness 14/14: ""
-*pt_BR.Darkness 15/15: ""
-*pt_BR.Darkness 16/16: ""
-*pt_BR.Darkness 17/17: ""
-*pt_BR.Darkness 18/18: ""
-*pt_BR.Darkness 19/19: ""
-*pt_BR.Darkness 20/20: ""
-*pt_BR.Darkness 21/21: ""
-*pt_BR.Darkness 22/22: ""
-*pt_BR.Darkness 23/23: ""
-*pt_BR.Darkness 24/24: ""
-*pt_BR.Darkness 25/25: ""
-*pt_BR.Darkness 26/26: ""
-*pt_BR.Darkness 27/27: ""
-*pt_BR.Darkness 28/28: ""
-*pt_BR.Darkness 29/29: ""
-*pt_BR.Darkness 30/30: ""
-*pt_BR.Translation zePrintRate/Print Rate: ""
-*pt_BR.zePrintRate Default/Rápido: ""
-*pt_BR.zePrintRate 1/1 inch/sec.: ""
-*pt_BR.zePrintRate 1.5/1.5 inch/sec.: ""
-*pt_BR.zePrintRate 2/2 inches/sec.: ""
-*pt_BR.zePrintRate 2.5/2.5 inches/sec.: ""
-*pt_BR.zePrintRate 3/3 inches/sec.: ""
-*pt_BR.zePrintRate 4/4 inches/sec.: ""
-*pt_BR.zePrintRate 5/5 inches/sec.: ""
-*pt_BR.zePrintRate 6/6 inches/sec.: ""
+*pt_PT.Translation Manufacturer/Zebra: ""
+*pt_PT.Translation ModelName/Zebra EPL2 Label Printer: ""
+*pt_PT.Translation ShortNickName/Zebra EPL2 Label Printer: ""
+*pt_PT.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
+*pt_PT.Translation PageSize/Media Size: ""
+*pt_PT.PageSize w90h18/1.25x0.25": ""
+*pt_PT.PageSize w90h162/1.25x2.25": ""
+*pt_PT.PageSize w108h18/1.50x0.25": ""
+*pt_PT.PageSize w108h36/1.50x0.50": ""
+*pt_PT.PageSize w108h72/1.50x1.00": ""
+*pt_PT.PageSize w108h144/1.50x2.00": ""
+*pt_PT.PageSize w144h26/2.00x0.37": ""
+*pt_PT.PageSize w144h36/2.00x0.50": ""
+*pt_PT.PageSize w144h72/2.00x1.00": ""
+*pt_PT.PageSize w144h90/2.00x1.25": ""
+*pt_PT.PageSize w144h288/2.00x4.00": ""
+*pt_PT.PageSize w144h396/2.00x5.50": ""
+*pt_PT.PageSize w162h36/2.25x0.50": ""
+*pt_PT.PageSize w162h90/2.25x1.25": ""
+*pt_PT.PageSize w162h288/2.25x4.00": ""
+*pt_PT.PageSize w162h396/2.25x5.50": ""
+*pt_PT.PageSize w171h396/2.38x5.50": ""
+*pt_PT.PageSize w180h72/2.50x1.00": ""
+*pt_PT.PageSize w180h144/2.50x2.00": ""
+*pt_PT.PageSize w198h90/2.75x1.25": ""
+*pt_PT.PageSize w216h72/3.00x1.00": ""
+*pt_PT.PageSize w216h90/3.00x1.25": ""
+*pt_PT.PageSize w216h144/3.00x2.00": ""
+*pt_PT.PageSize w216h216/3.00x3.00": ""
+*pt_PT.PageSize w216h360/3.00x5.00": ""
+*pt_PT.PageSize w234h144/3.25x2.00": ""
+*pt_PT.PageSize w234h360/3.25x5.00": ""
+*pt_PT.PageSize w234h396/3.25x5.50": ""
+*pt_PT.PageSize w234h419/3.25x5.83": ""
+*pt_PT.PageSize w234h563/3.25x7.83": ""
+*pt_PT.PageSize w252h72/3.50x1.00": ""
+*pt_PT.PageSize w288h72/4.00x1.00": ""
+*pt_PT.PageSize w288h144/4.00x2.00": ""
+*pt_PT.PageSize w288h180/4.00x2.50": ""
+*pt_PT.PageSize w288h216/4.00x3.00": ""
+*pt_PT.PageSize w288h288/4.00x4.00": ""
+*pt_PT.PageSize w288h360/4.00x5.00": ""
+*pt_PT.PageSize w288h432/4.00x6.00": ""
+*pt_PT.PageSize w288h468/4.00x6.50": ""
+*pt_PT.PageSize w288h936/4.00x13.00": ""
+*pt_PT.Translation Resolution/Resolution: ""
+*pt_PT.Resolution 203dpi/203dpi: ""
+*pt_PT.Resolution 300dpi/300dpi: ""
+*pt_PT.Resolution 600dpi/600dpi: ""
+*pt_PT.Translation MediaType/Media Type: ""
+*pt_PT.MediaType Saved/Rápido: ""
+*pt_PT.MediaType Thermal/Thermal Transfer Media: ""
+*pt_PT.MediaType Direct/Direct Thermal Media: ""
+*pt_PT.Translation PrinterSettings/Printer Settings: ""
+*pt_PT.Translation Darkness/Darkness: ""
+*pt_PT.Darkness -1/Rápido: ""
+*pt_PT.Darkness 1/1: ""
+*pt_PT.Darkness 2/2: ""
+*pt_PT.Darkness 3/3: ""
+*pt_PT.Darkness 4/4: ""
+*pt_PT.Darkness 5/5: ""
+*pt_PT.Darkness 6/6: ""
+*pt_PT.Darkness 7/7: ""
+*pt_PT.Darkness 8/8: ""
+*pt_PT.Darkness 9/9: ""
+*pt_PT.Darkness 10/10: ""
+*pt_PT.Darkness 11/11: ""
+*pt_PT.Darkness 12/12: ""
+*pt_PT.Darkness 13/13: ""
+*pt_PT.Darkness 14/14: ""
+*pt_PT.Darkness 15/15: ""
+*pt_PT.Darkness 16/16: ""
+*pt_PT.Darkness 17/17: ""
+*pt_PT.Darkness 18/18: ""
+*pt_PT.Darkness 19/19: ""
+*pt_PT.Darkness 20/20: ""
+*pt_PT.Darkness 21/21: ""
+*pt_PT.Darkness 22/22: ""
+*pt_PT.Darkness 23/23: ""
+*pt_PT.Darkness 24/24: ""
+*pt_PT.Darkness 25/25: ""
+*pt_PT.Darkness 26/26: ""
+*pt_PT.Darkness 27/27: ""
+*pt_PT.Darkness 28/28: ""
+*pt_PT.Darkness 29/29: ""
+*pt_PT.Darkness 30/30: ""
+*pt_PT.Translation zePrintRate/Print Rate: ""
+*pt_PT.zePrintRate Default/Rápido: ""
+*pt_PT.zePrintRate 1/1 inch/sec.: ""
+*pt_PT.zePrintRate 1.5/1.5 inch/sec.: ""
+*pt_PT.zePrintRate 2/2 inches/sec.: ""
+*pt_PT.zePrintRate 2.5/2.5 inches/sec.: ""
+*pt_PT.zePrintRate 3/3 inches/sec.: ""
+*pt_PT.zePrintRate 4/4 inches/sec.: ""
+*pt_PT.zePrintRate 5/5 inches/sec.: ""
+*pt_PT.zePrintRate 6/6 inches/sec.: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra EPL2 Label Printer: ""
 *sv.Translation ShortNickName/Zebra EPL2 Label Printer: ""
@@ -1531,7 +1437,7 @@
 *zh.Translation ModelName/Zebra EPL2 Label Printer: ""
 *zh.Translation ShortNickName/Zebra EPL2 Label Printer: ""
 *zh.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
-*zh.Translation PageSize/Page Size: ""
+*zh.Translation PageSize/Media Size: ""
 *zh.PageSize w90h18/1.25x0.25": ""
 *zh.PageSize w90h162/1.25x2.25": ""
 *zh.PageSize w108h18/1.50x0.25": ""
@@ -1627,7 +1533,7 @@
 *zh_TW.Translation ModelName/Zebra EPL2 Label Printer: ""
 *zh_TW.Translation ShortNickName/Zebra EPL2 Label Printer: ""
 *zh_TW.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
-*zh_TW.Translation PageSize/Page Size: ""
+*zh_TW.Translation PageSize/Media Size: ""
 *zh_TW.PageSize w90h18/1.25x0.25": ""
 *zh_TW.PageSize w90h162/1.25x2.25": ""
 *zh_TW.PageSize w108h18/1.50x0.25": ""
@@ -1755,4 +1661,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRAEP2.PPD, 67437 bytes.
+*% End of ZEBRAEP2.PPD, 64281 bytes.

scheduler/auth.c

@@ -3,7 +3,7 @@
  *
  *   Authorization routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -176,13 +176,8 @@ cupsdAddLocation(const char *location)	/* I - Location path */
   * Initialize the record and copy the name over...
   */
 
-  if ((temp->location = strdup(location)) == NULL)
-  {
-    free(temp);
-    return (NULL);
-  }
-
-  temp->length = strlen(temp->location);
+  temp->location = strdup(location);
+  temp->length   = strlen(temp->location);
 
   cupsArrayAdd(Locations, temp);
 
@@ -262,7 +257,7 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Allow *interface*...
     */
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup("*");
     temp->mask.name.length = 1;
   }
@@ -282,7 +277,7 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
       *ifptr = '\0';
     }
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup(ifname);
     temp->mask.name.length = ifptr - ifname;
   }
@@ -292,7 +287,7 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Allow name...
     */
 
-    temp->type             = CUPSD_AUTH_NAME;
+    temp->type             = AUTH_NAME;
     temp->mask.name.name   = strdup(name);
     temp->mask.name.length = strlen(name);
   }
@@ -305,10 +300,9 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */
  */
 
 void
-cupsdAllowIP(
-    cupsd_location_t *loc,		/* I - Location to add to */
-    const unsigned   address[4],	/* I - IP address to add */
-    const unsigned   netmask[4])	/* I - Netmask of address */
+cupsdAllowIP(cupsd_location_t *loc,	/* I - Location to add to */
+             unsigned   address[4],	/* I - IP address to add */
+             unsigned   netmask[4])	/* I - Netmask of address */
 {
   cupsd_authmask_t	*temp;		/* New host/domain mask */
 
@@ -322,7 +316,7 @@ cupsdAllowIP(
   if ((temp = add_allow(loc)) == NULL)
     return;
 
-  temp->type = CUPSD_AUTH_IP;
+  temp->type = AUTH_IP;
   memcpy(temp->mask.ip.address, address, sizeof(temp->mask.ip.address));
   memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
 }
@@ -340,7 +334,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
   char		*ptr,			/* Pointer into string */
 		username[256],		/* Username string */
 		password[33];		/* Password string */
-  cupsd_cert_t	*localuser;		/* Certificate username */
+  const char	*localuser;		/* Certificate username */
   char		nonce[HTTP_MAX_VALUE],	/* Nonce value from client */
 		md5[33],		/* MD5 password */
 		basicmd5[33];		/* MD5 of Basic password */
@@ -369,15 +363,15 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
   */
 
   con->best = cupsdFindBest(con->uri, con->http.state);
-  con->type = CUPSD_AUTH_NONE;
+  con->type = AUTH_NONE;
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdAuthorize: con->uri=\"%s\", con->best=%p(%s)",
                   con->uri, con->best, con->best ? con->best->location : "");
 
-  if (con->best && con->best->type != CUPSD_AUTH_NONE)
+  if (con->best && con->best->type != AUTH_NONE)
   {
-    if (con->best->type == CUPSD_AUTH_DEFAULT)
+    if (con->best->type == AUTH_DEFAULT)
       type = DefaultAuthType;
     else
       type = con->best->type;
@@ -469,7 +463,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 
     AuthorizationFreeItemSet(authinfo);
 
-    con->type = CUPSD_AUTH_BASIC;
+    con->type = AUTH_BASIC;
   }
 #endif /* HAVE_AUTHORIZATION_H */
 #if defined(SO_PEERCRED) && defined(AF_LOCAL)
@@ -526,7 +520,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
                     "cupsdAuthorize: Authorized as %s using PeerCred",
 		    username);
 
-    con->type = CUPSD_AUTH_BASIC;
+    con->type = AUTH_BASIC;
   }
 #endif /* SO_PEERCRED && AF_LOCAL */
   else if (!strncmp(authorization, "Local", 5) &&
@@ -542,7 +536,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 
     if ((localuser = cupsdFindCert(authorization)) != NULL)
     {
-      strlcpy(username, localuser->username, sizeof(username));
+      strlcpy(username, localuser, sizeof(username));
 
       cupsdLogMessage(CUPSD_LOG_DEBUG,
 		      "cupsdAuthorize: Authorized as %s using Local",
@@ -556,12 +550,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
       return;
     }
 
-#ifdef HAVE_GSSAPI
-    if (localuser->ccache)
-      con->type = CUPSD_AUTH_NEGOTIATE;
-    else
-#endif /* HAVE_GSSAPI */
-      con->type = CUPSD_AUTH_BASIC;
+    con->type = AUTH_BASIC;
   }
   else if (!strncmp(authorization, "Basic", 5))
   {
@@ -623,7 +612,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
     switch (type)
     {
       default :
-      case CUPSD_AUTH_BASIC :
+      case AUTH_BASIC :
           {
 #if HAVE_LIBPAM
 	   /*
@@ -664,6 +653,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 	      cupsdLogMessage(CUPSD_LOG_ERROR,
 	                      "cupsdAuthorize: pam_start() returned %d (%s)!\n",
         	              pamerr, pam_strerror(pamh, pamerr));
+	      pam_end(pamh, 0);
 	      return;
 	    }
 
@@ -821,7 +811,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 			  username);
           break;
 
-      case CUPSD_AUTH_BASICDIGEST :
+      case AUTH_BASICDIGEST :
          /*
 	  * Do Basic authentication with the Digest password file...
 	  */
@@ -925,7 +915,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
                     "cupsdAuthorize: Authorized as %s using Digest",
 		    username);
 
-    con->type = CUPSD_AUTH_DIGEST;
+    con->type = AUTH_DIGEST;
   }
 #ifdef HAVE_GSSAPI
   else if (!strncmp(authorization, "Negotiate", 9)) 
@@ -1066,7 +1056,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 
       con->gss_have_creds = 1;
 
-      con->type = CUPSD_AUTH_NEGOTIATE;
+      con->type = AUTH_NEGOTIATE;
     }
     else
       gss_release_name(&minor_status, &client_name);
@@ -1119,7 +1109,7 @@ cupsdCheckAuth(
   {
     switch (masks->type)
     {
-      case CUPSD_AUTH_INTERFACE :
+      case AUTH_INTERFACE :
          /*
 	  * Check for a match with a network interface...
 	  */
@@ -1227,7 +1217,7 @@ cupsdCheckAuth(
 	  }
 	  break;
 
-      case CUPSD_AUTH_NAME :
+      case AUTH_NAME :
          /*
 	  * Check for exact name match...
 	  */
@@ -1246,7 +1236,7 @@ cupsdCheckAuth(
 	    return (1);
           break;
 
-      case CUPSD_AUTH_IP :
+      case AUTH_IP :
          /*
 	  * Check for IP/network address match...
 	  */
@@ -1437,7 +1427,7 @@ cupsdCopyLocation(
     for (i = 0; i < temp->num_allow; i ++)
       switch (temp->allow[i].type = (*loc)->allow[i].type)
       {
-        case CUPSD_AUTH_NAME :
+        case AUTH_NAME :
 	    temp->allow[i].mask.name.length = (*loc)->allow[i].mask.name.length;
 	    temp->allow[i].mask.name.name   = strdup((*loc)->allow[i].mask.name.name);
 
@@ -1450,7 +1440,7 @@ cupsdCopyLocation(
 	      return (NULL);
 	    }
 	    break;
-	case CUPSD_AUTH_IP :
+	case AUTH_IP :
 	    memcpy(&(temp->allow[i].mask.ip), &((*loc)->allow[i].mask.ip),
 	           sizeof(cupsd_ipmask_t));
 	    break;
@@ -1475,7 +1465,7 @@ cupsdCopyLocation(
     for (i = 0; i < temp->num_deny; i ++)
       switch (temp->deny[i].type = (*loc)->deny[i].type)
       {
-        case CUPSD_AUTH_NAME :
+        case AUTH_NAME :
 	    temp->deny[i].mask.name.length = (*loc)->deny[i].mask.name.length;
 	    temp->deny[i].mask.name.name   = strdup((*loc)->deny[i].mask.name.name);
 
@@ -1488,7 +1478,7 @@ cupsdCopyLocation(
 	      return (NULL);
 	    }
 	    break;
-	case CUPSD_AUTH_IP :
+	case AUTH_IP :
 	    memcpy(&(temp->deny[i].mask.ip), &((*loc)->deny[i].mask.ip),
 	           sizeof(cupsd_ipmask_t));
 	    break;
@@ -1548,14 +1538,14 @@ cupsdDeleteLocation(
     free(loc->names);
 
   for (i = loc->num_allow, mask = loc->allow; i > 0; i --, mask ++)
-    if (mask->type == CUPSD_AUTH_NAME || mask->type == CUPSD_AUTH_INTERFACE)
+    if (mask->type == AUTH_NAME || mask->type == AUTH_INTERFACE)
       free(mask->mask.name.name);
 
   if (loc->num_allow > 0)
     free(loc->allow);
 
   for (i = loc->num_deny, mask = loc->deny; i > 0; i --, mask ++)
-    if (mask->type == CUPSD_AUTH_NAME || mask->type == CUPSD_AUTH_INTERFACE)
+    if (mask->type == AUTH_NAME || mask->type == AUTH_INTERFACE)
       free(mask->mask.name.name);
 
   if (loc->num_deny > 0)
@@ -1592,7 +1582,7 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Deny *interface*...
     */
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup("*");
     temp->mask.name.length = 1;
   }
@@ -1612,7 +1602,7 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
       *ifptr = '\0';
     }
 
-    temp->type             = CUPSD_AUTH_INTERFACE;
+    temp->type             = AUTH_INTERFACE;
     temp->mask.name.name   = strdup(ifname);
     temp->mask.name.length = ifptr - ifname;
   }
@@ -1622,7 +1612,7 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
     * Deny name...
     */
 
-    temp->type             = CUPSD_AUTH_NAME;
+    temp->type             = AUTH_NAME;
     temp->mask.name.name   = strdup(name);
     temp->mask.name.length = strlen(name);
   }
@@ -1636,8 +1626,8 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */
 
 void
 cupsdDenyIP(cupsd_location_t *loc,	/* I - Location to add to */
-	    const unsigned   address[4],/* I - IP address to add */
-	    const unsigned   netmask[4])/* I - Netmask of address */
+	    unsigned         address[4],/* I - IP address to add */
+	    unsigned         netmask[4])/* I - Netmask of address */
 {
   cupsd_authmask_t	*temp;		/* New host/domain mask */
 
@@ -1651,7 +1641,7 @@ cupsdDenyIP(cupsd_location_t *loc,	/* I - Location to add to */
   if ((temp = add_deny(loc)) == NULL)
     return;
 
-  temp->type = CUPSD_AUTH_IP;
+  temp->type = AUTH_IP;
   memcpy(temp->mask.ip.address, address, sizeof(temp->mask.ip.address));
   memcpy(temp->mask.ip.netmask, netmask, sizeof(temp->mask.ip.netmask));
 }
@@ -1672,22 +1662,22 @@ cupsdFindBest(const char   *path,	/* I - Resource path */
 			*best;		/* Best match for location so far */
   int			bestlen;	/* Length of best match */
   int			limit;		/* Limit field */
-  static const int	limits[] =	/* Map http_status_t to CUPSD_AUTH_LIMIT_xyz */
+  static const int	limits[] =	/* Map http_status_t to AUTH_LIMIT_xyz */
 		{
-		  CUPSD_AUTH_LIMIT_ALL,
-		  CUPSD_AUTH_LIMIT_OPTIONS,
-		  CUPSD_AUTH_LIMIT_GET,
-		  CUPSD_AUTH_LIMIT_GET,
-		  CUPSD_AUTH_LIMIT_HEAD,
-		  CUPSD_AUTH_LIMIT_POST,
-		  CUPSD_AUTH_LIMIT_POST,
-		  CUPSD_AUTH_LIMIT_POST,
-		  CUPSD_AUTH_LIMIT_PUT,
-		  CUPSD_AUTH_LIMIT_PUT,
-		  CUPSD_AUTH_LIMIT_DELETE,
-		  CUPSD_AUTH_LIMIT_TRACE,
-		  CUPSD_AUTH_LIMIT_ALL,
-		  CUPSD_AUTH_LIMIT_ALL
+		  AUTH_LIMIT_ALL,
+		  AUTH_LIMIT_OPTIONS,
+		  AUTH_LIMIT_GET,
+		  AUTH_LIMIT_GET,
+		  AUTH_LIMIT_HEAD,
+		  AUTH_LIMIT_POST,
+		  AUTH_LIMIT_POST,
+		  AUTH_LIMIT_POST,
+		  AUTH_LIMIT_PUT,
+		  AUTH_LIMIT_PUT,
+		  AUTH_LIMIT_DELETE,
+		  AUTH_LIMIT_TRACE,
+		  AUTH_LIMIT_ALL,
+		  AUTH_LIMIT_ALL
 		};
 
 
@@ -1847,16 +1837,16 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
 
   best = con->best;
 
-  if ((type = best->type) == CUPSD_AUTH_DEFAULT)
+  if ((type = best->type) == AUTH_DEFAULT)
     type = DefaultAuthType;
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdIsAuthorized: level=CUPSD_AUTH_%s, type=%s, "
-		  "satisfy=CUPSD_AUTH_SATISFY_%s, num_names=%d",
+                  "cupsdIsAuthorized: level=AUTH_%s, type=%s, "
+		  "satisfy=AUTH_SATISFY_%s, num_names=%d",
                   levels[best->level], types[type],
 	          best->satisfy ? "ANY" : "ALL", best->num_names);
 
-  if (best->limit == CUPSD_AUTH_LIMIT_IPP)
+  if (best->limit == AUTH_LIMIT_IPP)
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: op=%x(%s)",
                     best->op, ippOpString(best->op));
 
@@ -1900,7 +1890,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
     * Access from localhost (127.0.0.1 or ::1) is always allowed...
     */
 
-    auth = CUPSD_AUTH_ALLOW;
+    auth = AUTH_ALLOW;
   }
   else
   {
@@ -1911,39 +1901,39 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
     switch (best->order_type)
     {
       default :
-	  auth = CUPSD_AUTH_DENY;	/* anti-compiler-warning-code */
+	  auth = AUTH_DENY;	/* anti-compiler-warning-code */
 	  break;
 
-      case CUPSD_AUTH_ALLOW : /* Order Deny,Allow */
-          auth = CUPSD_AUTH_ALLOW;
+      case AUTH_ALLOW : /* Order Deny,Allow */
+          auth = AUTH_ALLOW;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	          	best->num_deny, best->deny))
-	    auth = CUPSD_AUTH_DENY;
+	    auth = AUTH_DENY;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	        	best->num_allow, best->allow))
-	    auth = CUPSD_AUTH_ALLOW;
+	    auth = AUTH_ALLOW;
 	  break;
 
-      case CUPSD_AUTH_DENY : /* Order Allow,Deny */
-          auth = CUPSD_AUTH_DENY;
+      case AUTH_DENY : /* Order Allow,Deny */
+          auth = AUTH_DENY;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	        	best->num_allow, best->allow))
-	    auth = CUPSD_AUTH_ALLOW;
+	    auth = AUTH_ALLOW;
 
           if (cupsdCheckAuth(address, con->http.hostname, hostlen,
 	        	best->num_deny, best->deny))
-	    auth = CUPSD_AUTH_DENY;
+	    auth = AUTH_DENY;
 	  break;
     }
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: auth=CUPSD_AUTH_%s...",
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdIsAuthorized: auth=AUTH_%s...",
                   auth ? "DENY" : "ALLOW");
 
-  if (auth == CUPSD_AUTH_DENY && best->satisfy == CUPSD_AUTH_SATISFY_ALL)
+  if (auth == AUTH_DENY && best->satisfy == AUTH_SATISFY_ALL)
     return (HTTP_FORBIDDEN);
 
 #ifdef HAVE_SSL
@@ -1953,9 +1943,9 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
 
   if ((best->encryption >= HTTP_ENCRYPT_REQUIRED && !con->http.tls &&
       strcasecmp(con->http.hostname, "localhost") &&
-      best->satisfy == CUPSD_AUTH_SATISFY_ALL) &&
-      !(type == CUPSD_AUTH_NEGOTIATE || 
-        (type == CUPSD_AUTH_NONE && DefaultAuthType == CUPSD_AUTH_NEGOTIATE)))
+      best->satisfy == AUTH_SATISFY_ALL) &&
+      !(type == AUTH_NEGOTIATE || 
+        (type == AUTH_NONE && DefaultAuthType == AUTH_NEGOTIATE)))
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG,
                     "cupsdIsAuthorized: Need upgrade to TLS...");
@@ -1967,12 +1957,12 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
   * Now see what access level is required...
   */
 
-  if (best->level == CUPSD_AUTH_ANON ||	/* Anonymous access - allow it */
-      (type == CUPSD_AUTH_NONE && best->num_names == 0))
+  if (best->level == AUTH_ANON ||	/* Anonymous access - allow it */
+      (type == AUTH_NONE && best->num_names == 0))
     return (HTTP_OK);
 
-  if (!con->username[0] && type == CUPSD_AUTH_NONE &&
-      best->limit == CUPSD_AUTH_LIMIT_IPP)
+  if (!con->username[0] && type == AUTH_NONE &&
+      best->limit == AUTH_LIMIT_IPP)
   {
    /*
     * Check for unauthenticated username...
@@ -1989,7 +1979,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
                       attr->values[0].string.text);
       strlcpy(username, attr->values[0].string.text, sizeof(username));
     }
-    else if (best->satisfy == CUPSD_AUTH_SATISFY_ALL || auth == CUPSD_AUTH_DENY)
+    else if (best->satisfy == AUTH_SATISFY_ALL || auth == AUTH_DENY)
       return (HTTP_UNAUTHORIZED);	/* Non-anonymous needs user/pass */
     else
       return (HTTP_OK);			/* unless overridden with Satisfy */
@@ -2005,14 +1995,14 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
     if (!con->username[0])
 #endif /* HAVE_AUTHORIZATION_H */
     {
-      if (best->satisfy == CUPSD_AUTH_SATISFY_ALL || auth == CUPSD_AUTH_DENY)
+      if (best->satisfy == AUTH_SATISFY_ALL || auth == AUTH_DENY)
 	return (HTTP_UNAUTHORIZED);	/* Non-anonymous needs user/pass */
       else
 	return (HTTP_OK);		/* unless overridden with Satisfy */
     }
 
-    if (con->type != type && type != CUPSD_AUTH_NONE &&
-        (con->type != CUPSD_AUTH_BASIC || type != CUPSD_AUTH_BASICDIGEST))
+    if (con->type != type && type != AUTH_NONE &&
+        (con->type != AUTH_BASIC || type != AUTH_BASICDIGEST))
     {
       cupsdLogMessage(CUPSD_LOG_ERROR, "Authorized using %s, expected %s!",
                       types[con->type], types[type]);
@@ -2060,7 +2050,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/* I - Connection */
   else
     pw = NULL;
 
-  if (best->level == CUPSD_AUTH_USER)
+  if (best->level == AUTH_USER)
   {
    /*
     * If there are no names associated with this location, then