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,69 +1,6 @@
-CHANGES.txt - 2007-12-17
+CHANGES.txt - 2007-10-30
 ------------------------
 
-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)

Makefile

@@ -54,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

backend/ieee1284.c

@@ -121,6 +121,7 @@ backendGetDeviceID(
     {
       char	devparport[16];		/* /dev/parportN */
       int	devparportfd,		/* File descriptor for raw device */
+		status,			/* ioctl status */
 		mode;			/* Port mode */
 
 
@@ -141,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;
 

backend/ipp.c

@@ -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

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/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);
     string[strsize - 1] = '\0';
   }
 
-  if (length > 0)
-    (*buffer) += length;
+  (*buffer) += length;
 
   return (string);
 }

backend/usb-darwin.c

@@ -1150,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);
-  }
 }
 
 

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 ++)
       {
@@ -420,6 +420,15 @@ open_device(const char *uri,		/* I - Device URI */
 	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)
   {

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

@@ -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,24 +1372,6 @@ do_config_server(http_t *http)		/* I - HTTP connection */
       return;
     }
 
-#ifdef HAVE_GSSAPI
-   /*
-    * Get authentication settings...
-    */
-
-    if (cgiGetVariable("KERBEROS"))
-      default_auth_type = "Negotiate";
-    else
-    {
-      default_auth_type = cupsGetOption("DefaultAuthType", num_settings,
-                                        settings);
-      if (!strcasecmp(default_auth_type, "Negotiate"))
-        default_auth_type = "Basic";
-    }
-
-    fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
-#endif /* HAVE_GSSAPI */
-
    /*
     * See if the settings have changed...
     */

config-scripts/cups-common.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 7057 2007-11-01 23:29:14Z 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
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Versio number information...
-CUPS_VERSION="1.3.5"
+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'`"
@@ -287,5 +287,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 7057 2007-11-01 23:29:14Z mike $".
+dnl End of "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z 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...

cups/adminutil.c

@@ -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,
@@ -956,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"))
       {
@@ -1699,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)
@@ -1874,7 +1873,7 @@ _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");
 
@@ -1912,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/cups.h

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

cups/encode.c

@@ -100,7 +100,6 @@ static const _ipp_option_t ipp_options[] =
   { "page-top-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { "penwidth",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { "penwidth-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { "port-monitor",             IPP_TAG_NAME,           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 },

cups/http-support.c

@@ -55,8 +55,7 @@
 
 static const char * const http_days[7] =
 			{
-			  "Sun",
-			  "Mon",
+			  "Sun",			  "Mon",
 			  "Tue",
 			  "Wed",
 			  "Thu",

cups/ppd.c

@@ -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
@@ -1008,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;
@@ -1023,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!");
 
@@ -1045,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"))
@@ -1264,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"))
     {
@@ -1370,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"))
     {

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)

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

@@ -510,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>
@@ -603,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>
@@ -689,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/index.html.in

@@ -114,7 +114,7 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 
 <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>
+CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
 
 </TD>
 

filter/pstops.c

@@ -889,7 +889,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
   * Finish up the last page(s)...
   */
 
-  if (number && !is_first_page(number) && cupsArrayLast(doc->pages))
+  if (number && is_not_last_page(number) && cupsArrayLast(doc->pages))
   {
     pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
 
@@ -2785,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)
@@ -2804,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",
@@ -3137,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;
@@ -3160,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,
@@ -3181,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);
   }
 }
 

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();

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/classes.c

@@ -256,9 +256,6 @@ cupsdFindAvailablePrinter(
     return (NULL);
   }
 
-  if (c->num_printers == 0)
-    return (NULL);
-
  /*
   * Make sure that the last printer is also a valid index into the printer
   * array.  If not, reset the last printer to 0...

scheduler/conf.c

@@ -2016,15 +2016,12 @@ parse_protocols(const char *s)		/* I - Space-delimited protocols */
       protocols |= BROWSE_SLP;
     else if (!strcasecmp(valstart, "ldap"))
       protocols |= BROWSE_LDAP;
-    else if (!strcasecmp(valstart, "dnssd") ||
-             !strcasecmp(valstart, "dns-sd") ||
-             !strcasecmp(valstart, "bonjour"))
+    else if (!strcasecmp(valstart, "dnssd") || !strcasecmp(valstart, "bonjour"))
       protocols |= BROWSE_DNSSD;
     else if (!strcasecmp(valstart, "all"))
       protocols |= BROWSE_ALL;
     else if (strcasecmp(valstart, "none"))
-      cupsdLogMessage(CUPSD_LOG_ERROR,
-                      "Unknown browse protocol \"%s\" ignored!", valstart);
+      return (-1);
 
     for (valstart = valend; *valstart; valstart ++)
       if (!isspace(*valstart & 255) || *valstart != ',')

scheduler/dirsvc.c

@@ -198,7 +198,7 @@ cupsdDeregisterPrinter(
   * Announce the deletion...
   */
 
-  if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+  if ((BrowseLocalProtocols & BROWSE_CUPS))
   {
     cups_ptype_t savedtype = p->type;	/* Saved printer type */
 
@@ -862,7 +862,7 @@ cupsdSendBrowseList(void)
 
 	p->browse_time = time(NULL);
 
-	if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+	if (BrowseLocalProtocols & BROWSE_CUPS)
           send_cups_browse(p);
 
 #ifdef HAVE_LIBSLP

scheduler/ipp.c

@@ -1268,8 +1268,7 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
                   con, con->http.fd, printer, printer->name,
-		  filetype, filetype ? filetype->super : "none",
-		  filetype ? filetype->type : "none");
+		  filetype, filetype->super, filetype->type);
 
  /*
   * Check remote printing to non-shared printer...
@@ -1506,7 +1505,17 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
     */
 
     if (auth_info)
-      ippDeleteAttribute(job->attrs, auth_info);
+    {
+      if (job->attrs->prev)
+        job->attrs->prev->next = auth_info->next;
+      else
+        job->attrs->attrs = auth_info->next;
+
+      if (job->attrs->last == auth_info)
+        job->attrs->last = job->attrs->prev;
+
+      _ippFreeAttr(auth_info);
+    }
   }
 
   if ((attr = ippFindAttribute(job->attrs, "job-originating-host-name",
@@ -2315,8 +2324,6 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
   {
    /*
     * Do we have a valid device URI?
-    *
-    * Note: Need to allow bad "hpip" URIs for now to work around HP bug...
     */
 
     http_uri_status_t uri_status;	/* URI separation status */
@@ -2331,7 +2338,7 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
 				 host, sizeof(host), &port,
 				 resource, sizeof(resource));
 
-    if (uri_status < HTTP_URI_OK && strcmp(scheme, "hpip"))
+    if (uri_status < HTTP_URI_OK)
     {
       send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri \"%s\"!"),
 		      attr->values[0].string.text);
@@ -2402,7 +2409,7 @@ add_printer(cupsd_client_t  *con,	/* I - Client connection */
     need_restart_job = 1;
 
     supported = ippFindAttribute(printer->attrs, "port-monitor-supported",
-                                 IPP_TAG_NAME);
+                                 IPP_TAG_KEYWORD);
     for (i = 0; i < supported->num_values; i ++)
       if (!strcmp(supported->values[i].string.text,
                   attr->values[0].string.text))
@@ -5928,12 +5935,6 @@ get_jobs(cupsd_client_t  *con,		/* I - Client connection */
 
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: job->id = %d", job->id);
 
-    if (!job->dest || !job->username)
-      cupsdLoadJob(job);
-
-    if (!job->dest || !job->username)
-      continue;
-
     if ((dest && strcmp(job->dest, dest)) &&
         (!job->printer || !dest || strcmp(job->printer->name, dest)))
       continue;
@@ -8338,7 +8339,9 @@ save_krb5_creds(cupsd_client_t *con,	/* I - Client connection */
   krb5_error_code	error;		/* Kerberos error code */
   OM_uint32		major_status,	/* Major status code */
 			minor_status;	/* Minor status code */
+#    ifdef HAVE_KRB5_CC_NEW_UNIQUE
   krb5_principal	principal;	/* Kerberos principal */
+#    endif /* HAVE_KRB5_CC_NEW_UNIQUE */
 
 
 #   ifdef __APPLE__
@@ -8367,7 +8370,7 @@ save_krb5_creds(cupsd_client_t *con,	/* I - Client connection */
   if ((error = krb5_cc_new_unique(KerberosContext, "FILE", NULL,
                                   &(job->ccache))) != 0)
 #    else /* HAVE_HEIMDAL */
-  if ((error = krb5_cc_gen_new(KerberosContext, &krb5_fcc_ops,
+  if ((error = krb5_cc_gen_new(krb_context, &krb5_fcc_ops,
                                &(job->ccache))) != 0)
 #    endif /* HAVE_KRB5_CC_NEW_UNIQUE */
   {

scheduler/job.c

@@ -250,7 +250,7 @@ cupsdCancelJob(cupsd_job_t  *job,	/* I - Job to cancel */
 
   job->current_file = 0;
 
-  if (!JobHistory || !JobFiles || purge)
+  if (!JobHistory || !JobFiles || purge || (job->dtype & CUPS_PRINTER_REMOTE))
   {
     for (i = 1; i <= job->num_files; i ++)
     {
@@ -270,7 +270,7 @@ cupsdCancelJob(cupsd_job_t  *job,	/* I - Job to cancel */
     }
   }
 
-  if (JobHistory && !purge)
+  if (JobHistory && !purge && !(job->dtype & CUPS_PRINTER_REMOTE))
   {
    /*
     * Save job state info...
@@ -318,13 +318,6 @@ cupsdCancelJobs(const char *dest,	/* I - Destination to cancel */
   for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
        job;
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
-  {
-    if (!job->dest || !job->username)
-      cupsdLoadJob(job);
-
-    if (!job->dest || !job->username)
-      continue;
-
     if ((dest == NULL || !strcmp(job->dest, dest)) &&
         (username == NULL || !strcmp(job->username, username)))
     {
@@ -334,7 +327,6 @@ cupsdCancelJobs(const char *dest,	/* I - Destination to cancel */
 
       cupsdCancelJob(job, purge, IPP_JOB_CANCELED);
     }
-  }
 
   cupsdCheckJobs();
 }

scheduler/main.c

@@ -146,10 +146,6 @@ main(int  argc,				/* I - Number of command-line args */
   cups_file_t		*fp;		/* Fake lpsched lock file */
   struct stat		statbuf;	/* Needed for checking lpsched FIFO */
 #endif /* __sgi */
-#ifdef __APPLE__
-  int			run_as_child = 0;
-					/* Needed for Mac OS X fork/exec */
-#endif /* __APPLE__ */
 #if HAVE_LAUNCHD
   int			launchd_idle_exit;
 					/* Idle exit on select timeout? */
@@ -187,12 +183,6 @@ main(int  argc,				/* I - Number of command-line args */
       for (opt = argv[i] + 1; *opt != '\0'; opt ++)
         switch (*opt)
 	{
-#ifdef __APPLE__
-	  case 'C' : /* Run as child with config file */
-              run_as_child = 1;
-	      fg           = -1;
-#endif /* __APPLE__ */
-
 	  case 'c' : /* Configuration file */
 	      i ++;
 	      if (i >= argc)
@@ -344,18 +334,6 @@ main(int  argc,				/* I - Number of command-line args */
 	return (3);
       }
     }
-
-#ifdef __APPLE__
-   /*
-    * Since CoreFoundation has an overly-agressive check for whether a
-    * process has forked but not exec'd (whether CF has been called or
-    * not...), we now have to exec ourselves with the "-f" option to
-    * eliminate their bogus warning messages.
-    */
-
-    execlp(argv[0], argv[0], "-C", ConfigurationFile, (char *)0);
-    exit(errno);
-#endif /* __APPLE__ */
   }
 
   if (fg < 1)
@@ -596,11 +574,7 @@ main(int  argc,				/* I - Number of command-line args */
   * we are up and running...
   */
 
-#ifdef __APPLE__
-  if (!fg || run_as_child)
-#else
   if (!fg)
-#endif /* __APPLE__ */
   {
    /*
     * Send a signal to the parent process, but only if the parent is
@@ -985,9 +959,7 @@ main(int  argc,				/* I - Number of command-line args */
     if (LastEvent)
     {
 #ifdef HAVE_NOTIFY_POST
-      if (LastEvent & (CUPSD_EVENT_PRINTER_ADDED |
-                       CUPSD_EVENT_PRINTER_DELETED |
-                       CUPSD_EVENT_PRINTER_MODIFIED))
+      if (LastEvent & CUPSD_EVENT_PRINTER_CHANGED)
       {
         cupsdLogMessage(CUPSD_LOG_DEBUG2,
 	                "notify_post(\"com.apple.printerListChange\")");

scheduler/printers.c

@@ -1682,12 +1682,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 		  "username",
 		  "password"
 		};
-#ifdef HAVE_GSSAPI
   static const char * const air_negotiate[] =
 		{			/* Kerberos authentication */
 		  "negotiate"
 		};
-#endif /* HAVE_GSSAPI */
   static const char * const air_none[] =
 		{			/* No authentication */
 		  "none"
@@ -2633,8 +2631,7 @@ cupsdSetPrinterState(
 
   if (old_state != s)
   {
-    cupsdAddEvent(s == IPP_PRINTER_STOPPED ? CUPSD_EVENT_PRINTER_STOPPED :
-                      CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
+    cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
 		  "%s \"%s\" state changed.",
 		  (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
 		  p->name);

scheduler/select.c

@@ -33,7 +33,6 @@
 
 #ifdef HAVE_EPOLL
 #  include <sys/epoll.h>
-#  include <sys/poll.h>
 #elif defined(HAVE_KQUEUE)
 #  include <sys/event.h>
 #  include <sys/time.h>
@@ -168,8 +167,8 @@
  *
  *   In tests using the "make test" target with option 0 (keep cupsd
  *   running) and the "testspeed" program with "-c 50 -r 1000", epoll()
- *   performed 5.5% slower than select(), followed by kqueue() at 16%
- *   slower than select() and poll() at 18% slower than select().  Similar
+ *   performed 5.5% slower select(), followed by kqueue() at 16% slower
+ *   than select() and poll() at 18% slower than select().  Similar
  *   results were seen with twice the number of client connections.
  *
  *   The epoll() and kqueue() performance is likely limited by the
@@ -215,7 +214,10 @@ static cups_array_t	*cupsd_inactive_fds = NULL;
 static int		cupsd_in_select = 0;
 #endif /* HAVE_EPOLL || HAVE_KQUEUE */
 
-#ifdef HAVE_KQUEUE
+#ifdef HAVE_EPOLL
+static int		cupsd_epoll_fd = -1;
+static struct epoll_event *cupsd_epoll_events = NULL;
+#elif defined(HAVE_KQUEUE)
 static int		cupsd_kqueue_fd = -1,
 			cupsd_kqueue_changes = 0;
 static struct kevent	*cupsd_kqueue_events = NULL;
@@ -223,16 +225,12 @@ static struct kevent	*cupsd_kqueue_events = NULL;
 static int		cupsd_alloc_pollfds = 0,
 			cupsd_update_pollfds = 0;
 static struct pollfd	*cupsd_pollfds = NULL;
-#  ifdef HAVE_EPOLL
-static int		cupsd_epoll_fd = -1;
-static struct epoll_event *cupsd_epoll_events = NULL;
-#  endif /* HAVE_EPOLL */
 #else /* select() */
 static fd_set		cupsd_global_input,
 			cupsd_global_output,
 			cupsd_current_input,
 			cupsd_current_output;
-#endif /* HAVE_KQUEUE */
+#endif /* HAVE_EPOLL */
 
 
 /*
@@ -301,7 +299,26 @@ cupsdAddSelect(int             fd,	/* I - File descriptor */
   else
     added = 0;
 
-#ifdef HAVE_KQUEUE
+#ifdef HAVE_EPOLL
+  {
+    struct epoll_event event;		/* Event data */
+
+
+    event.events = 0;
+
+    if (read_cb)
+      event.events |= EPOLLIN;
+
+    if (write_cb)
+      event.events |= EPOLLOUT;
+
+    event.data.ptr = fdptr;
+
+    epoll_ctl(cupsd_epoll_fd, added ? EPOLL_CTL_ADD : EPOLL_CTL_MOD, fd,
+              &event);
+  }
+
+#elif defined(HAVE_KQUEUE)
   {
     struct kevent	event;		/* Event data */
     struct timespec	timeout;	/* Timeout value */
@@ -344,33 +361,6 @@ cupsdAddSelect(int             fd,	/* I - File descriptor */
   }
 
 #elif defined(HAVE_POLL)
-#  ifdef HAVE_EPOLL
-  if (cupsd_epoll_fd >= 0)
-  {
-    struct epoll_event event;		/* Event data */
-
-
-    event.events = 0;
-
-    if (read_cb)
-      event.events |= EPOLLIN;
-
-    if (write_cb)
-      event.events |= EPOLLOUT;
-
-    event.data.ptr = fdptr;
-
-    if (epoll_ctl(cupsd_epoll_fd, added ? EPOLL_CTL_ADD : EPOLL_CTL_MOD, fd,
-                  &event))
-    {
-      close(cupsd_epoll_fd);
-      cupsd_epoll_fd       = -1;
-      cupsd_update_pollfds = 1;
-    }
-  }
-  else
-#  endif /* HAVE_EPOLL */
-
   cupsd_update_pollfds = 1;
 
 #else /* select() */
@@ -406,7 +396,7 @@ cupsdAddSelect(int             fd,	/* I - File descriptor */
     FD_CLR(fd, &cupsd_global_output);
     FD_CLR(fd, &cupsd_current_output);
   }
-#endif /* HAVE_KQUEUE */
+#endif /* HAVE_EPOLL */
 
  /*
   * Save the (new) read and write callbacks...
@@ -429,7 +419,53 @@ cupsdDoSelect(long timeout)		/* I - Timeout in seconds */
 {
   int			nfds;		/* Number of file descriptors */
   _cupsd_fd_t		*fdptr;		/* Current file descriptor */
-#ifdef HAVE_KQUEUE
+#ifdef HAVE_EPOLL
+  int			i;		/* Looping var */
+  struct epoll_event	*event;		/* Current event */
+
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "cupsdDoSelect: polling %d fds for %ld seconds...",
+		  cupsArrayCount(cupsd_fds), timeout);
+
+  cupsd_in_select = 1;
+
+  if (timeout >= 0 && timeout < 86400)
+    nfds = epoll_wait(cupsd_epoll_fd, cupsd_epoll_events, MaxFDs,
+                      timeout * 1000);
+  else
+    nfds = epoll_wait(cupsd_epoll_fd, cupsd_epoll_events, MaxFDs, -1);
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: epoll() returned %d...",
+                  nfds);
+
+  for (i = nfds, event = cupsd_epoll_events; i > 0; i --, event ++)
+  {
+    fdptr = (_cupsd_fd_t *)event->data.ptr;
+
+    if (cupsArrayFind(cupsd_inactive_fds, fdptr))
+      continue;
+
+    retain_fd(fdptr);
+
+    if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Read on fd %d...",
+	              fdptr->fd);
+      (*(fdptr->read_cb))(fdptr->data);
+    }
+
+    if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
+	              fdptr->fd);
+      (*(fdptr->write_cb))(fdptr->data);
+    }
+
+    release_fd(fdptr);
+  }
+
+#elif defined(HAVE_KQUEUE)
   int			i;		/* Looping var */
   struct kevent		*event;		/* Current event */
   struct timespec	ktimeout;	/* kevent() timeout */
@@ -492,66 +528,6 @@ cupsdDoSelect(long timeout)		/* I - Timeout in seconds */
   int			count;		/* Number of file descriptors */
 
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "cupsdDoSelect: polling %d fds for %ld seconds...",
-		  cupsArrayCount(cupsd_fds), timeout);
-
-#  ifdef HAVE_EPOLL
-  cupsd_in_select = 1;
-
-  if (cupsd_epoll_fd >= 0)
-  {
-    int			i;		/* Looping var */
-    struct epoll_event	*event;		/* Current event */
-
-
-    if (timeout >= 0 && timeout < 86400)
-      nfds = epoll_wait(cupsd_epoll_fd, cupsd_epoll_events, MaxFDs,
-                	timeout * 1000);
-    else
-      nfds = epoll_wait(cupsd_epoll_fd, cupsd_epoll_events, MaxFDs, -1);
-
-    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: epoll() returned %d...",
-                    nfds);
-
-    if (nfds < 0 && errno != EINTR)
-    {
-      close(cupsd_epoll_fd);
-      cupsd_epoll_fd = -1;
-    }
-    else
-    {
-      for (i = nfds, event = cupsd_epoll_events; i > 0; i --, event ++)
-      {
-	fdptr = (_cupsd_fd_t *)event->data.ptr;
-
-	if (cupsArrayFind(cupsd_inactive_fds, fdptr))
-	  continue;
-
-	retain_fd(fdptr);
-
-	if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
-	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Read on fd %d...",
-	        	  fdptr->fd);
-	  (*(fdptr->read_cb))(fdptr->data);
-	}
-
-	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
-	{
-	  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
-	        	  fdptr->fd);
-	  (*(fdptr->write_cb))(fdptr->data);
-	}
-
-	release_fd(fdptr);
-      }
-
-      goto release_inactive;
-    }
-  }
-#  endif /* HAVE_EPOLL */
-
   count = cupsArrayCount(cupsd_fds);
 
   if (cupsd_update_pollfds)
@@ -730,17 +706,13 @@ cupsdDoSelect(long timeout)		/* I - Timeout in seconds */
     }
   }
 
-#endif /* HAVE_KQUEUE */
+#endif /* HAVE_EPOLL */
 
 #if defined(HAVE_EPOLL) || defined(HAVE_KQUEUE)
  /*
   * Release all inactive file descriptors...
   */
 
-#  ifndef HAVE_KQUEUE
-  release_inactive:
-#  endif /* !HAVE_KQUEUE */
-
   cupsd_in_select = 0;
 
   for (fdptr = (_cupsd_fd_t *)cupsArrayFirst(cupsd_inactive_fds);
@@ -809,12 +781,7 @@ cupsdRemoveSelect(int fd)		/* I - File descriptor */
     return;
 
 #ifdef HAVE_EPOLL
-  if (epoll_ctl(cupsd_epoll_fd, EPOLL_CTL_DEL, fd, &event))
-  {
-    close(cupsd_epoll_fd);
-    cupsd_epoll_fd       = -1;
-    cupsd_update_pollfds = 1;
-  }
+  epoll_ctl(cupsd_epoll_fd, EPOLL_CTL_DEL, fd, &event);
 
 #elif defined(HAVE_KQUEUE)
   timeout.tv_sec  = 0;
@@ -895,9 +862,8 @@ cupsdStartSelect(void)
 #endif /* HAVE_EPOLL || HAVE_KQUEUE */
 
 #ifdef HAVE_EPOLL
-  cupsd_epoll_fd       = epoll_create(MaxFDs);
-  cupsd_epoll_events   = calloc(MaxFDs, sizeof(struct epoll_event));
-  cupsd_update_pollfds = 0;
+  cupsd_epoll_fd     = epoll_create(MaxFDs);
+  cupsd_epoll_events = calloc(MaxFDs, sizeof(struct epoll_event));
 
 #elif defined(HAVE_KQUEUE)
   cupsd_kqueue_fd      = kqueue();
@@ -937,7 +903,20 @@ cupsdStopSelect(void)
   cupsd_inactive_fds = NULL;
 #endif /* HAVE_EPOLL || HAVE_KQUEUE */
 
-#ifdef HAVE_KQUEUE
+#ifdef HAVE_EPOLL
+  if (cupsd_epoll_events)
+  {
+    free(cupsd_epoll_events);
+    cupsd_epoll_events = NULL;
+  }
+
+  if (cupsd_epoll_fd >= 0)
+  {
+    close(cupsd_epoll_fd);
+    cupsd_epoll_fd = -1;
+  }
+
+#elif defined(HAVE_KQUEUE)
   if (cupsd_kqueue_events)
   {
     free(cupsd_kqueue_events);
@@ -953,20 +932,6 @@ cupsdStopSelect(void)
   cupsd_kqueue_changes = 0;
 
 #elif defined(HAVE_POLL)
-#  ifdef HAVE_EPOLL
-  if (cupsd_epoll_events)
-  {
-    free(cupsd_epoll_events);
-    cupsd_epoll_events = NULL;
-  }
-
-  if (cupsd_epoll_fd >= 0)
-  {
-    close(cupsd_epoll_fd);
-    cupsd_epoll_fd = -1;
-  }
-#  endif /* HAVE_EPOLL */
-
   if (cupsd_pollfds)
   {
     free(cupsd_pollfds);

scheduler/sysman.c

@@ -286,7 +286,7 @@ cupsdUpdateSystemMonitor(void)
            p;
 	   p = (cupsd_printer_t *)cupsArrayNext(Printers))
       {
-	if (p->type & CUPS_PRINTER_DISCOVERED)
+	if (p->type & CUPS_PRINTER_REMOTE)
 	{
 	  cupsdLogMessage(CUPSD_LOG_DEBUG,
 	                  "Deleting remote destination \"%s\"", p->name);

systemv/cupstestppd.c

@@ -2053,9 +2053,6 @@ check_translations(ppd_file_t *ppd,	/* I - PPD file */
 	continue;
       }
 
-      if (!strcmp(langstart, "en"))
-        continue;
-
       cupsArrayAdd(langlist, langstart);
 
       strlcpy(ll, langstart, sizeof(ll));

systemv/lpadmin.c

@@ -1815,10 +1815,10 @@ set_printer_options(
   if ((protocol = cupsGetOption("protocol", num_options, options)) != NULL)
   {
     if (!strcasecmp(protocol, "bcp"))
-      ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "port-monitor",
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "port-monitor",
                    NULL, "bcp");
     else if (!strcasecmp(protocol, "tbcp"))
-      ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "port-monitor",
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "port-monitor",
                    NULL, "tbcp");
   }
 

systemv/lpmove.c

@@ -121,9 +121,6 @@ main(int  argc,				/* I - Number of command-line arguments */
       if ((job = strrchr(argv[i], '-')) != NULL &&
           cupsGetDest(argv[i], NULL, num_dests, dests) == NULL)
         jobid = atoi(job + 1);
-      else if (isdigit(argv[i][0] & 255) &&
-               !cupsGetDest(argv[i], NULL, num_dests, dests))
-        jobid = atoi(argv[i]);
       else
         src = argv[i];
     }

templates/trailer.tmpl

@@ -7,8 +7,8 @@ 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 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>
+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>