From 0a6827453a0fe4a97ad37a6a1a7ffeb96a10e339 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 7 Dec 2007 19:47:43 +0000 Subject: [PATCH] Import CUPS trunk (1.4svn) r7116. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@551 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-1.3.txt | 49 ++++- CHANGES.txt | 6 +- Makefile | 8 +- backend/ieee1284.c | 3 +- backend/usb-darwin.c | 16 ++ backend/usb-unix.c | 15 +- berkeley/lpc.c | 14 +- cgi-bin/admin.c | 23 +- config-scripts/cups-gssapi.m4 | 28 ++- cups/adminutil.c | 19 +- cups/emit.c | 125 ++++++----- cups/http-support.c | 3 +- cups/i18n.h | 4 + cups/language.c | 334 +++++++++++------------------ cups/libcups.exp | 1 + cups/ppd.c | 166 +++++++------- cups/string.c | 2 +- cups/test.ppd | 7 +- cups/testppd.c | 20 +- doc/help/spec-ipp.html | 117 +++++++++- doc/index.html.in | 4 +- packaging/cups.list.in | 63 +++--- pdftops/Stream.cxx | 393 +++++++++++++++++++++------------- pdftops/Stream.h | 10 +- ppd/deskjet.ppd | 84 +++----- ppd/dymo.ppd | 71 +++--- ppd/epson24.ppd | 63 +++--- ppd/epson9.ppd | 61 +++--- ppd/generic.ppd | 76 ++----- ppd/generpcl.ppd | 85 +++----- ppd/intelbar.ppd | 194 ++++++++--------- ppd/laserjet.ppd | 86 +++----- ppd/okidat24.ppd | 63 +++--- ppd/okidata9.ppd | 61 +++--- ppd/sample.drv | 23 +- ppd/stcolor.ppd | 67 +++--- ppd/stcolor2.ppd | 67 +++--- ppd/stphoto.ppd | 67 +++--- ppd/stphoto2.ppd | 67 +++--- ppd/zebra.ppd | 279 +++--------------------- ppd/zebracpl.ppd | 163 +++----------- ppd/zebraep1.ppd | 136 +++--------- ppd/zebraep2.ppd | 144 +++---------- scheduler/classes.c | 3 + scheduler/dirsvc.c | 4 +- scheduler/ipp.c | 36 +++- scheduler/job.c | 27 ++- scheduler/printers.c | 3 +- scheduler/select.c | 221 +++++++++++-------- systemv/cupstestppd.c | 3 + systemv/lpmove.c | 3 + templates/trailer.tmpl | 4 +- 52 files changed, 1550 insertions(+), 2041 deletions(-) diff --git a/CHANGES-1.3.txt b/CHANGES-1.3.txt index 9e3b973b2..21abb5955 100644 --- a/CHANGES-1.3.txt +++ b/CHANGES-1.3.txt @@ -3,6 +3,43 @@ CHANGES-1.3.txt CHANGES IN CUPS V1.3.5 + - 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. @@ -10,15 +47,15 @@ CHANGES IN CUPS V1.3.5 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 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 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. + - 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. diff --git a/CHANGES.txt b/CHANGES.txt index 525666acb..ca5acc926 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,12 @@ -CHANGES.txt - 2007-09-07 +CHANGES.txt - 2007-12-07 ------------------------ CHANGES IN CUPS V1.4b1 + - The Cancel-Job operation now supports a purge-job + attriibute to purge a specified job. + - ppdEmit* and ppdCollect* now use the NonUIOrderDependency + attributes for custom option selections. - The web interface now enables/disables the printer sharing (formerly publishing) controls based on the server-is-sharing-printers state (STR #2233) diff --git a/Makefile b/Makefile index 2c72a464f..1bf76413c 100644 --- a/Makefile +++ b/Makefile @@ -54,10 +54,10 @@ clean: distclean: clean $(RM) Makedefs config.h config.log config.status - $(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) 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) man/client.conf.man $(RM) man/cups-deviced.man man/cups-driverd.man $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man diff --git a/backend/ieee1284.c b/backend/ieee1284.c index 5fab7ec84..f0617bc82 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -121,7 +121,6 @@ backendGetDeviceID( { char devparport[16]; /* /dev/parportN */ int devparportfd, /* File descriptor for raw device */ - status, /* ioctl status */ mode; /* Port mode */ @@ -142,7 +141,7 @@ backendGetDeviceID( if (!ioctl(devparportfd, PPCLAIM)) { - fcntl(devparport, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK); + fcntl(devparportfd, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK); mode = IEEE1284_MODE_COMPAT; diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index a71d836f5..d92591455 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1150,6 +1150,22 @@ 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); + } } diff --git a/backend/usb-unix.c b/backend/usb-unix.c index a02b3713d..9d5273b64 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -90,8 +90,8 @@ print_device(const char *uri, /* I - Device URI */ use_bc = strcasecmp(hostname, "Brother") && strcasecmp(hostname, "Canon") && - strcasecmp(hostname, "Konica Minolta") && - strcasecmp(hostname, "Minolta"); + strncasecmp(hostname, "Konica", 6) && + strncasecmp(hostname, "Minolta", 7); #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... */ - do + for (;;) { for (busy = 0, i = 0; i < 16; i ++) { @@ -420,15 +420,6 @@ 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) { diff --git a/berkeley/lpc.c b/berkeley/lpc.c index 666308ebb..947186782 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -230,7 +230,6 @@ 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 */ @@ -263,18 +262,7 @@ show_status(http_t *http, /* I - HTTP connection to server */ * attributes-natural-language */ - 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); + request = ippNewRequest(CUPS_GET_PRINTERS); ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(requested) / sizeof(requested[0]), diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index bdf42f911..86ccb9c15 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1388,11 +1388,6 @@ 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... @@ -1409,6 +1404,24 @@ 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... */ diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 9d50a3cbf..968a5fe36 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -23,14 +23,26 @@ LIBGSSAPI="" if test x$enable_gssapi != xno; then AC_PATH_PROG(KRB5CONFIG, krb5-config) if test "x$KRB5CONFIG" != x; then - 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 + 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 AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) else # Check for vendor-specific implementations... diff --git a/cups/adminutil.c b/cups/adminutil.c index f4a492ee7..449feb9f5 100644 --- a/cups/adminutil.c +++ b/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, "= 0) || (in_root_location && share_printers >= 0)) && - (!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny") || + (((!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny")) && + !strcasecmp(value, "@LOCAL")) || !strcasecmp(line, "Order"))) continue; else if (in_cancel_job == 2) @@ -1900,7 +1909,7 @@ _cupsAdminSetServerSettings( cupsFilePuts(temp, "# Restrict access to the configuration files...\n"); cupsFilePuts(temp, "\n" - " AuthType Basic\n" + " AuthType Default\n" " Require user @SYSTEM\n" " Order allow,deny\n"); @@ -1938,7 +1947,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 Basic\n" + " AuthType Default\n" " Require user @SYSTEM\n" " Order deny,allow\n" "\n"); diff --git a/cups/emit.c b/cups/emit.c index b57183a93..ccbc02596 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -30,7 +30,6 @@ * ppdEmitJCLEnd() - Emit JCLEnd code to a file. * ppdEmitString() - Get a string containing the code for marked options. * ppd_handle_media() - Handle media selection... - * ppd_sort() - Sort options by ordering numbers... */ /* @@ -55,7 +54,6 @@ */ static void ppd_handle_media(ppd_file_t *ppd); -static int ppd_sort(ppd_choice_t **c1, ppd_choice_t **c2); /* @@ -94,13 +92,12 @@ ppdCollect2(ppd_file_t *ppd, /* I - PPD file data */ float min_order, /* I - Minimum OrderDependency value */ ppd_choice_t ***choices) /* O - Pointers to choices */ { - int i, j, k, m; /* Looping vars */ - ppd_group_t *g, /* Current group */ - *sg; /* Current sub-group */ - ppd_option_t *o; /* Current option */ ppd_choice_t *c; /* Current choice */ + ppd_section_t csection; /* Current section */ + float corder; /* Current OrderDependency value */ int count; /* Number of choices collected */ ppd_choice_t **collect; /* Collected choices */ + float *orders; /* Collected order values */ DEBUG_printf(("ppdCollect2(ppd=%p, section=%d, min_order=%f, choices=%p)\n", @@ -110,40 +107,72 @@ ppdCollect2(ppd_file_t *ppd, /* I - PPD file data */ return (0); /* - * Allocate memory for up to 1000 selected choices... + * Allocate memory for up to N selected choices... */ count = 0; - collect = calloc(sizeof(ppd_choice_t *), 1000); + collect = calloc(sizeof(ppd_choice_t *), cupsArrayCount(ppd->marked)); + orders = calloc(sizeof(float), cupsArrayCount(ppd->marked)); /* * Loop through all options and add choices as needed... */ - for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++) + for (c = (ppd_choice_t *)cupsArrayFirst(ppd->marked); + c; + c = (ppd_choice_t *)cupsArrayNext(ppd->marked)) { - for (j = g->num_options, o = g->options; j > 0; j --, o ++) - if (o->section == section && o->order >= min_order) - for (k = o->num_choices, c = o->choices; k > 0; k --, c ++) - if (c->marked && count < 1000) - { - DEBUG_printf(("ppdCollect2: %s=%s marked...\n", o->keyword, - c->choice)); - collect[count] = c; - count ++; - } + csection = c->option->section; + corder = c->option->order; + + if (!strcmp(c->choice, "Custom")) + { + ppd_attr_t *attr; /* NonUIOrderDependency value */ + float aorder; /* Order value */ + char asection[17], /* Section name */ + amain[PPD_MAX_NAME + 1], + aoption[PPD_MAX_NAME]; + /* *CustomFoo and True */ + + + for (attr = ppdFindAttr(ppd, "NonUIOrderDependency", NULL); + attr; + attr = ppdFindNextAttr(ppd, "NonUIOrderDependency", NULL)) + if (attr->value && + sscanf(attr->value, "%f%16s%41s%40s", &aorder, asection, amain, + aoption) == 4 && + !strncmp(amain, "*Custom", 7) && + !strcmp(amain + 7, c->option->keyword) && !strcmp(aoption, "True")) + { + /* + * Use this NonUIOrderDependency... + */ - for (j = g->num_subgroups, sg = g->subgroups; j > 0; j --, sg ++) - for (k = sg->num_options, o = sg->options; k > 0; k --, o ++) - if (o->section == section && o->order >= min_order) - for (m = o->num_choices, c = o->choices; m > 0; m --, c ++) - if (c->marked && count < 1000) - { - DEBUG_printf(("ppdCollect2: %s=%s marked...\n", o->keyword, - c->choice)); - collect[count] = c; - count ++; - } + corder = aorder; + + if (!strcmp(asection, "DocumentSetup")) + csection = PPD_ORDER_DOCUMENT; + else if (!strcmp(asection, "ExitServer")) + csection = PPD_ORDER_EXIT; + else if (!strcmp(asection, "JCLSetup")) + csection = PPD_ORDER_JCL; + else if (!strcmp(asection, "PageSetup")) + csection = PPD_ORDER_PAGE; + else if (!strcmp(asection, "Prolog")) + csection = PPD_ORDER_PROLOG; + else + csection = PPD_ORDER_ANY; + + break; + } + } + + if (csection == section && corder >= min_order) + { + collect[count] = c; + orders[count] = corder; + count ++; + } } /* @@ -151,8 +180,23 @@ ppdCollect2(ppd_file_t *ppd, /* I - PPD file data */ */ if (count > 1) - qsort(collect, count, sizeof(ppd_choice_t *), - (int (*)(const void *, const void *))ppd_sort); + { + int i, j; /* Looping vars */ + + for (i = 0; i < (count - 1); i ++) + for (j = i + 1; j < count; j ++) + if (orders[i] > orders[j]) + { + c = collect[i]; + corder = orders[i]; + collect[i] = collect[j]; + orders[i] = orders[j]; + collect[j] = c; + orders[j] = corder; + } + } + + free(orders); DEBUG_printf(("ppdCollect2: %d marked choices...\n", count)); @@ -928,23 +972,6 @@ ppd_handle_media(ppd_file_t *ppd) } -/* - * 'ppd_sort()' - Sort options by ordering numbers... - */ - -static int /* O - -1 if c1 < c2, 0 if equal, 1 otherwise */ -ppd_sort(ppd_choice_t **c1, /* I - First choice */ - ppd_choice_t **c2) /* I - Second choice */ -{ - if ((*c1)->option->order < (*c2)->option->order) - return (-1); - else if ((*c1)->option->order > (*c2)->option->order) - return (1); - else - return (0); -} - - /* * End of "$Id: emit.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/http-support.c b/cups/http-support.c index 3a6aee436..a05e528a3 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -55,7 +55,8 @@ static const char * const http_days[7] = { - "Sun", "Mon", + "Sun", + "Mon", "Tue", "Wed", "Thu", diff --git a/cups/i18n.h b/cups/i18n.h index 2e18790f7..1eacea816 100644 --- a/cups/i18n.h +++ b/cups/i18n.h @@ -82,6 +82,10 @@ typedef struct _cups_vmap_s /**** VBCS Charmap Struct ****/ * Prototypes... */ +#ifdef __APPLE__ +extern const char *_cupsAppleLanguage(const char *locale, char *language, + size_t langsize); +#endif /* __APPLE__ */ extern void _cupsCharmapFlush(void); extern void _cupsCharmapFree(const cups_encoding_t encoding); extern void *_cupsCharmapGet(const cups_encoding_t encoding); diff --git a/cups/language.c b/cups/language.c index 4edaab418..a94a3ae4b 100644 --- a/cups/language.c +++ b/cups/language.c @@ -16,6 +16,8 @@ * * Contents: * + * _cupsAppleLanguage() - Get the Apple language identifier associated + * with a locale ID. * _cupsEncodingName() - Return the character encoding name string * for the given encoding enumeration. * cupsLangDefault() - Return the default language. @@ -65,26 +67,6 @@ static pthread_mutex_t lang_mutex = PTHREAD_MUTEX_INITIALIZER; #endif /* HAVE_PTHREAD_H */ static cups_lang_t *lang_cache = NULL; /* Language string cache */ - - -/* - * Local functions... - */ - -#ifdef __APPLE__ -static const char *appleLangDefault(void); -#endif /* __APPLE__ */ -static cups_lang_t *cups_cache_lookup(const char *name, - cups_encoding_t encoding); -static int cups_message_compare(_cups_message_t *m1, - _cups_message_t *m2); -static void cups_unquote(char *d, const char *s); - - -/* - * Local globals... - */ - static const char * const lang_encodings[] = { /* Encoding strings */ "us-ascii", "iso-8859-1", @@ -155,6 +137,123 @@ static const char * const lang_encodings[] = "euc-kr", "euc-tw" }; +#ifdef __APPLE__ +typedef struct +{ + const char * const language; /* Language ID */ + const char * const locale; /* Locale ID */ +} _apple_language_locale_t; + +static const _apple_language_locale_t apple_language_locale[] = +{ /* Locale to language ID LUT */ + { "en" , "en_US" }, + { "nb" , "no" }, + { "zh-Hans" , "zh_CN" }, + { "zh-Hant" , "zh_TW" } +}; +#endif /* __APPLE__ */ + + +/* + * Local functions... + */ + +#ifdef __APPLE__ +static const char *appleLangDefault(void); +#endif /* __APPLE__ */ +static cups_lang_t *cups_cache_lookup(const char *name, + cups_encoding_t encoding); +static int cups_message_compare(_cups_message_t *m1, + _cups_message_t *m2); +static void cups_unquote(char *d, const char *s); + + +#ifdef __APPLE__ +/* + * _cupsAppleLanguage() - Get the Apple language identifier associated + * with a locale ID. + */ + +const char * /* O - Language ID */ +_cupsAppleLanguage(const char *locale, /* I - Locale ID */ + char *language,/* I - Language ID buffer */ + size_t langsize) /* I - Size of language ID buffer */ +{ + int i; /* Looping var */ + CFStringRef localeid, /* CF locale identifier */ + langid; /* CF language identifier */ + + + /* + * Copy the locale name and convert, as needed, to the Apple-specific + * locale identifier... + */ + + switch (strlen(locale)) + { + default : + /* + * Invalid locale... + */ + + strlcpy(language, "en", langsize); + break; + + case 2 : + strlcpy(language, locale, langsize); + break; + + case 5 : + strlcpy(language, locale, langsize); + + if (language[2] == '-') + { + /* + * Convert ll-cc to ll_CC... + */ + + language[2] = '_'; + language[3] = toupper(language[3] & 255); + language[4] = toupper(language[4] & 255); + } + break; + } + + for (i = 0; + i < (int)(sizeof(apple_language_locale) / + sizeof(apple_language_locale[0])); + i ++) + if (!strcmp(locale, apple_language_locale[i].locale)) + { + strlcpy(language, apple_language_locale[i].language, sizeof(language)); + break; + } + + /* + * Attempt to map the locale ID to a language ID... + */ + + if ((localeid = CFStringCreateWithCString(kCFAllocatorDefault, language, + kCFStringEncodingASCII)) != NULL) + { + if ((langid = CFLocaleCreateCanonicalLanguageIdentifierFromString( + kCFAllocatorDefault, localeid)) != NULL) + { + CFStringGetCString(langid, language, langsize, kCFStringEncodingASCII); + CFRelease(langid); + } + + CFRelease(localeid); + } + + /* + * Return what we got... + */ + + return (language); +} +#endif /* __APPLE__ */ + /* * '_cupsEncodingName()' - Return the character encoding name string @@ -973,30 +1072,6 @@ _cupsMessageLookup(cups_array_t *a, /* I - Message array */ #ifdef __APPLE__ -/* - * Code & data to translate OSX's language names to their ISO 639-1 locale. - * - * The first version uses the new CoreFoundation API added in 10.3 (Panther), - * the second is for 10.2 (Jaguar). - */ - -# ifdef HAVE_CF_LOCALE_ID - -typedef struct -{ - const char * const name; /* Language name */ - const char * const locale; /* Locale name */ -} _apple_name_locale_t; - -static const _apple_name_locale_t apple_name_locale[] = -{ - { "en" , "en_US" }, - { "nb" , "no" }, - { "zh-Hans" , "zh_CN" }, - { "zh-Hant" , "zh_TW" } -}; - - /* * 'appleLangDefault()' - Get the default locale string. */ @@ -1067,14 +1142,15 @@ appleLangDefault(void) */ for (i = 0; - i < sizeof(apple_name_locale) / sizeof(apple_name_locale[0]); - i++) + i < (int)(sizeof(apple_language_locale) / + sizeof(apple_language_locale[0])); + i ++) { - if (!strcmp(cg->language, apple_name_locale[i].name)) + if (!strcmp(cg->language, apple_language_locale[i].language)) { DEBUG_printf(("appleLangDefault: mapping \"%s\" to \"%s\"...\n", - cg->language, apple_name_locale[i].locale)); - strlcpy(cg->language, apple_name_locale[i].locale, + cg->language, apple_language_locale[i].locale)); + strlcpy(cg->language, apple_language_locale[i].locale, sizeof(cg->language)); break; } @@ -1110,166 +1186,6 @@ appleLangDefault(void) return (cg->language); } -# else -/* - * Code & data to translate OSX 10.2's language names to their ISO 639-1 - * locale. - */ - -typedef struct -{ - const char * const name; /* Language name */ - const char * const locale; /* Locale name */ -} _apple_name_locale_t; - -static const _apple_name_locale_t apple_name_locale[] = -{ - { "English" , "en_US.UTF-8" }, { "French" , "fr.UTF-8" }, - { "German" , "de.UTF-8" }, { "Italian" , "it.UTF-8" }, - { "Dutch" , "nl.UTF-8" }, { "Swedish" , "sv.UTF-8" }, - { "Spanish" , "es.UTF-8" }, { "Danish" , "da.UTF-8" }, - { "Portuguese" , "pt.UTF-8" }, { "Norwegian" , "no.UTF-8" }, - { "Hebrew" , "he.UTF-8" }, { "Japanese" , "ja.UTF-8" }, - { "Arabic" , "ar.UTF-8" }, { "Finnish" , "fi.UTF-8" }, - { "Greek" , "el.UTF-8" }, { "Icelandic" , "is.UTF-8" }, - { "Maltese" , "mt.UTF-8" }, { "Turkish" , "tr.UTF-8" }, - { "Croatian" , "hr.UTF-8" }, { "Chinese" , "zh.UTF-8" }, - { "Urdu" , "ur.UTF-8" }, { "Hindi" , "hi.UTF-8" }, - { "Thai" , "th.UTF-8" }, { "Korean" , "ko.UTF-8" }, - { "Lithuanian" , "lt.UTF-8" }, { "Polish" , "pl.UTF-8" }, - { "Hungarian" , "hu.UTF-8" }, { "Estonian" , "et.UTF-8" }, - { "Latvian" , "lv.UTF-8" }, { "Sami" , "se.UTF-8" }, - { "Faroese" , "fo.UTF-8" }, { "Farsi" , "fa.UTF-8" }, - { "Russian" , "ru.UTF-8" }, { "Chinese" , "zh.UTF-8" }, - { "Dutch" , "nl.UTF-8" }, { "Irish" , "ga.UTF-8" }, - { "Albanian" , "sq.UTF-8" }, { "Romanian" , "ro.UTF-8" }, - { "Czech" , "cs.UTF-8" }, { "Slovak" , "sk.UTF-8" }, - { "Slovenian" , "sl.UTF-8" }, { "Yiddish" , "yi.UTF-8" }, - { "Serbian" , "sr.UTF-8" }, { "Macedonian" , "mk.UTF-8" }, - { "Bulgarian" , "bg.UTF-8" }, { "Ukrainian" , "uk.UTF-8" }, - { "Byelorussian", "be.UTF-8" }, { "Uzbek" , "uz.UTF-8" }, - { "Kazakh" , "kk.UTF-8" }, { "Azerbaijani", "az.UTF-8" }, - { "Azerbaijani" , "az.UTF-8" }, { "Armenian" , "hy.UTF-8" }, - { "Georgian" , "ka.UTF-8" }, { "Moldavian" , "mo.UTF-8" }, - { "Kirghiz" , "ky.UTF-8" }, { "Tajiki" , "tg.UTF-8" }, - { "Turkmen" , "tk.UTF-8" }, { "Mongolian" , "mn.UTF-8" }, - { "Mongolian" , "mn.UTF-8" }, { "Pashto" , "ps.UTF-8" }, - { "Kurdish" , "ku.UTF-8" }, { "Kashmiri" , "ks.UTF-8" }, - { "Sindhi" , "sd.UTF-8" }, { "Tibetan" , "bo.UTF-8" }, - { "Nepali" , "ne.UTF-8" }, { "Sanskrit" , "sa.UTF-8" }, - { "Marathi" , "mr.UTF-8" }, { "Bengali" , "bn.UTF-8" }, - { "Assamese" , "as.UTF-8" }, { "Gujarati" , "gu.UTF-8" }, - { "Punjabi" , "pa.UTF-8" }, { "Oriya" , "or.UTF-8" }, - { "Malayalam" , "ml.UTF-8" }, { "Kannada" , "kn.UTF-8" }, - { "Tamil" , "ta.UTF-8" }, { "Telugu" , "te.UTF-8" }, - { "Sinhalese" , "si.UTF-8" }, { "Burmese" , "my.UTF-8" }, - { "Khmer" , "km.UTF-8" }, { "Lao" , "lo.UTF-8" }, - { "Vietnamese" , "vi.UTF-8" }, { "Indonesian" , "id.UTF-8" }, - { "Tagalog" , "tl.UTF-8" }, { "Malay" , "ms.UTF-8" }, - { "Malay" , "ms.UTF-8" }, { "Amharic" , "am.UTF-8" }, - { "Tigrinya" , "ti.UTF-8" }, { "Oromo" , "om.UTF-8" }, - { "Somali" , "so.UTF-8" }, { "Swahili" , "sw.UTF-8" }, - { "Kinyarwanda" , "rw.UTF-8" }, { "Rundi" , "rn.UTF-8" }, - { "Nyanja" , "" }, { "Malagasy" , "mg.UTF-8" }, - { "Esperanto" , "eo.UTF-8" }, { "Welsh" , "cy.UTF-8" }, - { "Basque" , "eu.UTF-8" }, { "Catalan" , "ca.UTF-8" }, - { "Latin" , "la.UTF-8" }, { "Quechua" , "qu.UTF-8" }, - { "Guarani" , "gn.UTF-8" }, { "Aymara" , "ay.UTF-8" }, - { "Tatar" , "tt.UTF-8" }, { "Uighur" , "ug.UTF-8" }, - { "Dzongkha" , "dz.UTF-8" }, { "Javanese" , "jv.UTF-8" }, - { "Sundanese" , "su.UTF-8" }, { "Galician" , "gl.UTF-8" }, - { "Afrikaans" , "af.UTF-8" }, { "Breton" , "br.UTF-8" }, - { "Inuktitut" , "iu.UTF-8" }, { "Scottish" , "gd.UTF-8" }, - { "Manx" , "gv.UTF-8" }, { "Irish" , "ga.UTF-8" }, - { "Tongan" , "to.UTF-8" }, { "Greek" , "el.UTF-8" }, - { "Greenlandic" , "kl.UTF-8" }, { "Azerbaijani", "az.UTF-8" } -}; - - -/* - * 'appleLangDefault()' - Get the default locale string. - */ - -static const char * /* O - Locale string */ -appleLangDefault(void) -{ - int i; /* Looping var */ - CFPropertyListRef localizationList; - /* List of localization data */ - CFStringRef localizationName; - /* Current name */ - char buff[256]; /* Temporary buffer */ - _cups_globals_t *cg = _cupsGlobals(); - /* Pointer to library globals */ - char *lang; /* LANG environment variable */ - - - /* - * Only do the lookup and translation the first time. - */ - - if (!cg->language[0]) - { - if ((lang = getenv("LANG"))) - strlcpy(cg->language, lang, sizeof(cg->language)); - else - { - localizationList = - CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), - kCFPreferencesCurrentApplication); - - if (localizationList != NULL) - { - if (CFGetTypeID(localizationList) == CFArrayGetTypeID() && - CFArrayGetCount(localizationList) > 0) - { - localizationName = CFArrayGetValueAtIndex(localizationList, 0); - - if (localizationName != NULL && - CFGetTypeID(localizationName) == CFStringGetTypeID()) - { - CFIndex length = CFStringGetLength(localizationName); - - if (length <= sizeof(buff) && - CFStringGetCString(localizationName, buff, sizeof(buff), - kCFStringEncodingASCII)) - { - buff[sizeof(buff) - 1] = '\0'; - - for (i = 0; - i < sizeof(apple_name_locale) / sizeof(apple_name_locale[0]); - i++) - { - if (!strcasecmp(buff, apple_name_locale[i].name)) - { - strlcpy(cg->language, apple_name_locale[i].locale, - sizeof(cg->language)); - break; - } - } - } - } - } - - CFRelease(localizationList); - } - } - - /* - * If we didn't find the language, default to en_US... - */ - - if (!cg->language[0]) - strlcpy(cg->language, apple_name_locale[0].locale, sizeof(cg->language)); - } - - /* - * Return the cached locale... - */ - - return (cg->language); -} -# endif /* HAVE_CF_LOCALE_ID */ #endif /* __APPLE__ */ diff --git a/cups/libcups.exp b/cups/libcups.exp index fdd5e775c..0dbb901d4 100644 --- a/cups/libcups.exp +++ b/cups/libcups.exp @@ -1,6 +1,7 @@ __cups_strcpy __cupsAdminGetServerSettings __cupsAdminSetServerSettings +__cupsAppleLanguage __cupsCharmapFlush __cupsCharmapFree __cupsCharmapGet diff --git a/cups/ppd.c b/cups/ppd.c index a2a7ef1a9..50ad5787f 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -463,6 +463,9 @@ 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 @@ -1015,44 +1018,14 @@ 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; @@ -1060,25 +1033,31 @@ ppdOpen2(cups_file_t *fp) /* I - File to read from */ goto error; } - /* - * Add the "custom" option... - */ + if (option && !strcasecmp(option->keyword, keyword + 6)) + custom_option = option; + else + custom_option = ppdFindOption(ppd, keyword + 6); - if ((choice = ppd_add_choice(option, "Custom")) == NULL) + if (custom_option) { - DEBUG_puts("Unable to add Custom choice!"); + /* + * Add the "custom" option... + */ - cg->ppd_status = PPD_ALLOC_ERROR; + if ((choice = ppd_add_choice(custom_option, "Custom")) == NULL) + { + DEBUG_puts("Unable to add Custom choice!"); - goto error; - } + cg->ppd_status = PPD_ALLOC_ERROR; - strlcpy(choice->text, text[0] ? text : _("Custom"), - sizeof(choice->text)); + goto error; + } - choice->code = string; - string = NULL; /* Don't add as an attribute below */ - option = NULL; + strlcpy(choice->text, text[0] ? text : _("Custom"), + sizeof(choice->text)); + + choice->code = _cupsStrAlloc(string); + } /* * Now process custom page sizes specially... @@ -1086,48 +1065,33 @@ ppdOpen2(cups_file_t *fp) /* I - File to read from */ if (!strcmp(keyword, "CustomPageSize")) { - ppd->variable_sizes = 1; - /* * Add a "Custom" page size entry... */ - ppd_add_size(ppd, "Custom"); + ppd->variable_sizes = 1; - if ((option = ppdFindOption(ppd, "PageRegion")) == NULL) - { - int groupidx = -1; /* Index to current group */ - ppd_group_t *gtemp; /* Temporary group */ + ppd_add_size(ppd, "Custom"); - if (group) - groupidx = group - ppd->groups; /* Save index for current group */ + if (option && !strcasecmp(option->keyword, "PageRegion")) + custom_option = option; + else + custom_option = ppdFindOption(ppd, "PageRegion"); - if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg, - encoding)) == NULL) + if (custom_option) + { + if ((choice = ppd_add_choice(custom_option, "Custom")) == NULL) { - DEBUG_puts("Unable to get general group!"); + DEBUG_puts("Unable to add Custom choice!"); + + cg->ppd_status = PPD_ALLOC_ERROR; goto error; } - if (group) - group = ppd->groups + groupidx; /* Restore group pointer */ - - option = ppd_get_option(gtemp, "PageRegion"); + strlcpy(choice->text, text[0] ? text : _("Custom"), + sizeof(choice->text)); } - - 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)); - option = NULL; } } else if (!strcmp(keyword, "LandscapeOrientation")) @@ -1310,6 +1274,33 @@ ppdOpen2(cups_file_t *fp) /* I - File to read from */ _cupsStrFree(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 = _cupsStrAlloc(custom_attr->value); + } } else if (!strcmp(keyword, "JCLOpenUI")) { @@ -1389,6 +1380,30 @@ ppdOpen2(cups_file_t *fp) /* I - File to read from */ _cupsStrFree(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 = _cupsStrAlloc(custom_attr->value); + } } else if (!strcmp(keyword, "CloseUI") || !strcmp(keyword, "JCLCloseUI")) { @@ -1451,8 +1466,7 @@ ppdOpen2(cups_file_t *fp) /* I - File to read from */ _cupsStrFree(string); string = NULL; } - else if (!strcmp(keyword, "OrderDependency") || - !strcmp(keyword, "NonUIOrderDependency")) + else if (!strcmp(keyword, "OrderDependency")) { order = (float)_cupsStrScand(string, &sptr, loc); diff --git a/cups/string.c b/cups/string.c index 40f3d7fd2..a20d0c507 100644 --- a/cups/string.c +++ b/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 */ - vconst char *t, /* I - Second string */ + const char *t, /* I - Second string */ size_t n) /* I - Maximum number of characters to compare */ { while (*s != '\0' && *t != '\0' && n > 0) diff --git a/cups/test.ppd b/cups/test.ppd index 77d42ecfc..05d36c010 100644 --- a/cups/test.ppd +++ b/cups/test.ppd @@ -95,6 +95,7 @@ *% Custom page size support *HWMargins: 0 0 0 0 +*NonUIOrderDependency: 100 AnySetup *CustomPageSize True *CustomPageSize True/Custom Page Size: "PageSize=Custom" *ParamCustomPageSize Width: 1 points 36 1080 *ParamCustomPageSize Height: 2 points 36 86400 @@ -103,7 +104,7 @@ *ParamCustomPageSize Orientation: 5 int 0 0 *OpenUI *InputSlot/Input Slot: PickOne -*OrderDependency: 10 AnySetup *InputSlot +*OrderDependency: 20 AnySetup *InputSlot *DefaultInputSlot: Tray *InputSlot Tray/Tray: "InputSlot=Tray" *InputSlot Manual/Manual Feed: "InputSlot=Manual" @@ -114,7 +115,7 @@ *OpenGroup: Extended/Extended Options *OpenUI IntOption/Integer: PickOne -*OrderDependency: 10 AnySetup *IntOption +*OrderDependency: 30 AnySetup *IntOption *DefaultIntOption: None *IntOption None: "" *IntOption 1: "IntOption=1" @@ -126,7 +127,7 @@ *ParamCustomIntOption Integer: 1 int -100 100 *OpenUI StringOption/String: PickOne -*OrderDependency: 10 AnySetup *StringOption +*OrderDependency: 40 AnySetup *StringOption *DefaultStringOption: None *StringOption None: "" *StringOption foo: "StringOption=foo" diff --git a/cups/testppd.c b/cups/testppd.c index dcd31d2cf..e88a12568 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -61,16 +61,6 @@ static const char *default_code = "} stopped cleartomark\n"; static const char *custom_code = - "[{\n" - "%%BeginFeature: *CustomPageSize True\n" - "400\n" - "500\n" - "0\n" - "0\n" - "0\n" - "PageSize=Custom\n" - "%%EndFeature\n" - "} stopped cleartomark\n" "[{\n" "%%BeginFeature: *InputSlot Tray\n" "InputSlot=Tray\n" @@ -83,6 +73,16 @@ static const char *custom_code = "[{\n" "%%BeginFeature: *StringOption None\n" "%%EndFeature\n" + "} stopped cleartomark\n" + "[{\n" + "%%BeginFeature: *CustomPageSize True\n" + "400\n" + "500\n" + "0\n" + "0\n" + "0\n" + "PageSize=Custom\n" + "%%EndFeature\n" "} stopped cleartomark\n"; diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html index 30854830e..29271625a 100644 --- a/doc/help/spec-ipp.html +++ b/doc/help/spec-ipp.html @@ -119,7 +119,7 @@ summary='Supported Operations'> Send a file for a print job. - Cancel-Job + Cancel-Job 1.0 0x0008 Cancel a print job. @@ -173,7 +173,7 @@ summary='Supported Operations'> Resume printing on a printer. - Purge-Jobs + Purge-Jobs 1.0 0x0012 Purge all jobs. @@ -555,6 +555,119 @@ Create-Job Response: Set-Job-Attributes Operation + +

The Cancel-Job operation (0x0008) cancels the specified job. CUPS 1.4 adds +a new purge-job (boolean) attribute that allows you to purge both +active and completed jobs, removing all history and document files for the +job as well. + +

Cancel-Job Request

+ +

The following groups of attributes are supplied as part of the +Set-Job-Attributes request: + +

Group 1: Operation Attributes + +

+ +
Natural Language and Character Set: + +
The "attributes-charset" and "attributes-natural-language" + attributes as described in section 3.1.4.1 of the IPP Model and + Semantics document. + +
"printer-uri" (uri) and "job-id" (integer) +
OR +
"job-uri": + +
The client MUST supply a URI for the specified printer and + a job ID number, or the job URI. + +
CUPS 1.4"purge-job" (boolean): + +
The client OPTIONALLY supplies this attribute. When true, + all job files (history and document) are purged. The default + is false, leading to the standard IPP behavior. + +
+ +

Cancel-Job Response

+ +

The following groups of attributes are send as part of the Cancel-Job +Response: + +

Group 1: Operation Attributes + +

+ +
Status Message: + +
The standard response status message. + +
Natural Language and Character Set: + +
The "attributes-charset" and "attributes-natural-language" + attributes as described in section 3.1.4.2 of the IPP Model and + Semantics document. + +
+ +

Purge-Jobs Operation

+ +

The Purge-Jobs operation (0x0012) cancels all of the jobs on a +given destination and optionally removes all history and document +files for the jobs as well. + +

Purge-Jobs Request

+ +

The following groups of attributes are supplied as part of the +Purge-Jobs request: + +

Group 1: Operation Attributes + +

+ +
Natural Language and Character Set: + +
The "attributes-charset" and "attributes-natural-language" + attributes as described in section 3.1.4.1 of the IPP Model and + Semantics document. + +
"printer-uri" (uri): + +
The client MUST supply a URI for the specified printer or + "ipp://.../printers" for all printers and classes. + +
CUPS 1.2"purge-jobs" (boolean): + +
The client OPTIONALLY supplies this attribute to specify + whether the jobs are purged (true) or just canceled (false). + The default is true. + +
+ +

Purge-Jobs Response

+ +

The following groups of attributes are send as part of the Purge-Jobs +Response: + +

Group 1: Operation Attributes + +

+ +
Status Message: + +
The standard response status message. + +
Natural Language and Character Set: + +
The "attributes-charset" and "attributes-natural-language" + attributes as described in section 3.1.4.2 of the IPP Model and + Semantics document. + +
+

CUPS 1.1Set-Job-Attributes Operation

The Set-Job-Attributes operation (0x0014) changes the attributes of diff --git a/doc/index.html.in b/doc/index.html.in index 223f7a2bc..fa40ee272 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -77,8 +77,8 @@ assistance:

  The Common UNIX Printing System, CUPS, and the CUPS logo are the trademark property of -Apple, Inc. CUPS is copyright 2007 by Apple -Inc, all rights reserved. +Apple Inc. CUPS is copyright 2007 by Apple +Inc., all rights reserved. diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 8198efa7a..ba8a2b1b5 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -409,7 +409,6 @@ f 0644 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po %subpackage pt f 0644 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po f 0644 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po -f 0644 root sys $LOCALEDIR/pt_PT/cups_pt_PT.po locale/cups_pt_PT.po %subpackage ru f 0644 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po %subpackage sv @@ -553,37 +552,37 @@ f 0644 root sys $DOCDIR/images doc/images/*.png f 0644 root sys $DOCDIR/robots.txt doc/robots.txt # Localized documentation files -%subpackage de -d 0755 root sys $DOCDIR/de -f 0644 root sys $DOCDIR/de doc/de/*.html -%subpackage es -d 0755 root sys $DOCDIR/es -f 0644 root sys $DOCDIR/es doc/es/*.html -%subpackage et -d 0755 root sys $DOCDIR/et -f 0644 root sys $DOCDIR/et doc/et/*.html -%subpackage fr -d 0755 root sys $DOCDIR/fr -f 0644 root sys $DOCDIR/fr doc/fr/*.html -%subpackage he -d 0755 root sys $DOCDIR/he -f 0644 root sys $DOCDIR/he doc/he/*.html -f 0644 root sys $DOCDIR/he/cups.css doc/he/cups.css -%subpackage it -d 0755 root sys $DOCDIR/it -f 0644 root sys $DOCDIR/it doc/it/*.html -%subpackage ja -d 0755 root sys $DOCDIR/ja -f 0644 root sys $DOCDIR/ja doc/ja/*.html -%subpackage pl -d 0755 root sys $DOCDIR/pl -f 0644 root sys $DOCDIR/pl doc/pl/*.html -%subpackage sv -d 0755 root sys $DOCDIR/sv -f 0644 root sys $DOCDIR/sv doc/sv/*.html -%subpackage zh -d 0755 root sys $DOCDIR/zh_TW -f 0644 root sys $DOCDIR/zh_TW doc/zh_TW/*.html +#%subpackage de +#d 0755 root sys $DOCDIR/de +#f 0644 root sys $DOCDIR/de doc/de/*.html +#%subpackage es +#d 0755 root sys $DOCDIR/es +#f 0644 root sys $DOCDIR/es doc/es/*.html +#%subpackage et +#d 0755 root sys $DOCDIR/et +#f 0644 root sys $DOCDIR/et doc/et/*.html +#%subpackage fr +#d 0755 root sys $DOCDIR/fr +#f 0644 root sys $DOCDIR/fr doc/fr/*.html +#%subpackage he +#d 0755 root sys $DOCDIR/he +#f 0644 root sys $DOCDIR/he doc/he/*.html +#f 0644 root sys $DOCDIR/he/cups.css doc/he/cups.css +#%subpackage it +#d 0755 root sys $DOCDIR/it +#f 0644 root sys $DOCDIR/it doc/it/*.html +#%subpackage ja +#d 0755 root sys $DOCDIR/ja +#f 0644 root sys $DOCDIR/ja doc/ja/*.html +#%subpackage pl +#d 0755 root sys $DOCDIR/pl +#f 0644 root sys $DOCDIR/pl doc/pl/*.html +#%subpackage sv +#d 0755 root sys $DOCDIR/sv +#f 0644 root sys $DOCDIR/sv doc/sv/*.html +#%subpackage zh +#d 0755 root sys $DOCDIR/zh_TW +#f 0644 root sys $DOCDIR/zh_TW doc/zh_TW/*.html %subpackage # Man pages diff --git a/pdftops/Stream.cxx b/pdftops/Stream.cxx index bc06938b9..40819ae5f 100644 --- a/pdftops/Stream.cxx +++ b/pdftops/Stream.cxx @@ -1274,23 +1274,26 @@ CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA, columns = columnsA; if (columns < 1) { columns = 1; - } - if (columns + 4 <= 0) { - columns = INT_MAX - 4; + } else if (columns > INT_MAX - 2) { + columns = INT_MAX - 2; } rows = rowsA; endOfBlock = endOfBlockA; black = blackA; - refLine = (short *)gmallocn(columns + 4, sizeof(short)); - codingLine = (short *)gmallocn(columns + 3, sizeof(short)); + // 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)); eof = gFalse; row = 0; nextLine2D = encoding < 0; inputBits = 0; - codingLine[0] = 0; - codingLine[1] = refLine[2] = columns; - a0 = 1; + codingLine[0] = columns; + a0i = 1; + outputBits = 0; buf = EOF; } @@ -1309,9 +1312,9 @@ void CCITTFaxStream::reset() { row = 0; nextLine2D = encoding < 0; inputBits = 0; - codingLine[0] = 0; - codingLine[1] = refLine[2] = columns; - a0 = 1; + codingLine[0] = columns; + a0i = 1; + outputBits = 0; buf = EOF; // skip any initial zero bits and end-of-line marker, and get the 2D @@ -1328,163 +1331,228 @@ 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 a0New; - GBool err, gotEOL; - int ret; - int bits, i; + int b1i, blackPixels, i, bits; + GBool gotEOL; - // if at eof just return EOF - if (eof && codingLine[a0] >= columns) { - return EOF; + if (buf != EOF) { + return buf; } // read the next row - err = gFalse; - if (codingLine[a0] >= columns) { + if (outputBits == 0) { + + // if at eof just return EOF + if (eof) { + return EOF; + } + + err = gFalse; // 2-D encoding if (nextLine2D) { for (i = 0; codingLine[i] < columns; ++i) refLine[i] = codingLine[i]; - refLine[i] = refLine[i + 1] = columns; - b1 = 1; - a0New = codingLine[a0 = 0] = 0; - do { + 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) { code1 = getTwoDimCode(); switch (code1) { case twoDimPass: - if (refLine[b1] < columns) { - a0New = refLine[b1 + 1]; - b1 += 2; + addPixels(refLine[b1i + 1], blackPixels); + if (refLine[b1i + 1] < columns) { + b1i += 2; } break; case twoDimHoriz: - if ((a0 & 1) == 0) { - code1 = code2 = 0; + code1 = code2 = 0; + if (blackPixels) { do { - code1 += code3 = getWhiteCode(); + code1 += code3 = getBlackCode(); } while (code3 >= 64); do { - code2 += code3 = getBlackCode(); + code2 += code3 = getWhiteCode(); } while (code3 >= 64); } else { - code1 = code2 = 0; do { - code1 += code3 = getBlackCode(); + code1 += code3 = getWhiteCode(); } while (code3 >= 64); do { - code2 += code3 = getWhiteCode(); + code2 += code3 = getBlackCode(); } while (code3 >= 64); } - 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; + 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 twoDimVert0: - a0New = codingLine[++a0] = refLine[b1]; - if (refLine[b1] < columns) { - ++b1; - while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) - b1 += 2; + 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 twoDimVertR1: - a0New = codingLine[++a0] = refLine[b1] + 1; - if (refLine[b1] < columns) { - ++b1; - while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) - b1 += 2; + 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 twoDimVertL1: - if (a0 == 0 || refLine[b1] - 1 > a0New) { - a0New = codingLine[++a0] = refLine[b1] - 1; - --b1; - while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) - b1 += 2; + case twoDimVertR1: + addPixels(refLine[b1i] + 1, blackPixels); + blackPixels ^= 1; + if (codingLine[a0i] < columns) { + ++b1i; + while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { + b1i += 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; + case twoDimVert0: + addPixels(refLine[b1i], blackPixels); + blackPixels ^= 1; + if (codingLine[a0i] < columns) { + ++b1i; + while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { + b1i += 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; + 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 twoDimVertR3: - a0New = codingLine[++a0] = refLine[b1] + 3; - if (refLine[b1] < columns) { - ++b1; - while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns) - b1 += 2; + 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; + } } 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; + 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; + } } break; case EOF: + addPixels(columns, 0); eof = gTrue; - codingLine[a0 = 0] = columns; - return EOF; + break; 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[a0 = 0] = 0; - while (1) { + codingLine[0] = 0; + a0i = 0; + blackPixels = 0; + while (codingLine[a0i] < columns) { code1 = 0; - 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; + if (blackPixels) { + do { + code1 += code3 = getBlackCode(); + } while (code3 >= 64); + } else { + do { + code1 += code3 = getWhiteCode(); + } while (code3 >= 64); + } + addPixels(codingLine[a0i] + code1, blackPixels); + blackPixels ^= 1; } - codingLine[++a0] = columns; - err = gTrue; } // byte-align the row @@ -1545,14 +1613,17 @@ 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) { - do { + while (1) { + code1 = lookBits(13); 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); @@ -1560,11 +1631,11 @@ int CCITTFaxStream::lookChar() { } } - a0 = 0; - outputBits = codingLine[1] - codingLine[0]; - if (outputBits == 0) { - a0 = 1; - outputBits = codingLine[2] - codingLine[1]; + // set up for output + if (codingLine[0] > 0) { + outputBits = codingLine[a0i = 0]; + } else { + outputBits = codingLine[a0i = 1]; } ++row; @@ -1572,39 +1643,43 @@ int CCITTFaxStream::lookChar() { // get a byte if (outputBits >= 8) { - ret = ((a0 & 1) == 0) ? 0xff : 0x00; - if ((outputBits -= 8) == 0) { - ++a0; - if (codingLine[a0] < columns) { - outputBits = codingLine[a0 + 1] - codingLine[a0]; - } + buf = (a0i & 1) ? 0x00 : 0xff; + outputBits -= 8; + if (outputBits == 0 && codingLine[a0i] < columns) { + ++a0i; + outputBits = codingLine[a0i] - codingLine[a0i - 1]; } } else { bits = 8; - ret = 0; + buf = 0; do { if (outputBits > bits) { - i = bits; - bits = 0; - if ((a0 & 1) == 0) { - ret |= 0xff >> (8 - i); + buf <<= bits; + if (!(a0i & 1)) { + buf |= 0xff >> (8 - bits); } - outputBits -= i; + outputBits -= bits; + bits = 0; } else { - i = outputBits; - bits -= outputBits; - if ((a0 & 1) == 0) { - ret |= (0xff >> (8 - i)) << bits; + buf <<= outputBits; + if (!(a0i & 1)) { + buf |= 0xff >> (8 - outputBits); } + bits -= outputBits; outputBits = 0; - ++a0; - if (codingLine[a0] < columns) { - outputBits = codingLine[a0 + 1] - codingLine[a0]; + if (codingLine[a0i] < columns) { + ++a0i; + outputBits = codingLine[a0i] - codingLine[a0i - 1]; + } else if (bits > 0) { + buf <<= bits; + bits = 0; } } - } while (bits > 0 && codingLine[a0] < columns); + } while (bits); + } + if (black) { + buf ^= 0xff; } - buf = black ? (ret ^ 0xff) : ret; return buf; } @@ -1646,6 +1721,9 @@ 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 { @@ -1658,6 +1736,9 @@ short CCITTFaxStream::getWhiteCode() { } else { for (n = 1; n <= 9; ++n) { code = lookBits(n); + if (code == EOF) { + return 1; + } if (n < 9) { code <<= 9 - n; } @@ -1669,6 +1750,9 @@ short CCITTFaxStream::getWhiteCode() { } for (n = 11; n <= 12; ++n) { code = lookBits(n); + if (code == EOF) { + return 1; + } if (n < 12) { code <<= 12 - n; } @@ -1694,9 +1778,12 @@ 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) { + } else if ((code >> 9) == 0 && (code >> 7) != 0) { p = &blackTab2[(code >> 1) - 64]; } else { p = &blackTab3[code >> 7]; @@ -1708,6 +1795,9 @@ short CCITTFaxStream::getBlackCode() { } else { for (n = 2; n <= 6; ++n) { code = lookBits(n); + if (code == EOF) { + return 1; + } if (n < 6) { code <<= 6 - n; } @@ -1719,6 +1809,9 @@ short CCITTFaxStream::getBlackCode() { } for (n = 7; n <= 12; ++n) { code = lookBits(n); + if (code == EOF) { + return 1; + } if (n < 12) { code <<= 12 - n; } @@ -1732,6 +1825,9 @@ short CCITTFaxStream::getBlackCode() { } for (n = 10; n <= 13; ++n) { code = lookBits(n); + if (code == EOF) { + return 1; + } if (n < 13) { code <<= 13 - n; } @@ -1954,6 +2050,12 @@ 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)); @@ -3015,6 +3117,11 @@ 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; diff --git a/pdftops/Stream.h b/pdftops/Stream.h index e26e67cc1..c06d9433b 100644 --- a/pdftops/Stream.h +++ b/pdftops/Stream.h @@ -519,13 +519,15 @@ private: int row; // current row int inputBuf; // input buffer int inputBits; // number of bits in input buffer - short *refLine; // reference line changing elements - int b1; // index into refLine - short *codingLine; // coding line changing elements - int a0; // index into codingLine + int *codingLine; // coding line changing elements + int *refLine; // reference line changing elements + int a0i; // index into codingLine + GBool err; // error on current line 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(); diff --git a/ppd/deskjet.ppd b/ppd/deskjet.ppd index ea6acbe2f..ab8741d39 100644 --- a/ppd/deskjet.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "DESKJET.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "HP" *ModelName: "HP DeskJet Series" *ShortNickName: "HP DeskJet Series" -*NickName: "HP DeskJet Series, 1.3" +*NickName: "HP DeskJet Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 1 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertohp" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *UIConstraints: *PageSize A3 *InputSlot Envelope *UIConstraints: *InputSlot Envelope *PageSize A3 *UIConstraints: *PageSize A4 *InputSlot Envelope @@ -149,7 +149,7 @@ *da.Translation Manufacturer/HP: "" *da.Translation ModelName/HP DeskJet Series: "" *da.Translation ShortNickName/HP DeskJet Series: "" -*da.Translation NickName/HP DeskJet Series, 1.3: "" +*da.Translation NickName/HP DeskJet Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -185,7 +185,7 @@ *de.Translation Manufacturer/HP: "" *de.Translation ModelName/HP DeskJet Series: "" *de.Translation ShortNickName/HP DeskJet Series: "" -*de.Translation NickName/HP DeskJet Series, 1.3: "" +*de.Translation NickName/HP DeskJet Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -221,7 +221,7 @@ *es.Translation Manufacturer/HP: "" *es.Translation ModelName/HP DeskJet Series: "" *es.Translation ShortNickName/HP DeskJet Series: "" -*es.Translation NickName/HP DeskJet Series, 1.3: "" +*es.Translation NickName/HP DeskJet Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -257,7 +257,7 @@ *fi.Translation Manufacturer/HP: "" *fi.Translation ModelName/HP DeskJet Series: "" *fi.Translation ShortNickName/HP DeskJet Series: "" -*fi.Translation NickName/HP DeskJet Series, 1.3: "" +*fi.Translation NickName/HP DeskJet Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -293,7 +293,7 @@ *fr.Translation Manufacturer/HP: "" *fr.Translation ModelName/HP DeskJet Series: "" *fr.Translation ShortNickName/HP DeskJet Series: "" -*fr.Translation NickName/HP DeskJet Series, 1.3: "" +*fr.Translation NickName/HP DeskJet Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -329,7 +329,7 @@ *it.Translation Manufacturer/HP: "" *it.Translation ModelName/HP DeskJet Series: "" *it.Translation ShortNickName/HP DeskJet Series: "" -*it.Translation NickName/HP DeskJet Series, 1.3: "" +*it.Translation NickName/HP DeskJet Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -365,7 +365,7 @@ *ja.Translation Manufacturer/HP: "" *ja.Translation ModelName/HP DeskJet Series: "" *ja.Translation ShortNickName/HP DeskJet Series: "" -*ja.Translation NickName/HP DeskJet Series, 1.3: "" +*ja.Translation NickName/HP DeskJet Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -401,8 +401,8 @@ *ko.Translation Manufacturer/HP: "" *ko.Translation ModelName/HP DeskJet Series: "" *ko.Translation ShortNickName/HP DeskJet Series: "" -*ko.Translation NickName/HP DeskJet Series, 1.3: "" -*ko.Translation PageSize/Media Size: "" +*ko.Translation NickName/HP DeskJet Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize Executive/Executive - 7.25x10.5in: "" @@ -437,7 +437,7 @@ *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 NickName/HP DeskJet Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -473,7 +473,7 @@ *no.Translation Manufacturer/HP: "" *no.Translation ModelName/HP DeskJet Series: "" *no.Translation ShortNickName/HP DeskJet Series: "" -*no.Translation NickName/HP DeskJet Series, 1.3: "" +*no.Translation NickName/HP DeskJet Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -509,7 +509,7 @@ *pt.Translation Manufacturer/HP: "" *pt.Translation ModelName/HP DeskJet Series: "" *pt.Translation ShortNickName/HP DeskJet Series: "" -*pt.Translation NickName/HP DeskJet Series, 1.3: "" +*pt.Translation NickName/HP DeskJet Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -545,7 +545,7 @@ *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 NickName/HP DeskJet Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -578,46 +578,10 @@ *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: "" -*sv.Translation NickName/HP DeskJet Series, 1.3: "" +*sv.Translation NickName/HP DeskJet Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -653,8 +617,8 @@ *zh.Translation Manufacturer/HP: "" *zh.Translation ModelName/HP DeskJet Series: "" *zh.Translation ShortNickName/HP DeskJet Series: "" -*zh.Translation NickName/HP DeskJet Series, 1.3: "" -*zh.Translation PageSize/Media Size: "" +*zh.Translation NickName/HP DeskJet Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize Executive/Executive - 7.25x10.5in: "" @@ -689,8 +653,8 @@ *zh_TW.Translation Manufacturer/HP: "" *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/Media Size: "" +*zh_TW.Translation NickName/HP DeskJet Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize Executive/Executive - 7.25x10.5in: "" @@ -758,4 +722,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, 34458 bytes. +*% End of DESKJET.PPD, 32862 bytes. diff --git a/ppd/dymo.ppd b/ppd/dymo.ppd index bab653d6f..378c22dcd 100644 --- a/ppd/dymo.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "DYMO.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Dymo" *ModelName: "Dymo Label Printer" *ShortNickName: "Dymo Label Printer" -*NickName: "Dymo Label Printer, 1.3" +*NickName: "Dymo Label Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 0 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertolabel" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: w81h252 @@ -100,7 +100,7 @@ *da.Translation Manufacturer/Dymo: "" *da.Translation ModelName/Dymo Label Printer: "" *da.Translation ShortNickName/Dymo Label Printer: "" -*da.Translation NickName/Dymo Label Printer, 1.3: "" +*da.Translation NickName/Dymo Label Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *da.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -123,7 +123,7 @@ *de.Translation Manufacturer/Dymo: "" *de.Translation ModelName/Dymo Label Printer: "" *de.Translation ShortNickName/Dymo Label Printer: "" -*de.Translation NickName/Dymo Label Printer, 1.3: "" +*de.Translation NickName/Dymo Label Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *de.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -146,7 +146,7 @@ *es.Translation Manufacturer/Dymo: "" *es.Translation ModelName/Dymo Label Printer: "" *es.Translation ShortNickName/Dymo Label Printer: "" -*es.Translation NickName/Dymo Label Printer, 1.3: "" +*es.Translation NickName/Dymo Label Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *es.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -169,7 +169,7 @@ *fi.Translation Manufacturer/Dymo: "" *fi.Translation ModelName/Dymo Label Printer: "" *fi.Translation ShortNickName/Dymo Label Printer: "" -*fi.Translation NickName/Dymo Label Printer, 1.3: "" +*fi.Translation NickName/Dymo Label Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *fi.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -192,7 +192,7 @@ *fr.Translation Manufacturer/Dymo: "" *fr.Translation ModelName/Dymo Label Printer: "" *fr.Translation ShortNickName/Dymo Label Printer: "" -*fr.Translation NickName/Dymo Label Printer, 1.3: "" +*fr.Translation NickName/Dymo Label Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *fr.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -215,7 +215,7 @@ *it.Translation Manufacturer/Dymo: "" *it.Translation ModelName/Dymo Label Printer: "" *it.Translation ShortNickName/Dymo Label Printer: "" -*it.Translation NickName/Dymo Label Printer, 1.3: "" +*it.Translation NickName/Dymo Label Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *it.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -238,7 +238,7 @@ *ja.Translation Manufacturer/Dymo: "" *ja.Translation ModelName/Dymo Label Printer: "" *ja.Translation ShortNickName/Dymo Label Printer: "" -*ja.Translation NickName/Dymo Label Printer, 1.3: "" +*ja.Translation NickName/Dymo Label Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *ja.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -261,8 +261,8 @@ *ko.Translation Manufacturer/Dymo: "" *ko.Translation ModelName/Dymo Label Printer: "" *ko.Translation ShortNickName/Dymo Label Printer: "" -*ko.Translation NickName/Dymo Label Printer, 1.3: "" -*ko.Translation PageSize/Media Size: "" +*ko.Translation NickName/Dymo Label Printer, 1.4: "" +*ko.Translation PageSize/Page 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: "" @@ -284,7 +284,7 @@ *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 NickName/Dymo Label Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *nl.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -307,7 +307,7 @@ *no.Translation Manufacturer/Dymo: "" *no.Translation ModelName/Dymo Label Printer: "" *no.Translation ShortNickName/Dymo Label Printer: "" -*no.Translation NickName/Dymo Label Printer, 1.3: "" +*no.Translation NickName/Dymo Label Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *no.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -330,7 +330,7 @@ *pt.Translation Manufacturer/Dymo: "" *pt.Translation ModelName/Dymo Label Printer: "" *pt.Translation ShortNickName/Dymo Label Printer: "" -*pt.Translation NickName/Dymo Label Printer, 1.3: "" +*pt.Translation NickName/Dymo Label Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *pt.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -353,7 +353,7 @@ *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 NickName/Dymo Label Printer, 1.4: "" *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: "" @@ -373,33 +373,10 @@ *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: "" -*sv.Translation NickName/Dymo Label Printer, 1.3: "" +*sv.Translation NickName/Dymo Label Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize w81h252/Address - 1 1/8x3 1/2in: "" *sv.PageSize w101h252/Large Address - 1 4/10x3 1/2in: "" @@ -422,8 +399,8 @@ *zh.Translation Manufacturer/Dymo: "" *zh.Translation ModelName/Dymo Label Printer: "" *zh.Translation ShortNickName/Dymo Label Printer: "" -*zh.Translation NickName/Dymo Label Printer, 1.3: "" -*zh.Translation PageSize/Media Size: "" +*zh.Translation NickName/Dymo Label Printer, 1.4: "" +*zh.Translation PageSize/Page 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: "" @@ -445,8 +422,8 @@ *zh_TW.Translation Manufacturer/Dymo: "" *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/Media Size: "" +*zh_TW.Translation NickName/Dymo Label Printer, 1.4: "" +*zh_TW.Translation PageSize/Page 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: "" @@ -501,4 +478,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, 24761 bytes. +*% End of DYMO.PPD, 23640 bytes. diff --git a/ppd/epson24.ppd b/ppd/epson24.ppd index 25b23c55a..f373ed3ad 100644 --- a/ppd/epson24.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "EPSON24.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Epson" *ModelName: "Epson 24-Pin Series" *ShortNickName: "Epson 24-Pin Series" -*NickName: "Epson 24-Pin Series, 1.3" +*NickName: "Epson 24-Pin Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 1 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -83,7 +83,7 @@ *da.Translation Manufacturer/Epson: "" *da.Translation ModelName/Epson 24-Pin Series: "" *da.Translation ShortNickName/Epson 24-Pin Series: "" -*da.Translation NickName/Epson 24-Pin Series, 1.3: "" +*da.Translation NickName/Epson 24-Pin Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -98,7 +98,7 @@ *de.Translation Manufacturer/Epson: "" *de.Translation ModelName/Epson 24-Pin Series: "" *de.Translation ShortNickName/Epson 24-Pin Series: "" -*de.Translation NickName/Epson 24-Pin Series, 1.3: "" +*de.Translation NickName/Epson 24-Pin Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -113,7 +113,7 @@ *es.Translation Manufacturer/Epson: "" *es.Translation ModelName/Epson 24-Pin Series: "" *es.Translation ShortNickName/Epson 24-Pin Series: "" -*es.Translation NickName/Epson 24-Pin Series, 1.3: "" +*es.Translation NickName/Epson 24-Pin Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -128,7 +128,7 @@ *fi.Translation Manufacturer/Epson: "" *fi.Translation ModelName/Epson 24-Pin Series: "" *fi.Translation ShortNickName/Epson 24-Pin Series: "" -*fi.Translation NickName/Epson 24-Pin Series, 1.3: "" +*fi.Translation NickName/Epson 24-Pin Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -143,7 +143,7 @@ *fr.Translation Manufacturer/Epson: "" *fr.Translation ModelName/Epson 24-Pin Series: "" *fr.Translation ShortNickName/Epson 24-Pin Series: "" -*fr.Translation NickName/Epson 24-Pin Series, 1.3: "" +*fr.Translation NickName/Epson 24-Pin Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -158,7 +158,7 @@ *it.Translation Manufacturer/Epson: "" *it.Translation ModelName/Epson 24-Pin Series: "" *it.Translation ShortNickName/Epson 24-Pin Series: "" -*it.Translation NickName/Epson 24-Pin Series, 1.3: "" +*it.Translation NickName/Epson 24-Pin Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -173,7 +173,7 @@ *ja.Translation Manufacturer/Epson: "" *ja.Translation ModelName/Epson 24-Pin Series: "" *ja.Translation ShortNickName/Epson 24-Pin Series: "" -*ja.Translation NickName/Epson 24-Pin Series, 1.3: "" +*ja.Translation NickName/Epson 24-Pin Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -188,8 +188,8 @@ *ko.Translation Manufacturer/Epson: "" *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/Media Size: "" +*ko.Translation NickName/Epson 24-Pin Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -203,7 +203,7 @@ *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 NickName/Epson 24-Pin Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -218,7 +218,7 @@ *no.Translation Manufacturer/Epson: "" *no.Translation ModelName/Epson 24-Pin Series: "" *no.Translation ShortNickName/Epson 24-Pin Series: "" -*no.Translation NickName/Epson 24-Pin Series, 1.3: "" +*no.Translation NickName/Epson 24-Pin Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -233,7 +233,7 @@ *pt.Translation Manufacturer/Epson: "" *pt.Translation ModelName/Epson 24-Pin Series: "" *pt.Translation ShortNickName/Epson 24-Pin Series: "" -*pt.Translation NickName/Epson 24-Pin Series, 1.3: "" +*pt.Translation NickName/Epson 24-Pin Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -248,7 +248,7 @@ *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 NickName/Epson 24-Pin Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -260,25 +260,10 @@ *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: "" -*sv.Translation NickName/Epson 24-Pin Series, 1.3: "" +*sv.Translation NickName/Epson 24-Pin Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -293,8 +278,8 @@ *zh.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh.Translation NickName/Epson 24-Pin Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -308,8 +293,8 @@ *zh_TW.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh_TW.Translation NickName/Epson 24-Pin Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -356,4 +341,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, 16375 bytes. +*% End of EPSON24.PPD, 15694 bytes. diff --git a/ppd/epson9.ppd b/ppd/epson9.ppd index f32ce9549..58779800f 100644 --- a/ppd/epson9.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "EPSON9.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Epson" *ModelName: "Epson 9-Pin Series" *ShortNickName: "Epson 9-Pin Series" -*NickName: "Epson 9-Pin Series, 1.3" +*NickName: "Epson 9-Pin Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 0 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -81,7 +81,7 @@ *da.Translation Manufacturer/Epson: "" *da.Translation ModelName/Epson 9-Pin Series: "" *da.Translation ShortNickName/Epson 9-Pin Series: "" -*da.Translation NickName/Epson 9-Pin Series, 1.3: "" +*da.Translation NickName/Epson 9-Pin Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -94,7 +94,7 @@ *de.Translation Manufacturer/Epson: "" *de.Translation ModelName/Epson 9-Pin Series: "" *de.Translation ShortNickName/Epson 9-Pin Series: "" -*de.Translation NickName/Epson 9-Pin Series, 1.3: "" +*de.Translation NickName/Epson 9-Pin Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -107,7 +107,7 @@ *es.Translation Manufacturer/Epson: "" *es.Translation ModelName/Epson 9-Pin Series: "" *es.Translation ShortNickName/Epson 9-Pin Series: "" -*es.Translation NickName/Epson 9-Pin Series, 1.3: "" +*es.Translation NickName/Epson 9-Pin Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -120,7 +120,7 @@ *fi.Translation Manufacturer/Epson: "" *fi.Translation ModelName/Epson 9-Pin Series: "" *fi.Translation ShortNickName/Epson 9-Pin Series: "" -*fi.Translation NickName/Epson 9-Pin Series, 1.3: "" +*fi.Translation NickName/Epson 9-Pin Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -133,7 +133,7 @@ *fr.Translation Manufacturer/Epson: "" *fr.Translation ModelName/Epson 9-Pin Series: "" *fr.Translation ShortNickName/Epson 9-Pin Series: "" -*fr.Translation NickName/Epson 9-Pin Series, 1.3: "" +*fr.Translation NickName/Epson 9-Pin Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -146,7 +146,7 @@ *it.Translation Manufacturer/Epson: "" *it.Translation ModelName/Epson 9-Pin Series: "" *it.Translation ShortNickName/Epson 9-Pin Series: "" -*it.Translation NickName/Epson 9-Pin Series, 1.3: "" +*it.Translation NickName/Epson 9-Pin Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -159,7 +159,7 @@ *ja.Translation Manufacturer/Epson: "" *ja.Translation ModelName/Epson 9-Pin Series: "" *ja.Translation ShortNickName/Epson 9-Pin Series: "" -*ja.Translation NickName/Epson 9-Pin Series, 1.3: "" +*ja.Translation NickName/Epson 9-Pin Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -172,8 +172,8 @@ *ko.Translation Manufacturer/Epson: "" *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/Media Size: "" +*ko.Translation NickName/Epson 9-Pin Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -185,7 +185,7 @@ *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 NickName/Epson 9-Pin Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -198,7 +198,7 @@ *no.Translation Manufacturer/Epson: "" *no.Translation ModelName/Epson 9-Pin Series: "" *no.Translation ShortNickName/Epson 9-Pin Series: "" -*no.Translation NickName/Epson 9-Pin Series, 1.3: "" +*no.Translation NickName/Epson 9-Pin Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -211,7 +211,7 @@ *pt.Translation Manufacturer/Epson: "" *pt.Translation ModelName/Epson 9-Pin Series: "" *pt.Translation ShortNickName/Epson 9-Pin Series: "" -*pt.Translation NickName/Epson 9-Pin Series, 1.3: "" +*pt.Translation NickName/Epson 9-Pin Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -224,7 +224,7 @@ *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 NickName/Epson 9-Pin Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -234,23 +234,10 @@ *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: "" -*sv.Translation NickName/Epson 9-Pin Series, 1.3: "" +*sv.Translation NickName/Epson 9-Pin Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -263,8 +250,8 @@ *zh.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh.Translation NickName/Epson 9-Pin Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -276,8 +263,8 @@ *zh_TW.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh_TW.Translation NickName/Epson 9-Pin Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -322,4 +309,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, 14929 bytes. +*% End of EPSON9.PPD, 14325 bytes. diff --git a/ppd/generic.ppd b/ppd/generic.ppd index 5d55f1b64..8227af84f 100644 --- a/ppd/generic.ppd +++ b/ppd/generic.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% PPD file for PostScript Printer with CUPS. -*% Created by the CUPS PPD Compiler v1.2.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "GENERIC.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Generic" *ModelName: "Generic PostScript Printer" *ShortNickName: "Generic PostScript Printer" -*NickName: "Generic PostScript Printer, 1.3" +*NickName: "Generic PostScript Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *PSVersion: "(2016.0) 0" @@ -31,7 +31,7 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *UIConstraints: *Duplex *Option1 False *UIConstraints: *Option1 False *Duplex *OpenUI *PageSize/Media Size: PickOne @@ -121,7 +121,7 @@ *da.Translation Manufacturer/Generic: "" *da.Translation ModelName/Generic PostScript Printer: "" *da.Translation ShortNickName/Generic PostScript Printer: "" -*da.Translation NickName/Generic PostScript Printer, 1.3: "" +*da.Translation NickName/Generic PostScript Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -151,7 +151,7 @@ *de.Translation Manufacturer/Generic: "" *de.Translation ModelName/Generic PostScript Printer: "" *de.Translation ShortNickName/Generic PostScript Printer: "" -*de.Translation NickName/Generic PostScript Printer, 1.3: "" +*de.Translation NickName/Generic PostScript Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -181,7 +181,7 @@ *es.Translation Manufacturer/Generic: "" *es.Translation ModelName/Generic PostScript Printer: "" *es.Translation ShortNickName/Generic PostScript Printer: "" -*es.Translation NickName/Generic PostScript Printer, 1.3: "" +*es.Translation NickName/Generic PostScript Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -211,7 +211,7 @@ *fi.Translation Manufacturer/Generic: "" *fi.Translation ModelName/Generic PostScript Printer: "" *fi.Translation ShortNickName/Generic PostScript Printer: "" -*fi.Translation NickName/Generic PostScript Printer, 1.3: "" +*fi.Translation NickName/Generic PostScript Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -241,7 +241,7 @@ *fr.Translation Manufacturer/Generic: "" *fr.Translation ModelName/Generic PostScript Printer: "" *fr.Translation ShortNickName/Generic PostScript Printer: "" -*fr.Translation NickName/Generic PostScript Printer, 1.3: "" +*fr.Translation NickName/Generic PostScript Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -271,7 +271,7 @@ *it.Translation Manufacturer/Generic: "" *it.Translation ModelName/Generic PostScript Printer: "" *it.Translation ShortNickName/Generic PostScript Printer: "" -*it.Translation NickName/Generic PostScript Printer, 1.3: "" +*it.Translation NickName/Generic PostScript Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -301,7 +301,7 @@ *ja.Translation Manufacturer/Generic: "" *ja.Translation ModelName/Generic PostScript Printer: "" *ja.Translation ShortNickName/Generic PostScript Printer: "" -*ja.Translation NickName/Generic PostScript Printer, 1.3: "" +*ja.Translation NickName/Generic PostScript Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -331,8 +331,8 @@ *ko.Translation Manufacturer/Generic: "" *ko.Translation ModelName/Generic PostScript Printer: "" *ko.Translation ShortNickName/Generic PostScript Printer: "" -*ko.Translation NickName/Generic PostScript Printer, 1.3: "" -*ko.Translation PageSize/Media Size: "" +*ko.Translation NickName/Generic PostScript Printer, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize Executive/Executive - 7.25x10.5in: "" @@ -361,7 +361,7 @@ *nl.Translation Manufacturer/Generic: "" *nl.Translation ModelName/Generic PostScript Printer: "" *nl.Translation ShortNickName/Generic PostScript Printer: "" -*nl.Translation NickName/Generic PostScript Printer, 1.3: "" +*nl.Translation NickName/Generic PostScript Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -391,7 +391,7 @@ *no.Translation Manufacturer/Generic: "" *no.Translation ModelName/Generic PostScript Printer: "" *no.Translation ShortNickName/Generic PostScript Printer: "" -*no.Translation NickName/Generic PostScript Printer, 1.3: "" +*no.Translation NickName/Generic PostScript Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -421,7 +421,7 @@ *pt.Translation Manufacturer/Generic: "" *pt.Translation ModelName/Generic PostScript Printer: "" *pt.Translation ShortNickName/Generic PostScript Printer: "" -*pt.Translation NickName/Generic PostScript Printer, 1.3: "" +*pt.Translation NickName/Generic PostScript Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -451,7 +451,7 @@ *pt_BR.Translation Manufacturer/Generic: "" *pt_BR.Translation ModelName/Generic PostScript Printer: "" *pt_BR.Translation ShortNickName/Generic PostScript Printer: "" -*pt_BR.Translation NickName/Generic PostScript Printer, 1.3: "" +*pt_BR.Translation NickName/Generic PostScript Printer, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -478,40 +478,10 @@ *pt_BR.Translation Option1/Duplexer: "" *pt_BR.Option1 False/Não instalado: "" *pt_BR.Option1 True/Instalada: "" -*pt_PT.Translation Manufacturer/Generic: "" -*pt_PT.Translation ModelName/Generic PostScript Printer: "" -*pt_PT.Translation ShortNickName/Generic PostScript Printer: "" -*pt_PT.Translation NickName/Generic PostScript Printer, 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 InputSlot/Media Source: "" -*pt_PT.InputSlot Default/Rápido: "" -*pt_PT.InputSlot Tray1/Bandeja 1: "" -*pt_PT.InputSlot Manual/Alimentação Manual: "" -*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/Generic: "" *sv.Translation ModelName/Generic PostScript Printer: "" *sv.Translation ShortNickName/Generic PostScript Printer: "" -*sv.Translation NickName/Generic PostScript Printer, 1.3: "" +*sv.Translation NickName/Generic PostScript Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -541,8 +511,8 @@ *zh.Translation Manufacturer/Generic: "" *zh.Translation ModelName/Generic PostScript Printer: "" *zh.Translation ShortNickName/Generic PostScript Printer: "" -*zh.Translation NickName/Generic PostScript Printer, 1.3: "" -*zh.Translation PageSize/Media Size: "" +*zh.Translation NickName/Generic PostScript Printer, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize Executive/Executive - 7.25x10.5in: "" @@ -571,8 +541,8 @@ *zh_TW.Translation Manufacturer/Generic: "" *zh_TW.Translation ModelName/Generic PostScript Printer: "" *zh_TW.Translation ShortNickName/Generic PostScript Printer: "" -*zh_TW.Translation NickName/Generic PostScript Printer, 1.3: "" -*zh_TW.Translation PageSize/Media Size: "" +*zh_TW.Translation NickName/Generic PostScript Printer, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize Executive/Executive - 7.25x10.5in: "" @@ -634,4 +604,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 GENERIC.PPD, 30315 bytes. +*% End of GENERIC.PPD, 28875 bytes. diff --git a/ppd/generpcl.ppd b/ppd/generpcl.ppd index cf9ba0767..acd0abd93 100644 --- a/ppd/generpcl.ppd +++ b/ppd/generpcl.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% PPD file for PCL Laser Printer with CUPS. -*% Created by the CUPS PPD Compiler v1.2.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "GENERPCL.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Generic" *ModelName: "Generic PCL Laser Printer" *ShortNickName: "Generic PCL Laser Printer" -*NickName: "Generic PCL Laser Printer, 1.3" +*NickName: "Generic PCL Laser Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 0 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertohp" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *UIConstraints: *Duplex *Option1 False *UIConstraints: *Option1 False *Duplex *UIConstraints: *PageSize A3 *InputSlot Envelope @@ -151,7 +151,7 @@ *da.Translation Manufacturer/Generic: "" *da.Translation ModelName/Generic PCL Laser Printer: "" *da.Translation ShortNickName/Generic PCL Laser Printer: "" -*da.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*da.Translation NickName/Generic PCL Laser Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -188,7 +188,7 @@ *de.Translation Manufacturer/Generic: "" *de.Translation ModelName/Generic PCL Laser Printer: "" *de.Translation ShortNickName/Generic PCL Laser Printer: "" -*de.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*de.Translation NickName/Generic PCL Laser Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -225,7 +225,7 @@ *es.Translation Manufacturer/Generic: "" *es.Translation ModelName/Generic PCL Laser Printer: "" *es.Translation ShortNickName/Generic PCL Laser Printer: "" -*es.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*es.Translation NickName/Generic PCL Laser Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -262,7 +262,7 @@ *fi.Translation Manufacturer/Generic: "" *fi.Translation ModelName/Generic PCL Laser Printer: "" *fi.Translation ShortNickName/Generic PCL Laser Printer: "" -*fi.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*fi.Translation NickName/Generic PCL Laser Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -299,7 +299,7 @@ *fr.Translation Manufacturer/Generic: "" *fr.Translation ModelName/Generic PCL Laser Printer: "" *fr.Translation ShortNickName/Generic PCL Laser Printer: "" -*fr.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*fr.Translation NickName/Generic PCL Laser Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -336,7 +336,7 @@ *it.Translation Manufacturer/Generic: "" *it.Translation ModelName/Generic PCL Laser Printer: "" *it.Translation ShortNickName/Generic PCL Laser Printer: "" -*it.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*it.Translation NickName/Generic PCL Laser Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -373,7 +373,7 @@ *ja.Translation Manufacturer/Generic: "" *ja.Translation ModelName/Generic PCL Laser Printer: "" *ja.Translation ShortNickName/Generic PCL Laser Printer: "" -*ja.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*ja.Translation NickName/Generic PCL Laser Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -410,8 +410,8 @@ *ko.Translation Manufacturer/Generic: "" *ko.Translation ModelName/Generic PCL Laser Printer: "" *ko.Translation ShortNickName/Generic PCL Laser Printer: "" -*ko.Translation NickName/Generic PCL Laser Printer, 1.3: "" -*ko.Translation PageSize/Media Size: "" +*ko.Translation NickName/Generic PCL Laser Printer, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize Executive/Executive - 7.25x10.5in: "" @@ -447,7 +447,7 @@ *nl.Translation Manufacturer/Generic: "" *nl.Translation ModelName/Generic PCL Laser Printer: "" *nl.Translation ShortNickName/Generic PCL Laser Printer: "" -*nl.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*nl.Translation NickName/Generic PCL Laser Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -484,7 +484,7 @@ *no.Translation Manufacturer/Generic: "" *no.Translation ModelName/Generic PCL Laser Printer: "" *no.Translation ShortNickName/Generic PCL Laser Printer: "" -*no.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*no.Translation NickName/Generic PCL Laser Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -521,7 +521,7 @@ *pt.Translation Manufacturer/Generic: "" *pt.Translation ModelName/Generic PCL Laser Printer: "" *pt.Translation ShortNickName/Generic PCL Laser Printer: "" -*pt.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*pt.Translation NickName/Generic PCL Laser Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -558,7 +558,7 @@ *pt_BR.Translation Manufacturer/Generic: "" *pt_BR.Translation ModelName/Generic PCL Laser Printer: "" *pt_BR.Translation ShortNickName/Generic PCL Laser Printer: "" -*pt_BR.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*pt_BR.Translation NickName/Generic PCL Laser Printer, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -592,47 +592,10 @@ *pt_BR.Translation Option1/Duplexer: "" *pt_BR.Option1 False/Não instalado: "" *pt_BR.Option1 True/Instalada: "" -*pt_PT.Translation Manufacturer/Generic: "" -*pt_PT.Translation ModelName/Generic PCL Laser Printer: "" -*pt_PT.Translation ShortNickName/Generic PCL Laser Printer: "" -*pt_PT.Translation NickName/Generic PCL Laser Printer, 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 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/Generic: "" *sv.Translation ModelName/Generic PCL Laser Printer: "" *sv.Translation ShortNickName/Generic PCL Laser Printer: "" -*sv.Translation NickName/Generic PCL Laser Printer, 1.3: "" +*sv.Translation NickName/Generic PCL Laser Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -669,8 +632,8 @@ *zh.Translation Manufacturer/Generic: "" *zh.Translation ModelName/Generic PCL Laser Printer: "" *zh.Translation ShortNickName/Generic PCL Laser Printer: "" -*zh.Translation NickName/Generic PCL Laser Printer, 1.3: "" -*zh.Translation PageSize/Media Size: "" +*zh.Translation NickName/Generic PCL Laser Printer, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize Executive/Executive - 7.25x10.5in: "" @@ -706,8 +669,8 @@ *zh_TW.Translation Manufacturer/Generic: "" *zh_TW.Translation ModelName/Generic PCL Laser Printer: "" *zh_TW.Translation ShortNickName/Generic PCL Laser Printer: "" -*zh_TW.Translation NickName/Generic PCL Laser Printer, 1.3: "" -*zh_TW.Translation PageSize/Media Size: "" +*zh_TW.Translation NickName/Generic PCL Laser Printer, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize Executive/Executive - 7.25x10.5in: "" @@ -776,4 +739,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 GENERPCL.PPD, 35952 bytes. +*% End of GENERPCL.PPD, 34243 bytes. diff --git a/ppd/intelbar.ppd b/ppd/intelbar.ppd index a46f27186..fb8228679 100644 --- a/ppd/intelbar.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "INTELBAR.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Intellitech" *ModelName: "Intellitech IntelliBar Label Printer" *ShortNickName: "Intellibar Label Printer" -*NickName: "Intellitech IntelliBar Label Printer, 1.3" +*NickName: "Intellitech IntelliBar Label Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -31,12 +31,14 @@ *TTRasterizer: Type42 *% Driver-defined attributes... *CustominTearInterval True: "<>setpagedevice" +*ParamCustominTearInterval Interval: 1 int 1 99 *CustominCutInterval True: "<>setpagedevice" -*cupsVersion: 1.3 +*ParamCustominCutInterval Interval: 1 int 1 99 +*cupsVersion: 1.4 *cupsModelNumber: 32 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertolabel" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *UIConstraints: *inPrintMode Standard *inCutInterval *UIConstraints: *inCutInterval *inPrintMode Standard *UIConstraints: *inPrintMode Standard *inTearInterval @@ -171,7 +173,7 @@ *da.Translation Manufacturer/Intellitech: "" *da.Translation ModelName/Intellitech IntelliBar Label Printer: "" *da.Translation ShortNickName/Intellibar Label Printer: "" -*da.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*da.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize w288h432/4.00x6.00": "" *da.Translation Resolution/Resolution: "" @@ -252,10 +254,14 @@ *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: "" -*de.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*de.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize w288h432/4.00x6.00": "" *de.Translation Resolution/Resolution: "" @@ -336,10 +342,14 @@ *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: "" -*es.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*es.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize w288h432/4.00x6.00": "" *es.Translation Resolution/Resolution: "" @@ -420,10 +430,14 @@ *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: "" -*fi.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*fi.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize w288h432/4.00x6.00": "" *fi.Translation Resolution/Resolution: "" @@ -504,10 +518,14 @@ *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: "" -*fr.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*fr.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize w288h432/4.00x6.00": "" *fr.Translation Resolution/Resolution: "" @@ -588,10 +606,14 @@ *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: "" -*it.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*it.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize w288h432/4.00x6.00": "" *it.Translation Resolution/Resolution: "" @@ -672,10 +694,14 @@ *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: "" -*ja.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*ja.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize w288h432/4.00x6.00": "" *ja.Translation Resolution/Resolution: "" @@ -756,11 +782,15 @@ *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/Media Size: "" +*ko.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize w288h432/4.00x6.00": "" *ko.Translation Resolution/Resolution: "" *ko.Resolution 300dpi/300dpi: "" @@ -840,10 +870,14 @@ *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 NickName/Intellitech IntelliBar Label Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize w288h432/4.00x6.00": "" *nl.Translation Resolution/Resolution: "" @@ -924,10 +958,14 @@ *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: "" -*no.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*no.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize w288h432/4.00x6.00": "" *no.Translation Resolution/Resolution: "" @@ -1008,10 +1046,14 @@ *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: "" -*pt.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*pt.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize w288h432/4.00x6.00": "" *pt.Translation Resolution/Resolution: "" @@ -1092,10 +1134,14 @@ *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 NickName/Intellitech IntelliBar Label Printer, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize w288h432/4.00x6.00": "" *pt_BR.Translation Resolution/Resolution: "" @@ -1176,94 +1222,14 @@ *pt_BR.inCutInterval 8/Every 8 Labels: "" *pt_BR.inCutInterval 9/Every 9 Labels: "" *pt_BR.inCutInterval 10/Every 10 Labels: "" -*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: "" +*pt_BR.CustominTearInterval True/CustominTearInterval: "" +*pt_BR.ParamCustominTearInterval Interval/ParamCustominTearInterval: "" +*pt_BR.CustominCutInterval True/CustominCutInterval: "" +*pt_BR.ParamCustominCutInterval Interval/ParamCustominCutInterval: "" *sv.Translation Manufacturer/Intellitech: "" *sv.Translation ModelName/Intellitech IntelliBar Label Printer: "" *sv.Translation ShortNickName/Intellibar Label Printer: "" -*sv.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: "" +*sv.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize w288h432/4.00x6.00": "" *sv.Translation Resolution/Resolution: "" @@ -1344,11 +1310,15 @@ *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/Media Size: "" +*zh.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize w288h432/4.00x6.00": "" *zh.Translation Resolution/Resolution: "" *zh.Resolution 300dpi/300dpi: "" @@ -1428,11 +1398,15 @@ *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/Media Size: "" +*zh_TW.Translation NickName/Intellitech IntelliBar Label Printer, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize w288h432/4.00x6.00": "" *zh_TW.Translation Resolution/Resolution: "" *zh_TW.Resolution 300dpi/300dpi: "" @@ -1512,6 +1486,10 @@ *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 @@ -1548,4 +1526,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, 59892 bytes. +*% End of INTELBAR.PPD, 60389 bytes. diff --git a/ppd/laserjet.ppd b/ppd/laserjet.ppd index 5cc204e0b..9a582c817 100644 --- a/ppd/laserjet.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "LASERJET.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "HP" *ModelName: "HP LaserJet Series PCL 4/5" *ShortNickName: "HP LaserJet Series PCL 4/5" -*NickName: "HP LaserJet Series PCL 4/5, 1.3" +*NickName: "HP LaserJet Series PCL 4/5, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 0 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertohp" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *UIConstraints: *Duplex *Option1 False *UIConstraints: *Option1 False *Duplex *UIConstraints: *PageSize A3 *InputSlot Envelope @@ -152,7 +152,7 @@ *da.Translation Manufacturer/HP: "" *da.Translation ModelName/HP LaserJet Series PCL 4/5: "" *da.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*da.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*da.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -190,7 +190,7 @@ *de.Translation Manufacturer/HP: "" *de.Translation ModelName/HP LaserJet Series PCL 4/5: "" *de.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*de.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*de.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -228,7 +228,7 @@ *es.Translation Manufacturer/HP: "" *es.Translation ModelName/HP LaserJet Series PCL 4/5: "" *es.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*es.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*es.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -266,7 +266,7 @@ *fi.Translation Manufacturer/HP: "" *fi.Translation ModelName/HP LaserJet Series PCL 4/5: "" *fi.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*fi.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*fi.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -304,7 +304,7 @@ *fr.Translation Manufacturer/HP: "" *fr.Translation ModelName/HP LaserJet Series PCL 4/5: "" *fr.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*fr.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*fr.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -342,7 +342,7 @@ *it.Translation Manufacturer/HP: "" *it.Translation ModelName/HP LaserJet Series PCL 4/5: "" *it.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*it.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*it.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -380,7 +380,7 @@ *ja.Translation Manufacturer/HP: "" *ja.Translation ModelName/HP LaserJet Series PCL 4/5: "" *ja.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*ja.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*ja.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -418,8 +418,8 @@ *ko.Translation Manufacturer/HP: "" *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/Media Size: "" +*ko.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize Executive/Executive - 7.25x10.5in: "" @@ -456,7 +456,7 @@ *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 NickName/HP LaserJet Series PCL 4/5, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -494,7 +494,7 @@ *no.Translation Manufacturer/HP: "" *no.Translation ModelName/HP LaserJet Series PCL 4/5: "" *no.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*no.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*no.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -532,7 +532,7 @@ *pt.Translation Manufacturer/HP: "" *pt.Translation ModelName/HP LaserJet Series PCL 4/5: "" *pt.Translation ShortNickName/HP LaserJet Series PCL 4/5: "" -*pt.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*pt.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -570,7 +570,7 @@ *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 NickName/HP LaserJet Series PCL 4/5, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -605,48 +605,10 @@ *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: "" -*sv.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: "" +*sv.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -684,8 +646,8 @@ *zh.Translation Manufacturer/HP: "" *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/Media Size: "" +*zh.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize Executive/Executive - 7.25x10.5in: "" @@ -722,8 +684,8 @@ *zh_TW.Translation Manufacturer/HP: "" *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/Media Size: "" +*zh_TW.Translation NickName/HP LaserJet Series PCL 4/5, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize Executive/Executive - 7.25x10.5in: "" @@ -793,4 +755,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, 36602 bytes. +*% End of LASERJET.PPD, 34859 bytes. diff --git a/ppd/okidat24.ppd b/ppd/okidat24.ppd index 6dbfd0638..3ad8ecaac 100644 --- a/ppd/okidat24.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "OKIDAT24.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Oki" *ModelName: "Oki 24-Pin Series" *ShortNickName: "Oki 24-Pin Series" -*NickName: "Oki 24-Pin Series, 1.3" +*NickName: "Oki 24-Pin Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 1 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -83,7 +83,7 @@ *da.Translation Manufacturer/Oki: "" *da.Translation ModelName/Oki 24-Pin Series: "" *da.Translation ShortNickName/Oki 24-Pin Series: "" -*da.Translation NickName/Oki 24-Pin Series, 1.3: "" +*da.Translation NickName/Oki 24-Pin Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -98,7 +98,7 @@ *de.Translation Manufacturer/Oki: "" *de.Translation ModelName/Oki 24-Pin Series: "" *de.Translation ShortNickName/Oki 24-Pin Series: "" -*de.Translation NickName/Oki 24-Pin Series, 1.3: "" +*de.Translation NickName/Oki 24-Pin Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -113,7 +113,7 @@ *es.Translation Manufacturer/Oki: "" *es.Translation ModelName/Oki 24-Pin Series: "" *es.Translation ShortNickName/Oki 24-Pin Series: "" -*es.Translation NickName/Oki 24-Pin Series, 1.3: "" +*es.Translation NickName/Oki 24-Pin Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -128,7 +128,7 @@ *fi.Translation Manufacturer/Oki: "" *fi.Translation ModelName/Oki 24-Pin Series: "" *fi.Translation ShortNickName/Oki 24-Pin Series: "" -*fi.Translation NickName/Oki 24-Pin Series, 1.3: "" +*fi.Translation NickName/Oki 24-Pin Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -143,7 +143,7 @@ *fr.Translation Manufacturer/Oki: "" *fr.Translation ModelName/Oki 24-Pin Series: "" *fr.Translation ShortNickName/Oki 24-Pin Series: "" -*fr.Translation NickName/Oki 24-Pin Series, 1.3: "" +*fr.Translation NickName/Oki 24-Pin Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -158,7 +158,7 @@ *it.Translation Manufacturer/Oki: "" *it.Translation ModelName/Oki 24-Pin Series: "" *it.Translation ShortNickName/Oki 24-Pin Series: "" -*it.Translation NickName/Oki 24-Pin Series, 1.3: "" +*it.Translation NickName/Oki 24-Pin Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -173,7 +173,7 @@ *ja.Translation Manufacturer/Oki: "" *ja.Translation ModelName/Oki 24-Pin Series: "" *ja.Translation ShortNickName/Oki 24-Pin Series: "" -*ja.Translation NickName/Oki 24-Pin Series, 1.3: "" +*ja.Translation NickName/Oki 24-Pin Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -188,8 +188,8 @@ *ko.Translation Manufacturer/Oki: "" *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/Media Size: "" +*ko.Translation NickName/Oki 24-Pin Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -203,7 +203,7 @@ *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 NickName/Oki 24-Pin Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -218,7 +218,7 @@ *no.Translation Manufacturer/Oki: "" *no.Translation ModelName/Oki 24-Pin Series: "" *no.Translation ShortNickName/Oki 24-Pin Series: "" -*no.Translation NickName/Oki 24-Pin Series, 1.3: "" +*no.Translation NickName/Oki 24-Pin Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -233,7 +233,7 @@ *pt.Translation Manufacturer/Oki: "" *pt.Translation ModelName/Oki 24-Pin Series: "" *pt.Translation ShortNickName/Oki 24-Pin Series: "" -*pt.Translation NickName/Oki 24-Pin Series, 1.3: "" +*pt.Translation NickName/Oki 24-Pin Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -248,7 +248,7 @@ *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 NickName/Oki 24-Pin Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -260,25 +260,10 @@ *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: "" -*sv.Translation NickName/Oki 24-Pin Series, 1.3: "" +*sv.Translation NickName/Oki 24-Pin Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -293,8 +278,8 @@ *zh.Translation Manufacturer/Oki: "" *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/Media Size: "" +*zh.Translation NickName/Oki 24-Pin Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -308,8 +293,8 @@ *zh_TW.Translation Manufacturer/Oki: "" *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/Media Size: "" +*zh_TW.Translation NickName/Oki 24-Pin Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -356,4 +341,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, 16109 bytes. +*% End of OKIDAT24.PPD, 15444 bytes. diff --git a/ppd/okidata9.ppd b/ppd/okidata9.ppd index 1a9bc1324..ae6cc64bd 100644 --- a/ppd/okidata9.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "OKIDATA9.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Oki" *ModelName: "Oki 9-Pin Series" *ShortNickName: "Oki 9-Pin Series" -*NickName: "Oki 9-Pin Series, 1.3" +*NickName: "Oki 9-Pin Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 0 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -81,7 +81,7 @@ *da.Translation Manufacturer/Oki: "" *da.Translation ModelName/Oki 9-Pin Series: "" *da.Translation ShortNickName/Oki 9-Pin Series: "" -*da.Translation NickName/Oki 9-Pin Series, 1.3: "" +*da.Translation NickName/Oki 9-Pin Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -94,7 +94,7 @@ *de.Translation Manufacturer/Oki: "" *de.Translation ModelName/Oki 9-Pin Series: "" *de.Translation ShortNickName/Oki 9-Pin Series: "" -*de.Translation NickName/Oki 9-Pin Series, 1.3: "" +*de.Translation NickName/Oki 9-Pin Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -107,7 +107,7 @@ *es.Translation Manufacturer/Oki: "" *es.Translation ModelName/Oki 9-Pin Series: "" *es.Translation ShortNickName/Oki 9-Pin Series: "" -*es.Translation NickName/Oki 9-Pin Series, 1.3: "" +*es.Translation NickName/Oki 9-Pin Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -120,7 +120,7 @@ *fi.Translation Manufacturer/Oki: "" *fi.Translation ModelName/Oki 9-Pin Series: "" *fi.Translation ShortNickName/Oki 9-Pin Series: "" -*fi.Translation NickName/Oki 9-Pin Series, 1.3: "" +*fi.Translation NickName/Oki 9-Pin Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -133,7 +133,7 @@ *fr.Translation Manufacturer/Oki: "" *fr.Translation ModelName/Oki 9-Pin Series: "" *fr.Translation ShortNickName/Oki 9-Pin Series: "" -*fr.Translation NickName/Oki 9-Pin Series, 1.3: "" +*fr.Translation NickName/Oki 9-Pin Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -146,7 +146,7 @@ *it.Translation Manufacturer/Oki: "" *it.Translation ModelName/Oki 9-Pin Series: "" *it.Translation ShortNickName/Oki 9-Pin Series: "" -*it.Translation NickName/Oki 9-Pin Series, 1.3: "" +*it.Translation NickName/Oki 9-Pin Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -159,7 +159,7 @@ *ja.Translation Manufacturer/Oki: "" *ja.Translation ModelName/Oki 9-Pin Series: "" *ja.Translation ShortNickName/Oki 9-Pin Series: "" -*ja.Translation NickName/Oki 9-Pin Series, 1.3: "" +*ja.Translation NickName/Oki 9-Pin Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -172,8 +172,8 @@ *ko.Translation Manufacturer/Oki: "" *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/Media Size: "" +*ko.Translation NickName/Oki 9-Pin Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -185,7 +185,7 @@ *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 NickName/Oki 9-Pin Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -198,7 +198,7 @@ *no.Translation Manufacturer/Oki: "" *no.Translation ModelName/Oki 9-Pin Series: "" *no.Translation ShortNickName/Oki 9-Pin Series: "" -*no.Translation NickName/Oki 9-Pin Series, 1.3: "" +*no.Translation NickName/Oki 9-Pin Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -211,7 +211,7 @@ *pt.Translation Manufacturer/Oki: "" *pt.Translation ModelName/Oki 9-Pin Series: "" *pt.Translation ShortNickName/Oki 9-Pin Series: "" -*pt.Translation NickName/Oki 9-Pin Series, 1.3: "" +*pt.Translation NickName/Oki 9-Pin Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -224,7 +224,7 @@ *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 NickName/Oki 9-Pin Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -234,23 +234,10 @@ *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: "" -*sv.Translation NickName/Oki 9-Pin Series, 1.3: "" +*sv.Translation NickName/Oki 9-Pin Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -263,8 +250,8 @@ *zh.Translation Manufacturer/Oki: "" *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/Media Size: "" +*zh.Translation NickName/Oki 9-Pin Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -276,8 +263,8 @@ *zh_TW.Translation Manufacturer/Oki: "" *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/Media Size: "" +*zh_TW.Translation NickName/Oki 9-Pin Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -322,4 +309,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, 14797 bytes. +*% End of OKIDATA9.PPD, 14201 bytes. diff --git a/ppd/sample.drv b/ppd/sample.drv index 76c9a496d..20a86e57b 100644 --- a/ppd/sample.drv +++ b/ppd/sample.drv @@ -1,4 +1,17 @@ -// CUPS PPD Compiler v1.1.1 +// +// "$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/". +// // Include necessary files... #include @@ -76,7 +89,7 @@ #media "w576h468/8.00x6.50\"" 576 468 // Common stuff for all drivers... -Attribute "cupsVersion" "" "1.3" +Attribute "cupsVersion" "" "1.4" Attribute "FileSystem" "" "False" Attribute "LandscapeOrientation" "" "Plus90" Attribute "LanguageLevel" "" "3" @@ -97,7 +110,7 @@ Copyright "file is missing or damaged, see the license at \"http://www.cups.org/ Font * -Version "1.3" +Version "1.4" // Dymo Label Printer { @@ -1191,3 +1204,7 @@ Version "1.3" Choice "Never/Never" "" } } + +// +// End of "$Id$". +// diff --git a/ppd/stcolor.ppd b/ppd/stcolor.ppd index ca5e7f56e..926f85fd6 100644 --- a/ppd/stcolor.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "STCOLOR.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Epson" *ModelName: "Epson Stylus Color Series" *ShortNickName: "Epson Stylus Color Series" -*NickName: "Epson Stylus Color Series, 1.3" +*NickName: "Epson Stylus Color Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 2 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -99,7 +99,7 @@ *da.Translation Manufacturer/Epson: "" *da.Translation ModelName/Epson Stylus Color Series: "" *da.Translation ShortNickName/Epson Stylus Color Series: "" -*da.Translation NickName/Epson Stylus Color Series, 1.3: "" +*da.Translation NickName/Epson Stylus Color Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -118,7 +118,7 @@ *de.Translation Manufacturer/Epson: "" *de.Translation ModelName/Epson Stylus Color Series: "" *de.Translation ShortNickName/Epson Stylus Color Series: "" -*de.Translation NickName/Epson Stylus Color Series, 1.3: "" +*de.Translation NickName/Epson Stylus Color Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -137,7 +137,7 @@ *es.Translation Manufacturer/Epson: "" *es.Translation ModelName/Epson Stylus Color Series: "" *es.Translation ShortNickName/Epson Stylus Color Series: "" -*es.Translation NickName/Epson Stylus Color Series, 1.3: "" +*es.Translation NickName/Epson Stylus Color Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -156,7 +156,7 @@ *fi.Translation Manufacturer/Epson: "" *fi.Translation ModelName/Epson Stylus Color Series: "" *fi.Translation ShortNickName/Epson Stylus Color Series: "" -*fi.Translation NickName/Epson Stylus Color Series, 1.3: "" +*fi.Translation NickName/Epson Stylus Color Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -175,7 +175,7 @@ *fr.Translation Manufacturer/Epson: "" *fr.Translation ModelName/Epson Stylus Color Series: "" *fr.Translation ShortNickName/Epson Stylus Color Series: "" -*fr.Translation NickName/Epson Stylus Color Series, 1.3: "" +*fr.Translation NickName/Epson Stylus Color Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -194,7 +194,7 @@ *it.Translation Manufacturer/Epson: "" *it.Translation ModelName/Epson Stylus Color Series: "" *it.Translation ShortNickName/Epson Stylus Color Series: "" -*it.Translation NickName/Epson Stylus Color Series, 1.3: "" +*it.Translation NickName/Epson Stylus Color Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -213,7 +213,7 @@ *ja.Translation Manufacturer/Epson: "" *ja.Translation ModelName/Epson Stylus Color Series: "" *ja.Translation ShortNickName/Epson Stylus Color Series: "" -*ja.Translation NickName/Epson Stylus Color Series, 1.3: "" +*ja.Translation NickName/Epson Stylus Color Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -232,8 +232,8 @@ *ko.Translation Manufacturer/Epson: "" *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/Media Size: "" +*ko.Translation NickName/Epson Stylus Color Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -251,7 +251,7 @@ *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 NickName/Epson Stylus Color Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -270,7 +270,7 @@ *no.Translation Manufacturer/Epson: "" *no.Translation ModelName/Epson Stylus Color Series: "" *no.Translation ShortNickName/Epson Stylus Color Series: "" -*no.Translation NickName/Epson Stylus Color Series, 1.3: "" +*no.Translation NickName/Epson Stylus Color Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -289,7 +289,7 @@ *pt.Translation Manufacturer/Epson: "" *pt.Translation ModelName/Epson Stylus Color Series: "" *pt.Translation ShortNickName/Epson Stylus Color Series: "" -*pt.Translation NickName/Epson Stylus Color Series, 1.3: "" +*pt.Translation NickName/Epson Stylus Color Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -308,7 +308,7 @@ *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 NickName/Epson Stylus Color Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -324,29 +324,10 @@ *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: "" -*sv.Translation NickName/Epson Stylus Color Series, 1.3: "" +*sv.Translation NickName/Epson Stylus Color Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -365,8 +346,8 @@ *zh.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh.Translation NickName/Epson Stylus Color Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -384,8 +365,8 @@ *zh_TW.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh_TW.Translation NickName/Epson Stylus Color Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -436,4 +417,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, 19832 bytes. +*% End of STCOLOR.PPD, 18987 bytes. diff --git a/ppd/stcolor2.ppd b/ppd/stcolor2.ppd index 284dce455..01ddc83a2 100644 --- a/ppd/stcolor2.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "STCOLOR2.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Epson" *ModelName: "Epson New Stylus Color Series" *ShortNickName: "Epson New Stylus Color Series" -*NickName: "Epson New Stylus Color Series, 1.3" +*NickName: "Epson New Stylus Color Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 4 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -99,7 +99,7 @@ *da.Translation Manufacturer/Epson: "" *da.Translation ModelName/Epson New Stylus Color Series: "" *da.Translation ShortNickName/Epson New Stylus Color Series: "" -*da.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*da.Translation NickName/Epson New Stylus Color Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -118,7 +118,7 @@ *de.Translation Manufacturer/Epson: "" *de.Translation ModelName/Epson New Stylus Color Series: "" *de.Translation ShortNickName/Epson New Stylus Color Series: "" -*de.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*de.Translation NickName/Epson New Stylus Color Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -137,7 +137,7 @@ *es.Translation Manufacturer/Epson: "" *es.Translation ModelName/Epson New Stylus Color Series: "" *es.Translation ShortNickName/Epson New Stylus Color Series: "" -*es.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*es.Translation NickName/Epson New Stylus Color Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -156,7 +156,7 @@ *fi.Translation Manufacturer/Epson: "" *fi.Translation ModelName/Epson New Stylus Color Series: "" *fi.Translation ShortNickName/Epson New Stylus Color Series: "" -*fi.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*fi.Translation NickName/Epson New Stylus Color Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -175,7 +175,7 @@ *fr.Translation Manufacturer/Epson: "" *fr.Translation ModelName/Epson New Stylus Color Series: "" *fr.Translation ShortNickName/Epson New Stylus Color Series: "" -*fr.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*fr.Translation NickName/Epson New Stylus Color Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -194,7 +194,7 @@ *it.Translation Manufacturer/Epson: "" *it.Translation ModelName/Epson New Stylus Color Series: "" *it.Translation ShortNickName/Epson New Stylus Color Series: "" -*it.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*it.Translation NickName/Epson New Stylus Color Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -213,7 +213,7 @@ *ja.Translation Manufacturer/Epson: "" *ja.Translation ModelName/Epson New Stylus Color Series: "" *ja.Translation ShortNickName/Epson New Stylus Color Series: "" -*ja.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*ja.Translation NickName/Epson New Stylus Color Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -232,8 +232,8 @@ *ko.Translation Manufacturer/Epson: "" *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/Media Size: "" +*ko.Translation NickName/Epson New Stylus Color Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -251,7 +251,7 @@ *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 NickName/Epson New Stylus Color Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -270,7 +270,7 @@ *no.Translation Manufacturer/Epson: "" *no.Translation ModelName/Epson New Stylus Color Series: "" *no.Translation ShortNickName/Epson New Stylus Color Series: "" -*no.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*no.Translation NickName/Epson New Stylus Color Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -289,7 +289,7 @@ *pt.Translation Manufacturer/Epson: "" *pt.Translation ModelName/Epson New Stylus Color Series: "" *pt.Translation ShortNickName/Epson New Stylus Color Series: "" -*pt.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*pt.Translation NickName/Epson New Stylus Color Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -308,7 +308,7 @@ *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 NickName/Epson New Stylus Color Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -324,29 +324,10 @@ *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: "" -*sv.Translation NickName/Epson New Stylus Color Series, 1.3: "" +*sv.Translation NickName/Epson New Stylus Color Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -365,8 +346,8 @@ *zh.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh.Translation NickName/Epson New Stylus Color Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -384,8 +365,8 @@ *zh_TW.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh_TW.Translation NickName/Epson New Stylus Color Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -436,4 +417,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, 20042 bytes. +*% End of STCOLOR2.PPD, 19185 bytes. diff --git a/ppd/stphoto.ppd b/ppd/stphoto.ppd index f2f105703..272a0ac07 100644 --- a/ppd/stphoto.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "STPHOTO.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Epson" *ModelName: "Epson Stylus Photo Series" *ShortNickName: "Epson Stylus Photo Series" -*NickName: "Epson Stylus Photo Series, 1.3" +*NickName: "Epson Stylus Photo Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 3 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -99,7 +99,7 @@ *da.Translation Manufacturer/Epson: "" *da.Translation ModelName/Epson Stylus Photo Series: "" *da.Translation ShortNickName/Epson Stylus Photo Series: "" -*da.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*da.Translation NickName/Epson Stylus Photo Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -118,7 +118,7 @@ *de.Translation Manufacturer/Epson: "" *de.Translation ModelName/Epson Stylus Photo Series: "" *de.Translation ShortNickName/Epson Stylus Photo Series: "" -*de.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*de.Translation NickName/Epson Stylus Photo Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -137,7 +137,7 @@ *es.Translation Manufacturer/Epson: "" *es.Translation ModelName/Epson Stylus Photo Series: "" *es.Translation ShortNickName/Epson Stylus Photo Series: "" -*es.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*es.Translation NickName/Epson Stylus Photo Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -156,7 +156,7 @@ *fi.Translation Manufacturer/Epson: "" *fi.Translation ModelName/Epson Stylus Photo Series: "" *fi.Translation ShortNickName/Epson Stylus Photo Series: "" -*fi.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*fi.Translation NickName/Epson Stylus Photo Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -175,7 +175,7 @@ *fr.Translation Manufacturer/Epson: "" *fr.Translation ModelName/Epson Stylus Photo Series: "" *fr.Translation ShortNickName/Epson Stylus Photo Series: "" -*fr.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*fr.Translation NickName/Epson Stylus Photo Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -194,7 +194,7 @@ *it.Translation Manufacturer/Epson: "" *it.Translation ModelName/Epson Stylus Photo Series: "" *it.Translation ShortNickName/Epson Stylus Photo Series: "" -*it.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*it.Translation NickName/Epson Stylus Photo Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -213,7 +213,7 @@ *ja.Translation Manufacturer/Epson: "" *ja.Translation ModelName/Epson Stylus Photo Series: "" *ja.Translation ShortNickName/Epson Stylus Photo Series: "" -*ja.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*ja.Translation NickName/Epson Stylus Photo Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -232,8 +232,8 @@ *ko.Translation Manufacturer/Epson: "" *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/Media Size: "" +*ko.Translation NickName/Epson Stylus Photo Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -251,7 +251,7 @@ *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 NickName/Epson Stylus Photo Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -270,7 +270,7 @@ *no.Translation Manufacturer/Epson: "" *no.Translation ModelName/Epson Stylus Photo Series: "" *no.Translation ShortNickName/Epson Stylus Photo Series: "" -*no.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*no.Translation NickName/Epson Stylus Photo Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -289,7 +289,7 @@ *pt.Translation Manufacturer/Epson: "" *pt.Translation ModelName/Epson Stylus Photo Series: "" *pt.Translation ShortNickName/Epson Stylus Photo Series: "" -*pt.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*pt.Translation NickName/Epson Stylus Photo Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -308,7 +308,7 @@ *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 NickName/Epson Stylus Photo Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -324,29 +324,10 @@ *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: "" -*sv.Translation NickName/Epson Stylus Photo Series, 1.3: "" +*sv.Translation NickName/Epson Stylus Photo Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -365,8 +346,8 @@ *zh.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh.Translation NickName/Epson Stylus Photo Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -384,8 +365,8 @@ *zh_TW.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh_TW.Translation NickName/Epson Stylus Photo Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -436,4 +417,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, 19833 bytes. +*% End of STPHOTO.PPD, 18988 bytes. diff --git a/ppd/stphoto2.ppd b/ppd/stphoto2.ppd index 1f0c67154..734f356f1 100644 --- a/ppd/stphoto2.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "STPHOTO2.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Epson" *ModelName: "Epson New Stylus Photo Series" *ShortNickName: "Epson New Stylus Photo Series" -*NickName: "Epson New Stylus Photo Series, 1.3" +*NickName: "Epson New Stylus Photo Series, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 5 *cupsManualCopies: True *cupsFilter: "application/vnd.cups-raster 50 rastertoepson" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: Letter @@ -99,7 +99,7 @@ *da.Translation Manufacturer/Epson: "" *da.Translation ModelName/Epson New Stylus Photo Series: "" *da.Translation ShortNickName/Epson New Stylus Photo Series: "" -*da.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*da.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize Letter/Letter - 8.5x11in: "" *da.PageSize Legal/Legal - 8.5x14in: "" @@ -118,7 +118,7 @@ *de.Translation Manufacturer/Epson: "" *de.Translation ModelName/Epson New Stylus Photo Series: "" *de.Translation ShortNickName/Epson New Stylus Photo Series: "" -*de.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*de.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize Letter/Letter - 8.5x11in: "" *de.PageSize Legal/Legal - 8.5x14in: "" @@ -137,7 +137,7 @@ *es.Translation Manufacturer/Epson: "" *es.Translation ModelName/Epson New Stylus Photo Series: "" *es.Translation ShortNickName/Epson New Stylus Photo Series: "" -*es.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*es.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize Letter/Letter - 8.5x11in: "" *es.PageSize Legal/Legal - 8.5x14in: "" @@ -156,7 +156,7 @@ *fi.Translation Manufacturer/Epson: "" *fi.Translation ModelName/Epson New Stylus Photo Series: "" *fi.Translation ShortNickName/Epson New Stylus Photo Series: "" -*fi.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*fi.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize Letter/Letter - 8.5x11in: "" *fi.PageSize Legal/Legal - 8.5x14in: "" @@ -175,7 +175,7 @@ *fr.Translation Manufacturer/Epson: "" *fr.Translation ModelName/Epson New Stylus Photo Series: "" *fr.Translation ShortNickName/Epson New Stylus Photo Series: "" -*fr.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*fr.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize Letter/Letter - 8.5x11in: "" *fr.PageSize Legal/Legal - 8.5x14in: "" @@ -194,7 +194,7 @@ *it.Translation Manufacturer/Epson: "" *it.Translation ModelName/Epson New Stylus Photo Series: "" *it.Translation ShortNickName/Epson New Stylus Photo Series: "" -*it.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*it.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize Letter/Letter - 8.5x11in: "" *it.PageSize Legal/Legal - 8.5x14in: "" @@ -213,7 +213,7 @@ *ja.Translation Manufacturer/Epson: "" *ja.Translation ModelName/Epson New Stylus Photo Series: "" *ja.Translation ShortNickName/Epson New Stylus Photo Series: "" -*ja.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*ja.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize Letter/Letter - 8.5x11in: "" *ja.PageSize Legal/Legal - 8.5x14in: "" @@ -232,8 +232,8 @@ *ko.Translation Manufacturer/Epson: "" *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/Media Size: "" +*ko.Translation NickName/Epson New Stylus Photo Series, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize Letter/Letter - 8.5x11in: "" *ko.PageSize Legal/Legal - 8.5x14in: "" *ko.PageSize A4/A4 - 210x297mm: "" @@ -251,7 +251,7 @@ *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 NickName/Epson New Stylus Photo Series, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize Letter/Letter - 8.5x11in: "" *nl.PageSize Legal/Legal - 8.5x14in: "" @@ -270,7 +270,7 @@ *no.Translation Manufacturer/Epson: "" *no.Translation ModelName/Epson New Stylus Photo Series: "" *no.Translation ShortNickName/Epson New Stylus Photo Series: "" -*no.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*no.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize Letter/Letter - 8.5x11in: "" *no.PageSize Legal/Legal - 8.5x14in: "" @@ -289,7 +289,7 @@ *pt.Translation Manufacturer/Epson: "" *pt.Translation ModelName/Epson New Stylus Photo Series: "" *pt.Translation ShortNickName/Epson New Stylus Photo Series: "" -*pt.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*pt.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize Letter/Letter - 8.5x11in: "" *pt.PageSize Legal/Legal - 8.5x14in: "" @@ -308,7 +308,7 @@ *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 NickName/Epson New Stylus Photo Series, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize Letter/Letter - 8.5x11in: "" *pt_BR.PageSize Legal/Legal - 8.5x14in: "" @@ -324,29 +324,10 @@ *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: "" -*sv.Translation NickName/Epson New Stylus Photo Series, 1.3: "" +*sv.Translation NickName/Epson New Stylus Photo Series, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize Letter/Letter - 8.5x11in: "" *sv.PageSize Legal/Legal - 8.5x14in: "" @@ -365,8 +346,8 @@ *zh.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh.Translation NickName/Epson New Stylus Photo Series, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize Letter/Letter - 8.5x11in: "" *zh.PageSize Legal/Legal - 8.5x14in: "" *zh.PageSize A4/A4 - 210x297mm: "" @@ -384,8 +365,8 @@ *zh_TW.Translation Manufacturer/Epson: "" *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/Media Size: "" +*zh_TW.Translation NickName/Epson New Stylus Photo Series, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize Letter/Letter - 8.5x11in: "" *zh_TW.PageSize Legal/Legal - 8.5x14in: "" *zh_TW.PageSize A4/A4 - 210x297mm: "" @@ -436,4 +417,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, 20043 bytes. +*% End of STPHOTO2.PPD, 19186 bytes. diff --git a/ppd/zebra.ppd b/ppd/zebra.ppd index 6b0d99f84..426ec123d 100644 --- a/ppd/zebra.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "ZEBRA.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Zebra" *ModelName: "Zebra ZPL Label Printer" *ShortNickName: "Zebra ZPL Label Printer" -*NickName: "Zebra ZPL Label Printer, 1.3" +*NickName: "Zebra ZPL Label Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 18 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertolabel" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: w288h360 @@ -474,7 +474,7 @@ *da.Translation Manufacturer/Zebra: "" *da.Translation ModelName/Zebra ZPL Label Printer: "" *da.Translation ShortNickName/Zebra ZPL Label Printer: "" -*da.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*da.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize w90h18/1.25x0.25": "" *da.PageSize w90h162/1.25x2.25": "" @@ -705,7 +705,7 @@ *de.Translation Manufacturer/Zebra: "" *de.Translation ModelName/Zebra ZPL Label Printer: "" *de.Translation ShortNickName/Zebra ZPL Label Printer: "" -*de.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*de.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize w90h18/1.25x0.25": "" *de.PageSize w90h162/1.25x2.25": "" @@ -936,7 +936,7 @@ *es.Translation Manufacturer/Zebra: "" *es.Translation ModelName/Zebra ZPL Label Printer: "" *es.Translation ShortNickName/Zebra ZPL Label Printer: "" -*es.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*es.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize w90h18/1.25x0.25": "" *es.PageSize w90h162/1.25x2.25": "" @@ -1167,7 +1167,7 @@ *fi.Translation Manufacturer/Zebra: "" *fi.Translation ModelName/Zebra ZPL Label Printer: "" *fi.Translation ShortNickName/Zebra ZPL Label Printer: "" -*fi.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*fi.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize w90h18/1.25x0.25": "" *fi.PageSize w90h162/1.25x2.25": "" @@ -1398,7 +1398,7 @@ *fr.Translation Manufacturer/Zebra: "" *fr.Translation ModelName/Zebra ZPL Label Printer: "" *fr.Translation ShortNickName/Zebra ZPL Label Printer: "" -*fr.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*fr.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize w90h18/1.25x0.25": "" *fr.PageSize w90h162/1.25x2.25": "" @@ -1629,7 +1629,7 @@ *it.Translation Manufacturer/Zebra: "" *it.Translation ModelName/Zebra ZPL Label Printer: "" *it.Translation ShortNickName/Zebra ZPL Label Printer: "" -*it.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*it.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize w90h18/1.25x0.25": "" *it.PageSize w90h162/1.25x2.25": "" @@ -1860,7 +1860,7 @@ *ja.Translation Manufacturer/Zebra: "" *ja.Translation ModelName/Zebra ZPL Label Printer: "" *ja.Translation ShortNickName/Zebra ZPL Label Printer: "" -*ja.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*ja.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize w90h18/1.25x0.25": "" *ja.PageSize w90h162/1.25x2.25": "" @@ -2091,8 +2091,8 @@ *ko.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*ko.Translation NickName/Zebra ZPL Label Printer, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize w90h18/1.25x0.25": "" *ko.PageSize w90h162/1.25x2.25": "" *ko.PageSize w108h18/1.50x0.25": "" @@ -2322,7 +2322,7 @@ *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 NickName/Zebra ZPL Label Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize w90h18/1.25x0.25": "" *nl.PageSize w90h162/1.25x2.25": "" @@ -2553,7 +2553,7 @@ *no.Translation Manufacturer/Zebra: "" *no.Translation ModelName/Zebra ZPL Label Printer: "" *no.Translation ShortNickName/Zebra ZPL Label Printer: "" -*no.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*no.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize w90h18/1.25x0.25": "" *no.PageSize w90h162/1.25x2.25": "" @@ -2784,7 +2784,7 @@ *pt.Translation Manufacturer/Zebra: "" *pt.Translation ModelName/Zebra ZPL Label Printer: "" *pt.Translation ShortNickName/Zebra ZPL Label Printer: "" -*pt.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*pt.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize w90h18/1.25x0.25": "" *pt.PageSize w90h162/1.25x2.25": "" @@ -3015,7 +3015,7 @@ *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 NickName/Zebra ZPL Label Printer, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize w90h18/1.25x0.25": "" *pt_BR.PageSize w90h162/1.25x2.25": "" @@ -3243,241 +3243,10 @@ *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: "" -*sv.Translation NickName/Zebra ZPL Label Printer, 1.3: "" +*sv.Translation NickName/Zebra ZPL Label Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize w90h18/1.25x0.25": "" *sv.PageSize w90h162/1.25x2.25": "" @@ -3708,8 +3477,8 @@ *zh.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh.Translation NickName/Zebra ZPL Label Printer, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize w90h18/1.25x0.25": "" *zh.PageSize w90h162/1.25x2.25": "" *zh.PageSize w108h18/1.50x0.25": "" @@ -3939,8 +3708,8 @@ *zh_TW.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh_TW.Translation NickName/Zebra ZPL Label Printer, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize w90h18/1.25x0.25": "" *zh_TW.PageSize w90h162/1.25x2.25": "" *zh_TW.PageSize w108h18/1.50x0.25": "" @@ -4203,4 +3972,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, 153875 bytes. +*% End of ZEBRA.PPD, 145610 bytes. diff --git a/ppd/zebracpl.ppd b/ppd/zebracpl.ppd index f46dbe761..f132101f0 100644 --- a/ppd/zebracpl.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "ZEBRACPL.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Zebra" *ModelName: "Zebra CPCL Label Printer" *ShortNickName: "Zebra CPCL Label Printer" -*NickName: "Zebra CPCL Label Printer, 1.3" +*NickName: "Zebra CPCL Label Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 19 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertolabel" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: w288h360 @@ -217,7 +217,7 @@ *da.Translation Manufacturer/Zebra: "" *da.Translation ModelName/Zebra CPCL Label Printer: "" *da.Translation ShortNickName/Zebra CPCL Label Printer: "" -*da.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*da.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize w144h72/2.00x1.00": "" *da.PageSize w144h90/2.00x1.25": "" @@ -332,7 +332,7 @@ *de.Translation Manufacturer/Zebra: "" *de.Translation ModelName/Zebra CPCL Label Printer: "" *de.Translation ShortNickName/Zebra CPCL Label Printer: "" -*de.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*de.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize w144h72/2.00x1.00": "" *de.PageSize w144h90/2.00x1.25": "" @@ -447,7 +447,7 @@ *es.Translation Manufacturer/Zebra: "" *es.Translation ModelName/Zebra CPCL Label Printer: "" *es.Translation ShortNickName/Zebra CPCL Label Printer: "" -*es.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*es.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize w144h72/2.00x1.00": "" *es.PageSize w144h90/2.00x1.25": "" @@ -562,7 +562,7 @@ *fi.Translation Manufacturer/Zebra: "" *fi.Translation ModelName/Zebra CPCL Label Printer: "" *fi.Translation ShortNickName/Zebra CPCL Label Printer: "" -*fi.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*fi.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize w144h72/2.00x1.00": "" *fi.PageSize w144h90/2.00x1.25": "" @@ -677,7 +677,7 @@ *fr.Translation Manufacturer/Zebra: "" *fr.Translation ModelName/Zebra CPCL Label Printer: "" *fr.Translation ShortNickName/Zebra CPCL Label Printer: "" -*fr.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*fr.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize w144h72/2.00x1.00": "" *fr.PageSize w144h90/2.00x1.25": "" @@ -792,7 +792,7 @@ *it.Translation Manufacturer/Zebra: "" *it.Translation ModelName/Zebra CPCL Label Printer: "" *it.Translation ShortNickName/Zebra CPCL Label Printer: "" -*it.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*it.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize w144h72/2.00x1.00": "" *it.PageSize w144h90/2.00x1.25": "" @@ -907,7 +907,7 @@ *ja.Translation Manufacturer/Zebra: "" *ja.Translation ModelName/Zebra CPCL Label Printer: "" *ja.Translation ShortNickName/Zebra CPCL Label Printer: "" -*ja.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*ja.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize w144h72/2.00x1.00": "" *ja.PageSize w144h90/2.00x1.25": "" @@ -1022,8 +1022,8 @@ *ko.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*ko.Translation NickName/Zebra CPCL Label Printer, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize w144h72/2.00x1.00": "" *ko.PageSize w144h90/2.00x1.25": "" *ko.PageSize w144h144/2.00x2.00": "" @@ -1137,7 +1137,7 @@ *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 NickName/Zebra CPCL Label Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize w144h72/2.00x1.00": "" *nl.PageSize w144h90/2.00x1.25": "" @@ -1252,7 +1252,7 @@ *no.Translation Manufacturer/Zebra: "" *no.Translation ModelName/Zebra CPCL Label Printer: "" *no.Translation ShortNickName/Zebra CPCL Label Printer: "" -*no.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*no.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize w144h72/2.00x1.00": "" *no.PageSize w144h90/2.00x1.25": "" @@ -1367,7 +1367,7 @@ *pt.Translation Manufacturer/Zebra: "" *pt.Translation ModelName/Zebra CPCL Label Printer: "" *pt.Translation ShortNickName/Zebra CPCL Label Printer: "" -*pt.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*pt.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize w144h72/2.00x1.00": "" *pt.PageSize w144h90/2.00x1.25": "" @@ -1482,7 +1482,7 @@ *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 NickName/Zebra CPCL Label Printer, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize w144h72/2.00x1.00": "" *pt_BR.PageSize w144h90/2.00x1.25": "" @@ -1594,125 +1594,10 @@ *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: "" -*sv.Translation NickName/Zebra CPCL Label Printer, 1.3: "" +*sv.Translation NickName/Zebra CPCL Label Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize w144h72/2.00x1.00": "" *sv.PageSize w144h90/2.00x1.25": "" @@ -1827,8 +1712,8 @@ *zh.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh.Translation NickName/Zebra CPCL Label Printer, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize w144h72/2.00x1.00": "" *zh.PageSize w144h90/2.00x1.25": "" *zh.PageSize w144h144/2.00x2.00": "" @@ -1942,8 +1827,8 @@ *zh_TW.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh_TW.Translation NickName/Zebra CPCL Label Printer, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize w144h72/2.00x1.00": "" *zh_TW.PageSize w144h90/2.00x1.25": "" *zh_TW.PageSize w144h144/2.00x2.00": "" @@ -2090,4 +1975,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, 75850 bytes. +*% End of ZEBRACPL.PPD, 71686 bytes. diff --git a/ppd/zebraep1.ppd b/ppd/zebraep1.ppd index 5d87da709..ab97b75d1 100644 --- a/ppd/zebraep1.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "ZEBRAEP1.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Zebra" *ModelName: "Zebra EPL1 Label Printer" *ShortNickName: "Zebra EPL1 Label Printer" -*NickName: "Zebra EPL1 Label Printer, 1.3" +*NickName: "Zebra EPL1 Label Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 16 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertolabel" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: w288h360 @@ -271,7 +271,7 @@ *da.Translation Manufacturer/Zebra: "" *da.Translation ModelName/Zebra EPL1 Label Printer: "" *da.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*da.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*da.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize w90h18/1.25x0.25": "" *da.PageSize w90h162/1.25x2.25": "" @@ -359,7 +359,7 @@ *de.Translation Manufacturer/Zebra: "" *de.Translation ModelName/Zebra EPL1 Label Printer: "" *de.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*de.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*de.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize w90h18/1.25x0.25": "" *de.PageSize w90h162/1.25x2.25": "" @@ -447,7 +447,7 @@ *es.Translation Manufacturer/Zebra: "" *es.Translation ModelName/Zebra EPL1 Label Printer: "" *es.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*es.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*es.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize w90h18/1.25x0.25": "" *es.PageSize w90h162/1.25x2.25": "" @@ -535,7 +535,7 @@ *fi.Translation Manufacturer/Zebra: "" *fi.Translation ModelName/Zebra EPL1 Label Printer: "" *fi.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*fi.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*fi.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize w90h18/1.25x0.25": "" *fi.PageSize w90h162/1.25x2.25": "" @@ -623,7 +623,7 @@ *fr.Translation Manufacturer/Zebra: "" *fr.Translation ModelName/Zebra EPL1 Label Printer: "" *fr.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*fr.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*fr.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize w90h18/1.25x0.25": "" *fr.PageSize w90h162/1.25x2.25": "" @@ -711,7 +711,7 @@ *it.Translation Manufacturer/Zebra: "" *it.Translation ModelName/Zebra EPL1 Label Printer: "" *it.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*it.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*it.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize w90h18/1.25x0.25": "" *it.PageSize w90h162/1.25x2.25": "" @@ -799,7 +799,7 @@ *ja.Translation Manufacturer/Zebra: "" *ja.Translation ModelName/Zebra EPL1 Label Printer: "" *ja.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*ja.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*ja.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize w90h18/1.25x0.25": "" *ja.PageSize w90h162/1.25x2.25": "" @@ -887,8 +887,8 @@ *ko.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*ko.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize w90h18/1.25x0.25": "" *ko.PageSize w90h162/1.25x2.25": "" *ko.PageSize w108h18/1.50x0.25": "" @@ -975,7 +975,7 @@ *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 NickName/Zebra EPL1 Label Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize w90h18/1.25x0.25": "" *nl.PageSize w90h162/1.25x2.25": "" @@ -1063,7 +1063,7 @@ *no.Translation Manufacturer/Zebra: "" *no.Translation ModelName/Zebra EPL1 Label Printer: "" *no.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*no.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*no.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize w90h18/1.25x0.25": "" *no.PageSize w90h162/1.25x2.25": "" @@ -1151,7 +1151,7 @@ *pt.Translation Manufacturer/Zebra: "" *pt.Translation ModelName/Zebra EPL1 Label Printer: "" *pt.Translation ShortNickName/Zebra EPL1 Label Printer: "" -*pt.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*pt.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize w90h18/1.25x0.25": "" *pt.PageSize w90h162/1.25x2.25": "" @@ -1239,7 +1239,7 @@ *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 NickName/Zebra EPL1 Label Printer, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize w90h18/1.25x0.25": "" *pt_BR.PageSize w90h162/1.25x2.25": "" @@ -1324,98 +1324,10 @@ *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: "" -*sv.Translation NickName/Zebra EPL1 Label Printer, 1.3: "" +*sv.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize w90h18/1.25x0.25": "" *sv.PageSize w90h162/1.25x2.25": "" @@ -1503,8 +1415,8 @@ *zh.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize w90h18/1.25x0.25": "" *zh.PageSize w90h162/1.25x2.25": "" *zh.PageSize w108h18/1.50x0.25": "" @@ -1591,8 +1503,8 @@ *zh_TW.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh_TW.Translation NickName/Zebra EPL1 Label Printer, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize w90h18/1.25x0.25": "" *zh_TW.PageSize w90h162/1.25x2.25": "" *zh_TW.PageSize w108h18/1.50x0.25": "" @@ -1712,4 +1624,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, 65262 bytes. +*% End of ZEBRAEP1.PPD, 62118 bytes. diff --git a/ppd/zebraep2.ppd b/ppd/zebraep2.ppd index 829775a56..ce2e2ca27 100644 --- a/ppd/zebraep2.ppd +++ b/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.0. +*% Created by the CUPS PPD Compiler v1.2.4. *% Copyright 2007 by Apple Inc. *% Copyright 1997-2007 by Easy Software Products. *% @@ -10,7 +10,7 @@ *% which should have been included with this file. If this file is *% file is missing or damaged, see the license at "http://www.cups.org/". *FormatVersion: "4.3" -*FileVersion: "1.3" +*FileVersion: "1.4" *LanguageVersion: English *LanguageEncoding: ISOLatin1 *PCFileName: "ZEBRAEP2.PPD" @@ -19,7 +19,7 @@ *Manufacturer: "Zebra" *ModelName: "Zebra EPL2 Label Printer" *ShortNickName: "Zebra EPL2 Label Printer" -*NickName: "Zebra EPL2 Label Printer, 1.3" +*NickName: "Zebra EPL2 Label Printer, 1.4" *PSVersion: "(3010.000) 81504" *PSVersion: "(3010.000) 860" *LanguageLevel: "3" @@ -30,11 +30,11 @@ *LandscapeOrientation: Plus90 *TTRasterizer: Type42 *% Driver-defined attributes... -*cupsVersion: 1.3 +*cupsVersion: 1.4 *cupsModelNumber: 17 *cupsManualCopies: False *cupsFilter: "application/vnd.cups-raster 50 rastertolabel" -*cupsLanguages: "da de es fi fr it ja ko nl no pt pt_BR pt_PT sv zh zh_TW" +*cupsLanguages: "en da de es fi fr it ja ko nl no pt pt_BR sv zh zh_TW" *OpenUI *PageSize/Media Size: PickOne *OrderDependency: 10 AnySetup *PageSize *DefaultPageSize: w288h360 @@ -282,7 +282,7 @@ *da.Translation Manufacturer/Zebra: "" *da.Translation ModelName/Zebra EPL2 Label Printer: "" *da.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*da.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*da.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *da.Translation PageSize/Media Size: "" *da.PageSize w90h18/1.25x0.25": "" *da.PageSize w90h162/1.25x2.25": "" @@ -378,7 +378,7 @@ *de.Translation Manufacturer/Zebra: "" *de.Translation ModelName/Zebra EPL2 Label Printer: "" *de.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*de.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*de.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *de.Translation PageSize/Media Size: "" *de.PageSize w90h18/1.25x0.25": "" *de.PageSize w90h162/1.25x2.25": "" @@ -474,7 +474,7 @@ *es.Translation Manufacturer/Zebra: "" *es.Translation ModelName/Zebra EPL2 Label Printer: "" *es.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*es.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*es.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *es.Translation PageSize/Media Size: "" *es.PageSize w90h18/1.25x0.25": "" *es.PageSize w90h162/1.25x2.25": "" @@ -570,7 +570,7 @@ *fi.Translation Manufacturer/Zebra: "" *fi.Translation ModelName/Zebra EPL2 Label Printer: "" *fi.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*fi.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*fi.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *fi.Translation PageSize/Media Size: "" *fi.PageSize w90h18/1.25x0.25": "" *fi.PageSize w90h162/1.25x2.25": "" @@ -666,7 +666,7 @@ *fr.Translation Manufacturer/Zebra: "" *fr.Translation ModelName/Zebra EPL2 Label Printer: "" *fr.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*fr.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*fr.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *fr.Translation PageSize/Media Size: "" *fr.PageSize w90h18/1.25x0.25": "" *fr.PageSize w90h162/1.25x2.25": "" @@ -762,7 +762,7 @@ *it.Translation Manufacturer/Zebra: "" *it.Translation ModelName/Zebra EPL2 Label Printer: "" *it.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*it.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*it.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *it.Translation PageSize/Media Size: "" *it.PageSize w90h18/1.25x0.25": "" *it.PageSize w90h162/1.25x2.25": "" @@ -858,7 +858,7 @@ *ja.Translation Manufacturer/Zebra: "" *ja.Translation ModelName/Zebra EPL2 Label Printer: "" *ja.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*ja.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*ja.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *ja.Translation PageSize/Media Size: "" *ja.PageSize w90h18/1.25x0.25": "" *ja.PageSize w90h162/1.25x2.25": "" @@ -954,8 +954,8 @@ *ko.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*ko.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" +*ko.Translation PageSize/Page Size: "" *ko.PageSize w90h18/1.25x0.25": "" *ko.PageSize w90h162/1.25x2.25": "" *ko.PageSize w108h18/1.50x0.25": "" @@ -1050,7 +1050,7 @@ *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 NickName/Zebra EPL2 Label Printer, 1.4: "" *nl.Translation PageSize/Media Size: "" *nl.PageSize w90h18/1.25x0.25": "" *nl.PageSize w90h162/1.25x2.25": "" @@ -1146,7 +1146,7 @@ *no.Translation Manufacturer/Zebra: "" *no.Translation ModelName/Zebra EPL2 Label Printer: "" *no.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*no.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*no.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *no.Translation PageSize/Media Size: "" *no.PageSize w90h18/1.25x0.25": "" *no.PageSize w90h162/1.25x2.25": "" @@ -1242,7 +1242,7 @@ *pt.Translation Manufacturer/Zebra: "" *pt.Translation ModelName/Zebra EPL2 Label Printer: "" *pt.Translation ShortNickName/Zebra EPL2 Label Printer: "" -*pt.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*pt.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *pt.Translation PageSize/Media Size: "" *pt.PageSize w90h18/1.25x0.25": "" *pt.PageSize w90h162/1.25x2.25": "" @@ -1338,7 +1338,7 @@ *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 NickName/Zebra EPL2 Label Printer, 1.4: "" *pt_BR.Translation PageSize/Media Size: "" *pt_BR.PageSize w90h18/1.25x0.25": "" *pt_BR.PageSize w90h162/1.25x2.25": "" @@ -1431,106 +1431,10 @@ *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: "" -*sv.Translation NickName/Zebra EPL2 Label Printer, 1.3: "" +*sv.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" *sv.Translation PageSize/Media Size: "" *sv.PageSize w90h18/1.25x0.25": "" *sv.PageSize w90h162/1.25x2.25": "" @@ -1626,8 +1530,8 @@ *zh.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" +*zh.Translation PageSize/Page Size: "" *zh.PageSize w90h18/1.25x0.25": "" *zh.PageSize w90h162/1.25x2.25": "" *zh.PageSize w108h18/1.50x0.25": "" @@ -1722,8 +1626,8 @@ *zh_TW.Translation Manufacturer/Zebra: "" *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/Media Size: "" +*zh_TW.Translation NickName/Zebra EPL2 Label Printer, 1.4: "" +*zh_TW.Translation PageSize/Page Size: "" *zh_TW.PageSize w90h18/1.25x0.25": "" *zh_TW.PageSize w90h162/1.25x2.25": "" *zh_TW.PageSize w108h18/1.50x0.25": "" @@ -1851,4 +1755,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, 70917 bytes. +*% End of ZEBRAEP2.PPD, 67437 bytes. diff --git a/scheduler/classes.c b/scheduler/classes.c index 5b06ff739..192c4d01d 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -256,6 +256,9 @@ 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... diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index dd08c4b17..5303bf898 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -202,7 +202,7 @@ cupsdDeregisterPrinter( * Announce the deletion... */ - if ((BrowseLocalProtocols & BROWSE_CUPS)) + if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0) { cups_ptype_t savedtype = p->type; /* Saved printer type */ @@ -866,7 +866,7 @@ cupsdSendBrowseList(void) p->browse_time = time(NULL); - if (BrowseLocalProtocols & BROWSE_CUPS) + if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0) send_cups_browse(p); #ifdef HAVE_LIBSLP diff --git a/scheduler/ipp.c b/scheduler/ipp.c index e2b517e88..690a08732 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -1274,7 +1274,8 @@ 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->super, filetype->type); + filetype, filetype ? filetype->super : "none", + filetype ? filetype->type : "none"); /* * Check remote printing to non-shared printer... @@ -3158,6 +3159,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ cupsd_job_t *job; /* Job information */ cups_ptype_t dtype; /* Destination type (printer/class) */ cupsd_printer_t *printer; /* Printer data */ + int purge; /* Purge the job? */ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cancel_job(%p[%d], %s)", con, @@ -3265,6 +3267,16 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ jobid = atoi(resource + 6); } + /* + * Look for the "purge-job" attribute... + */ + + if ((attr = ippFindAttribute(con->request, "purge-job", + IPP_TAG_BOOLEAN)) != NULL) + purge = attr->values[0].boolean; + else + purge = 0; + /* * See if the job exists... */ @@ -3294,7 +3306,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ * we can't cancel... */ - if (job->state_value >= IPP_JOB_CANCELED) + if (job->state_value >= IPP_JOB_CANCELED && !purge) { switch (job->state_value) { @@ -3324,11 +3336,15 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ * Cancel the job and return... */ - cupsdCancelJob(job, 0, IPP_JOB_CANCELED); + cupsdCancelJob(job, purge, IPP_JOB_CANCELED); cupsdCheckJobs(); - cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Canceled by \"%s\".", jobid, - username); + if (purge) + cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Purged by \"%s\".", jobid, + username); + else + cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Canceled by \"%s\".", jobid, + username); con->response->request.status.status_code = IPP_OK; } @@ -6089,6 +6105,12 @@ 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; @@ -8493,9 +8515,7 @@ 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__ @@ -8524,7 +8544,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(krb_context, &krb5_fcc_ops, + if ((error = krb5_cc_gen_new(KerberosContext, &krb5_fcc_ops, &(job->ccache))) != 0) # endif /* HAVE_KRB5_CC_NEW_UNIQUE */ { diff --git a/scheduler/job.c b/scheduler/job.c index 4639b336a..9169b4485 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -250,7 +250,7 @@ cupsdCancelJob(cupsd_job_t *job, /* I - Job to cancel */ job->current_file = 0; - if (!JobHistory || !JobFiles || purge || (job->dtype & CUPS_PRINTER_REMOTE)) + if (!JobHistory || !JobFiles || purge) { for (i = 1; i <= job->num_files; i ++) { @@ -270,7 +270,7 @@ cupsdCancelJob(cupsd_job_t *job, /* I - Job to cancel */ } } - if (JobHistory && !purge && !(job->dtype & CUPS_PRINTER_REMOTE)) + if (JobHistory && !purge) { /* * Save job state info... @@ -318,6 +318,13 @@ 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))) { @@ -327,6 +334,7 @@ cupsdCancelJobs(const char *dest, /* I - Destination to cancel */ cupsdCancelJob(job, purge, IPP_JOB_CANCELED); } + } cupsdCheckJobs(); } @@ -2437,7 +2445,7 @@ start_job(cupsd_job_t *job, /* I - Job ID */ title[IPP_MAX_NAME], /* Job title string */ copies[255], /* # copies string */ - *envp[MAX_ENV + 15], + *envp[MAX_ENV + 16], /* Environment variables */ charset[255], /* CHARSET env variable */ class_name[255],/* CLASS env variable */ @@ -2450,6 +2458,10 @@ start_job(cupsd_job_t *job, /* I - Job ID */ final_content_type[1024], /* FINAL_CONTENT_TYPE env variable */ lang[255], /* LANG env variable */ +#ifdef __APPLE__ + apple_language[255], + /* APPLE_LANGUAGE env variable */ +#endif /* __APPLE__ */ ppd[1024], /* PPD env variable */ printer_name[255], /* PRINTER env variable */ @@ -2992,6 +3004,12 @@ start_job(cupsd_job_t *job, /* I - Job ID */ attr = ippFindAttribute(job->attrs, "attributes-natural-language", IPP_TAG_LANGUAGE); +#ifdef __APPLE__ + strcpy(apple_language, "APPLE_LANGUAGE"); + _cupsAppleLanguage(attr->values[0].string.text, + apple_language + 15, sizeof(apple_language) - 15); +#endif /* __APPLE__ */ + switch (strlen(attr->values[0].string.text)) { default : @@ -3052,6 +3070,9 @@ start_job(cupsd_job_t *job, /* I - Job ID */ envp[envc ++] = charset; envp[envc ++] = lang; +#ifdef __APPLE__ + envp[envc ++] = apple_language; +#endif /* __APPLE__ */ envp[envc ++] = ppd; envp[envc ++] = rip_max_cache; envp[envc ++] = content_type; diff --git a/scheduler/printers.c b/scheduler/printers.c index 4f69babbe..3571454f5 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -2640,7 +2640,8 @@ cupsdSetPrinterState( if (old_state != s) { - cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL, + cupsdAddEvent(s == IPP_PRINTER_STOPPED ? CUPSD_EVENT_PRINTER_STOPPED : + CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL, "%s \"%s\" state changed.", (p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer", p->name); diff --git a/scheduler/select.c b/scheduler/select.c index c6f278e36..a2e1925d1 100644 --- a/scheduler/select.c +++ b/scheduler/select.c @@ -33,6 +33,7 @@ #ifdef HAVE_EPOLL # include +# include #elif defined(HAVE_KQUEUE) # include # include @@ -167,8 +168,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 select(), followed by kqueue() at 16% slower - * than select() and poll() at 18% slower than select(). Similar + * performed 5.5% slower than 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 @@ -214,10 +215,7 @@ static cups_array_t *cupsd_inactive_fds = NULL; static int cupsd_in_select = 0; #endif /* HAVE_EPOLL || HAVE_KQUEUE */ -#ifdef HAVE_EPOLL -static int cupsd_epoll_fd = -1; -static struct epoll_event *cupsd_epoll_events = NULL; -#elif defined(HAVE_KQUEUE) +#ifdef HAVE_KQUEUE static int cupsd_kqueue_fd = -1, cupsd_kqueue_changes = 0; static struct kevent *cupsd_kqueue_events = NULL; @@ -225,12 +223,16 @@ 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_EPOLL */ +#endif /* HAVE_KQUEUE */ /* @@ -299,26 +301,7 @@ cupsdAddSelect(int fd, /* I - File descriptor */ else added = 0; -#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) +#ifdef HAVE_KQUEUE { struct kevent event; /* Event data */ struct timespec timeout; /* Timeout value */ @@ -361,6 +344,33 @@ 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() */ @@ -396,7 +406,7 @@ cupsdAddSelect(int fd, /* I - File descriptor */ FD_CLR(fd, &cupsd_global_output); FD_CLR(fd, &cupsd_current_output); } -#endif /* HAVE_EPOLL */ +#endif /* HAVE_KQUEUE */ /* * Save the (new) read and write callbacks... @@ -419,53 +429,7 @@ cupsdDoSelect(long timeout) /* I - Timeout in seconds */ { int nfds; /* Number of file descriptors */ _cupsd_fd_t *fdptr; /* Current file descriptor */ -#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) +#ifdef HAVE_KQUEUE int i; /* Looping var */ struct kevent *event; /* Current event */ struct timespec ktimeout; /* kevent() timeout */ @@ -528,6 +492,66 @@ 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) @@ -706,13 +730,17 @@ cupsdDoSelect(long timeout) /* I - Timeout in seconds */ } } -#endif /* HAVE_EPOLL */ +#endif /* HAVE_KQUEUE */ #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); @@ -781,7 +809,12 @@ cupsdRemoveSelect(int fd) /* I - File descriptor */ return; #ifdef HAVE_EPOLL - epoll_ctl(cupsd_epoll_fd, EPOLL_CTL_DEL, fd, &event); + if (epoll_ctl(cupsd_epoll_fd, EPOLL_CTL_DEL, fd, &event)) + { + close(cupsd_epoll_fd); + cupsd_epoll_fd = -1; + cupsd_update_pollfds = 1; + } #elif defined(HAVE_KQUEUE) timeout.tv_sec = 0; @@ -862,8 +895,9 @@ 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_epoll_fd = epoll_create(MaxFDs); + cupsd_epoll_events = calloc(MaxFDs, sizeof(struct epoll_event)); + cupsd_update_pollfds = 0; #elif defined(HAVE_KQUEUE) cupsd_kqueue_fd = kqueue(); @@ -903,20 +937,7 @@ cupsdStopSelect(void) cupsd_inactive_fds = NULL; #endif /* HAVE_EPOLL || 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) +#ifdef HAVE_KQUEUE if (cupsd_kqueue_events) { free(cupsd_kqueue_events); @@ -932,6 +953,20 @@ 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); diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 55b930a9e..8e7201f40 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -2053,6 +2053,9 @@ check_translations(ppd_file_t *ppd, /* I - PPD file */ continue; } + if (!strcmp(langstart, "en")) + continue; + cupsArrayAdd(langlist, langstart); strlcpy(ll, langstart, sizeof(ll)); diff --git a/systemv/lpmove.c b/systemv/lpmove.c index e991dfd9a..0795737f1 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -121,6 +121,9 @@ 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]; } diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl index 18fe6c914..fd79db9b6 100644 --- a/templates/trailer.tmpl +++ b/templates/trailer.tmpl @@ -2,8 +2,8 @@   The Common UNIX Printing System, CUPS, and the CUPS logo are the trademark property of -Apple, Inc. CUPS is copyright 2007 by Apple -Inc, all rights reserved. +Apple Inc. CUPS is copyright 2007 by Apple +Inc., all rights reserved. -- 2.39.2