diff options
1602 files changed, 6654 insertions, 3103 deletions
diff --git a/Makefile.am b/Makefile.am index f96272a15..f6f0e356e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,567 +1,566 @@ -# -# Makefile.am - hplip automake input file -# -# (c) 2004-2010 Copyright Hewlett-Packard Development Company, LP -# Author: David Suffield, Naga Samrat Chowdary Narla, - -INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs - -hplipdir = $(datadir)/hplip - -docdir = $(hpdocdir) -doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG -EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright - -dist_noinst_SCRIPTS = -dist_noinst_DATA = -noinst_PROGRAMS = -lib_LTLIBRARIES = - -include foomatic_drv.inc -include unreleased.inc -include cups_drv.inc - -if DOC_BUILD -wwwsrc = doc -www0dir = $(docdir) -dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html -www3dir = $(docdir)/styles -dist_www3_DATA = $(wwwsrc)/styles/* -www4dir = $(docdir)/images -dist_www4_DATA = $(wwwsrc)/images/* -endif - -if HPLIP_BUILD - -# hp backend. -hpdir = $(cupsbackenddir) -hp_PROGRAMS = hp -hp_SOURCES = prnt/backend/hp.c -hp_LDADD = libhpmud.la $(DBUS_LIBS) -hp_CFLAGS = $(DBUS_CFLAGS) - -# hpaio sane backend -if SCAN_BUILD -libsane_hpaiodir = $(libdir)/sane -libsane_hpaio_LTLIBRARIES = libsane-hpaio.la -libsane_hpaio_la_SOURCES = scan/sane/hpaio.c scan/sane/mfpdtf.c scan/sane/pml.c scan/sane/scl.c scan/sane/io.c scan/sane/hpaio.h \ - scan/sane/pml.h scan/sane/saneopts.h scan/sane/io.h scan/sane/mfpdtf.h scan/sane/sane.h scan/sane/scl.h scan/sane/tables.h \ - scan/sane/common.c scan/sane/common.h scan/sane/soap.h scan/sane/soapht.h scan/sane/sanei_debug.h scan/sane/sanei.h \ - scan/sane/sanei_init_debug.c scan/sane/marvell.h scan/sane/marvelli.h scan/sane/marvell.c scan/sane/soapht.c scan/sane/soap.c \ - scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \ - scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c -if DARWIN_BUILD -libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0 -else -libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 -endif -# The following is a interlibrary dependency that must be compiled first. -libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl -#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG -libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -endif # SCAN_BUILD - -# hpmud library -MUDNAME=hpmud -lib_LTLIBRARIES += libhpmud.la -libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/musb.c io/hpmud/pml.c \ - io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/musb.h io/hpmud/pml.h io/hpmud/dot4.c \ - io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h -if NETWORK_BUILD -libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -l$(SNMPLIB) -lcrypto -else -libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -endif -libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" - -# ip library -lib_LTLIBRARIES += libhpip.la -libhpip_la_LDFLAGS = -version-info 0:1:0 -libhpip_la_LIBADD = -lm -libhpip_la_SOURCES = ip/xconvolve.c ip/xfax.c ip/xgrayout.c ip/xjpg_dct.c ip/xjpg_fix.c ip/xpad.c ip/xrotate.c ip/xskel.c ip/xtiff.c \ - ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \ - ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \ - ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h - -# hp-mkuri. -hp_mkuridir = $(bindir) -hp_mkuri_PROGRAMS = hp-mkuri -hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c -hp_mkuri_LDADD = -ldl libhpmud.la -hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" - -# hpmud.rules -rulesdir = /etc/udev/rules.d -dist_rules_DATA = data/rules/56-hpmud_support.rules -if UDEV_ACL_RULES -dist_rules_DATA += data/rules/40-hplip.rules -else -dist_rules_DATA += data/rules/55-hpmud.rules -endif -halpredir = /usr/share/hal/fdi/preprobe/10osvendor -dist_halpre_DATA = data/rules/20-hplip-devices.fdi - -# hplip.conf -hplip_confdir = /etc/hp -hplip_conf_DATA = hplip.conf - -#pstotiff filter -pstotiffdir = $(cupsfilterdir) -pstotiff_SCRIPTS = fax/filters/pstotiff - -# hplip.state -hplip_statedir = /var/lib/hp -dist_hplip_state_DATA = hplip.state - -if FULL_BUILD - -dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py -dist_noinst_DATA += scan/sane/hpaio.desc prnt/drv/hpijs.drv.in.template -dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall - -cmddir = $(hplipdir) -dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \ - sendfax.py setup.py makecopies.py probe.py timedate.py firmware.py scan.py systray.py plugin.py linefeedcal.py pqdiag.py \ - faxsetup.py devicesettings.py printsettings.py query.py pkservice.py wificonfig.py - -# base -basedir = $(hplipdir)/base - -dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \ - base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \ - base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \ - base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \ - base/ldif.py base/vcard.py base/module.py base/pkit.py - -# installer -installdir = $(hplipdir)/installer -dist_install_DATA = installer/__init__.py installer/dcheck.py installer/distros.dat installer/core_install.py -dist_noinst_DATA += installer/text_install.py - -# makecopies -copierdir = $(hplipdir)/copier -dist_copier_DATA = copier/copier.py copier/__init__.py - -# fax -if FAX_BUILD -faxdir = $(hplipdir)/fax -dist_fax_DATA = fax/fax.py fax/__init__.py fax/coverpages.py fax/pmlfax.py fax/soapfax.py fax/marvellfax.py \ - fax/faxdevice.py fax/filters/pstotiff fax/filters/pstotiff.convs fax/filters/pstotiff.types -fax_filtersdir = $(mimedir) -dist_fax_filters_DATA = fax/filters/pstotiff.convs fax/filters/pstotiff.types -hpfaxdir = $(cupsbackenddir) -dist_hpfax_SCRIPTS = fax/backend/hpfax.py -hpijsfaxppddir = $(hpppddir) -hpcupsfaxppddir = $(hpppddir) -if HPIJS_INSTALL -dist_hpijsfaxppd_DATA = fax/ppd/HP-Fax-hpijs.ppd.gz fax/ppd/HP-Fax2-hpijs.ppd.gz fax/ppd/HP-Fax3-hpijs.ppd.gz -endif # HPIJS_INSTALL -if HPCUPS_INSTALL -dist_hpcupsfaxppd_DATA = fax/ppd/HP-Fax-hpcups.ppd.gz fax/ppd/HP-Fax2-hpcups.ppd.gz fax/ppd/HP-Fax3-hpcups.ppd.gz -endif # HPCUPS_INSTALL -endif # FAX_BUILD - -# ptest -noinst_PROGRAMS += ptest -ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h -ptest_LDADD = libhpmud.la - -# data -modelsdir = $(hplipdir)/data/models -images_16x16dir = $(hplipdir)/data/images/16x16 -images_24x24dir = $(hplipdir)/data/images/24x24 -images_32x32dir = $(hplipdir)/data/images/32x32 -images_64x64dir = $(hplipdir)/data/images/64x64 -images_128x128dir = $(hplipdir)/data/images/128x128 -images_256x256dir = $(hplipdir)/data/images/256x256 -images_devicesdir = $(hplipdir)/data/images/devices -images_otherdir = $(hplipdir)/data/images/other -pcldir = $(hplipdir)/data/pcl -ldldir = $(hplipdir)/data/ldl -postscriptdir = $(hplipdir)/data/ps -localzdir = $(hplipdir)/data/localization -dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz -dist_models_DATA = data/models/models.dat - -if GUI_BUILD -dist_images_16x16_DATA = data/images/16x16/* -dist_images_24x24_DATA = data/images/24x24/* -dist_images_32x32_DATA = data/images/32x32/* -dist_images_64x64_DATA = data/images/64x64/* -dist_images_128x128_DATA = data/images/128x128/* -dist_images_256x256_DATA = data/images/256x256/* -dist_images_devices_DATA = data/images/devices/* -dist_images_other_DATA = data/images/other/* -endif - -dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ - data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ - data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \ - data/pcl/crcpcal.pcl.gz data/pcl/crpcal.pcl.gz -dist_ldl_DATA = data/ldl/cb2pcal.ldl.gz data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz data/ldl/cbccal.ldl.gz data/ldl/cbccal_done.ldl.gz data/ldl/cbcpcal.ldl.gz \ - data/ldl/cbpcal.ldl.gz -dist_localz_DATA = data/localization/hplip_de.qm data/localization/hplip_es.qm data/localization/hplip_fr.qm data/localization/hplip_it.qm \ - data/localization/hplip_pt.qm data/localization/hplip_ru.qm data/localization/hplip_zh.qm -dist_noinst_DATA += data/localization/hplip_de.ts data/localization/hplip_es.ts data/localization/hplip_fr.ts data/localization/hplip_it.ts \ - data/localization/hplip_pt.ts data/localization/hplip_ru.ts data/localization/hplip_zh.ts - -# pcard -pcarddir = $(hplipdir)/pcard -dist_pcard_DATA = pcard/__init__.py pcard/photocard.py - -# pcardext -pcardextdir = $(pyexecdir) -pcardext_LTLIBRARIES = pcardext.la -pcardext_la_LDFLAGS = -module -avoid-version -pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c -pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) - -# prnt -prntdir = $(hplipdir)/prnt -dist_prnt_DATA = prnt/cups.py prnt/__init__.py prnt/ldl.py prnt/pcl.py prnt/colorcal.py - -# cupsext -cupsextdir = $(pyexecdir) -cupsext_LTLIBRARIES = cupsext.la -cupsext_la_LDFLAGS = -module -avoid-version -cupsext_la_SOURCES = prnt/cupsext/cupsext.c -cupsext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) -cupsext_la_LIBADD = -lcups - -if SCAN_BUILD -# scan -scandir = $(hplipdir)/scan -dist_scan_DATA = scan/__init__.py scan/sane.py - -# scanext -scanextdir = $(pyexecdir) -scanext_LTLIBRARIES = scanext.la -scanext_la_LDFLAGS = -module -avoid-version -lsane -scanext_la_SOURCES = scan/scanext/scanext.c -scanext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) -endif - -# hpmudext -hpmudextdir = $(pyexecdir) -hpmudext_LTLIBRARIES = hpmudext.la -hpmudext_la_LDFLAGS = -module -avoid-version -hpmudext_la_SOURCES = io/mudext/hpmudext.c -hpmudext_la_LIBADD = libhpmud.la -hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) - -# ui (qt3) -if GUI_BUILD -if QT3_INSTALL -uidir = $(hplipdir)/ui -dist_ui_DATA = ui/alignform.py \ - ui/colorcalform_base.py ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py ui/devmgr4_base.py ui/devmgr4.py \ - ui/__init__.py ui/loadpaperform_base.py ui/loadpaperform.py \ - ui/paperedgealignform_base.py ui/paperedgealignform.py ui/ui_utils.py \ - ui/settingsdialog_base.py ui/settingsdialog.py ui/aligntype6form1.py ui/aligntype6form1_base.py ui/aligntype6form2_base.py \ - ui/aligntype6form2.py ui/nodevicesform_base.py ui/nodevicesform.py ui/unloadform.py \ - ui/imagepropertiesdlg_base.py ui/imagepropertiesdlg.py ui/choosedevicedlg.py ui/chooseprinterdlg.py \ - ui/aboutdlg.py ui/aboutdlg_base.py ui/waitform.py ui/waitform_base.py ui/cleaningform_base.py ui/cleaningform.py \ - ui/cleaningform2_base.py ui/cleaningform2.py ui/colorcalform2_base.py ui/colorcalform2.py ui/colorcal4form.py \ - ui/colorcal4form_base.py ui/colorcal4form_base.ui ui/printerform.py \ - ui/faxaddrbookgroupsform_base.py ui/faxaddrbookgroupeditform_base.py ui/faxaddrbookform_base.py \ - ui/faxaddrbookform.py ui/faxaddrbookeditform_base.py ui/align10form.py ui/align10form_base.py \ - ui/faxsendjobform.py ui/faxsettingsform_base.py ui/faxsettingsform.py \ - ui/coverpageform_base.py ui/coverpageform.py ui/allowabletypesdlg_base.py ui/allowabletypesdlg.py \ - ui/makecopiesform.py ui/setupform_base.py ui/setupform.py ui/setupmanualfind_base.py \ - ui/setupmanualfind.py ui/setupsettings_base.py ui/setupsettings.py ui/scrollview.py \ - ui/scrollprintsettings.py ui/scrollprint.py ui/scrollfax.py \ - ui/scrollunload.py ui/scrollcopy.py ui/pluginform2.py ui/pluginform2_base.py ui/systemtray.py \ - ui/ui_utils.py ui/jobstoragemixin.py ui/pluginlicenseform_base.py ui/pluginlicenseform.py \ - ui/align13form_base.py ui/align13form.py - -dist_noinst_DATA += ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \ - ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \ - ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \ - ui/cleaningform2_base.ui ui/waitform_base.ui ui/coloradjform_base.ui ui/faxaddrbookeditform_base.ui \ - ui/faxaddrbookform_base.ui ui/faxaddrbookgroupeditform_base.ui ui/faxaddrbookgroupsform_base.ui \ - ui/align10form_base.ui ui/pluginform2_base.ui \ - plugins/powersettingsdialog_base.ui ui/faxsettingsform_base.ui ui/coverpageform_base.ui \ - ui/allowabletypesdlg_base.ui ui/setupform_base.ui ui/setupmanualfind_base.ui \ - ui/setupsettings_base.ui ui/pluginlicenseform_base.ui ui/align13form_base.ui -endif -endif - -#ui4 (qt4) -if GUI_BUILD -if QT4_INSTALL -ui4dir=$(hplipdir)/ui4 -#dist_ui4_SCRIPTS = ui4/devmgr5.py ui4/systemtray.py ui4/devmgr5_base.py ui4/__init__.py ui4/ui_utils.py \ -# ui4/settingsdialog_base.py ui4/settingsdialog.py ui4/printsettingstoolbox.py ui4/printdialog_base.py \ -# ui4/printdialog.py -#dist_noinst_DATA += ui4/devmgr5_base.ui ui4/settingsdialog_base.ui ui4/printdialog_base.ui -dist_ui4_DATA = ui4/*.py -dist_noinst_DATA += ui4/*.ui -endif -endif - -# ui plugins (qt3) -if GUI_BUILD -if QT3_INSTALL -pluginsdir = $(hplipdir)/plugins -dist_plugins_DATA = plugins/dj450.py plugins/__init__.py plugins/powersettings.py plugins/powersettingsdialog.py \ - plugins/powersettingsdialog_base.py plugins/Deskjet_460.py plugins/Officejet_H470.py plugins/powersettings2.py -endif -endif - -# ui plugins (qt4) -if GUI_BUILD -if QT4_INSTALL -plugins4dir = $(hplipdir)/ui4/plugins -dist_plugins4_SCRIPTS = -endif -endif - -# PolicyKit -if POLICYKIT_INSTALL -policykit_dbus_etcdir = /etc/dbus-1/system.d -dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf -policykit_dbus_sharedir = /usr/share/dbus-1/system-services -dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service -policykit_policydir = $(policykit_dir) -dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy -endif - -# hppgsz -noinst_PROGRAMS += hppgsz -hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h -hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS) -hppgsz_CFLAGS = $(libapdk_la_CFLAGS) -hppgsz_LDADD = libapdk.la -ljpeg -ldl - -# hplip.desktop -hplip_desktopdir = $(icondir) -hplip_desktop_DATA = hplip.desktop - -# hplip-systray.desktop -hplip_systraydir = $(systraydir) -hplip_systray_DATA = hplip-systray.desktop - -# hpipjs (CUPS filter) -hplipjsdir = $(cupsfilterdir) -hplipjs_PROGRAMS = hplipjs -hplipjs_SOURCES = prnt/filters/hplipjs.c - -# hpcac (CUPS filter, Color Access Control, ie: CLJ 4700) -cacdir = $(cupsfilterdir) -dist_cac_SCRIPTS = prnt/filters/hpcac - -endif # FULL_BUILD -endif # HPLIP_BUILD - -# foomatic-rip-hplip -if RIP_INSTALL -ripdir = $(cupsfilterdir) -dist_rip_SCRIPTS = prnt/hpijs/foomatic-rip-hplip -endif - -# apdk -noinst_LTLIBRARIES = libapdk.la -libapdk_la_SOURCES = prnt/hpijs/models.cpp prnt/hpijs/breaks_open.cpp \ - prnt/hpijs/dj9xxvip.cpp prnt/hpijs/dj9xx.cpp prnt/hpijs/capture.cpp prnt/hpijs/colormatch.cpp prnt/hpijs/colormatcher_open.cpp \ - prnt/hpijs/compression.cpp prnt/hpijs/context2.cpp prnt/hpijs/create_so.cpp prnt/hpijs/creator.cpp \ - prnt/hpijs/dj600.cpp prnt/hpijs/dj630.cpp prnt/hpijs/dj660.cpp prnt/hpijs/dj690.cpp prnt/hpijs/dj6xx.cpp prnt/hpijs/dj8xx.cpp prnt/hpijs/dj600_maps.cpp \ - prnt/hpijs/dj660_maps.cpp prnt/hpijs/dj690_maps.cpp prnt/hpijs/dj895_maps.cpp prnt/hpijs/dj895_maps2.cpp prnt/hpijs/dj970_maps.cpp \ - prnt/hpijs/dj970_maps2.cpp prnt/hpijs/dj970_maps3.cpp prnt/hpijs/filterhpa.cpp prnt/hpijs/apollo21xx.cpp prnt/hpijs/apollo2560.cpp prnt/hpijs/apollo2xxx.cpp \ - prnt/hpijs/dj8x5.cpp prnt/hpijs/psp100.cpp prnt/hpijs/phobos_cmaps.cpp prnt/hpijs/dj350.cpp prnt/hpijs/halftoner.cpp prnt/hpijs/halftoner_open.cpp \ - prnt/hpijs/globals.cpp prnt/hpijs/header2.cpp prnt/hpijs/htmtxhi.cpp prnt/hpijs/pmselect.cpp \ - prnt/hpijs/job.cpp prnt/hpijs/printer.cpp prnt/hpijs/registry.cpp prnt/hpijs/scaler.cpp \ - prnt/hpijs/scaler_open.cpp prnt/hpijs/script.cpp prnt/hpijs/systemservices.cpp \ - prnt/hpijs/translator.cpp prnt/hpijs/version.cpp prnt/hpijs/versioncode.cpp \ - prnt/hpijs/djgenericvip.cpp prnt/hpijs/dj540.cpp prnt/hpijs/dj850.cpp prnt/hpijs/dj850_maps.cpp prnt/hpijs/dj890.cpp \ - prnt/hpijs/apollo21xx.h prnt/hpijs/apollo2560.h prnt/hpijs/apollo2xxx.h prnt/hpijs/colormatch.h prnt/hpijs/colormatcher_open.h \ - prnt/hpijs/compression.h prnt/hpijs/config.h prnt/hpijs/context.h prnt/hpijs/dj350.h prnt/hpijs/dj400.h prnt/hpijs/dj540.h \ - prnt/hpijs/dj600.h prnt/hpijs/dj630.h prnt/hpijs/dj660.h prnt/hpijs/dj690.h prnt/hpijs/dj6xx.h prnt/hpijs/dj8x5.h prnt/hpijs/dj8xx.h \ - prnt/hpijs/dj850.h prnt/hpijs/dj890.h prnt/hpijs/dj9xx.h prnt/hpijs/dj9xxvip.h \ - prnt/hpijs/ernieplatform.h prnt/hpijs/filterhpa.h prnt/hpijs/global_types.h prnt/hpijs/halftoner.h prnt/hpijs/font.h prnt/hpijs/debug.h \ - prnt/hpijs/halftoner_open.h prnt/hpijs/header.h prnt/hpijs/hpprint_c_api.h \ - prnt/hpijs/hpprintapi.h prnt/hpijs/hptypes.h prnt/hpijs/htfed.h prnt/hpijs/internal.h \ - prnt/hpijs/interp.h prnt/hpijs/interp_data_50.h prnt/hpijs/io_defs.h prnt/hpijs/job.h prnt/hpijs/models.h prnt/hpijs/modes.h prnt/hpijs/pmselect.h \ - prnt/hpijs/printer.h prnt/hpijs/psp100.h prnt/hpijs/psp470.h prnt/hpijs/resources.h prnt/hpijs/scaler_open.h prnt/hpijs/scaler_prop.h prnt/hpijs/script.h \ - prnt/hpijs/systemservices.h prnt/hpijs/unistd_.h prnt/hpijs/djgenericvip.h prnt/hpijs/ljmono.h prnt/hpijs/ljmono.cpp \ - prnt/hpijs/dj3320.cpp prnt/hpijs/dj3320.h prnt/hpijs/dj3320_cmap.cpp prnt/hpijs/dj3600.cpp prnt/hpijs/dj3600.h prnt/hpijs/dj3600_cmap.cpp prnt/hpijs/dj4100.h prnt/hpijs/djd2600.h \ - prnt/hpijs/dj4100_cmap.cpp prnt/hpijs/ldlencap.h prnt/hpijs/ljcolor.cpp prnt/hpijs/ljcolor.h prnt/hpijs/pscript.h \ - prnt/hpijs/printerproxy.cpp prnt/hpijs/printerfactory.cpp prnt/hpijs/printerproxy.h prnt/hpijs/printerfactory.h \ - prnt/hpijs/ljjetready.cpp prnt/hpijs/ljjetready.h prnt/hpijs/jdatadbf.c prnt/hpijs/jccolor.c prnt/hpijs/ljfastraster.cpp prnt/hpijs/ljfastraster.h \ - prnt/hpijs/jinclude.h prnt/hpijs/jpegint.h prnt/hpijs/dj55xx.h prnt/hpijs/hpijsfax.h prnt/hpijs/ojprokx50.h \ - prnt/hpijs/ljzjs.cpp prnt/hpijs/ljzjs.h prnt/hpijs/ljzjsmono.cpp prnt/hpijs/ljm1005.cpp prnt/hpijs/ljm1005.h \ - prnt/hpijs/ljzjsmono.h prnt/hpijs/hpjbig_wrapper.h prnt/hpijs/quickconnect.cpp prnt/hpijs/quickconnect.h prnt/hpijs/ljp1xxx.h prnt/hpijs/ljzjscolor.cpp prnt/hpijs/ljzjscolor.h -libapdk_la_CXXFLAGS = -DAPDK_DJ660 -DAPDK_DJ6xx -DAPDK_DJ6xxPhoto -DAPDK_DJ8xx -DAPDK_DJ9xx -DAPDK_DJ9xxVIP -DAPDK_DJ630 \ - -DAPDK_APOLLO2XXX -DAPDK_APOLLO21XX -DAPDK_APOLLO2560 -DAPDK_DJ600 -DAPDK_DJ350 -DAPDK_DJ8x5 -DAPDK_PSP100 -DAPDK_AUTODUPLEX \ - -DAPDK_HIGH_RES_MODES -DAPDK_LJMONO -DAPDK_DJ540 -DAPDK_DJ850 -DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \ - -DAPDK_LJJETREADY -DAPDK_LJFASTRASTER -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \ - -DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LJZJS_MONO -DAPDK_LJZJS_COLOR -DAPDK_LJM1005 -DAPDK_QUICKCONNECT \ - $(APDK_ENDIAN_FLAG) $(APDK_AUTO_INCLUDE_FLAG) -DAPDK_LINUX -DNDEBUG $(DBUS_CFLAGS) -libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs - -if HPIJS_INSTALL -# hpijs -bin_PROGRAMS = hpijs -hpijs_SOURCES = prnt/hpijs/hpijs.cpp prnt/hpijs/ijs_server.c prnt/hpijs/ijs.c prnt/hpijs/hpijsfax.cpp prnt/hpijs/services.cpp prnt/hpijs/bug.h \ - prnt/hpijs/hpijs.h prnt/hpijs/ijs.h prnt/hpijs/ijs_server.h prnt/hpijs/services.h prnt/hpijs/ijs_client.h prnt/hpijs/hpiom.c prnt/hpijs/hpiom.h -hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS) -hpijs_CFLAGS = $(libapdk_la_CFLAGS) -if HPLIP_BUILD -hpijs_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS) -else -hpijs_LDADD = libapdk.la -ljpeg -ldl -endif -endif # HPIJS_INSTALL - -if HPCUPS_INSTALL -# hpcups -#if NEW_HPCUPS -hpcupsdir = $(cupsfilterdir) -hpcups_PROGRAMS = hpcups -hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hpcups/Compressor.cpp prnt/hpcups/Compressor.h \ - prnt/hpcups/Mode2.cpp prnt/hpcups/Mode2.h prnt/hpcups/Mode3.cpp prnt/hpcups/Mode3.h \ - prnt/hpcups/Mode9.cpp prnt/hpcups/Mode9.h prnt/hpcups/Mode10.cpp prnt/hpcups/Mode10.h \ - prnt/hpcups/ModeDeltaPlus.cpp prnt/hpcups/ModeDeltaPlus.h prnt/hpcups/ModeJbig.cpp prnt/hpcups/ModeJbig.h \ - prnt/hpcups/ErnieFilter.cpp prnt/hpcups/ErnieFilter.h prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \ - prnt/hpcups/Encapsulator.cpp prnt/hpcups/Encapsulator.h prnt/hpcups/Pcl3.cpp prnt/hpcups/Pcl3.h \ - prnt/hpcups/Pcl3Gui.cpp prnt/hpcups/Pcl3Gui.h prnt/hpcups/Pcl3Gui2.cpp prnt/hpcups/Pcl3Gui2.h \ - prnt/hpcups/LJMono.cpp prnt/hpcups/LJMono.h prnt/hpcups/LJColor.cpp prnt/hpcups/LJColor.h \ - prnt/hpcups/LJFastRaster.cpp prnt/hpcups/LJFastRaster.h prnt/hpcups/LJJetReady.cpp prnt/hpcups/LJJetReady.h \ -prnt/hpcups/LJZjStream.cpp prnt/hpcups/LJZjStream.h \ - prnt/hpcups/LJZxStream.cpp prnt/hpcups/LJZxStream.h prnt/hpcups/Job.cpp prnt/hpcups/Job.h \ - prnt/hpcups/Pipeline.cpp prnt/hpcups/Pipeline.h prnt/hpcups/Processor.cpp prnt/hpcups/Processor.h \ - prnt/hpcups/RasterSender.cpp prnt/hpcups/RasterSender.h prnt/hpcups/ColorMatcher.cpp prnt/hpcups/ColorMatcher.h \ - prnt/hpcups/Halftoner.cpp prnt/hpcups/Halftoner.h prnt/hpcups/Scaler.cpp prnt/hpcups/Scaler.h prnt/hpcups/resources.h \ - prnt/hpcups/dj400ColorMaps.cpp prnt/hpcups/dj600ColorMaps.cpp prnt/hpcups/dj970ColorMaps.cpp prnt/hpcups/dj8xxColorMaps.cpp \ - prnt/hpcups/dj4100ColorMaps.cpp \ - prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h prnt/hpcups/Utils.cpp prnt/hpcups/Utils.h \ - prnt/hpcups/SystemServices.cpp prnt/hpcups/SystemServices.h prnt/hpcups/CommonDefinitions.h prnt/hpcups/hpjbig_wrapper.h \ - prnt/hpcups/apPrintModes.h prnt/hpcups/dj400PrintModes.h prnt/hpcups/dj540PrintModes.h prnt/hpcups/dj600PrintModes.h \ - prnt/hpcups/dj630PrintModes.h prnt/hpcups/dj690PrintModes.h prnt/hpcups/dj850PrintModes.h prnt/hpcups/dj890PrintModes.h \ - prnt/hpcups/dj895PrintModes.h prnt/hpcups/dj8x5PrintModes.h prnt/hpcups/dj970PrintModes.h prnt/hpcups/Pcl3GuiPrintModes.h \ - prnt/hpcups/Pcl3PrintModes.h prnt/hpcups/ColorMaps.h \ - prnt/hpcups/QuickConnect.cpp prnt/hpcups/QuickConnect.h \ - prnt/hpcups/ModeJpeg.cpp prnt/hpcups/ModeJpeg.h \ - prnt/hpcups/jccolor.c prnt/hpcups/jinclude.h \ - prnt/hpcups/jdatadbf.c prnt/hpcups/jinclude.h \ - prnt/hpcups/Lidil.cpp prnt/hpcups/Lidil.h \ - prnt/hpcups/LidilCompress.cpp prnt/hpcups/LidilCompress.h \ - prnt/hpcups/LidilPrintModes.h prnt/hpcups/dj3320ColorMaps.cpp \ - prnt/hpcups/dj3600ColorMaps.cpp prnt/hpcups/dj3320PrintModes.h \ - prnt/hpcups/dj4100PrintModes.h - -hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) -hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage -#else -#hpcupsdir = $(cupsfilterdir) -#hpcups_PROGRAMS = hpcups -#hpcups_SOURCES = prnt/hpijs/hpcups.cpp prnt/hpijs/hpcups.h prnt/hpijs/services.cpp prnt/hpijs/services.h prnt/hpijs/hpiom.c prnt/hpijs/hpiom.h prnt/hpijs/bug.h prnt/hpijs/hpimage.cpp prnt/hpijs/hpimage.h -#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS) -#hpcups_CFLAGS = $(libapdk_la_CFLAGS) -#if HPCUPS_ONLY_BUILD -#hpcups_LDADD = libapdk.la -ljpeg -ldl -lcups -lcupsimage -#else -#hpcups_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage -#endif #HPCUPS_ONLY_BUILD -#endif # NEW_HPCUPS -if !HPCUPS_ONLY_BUILD -if FAX_BUILD -# hpcupsfax -hpcupsfaxdir = $(cupsfilterdir) -hpcupsfax_PROGRAMS = hpcupsfax -hpcupsfax_SOURCES = prnt/hpijs/hpcupsfax.cpp prnt/hpijs/hpcupsfax.h -hpcupsfax_LDADD = libhpip.la -lcups -lcupsimage -endif # FAX_BUILD -endif # HPCUPS ONLY -endif # HPCUPS_INSTALL - -# PPDs -ppddir = $(hpppddir) -dist_ppd_DATA = $(foomatic_ps_printers) -if FOOMATIC_PPD_INSTALL -dist_ppd_DATA += $(foomatic_ppd_printers) -endif -if FOOMATIC_DRV_INSTALL -cupsdrvdir = $(drvdir) -cupsdrv_DATA = $(foomatic_drv) -endif -if CUPS_PPD_INSTALL -dist_ppd_DATA += $(cups_ppd_printers) -endif -if CUPS_DRV_INSTALL -cupsdrv2dir = $(drvdir) -cupsdrv2_DATA = $(cups_drv) -endif - -install-data-hook: -if HPLIP_BUILD -# If scanner build, add hpaio entry to sane dll.conf. - if [ "$(scan_build)" = "yes" ]; then \ - $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ - if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ - touch $(DESTDIR)/etc/sane.d/dll.conf; \ - fi; \ - if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ - echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \ - echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \ - fi \ - fi -if FULL_BUILD -# Create hp-xxx commands in bindir. - $(mkinstalldirs) $(DESTDIR)$(bindir) - for i in $(dist_cmd_SCRIPTS); do \ - cmd=`basename $$i .py`; \ - if [ ! \( "$$cmd" = "toolbox" -a "$(gui_build)" = "no" \) ]; then \ - ln -sf ../share/$(PACKAGE)/$$i $(DESTDIR)$(bindir)/hp-$$cmd; \ - fi \ - done -# -# Install fax support. - if [ "$(fax_build)" = "yes" ]; then \ - mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \ - chmod 700 $(DESTDIR)$(hpfaxdir)/hpfax; \ - fi -# -# Make backend run as root. -# chmod 700 $(DESTDIR)$(hpdir)/hp -endif # FULL_BUILD -endif # HPLIP_BUILD - -uninstall-hook: -if HPLIP_BUILD -# Remove hp-xxx commands. - for i in $(dist_cmd_SCRIPTS); do \ - cmd=`basename $$i .py`; \ - rm -f $(DESTDIR)$(bindir)/hp-$$cmd; \ - done -# -# Remove fax support. - rm -f $(DESTDIR)$(hpfaxdir)/hpfax -endif - -rpm: -if FULL_BUILD - epm -f rpm hplipfull hplip.list -endif -if LITE_BUILD - epm -f rpm hpliplite hplip.list -endif -if HPCUPS_ONLY_BUILD - epm -f rpm hpliphpcupsonly hplip.list -endif -if HPIJS_ONLY_BUILD - epm -f rpm hpliphpijsonly hplip.list -endif - -deb: -if FULL_BUILD - epm -f deb hplipfull hplip.list -endif -if LITE_BUILD - epm -f deb hpliplite hplip.list -endif -if HPCUPS_ONLY_BUILD - epm -f deb hpliphpcupsonly hplip.list -endif -if HPIJS_ONLY_BUILD - epm -f deb hpliphpijsonly hplip.list -endif +#
+# Makefile.am - hplip automake input file
+#
+# (c) 2004-2010 Copyright Hewlett-Packard Development Company, LP
+# Author: David Suffield, Naga Samrat Chowdary Narla,
+
+INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs
+
+hplipdir = $(datadir)/hplip
+
+docdir = $(hpdocdir)
+doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
+EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright
+
+dist_noinst_SCRIPTS =
+dist_noinst_DATA =
+noinst_PROGRAMS =
+lib_LTLIBRARIES =
+
+include foomatic_drv.inc
+include unreleased.inc
+include cups_drv.inc
+
+if DOC_BUILD
+wwwsrc = doc
+www0dir = $(docdir)
+dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html
+www3dir = $(docdir)/styles
+dist_www3_DATA = $(wwwsrc)/styles/*
+www4dir = $(docdir)/images
+dist_www4_DATA = $(wwwsrc)/images/*
+endif
+
+if HPLIP_BUILD
+
+# hp backend.
+hpdir = $(cupsbackenddir)
+hp_PROGRAMS = hp
+hp_SOURCES = prnt/backend/hp.c
+hp_LDADD = libhpmud.la $(DBUS_LIBS)
+hp_CFLAGS = $(DBUS_CFLAGS)
+
+# hpaio sane backend
+if SCAN_BUILD
+libsane_hpaiodir = $(libdir)/sane
+libsane_hpaio_LTLIBRARIES = libsane-hpaio.la
+libsane_hpaio_la_SOURCES = scan/sane/hpaio.c scan/sane/mfpdtf.c scan/sane/pml.c scan/sane/scl.c scan/sane/io.c scan/sane/hpaio.h \
+ scan/sane/pml.h scan/sane/saneopts.h scan/sane/io.h scan/sane/mfpdtf.h scan/sane/sane.h scan/sane/scl.h scan/sane/tables.h \
+ scan/sane/common.c scan/sane/common.h scan/sane/soap.h scan/sane/soapht.h scan/sane/sanei_debug.h scan/sane/sanei.h \
+ scan/sane/sanei_init_debug.c scan/sane/marvell.h scan/sane/marvelli.h scan/sane/marvell.c scan/sane/soapht.c scan/sane/soap.c \
+ scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \
+ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c
+if DARWIN_BUILD
+libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
+else
+libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+endif
+# The following is a interlibrary dependency that must be compiled first.
+libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl
+#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
+libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
+endif # SCAN_BUILD
+
+# hpmud library
+MUDNAME=hpmud
+lib_LTLIBRARIES += libhpmud.la
+libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/musb.c io/hpmud/pml.c \
+ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/musb.h io/hpmud/pml.h io/hpmud/dot4.c \
+ io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h
+if NETWORK_BUILD
+libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -l$(SNMPLIB) -lcrypto
+else
+libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread
+endif
+libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+
+# ip library
+lib_LTLIBRARIES += libhpip.la
+libhpip_la_LDFLAGS = -version-info 0:1:0
+libhpip_la_LIBADD = -lm
+libhpip_la_SOURCES = ip/xconvolve.c ip/xfax.c ip/xgrayout.c ip/xjpg_dct.c ip/xjpg_fix.c ip/xpad.c ip/xrotate.c ip/xskel.c ip/xtiff.c \
+ ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \
+ ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
+ ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
+
+# hp-mkuri.
+hp_mkuridir = $(bindir)
+hp_mkuri_PROGRAMS = hp-mkuri
+hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c
+hp_mkuri_LDADD = -ldl libhpmud.la
+hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+
+# hpmud.rules
+rulesdir = /etc/udev/rules.d
+dist_rules_DATA = data/rules/56-hpmud_support.rules
+if UDEV_ACL_RULES
+dist_rules_DATA += data/rules/40-hplip.rules
+else
+dist_rules_DATA += data/rules/55-hpmud.rules
+endif
+halpredir = /usr/share/hal/fdi/preprobe/10osvendor
+dist_halpre_DATA = data/rules/20-hplip-devices.fdi
+
+# hplip.conf
+hplip_confdir = /etc/hp
+hplip_conf_DATA = hplip.conf
+
+#pstotiff filter
+pstotiffdir = $(cupsfilterdir)
+pstotiff_SCRIPTS = fax/filters/pstotiff
+
+# hplip.state
+hplip_statedir = /var/lib/hp
+dist_hplip_state_DATA = hplip.state
+
+if FULL_BUILD
+
+dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
+dist_noinst_DATA += scan/sane/hpaio.desc prnt/drv/hpijs.drv.in.template
+dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall
+
+cmddir = $(hplipdir)
+dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
+ sendfax.py setup.py makecopies.py probe.py timedate.py firmware.py scan.py systray.py plugin.py linefeedcal.py pqdiag.py \
+ faxsetup.py devicesettings.py printsettings.py query.py pkservice.py wificonfig.py
+
+# base
+basedir = $(hplipdir)/base
+
+dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \
+ base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
+ base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
+ base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \
+ base/ldif.py base/vcard.py base/module.py base/pkit.py
+
+# installer
+installdir = $(hplipdir)/installer
+dist_install_DATA = installer/__init__.py installer/dcheck.py installer/distros.dat installer/core_install.py
+dist_noinst_DATA += installer/text_install.py
+
+# makecopies
+copierdir = $(hplipdir)/copier
+dist_copier_DATA = copier/copier.py copier/__init__.py
+
+# fax
+if FAX_BUILD
+faxdir = $(hplipdir)/fax
+dist_fax_DATA = fax/fax.py fax/__init__.py fax/coverpages.py fax/pmlfax.py fax/ledmfax.py fax/soapfax.py fax/ledmsoapfax.py fax/marvellfax.py \
+ fax/faxdevice.py fax/filters/pstotiff fax/filters/pstotiff.convs fax/filters/pstotiff.types
+fax_filtersdir = $(mimedir)
+dist_fax_filters_DATA = fax/filters/pstotiff.convs fax/filters/pstotiff.types
+hpfaxdir = $(cupsbackenddir)
+dist_hpfax_SCRIPTS = fax/backend/hpfax.py
+hpijsfaxppddir = $(hpppddir)
+hpcupsfaxppddir = $(hpppddir)
+if HPIJS_INSTALL
+dist_hpijsfaxppd_DATA = fax/ppd/HP-Fax-hpijs.ppd.gz fax/ppd/HP-Fax2-hpijs.ppd.gz fax/ppd/HP-Fax3-hpijs.ppd.gz fax/ppd/HP-Fax4-hpijs.ppd.gz
+endif # HPIJS_INSTALL
+if HPCUPS_INSTALL
+dist_hpcupsfaxppd_DATA = fax/ppd/HP-Fax-hpcups.ppd.gz fax/ppd/HP-Fax2-hpcups.ppd.gz fax/ppd/HP-Fax3-hpcups.ppd.gz fax/ppd/HP-Fax4-hpcups.ppd.gz
+endif # HPCUPS_INSTALL
+endif # FAX_BUILD
+
+# ptest
+noinst_PROGRAMS += ptest
+ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h
+ptest_LDADD = libhpmud.la
+
+# data
+modelsdir = $(hplipdir)/data/models
+images_16x16dir = $(hplipdir)/data/images/16x16
+images_24x24dir = $(hplipdir)/data/images/24x24
+images_32x32dir = $(hplipdir)/data/images/32x32
+images_64x64dir = $(hplipdir)/data/images/64x64
+images_128x128dir = $(hplipdir)/data/images/128x128
+images_256x256dir = $(hplipdir)/data/images/256x256
+images_devicesdir = $(hplipdir)/data/images/devices
+images_otherdir = $(hplipdir)/data/images/other
+pcldir = $(hplipdir)/data/pcl
+ldldir = $(hplipdir)/data/ldl
+postscriptdir = $(hplipdir)/data/ps
+localzdir = $(hplipdir)/data/localization
+dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
+dist_models_DATA = data/models/models.dat
+
+if GUI_BUILD
+dist_images_16x16_DATA = data/images/16x16/*
+dist_images_24x24_DATA = data/images/24x24/*
+dist_images_32x32_DATA = data/images/32x32/*
+dist_images_64x64_DATA = data/images/64x64/*
+dist_images_128x128_DATA = data/images/128x128/*
+dist_images_256x256_DATA = data/images/256x256/*
+dist_images_devices_DATA = data/images/devices/*
+dist_images_other_DATA = data/images/other/*
+endif
+
+dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
+ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
+ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \
+ data/pcl/crcpcal.pcl.gz data/pcl/crpcal.pcl.gz
+dist_ldl_DATA = data/ldl/cb2pcal.ldl.gz data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz data/ldl/cbccal.ldl.gz data/ldl/cbccal_done.ldl.gz data/ldl/cbcpcal.ldl.gz \
+ data/ldl/cbpcal.ldl.gz
+dist_localz_DATA = data/localization/hplip_de.qm data/localization/hplip_es.qm data/localization/hplip_fr.qm data/localization/hplip_it.qm \
+ data/localization/hplip_pt.qm data/localization/hplip_ru.qm data/localization/hplip_zh.qm
+dist_noinst_DATA += data/localization/hplip_de.ts data/localization/hplip_es.ts data/localization/hplip_fr.ts data/localization/hplip_it.ts \
+ data/localization/hplip_pt.ts data/localization/hplip_ru.ts data/localization/hplip_zh.ts
+
+# pcard
+pcarddir = $(hplipdir)/pcard
+dist_pcard_DATA = pcard/__init__.py pcard/photocard.py
+
+# pcardext
+pcardextdir = $(pyexecdir)
+pcardext_LTLIBRARIES = pcardext.la
+pcardext_la_LDFLAGS = -module -avoid-version
+pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c
+pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+
+# prnt
+prntdir = $(hplipdir)/prnt
+dist_prnt_DATA = prnt/cups.py prnt/__init__.py prnt/ldl.py prnt/pcl.py prnt/colorcal.py
+
+# cupsext
+cupsextdir = $(pyexecdir)
+cupsext_LTLIBRARIES = cupsext.la
+cupsext_la_LDFLAGS = -module -avoid-version
+cupsext_la_SOURCES = prnt/cupsext/cupsext.c
+cupsext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+cupsext_la_LIBADD = -lcups
+
+if SCAN_BUILD
+# scan
+scandir = $(hplipdir)/scan
+dist_scan_DATA = scan/__init__.py scan/sane.py
+
+# scanext
+scanextdir = $(pyexecdir)
+scanext_LTLIBRARIES = scanext.la
+scanext_la_LDFLAGS = -module -avoid-version -lsane
+scanext_la_SOURCES = scan/scanext/scanext.c
+scanext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+endif
+
+# hpmudext
+hpmudextdir = $(pyexecdir)
+hpmudext_LTLIBRARIES = hpmudext.la
+hpmudext_la_LDFLAGS = -module -avoid-version
+hpmudext_la_SOURCES = io/mudext/hpmudext.c
+hpmudext_la_LIBADD = libhpmud.la
+hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+# ui (qt3)
+if GUI_BUILD
+if QT3_INSTALL
+uidir = $(hplipdir)/ui
+dist_ui_DATA = ui/alignform.py \
+ ui/colorcalform_base.py ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py ui/devmgr4_base.py ui/devmgr4.py \
+ ui/__init__.py ui/loadpaperform_base.py ui/loadpaperform.py \
+ ui/paperedgealignform_base.py ui/paperedgealignform.py ui/ui_utils.py \
+ ui/settingsdialog_base.py ui/settingsdialog.py ui/aligntype6form1.py ui/aligntype6form1_base.py ui/aligntype6form2_base.py \
+ ui/aligntype6form2.py ui/nodevicesform_base.py ui/nodevicesform.py ui/unloadform.py \
+ ui/imagepropertiesdlg_base.py ui/imagepropertiesdlg.py ui/choosedevicedlg.py ui/chooseprinterdlg.py \
+ ui/aboutdlg.py ui/aboutdlg_base.py ui/waitform.py ui/waitform_base.py ui/cleaningform_base.py ui/cleaningform.py \
+ ui/cleaningform2_base.py ui/cleaningform2.py ui/colorcalform2_base.py ui/colorcalform2.py ui/colorcal4form.py \
+ ui/colorcal4form_base.py ui/colorcal4form_base.ui ui/printerform.py \
+ ui/faxaddrbookgroupsform_base.py ui/faxaddrbookgroupeditform_base.py ui/faxaddrbookform_base.py \
+ ui/faxaddrbookform.py ui/faxaddrbookeditform_base.py ui/align10form.py ui/align10form_base.py \
+ ui/faxsendjobform.py ui/faxsettingsform_base.py ui/faxsettingsform.py \
+ ui/coverpageform_base.py ui/coverpageform.py ui/allowabletypesdlg_base.py ui/allowabletypesdlg.py \
+ ui/makecopiesform.py ui/setupform_base.py ui/setupform.py ui/setupmanualfind_base.py \
+ ui/setupmanualfind.py ui/setupsettings_base.py ui/setupsettings.py ui/scrollview.py \
+ ui/scrollprintsettings.py ui/scrollprint.py ui/scrollfax.py \
+ ui/scrollunload.py ui/scrollcopy.py ui/pluginform2.py ui/pluginform2_base.py ui/systemtray.py \
+ ui/ui_utils.py ui/jobstoragemixin.py ui/pluginlicenseform_base.py ui/pluginlicenseform.py \
+ ui/align13form_base.py ui/align13form.py
+
+dist_noinst_DATA += ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
+ ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \
+ ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \
+ ui/cleaningform2_base.ui ui/waitform_base.ui ui/coloradjform_base.ui ui/faxaddrbookeditform_base.ui \
+ ui/faxaddrbookform_base.ui ui/faxaddrbookgroupeditform_base.ui ui/faxaddrbookgroupsform_base.ui \
+ ui/align10form_base.ui ui/pluginform2_base.ui \
+ plugins/powersettingsdialog_base.ui ui/faxsettingsform_base.ui ui/coverpageform_base.ui \
+ ui/allowabletypesdlg_base.ui ui/setupform_base.ui ui/setupmanualfind_base.ui \
+ ui/setupsettings_base.ui ui/pluginlicenseform_base.ui ui/align13form_base.ui
+endif
+endif
+
+#ui4 (qt4)
+if GUI_BUILD
+if QT4_INSTALL
+ui4dir=$(hplipdir)/ui4
+#dist_ui4_SCRIPTS = ui4/devmgr5.py ui4/systemtray.py ui4/devmgr5_base.py ui4/__init__.py ui4/ui_utils.py \
+# ui4/settingsdialog_base.py ui4/settingsdialog.py ui4/printsettingstoolbox.py ui4/printdialog_base.py \
+# ui4/printdialog.py
+#dist_noinst_DATA += ui4/devmgr5_base.ui ui4/settingsdialog_base.ui ui4/printdialog_base.ui
+dist_ui4_DATA = ui4/*.py
+dist_noinst_DATA += ui4/*.ui
+endif
+endif
+
+# ui plugins (qt3)
+if GUI_BUILD
+if QT3_INSTALL
+pluginsdir = $(hplipdir)/plugins
+dist_plugins_DATA = plugins/dj450.py plugins/__init__.py plugins/powersettings.py plugins/powersettingsdialog.py \
+ plugins/powersettingsdialog_base.py plugins/Deskjet_460.py plugins/Officejet_H470.py plugins/powersettings2.py
+endif
+endif
+
+# ui plugins (qt4)
+if GUI_BUILD
+if QT4_INSTALL
+plugins4dir = $(hplipdir)/ui4/plugins
+dist_plugins4_SCRIPTS =
+endif
+endif
+
+# PolicyKit
+if POLICYKIT_INSTALL
+policykit_dbus_etcdir = /etc/dbus-1/system.d
+dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf
+policykit_dbus_sharedir = /usr/share/dbus-1/system-services
+dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
+policykit_policydir = $(policykit_dir)
+dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
+endif
+
+# hppgsz
+noinst_PROGRAMS += hppgsz
+hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
+hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
+hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
+hppgsz_LDADD = libapdk.la -ljpeg -ldl
+
+# hplip.desktop
+hplip_desktopdir = $(icondir)
+hplip_desktop_DATA = hplip.desktop
+
+# hplip-systray.desktop
+hplip_systraydir = $(systraydir)
+hplip_systray_DATA = hplip-systray.desktop
+
+# hpipjs (CUPS filter)
+hplipjsdir = $(cupsfilterdir)
+hplipjs_PROGRAMS = hplipjs
+hplipjs_SOURCES = prnt/filters/hplipjs.c
+
+# hpcac (CUPS filter, Color Access Control, ie: CLJ 4700)
+cacdir = $(cupsfilterdir)
+dist_cac_SCRIPTS = prnt/filters/hpcac
+
+endif # FULL_BUILD
+endif # HPLIP_BUILD
+
+# foomatic-rip-hplip
+if RIP_INSTALL
+ripdir = $(cupsfilterdir)
+dist_rip_SCRIPTS = prnt/hpijs/foomatic-rip-hplip
+endif
+
+# apdk
+noinst_LTLIBRARIES = libapdk.la
+libapdk_la_SOURCES = prnt/hpijs/models.cpp prnt/hpijs/breaks_open.cpp \
+ prnt/hpijs/dj9xxvip.cpp prnt/hpijs/dj9xx.cpp prnt/hpijs/capture.cpp prnt/hpijs/colormatch.cpp prnt/hpijs/colormatcher_open.cpp \
+ prnt/hpijs/compression.cpp prnt/hpijs/context2.cpp prnt/hpijs/create_so.cpp prnt/hpijs/creator.cpp \
+ prnt/hpijs/dj600.cpp prnt/hpijs/dj630.cpp prnt/hpijs/dj660.cpp prnt/hpijs/dj690.cpp prnt/hpijs/dj6xx.cpp prnt/hpijs/dj8xx.cpp prnt/hpijs/dj600_maps.cpp \
+ prnt/hpijs/dj660_maps.cpp prnt/hpijs/dj690_maps.cpp prnt/hpijs/dj895_maps.cpp prnt/hpijs/dj895_maps2.cpp prnt/hpijs/dj970_maps.cpp \
+ prnt/hpijs/dj970_maps2.cpp prnt/hpijs/dj970_maps3.cpp prnt/hpijs/filterhpa.cpp prnt/hpijs/apollo21xx.cpp prnt/hpijs/apollo2560.cpp prnt/hpijs/apollo2xxx.cpp \
+ prnt/hpijs/dj8x5.cpp prnt/hpijs/psp100.cpp prnt/hpijs/phobos_cmaps.cpp prnt/hpijs/dj350.cpp prnt/hpijs/halftoner.cpp prnt/hpijs/halftoner_open.cpp \
+ prnt/hpijs/globals.cpp prnt/hpijs/header2.cpp prnt/hpijs/htmtxhi.cpp prnt/hpijs/pmselect.cpp \
+ prnt/hpijs/job.cpp prnt/hpijs/printer.cpp prnt/hpijs/registry.cpp prnt/hpijs/scaler.cpp \
+ prnt/hpijs/scaler_open.cpp prnt/hpijs/script.cpp prnt/hpijs/systemservices.cpp \
+ prnt/hpijs/translator.cpp prnt/hpijs/version.cpp prnt/hpijs/versioncode.cpp \
+ prnt/hpijs/djgenericvip.cpp prnt/hpijs/dj540.cpp prnt/hpijs/dj850.cpp prnt/hpijs/dj850_maps.cpp prnt/hpijs/dj890.cpp \
+ prnt/hpijs/apollo21xx.h prnt/hpijs/apollo2560.h prnt/hpijs/apollo2xxx.h prnt/hpijs/colormatch.h prnt/hpijs/colormatcher_open.h \
+ prnt/hpijs/compression.h prnt/hpijs/config.h prnt/hpijs/context.h prnt/hpijs/dj350.h prnt/hpijs/dj400.h prnt/hpijs/dj540.h \
+ prnt/hpijs/dj600.h prnt/hpijs/dj630.h prnt/hpijs/dj660.h prnt/hpijs/dj690.h prnt/hpijs/dj6xx.h prnt/hpijs/dj8x5.h prnt/hpijs/dj8xx.h \
+ prnt/hpijs/dj850.h prnt/hpijs/dj890.h prnt/hpijs/dj9xx.h prnt/hpijs/dj9xxvip.h \
+ prnt/hpijs/ernieplatform.h prnt/hpijs/filterhpa.h prnt/hpijs/global_types.h prnt/hpijs/halftoner.h prnt/hpijs/font.h prnt/hpijs/debug.h \
+ prnt/hpijs/halftoner_open.h prnt/hpijs/header.h prnt/hpijs/hpprint_c_api.h \
+ prnt/hpijs/hpprintapi.h prnt/hpijs/hptypes.h prnt/hpijs/htfed.h prnt/hpijs/internal.h \
+ prnt/hpijs/interp.h prnt/hpijs/interp_data_50.h prnt/hpijs/io_defs.h prnt/hpijs/job.h prnt/hpijs/models.h prnt/hpijs/modes.h prnt/hpijs/pmselect.h \
+ prnt/hpijs/printer.h prnt/hpijs/psp100.h prnt/hpijs/psp470.h prnt/hpijs/resources.h prnt/hpijs/scaler_open.h prnt/hpijs/scaler_prop.h prnt/hpijs/script.h \
+ prnt/hpijs/systemservices.h prnt/hpijs/unistd_.h prnt/hpijs/djgenericvip.h prnt/hpijs/ljmono.h prnt/hpijs/ljmono.cpp \
+ prnt/hpijs/dj3320.cpp prnt/hpijs/dj3320.h prnt/hpijs/dj3320_cmap.cpp prnt/hpijs/dj3600.cpp prnt/hpijs/dj3600.h prnt/hpijs/dj3600_cmap.cpp prnt/hpijs/dj4100.h prnt/hpijs/djd2600.h \
+ prnt/hpijs/dj4100_cmap.cpp prnt/hpijs/ldlencap.h prnt/hpijs/ljcolor.cpp prnt/hpijs/ljcolor.h prnt/hpijs/pscript.h \
+ prnt/hpijs/printerproxy.cpp prnt/hpijs/printerfactory.cpp prnt/hpijs/printerproxy.h prnt/hpijs/printerfactory.h \
+ prnt/hpijs/ljjetready.cpp prnt/hpijs/ljjetready.h prnt/hpijs/jdatadbf.c prnt/hpijs/jccolor.c prnt/hpijs/ljfastraster.cpp prnt/hpijs/ljfastraster.h \
+ prnt/hpijs/jinclude.h prnt/hpijs/jpegint.h prnt/hpijs/dj55xx.h prnt/hpijs/hpijsfax.h prnt/hpijs/ojprokx50.h \
+ prnt/hpijs/ljzjs.cpp prnt/hpijs/ljzjs.h prnt/hpijs/ljzjsmono.cpp prnt/hpijs/ljm1005.cpp prnt/hpijs/ljm1005.h \
+ prnt/hpijs/ljzjsmono.h prnt/hpijs/hpjbig_wrapper.h prnt/hpijs/quickconnect.cpp prnt/hpijs/quickconnect.h prnt/hpijs/ljp1xxx.h prnt/hpijs/ljzjscolor.cpp prnt/hpijs/ljzjscolor.h
+libapdk_la_CXXFLAGS = -DAPDK_DJ660 -DAPDK_DJ6xx -DAPDK_DJ6xxPhoto -DAPDK_DJ8xx -DAPDK_DJ9xx -DAPDK_DJ9xxVIP -DAPDK_DJ630 \
+ -DAPDK_APOLLO2XXX -DAPDK_APOLLO21XX -DAPDK_APOLLO2560 -DAPDK_DJ600 -DAPDK_DJ350 -DAPDK_DJ8x5 -DAPDK_PSP100 -DAPDK_AUTODUPLEX \
+ -DAPDK_HIGH_RES_MODES -DAPDK_LJMONO -DAPDK_DJ540 -DAPDK_DJ850 -DAPDK_DJ890 -DAPDK_DJ3320 -DAPDK_LJCOLOR -DAPDK_DJGENERICVIP \
+ -DAPDK_LJJETREADY -DAPDK_LJFASTRASTER -DAPDK_BUFFER_SEND -DAPDK_LDL_COMPRESS -DAPDK_EXTENDED_MEDIASIZE \
+ -DAPDK_MLC_PRINTER -DAPDK_DJ3600 -DAPDK_LJZJS_MONO -DAPDK_LJZJS_COLOR -DAPDK_LJM1005 -DAPDK_QUICKCONNECT \
+ $(APDK_ENDIAN_FLAG) $(APDK_AUTO_INCLUDE_FLAG) -DAPDK_LINUX -DNDEBUG $(DBUS_CFLAGS)
+libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs
+
+if HPIJS_INSTALL
+# hpijs
+bin_PROGRAMS = hpijs
+hpijs_SOURCES = prnt/hpijs/hpijs.cpp prnt/hpijs/ijs_server.c prnt/hpijs/ijs.c prnt/hpijs/hpijsfax.cpp prnt/hpijs/services.cpp prnt/hpijs/bug.h \
+ prnt/hpijs/hpijs.h prnt/hpijs/ijs.h prnt/hpijs/ijs_server.h prnt/hpijs/services.h prnt/hpijs/ijs_client.h prnt/hpijs/hpiom.c prnt/hpijs/hpiom.h
+hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
+hpijs_CFLAGS = $(libapdk_la_CFLAGS)
+if HPLIP_BUILD
+hpijs_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS)
+else
+hpijs_LDADD = libapdk.la -ljpeg -ldl
+endif
+endif # HPIJS_INSTALL
+
+if HPCUPS_INSTALL
+# hpcups
+#if NEW_HPCUPS
+hpcupsdir = $(cupsfilterdir)
+hpcups_PROGRAMS = hpcups
+hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hpcups/Compressor.cpp prnt/hpcups/Compressor.h \
+ prnt/hpcups/Mode2.cpp prnt/hpcups/Mode2.h prnt/hpcups/Mode3.cpp prnt/hpcups/Mode3.h \
+ prnt/hpcups/Mode9.cpp prnt/hpcups/Mode9.h prnt/hpcups/Mode10.cpp prnt/hpcups/Mode10.h \
+ prnt/hpcups/ModeDeltaPlus.cpp prnt/hpcups/ModeDeltaPlus.h prnt/hpcups/ModeJbig.cpp prnt/hpcups/ModeJbig.h \
+ prnt/hpcups/ErnieFilter.cpp prnt/hpcups/ErnieFilter.h prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \
+ prnt/hpcups/Encapsulator.cpp prnt/hpcups/Encapsulator.h prnt/hpcups/Pcl3.cpp prnt/hpcups/Pcl3.h \
+ prnt/hpcups/Pcl3Gui.cpp prnt/hpcups/Pcl3Gui.h prnt/hpcups/Pcl3Gui2.cpp prnt/hpcups/Pcl3Gui2.h \
+ prnt/hpcups/LJMono.cpp prnt/hpcups/LJMono.h prnt/hpcups/LJColor.cpp prnt/hpcups/LJColor.h \
+ prnt/hpcups/LJFastRaster.cpp prnt/hpcups/LJFastRaster.h prnt/hpcups/LJJetReady.cpp prnt/hpcups/LJJetReady.h \
+prnt/hpcups/LJZjStream.cpp prnt/hpcups/LJZjStream.h \
+ prnt/hpcups/LJZxStream.cpp prnt/hpcups/LJZxStream.h prnt/hpcups/Job.cpp prnt/hpcups/Job.h \
+ prnt/hpcups/Pipeline.cpp prnt/hpcups/Pipeline.h prnt/hpcups/Processor.cpp prnt/hpcups/Processor.h \
+ prnt/hpcups/RasterSender.cpp prnt/hpcups/RasterSender.h prnt/hpcups/ColorMatcher.cpp prnt/hpcups/ColorMatcher.h \
+ prnt/hpcups/Halftoner.cpp prnt/hpcups/Halftoner.h prnt/hpcups/Scaler.cpp prnt/hpcups/Scaler.h prnt/hpcups/resources.h \
+ prnt/hpcups/dj400ColorMaps.cpp prnt/hpcups/dj600ColorMaps.cpp prnt/hpcups/dj970ColorMaps.cpp prnt/hpcups/dj8xxColorMaps.cpp \
+ prnt/hpcups/dj4100ColorMaps.cpp \
+ prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h prnt/hpcups/Utils.cpp prnt/hpcups/Utils.h \
+ prnt/hpcups/SystemServices.cpp prnt/hpcups/SystemServices.h prnt/hpcups/CommonDefinitions.h prnt/hpcups/hpjbig_wrapper.h \
+ prnt/hpcups/apPrintModes.h prnt/hpcups/dj400PrintModes.h prnt/hpcups/dj540PrintModes.h prnt/hpcups/dj600PrintModes.h \
+ prnt/hpcups/dj630PrintModes.h prnt/hpcups/dj690PrintModes.h prnt/hpcups/dj850PrintModes.h prnt/hpcups/dj890PrintModes.h \
+ prnt/hpcups/dj895PrintModes.h prnt/hpcups/dj8x5PrintModes.h prnt/hpcups/dj970PrintModes.h prnt/hpcups/Pcl3GuiPrintModes.h \
+ prnt/hpcups/Pcl3PrintModes.h prnt/hpcups/ColorMaps.h \
+ prnt/hpcups/QuickConnect.cpp prnt/hpcups/QuickConnect.h \
+ prnt/hpcups/ModeJpeg.cpp prnt/hpcups/ModeJpeg.h \
+ prnt/hpcups/jccolor.c prnt/hpcups/jinclude.h \
+ prnt/hpcups/jdatadbf.c prnt/hpcups/jinclude.h \
+ prnt/hpcups/Lidil.cpp prnt/hpcups/Lidil.h \
+ prnt/hpcups/LidilCompress.cpp prnt/hpcups/LidilCompress.h \
+ prnt/hpcups/LidilPrintModes.h prnt/hpcups/dj3320ColorMaps.cpp \
+ prnt/hpcups/dj3600ColorMaps.cpp prnt/hpcups/dj3320PrintModes.h \
+ prnt/hpcups/dj4100PrintModes.h
+
+hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG)
+hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage
+#else
+#hpcupsdir = $(cupsfilterdir)
+#hpcups_PROGRAMS = hpcups
+#hpcups_SOURCES = prnt/hpijs/hpcups.cpp prnt/hpijs/hpcups.h prnt/hpijs/services.cpp prnt/hpijs/services.h prnt/hpijs/hpiom.c prnt/hpijs/hpiom.h prnt/hpijs/bug.h prnt/hpijs/hpimage.cpp prnt/hpijs/hpimage.h
+#hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
+#hpcups_CFLAGS = $(libapdk_la_CFLAGS)
+#if HPCUPS_ONLY_BUILD
+#hpcups_LDADD = libapdk.la -ljpeg -ldl -lcups -lcupsimage
+#else
+#hpcups_LDADD = libapdk.la -ljpeg -ldl libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lcupsimage
+#endif #HPCUPS_ONLY_BUILD
+#endif # NEW_HPCUPS
+if !HPCUPS_ONLY_BUILD
+if FAX_BUILD
+# hpcupsfax
+hpcupsfaxdir = $(cupsfilterdir)
+hpcupsfax_PROGRAMS = hpcupsfax
+hpcupsfax_SOURCES = prnt/hpijs/hpcupsfax.cpp prnt/hpijs/hpcupsfax.h
+hpcupsfax_LDADD = libhpip.la -lcups -lcupsimage
+endif # FAX_BUILD
+endif # HPCUPS ONLY
+endif # HPCUPS_INSTALL
+
+# PPDs
+ppddir = $(hpppddir)
+dist_ppd_DATA = $(foomatic_ps_printers)
+if FOOMATIC_PPD_INSTALL
+dist_ppd_DATA += $(foomatic_ppd_printers)
+endif
+if FOOMATIC_DRV_INSTALL
+cupsdrvdir = $(drvdir)
+cupsdrv_DATA = $(foomatic_drv)
+endif
+if CUPS_PPD_INSTALL
+dist_ppd_DATA += $(cups_ppd_printers)
+endif
+if CUPS_DRV_INSTALL
+cupsdrv2dir = $(drvdir)
+cupsdrv2_DATA = $(cups_drv)
+endif
+
+install-data-hook:
+if HPLIP_BUILD
+# If scanner build, add hpaio entry to sane dll.conf.
+ if [ "$(scan_build)" = "yes" ]; then \
+ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
+ if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
+ touch $(DESTDIR)/etc/sane.d/dll.conf; \
+ fi; \
+ if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
+ echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
+ echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
+ fi \
+ fi
+if FULL_BUILD
+# Create hp-xxx commands in bindir.
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ for i in $(dist_cmd_SCRIPTS); do \
+ cmd=`basename $$i .py`; \
+ if [ ! \( "$$cmd" = "toolbox" -a "$(gui_build)" = "no" \) ]; then \
+ ln -sf ../share/$(PACKAGE)/$$i $(DESTDIR)$(bindir)/hp-$$cmd; \
+ fi \
+ done
+#
+# Install fax support.
+ if [ "$(fax_build)" = "yes" ]; then \
+ mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \
+ chmod 700 $(DESTDIR)$(hpfaxdir)/hpfax; \
+ fi
+#
+# Make backend run as root.
+# chmod 700 $(DESTDIR)$(hpdir)/hp
+endif # FULL_BUILD
+endif # HPLIP_BUILD
+
+uninstall-hook:
+if HPLIP_BUILD
+# Remove hp-xxx commands.
+ for i in $(dist_cmd_SCRIPTS); do \
+ cmd=`basename $$i .py`; \
+ rm -f $(DESTDIR)$(bindir)/hp-$$cmd; \
+ done
+#
+# Remove fax support.
+ rm -f $(DESTDIR)$(hpfaxdir)/hpfax
+endif
+
+rpm:
+if FULL_BUILD
+ epm -f rpm hplipfull hplip.list
+endif
+if LITE_BUILD
+ epm -f rpm hpliplite hplip.list
+endif
+if HPCUPS_ONLY_BUILD
+ epm -f rpm hpliphpcupsonly hplip.list
+endif
+if HPIJS_ONLY_BUILD
+ epm -f rpm hpliphpijsonly hplip.list
+endif
+
+deb:
+if FULL_BUILD
+ epm -f deb hplipfull hplip.list
+endif
+if LITE_BUILD
+ epm -f deb hpliplite hplip.list
+endif
+if HPCUPS_ONLY_BUILD
+ epm -f deb hpliphpcupsonly hplip.list
+endif
+if HPIJS_ONLY_BUILD
+ epm -f deb hpliphpijsonly hplip.list
+endif
diff --git a/Makefile.in b/Makefile.in index 5e7a949ba..72119c545 100644 --- a/Makefile.in +++ b/Makefile.in @@ -581,16 +581,18 @@ am__dist_base_DATA_DIST = base/maint.py base/codes.py base/g.py \ base/module.py base/pkit.py am__dist_copier_DATA_DIST = copier/copier.py copier/__init__.py am__dist_fax_DATA_DIST = fax/fax.py fax/__init__.py fax/coverpages.py \ - fax/pmlfax.py fax/soapfax.py fax/marvellfax.py \ - fax/faxdevice.py fax/filters/pstotiff \ + fax/pmlfax.py fax/ledmfax.py fax/soapfax.py fax/ledmsoapfax.py \ + fax/marvellfax.py fax/faxdevice.py fax/filters/pstotiff \ fax/filters/pstotiff.convs fax/filters/pstotiff.types am__dist_fax_filters_DATA_DIST = fax/filters/pstotiff.convs \ fax/filters/pstotiff.types am__dist_halpre_DATA_DIST = data/rules/20-hplip-devices.fdi am__dist_hpcupsfaxppd_DATA_DIST = fax/ppd/HP-Fax-hpcups.ppd.gz \ - fax/ppd/HP-Fax2-hpcups.ppd.gz fax/ppd/HP-Fax3-hpcups.ppd.gz + fax/ppd/HP-Fax2-hpcups.ppd.gz fax/ppd/HP-Fax3-hpcups.ppd.gz \ + fax/ppd/HP-Fax4-hpcups.ppd.gz am__dist_hpijsfaxppd_DATA_DIST = fax/ppd/HP-Fax-hpijs.ppd.gz \ - fax/ppd/HP-Fax2-hpijs.ppd.gz fax/ppd/HP-Fax3-hpijs.ppd.gz + fax/ppd/HP-Fax2-hpijs.ppd.gz fax/ppd/HP-Fax3-hpijs.ppd.gz \ + fax/ppd/HP-Fax4-hpijs.ppd.gz am__dist_hplip_state_DATA_DIST = hplip.state am__dist_images_128x128_DATA_DIST = data/images/128x128/* am__dist_images_16x16_DATA_DIST = data/images/16x16/* @@ -724,6 +726,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_5100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_p4515n-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ @@ -755,6 +758,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz \ prnt/ps/hp-laserjet_1300xi-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz \ prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \ @@ -791,6 +795,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_3030-ps.ppd.gz \ + prnt/ps/hp-laserjet_cm1415fnw-ps.ppd.gz \ prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p3004-ps.ppd.gz \ @@ -808,6 +813,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2700-ps.ppd.gz \ prnt/ps/hp-laserjet_p4515x-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_m1536dnf_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055d-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5500-ps.ppd.gz \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ @@ -952,6 +958,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1027nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz \ @@ -979,6 +986,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz \ @@ -1010,6 +1019,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1021-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz \ ppd/hpijs/hp-dj450-hpijs.ppd.gz \ @@ -1062,6 +1072,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz \ @@ -1082,6 +1093,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \ @@ -1096,6 +1108,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1022-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \ ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \ @@ -1103,8 +1116,10 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz \ @@ -1131,6 +1146,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz \ ppd/hpijs/hp-psc_500-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz \ @@ -1139,6 +1155,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ @@ -1182,6 +1199,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-2000c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz \ @@ -1201,6 +1219,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz \ @@ -1232,6 +1251,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz \ @@ -1248,8 +1268,10 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1023-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz \ @@ -1309,6 +1331,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \ @@ -1324,6 +1347,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz \ @@ -1365,6 +1389,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz \ ppd/hpijs/hp-dj350-hpijs.ppd.gz \ @@ -1383,6 +1408,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1028nw-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz \ @@ -1393,10 +1419,12 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz \ @@ -1406,6 +1434,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz \ @@ -1439,6 +1468,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz \ ppd/hpijs/hp-cp1160-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz \ @@ -1467,6 +1497,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz \ @@ -1477,6 +1508,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz \ @@ -1541,6 +1573,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz \ @@ -1561,6 +1594,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz \ ppd/hpcups/hp-cp1160.ppd.gz \ ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz \ @@ -1718,6 +1752,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-deskjet_f4400_series.ppd.gz \ ppd/hpcups/hp-deskjet_f4500_series.ppd.gz \ ppd/hpcups/hp-deskjet_f735.ppd.gz \ + ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz \ + ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz \ ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz \ ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz \ ppd/hpcups/hp-dj350.ppd.gz ppd/hpcups/hp-dj450.ppd.gz \ @@ -1823,11 +1859,31 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1021.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1022.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1023.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz \ ppd/hpcups/hp-laserjet_m1005.ppd.gz \ ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz \ @@ -1883,6 +1939,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ @@ -2081,6 +2138,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-photosmart_d7400_series.ppd.gz \ ppd/hpcups/hp-photosmart_d7500_series.ppd.gz \ ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz \ + ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz \ ppd/hpcups/hp-photosmart_p1000.ppd.gz \ ppd/hpcups/hp-photosmart_p1100.ppd.gz \ ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz \ @@ -2497,6 +2555,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1027nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz \ @@ -2524,6 +2583,8 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz \ @@ -2555,6 +2616,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1021-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz \ ppd/hpijs/hp-dj450-hpijs.ppd.gz \ @@ -2607,6 +2669,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz \ @@ -2627,6 +2690,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \ @@ -2641,6 +2705,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1022-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \ ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \ @@ -2648,8 +2713,10 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz \ @@ -2676,6 +2743,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz \ ppd/hpijs/hp-psc_500-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz \ @@ -2684,6 +2752,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ @@ -2727,6 +2796,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-2000c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz \ @@ -2746,6 +2816,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz \ @@ -2777,6 +2848,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz \ @@ -2793,8 +2865,10 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1023-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz \ @@ -2854,6 +2928,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \ @@ -2869,6 +2944,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz \ @@ -2910,6 +2986,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz \ ppd/hpijs/hp-dj350-hpijs.ppd.gz \ @@ -2928,6 +3005,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1028nw-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz \ @@ -2938,10 +3016,12 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz \ @@ -2951,6 +3031,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz \ @@ -2984,6 +3065,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz \ ppd/hpijs/hp-cp1160-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz \ @@ -3012,6 +3094,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz \ @@ -3022,6 +3105,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz \ @@ -3101,6 +3185,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_5100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_p4515n-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ @@ -3132,6 +3217,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz \ prnt/ps/hp-laserjet_1300xi-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz \ prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \ @@ -3168,6 +3254,7 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_3030-ps.ppd.gz \ + prnt/ps/hp-laserjet_cm1415fnw-ps.ppd.gz \ prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p3004-ps.ppd.gz \ @@ -3185,6 +3272,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_2700-ps.ppd.gz \ prnt/ps/hp-laserjet_p4515x-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_m1536dnf_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055d-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5500-ps.ppd.gz \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ @@ -3291,6 +3379,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz \ @@ -3311,6 +3400,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz \ ppd/hpcups/hp-cp1160.ppd.gz \ ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz \ @@ -3468,6 +3558,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_f4400_series.ppd.gz \ ppd/hpcups/hp-deskjet_f4500_series.ppd.gz \ ppd/hpcups/hp-deskjet_f735.ppd.gz \ + ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz \ + ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz \ ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz \ ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz \ ppd/hpcups/hp-dj350.ppd.gz \ @@ -3574,11 +3666,31 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1021.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1022.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1023.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz \ ppd/hpcups/hp-laserjet_m1005.ppd.gz \ ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz \ @@ -3634,6 +3746,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ @@ -3832,6 +3945,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-photosmart_d7400_series.ppd.gz \ ppd/hpcups/hp-photosmart_d7500_series.ppd.gz \ ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz \ + ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz \ ppd/hpcups/hp-photosmart_p1000.ppd.gz \ ppd/hpcups/hp-photosmart_p1100.ppd.gz \ ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz \ @@ -3975,7 +4089,7 @@ cups_drv = prnt/drv/hpcups.drv # fax @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@faxdir = $(hplipdir)/fax -@FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_fax_DATA = fax/fax.py fax/__init__.py fax/coverpages.py fax/pmlfax.py fax/soapfax.py fax/marvellfax.py \ +@FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_fax_DATA = fax/fax.py fax/__init__.py fax/coverpages.py fax/pmlfax.py fax/ledmfax.py fax/soapfax.py fax/ledmsoapfax.py fax/marvellfax.py \ @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ fax/faxdevice.py fax/filters/pstotiff fax/filters/pstotiff.convs fax/filters/pstotiff.types @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@fax_filtersdir = $(mimedir) @@ -3984,8 +4098,8 @@ cups_drv = prnt/drv/hpcups.drv @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hpfax_SCRIPTS = fax/backend/hpfax.py @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpijsfaxppddir = $(hpppddir) @FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpcupsfaxppddir = $(hpppddir) -@FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@dist_hpijsfaxppd_DATA = fax/ppd/HP-Fax-hpijs.ppd.gz fax/ppd/HP-Fax2-hpijs.ppd.gz fax/ppd/HP-Fax3-hpijs.ppd.gz -@FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@dist_hpcupsfaxppd_DATA = fax/ppd/HP-Fax-hpcups.ppd.gz fax/ppd/HP-Fax2-hpcups.ppd.gz fax/ppd/HP-Fax3-hpcups.ppd.gz +@FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@dist_hpijsfaxppd_DATA = fax/ppd/HP-Fax-hpijs.ppd.gz fax/ppd/HP-Fax2-hpijs.ppd.gz fax/ppd/HP-Fax3-hpijs.ppd.gz fax/ppd/HP-Fax4-hpijs.ppd.gz +@FAX_BUILD_TRUE@@FULL_BUILD_TRUE@@HPCUPS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@dist_hpcupsfaxppd_DATA = fax/ppd/HP-Fax-hpcups.ppd.gz fax/ppd/HP-Fax2-hpcups.ppd.gz fax/ppd/HP-Fax3-hpcups.ppd.gz fax/ppd/HP-Fax4-hpcups.ppd.gz @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ptest_LDADD = libhpmud.la @@ -4066,7 +4180,6 @@ cups_drv = prnt/drv/hpcups.drv @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_SOURCES = io/mudext/hpmudext.c @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_LIBADD = libhpmud.la @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) - # ui (qt3) @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@uidir = $(hplipdir)/ui @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@dist_ui_DATA = ui/alignform.py \ @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Naga Samrat Chowdary Narla, # __version__ = '5.0' @@ -39,7 +39,7 @@ from prnt import cups def enterAlignmentNumber(letter, hortvert, colors, line_count, maximum): - ok, value = tui.enter_range("Enter the best aligned value for line %s (1-%d): " % + ok, value = tui.enter_range("From the printed Alignment page, Enter the best aligned value for line %s (1-%d): " % (letter, maximum), 1, maximum) @@ -205,6 +205,12 @@ try: elif align_type == ALIGN_TYPE_LIDIL_DJ_D1600: maint.AlignType14(d, tui.load_paper_prompt, type10and11and14Align, invalidPen2) + + elif align_type == ALIGN_TYPE_LEDM: + maint.AlignType15(d, tui.load_paper_prompt, aioUI2) + + elif align_type == ALIGN_TYPE_LEDM_MANUAL: + maint.AlignType16(d, tui.load_paper_prompt, enterAlignmentNumber) else: log.error("Invalid alignment type.") diff --git a/base/codes.py b/base/codes.py index eacfe8ace..43c16823c 100644 --- a/base/codes.py +++ b/base/codes.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Naga Samrat Chowdary Narla, Yashwant Sahu # # # NOTE: This module is safe for 'from codes import *' @@ -205,6 +205,7 @@ EVENT_SCAN_WAITING_FOR_PC = 2006 EVENT_SCAN_ADF_JAM = 2007 EVENT_SCAN_ADF_DOOR_OPEN = 2008 EVENT_SCAN_CANCEL = 2009 +EVENT_SIZE_WARNING = 2010 #end # fax @@ -426,6 +427,7 @@ STATUS_TO_ERROR_STATE_MAP = { EVENT_SCAN_TO_DESTINATION_NOTSET : ERROR_STATE_ERROR, EVENT_SCAN_ADF_LOADED : ERROR_STATE_OK, EVENT_SCAN_CANCEL : ERROR_STATE_OK, + EVENT_SIZE_WARNING : ERROR_STATE_WARNING, # Fax EVENT_FAX_DIALING : ERROR_STATE_BUSY, EVENT_FAX_CONNECTING : ERROR_STATE_BUSY, @@ -597,6 +599,8 @@ ALIGN_TYPE_LIDIL_0_5_4 = 11 ALIGN_TYPE_OJ_PRO = 12 # OJ Pro L7xxx ALIGN_TYPE_AIO = 13 # AiO Non-LIDIL (OJ J4500/J4600) ALIGN_TYPE_LIDIL_DJ_D1600 = 14 +ALIGN_TYPE_LEDM = 15 +ALIGN_TYPE_LEDM_MANUAL = 16 # clean-types CLEAN_TYPE_UNSUPPORTED = -1 @@ -662,6 +666,7 @@ FAX_TYPE_BLACK_AND_COLOR_SEND = 3 # future/OZ FAX_TYPE_SOAP = 4 FAX_TYPE_MARVELL = 5 FAX_TYPE_LEDM = 6 +FAX_TYPE_LEDMSOAP = 7 # pcard-types PCARD_TYPE_NONE = 0 @@ -679,6 +684,7 @@ SCAN_TYPE_MARVEL = 4 SCAN_TYPE_SOAP2 = 5 SCAN_TYPE_SCL_DUPLEX = 6 SCAN_TYPE_LEDM = 7 +SCAN_TYPE_MARVEL2 = 8 # scan-styles SCAN_STYLE_NONE = 0 @@ -691,11 +697,6 @@ SCAN_SRC_ADF = 1 SCAN_SRC_FLATBED = 2 SCAN_SRC_BOTH = 3 -# scan-color -SCAN_COLOR_NA = 0 -SCAN_COLOR_MONO = 1 -SCAN_COLOR_COLOR = 2 - # copy-types COPY_TYPE_NOT_SUPPORTED = -1 COPY_TYPE_NONE = 0 diff --git a/base/device.py b/base/device.py index 6d25ff96b..76823cf6f 100644 --- a/base/device.py +++ b/base/device.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Naga Samrat Chowdary Narla # # Std Lib @@ -27,8 +27,10 @@ import os.path import time import urllib # TODO: Replace with urllib2 (urllib is deprecated in Python 3.0) import StringIO +import cStringIO import httplib import struct +import string # Local from g import * @@ -36,6 +38,7 @@ from codes import * import utils import status import pml +import status from prnt import pcl, ldl, cups import models, mdns, slp from strings import StringTable @@ -2437,39 +2440,30 @@ class Device(object): finally: self.closeEWS() - def getEWSUrl_LEDM(self, url, stream): + def getEWSUrl_LEDM(self, url, stream, footer=""): try: - if self.is_local: - url2 = "%s&loc=%s" % (self.device_uri.replace('hpfax:', 'hp:'), url) - data = self - else: - url2 = "http://%s%s" % (self.host, url) - if self.zc: - status, ip = hpmudext.get_zc_ip_address(self.zc) - if status == hpmudext.HPMUD_R_OK: - url2 = "http://%s%s" % (ip, url) - data = None - - log.debug("Opening: %s" % url2) + url2 = "%s&loc=%s" % (self.device_uri.replace('hpfax:', 'hp:'), url) + data = self opener = LocalOpener_LEDM({}) try: - f = opener.open(url2, data) + if footer: + return opener.open_hp(url2, data, footer) + else: + return opener.open_hp(url2, data) except Error: - log.error("Status read failed: %s" % url2) - stream.seek(0) - stream.truncate() - else: - try: - stream.write(f.read()) - except AttributeError: - stream.write(" ") - - if f is not " ": - f.close() + log.debug("Status read failed: %s" % url2) finally: self.closeEWS_LEDM() - + def readAttributeFromXml(self,uri,attribute): + stream = cStringIO.StringIO() + data = status.StatusType10FetchUrl(self,uri) + if not data: + log.error("Unable To read the XML data from device") + return "" + xmlDict = utils.XMLToDictParser().parseXML(data) + return str(xmlDict[attribute]) + def downloadFirmware(self, usb_bus_id=None, usb_device_id=None): # Note: IDs not currently used ok = False filename = os.path.join(prop.data_dir, "firmware", self.model.lower() + '.fw.gz') @@ -2548,36 +2542,26 @@ class LocalOpener(urllib.URLopener): # URLs: hp:/usb/HP_OfficeJet_7500?serial=00XXXXXXXXXX&loc=/hp/device/info_device_status.xml class LocalOpener_LEDM(urllib.URLopener): - def open_hp(self, url, dev): + def open_hp(self, url, dev, foot=""): log.debug("open_hp(%s)" % url) match_obj = http_pat_url.search(url) - bus = match_obj.group(1) or '' - model = match_obj.group(2) or '' - serial = match_obj.group(3) or '' - device = match_obj.group(4) or '' - loc = match_obj.group(5) or '' + loc = url.split("=")[url.count("=")] dev.openEWS_LEDM() - dev.writeEWS_LEDM("""GET %s HTTP/1.1\nContent-Length:0\nHost:localhost\nUser-Agent:hplip\n\n""" % loc) + if foot: + if "PUT" in foot: + dev.writeEWS_LEDM("""%s""" % foot) + else: + dev.writeEWS_LEDM("""POST %s HTTP/1.1\r\nContent-Type:text/xml\r\nContent-Length:%s\r\nAccept-Encoding: UTF-8\r\nHost:localhost\r\nUser-Agent:hplip\r\n\r\n """ % (loc, len(foot))) + dev.writeEWS_LEDM("""%s""" % foot) + else: + dev.writeEWS_LEDM("""GET %s HTTP/1.1\r\nAccept: text/plain\r\nHost:localhost\r\nUser-Agent:hplip\r\n\r\n""" % loc) reply = xStringIO() - while dev.readEWS_LEDM(8080, reply, timeout=1): + while dev.readEWS_LEDM(8080, reply, timeout=3): pass reply.seek(0) - log.log_data(reply.getvalue()) - - response = httplib.HTTPResponse(reply) - try: - response.begin() - except httplib.BadStatusLine: - response.status = httplib.OK - response.fp = " " - - if response.status != httplib.OK: - raise Error(ERROR_DEVICE_STATUS_NOT_AVAILABLE) - else: - return response.fp - + return reply.getvalue() diff --git a/base/maint.py b/base/maint.py index ee11a2920..487247252 100644 --- a/base/maint.py +++ b/base/maint.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Naga Samrat Chowdary Narla, # # NOTE: Not used by Qt4 code. Use maint_*.py modules instead. @@ -620,6 +620,153 @@ def alignType13Phase1(dev): dev.setPML(pml.OID_AUTO_ALIGNMENT, pml.AUTO_ALIGNMENT) dev.closePML() +calibrationSession = 1 + +def dataModelHelper(dev, ui2): + data = status.StatusType10FetchUrl(dev, "/Calibration/State") + if not data: + data = status.StatusType10FetchUrl(dev, "/Calibration/State") + + if not data: + log.debug("Unable to retrieve calibration state") + return 0 + + if "ParmsRequested" in data: + log.error("Restart device and start alignment") + return 1 + + if "404 Not Found" in data: + log.error("Device may not support Alignment") + return 1 + + if "Printing<" in data: + log.warn("Previous alignment job not completed") + return 1 + + data = status.StatusType10FetchUrl(dev, "/DevMgmt/ConsumableConfigDyn.xml") + if "AlignmentMode" not in data: + log.error("Device may not support Alignment") + return 1 + + if "automatic" in data: + log.debug("Device supports automatic calibration") + status.StatusType10FetchUrl(dev, "/Calibration/Session", "<cal:CalibrationState xmlns:cal=\\\"http://www.hp.com/schemas/imaging/con/cnx/markingagentcalibration/2009/04/08\\\" xmlns:dd=\\\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\\\">Printing</cal:CalibrationState>") + return 0 + + if "semiAutomatic" in data: + log.debug("Device supports semiAutomatic calibration") + status.StatusType10FetchUrl(dev, "/Calibration/Session", "<cal:CalibrationState xmlns:cal=\\\"http://www.hp.com/schemas/imaging/con/cnx/markingagentcalibration/2009/04/08\\\" xmlns:dd=\\\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\\\">Printing</cal:CalibrationState>") + return ui2() + + if "manual" in data: + log.debug("Device supports manual calibration") + data = status.StatusType10FetchUrl(dev, "/Calibration/Session", "<cal:CalibrationState xmlns:cal=\\\"http://www.hp.com/schemas/imaging/con/cnx/markingagentcalibration/2009/04/08\\\" xmlns:dd=\\\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\\\">Printing</cal:CalibrationState>") + import string + data = string.split(data, "/Jobs")[1] + data = string.split(data, "\r\n")[0] + data = "/Jobs" + data + data = status.StatusType10FetchUrl(dev, data) + data = string.split(data, "Session/")[1] + data = string.split(data, "<")[0] + data = "/Calibration/Session/" + data + "/ManualSelectedPatterns.xml" + global calibrationSession + calibrationSession = data + + return 0 + +def AlignType16Manual(dev, a, b, c, d, e, f, g, h, i): + log.debug("a=%s b=%s c=%s d=%s e=%s f=%s g=%s h=%s i=%s" % (a, b, c, d, e, f, g, h, i )) + data = status.StatusType10FetchUrl(dev, "/Calibration/State") + + if not data: + return 0 + + while "ParmsRequested" not in data: + if "CalibrationValid" in data: + return + data = status.StatusType10FetchUrl(dev, "/Calibration/State") + data = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!-- THIS DATA SUBJECT TO DISCLAIMER(S) INCLUDED WITH THE PRODUCT OF ORIGIN. -->\n<ManualSelectedPatterns xmlns=\"http://www.hp.com/schemas/imaging/con/cnx/markingagentcalibration/2009/04/08\" xmlns:locid=\"http://www.hp.com/schemas/imaging/con/ledm/localizationids/2007/10/31/\" xmlns:psdyn=\"http://www.hp.com/schemas/imaging/con/ledm/productstatdyn/2007/10/31\"><SelectedPattern><Identifier><Id>1</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>2</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>3</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>4</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>5</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>6</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>7</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>8</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern><SelectedPattern><Identifier><Id>9</Id></Identifier><Choice><Identifier><Id>%s</Id></Identifier></Choice></SelectedPattern></ManualSelectedPattern>" % ( a, b, c, d, e, f, g, h, i ) + data = "PUT %s HTTP/1.1\r\nHost: localhost\r\nUser-Agent: hp\r\nAccept: text/plain\r\nAccept-Language: en-us,en\r\nAccept-Charset:utf-8\r\nContent-Type: text/xml\r\nContent-Length: %s\r\n\r\n" % ( calibrationSession, len(data)) + data + data = status.StatusType10FetchUrl(dev, calibrationSession, data) + +def AlignType15(dev, loadpaper_ui, ui2): + if not loadpaper_ui(): + return + return dataModelHelper(dev, ui2) + +def AlignType15Phase1(dev, ui2): + return dataModelHelper(dev, ui2) + +def AlignType16(dev, loadpaper_ui, align_ui): + if not loadpaper_ui(): + return + dataModelHelper(dev, align_ui) + state, a, b, c, d, e, f, g, h, i = 0, 6, 6, 3, 3, 6, 6, 6, 6, 6 + ok = False + while state != -1: + if state == 0: + state = -1 + ok, a = align_ui('A', 'v', 'kc', 3, 23) + if ok: + state = 1 + + elif state == 1: + state = -1 + ok, b = align_ui('B', 'h', 'kc', 3, 11) + if ok: + state = 2 + + elif state == 2: + state = -1 + ok, c = align_ui('C', 'v', 'k', 3, 23) + if ok: + state = 3 + + elif state == 3: + state = -1 + ok, d = align_ui('D', 'v', 'c', 3, 23) + if ok: + state = 4 + + elif state == 4: + state = -1 + ok, e = align_ui('E', 'h', 'k', 3, 11) + if ok: + state = 5 + + elif state == 5: + state = -1 + ok, e = align_ui('F', 'h', 'k', 3, 11) + if ok: + state = 6 + + elif state == 6: + state = -1 + ok, e = align_ui('G', 'h', 'k', 3, 11) + if ok: + state = 7 + + elif state == 7: + state = -1 + ok, e = align_ui('H', 'h', 'k', 3, 11) + if ok: + state = 8 + + elif state == 8: + state = -1 + ok, e = align_ui('I', 'h', 'k', 3, 11) + if ok: + state = 9 + + elif state == 9: + state = -1 + + AlignType16Manual(dev, a, b, c, d, e, f, g, h, i) + + return ok + +def AlignType16Phase1(dev, a, b, c, d, e, f, g, h, i): + AlignType16Manual(dev, a, b, c, d, e, f, g, h, i) def AlignType14(dev, loadpaper_ui, align_ui, invalidpen_ui): pattern = alignType14SetPattern(dev) diff --git a/base/models.py b/base/models.py index b45ca9316..06bd26029 100644 --- a/base/models.py +++ b/base/models.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Naga Samrat Chowdary Narla, # Local from base.g import * @@ -205,6 +205,7 @@ TECH_SUBCLASSES = [ "SmallMargins", "Trim", "4800x1200dpi", + "Advanced", ] TECH_SUBCLASSES.sort() @@ -300,7 +301,6 @@ class ModelData: 'scan-style' : TYPE_INT, 'scan-type' : TYPE_INT, 'scan-src' : TYPE_INT, - 'scan-color' : TYPE_INT, #'scan-duplex' : TYPE_BOOL, 'status-battery-check' : TYPE_INT, 'status-dynamic-counters' : TYPE_INT, diff --git a/base/status.py b/base/status.py index 09cf9d9c1..4ba6b57a3 100644 --- a/base/status.py +++ b/base/status.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Narla Naga Samrat Chowdary # from __future__ import division @@ -1463,6 +1463,7 @@ element_type10_xlate = { 'ink' : AGENT_KIND_SUPPLY, 'inkCartridge' : AGENT_KIND_HEAD_AND_SUPPLY, 'printhead' : AGENT_KIND_HEAD, 'toner' : AGENT_KIND_TONER_CARTRIDGE, + 'tonerCartridge' : AGENT_KIND_TONER_CARTRIDGE, } pen_type10_xlate = { 'pK' : AGENT_TYPE_PG, @@ -1485,30 +1486,29 @@ pen_health10_xlate = { 'ok' : AGENT_HEALTH_OK, 'missing' : AGENT_HEALTH_MISINSTALLED, } -def StatusType10FetchUrl(dev, url): - if dev.is_local: - data_fp = cStringIO.StringIO() - dev.getEWSUrl_LEDM(url, data_fp) - data = data_fp.getvalue() +def clean(data): + if data[0] is not '<': + size = -1 + temp = "" + while size: + index = data.find('\r\n') + size = int(data[0:index+1], 16) + temp = temp + data[index+2:index+2+size] + data = data[index+2+size+2:len(data)] + data = temp + return data +def StatusType10FetchUrl(dev, url, footer=""): + data_fp = cStringIO.StringIO() + if footer: + data = dev.getEWSUrl_LEDM(url, data_fp, footer) else: - if dev.zc: - status, ip = hpmudext.get_zc_ip_address(dev.zc) - if status != hpmudext.HPMUD_R_OK: - log.error("unable to get IP address of mDNS configured device") - return None - else: - ip = dev.host - - # Get the agent status XML - addr = "http://%s:8080%s" % (ip, url) - feed = urllib.urlopen(addr) - data = feed.read() - feed.close() - + data = dev.getEWSUrl_LEDM(url, data_fp) + if data: + data = data.split('\r\n\r\n', 1)[1] + data = clean(data) return data - def StatusType10(dev): # Low End Data Model status_block = { 'revision' : STATUS_REV_UNKNOWN, 'agents' : [], @@ -1543,33 +1543,36 @@ def StatusType10(dev): # Low End Data Model for e in elements: health = AGENT_HEALTH_OK ink_level = 0 - type = e.find("ConsumableTypeEnum").text - state = e.find("ConsumableLifeState/ConsumableState").text - - # level - if type == "ink" or type == "inkCartridge" or type == "toner": - ink_type = e.find("ConsumableLabelCode").text - if state != "missing": - try: - ink_level = int(e.find("ConsumablePercentageLevelRemaining").text) - except: - ink_level = 0 - else: - ink_type = '' - if state == "ok": - ink_level = 100 + try: + type = e.find("ConsumableTypeEnum").text + state = e.find("ConsumableLifeState/ConsumableState").text + + # level + if type == "ink" or type == "inkCartridge" or type == "toner" or type == "tonerCartridge": + ink_type = e.find("ConsumableLabelCode").text + if state != "missing": + try: + ink_level = int(e.find("ConsumablePercentageLevelRemaining").text) + except: + ink_level = 0 + else: + ink_type = '' + if state == "ok": + ink_level = 100 - log.debug("type '%s' state '%s' ink_type '%s' ink_level %d" % (type, state, ink_type, ink_level)) + log.debug("type '%s' state '%s' ink_type '%s' ink_level %d" % (type, state, ink_type, ink_level)) - entry = { 'kind' : element_type10_xlate.get(type, AGENT_KIND_NONE), - 'type' : pen_type10_xlate.get(ink_type, AGENT_TYPE_NONE), - 'health' : pen_health10_xlate.get(state, AGENT_HEALTH_OK), - 'level' : int(ink_level), - 'level-trigger' : pen_level10_xlate.get(state, AGENT_LEVEL_TRIGGER_SUFFICIENT_0) - } - - log.debug("%s" % entry) - agents.append(entry) + entry = { 'kind' : element_type10_xlate.get(type, AGENT_KIND_NONE), + 'type' : pen_type10_xlate.get(ink_type, AGENT_TYPE_NONE), + 'health' : pen_health10_xlate.get(state, AGENT_HEALTH_OK), + 'level' : int(ink_level), + 'level-trigger' : pen_level10_xlate.get(state, AGENT_LEVEL_TRIGGER_SUFFICIENT_0) + } + + log.debug("%s" % entry) + agents.append(entry) + except AttributeError: + log.debug("no value found for attribute") except (expat.ExpatError, UnboundLocalError): agents = [] status_block['agents'] = agents @@ -1625,6 +1628,8 @@ def StatusType10(dev): # Low End Data Model except (expat.ExpatError, UnboundLocalError): elements = [] for e in elements: + if e.text == "processing": + status_block['status-code'] = STATUS_PRINTER_PRINTING if e.text == "closeDoorOrCover": status_block['status-code'] = STATUS_PRINTER_DOOR_OPEN elif e.text == "shuttingDown": @@ -1639,7 +1644,7 @@ def StatusType10(dev): # Low End Data Model status_block['status-code'] = STATUS_PRINTER_HARD_ERROR elif e.text == "outputBinFull": status_block['status-code'] = STATUS_PRINTER_OUTPUT_BIN_FULL - elif e.text == "unexpectedSizeInTray": + elif e.text == "unexpectedSizeInTray" or e.text == "sizeMismatchInTray": status_block['status-code'] = STATUS_PRINTER_MEDIA_SIZE_MISMATCH elif e.text == "insertOrCloseTray2": status_block['status-code'] = STATUS_PRINTER_TRAY_2_MISSING @@ -1682,4 +1687,4 @@ def StatusType10(dev): # Low End Data Model elif e.text == "cartridgeMissing": status_block['status-code'] = STATUS_PRINTER_CARTRIDGE_MISSING - return status_block
\ No newline at end of file + return status_block diff --git a/base/strings.py b/base/strings.py index 45a205760..7db353392 100644 --- a/base/strings.py +++ b/base/strings.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Naga Samrat Chowdary Narla, # # string_table := { 'string_id' : 'short', 'long' ), ... } @@ -133,6 +133,7 @@ class StringTable: '2007' : (self.__tr('Scanner automatic document feeder jam'), ''), '2008' : (self.__tr('Scanner automatic document feeder door opened'), ''), '2009' : (self.__tr('Scan job cancelled'), ''), + '2010' : (self.__tr('Check scan image size requirements'), ''), '3000' : (self.__tr('Fax job started'), ''), '3001' : (self.__tr('Fax job complete'), ''), '3002' : (self.__tr('Fax job failed'), '%try_again%'), diff --git a/base/utils.py b/base/utils.py index db62c32e3..0154fd6be 100644 --- a/base/utils.py +++ b/base/utils.py @@ -65,8 +65,8 @@ def addgroup(): fp=open('/etc/cups/cupsd.conf') except IOError: try: - if "root" != grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid)[0]: - return grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid)[0] + if "root" != grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid).gr_name: + return [grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid).gr_name] except OSError: return lis @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.10.9. +# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.11.1. # -# Report bugs to <3.10.9.11>. +# Report bugs to <3.11.1.19>. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -750,9 +750,9 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='HP Linux Imaging and Printing' PACKAGE_TARNAME='hplip' -PACKAGE_VERSION='3.10.9' -PACKAGE_STRING='HP Linux Imaging and Printing 3.10.9' -PACKAGE_BUGREPORT='3.10.9.11' +PACKAGE_VERSION='3.11.1' +PACKAGE_STRING='HP Linux Imaging and Printing 3.11.1' +PACKAGE_BUGREPORT='3.11.1.19' # Factoring default headers for most tests. ac_includes_default="\ @@ -1636,7 +1636,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HP Linux Imaging and Printing 3.10.9 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.11.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1706,7 +1706,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.10.9:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.11.1:";; esac cat <<\_ACEOF @@ -1795,7 +1795,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <3.10.9.11>. +Report bugs to <3.11.1.19>. _ACEOF ac_status=$? fi @@ -1858,7 +1858,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HP Linux Imaging and Printing configure 3.10.9 +HP Linux Imaging and Printing configure 3.11.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1872,7 +1872,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HP Linux Imaging and Printing $as_me 3.10.9, which was +It was created by HP Linux Imaging and Printing $as_me 3.11.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2722,7 +2722,7 @@ fi # Define the identity of the package. PACKAGE='hplip' - VERSION='3.10.9' + VERSION='3.11.1' cat >>confdefs.h <<_ACEOF @@ -6063,7 +6063,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -20681,7 +20681,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -20836,7 +20836,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -22566,7 +22566,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -22722,7 +22722,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -22881,7 +22881,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -23112,7 +23112,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -23340,7 +23340,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -23721,7 +23721,7 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------ ## -## Report this to 3.10.9.11 ## +## Report this to 3.11.1.19 ## ## ------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -24891,7 +24891,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HP Linux Imaging and Printing $as_me 3.10.9, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.11.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24945,7 +24945,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -HP Linux Imaging and Printing config.status 3.10.9 +HP Linux Imaging and Printing config.status 3.11.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 0c62ca2dd..bcbb9dc6c 100755 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ # 104 = no libdl #AC_PREREQ(2.59) -AC_INIT([HP Linux Imaging and Printing], [3.10.9], [3.10.9.11], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.11.1], [3.11.1.19], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC diff --git a/cups_drv.inc b/cups_drv.inc index 98c730470..68604f936 100644 --- a/cups_drv.inc +++ b/cups_drv.inc @@ -60,6 +60,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz \ @@ -80,6 +81,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz \ + ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz \ ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz \ ppd/hpcups/hp-cp1160.ppd.gz \ ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz \ @@ -237,6 +239,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-deskjet_f4400_series.ppd.gz \ ppd/hpcups/hp-deskjet_f4500_series.ppd.gz \ ppd/hpcups/hp-deskjet_f735.ppd.gz \ + ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz \ + ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz \ ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz \ ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz \ ppd/hpcups/hp-dj350.ppd.gz \ @@ -343,11 +347,31 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1021.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1022.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1023.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz \ + ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz \ ppd/hpcups/hp-laserjet_m1005.ppd.gz \ ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz \ + ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz \ @@ -403,6 +427,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ @@ -601,6 +626,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-photosmart_d7400_series.ppd.gz \ ppd/hpcups/hp-photosmart_d7500_series.ppd.gz \ ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz \ + ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz \ ppd/hpcups/hp-photosmart_p1000.ppd.gz \ ppd/hpcups/hp-photosmart_p1100.ppd.gz \ ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz \ diff --git a/data/images/other/h-k-2.png b/data/images/other/h-k-2.png Binary files differnew file mode 100644 index 000000000..f24fa30b2 --- /dev/null +++ b/data/images/other/h-k-2.png diff --git a/data/images/other/h-k-3.png b/data/images/other/h-k-3.png Binary files differnew file mode 100644 index 000000000..ca0837c53 --- /dev/null +++ b/data/images/other/h-k-3.png diff --git a/data/models/models.dat b/data/models/models.dat index f7d9a2584..7211dbb14 100644 --- a/data/models/models.dat +++ b/data/models/models.dat @@ -20,7 +20,7 @@ # This file automatically generated by the HPLIP model editor (model_editor.py). # Please do NOT hand edit this file. # -# Last written on Wed, 08 Sep 2010 10:54:50 by sanjay. +# Last written on Wed, 19 Jan 2011 10:39:34 by yatheesh. # Model editor version 10.2 (Qt4). @@ -2533,8 +2533,48 @@ usb-pid=411 usb-vid=3f0 wifi-config=0 +[hp_designjet_100] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_designjet.png +io-mfp-mode=0 +io-mode=0 +io-support=0 +job-storage=0 +linefeed-cal-type=0 +model1=HP Designjet 100 Printer +model2=HP Designjet 100 Plus Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=0 +support-released=True +support-subtype=219b2b +support-type=0 +support-ver=0.0.0 +tech-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + [envy_100_d410_series] -align-type=1 +align-type=15 clean-type=3 color-cal-type=0 copy-type=0 @@ -2608,46 +2648,6 @@ usb-pid=9911 usb-vid=3f0 wifi-config=1 -[hp_designjet_100] -align-type=0 -clean-type=0 -color-cal-type=0 -copy-type=0 -embedded-server-type=0 -fax-type=0 -fw-download=False -icon=default_designjet.png -io-mfp-mode=0 -io-mode=0 -io-support=0 -job-storage=0 -linefeed-cal-type=0 -model1=HP Designjet 100 Printer -model2=HP Designjet 100 Plus Printer -monitor-type=0 -panel-check-type=0 -pcard-type=0 -plugin=0 -plugin-reason=0 -power-settings=0 -pq-diag-type=0 -r-type=0 -scan-style=0 -scan-type=0 -status-battery-check=0 -status-dynamic-counters=0 -status-type=0 -support-released=True -support-subtype=219b2b -support-type=0 -support-ver=0.0.0 -tech-class=Undefined -tech-subclass=Normal -tech-type=2 -usb-pid=0 -usb-vid=3f0 -wifi-config=0 - [photosmart_100] align-type=1 clean-type=1 @@ -3721,7 +3721,7 @@ embedded-server-type=1 fax-type=0 fw-download=False icon=Photosmart_C5100.png -io-mfp-mode=1 +io-mfp-mode=3 io-mode=1 io-support=10 job-storage=0 @@ -4448,7 +4448,7 @@ r8-agent5-kind=2 r8-agent5-sku=862/862XL r8-agent5-type=19 scan-style=1 -scan-type=1 +scan-type=6 status-battery-check=0 status-dynamic-counters=2 status-type=2 @@ -7038,6 +7038,81 @@ usb-pid=1a02 usb-vid=3f0 wifi-config=0 +[photosmart_ink_adv_k510] +align-type=1 +clean-type=3 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_photosmart.png +io-mfp-mode=3 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Photosmart Ink Adv K510 +monitor-type=0 +panel-check-type=1 +pcard-type=2 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=60/60XL +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=60/60XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=818/818XL/818L +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=818/818XL/818L +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=60/60XL/60L +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=60/60XL/60L +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=300/300XL +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=300/300XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=121/121XL +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=121/121XL +r8-agent2-type=2 +scan-style=1 +scan-type=1 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=ViperPlusVIP +tech-subclass=Normal +tech-type=2 +usb-pid=9e11 +usb-vid=3f0 +wifi-config=1 + [photosmart_estn_c510_series] align-type=1 clean-type=3 @@ -12869,7 +12944,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_1000_j110_series] -align-type=13 +align-type=16 clean-type=1 color-cal-type=0 copy-type=0 @@ -12931,7 +13006,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=2 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -13611,6 +13686,108 @@ usb-pid=2b17 usb-vid=3f0 wifi-config=0 +[hp_laserjet_cp1021] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1021 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1022] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1022 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_1022nw] align-type=0 clean-type=0 @@ -13738,8 +13915,314 @@ usb-pid=2c17 usb-vid=3f0 wifi-config=0 +[hp_laserjet_cp1023] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1023 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1025nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1025nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1025] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1025 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1026nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1026nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1027nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1027nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1028nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1028nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + [deskjet_1050_j410_series] -align-type=13 +align-type=-1 clean-type=1 color-cal-type=0 copy-type=0 @@ -13747,7 +14230,7 @@ embedded-server-type=0 fax-type=0 fw-download=False icon=hp_deskjet_f4200.png -io-mfp-mode=3 +io-mfp-mode=1 io-mode=1 io-support=2 job-storage=0 @@ -13798,7 +14281,7 @@ r8-agent2-kind=3 r8-agent2-sku=121/121XL r8-agent2-type=2 scan-style=1 -scan-type=-1 +scan-type=7 status-battery-check=0 status-dynamic-counters=1 status-type=2 @@ -14799,10 +15282,9 @@ r-type=0 r0-agent1-kind=4 r0-agent1-sku=Q2612A r0-agent1-type=1 -scan-color=1 scan-src=2 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -14841,12 +15323,11 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q2612A +r0-agent1-sku=CE285A r0-agent1-type=1 -scan-color=1 scan-src=2 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -15212,7 +15693,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=0 -status-type=0 +status-type=1 support-released=True support-subtype=219b2b support-type=2 @@ -15464,12 +15945,11 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q2612A +r0-agent1-sku=CE285A r0-agent1-type=1 -scan-color=1 scan-src=3 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -15484,6 +15964,49 @@ usb-pid=52a usb-vid=3f0 wifi-config=0 +[hp_laserjet_professional_m1213nf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=5 +fw-download=False +icon=hp_laserjet_3050.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional M1213nf Multifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=65 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE285A +r0-agent1-type=1 +scan-src=3 +scan-style=1 +scan-type=8 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=52a +usb-vid=3f0 +wifi-config=0 + [hp_color_laserjet_cp1215] align-type=0 clean-type=0 @@ -15607,10 +16130,9 @@ r-type=0 r0-agent1-kind=4 r0-agent1-sku=Q2612A r0-agent1-type=1 -scan-color=1 scan-src=3 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -16267,16 +16789,16 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q6000A +r0-agent1-sku=CB540A r0-agent1-type=1 r0-agent2-kind=4 -r0-agent2-sku=Q6001A +r0-agent2-sku=CB541A r0-agent2-type=4 r0-agent3-kind=4 -r0-agent3-sku=Q6002A +r0-agent3-sku=CB542A r0-agent3-type=6 r0-agent4-kind=4 -r0-agent4-sku=Q6003A +r0-agent4-sku=CB543A r0-agent4-type=5 scan-style=1 scan-type=5 @@ -16318,16 +16840,16 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q6000A +r0-agent1-sku=CB540A r0-agent1-type=1 r0-agent2-kind=4 -r0-agent2-sku=Q6001A +r0-agent2-sku=CB541A r0-agent2-type=4 r0-agent3-kind=4 -r0-agent3-sku=Q6002A +r0-agent3-sku=CB542A r0-agent3-type=6 r0-agent4-kind=4 -r0-agent4-sku=Q6003A +r0-agent4-sku=CB543A r0-agent4-type=5 scan-style=1 scan-type=5 @@ -16862,6 +17384,414 @@ usb-pid=4d11 usb-vid=3f0 wifi-config=0 +[hp_laserjet_cm1411fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1411fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1412fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1412fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1413fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1413fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1415fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1415fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1415fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1415fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1416fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1416fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1417fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1417fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1418fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1418fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + [hp_color_laserjet_1500] align-type=0 clean-type=1 @@ -17483,7 +18413,7 @@ usb-pid=5017 usb-vid=3f0 wifi-config=0 -[hp_laserjet_cp1525n] +[hp_laserjet_m1522nf_mfp] align-type=0 clean-type=0 color-cal-type=0 @@ -17491,63 +18421,47 @@ copy-type=0 embedded-server-type=1 fax-type=0 fw-download=False -icon=hp_color_laserjet_cp2025.png +icon=HP_LaserJet_m1522.png io-mfp-mode=1 io-mode=1 io-support=6 job-storage=0 linefeed-cal-type=0 -model1=HP Laserjet Profesional CP1525N -model2=HP Laserjet Profesional CP1521n -model3=HP Laserjet Profesional CP1522n -model4=HP Laserjet Profesional CP1523n -model5=HP Laserjet Profesional CP1525nw -model6=HP Laserjet Profesional CP1526nw -model7=HP Laserjet Profesional CP1527nw -model8=HP Laserjet Profesional CP1528nw +model1=HP LaserJet M1522nf Multifunction Printer monitor-type=0 -panel-check-type=1 -pcard-type=2 -plugin=0 -plugin-reason=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=CB540A +r0-agent1-sku=Q7573 r0-agent1-type=1 -r0-agent2-kind=4 -r0-agent2-sku=CB541A -r0-agent2-type=4 -r0-agent3-kind=4 -r0-agent3-sku=CB542A -r0-agent3-type=5 -r0-agent4-kind=4 -r0-agent4-sku=CB543A -r0-agent4-type=6 -scan-style=0 -scan-type=0 +scan-style=1 +scan-type=5 status-battery-check=0 status-dynamic-counters=0 -status-type=10 +status-type=6 support-released=True support-subtype=219b2b support-type=2 -support-ver=3.10.9 -tech-class=Postscript +support-ver=2.8.10 +tech-class=LJMono,Postscript tech-subclass=Normal -tech-type=4 -usb-pid=22a +tech-type=3 +usb-pid=0 usb-vid=3f0 wifi-config=0 -[hp_laserjet_m1522nf_mfp] +[hp_laserjet_m1522_mfp] align-type=0 clean-type=0 color-cal-type=0 copy-type=0 embedded-server-type=1 -fax-type=4 +fax-type=0 fw-download=False icon=HP_LaserJet_m1522.png io-mfp-mode=1 @@ -17555,7 +18469,7 @@ io-mode=1 io-support=6 job-storage=0 linefeed-cal-type=0 -model1=HP LaserJet M1522nf Multifunction Printer +model1=HP LaserJet M1522 Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -17573,17 +18487,17 @@ status-battery-check=0 status-dynamic-counters=0 status-type=6 support-released=True -support-subtype=219b2b +support-subtype=-4fc8 support-type=2 support-ver=2.8.10 -tech-class=LJMono,Postscript +tech-class=Postscript tech-subclass=Normal tech-type=3 usb-pid=0 usb-vid=3f0 wifi-config=0 -[hp_laserjet_m1522_mfp] +[hp_laserjet_m1522n_mfp] align-type=0 clean-type=0 color-cal-type=0 @@ -17597,7 +18511,7 @@ io-mode=1 io-support=6 job-storage=0 linefeed-cal-type=0 -model1=HP LaserJet M1522 Multifunction Printer +model1=HP LaserJet M1522n Multifunction Printer monitor-type=0 panel-check-type=0 pcard-type=0 @@ -17615,7 +18529,7 @@ status-battery-check=0 status-dynamic-counters=0 status-type=6 support-released=True -support-subtype=-4fc8 +support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=Postscript @@ -17625,13 +18539,13 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 -[hp_laserjet_m1522n_mfp] +[hp_laserjet_m1536dnf_mfp] align-type=0 clean-type=0 color-cal-type=0 copy-type=0 -embedded-server-type=1 -fax-type=0 +embedded-server-type=0 +fax-type=7 fw-download=False icon=HP_LaserJet_m1522.png io-mfp-mode=1 @@ -17639,7 +18553,10 @@ io-mode=1 io-support=6 job-storage=0 linefeed-cal-type=0 -model1=HP LaserJet M1522n Multifunction Printer +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP monitor-type=0 panel-check-type=0 pcard-type=0 @@ -17649,21 +18566,156 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q7573 +r0-agent1-sku=CE278A r0-agent1-type=1 scan-style=1 scan-type=5 -status-battery-check=0 +status-battery-check=2 status-dynamic-counters=0 -status-type=6 +status-type=10 support-released=True -support-subtype=219b2b +support-subtype=-4fc8 support-type=2 -support-ver=2.8.10 -tech-class=Postscript +support-ver=3.11.1 +tech-class=LJMono,Postscript tech-subclass=Normal tech-type=3 -usb-pid=0 +usb-pid=12a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m1537dnf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_LaserJet_m1522.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE278A +r0-agent1-type=1 +scan-style=1 +scan-type=5 +status-battery-check=2 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=-4fc8 +support-type=2 +support-ver=3.11.1 +tech-class=LJMono,Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=12a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m1538dnf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_LaserJet_m1522.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE278A +r0-agent1-type=1 +scan-style=1 +scan-type=5 +status-battery-check=2 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=-4fc8 +support-type=2 +support-ver=3.11.1 +tech-class=LJMono,Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=12a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m1539dnf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_LaserJet_m1522.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE278A +r0-agent1-type=1 +scan-style=1 +scan-type=5 +status-battery-check=2 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=-4fc8 +support-type=2 +support-ver=3.11.1 +tech-class=LJMono,Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=12a usb-vid=3f0 wifi-config=0 @@ -18345,7 +19397,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_2000_j210_series] -align-type=13 +align-type=16 clean-type=1 color-cal-type=0 copy-type=0 @@ -18407,7 +19459,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=2 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -18485,6 +19537,81 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[deskjet_ink_adv_2010_k010] +align-type=16 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_deskjet.png +io-mfp-mode=3 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet Ink Adv 2010 K010 +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=61/61XL/61b +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=61/61XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=802/802XL/802b +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=802/802XL +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=61/61XL/61b +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=61/61XL +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=301/301XL/301b +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=301/301XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=122/122XL/122b +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=122/122XL +r8-agent2-type=2 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=Pyramid +tech-subclass=NoAutoDuplex,NoCDDVD +tech-type=2 +usb-pid=9b11 +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_p2014] align-type=0 clean-type=0 @@ -19068,7 +20195,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_2050_j510_series] -align-type=13 +align-type=-1 clean-type=1 color-cal-type=0 copy-type=0 @@ -19076,7 +20203,7 @@ embedded-server-type=0 fax-type=0 fw-download=False icon=hp_deskjet_f4200.png -io-mfp-mode=3 +io-mfp-mode=1 io-mode=1 io-support=2 job-storage=0 @@ -19127,7 +20254,7 @@ r8-agent2-kind=3 r8-agent2-sku=121/121XL r8-agent2-type=2 scan-style=1 -scan-type=0 +scan-type=7 status-battery-check=0 status-dynamic-counters=1 status-type=2 @@ -19310,6 +20437,81 @@ usb-pid=5c17 usb-vid=3f0 wifi-config=0 +[deskjet_ink_adv_2060_k110] +align-type=-1 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_deskjet.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet Ink Adv 2060 K110 +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=61/61XL/61b +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=61/61XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=802/802XL/802b +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=802/802XL +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=61/61XL/61b +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=61/61XL +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=301/301XL/301b +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=301/301XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=122/122XL/122b +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=122/122XL +r8-agent2-type=2 +scan-style=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=Pyramid +tech-subclass=NoAutoDuplex,NoCDDVD +tech-type=2 +usb-pid=9a11 +usb-vid=3f0 +wifi-config=0 + [apollo_2100] align-type=0 clean-type=0 @@ -23430,7 +24632,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_3000_j310_series] -align-type=13 +align-type=16 clean-type=1 color-cal-type=0 copy-type=0 @@ -23492,7 +24694,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=2 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -23894,7 +25096,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_3050_j610_series] -align-type=13 +align-type=15 clean-type=1 color-cal-type=0 copy-type=0 @@ -28432,6 +29634,100 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[deskjet_f4200_series] +align-type=13 +clean-type=1 +color-cal-type=3 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=3 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet F4224 All-in-One Printer +model10=HP Deskjet F4275 All-in-One Printer +model11=HP Deskjet F4275 All-in-One Printer +model12=HP Deskjet F4280 All-in-One Printer +model13=HP Deskjet F4283 All-in-One Printer +model14=HP Deskjet F4288 All-in-One Printer +model15=HP Deskjet F4292 All-in-One Printer +model16=HP Deskjet F4293 All-in-One Printer +model17=HP Deskjet F4294 All-in-One Printer +model2=HP Deskjet F4230 All-in-One Printer +model3=HP Deskjet F4235 All-in-One Printer +model4=HP Deskjet F4238 All-in-One Printer +model5=HP Deskjet F4240 All-in-One Printer +model6=HP Deskjet F4250 All-in-One Printer +model7=HP Deskjet F4272 All-in-One Printer +model8=HP Deskjet F4273 All-in-One Printer +model9=HP Deskjet F4274 All-in-One Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=60/60XL/60b +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=60/60XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=818/818XL/818b +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=818/818XL +r10-agent2-type=2 +r18-agent1-kind=3 +r18-agent1-sku=92/98 +r18-agent1-type=1 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=60/60XL/60b +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=60/60XL +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=300/300XL/300b +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=300/300XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=121/121XL/121b +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=121/121XL +r8-agent2-type=2 +scan-style=1 +scan-type=1 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=2.8.5 +tech-class=DJGenericVIP +tech-subclass=Normal +tech-type=2 +usb-pid=2504 +usb-vid=3f0 +wifi-config=0 + [officejet_4200_series] align-type=5 clean-type=2 @@ -28720,100 +30016,6 @@ usb-pid=7b04 usb-vid=3f0 wifi-config=0 -[deskjet_f4200_series] -align-type=13 -clean-type=1 -color-cal-type=3 -copy-type=0 -embedded-server-type=0 -fax-type=0 -fw-download=False -icon=hp_deskjet_f4200.png -io-mfp-mode=3 -io-mode=1 -io-support=2 -job-storage=0 -linefeed-cal-type=0 -model1=HP Deskjet F4224 All-in-One Printer -model10=HP Deskjet F4275 All-in-One Printer -model11=HP Deskjet F4275 All-in-One Printer -model12=HP Deskjet F4280 All-in-One Printer -model13=HP Deskjet F4283 All-in-One Printer -model14=HP Deskjet F4288 All-in-One Printer -model15=HP Deskjet F4292 All-in-One Printer -model16=HP Deskjet F4293 All-in-One Printer -model17=HP Deskjet F4294 All-in-One Printer -model2=HP Deskjet F4230 All-in-One Printer -model3=HP Deskjet F4235 All-in-One Printer -model4=HP Deskjet F4238 All-in-One Printer -model5=HP Deskjet F4240 All-in-One Printer -model6=HP Deskjet F4250 All-in-One Printer -model7=HP Deskjet F4272 All-in-One Printer -model8=HP Deskjet F4273 All-in-One Printer -model9=HP Deskjet F4274 All-in-One Printer -monitor-type=0 -panel-check-type=0 -pcard-type=0 -plugin=0 -plugin-reason=0 -power-settings=0 -pq-diag-type=0 -r-type=1 -r0-agent1-kind=3 -r0-agent1-sku=60/60XL/60b -r0-agent1-type=1 -r0-agent2-kind=3 -r0-agent2-sku=60/60XL -r0-agent2-type=2 -r10-agent1-kind=3 -r10-agent1-sku=818/818XL/818b -r10-agent1-type=1 -r10-agent2-kind=3 -r10-agent2-sku=818/818XL -r10-agent2-type=2 -r18-agent1-kind=3 -r18-agent1-sku=92/98 -r18-agent1-type=1 -r18-agent2-kind=3 -r18-agent2-sku=93/95 -r18-agent2-type=2 -r18-agent3-kind=3 -r18-agent3-sku=99 -r18-agent3-type=3 -r2-agent1-kind=3 -r2-agent1-sku=60/60XL/60b -r2-agent1-type=1 -r2-agent2-kind=3 -r2-agent2-sku=60/60XL -r2-agent2-type=2 -r4-agent1-kind=3 -r4-agent1-sku=300/300XL/300b -r4-agent1-type=1 -r4-agent2-kind=3 -r4-agent2-sku=300/300XL -r4-agent2-type=2 -r8-agent1-kind=3 -r8-agent1-sku=121/121XL/121b -r8-agent1-type=1 -r8-agent2-kind=3 -r8-agent2-sku=121/121XL -r8-agent2-type=2 -scan-style=1 -scan-type=1 -status-battery-check=0 -status-dynamic-counters=1 -status-type=2 -support-released=True -support-subtype=219b2b -support-type=2 -support-ver=2.8.5 -tech-class=DJGenericVIP -tech-subclass=Normal -tech-type=2 -usb-pid=2504 -usb-vid=3f0 -wifi-config=0 - [deskjet_f4210_series] align-type=6 clean-type=1 @@ -31089,6 +32291,57 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_cm4540_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=-1 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_9000_MFP.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet CM4540 Multifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE260A / CE264X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF031A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF032A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CF033A +r0-agent4-type=5 +scan-style=0 +scan-type=-1 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=9917 +usb-vid=3f0 +wifi-config=0 + [hp_color_laserjet_4550] align-type=0 clean-type=0 @@ -34175,6 +35428,57 @@ usb-pid=7211 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_cp5520_series] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet CP5520 Series Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE270A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE271A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE273A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE272A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=9b17 +usb-vid=3f0 +wifi-config=0 + [hp_color_laserjet_5550] align-type=0 clean-type=0 @@ -36744,12 +38048,12 @@ usb-vid=3f0 wifi-config=0 [officejet_6500_e710n-z] -align-type=1 +align-type=15 clean-type=3 color-cal-type=0 copy-type=0 embedded-server-type=1 -fax-type=-1 +fax-type=6 fw-download=False icon=officejet_k550.png io-mfp-mode=1 @@ -36857,6 +38161,120 @@ usb-pid=5412 usb-vid=3f0 wifi-config=1 +[officejet_6500_e710a-f] +align-type=15 +clean-type=3 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=Officejet 6500 E710 +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=2 +r0-agent1-sku=04/04XL +r0-agent1-type=1 +r0-agent2-kind=2 +r0-agent2-sku=04/04XL +r0-agent2-type=4 +r0-agent3-kind=2 +r0-agent3-sku=04/04XL +r0-agent3-type=5 +r0-agent4-kind=2 +r0-agent4-sku=04/04XL +r0-agent4-type=6 +r0-agent5-kind=2 +r0-agent5-sku=04/04XL +r0-agent5-type=16 +r1-agent1-kind=2 +r1-agent1-sku=04/04XL +r1-agent1-type=1 +r1-agent2-kind=2 +r1-agent2-sku=04/04XL +r1-agent2-type=4 +r1-agent3-kind=2 +r1-agent3-sku=04/04XL +r1-agent3-type=5 +r1-agent4-kind=2 +r1-agent4-sku=04/04XL +r1-agent4-type=6 +r1-agent5-kind=2 +r1-agent5-sku=04/04XL +r1-agent5-type=16 +r2-agent1-kind=2 +r2-agent1-sku=360/360XL +r2-agent1-type=1 +r2-agent2-kind=2 +r2-agent2-sku=360/360XL +r2-agent2-type=4 +r2-agent3-kind=2 +r2-agent3-sku=360/360XL +r2-agent3-type=5 +r2-agent4-kind=2 +r2-agent4-sku=360/360XL +r2-agent4-type=6 +r2-agent5-kind=2 +r2-agent5-sku=360/360XL +r2-agent5-type=16 +r4-agent1-kind=2 +r4-agent1-sku=155/155XL +r4-agent1-type=1 +r4-agent2-kind=2 +r4-agent2-sku=155/155XL +r4-agent2-type=4 +r4-agent3-kind=2 +r4-agent3-sku=155/155XL +r4-agent3-type=5 +r4-agent4-kind=2 +r4-agent4-sku=155/155XL +r4-agent4-type=6 +r4-agent5-kind=2 +r4-agent5-sku=155/155XL +r4-agent5-type=16 +r8-agent1-kind=2 +r8-agent1-sku=808/808XL +r8-agent1-type=1 +r8-agent2-kind=2 +r8-agent2-sku=808/808XL +r8-agent2-type=4 +r8-agent3-kind=2 +r8-agent3-sku=808/808XL +r8-agent3-type=5 +r8-agent4-kind=2 +r8-agent4-sku=808/808XL +r8-agent4-type=6 +r8-agent5-kind=2 +r8-agent5-sku=808/808XL +r8-agent5-type=16 +scan-style=0 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=2 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=Python +tech-subclass=NoCDDVD,NoAutoDuplex +tech-type=2 +usb-pid=5512 +usb-vid=3f0 +wifi-config=0 + [officejet_6500_e709n] align-type=1 clean-type=1 @@ -39950,12 +41368,12 @@ usb-vid=3f0 wifi-config=0 [officejet_7500_e910] -align-type=1 +align-type=15 clean-type=1 color-cal-type=0 copy-type=0 embedded-server-type=0 -fax-type=-1 +fax-type=6 fw-download=False icon=officejet_k550.png io-mfp-mode=1 @@ -42419,12 +43837,12 @@ usb-vid=3f0 wifi-config=0 [officejet_pro_8500_a910] -align-type=13 +align-type=15 clean-type=1 color-cal-type=0 copy-type=0 embedded-server-type=1 -fax-type=-1 +fax-type=0 fw-download=False icon=officejet_k550.png io-mfp-mode=1 @@ -43872,6 +45290,8 @@ wifi-config=0 # 12 : Carrier # 13 : Auto AiO # 14 : LIDIL DJ D1600 +# 15 : Low End Data Model (automatic and semiautomatic) +# 16 : Low End Data Model (manual) # # # clean-type @@ -43932,6 +45352,7 @@ wifi-config=0 # 4 : B&W SOAP # 5 : B&W MARVELL # 6 : B&W LEDM +# 7 : B&W LEDMSOAP # # # fw-download @@ -44105,6 +45526,7 @@ wifi-config=0 # 5 : SOAP2 # 6 : Duplex SCL # 7 : LEDM +# 8 : Marvell2 # # # status-battery-check @@ -44229,7 +45651,9 @@ wifi-config=0 # HPLIP device sub-class(es) # (TYPE_LIST) # 300dpiOnly +# 4800x1200dpi # 4x6FullBleed +# Advanced # Apollo2000 # Apollo2200 # Apollo2500 diff --git a/data/rules/40-hplip.rules b/data/rules/40-hplip.rules index ca39de744..d2dd3ee50 100644 --- a/data/rules/40-hplip.rules +++ b/data/rules/40-hplip.rules @@ -131,6 +131,8 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", GROUP="lp", ENV{ID_HPLIP}="1" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", GROUP="lp", ENV{ID_HPLIP}="1" # Check for LaserJet products (0x03f0xx2a). ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", GROUP="lp", ENV{ID_HPLIP}="1" +# Check for DesignJet product (0x03f0xx14). +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??14", GROUP="lp", ENV{ID_HPLIP}="1" LABEL="hpmud_rules_end" diff --git a/data/rules/55-hpmud.rules b/data/rules/55-hpmud.rules index 71f7951aa..2b260f223 100644 --- a/data/rules/55-hpmud.rules +++ b/data/rules/55-hpmud.rules @@ -141,6 +141,8 @@ SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MOD SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" # Check for LaserJet products (0x03f0xx2a). SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660" +# Check for DesignJet product (0x03f0xx14). +SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660" # Removed the following rule because FHS states that /etc should be reserved for static files only. This # functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield diff --git a/fax/backend/hpfax.py b/fax/backend/hpfax.py index c12d8c4f6..039af446d 100755 --- a/fax/backend/hpfax.py +++ b/fax/backend/hpfax.py @@ -166,7 +166,7 @@ if len( args ) == 0: print 'direct %s "HP Fax 3" "%s LPT HP Fax HPLIP" "MFG:HP;MDL:Fax 3;DES:HP Fax 3;"' % \ (uri.replace("hp:", "hpfax:"), model.replace('_', ' ')) - elif mq.get('fax-type', FAX_TYPE_NONE) in (FAX_TYPE_SOAP,): + elif mq.get('fax-type', FAX_TYPE_NONE) in (FAX_TYPE_SOAP,) or mq.get('fax-type', FAX_TYPE_NONE) in (FAX_TYPE_LEDMSOAP,): # HP Fax 2 if bus == 'usb': print 'direct %s "HP Fax 2" "%s USB %s HP Fax HPLIP" "MFG:HP;MDL:Fax 2;DES:HP Fax 2;"' % \ @@ -175,6 +175,15 @@ if len( args ) == 0: else: # par print 'direct %s "HP Fax 2" "%s LPT HP Fax HPLIP" "MFG:HP;MDL:Fax 2;DES:HP Fax 2;"' % \ (uri.replace("hp:", "hpfax:"), model.replace('_', ' ')) + elif mq.get('fax-type', FAX_TYPE_NONE) in (FAX_TYPE_LEDM,): + # HP Fax 4 + if bus == 'usb': + print 'direct %s "HP Fax 4" "%s USB %s HP Fax HPLIP" "MFG:HP;MDL:Fax 4;DES:HP Fax 4;"' % \ + (uri.replace("hp:", "hpfax:"), model.replace('_', ' '), serial) + + else: # par + print 'direct %s "HP Fax 4" "%s LPT HP Fax HPLIP" "MFG:HP;MDL:Fax 4;DES:HP Fax 4;"' % \ + (uri.replace("hp:", "hpfax:"), model.replace('_', ' ')) else: # HP Fax diff --git a/fax/fax.py b/fax/fax.py index e1c3247a7..ea3551f2c 100644 --- a/fax/fax.py +++ b/fax/fax.py @@ -65,6 +65,10 @@ STATUS_CREATING_COVER_PAGE = 7 STATUS_ERROR = 8 STATUS_BUSY = 9 STATUS_CLEANUP = 10 +STATUS_ERROR_IN_CONNECTING = 11 +STATUS_ERROR_IN_TRANSMITTING = 12 +STATUS_ERROR_PROBLEM_IN_FAXLINE = 13 +STATUS_JOB_CANCEL = 14 # Event queue values (UI ==> Send thread) EVENT_FAX_SEND_CANCELED = 1 @@ -132,7 +136,6 @@ RESOLUTION_300DPI = 3 FILE_HEADER_SIZE = 28 PAGE_HEADER_SIZE = 24 - # **************************************************************************** # ##skip_dn = ["uid=foo,ou=People,dc=example,dc=com", @@ -520,16 +523,26 @@ def getFaxDevice(device_uri=None, printer_name=None, from soapfax import SOAPFaxDevice return SOAPFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + elif fax_type == FAX_TYPE_LEDMSOAP: + from ledmsoapfax import LEDMSOAPFaxDevice + return LEDMSOAPFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + elif fax_type == FAX_TYPE_MARVELL: from marvellfax import MarvellFaxDevice return MarvellFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + elif fax_type == FAX_TYPE_LEDM: + from ledmfax import LEDMFaxDevice + return LEDMFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + else: raise Error(ERROR_DEVICE_DOES_NOT_SUPPORT_OPERATION) # **************************************************************************** # + + # TODO: Define these in only 1 place! STATE_DONE = 0 STATE_ABORTED = 10 diff --git a/fax/faxdevice.py b/fax/faxdevice.py index 4cb4dba62..b832d35cf 100644 --- a/fax/faxdevice.py +++ b/fax/faxdevice.py @@ -55,8 +55,16 @@ def FaxDevice(device_uri=None, printer_name=None, elif fax_type == FAX_TYPE_SOAP: return SOAPFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + elif fax_type == FAX_TYPE_LEDMSOAP: + return LEDMSOAPFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + elif fax_type == FAX_TYPE_MARVELL: return MarvellFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + + elif fax_type == FAX_TYPE_LEDM: + from ledmfax import LEDMFaxDevice + return LEDMFaxDevice(device_uri, printer_name, callback, fax_type, disable_dbus) + else: raise Error(ERROR_DEVICE_DOES_NOT_SUPPORT_OPERATION) diff --git a/fax/ledmfax.py b/fax/ledmfax.py new file mode 100644 index 000000000..046b58902 --- /dev/null +++ b/fax/ledmfax.py @@ -0,0 +1,691 @@ +# -*- coding: utf-8 -*- +# +# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: k,shunmugaraj +# Date Created: 10/10/2010 + +from __future__ import division + +# Std Lib +import sys +import os +import time +import cStringIO +import urllib # TODO: Replace with urllib2 (urllib is deprecated in Python 3.0) +import re +import threading +import struct +import time +import xml.parsers.expat as expat +from stat import * +# Local +from base.g import * +from base.codes import * +from base import device, utils, codes, dime, status +from fax import * + + +# **************************************************************************** # + +http_result_pat = re.compile("""HTTP/\d.\d\s(\d+)""", re.I) + +HTTP_OK = 200 +HTTP_ACCEPTED = 202 +HTTP_CREATED = 201 +HTTP_ERROR = 500 + +PIXELS_PER_LINE = 1728 + +# **************************************************************************** # +setPhoneNumXML = """<?xml version=\"1.0\" encoding=\"UTF-8\"?><!--Sample XML file generated by XMLSPY v5 rel. 4 U (http://www.xmlspy.com)--><faxcfgdyn:FaxConfigDyn xmlns:faxcfgdyn=\"http://www.hp.com/schemas/imaging/con/ledm/faxconfigdyn/2009/03/03\" xmlns:dd=\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\" xmlns:fax=\"http://www.hp.com/schemas/imaging/con/fax/2008/06/13\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.hp.com/schemas/imaging/con/ledm/faxconfigdyn/2009/03/03 ../schemas/FaxConfigDyn.xsd\"><faxcfgdyn:SystemSettings><dd:PhoneNumber>%s</dd:PhoneNumber></faxcfgdyn:SystemSettings></faxcfgdyn:FaxConfigDyn>""" + +setStationNameXML = """<?xml version=\"1.0\" encoding=\"UTF-8\"?><!--Sample XML file generated by XMLSPY v5 rel. 4 U (http://www.xmlspy.com)--><faxcfgdyn:FaxConfigDyn xmlns:faxcfgdyn=\"http://www.hp.com/schemas/imaging/con/ledm/faxconfigdyn/2009/03/03\" xmlns:dd=\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\" xmlns:fax=\"http://www.hp.com/schemas/imaging/con/fax/2008/06/13\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.hp.com/schemas/imaging/con/ledm/faxconfigdyn/2009/03/03 ../schemas/FaxConfigDyn.xsd\"><faxcfgdyn:SystemSettings><dd:CompanyName>%s</dd:CompanyName></faxcfgdyn:SystemSettings></faxcfgdyn:FaxConfigDyn>""" + +createJobXML = """<?xml version=\"1.0\" encoding=\"UTF-8\"?><!--THIS DATA SUBJECT TO DISCLAIMER(S)INCLUDED WITH THE PRODUCT OF ORIGIN.--><fpsdyn:FaxPCSendDyn xmlns:fpsdyn=\"http://www.hp.com/schemas/imaging/con/ledm/printtofaxdyn/2008/11/24\" xmlns:dd=\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.hp.com/schemas/imaging/con/ledm/printtofaxdyn/2008/11/24 ../schemas/FaxPCSendDyn.xsd\"><dd:Version><dd:Revision>1.0</dd:Revision></dd:Version><fpsdyn:FaxPCSendConfig><fpsdyn:FaxTxPhoneNumber>%s</fpsdyn:FaxTxPhoneNumber><fpsdyn:NumPages>%d</fpsdyn:NumPages><fpsdyn:TTI_Control>TTI_Off</fpsdyn:TTI_Control></fpsdyn:FaxPCSendConfig></fpsdyn:FaxPCSendDyn>""" + +pageConfigXML = """<?xml version=\"1.0\" encoding=\"UTF-8\" ?><!-- THIS DATA SUBJECT TO DISCLAIMER(S)INCLUDED WITH THE PRODUCT OF ORIGIN.--><fpsdyn:FaxPCSendDyn xmlns:fpsdyn=\"http://www.hp.com/schemas/imaging/con/ledm/printtofaxdyn/2008/11/24\" xmlns:dd=\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.hp.com/schemas/imaging/con/ledm/printtofaxdyn/2008/11/24 ../schemas/FaxPCSendDyn.xsd\"><dd:Version><dd:Revision>1.0</dd:Revision></dd:Version><fpsdyn:PageConfig><fpsdyn:PageNum>%d</fpsdyn:PageNum><fpsdyn:Width>1728</fpsdyn:Width><fpsdyn:Height>2200</fpsdyn:Height><fpsdyn:ImageType>BW</fpsdyn:ImageType><fpsdyn:Compression>mh</fpsdyn:Compression><fpsdyn:HorizontalDPI>%d</fpsdyn:HorizontalDPI><fpsdyn:VerticalDPI>%d</fpsdyn:VerticalDPI></fpsdyn:PageConfig></fpsdyn:FaxPCSendDyn>""" + +cancelJobXML = """<?xml version=\"1.0\" encoding=\"UTF-8\"?><!-- THIS DATA SUBJECT TO DISCLAIMER(S) INCLUDED WITH THE PRODUCT OF ORIGIN.--><j:Job xmlns:j=\"http://www.hp.com/schemas/imaging/con/ledm/jobs/2009/04/30\" xmlns:dd=\"http://www.hp.com/schemas/imaging/con/dictionaries/1.0/\" xmlns:fax=\"http://www.hp.com/schemas/imaging/con/fax/2008/06/13\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.hp.com/schemas/imaging/con/ledm/jobs/2009/04/30 ../schemas/Jobs.xsd\"><j:JobUrl>%s</j:JobUrl><j:JobState>Canceled</j:JobState></j:Job>""" + +# **************************************************************************** # +class LEDMFaxDevice(FaxDevice): + + def __init__(self, device_uri=None, printer_name=None, + callback=None, + fax_type=FAX_TYPE_NONE, + disable_dbus=False): + + FaxDevice.__init__(self, device_uri, + printer_name, + callback, fax_type, + disable_dbus) + + self.send_fax_thread = None + self.upload_log_thread = None + + if self.bus == 'net': + self.http_host = self.host + else: + self.http_host = 'localhost' + + + def put(self, url, post): + data = """PUT %s HTTP/1.1\r +Connection: Keep-alive\r +User-agent: hplip/2.0\r +Host: %s\r +Content-length: %d\r +\r +%s""" % (url, self.http_host, len(post), post) + log.log_data(data) + self.writeEWS_LEDM(data) + response = cStringIO.StringIO() + + while self.readEWS_LEDM(4096, response, timeout=5): + pass + + response = response.getvalue() + log.log_data(response) + self.closeEWS_LEDM() + + match = http_result_pat.match(response) + if match is None: return HTTP_OK + try: + code = int(match.group(1)) + except (ValueError, TypeError): + code = HTTP_ERROR + + return code == HTTP_OK + + + def setPhoneNum(self, num): + xml = setPhoneNumXML %(num) + log.debug("SetPhoneNum:xml Value:%s" %xml) + return self.put("/DevMgmt/FaxConfigDyn.xml", xml) + + + def getPhoneNum(self): + return self.readAttributeFromXml("/DevMgmt/FaxConfigDyn.xml",'faxcfgdyn:faxconfigdyn-faxcfgdyn:systemsettings-dd:phonenumber') + + phone_num = property(getPhoneNum, setPhoneNum) + + + def setStationName(self, name): + xml = setStationNameXML %(name) + return self.put("/DevMgmt/FaxConfigDyn.xml", xml) + + + def getStationName(self): + return self.readAttributeFromXml("/DevMgmt/FaxConfigDyn.xml",'faxcfgdyn:faxconfigdyn-faxcfgdyn:systemsettings-dd:companyname') + + station_name = property(getStationName, setStationName) + + def sendFaxes(self, phone_num_list, fax_file_list, cover_message='', cover_re='', + cover_func=None, preserve_formatting=False, printer_name='', + update_queue=None, event_queue=None): + + if not self.isSendFaxActive(): + + self.send_fax_thread = LEDMFaxSendThread(self, self.service, phone_num_list, fax_file_list, + cover_message, cover_re, cover_func, + preserve_formatting, + printer_name, update_queue, + event_queue) + + self.send_fax_thread.start() + return True + else: + return False + + +# **************************************************************************** # +class LEDMFaxSendThread(FaxSendThread): + def __init__(self, dev, service, phone_num_list, fax_file_list, + cover_message='', cover_re='', cover_func=None, preserve_formatting=False, + printer_name='', update_queue=None, event_queue=None): + + FaxSendThread.__init__(self, dev, service, phone_num_list, fax_file_list, + cover_message, cover_re, cover_func, preserve_formatting, + printer_name, update_queue, event_queue) + + if dev.bus == 'net': + self.http_host = "%s:8080" % self.dev.host + else: + self.http_host = 'localhost:8080' + + + def run(self): + + STATE_DONE = 0 + STATE_ABORTED = 10 + STATE_SUCCESS = 20 + STATE_BUSY = 25 + STATE_READ_SENDER_INFO = 30 + STATE_PRERENDER = 40 + STATE_COUNT_PAGES = 50 + STATE_NEXT_RECIPIENT = 60 + STATE_COVER_PAGE = 70 + STATE_SINGLE_FILE = 80 + STATE_MERGE_FILES = 90 + STATE_SINGLE_FILE = 100 + STATE_SEND_FAX = 110 + STATE_CLEANUP = 120 + STATE_ERROR = 130 + + next_recipient = self.next_recipient_gen() + + state = STATE_READ_SENDER_INFO + error_state = STATUS_ERROR + self.rendered_file_list = [] + + while state != STATE_DONE: # --------------------------------- Fax state machine + if self.check_for_cancel(): + state = STATE_ABORTED + + log.debug("STATE=(%d, 0, 0)" % state) + + if state == STATE_ABORTED: # ----------------------------- Aborted (10, 0, 0) + log.error("Aborted by user.") + self.write_queue((STATUS_IDLE, 0, '')) + state = STATE_CLEANUP + + + elif state == STATE_SUCCESS: # --------------------------- Success (20, 0, 0) + log.debug("Success.") + self.write_queue((STATUS_COMPLETED, 0, '')) + state = STATE_CLEANUP + + + elif state == STATE_ERROR: # ----------------------------- Error (130, 0, 0) + log.error("Error, aborting.") + self.write_queue((error_state, 0, '')) + state = STATE_CLEANUP + + + elif state == STATE_BUSY: # ------------------------------ Busy (25, 0, 0) + log.error("Device busy, aborting.") + self.write_queue((STATUS_BUSY, 0, '')) + state = STATE_CLEANUP + + + elif state == STATE_READ_SENDER_INFO: # ------------------ Get sender info (30, 0, 0) + log.debug("%s State: Get sender info" % ("*"*20)) + state = STATE_PRERENDER + try: + try: + self.dev.open() + except Error, e: + log.error("Unable to open device (%s)." % e.msg) + state = STATE_ERROR + else: + try: + self.sender_name = self.dev.station_name + log.debug("Sender name=%s" % self.sender_name) + self.sender_fax = self.dev.phone_num + log.debug("Sender fax=%s" % self.sender_fax) + except Error: + log.error("LEDM GET failed!") + state = STATE_ERROR + + finally: + self.dev.close() + + + elif state == STATE_PRERENDER: # --------------------------------- Pre-render non-G4 files (40, 0, 0) + log.debug("%s State: Pre-render non-G4 files" % ("*"*20)) + state = self.pre_render(STATE_COUNT_PAGES) + + elif state == STATE_COUNT_PAGES: # -------------------------------- Get total page count (50, 0, 0) + log.debug("%s State: Get total page count" % ("*"*20)) + state = self.count_pages(STATE_NEXT_RECIPIENT) + + elif state == STATE_NEXT_RECIPIENT: # ----------------------------- Loop for multiple recipients (60, 0, 0) + log.debug("%s State: Next recipient" % ("*"*20)) + state = STATE_COVER_PAGE + + try: + recipient = next_recipient.next() + log.debug("Processing for recipient %s" % recipient['name']) + self.write_queue((STATUS_SENDING_TO_RECIPIENT, 0, recipient['name'])) + except StopIteration: + state = STATE_SUCCESS + log.debug("Last recipient.") + continue + + recipient_file_list = self.rendered_file_list[:] + + + elif state == STATE_COVER_PAGE: # ---------------------------------- Create cover page (70, 0, 0) + log.debug("%s State: Render cover page" % ("*"*20)) + state = self.cover_page(recipient) + + + elif state == STATE_SINGLE_FILE: # --------------------------------- Special case for single file (no merge) (80, 0, 0) + log.debug("%s State: Handle single file" % ("*"*20)) + state = self.single_file(STATE_SEND_FAX) + + elif state == STATE_MERGE_FILES: # --------------------------------- Merge multiple G4 files (90, 0, 0) + log.debug("%s State: Merge multiple files" % ("*"*20)) + state = self.merge_files(STATE_SEND_FAX) + + elif state == STATE_SEND_FAX: # ------------------------------------ Send fax state machine (110, 0, 0) + log.debug("%s State: Send fax" % ("*"*20)) + state = STATE_NEXT_RECIPIENT + + FAX_SEND_STATE_DONE = 0 + FAX_SEND_STATE_ABORT = 10 + FAX_SEND_STATE_ERROR = 20 + FAX_SEND_STATE_BUSY = 25 + FAX_SEND_STATE_SUCCESS = 30 + FAX_SEND_STATE_DEVICE_OPEN = 40 + FAX_SEND_STATE_BEGINJOB = 50 + FAX_SEND_STATE_DOWNLOADPAGES = 60 + FAX_SEND_STATE_ENDJOB = 70 + FAX_SEND_STATE_CANCELJOB = 80 + FAX_SEND_STATE_CLOSE_SESSION = 170 + + monitor_state = False + fax_send_state = FAX_SEND_STATE_DEVICE_OPEN + + while fax_send_state != FAX_SEND_STATE_DONE: + + if self.check_for_cancel(): + log.error("Fax send aborted.") + fax_send_state = FAX_SEND_STATE_ABORT + + if monitor_state: + fax_state = self.getFaxDownloadState() + if not fax_state in (pml.UPDN_STATE_XFERACTIVE, pml.UPDN_STATE_XFERDONE): + log.error("D/L error state=%d" % fax_state) + fax_send_state = FAX_SEND_STATE_ERROR + state = STATE_ERROR + + log.debug("STATE=(%d, %d, 0)" % (STATE_SEND_FAX, fax_send_state)) + + if fax_send_state == FAX_SEND_STATE_ABORT: # ----------------- Abort (110, 10, 0) + monitor_state = False + fax_send_state = FAX_SEND_STATE_CANCELJOB + state = STATE_ABORTED + + elif fax_send_state == FAX_SEND_STATE_ERROR: # --------------- Error (110, 20, 0) + log.error("Fax send error.") + monitor_state = False + fax_send_state = FAX_SEND_STATE_CLOSE_SESSION + state = STATE_ERROR + + elif fax_send_state == FAX_SEND_STATE_BUSY: # ---------------- Busy (110, 25, 0) + log.error("Fax device busy.") + monitor_state = False + fax_send_state = FAX_SEND_STATE_CLOSE_SESSION + state = STATE_BUSY + + elif fax_send_state == FAX_SEND_STATE_SUCCESS: # ------------- Success (110, 30, 0) + log.debug("Fax send success.") + monitor_state = False + fax_send_state = FAX_SEND_STATE_CLOSE_SESSION + state = STATE_NEXT_RECIPIENT + + elif fax_send_state == FAX_SEND_STATE_DEVICE_OPEN: # --------- Device open (110, 40, 0) + log.debug("%s State: Open device" % ("*"*20)) + fax_send_state = FAX_SEND_STATE_BEGINJOB + try: + self.dev.open() + except Error, e: + log.error("Unable to open device (%s)." % e.msg) + fax_send_state = FAX_SEND_STATE_ERROR + else: + if self.dev.device_state == DEVICE_STATE_NOT_FOUND: + fax_send_state = FAX_SEND_STATE_ERROR + + elif fax_send_state == FAX_SEND_STATE_BEGINJOB: # -------------- BeginJob (110, 50, 0) + log.debug("%s State: BeginJob" % ("*"*20)) + try: + ff = file(self.f, 'r') + except IOError: + log.error("Unable to read fax file.") + fax_send_state = FAX_SEND_STATE_ERROR + continue + + try: + header = ff.read(FILE_HEADER_SIZE) + except IOError: + log.error("Unable to read fax file.") + fax_send_state = FAX_SEND_STATE_ERROR + continue + + magic, version, total_pages, hort_dpi, vert_dpi, page_size, \ + resolution, encoding, reserved1, reserved2 = self.decode_fax_header(header) + + if magic != 'hplip_g3': + log.error("Invalid file header. Bad magic.") + fax_send_state = FAX_SEND_STATE_ERROR + else: + log.debug("Magic=%s Ver=%d Pages=%d hDPI=%d vDPI=%d Size=%d Res=%d Enc=%d" % + (magic, version, total_pages, hort_dpi, vert_dpi, page_size, + resolution, encoding)) + + faxnum = recipient['fax'].encode('ascii') + + createJob = createJobXML %(faxnum, total_pages) + data = self.format_http_post("/FaxPCSend/Job",len(createJob),createJob) + log.log_data(data) + + self.dev.openEWS_LEDM() + self.dev.writeEWS_LEDM(data) + response = cStringIO.StringIO() + try: + while self.dev.readEWS_LEDM(1000, response, timeout=5): + pass + except Error: + fax_send_state = FAX_SEND_STATE_ERROR + self.dev.closeEWS_LEDM() + break + self.dev.closeEWS_LEDM() + + response = response.getvalue() + log.log_data(response) + if self.get_error_code(response) == HTTP_CREATED: + fax_send_state = FAX_SEND_STATE_DOWNLOADPAGES + else: + fax_send_state = FAX_SEND_STATE_ERROR + log.error("Create Job request failed") + break + + responsestr = str(response) + pos = responsestr.find("/Jobs/JobList/",0,len(responsestr)) + pos1 = responsestr.find("Content-Length",0,len(responsestr)) + jobListURI = responsestr[pos:pos1].strip() + log.debug("jobListURI = [%s]" %(jobListURI)) + + elif fax_send_state == FAX_SEND_STATE_DOWNLOADPAGES: # -------------- DownloadPages (110, 60, 0) + log.debug("%s State: DownloadPages" % ("*"*20)) + page = StringIO() + log.debug("Total Number of pages are:%d" %total_pages) + for p in range(total_pages): + + if self.check_for_cancel(): + fax_send_state = FAX_SEND_STATE_ABORT + + if fax_send_state == FAX_SEND_STATE_ABORT: + break + + try: + header = ff.read(PAGE_HEADER_SIZE) + except IOError: + log.error("Unable to read fax file.") + fax_send_state = FAX_SEND_STATE_ERROR + continue + + page_num, ppr, rpp, bytes_to_read, thumbnail_bytes, reserved2 = \ + self.decode_page_header(header) + + log.debug("Page=%d PPR=%d RPP=%d BPP=%d Thumb=%d" % + (page_num, ppr, rpp, bytes_to_read, thumbnail_bytes)) + + if ppr != PIXELS_PER_LINE: + log.error("Pixels per line (width) must be %d!" % PIXELS_PER_LINE) + + page.write(ff.read(bytes_to_read)) + thumbnail = ff.read(thumbnail_bytes) # thrown away for now (should be 0 read) + page.seek(0) + + try: + data = page.read(bytes_to_read) + except IOError: + log.error("Unable to read fax file.") + fax_send_state = FAX_SEND_STATE_ERROR + break + + if data == '': + log.error("No data!") + fax_send_state = FAX_SEND_STATE_ERROR + break + + pageConfigURI = self.dev.readAttributeFromXml(jobListURI,"j:job-faxpcsendstatus-resourceuri") + log.debug("pageConfigURI:[%s]" %pageConfigURI) + + pageConfig = pageConfigXML %(page_num,hort_dpi,vert_dpi) + xmldata = self.format_http_post(pageConfigURI,len(pageConfig),pageConfig) + log.log_data(xmldata) + + self.dev.openEWS_LEDM() + try: + self.dev.writeEWS_LEDM(xmldata) + except Error: + fax_send_state = FAX_SEND_STATE_ERROR + self.dev.closeEWS_LEDM() + break + + response = cStringIO.StringIO() + try: + while self.dev.readEWS_LEDM(1000, response, timeout=5): + pass + except Error: + fax_send_state = FAX_SEND_STATE_ERROR + self.dev.closeEWS_LEDM() + break + + self.dev.closeEWS_LEDM() + response = (response.getvalue()) + log.log_data(response) + if self.get_error_code(response) != HTTP_ACCEPTED: + fax_send_state = FAX_SEND_STATE_ERROR + log.error("Page config data is not accepted by the device") + break + + pageImageURI = self.dev.readAttributeFromXml(jobListURI,"j:job-faxpcsendstatus-resourceuri") + while(True): + if self.check_for_cancel(): + fax_send_state = FAX_SEND_STATE_ABORT + break + + Status, Fax_State = self.checkForError(jobListURI) + if Status == FAX_SEND_STATE_ERROR and (Fax_State == STATUS_ERROR_IN_TRANSMITTING or + Fax_State == STATUS_ERROR_IN_CONNECTING or Fax_State == STATUS_ERROR_PROBLEM_IN_FAXLINE or + Fax_State == STATUS_JOB_CANCEL): + log.debug("setting state to FAX_SEND_STATE_ERROR") + fax_send_state = FAX_SEND_STATE_ERROR + error_state = Fax_State + break + elif Status == FAX_SEND_STATE_SUCCESS: + break + + if fax_send_state == FAX_SEND_STATE_ABORT or fax_send_state == FAX_SEND_STATE_ERROR: + break + + + xmldata = self.format_http_post(pageImageURI,len(data),"","application/octet-stream") + log.debug("Sending Page Image XML Data [%s] to the device" %str(xmldata)) + self.dev.openEWS_LEDM() + self.dev.writeEWS_LEDM(xmldata) + log.debug("Sending Raw Data to printer............") + try: + self.dev.writeEWS_LEDM(data) + except Error: + fax_send_state = FAX_SEND_STATE_ERROR + self.dev.closeEWS_LEDM() + break + + response = cStringIO.StringIO() + try: + while self.dev.readEWS_LEDM(1000, response, timeout=10): + pass + except Error: + fax_send_state = FAX_SEND_STATE_ERROR + self.dev.closeEWS_LEDM() + break + + self.dev.closeEWS_LEDM() + response = response.getvalue() + log.log_data(response) + + if self.get_error_code(response) != HTTP_ACCEPTED: + log.error("Image Data is not accepted by the device") + fax_send_state = FAX_SEND_STATE_ERROR + break + + page.truncate(0) + page.seek(0) + + else: + fax_send_state = FAX_SEND_STATE_ENDJOB + + + elif fax_send_state == FAX_SEND_STATE_ENDJOB: # -------------- EndJob (110, 70, 0) + fax_send_state = FAX_SEND_STATE_SUCCESS + + + elif fax_send_state == FAX_SEND_STATE_CANCELJOB: # -------------- CancelJob (110, 80, 0) + log.debug("%s State: CancelJob" % ("*"*20)) + + xmldata = cancelJobXML %(jobListURI) + data = self.format_http_put(jobListURI,len(xmldata),xmldata) + log.log_data(data) + + self.dev.openEWS_LEDM() + self.dev.writeEWS_LEDM(data) + + response = cStringIO.StringIO() + try: + while self.dev.readEWS_LEDM(1000, response, timeout=10): + pass + except Error: + fax_send_state = FAX_SEND_STATE_ERROR + self.dev.closeEWS_LEDM() + break + self.dev.closeEWS_LEDM() + response = response.getvalue() + log.log_data(response) + + if self.get_error_code(response) == HTTP_OK: + fax_send_state = FAX_SEND_STATE_CLOSE_SESSION + else: + fax_send_state = FAX_SEND_STATE_ERROR + log.error("Job Cancel Request Failed") + + + elif fax_send_state == FAX_SEND_STATE_CLOSE_SESSION: # -------------- Close session (110, 170, 0) + log.debug("%s State: Close session" % ("*"*20)) + log.debug("Closing session...") + + try: + ff.close() + except NameError: + pass + + #time.sleep(1) + + self.dev.closeEWS_LEDM() + self.dev.close() + + fax_send_state = FAX_SEND_STATE_DONE # Exit inner state machine + + + elif state == STATE_CLEANUP: # --------------------------------- Cleanup (120, 0, 0) + log.debug("%s State: Cleanup" % ("*"*20)) + + if self.remove_temp_file: + log.debug("Removing merged file: %s" % self.f) + try: + os.remove(self.f) + log.debug("Removed") + except OSError: + log.debug("Not found") + + state = STATE_DONE # Exit outer state machine + + + def get_error_code(self, ret): + if not ret: return HTTP_ERROR + + match = http_result_pat.match(ret) + if match is None: return HTTP_OK + try: + code = int(match.group(1)) + except (ValueError, TypeError): + code = HTTP_ERROR + return code + + def checkForError(self,uri): + stream = cStringIO.StringIO() + data = status.StatusType10FetchUrl(self.dev,uri) + if not data: + log.error("Unable To read the XML data from device") + return "" + + xmlDict = utils.XMLToDictParser().parseXML(data) + log.debug("Read Attribute:%s and it is value:%s" %(uri,data)) + + FAX_SEND_STATE_ERROR = 20 + FAX_SEND_STATE_SUCCESS = 30 + state = FAX_SEND_STATE_ERROR + Fax_send_state = STATUS_ERROR + + if cmp(str(xmlDict['j:job-faxpcsendstatus-faxtxmachinestatus']),"Transmitting")==0 \ + and cmp(str(xmlDict['j:job-faxpcsendstatus-faxtxerrorstatus']),"CommunicationError")== 0: + state = FAX_SEND_STATE_ERROR + Fax_send_state = STATUS_ERROR_IN_TRANSMITTING + elif(cmp(str(xmlDict['j:job-faxpcsendstatus-faxtxmachinestatus']),"Connecting")==0 \ + and cmp(str(xmlDict['j:job-faxpcsendstatus-faxtxerrorstatus']),"NoAnswer")== 0): + state = FAX_SEND_STATE_ERROR + Fax_send_state = STATUS_ERROR_IN_CONNECTING + elif(cmp(str(xmlDict['j:job-faxpcsendstatus-faxtxerrorstatus']),"PcDisconnect")==0 \ + and cmp(str(xmlDict['j:job-faxpcsendstatus-pagestatus-state']),"Error")== 0): + state = FAX_SEND_STATE_ERROR + Fax_send_state = STATUS_ERROR_PROBLEM_IN_FAXLINE + elif(cmp(str(xmlDict['j:job-faxpcsendstatus-faxtxerrorstatus']),"Stop")==0 \ + and cmp(str(xmlDict['j:job-faxpcsendstatus-pagestatus-state']),"Error")== 0): + state = FAX_SEND_STATE_ERROR + Fax_send_state = STATUS_JOB_CANCEL + elif(cmp(str(xmlDict['j:job-faxpcsendstatus-faxtxmachinestatus']),"Transmitting")== 0): + state = FAX_SEND_STATE_SUCCESS + Fax_send_state = FAX_SEND_STATE_SUCCESS + return state,Fax_send_state + + def format_http_post(self, requst, ledmlen, xmldata, content_type="text/xml; charset=utf-8"): + host = self.http_host + + return utils.cat( +"""POST $requst HTTP/1.1\r +Host: $host\r +User-Agent: hplip/2.0\r +Content-Type: $content_type\r +Content-Length: $ledmlen\r +Connection: Keep-alive\r +SOAPAction: ""\r +\r +$xmldata""") + + def format_http_put(self, requst, ledmlen, xmldata, content_type="text/xml; charset=utf-8"): + host = self.http_host + return utils.cat( +"""PUT $requst HTTP/1.1\r +Host: $host\r +User-Agent: hplip/2.0\r +Content-Type: $content_type\r +Content-Length: $ledmlen\r +\r +$xmldata""") + + + + + + + + diff --git a/fax/ledmsoapfax.py b/fax/ledmsoapfax.py new file mode 100644 index 000000000..0805c60e4 --- /dev/null +++ b/fax/ledmsoapfax.py @@ -0,0 +1,106 @@ +# -*- coding: utf-8 -*- +# +# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Don Welch +# + +from __future__ import division + +# Std Lib +import sys +import os +import time +import cStringIO +import urllib # TODO: Replace with urllib2 (urllib is deprecated in Python 3.0) +import re + +# Local +from base.g import * +from base.codes import * +from base import device, utils, codes, dime +from fax import * +from ledmfax import * +from soapfax import SOAPFaxSendThread +from soapfax import SOAPFaxDevice + + +# **************************************************************************** # +class LEDMSOAPFaxDevice(SOAPFaxDevice): + + + def __init__(self, device_uri=None, printer_name=None, + callback=None, + fax_type=FAX_TYPE_NONE, + disable_dbus=False): + + SOAPFaxDevice.__init__(self, device_uri, + printer_name, + callback, fax_type, + disable_dbus) + + #LEDM Specific functions + def put(self, url, post): + data = """PUT %s HTTP/1.1\r +Connection: Keep-alive\r +User-agent: hplip/2.0\r +Host: %s\r +Content-length: %d\r +\r +%s""" % (url, self.http_host, len(post), post) + log.log_data(data) + self.writeEWS_LEDM(data) + response = cStringIO.StringIO() + + while self.readEWS_LEDM(4096, response, timeout=5): + pass + + response = response.getvalue() + log.log_data(response) + self.closeEWS_LEDM() + + match = http_result_pat.match(response) + if match is None: return HTTP_OK + try: + code = int(match.group(1)) + except (ValueError, TypeError): + code = HTTP_ERROR + + return code == HTTP_OK + + + def setPhoneNum(self, num): + xml = setPhoneNumXML %(num) + log.debug("SetPhoneNum:xml Value:%s" %xml) + return self.put("/DevMgmt/FaxConfigDyn.xml", xml) + + + def getPhoneNum(self): + return self.readAttributeFromXml("/DevMgmt/FaxConfigDyn.xml",'faxcfgdyn:faxconfigdyn-faxcfgdyn:systemsettings-dd:phonenumber') + + phone_num = property(getPhoneNum, setPhoneNum) + + + def setStationName(self, name): + xml = setStationNameXML %(name) + return self.put("/DevMgmt/FaxConfigDyn.xml", xml) + + + def getStationName(self): + return self.readAttributeFromXml("/DevMgmt/FaxConfigDyn.xml",'faxcfgdyn:faxconfigdyn-faxcfgdyn:systemsettings-dd:companyname') + + station_name = property(getStationName, setStationName) diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex ad94a6a6e..717592fab 100644 --- a/fax/ppd/HP-Fax-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax-hpijs.ppd.gz b/fax/ppd/HP-Fax-hpijs.ppd.gz Binary files differindex 65f5b53a4..555423909 100644 --- a/fax/ppd/HP-Fax-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax-hpijs.ppd.gz diff --git a/fax/ppd/HP-Fax2-hpcups.ppd.gz b/fax/ppd/HP-Fax2-hpcups.ppd.gz Binary files differindex 2fd6f8063..426286654 100644 --- a/fax/ppd/HP-Fax2-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax2-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax2-hpijs.ppd.gz b/fax/ppd/HP-Fax2-hpijs.ppd.gz Binary files differindex a55f716c1..7b0799617 100644 --- a/fax/ppd/HP-Fax2-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax2-hpijs.ppd.gz diff --git a/fax/ppd/HP-Fax3-hpcups.ppd.gz b/fax/ppd/HP-Fax3-hpcups.ppd.gz Binary files differindex 5cc7542d3..14786c8a2 100644 --- a/fax/ppd/HP-Fax3-hpcups.ppd.gz +++ b/fax/ppd/HP-Fax3-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax3-hpijs.ppd.gz b/fax/ppd/HP-Fax3-hpijs.ppd.gz Binary files differindex 4b6069783..6f05e5e50 100644 --- a/fax/ppd/HP-Fax3-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax3-hpijs.ppd.gz diff --git a/fax/ppd/HP-Fax4-hpcups.ppd.gz b/fax/ppd/HP-Fax4-hpcups.ppd.gz Binary files differnew file mode 100644 index 000000000..094e057b6 --- /dev/null +++ b/fax/ppd/HP-Fax4-hpcups.ppd.gz diff --git a/fax/ppd/HP-Fax4-hpijs.ppd.gz b/fax/ppd/HP-Fax4-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..3bb74d666 --- /dev/null +++ b/fax/ppd/HP-Fax4-hpijs.ppd.gz diff --git a/foomatic_drv.inc b/foomatic_drv.inc index 2e2278951..f8c83c931 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -103,6 +103,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1027nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz \ @@ -130,6 +131,8 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz \ @@ -161,6 +164,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1021-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz \ ppd/hpijs/hp-dj450-hpijs.ppd.gz \ @@ -213,6 +217,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz \ @@ -233,6 +238,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz \ @@ -247,6 +253,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1022-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz \ ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz \ @@ -254,8 +261,10 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz \ @@ -282,6 +291,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz \ ppd/hpijs/hp-psc_500-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz \ @@ -290,6 +300,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ @@ -333,6 +344,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-2000c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz \ @@ -352,6 +364,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz \ @@ -383,6 +396,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz \ @@ -399,8 +413,10 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1023-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz \ @@ -460,6 +476,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz \ @@ -475,6 +492,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz \ + ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz \ @@ -516,6 +534,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz \ ppd/hpijs/hp-dj350-hpijs.ppd.gz \ @@ -534,6 +553,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1028nw-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz \ @@ -544,10 +564,12 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz \ ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz \ @@ -557,6 +579,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz \ ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz \ @@ -590,6 +613,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz \ ppd/hpijs/hp-cp1160-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz \ + ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz \ @@ -618,6 +642,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz \ @@ -628,6 +653,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz \ @@ -707,6 +733,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ prnt/ps/hp-laserjet_5100_series-ps.ppd.gz \ prnt/ps/hp-laserjet_p4515n-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5m-ps.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ @@ -738,6 +765,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz \ prnt/ps/hp-laserjet_1300xi-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz \ prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \ @@ -774,6 +802,7 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_3030-ps.ppd.gz \ + prnt/ps/hp-laserjet_cm1415fnw-ps.ppd.gz \ prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p3004-ps.ppd.gz \ @@ -791,6 +820,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_2700-ps.ppd.gz \ prnt/ps/hp-laserjet_p4515x-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_m1536dnf_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055d-ps.ppd.gz \ prnt/ps/hp-color_laserjet_5500-ps.ppd.gz \ prnt/ps/hp-laserjet_2300-ps.ppd.gz \ diff --git a/hplip.list.in b/hplip.list.in index 5ce4b0624..76f20f197 100644 --- a/hplip.list.in +++ b/hplip.list.in @@ -176,6 +176,7 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz @epm_full@f 644 root root $home/fax/coverpages.py fax/coverpages.py @epm_full@f 644 root root $home/fax/fax.py fax/fax.py @epm_full@f 644 root root $home/fax/faxdevice.py fax/faxdevice.py +@epm_full@f 644 root root $home/fax/ledmfax.py fax/ledmfax.py @epm_full@f 755 root root $home/fab.py fab.py @epm_full@f 755 root root $home/pkservice.py pkservice.py @epm_full@f 755 root root $home/hpssd.py hpssd.py diff --git a/installer/distros.dat b/installer/distros.dat index 1d1a75f33..80ee13dba 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -1024,7 +1024,7 @@ pre_depend_cmd=su -c "zypper refresh" packages=cups,cups-client [suse:11.3:cups-devel] -packages=cups-devel,cups-ddk +packages=cups-devel,cupsddk [suse:11.3:gcc] packages=gcc-c++ @@ -1094,7 +1094,7 @@ packages=sane-backends packages=xsane [suse:11.3:cups-ddk] -packages=cups-ddk +packages=cupsddk [suse:11.3:python-dbus] packages=dbus-1-python @@ -1311,11 +1311,11 @@ ui_toolkit=qt3 # **************************************** [fedora] index=5 -versions=1.0,2.0,3.0,4.0,5,5.0,5.92,6,6.0,7,7.0,8,8.0,9,9.0,10,10.0,11,11.0,12,12.0,13,13.0 +versions=1.0,2.0,3.0,4.0,5,5.0,5.92,6,6.0,7,7.0,8,8.0,9,9.0,10,10.0,11,11.0,12,12.0,13,13.0,14,14.0 display_name=Fedora alt_names=Fedora Core display=1 -notes=SELinux must be disabled for HPLIP to function properly. Please disable SELinux before continuing. +notes=SELinux must run in permissive mode or it must be disabled for HPLIP to function properly. Please run SELinux in permissive mode or disable it before continuing. package_mgrs=yum,rpm,up2date package_mgr_cmd=su -c "yum -y -d 10 -e 1 install $packages_to_install" pre_depend_cmd=su -c "yum clean all" @@ -2129,7 +2129,7 @@ same_as_version= 8 # ******************** [fedora:9] code_name=sulphur -supported=1 +supported=0 scan_supported=1 fax_supported=1 pcard_supported=1 @@ -2245,7 +2245,7 @@ same_as_version= 9 # ******************** [fedora:10] code_name=sulphur -supported=1 +supported=0 scan_supported=1 fax_supported=1 pcard_supported=1 @@ -2366,7 +2366,7 @@ same_as_version= 10 # ******************** [fedora:11] code_name= -supported=1 +supported=0 scan_supported=1 fax_supported=1 pcard_supported=1 @@ -2497,7 +2497,7 @@ parallel_supported=1 usb_supported=1 packaged_version= release_date= -notes=To complete the install in Fedora 12 or 13 you must quit the installer at the printer setup stage, log out, log back in, and run hp-setup. +notes=To complete the install in Fedora 12 or 13 or 14 you must quit the installer at the printer setup stage, log out, log back in, and run hp-setup. ppd_install=drv udev_mode_fix=1 ppd_dir=/usr/share/cups/model/HP @@ -2608,6 +2608,12 @@ same_as_version=12 [fedora:13.0] same_as_version=12 +[fedora:14] +same_as_version=12 + +[fedora:14.0] +same_as_version=12 + # **************************************** [linspire] index=15 @@ -3777,14 +3783,14 @@ packages= # **************************************** [ubuntu] index=12 -versions=5.04,5.1,6.06,6.10,7.04,7.10,8.04,8.04.1,8.04.2,8.10,9.04,9.10,10.04 +versions=5.04,5.1,6.06,6.10,7.04,7.10,8.04,8.04.1,8.04.2,8.10,9.04,9.10,10.04,10.10 display_name=Ubuntu alt_names=kubuntu,edubuntu,xubuntu display=1 notes= package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater -package_mgr_cmd=sudo aptitude install --assume-yes $packages_to_install -pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo aptitude update +package_mgr_cmd=sudo apt-get install --assume-yes $packages_to_install +pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo apt-get update post_depend_cmd= hplip_remove_cmd=sudo apt-get remove --assume-yes hplip hpijs hplip-cups hplip-data libhpmud0 foomatic-db-hpijs su_sudo=sudo @@ -5036,7 +5042,7 @@ ui_toolkit=qt4 policykit=1 native_cups=1 acl_rules=1 -add_user_to_group=-a -Glp +add_user_to_group=-a -Glp,lpadmin [ubuntu:9.10:cups] packages=libcupsys2 @@ -5153,7 +5159,7 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4 native_cups=1 acl_rules=1 -add_user_to_group=-a -Glp +add_user_to_group=-a -Glp,lpadmin [ubuntu:10.04:cups] packages=libcups2 @@ -5246,10 +5252,124 @@ packages=policykit-1,policykit-1-gnome [ubuntu:10.04:python-notify] packages=python-notify +# ************************************ +[ubuntu:10.10] +code_name=Maverick +supported=1 +scan_supported=1 +fax_supported=1 +pcard_supported=1 +network_supported=1 +parallel_supported=1 +usb_supported=1 +packaged_version=3.10.11 +release_date=2010 +notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. During the install process you will be added to the lp and lpadmin group, please quit the installer before the setup stage, log out, log back in, and run hp-setup to complete the install. +ppd_install=drv +udev_mode_fix=1 +ppd_dir=/usr/share/ppd/HP +fix_ppd_symlink=0 +drv_dir=/usr/share/cups/drv/HP +ui_toolkit=qt4 +native_cups=1 +acl_rules=1 +add_user_to_group=-a -Glp,lpadmin + +[ubuntu:10.10:cups] +packages=libcups2 + +[ubuntu:10.10:cups-devel] +packages=libcups2-dev,cups-bsd,cups-client + +[ubuntu:10.10:gcc] +packages=build-essential + +[ubuntu:10.10:gs] +packages=ghostscript + +[ubuntu:10.10:libcrypto] +packages=openssl + +[ubuntu:10.10:libjpeg] +packages=libjpeg62-dev + +[ubuntu:10.10:libnetsnmp-devel] +packages=libsnmp-dev + +[ubuntu:10.10:libpthread] +packages=build-essential + +[ubuntu:10.10:libtool] +packages=libtool + +[ubuntu:10.10:libusb] +packages=libusb-dev + +[ubuntu:10.10:make] +packages=build-essential + +[ubuntu:10.10:pil] +packages=python-imaging + +[ubuntu:10.10:ppdev] +packages= +commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules + +[ubuntu:10.10:pyqt] +packages=python-qt4 + +[ubuntu:10.10:python-devel] +packages=python-dev + +[ubuntu:10.10:pyqt4] +packages=python-qt4 + +[ubuntu:10.10:pyqt4-dbus] +packages=python-qt4-dbus + +#[ubuntu:10.10:python23] +#packages=python + +[ubuntu:10.10:python2x] +packages=python + +[ubuntu:10.10:reportlab] +packages=python-reportlab + +[ubuntu:10.10:sane] +packages=libsane + +[ubuntu:10.10:sane-devel] +packages=libsane-dev + +[ubuntu:10.10:scanimage] +packages=sane-utils + +[ubuntu:10.10:xsane] +packages=xsane + +[ubuntu:10.10:python-dbus] +packages=python-dbus,python-gobject + +[ubuntu:10.10:dbus] +packages=libdbus-1-dev + +[ubuntu:10.10:cups-image] +packages=libcupsimage2-dev + +[ubuntu:10.10:cups-ddk] +packages=cups + +[ubuntu:10.10:policykit] +packages=policykit-1,policykit-1-gnome + +[ubuntu:10.10:python-notify] +packages=python-notify + # **************************************** [debian] index=2 -versions=2.2,3.0,3.1,4.0,4.0r0,4.0r1,5.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,stable,lenny/sid,testing,lenny +versions=2.2,3.0,3.1,4.0,4.0r0,4.0r1,5.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,stable,lenny/sid,testing,lenny display_name=Debian alt_names= display=1 @@ -5814,6 +5934,12 @@ same_as_version=5.0 [debian:5.0.5] same_as_version=5.0 +[debian:5.0.6] +same_as_version=5.0 + +[debian:5.0.7] +same_as_version=5.0 + # ******************** [debian:stable] code_name=Etch diff --git a/io/hpmud/hpmud.h b/io/hpmud/hpmud.h index c4ec08b9d..f28e2f81c 100644 --- a/io/hpmud/hpmud.h +++ b/io/hpmud/hpmud.h @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Author: Naga Samrat Chowdary Narla, + Author: Naga Samrat Chowdary Narla, Yashwant Sahu \*****************************************************************************/ #ifndef _HPMUD_H @@ -77,7 +77,8 @@ enum HPMUD_SCANTYPE HPMUD_SCANTYPE_MARVELL = 4, /* (ie: ljm1005) */ HPMUD_SCANTYPE_SOAPHT = 5, /* HorseThief (ie: ljm1522) */ HPMUD_SCANTYPE_SCL_DUPLEX = 6, - HPMUD_SCANTYPE_LEDM = 7 + HPMUD_SCANTYPE_LEDM = 7, + HPMUD_SCANTYPE_MARVELL2 = 8, /* (Tsunami lj 1212 and series) */ }; enum HPMUD_SCANSRC @@ -88,13 +89,6 @@ enum HPMUD_SCANSRC HPMUD_SCANSRC_BOTH = 3 }; -enum HPMUD_SCANCOLOR -{ - HPMUD_SCANCOLOR_NA = 0, - HPMUD_SCANCOLOR_MONO = 1, - HPMUD_SCANCOLOR_COLOR = 2 -}; - enum HPMUD_STATUSTYPE { HPMUD_STATUSTYPE_NA = 0, @@ -165,7 +159,6 @@ struct hpmud_model_attributes enum HPMUD_PLUGIN_TYPE plugin; enum HPMUD_SUPPORT_TYPE reserved[5]; enum HPMUD_SCANSRC scansrc; - enum HPMUD_SCANCOLOR scancolor; }; #ifdef __cplusplus diff --git a/io/hpmud/jd.c b/io/hpmud/jd.c index a4538e6f8..e4ab8e914 100644 --- a/io/hpmud/jd.c +++ b/io/hpmud/jd.c @@ -466,6 +466,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_open(mud_ } break; case HPMUD_LEDM_SCAN_CHANNEL: + case HPMUD_EWS_LEDM_CHANNEL: port = 8080; pin.sin_port = htons(port); if ((pc->socket = socket(AF_INET, SOCK_STREAM, 0)) == -1) @@ -478,7 +479,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_open(mud_ BUG("unable to connect to ledm-scan port %d: %m %s\n", port, pd->uri); goto bugout; } - break; + break; case HPMUD_MARVELL_FAX_CHANNEL: port = 8290; /* same as ScanPort1[1] */ pin.sin_port = htons(port); diff --git a/io/hpmud/model.c b/io/hpmud/model.c index 8ed3b0bac..ebde06a9c 100644 --- a/io/hpmud/model.c +++ b/io/hpmud/model.c @@ -485,10 +485,6 @@ static int parse_key_value_pair(char *buf, int len, struct hpmud_model_attribute { ma->scansrc = strtol(value, &tail2, 10); } - else if(strcasecmp(key, "scan-color") == 0) - { - ma->scancolor = strtol(value, &tail2, 10); - } else if(strcasecmp(key, "status-type") == 0) { ma->statustype = strtol(value, &tail2, 10); diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex 580236b7a..2ebdb1479 100644 --- a/ppd/hpcups/apollo-2100.ppd.gz +++ b/ppd/hpcups/apollo-2100.ppd.gz diff --git a/ppd/hpcups/apollo-2150.ppd.gz b/ppd/hpcups/apollo-2150.ppd.gz Binary files differindex 52aecfe0d..b76a88465 100644 --- a/ppd/hpcups/apollo-2150.ppd.gz +++ b/ppd/hpcups/apollo-2150.ppd.gz diff --git a/ppd/hpcups/apollo-2200.ppd.gz b/ppd/hpcups/apollo-2200.ppd.gz Binary files differindex e0c4a1115..396134381 100644 --- a/ppd/hpcups/apollo-2200.ppd.gz +++ b/ppd/hpcups/apollo-2200.ppd.gz diff --git a/ppd/hpcups/apollo-2500.ppd.gz b/ppd/hpcups/apollo-2500.ppd.gz Binary files differindex d89c5bd6f..2d3ddc2cb 100644 --- a/ppd/hpcups/apollo-2500.ppd.gz +++ b/ppd/hpcups/apollo-2500.ppd.gz diff --git a/ppd/hpcups/apollo-2600.ppd.gz b/ppd/hpcups/apollo-2600.ppd.gz Binary files differindex 17d88a123..e12ba3e1e 100644 --- a/ppd/hpcups/apollo-2600.ppd.gz +++ b/ppd/hpcups/apollo-2600.ppd.gz diff --git a/ppd/hpcups/apollo-2650.ppd.gz b/ppd/hpcups/apollo-2650.ppd.gz Binary files differindex fdbe8301f..1f0744dde 100644 --- a/ppd/hpcups/apollo-2650.ppd.gz +++ b/ppd/hpcups/apollo-2650.ppd.gz diff --git a/ppd/hpcups/apollo-p2000-u.ppd.gz b/ppd/hpcups/apollo-p2000-u.ppd.gz Binary files differindex ae76b4308..c062bfb5c 100644 --- a/ppd/hpcups/apollo-p2000-u.ppd.gz +++ b/ppd/hpcups/apollo-p2000-u.ppd.gz diff --git a/ppd/hpcups/apollo-p2250.ppd.gz b/ppd/hpcups/apollo-p2250.ppd.gz Binary files differindex 0e57228b2..13ddde23b 100644 --- a/ppd/hpcups/apollo-p2250.ppd.gz +++ b/ppd/hpcups/apollo-p2250.ppd.gz diff --git a/ppd/hpcups/hp-2000c.ppd.gz b/ppd/hpcups/hp-2000c.ppd.gz Binary files differindex 0b39525f4..f00073532 100644 --- a/ppd/hpcups/hp-2000c.ppd.gz +++ b/ppd/hpcups/hp-2000c.ppd.gz diff --git a/ppd/hpcups/hp-2500c.ppd.gz b/ppd/hpcups/hp-2500c.ppd.gz Binary files differindex 936d6e25b..2584ed76b 100644 --- a/ppd/hpcups/hp-2500c.ppd.gz +++ b/ppd/hpcups/hp-2500c.ppd.gz diff --git a/ppd/hpcups/hp-910.ppd.gz b/ppd/hpcups/hp-910.ppd.gz Binary files differindex a1382b50c..fb1cfb21f 100644 --- a/ppd/hpcups/hp-910.ppd.gz +++ b/ppd/hpcups/hp-910.ppd.gz diff --git a/ppd/hpcups/hp-915.ppd.gz b/ppd/hpcups/hp-915.ppd.gz Binary files differindex 24452599f..c8b494479 100644 --- a/ppd/hpcups/hp-915.ppd.gz +++ b/ppd/hpcups/hp-915.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_1000.ppd.gz b/ppd/hpcups/hp-business_inkjet_1000.ppd.gz Binary files differindex bc3e040ed..92acc14aa 100644 --- a/ppd/hpcups/hp-business_inkjet_1000.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_1000.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_1100.ppd.gz b/ppd/hpcups/hp-business_inkjet_1100.ppd.gz Binary files differindex c26792fe7..395a9428d 100644 --- a/ppd/hpcups/hp-business_inkjet_1100.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_1200.ppd.gz b/ppd/hpcups/hp-business_inkjet_1200.ppd.gz Binary files differindex d2ff95331..36b4ce3e2 100644 --- a/ppd/hpcups/hp-business_inkjet_1200.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_1200.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2200.ppd.gz b/ppd/hpcups/hp-business_inkjet_2200.ppd.gz Binary files differindex a76e831f4..9e9bbbd35 100644 --- a/ppd/hpcups/hp-business_inkjet_2200.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2200.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2230.ppd.gz b/ppd/hpcups/hp-business_inkjet_2230.ppd.gz Binary files differindex db9c383c9..dafb8a8d2 100644 --- a/ppd/hpcups/hp-business_inkjet_2230.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2230.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz Binary files differindex c4bf3fec4..b1b5b08c3 100644 --- a/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2250-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz Binary files differindex ea6df668f..109f30200 100644 --- a/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2280-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz Binary files differindex 5eb3790ab..21e9c6ad3 100644 --- a/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz Binary files differindex f7f0a765f..3fe7128c9 100644 --- a/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2600-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz Binary files differindex 4d363e9ae..68bf19211 100644 --- a/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_2800-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz b/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz Binary files differindex 28144e313..bbc5f19aa 100644 --- a/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz +++ b/ppd/hpcups/hp-business_inkjet_3000-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz Binary files differindex f36bc0e18..ef200b1ad 100644 --- a/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz +++ b/ppd/hpcups/hp-color_inkjet_cp1700.ppd.gz diff --git a/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz Binary files differindex de2ce5b6f..e8a30ee7c 100644 --- a/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz +++ b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_1600.ppd.gz b/ppd/hpcups/hp-color_laserjet_1600.ppd.gz Binary files differindex 38da8890e..1e07bb33c 100644 --- a/ppd/hpcups/hp-color_laserjet_1600.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_1600.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz Binary files differindex ff0252f17..c0e89290c 100644 --- a/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_2500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz Binary files differindex 1c20ac424..e2aa9b4a8 100644 --- a/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz b/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz Binary files differindex 3d53599b0..f9498414f 100644 --- a/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_2600n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz Binary files differindex 25c5fc8d1..a5cec4c07 100644 --- a/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3000-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3500.ppd.gz b/ppd/hpcups/hp-color_laserjet_3500.ppd.gz Binary files differindex 3c442f039..a734524ec 100644 --- a/ppd/hpcups/hp-color_laserjet_3500.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3500.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz Binary files differindex 9096d15c0..a671ce868 100644 --- a/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3500n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3550.ppd.gz b/ppd/hpcups/hp-color_laserjet_3550.ppd.gz Binary files differindex 88ce298e3..3fd7a592c 100644 --- a/ppd/hpcups/hp-color_laserjet_3550.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3550.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz Binary files differindex 93c8a7565..74d7ce377 100644 --- a/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3550n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3600.ppd.gz b/ppd/hpcups/hp-color_laserjet_3600.ppd.gz Binary files differindex 5038c9db9..4ef157714 100644 --- a/ppd/hpcups/hp-color_laserjet_3600.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3600.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz Binary files differindex beb96b87a..e8a478e50 100644 --- a/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3700-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz b/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz Binary files differindex 1b4cd116c..691bb844f 100644 --- a/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3700n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz Binary files differindex 9a336ea1c..05dd9588b 100644 --- a/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_3800-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz Binary files differindex 0fd195dbd..c7cb19666 100644 --- a/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz Binary files differindex 5d3574402..fb9dfbea0 100644 --- a/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4550-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz Binary files differindex b1a161b13..60d9895bb 100644 --- a/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4600-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz Binary files differindex d8e9785a9..de160b0c7 100644 --- a/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4600_series.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz Binary files differindex 63003f569..d0c1a7abe 100644 --- a/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz Binary files differindex 5e4d4d408..3ec5f996b 100644 --- a/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4650-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz Binary files differindex 86126e94f..23d747cd4 100644 --- a/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4700-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz Binary files differindex 64f5cc0f4..7cf7ac730 100644 --- a/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_4730mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5.ppd.gz b/ppd/hpcups/hp-color_laserjet_5.ppd.gz Binary files differindex 36ad04cef..dbd8d86b2 100644 --- a/ppd/hpcups/hp-color_laserjet_5.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz Binary files differindex a1fa24aaf..d91f6d109 100644 --- a/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz Binary files differindex 5325e2a60..e229ab679 100644 --- a/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5550-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz Binary files differindex 63366b27f..2a9bdd8b2 100644 --- a/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_5m-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz Binary files differindex 575211d7f..dc50b9910 100644 --- a/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_8500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz Binary files differindex 6e5c344a8..782f7c908 100644 --- a/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_8550-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz Binary files differindex e2d6fdcd7..95c9771d9 100644 --- a/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_9500-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz Binary files differindex 3a5280ef8..80c2e3396 100644 --- a/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_9500_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz Binary files differindex c79d9c92d..601b5f863 100644 --- a/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz Binary files differindex 5e3f055c8..2b2305156 100644 --- a/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz Binary files differindex 3c38156d1..60ee37483 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz Binary files differindex 9721867e2..c7cf6e0e8 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz Binary files differindex 11112599f..9110d44f2 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz Binary files differindex 14c8eb7b4..524e29db7 100644 --- a/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz Binary files differindex 9fd26fd92..02f2d48b7 100644 --- a/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..cc0c9b3eb --- /dev/null +++ b/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz Binary files differindex 421ad16ac..642f068a4 100644 --- a/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz Binary files differindex eb7e39304..2ced8e878 100644 --- a/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz Binary files differindex e5819cc20..02bc15cd2 100644 --- a/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm6040_mfp.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz Binary files differindex 379ed67f7..96d29c891 100644 --- a/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cm6049_mfp.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz Binary files differindex 0384fb01b..ffaeab420 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1215.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz Binary files differindex 058963c96..8e21b22dd 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1514n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz Binary files differindex f62db637b..3415d9dc1 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1515n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz Binary files differindex dee33c1d5..a1ef8cc3f 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1518ni-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz Binary files differindex b31ca0c03..2b40d63eb 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz Binary files differindex 3d0706515..4b827d6e8 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025dn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz Binary files differindex 31dcd08da..740386ea2 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz Binary files differindex e2af99681..f0ea9e982 100644 --- a/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp2025x-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz Binary files differindex 141b8300b..c6ee7aaa7 100644 --- a/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp3505-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz Binary files differindex 6f71c8bfc..e5dcbe668 100644 --- a/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp3525-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz Binary files differindex e653db174..4e8bc5cb8 100644 --- a/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp4005-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz Binary files differindex 81c33d08f..ed397dcbd 100644 --- a/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp4020_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz Binary files differindex c5865eabc..770638197 100644 --- a/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp4520_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz Binary files differindex b35c9ac28..e5a1f1fef 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5225-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz Binary files differindex de4881057..8efca0abc 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5225dn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz Binary files differindex d64c86566..34cfdd50c 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp5225n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..ec6bce027 --- /dev/null +++ b/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz Binary files differindex 631062fe3..065172f0e 100644 --- a/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp6015-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-cp1160.ppd.gz b/ppd/hpcups/hp-cp1160.ppd.gz Binary files differindex 9b1d3f8c5..31c92d7f4 100644 --- a/ppd/hpcups/hp-cp1160.ppd.gz +++ b/ppd/hpcups/hp-cp1160.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz Binary files differindex 4b9fc0637..ff02a0068 100644 --- a/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1000_j110_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz Binary files differindex 235864939..745c53c9a 100644 --- a/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1050_j410_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1100.ppd.gz b/ppd/hpcups/hp-deskjet_1100.ppd.gz Binary files differindex 1961336f7..ad6ec622b 100644 --- a/ppd/hpcups/hp-deskjet_1100.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1120.ppd.gz b/ppd/hpcups/hp-deskjet_1120.ppd.gz Binary files differindex 34b0fff4e..3e9e957c9 100644 --- a/ppd/hpcups/hp-deskjet_1120.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1120.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1125.ppd.gz b/ppd/hpcups/hp-deskjet_1125.ppd.gz Binary files differindex 832bfb219..dbba62c06 100644 --- a/ppd/hpcups/hp-deskjet_1125.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1125.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1200c.ppd.gz b/ppd/hpcups/hp-deskjet_1200c.ppd.gz Binary files differindex 9064393eb..f0c9774c7 100644 --- a/ppd/hpcups/hp-deskjet_1200c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1200c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1220c.ppd.gz b/ppd/hpcups/hp-deskjet_1220c.ppd.gz Binary files differindex 7e9b890be..c3f950b91 100644 --- a/ppd/hpcups/hp-deskjet_1220c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1220c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1280.ppd.gz b/ppd/hpcups/hp-deskjet_1280.ppd.gz Binary files differindex ace652efb..f5b9647a2 100644 --- a/ppd/hpcups/hp-deskjet_1280.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1280.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600c.ppd.gz b/ppd/hpcups/hp-deskjet_1600c.ppd.gz Binary files differindex 3618d7e67..a15647ac8 100644 --- a/ppd/hpcups/hp-deskjet_1600c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600cm.ppd.gz b/ppd/hpcups/hp-deskjet_1600cm.ppd.gz Binary files differindex bf1294de2..c28bed0b3 100644 --- a/ppd/hpcups/hp-deskjet_1600cm.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600cm.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz Binary files differindex 02221df0c..6c2fc39d6 100644 --- a/ppd/hpcups/hp-deskjet_1600cn.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1600cn.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz Binary files differindex 37842eaef..7ec56443a 100644 --- a/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2000_j210_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz Binary files differindex d0e8cf337..39fc3d66a 100644 --- a/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2050_j510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz Binary files differindex f7d3a3b59..66cf79bb1 100644 --- a/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3000_j310_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz Binary files differindex eee66d85c..814ddd77e 100644 --- a/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3050_j610_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3320.ppd.gz b/ppd/hpcups/hp-deskjet_3320.ppd.gz Binary files differindex 3c91ea3d1..7ef35be9c 100644 --- a/ppd/hpcups/hp-deskjet_3320.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3320.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3325.ppd.gz b/ppd/hpcups/hp-deskjet_3325.ppd.gz Binary files differindex 9c34bbab3..872ab4484 100644 --- a/ppd/hpcups/hp-deskjet_3325.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3325.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3420.ppd.gz b/ppd/hpcups/hp-deskjet_3420.ppd.gz Binary files differindex f22199013..544807dcd 100644 --- a/ppd/hpcups/hp-deskjet_3420.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3420.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3425.ppd.gz b/ppd/hpcups/hp-deskjet_3425.ppd.gz Binary files differindex de5cd192a..8b2ab0fcd 100644 --- a/ppd/hpcups/hp-deskjet_3425.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3425.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3450.ppd.gz b/ppd/hpcups/hp-deskjet_3450.ppd.gz Binary files differindex 0f4654263..ab7119d57 100644 --- a/ppd/hpcups/hp-deskjet_3450.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3450.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3500.ppd.gz b/ppd/hpcups/hp-deskjet_3500.ppd.gz Binary files differindex 4fb2bea99..50281d71a 100644 --- a/ppd/hpcups/hp-deskjet_3500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3550.ppd.gz b/ppd/hpcups/hp-deskjet_3550.ppd.gz Binary files differindex fcafddd6e..ac2e31ad4 100644 --- a/ppd/hpcups/hp-deskjet_3550.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3550.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3600.ppd.gz b/ppd/hpcups/hp-deskjet_3600.ppd.gz Binary files differindex 69fda6b35..7e38e5259 100644 --- a/ppd/hpcups/hp-deskjet_3600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3650.ppd.gz b/ppd/hpcups/hp-deskjet_3650.ppd.gz Binary files differindex da12d3692..99ac1af8a 100644 --- a/ppd/hpcups/hp-deskjet_3650.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3650.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3740.ppd.gz b/ppd/hpcups/hp-deskjet_3740.ppd.gz Binary files differindex 31122c997..b6fefe71a 100644 --- a/ppd/hpcups/hp-deskjet_3740.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3740.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3810.ppd.gz b/ppd/hpcups/hp-deskjet_3810.ppd.gz Binary files differindex 4d56bd2cf..46cca2c8f 100644 --- a/ppd/hpcups/hp-deskjet_3810.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3810.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3816.ppd.gz b/ppd/hpcups/hp-deskjet_3816.ppd.gz Binary files differindex 4ebc935fc..c71fa244f 100644 --- a/ppd/hpcups/hp-deskjet_3816.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3816.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3819.ppd.gz b/ppd/hpcups/hp-deskjet_3819.ppd.gz Binary files differindex 1135608e6..01e5cbba8 100644 --- a/ppd/hpcups/hp-deskjet_3819.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3819.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3820.ppd.gz b/ppd/hpcups/hp-deskjet_3820.ppd.gz Binary files differindex 097044081..ae15bf137 100644 --- a/ppd/hpcups/hp-deskjet_3820.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3820.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3822.ppd.gz b/ppd/hpcups/hp-deskjet_3822.ppd.gz Binary files differindex 7b331bb6e..0a3777301 100644 --- a/ppd/hpcups/hp-deskjet_3822.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3822.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3840.ppd.gz b/ppd/hpcups/hp-deskjet_3840.ppd.gz Binary files differindex 1d3f098a6..bd5928ef2 100644 --- a/ppd/hpcups/hp-deskjet_3840.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3840.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3870.ppd.gz b/ppd/hpcups/hp-deskjet_3870.ppd.gz Binary files differindex 2da34749f..427da21f8 100644 --- a/ppd/hpcups/hp-deskjet_3870.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3870.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3900.ppd.gz b/ppd/hpcups/hp-deskjet_3900.ppd.gz Binary files differindex 84c426774..ec0d90188 100644 --- a/ppd/hpcups/hp-deskjet_3900.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3900.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3910.ppd.gz b/ppd/hpcups/hp-deskjet_3910.ppd.gz Binary files differindex 368cca727..f87e523d2 100644 --- a/ppd/hpcups/hp-deskjet_3910.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3910.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3920.ppd.gz b/ppd/hpcups/hp-deskjet_3920.ppd.gz Binary files differindex 6cbb73b11..1690e9dc8 100644 --- a/ppd/hpcups/hp-deskjet_3920.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3920.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3940.ppd.gz b/ppd/hpcups/hp-deskjet_3940.ppd.gz Binary files differindex c9bbc74e9..00a728d28 100644 --- a/ppd/hpcups/hp-deskjet_3940.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3940.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_400.ppd.gz b/ppd/hpcups/hp-deskjet_400.ppd.gz Binary files differindex ac54beebf..ffcb7e306 100644 --- a/ppd/hpcups/hp-deskjet_400.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_400l.ppd.gz b/ppd/hpcups/hp-deskjet_400l.ppd.gz Binary files differindex c5134e5cf..006b5edc4 100644 --- a/ppd/hpcups/hp-deskjet_400l.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400l.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_460.ppd.gz b/ppd/hpcups/hp-deskjet_460.ppd.gz Binary files differindex 763232b43..946f19a1e 100644 --- a/ppd/hpcups/hp-deskjet_460.ppd.gz +++ b/ppd/hpcups/hp-deskjet_460.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500.ppd.gz b/ppd/hpcups/hp-deskjet_500.ppd.gz Binary files differindex 42acd19cc..dd0ee6154 100644 --- a/ppd/hpcups/hp-deskjet_500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500c.ppd.gz b/ppd/hpcups/hp-deskjet_500c.ppd.gz Binary files differindex 7a705cbea..16c24aaf4 100644 --- a/ppd/hpcups/hp-deskjet_500c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_500c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_505j.ppd.gz b/ppd/hpcups/hp-deskjet_505j.ppd.gz Binary files differindex 10a50400f..4456ca629 100644 --- a/ppd/hpcups/hp-deskjet_505j.ppd.gz +++ b/ppd/hpcups/hp-deskjet_505j.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_510.ppd.gz b/ppd/hpcups/hp-deskjet_510.ppd.gz Binary files differindex 02b8c9963..511ac077e 100644 --- a/ppd/hpcups/hp-deskjet_510.ppd.gz +++ b/ppd/hpcups/hp-deskjet_510.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5100.ppd.gz b/ppd/hpcups/hp-deskjet_5100.ppd.gz Binary files differindex 4818fc76c..ae66d2e82 100644 --- a/ppd/hpcups/hp-deskjet_5100.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5100.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_520.ppd.gz b/ppd/hpcups/hp-deskjet_520.ppd.gz Binary files differindex dcb3e85ce..8782a38ca 100644 --- a/ppd/hpcups/hp-deskjet_520.ppd.gz +++ b/ppd/hpcups/hp-deskjet_520.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_540.ppd.gz b/ppd/hpcups/hp-deskjet_540.ppd.gz Binary files differindex b17997503..7ca98b5c4 100644 --- a/ppd/hpcups/hp-deskjet_540.ppd.gz +++ b/ppd/hpcups/hp-deskjet_540.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5400_series.ppd.gz b/ppd/hpcups/hp-deskjet_5400_series.ppd.gz Binary files differindex 089272b7a..e7aaaecf5 100644 --- a/ppd/hpcups/hp-deskjet_5400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_550c.ppd.gz b/ppd/hpcups/hp-deskjet_550c.ppd.gz Binary files differindex 7ea29d12c..04053879e 100644 --- a/ppd/hpcups/hp-deskjet_550c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_550c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5550.ppd.gz b/ppd/hpcups/hp-deskjet_5550.ppd.gz Binary files differindex 3de9718ab..8a1f2494f 100644 --- a/ppd/hpcups/hp-deskjet_5550.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5550.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5551.ppd.gz b/ppd/hpcups/hp-deskjet_5551.ppd.gz Binary files differindex 80e91bbe2..5d55b9744 100644 --- a/ppd/hpcups/hp-deskjet_5551.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5551.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5552.ppd.gz b/ppd/hpcups/hp-deskjet_5552.ppd.gz Binary files differindex 7e531696e..2823c2be7 100644 --- a/ppd/hpcups/hp-deskjet_5552.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5552.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5600.ppd.gz b/ppd/hpcups/hp-deskjet_5600.ppd.gz Binary files differindex 60383b0d8..4ea656467 100644 --- a/ppd/hpcups/hp-deskjet_5600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5650.ppd.gz b/ppd/hpcups/hp-deskjet_5650.ppd.gz Binary files differindex ebf2f3c70..fe831a650 100644 --- a/ppd/hpcups/hp-deskjet_5650.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5650.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5652.ppd.gz b/ppd/hpcups/hp-deskjet_5652.ppd.gz Binary files differindex 6726aa71f..4e5fd837b 100644 --- a/ppd/hpcups/hp-deskjet_5652.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5652.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5700.ppd.gz b/ppd/hpcups/hp-deskjet_5700.ppd.gz Binary files differindex 61ac31d8d..5a77ad648 100644 --- a/ppd/hpcups/hp-deskjet_5700.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5700.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5800.ppd.gz b/ppd/hpcups/hp-deskjet_5800.ppd.gz Binary files differindex 844acbcbc..883180913 100644 --- a/ppd/hpcups/hp-deskjet_5800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5850.ppd.gz b/ppd/hpcups/hp-deskjet_5850.ppd.gz Binary files differindex 4175439d7..f5edd110e 100644 --- a/ppd/hpcups/hp-deskjet_5850.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5850.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5900_series.ppd.gz b/ppd/hpcups/hp-deskjet_5900_series.ppd.gz Binary files differindex 059cd1659..933d038ad 100644 --- a/ppd/hpcups/hp-deskjet_5900_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5900_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_600.ppd.gz b/ppd/hpcups/hp-deskjet_600.ppd.gz Binary files differindex bb455882b..21a0cc906 100644 --- a/ppd/hpcups/hp-deskjet_600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_610c.ppd.gz b/ppd/hpcups/hp-deskjet_610c.ppd.gz Binary files differindex dcbbb94ca..ef35ed74e 100644 --- a/ppd/hpcups/hp-deskjet_610c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_610c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_610cl.ppd.gz b/ppd/hpcups/hp-deskjet_610cl.ppd.gz Binary files differindex 5e754b686..072df234e 100644 --- a/ppd/hpcups/hp-deskjet_610cl.ppd.gz +++ b/ppd/hpcups/hp-deskjet_610cl.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6120.ppd.gz b/ppd/hpcups/hp-deskjet_6120.ppd.gz Binary files differindex 883baf9c9..c91bef30c 100644 --- a/ppd/hpcups/hp-deskjet_6120.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6120.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6122.ppd.gz b/ppd/hpcups/hp-deskjet_6122.ppd.gz Binary files differindex f69df10bc..004184e48 100644 --- a/ppd/hpcups/hp-deskjet_6122.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6122.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6127.ppd.gz b/ppd/hpcups/hp-deskjet_6127.ppd.gz Binary files differindex 6d9ea394c..d7be9ad68 100644 --- a/ppd/hpcups/hp-deskjet_6127.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6127.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_612c.ppd.gz b/ppd/hpcups/hp-deskjet_612c.ppd.gz Binary files differindex fd9dc702e..634ee3465 100644 --- a/ppd/hpcups/hp-deskjet_612c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_612c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_630c.ppd.gz b/ppd/hpcups/hp-deskjet_630c.ppd.gz Binary files differindex 75640c863..fc90be4f4 100644 --- a/ppd/hpcups/hp-deskjet_630c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_630c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_632c.ppd.gz b/ppd/hpcups/hp-deskjet_632c.ppd.gz Binary files differindex 973929b29..7a7b2a209 100644 --- a/ppd/hpcups/hp-deskjet_632c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_632c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_640c.ppd.gz b/ppd/hpcups/hp-deskjet_640c.ppd.gz Binary files differindex 7049c60ce..eba2675b9 100644 --- a/ppd/hpcups/hp-deskjet_640c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_640c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_648c.ppd.gz b/ppd/hpcups/hp-deskjet_648c.ppd.gz Binary files differindex 43f3ac660..ac214c00d 100644 --- a/ppd/hpcups/hp-deskjet_648c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_648c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6500.ppd.gz b/ppd/hpcups/hp-deskjet_6500.ppd.gz Binary files differindex ade791887..e42f7fdb9 100644 --- a/ppd/hpcups/hp-deskjet_6500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_656c.ppd.gz b/ppd/hpcups/hp-deskjet_656c.ppd.gz Binary files differindex 1cda15dc7..6739531e5 100644 --- a/ppd/hpcups/hp-deskjet_656c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_656c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_660.ppd.gz b/ppd/hpcups/hp-deskjet_660.ppd.gz Binary files differindex 6172dc709..c4944b893 100644 --- a/ppd/hpcups/hp-deskjet_660.ppd.gz +++ b/ppd/hpcups/hp-deskjet_660.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6600.ppd.gz b/ppd/hpcups/hp-deskjet_6600.ppd.gz Binary files differindex fdc448b57..1ddc98216 100644 --- a/ppd/hpcups/hp-deskjet_6600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_670.ppd.gz b/ppd/hpcups/hp-deskjet_670.ppd.gz Binary files differindex 77d1483f9..14f21a611 100644 --- a/ppd/hpcups/hp-deskjet_670.ppd.gz +++ b/ppd/hpcups/hp-deskjet_670.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_670c.ppd.gz b/ppd/hpcups/hp-deskjet_670c.ppd.gz Binary files differindex f9873f633..bac3a6540 100644 --- a/ppd/hpcups/hp-deskjet_670c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_670c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_670tv.ppd.gz b/ppd/hpcups/hp-deskjet_670tv.ppd.gz Binary files differindex 1861651b4..7503a13ee 100644 --- a/ppd/hpcups/hp-deskjet_670tv.ppd.gz +++ b/ppd/hpcups/hp-deskjet_670tv.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_672c.ppd.gz b/ppd/hpcups/hp-deskjet_672c.ppd.gz Binary files differindex c711ddbd2..55fd7e5cf 100644 --- a/ppd/hpcups/hp-deskjet_672c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_672c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_680.ppd.gz b/ppd/hpcups/hp-deskjet_680.ppd.gz Binary files differindex 5004f910f..48015b198 100644 --- a/ppd/hpcups/hp-deskjet_680.ppd.gz +++ b/ppd/hpcups/hp-deskjet_680.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6800.ppd.gz b/ppd/hpcups/hp-deskjet_6800.ppd.gz Binary files differindex 1d1ba9731..ca6ebd5fd 100644 --- a/ppd/hpcups/hp-deskjet_6800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_682.ppd.gz b/ppd/hpcups/hp-deskjet_682.ppd.gz Binary files differindex 40b1001be..f7933a828 100644 --- a/ppd/hpcups/hp-deskjet_682.ppd.gz +++ b/ppd/hpcups/hp-deskjet_682.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690.ppd.gz b/ppd/hpcups/hp-deskjet_690.ppd.gz Binary files differindex b20d4b818..f06e916ea 100644 --- a/ppd/hpcups/hp-deskjet_690.ppd.gz +++ b/ppd/hpcups/hp-deskjet_690.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690c.ppd.gz b/ppd/hpcups/hp-deskjet_690c.ppd.gz Binary files differindex daf4f2649..0a2022dfd 100644 --- a/ppd/hpcups/hp-deskjet_690c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_690c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_692.ppd.gz b/ppd/hpcups/hp-deskjet_692.ppd.gz Binary files differindex ebb27ca7f..ff53bd78d 100644 --- a/ppd/hpcups/hp-deskjet_692.ppd.gz +++ b/ppd/hpcups/hp-deskjet_692.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_693.ppd.gz b/ppd/hpcups/hp-deskjet_693.ppd.gz Binary files differindex 1825bf0b3..a0f5e712e 100644 --- a/ppd/hpcups/hp-deskjet_693.ppd.gz +++ b/ppd/hpcups/hp-deskjet_693.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_694.ppd.gz b/ppd/hpcups/hp-deskjet_694.ppd.gz Binary files differindex 30be66f54..0d71f97c5 100644 --- a/ppd/hpcups/hp-deskjet_694.ppd.gz +++ b/ppd/hpcups/hp-deskjet_694.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6940_series.ppd.gz b/ppd/hpcups/hp-deskjet_6940_series.ppd.gz Binary files differindex d21684071..2142ccbbd 100644 --- a/ppd/hpcups/hp-deskjet_6940_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6940_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_695.ppd.gz b/ppd/hpcups/hp-deskjet_695.ppd.gz Binary files differindex aeccb4fc2..91202b850 100644 --- a/ppd/hpcups/hp-deskjet_695.ppd.gz +++ b/ppd/hpcups/hp-deskjet_695.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_697.ppd.gz b/ppd/hpcups/hp-deskjet_697.ppd.gz Binary files differindex 5216c9296..b1f3158be 100644 --- a/ppd/hpcups/hp-deskjet_697.ppd.gz +++ b/ppd/hpcups/hp-deskjet_697.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6980_series.ppd.gz b/ppd/hpcups/hp-deskjet_6980_series.ppd.gz Binary files differindex b508373e7..35d73245e 100644 --- a/ppd/hpcups/hp-deskjet_6980_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6980_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_810c.ppd.gz b/ppd/hpcups/hp-deskjet_810c.ppd.gz Binary files differindex cf2add469..5c189c5b4 100644 --- a/ppd/hpcups/hp-deskjet_810c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_810c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_812c.ppd.gz b/ppd/hpcups/hp-deskjet_812c.ppd.gz Binary files differindex 0799ff02e..2d0b42528 100644 --- a/ppd/hpcups/hp-deskjet_812c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_812c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_815c.ppd.gz b/ppd/hpcups/hp-deskjet_815c.ppd.gz Binary files differindex 8c56a2c7a..09715023a 100644 --- a/ppd/hpcups/hp-deskjet_815c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_815c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_816c.ppd.gz b/ppd/hpcups/hp-deskjet_816c.ppd.gz Binary files differindex f5edbf0f0..8d5e4bcf5 100644 --- a/ppd/hpcups/hp-deskjet_816c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_816c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_825c.ppd.gz b/ppd/hpcups/hp-deskjet_825c.ppd.gz Binary files differindex 919ef534d..d0a78f7f6 100644 --- a/ppd/hpcups/hp-deskjet_825c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_825c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_830c.ppd.gz b/ppd/hpcups/hp-deskjet_830c.ppd.gz Binary files differindex 4cc219fbb..034ca4586 100644 --- a/ppd/hpcups/hp-deskjet_830c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_830c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_832c.ppd.gz b/ppd/hpcups/hp-deskjet_832c.ppd.gz Binary files differindex 8090dad36..44c8558e5 100644 --- a/ppd/hpcups/hp-deskjet_832c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_832c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_840c.ppd.gz b/ppd/hpcups/hp-deskjet_840c.ppd.gz Binary files differindex 00cbee647..9ad5e0569 100644 --- a/ppd/hpcups/hp-deskjet_840c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_840c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_841c.ppd.gz b/ppd/hpcups/hp-deskjet_841c.ppd.gz Binary files differindex 70efd9169..35bbf0d5a 100644 --- a/ppd/hpcups/hp-deskjet_841c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_841c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_842c.ppd.gz b/ppd/hpcups/hp-deskjet_842c.ppd.gz Binary files differindex 57fb1bb77..4866a3ef6 100644 --- a/ppd/hpcups/hp-deskjet_842c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_842c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_843c.ppd.gz b/ppd/hpcups/hp-deskjet_843c.ppd.gz Binary files differindex 0e2bb87bd..bf7e22d33 100644 --- a/ppd/hpcups/hp-deskjet_843c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_843c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_845c.ppd.gz b/ppd/hpcups/hp-deskjet_845c.ppd.gz Binary files differindex 5a616e7e4..ab67383ba 100644 --- a/ppd/hpcups/hp-deskjet_845c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_845c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_850c.ppd.gz b/ppd/hpcups/hp-deskjet_850c.ppd.gz Binary files differindex 9aa18cfc6..892bff380 100644 --- a/ppd/hpcups/hp-deskjet_850c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_850c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_855c.ppd.gz b/ppd/hpcups/hp-deskjet_855c.ppd.gz Binary files differindex d608f6568..cf5e5a126 100644 --- a/ppd/hpcups/hp-deskjet_855c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_855c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_870c.ppd.gz b/ppd/hpcups/hp-deskjet_870c.ppd.gz Binary files differindex c5274ae5d..8534affdc 100644 --- a/ppd/hpcups/hp-deskjet_870c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_870c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_880c.ppd.gz b/ppd/hpcups/hp-deskjet_880c.ppd.gz Binary files differindex e130f4538..ed7072569 100644 --- a/ppd/hpcups/hp-deskjet_880c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_880c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_882c.ppd.gz b/ppd/hpcups/hp-deskjet_882c.ppd.gz Binary files differindex 2236ea82c..9ec919fa9 100644 --- a/ppd/hpcups/hp-deskjet_882c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_882c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_890c.ppd.gz b/ppd/hpcups/hp-deskjet_890c.ppd.gz Binary files differindex 68850e95b..ad241c49a 100644 --- a/ppd/hpcups/hp-deskjet_890c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_890c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_895c.ppd.gz b/ppd/hpcups/hp-deskjet_895c.ppd.gz Binary files differindex ec336c0d9..8832c1103 100644 --- a/ppd/hpcups/hp-deskjet_895c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_895c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_916c.ppd.gz b/ppd/hpcups/hp-deskjet_916c.ppd.gz Binary files differindex ad908d6bb..1df4b515d 100644 --- a/ppd/hpcups/hp-deskjet_916c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_916c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_920c.ppd.gz b/ppd/hpcups/hp-deskjet_920c.ppd.gz Binary files differindex b11970c61..1021a17f9 100644 --- a/ppd/hpcups/hp-deskjet_920c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_920c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_9300.ppd.gz b/ppd/hpcups/hp-deskjet_9300.ppd.gz Binary files differindex 37452c5ff..ce808b813 100644 --- a/ppd/hpcups/hp-deskjet_9300.ppd.gz +++ b/ppd/hpcups/hp-deskjet_9300.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_930c.ppd.gz b/ppd/hpcups/hp-deskjet_930c.ppd.gz Binary files differindex f4ab40476..fccf917e5 100644 --- a/ppd/hpcups/hp-deskjet_930c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_930c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_932c.ppd.gz b/ppd/hpcups/hp-deskjet_932c.ppd.gz Binary files differindex a6e3084bc..2baa3824a 100644 --- a/ppd/hpcups/hp-deskjet_932c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_932c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_933c.ppd.gz b/ppd/hpcups/hp-deskjet_933c.ppd.gz Binary files differindex d406b1170..836788777 100644 --- a/ppd/hpcups/hp-deskjet_933c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_933c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_934c.ppd.gz b/ppd/hpcups/hp-deskjet_934c.ppd.gz Binary files differindex 22ca67893..79ebedd33 100644 --- a/ppd/hpcups/hp-deskjet_934c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_934c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_935c.ppd.gz b/ppd/hpcups/hp-deskjet_935c.ppd.gz Binary files differindex ed53c0d90..e6defe9a6 100644 --- a/ppd/hpcups/hp-deskjet_935c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_935c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_940c.ppd.gz b/ppd/hpcups/hp-deskjet_940c.ppd.gz Binary files differindex 3376ba8f2..e627fdeea 100644 --- a/ppd/hpcups/hp-deskjet_940c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_940c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_948c.ppd.gz b/ppd/hpcups/hp-deskjet_948c.ppd.gz Binary files differindex 9af605710..156d7349b 100644 --- a/ppd/hpcups/hp-deskjet_948c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_948c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_950c.ppd.gz b/ppd/hpcups/hp-deskjet_950c.ppd.gz Binary files differindex 168ee508a..d516c4ec1 100644 --- a/ppd/hpcups/hp-deskjet_950c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_950c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_952c.ppd.gz b/ppd/hpcups/hp-deskjet_952c.ppd.gz Binary files differindex 662831a72..10ee6f834 100644 --- a/ppd/hpcups/hp-deskjet_952c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_952c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_955c.ppd.gz b/ppd/hpcups/hp-deskjet_955c.ppd.gz Binary files differindex b888a4a20..fa3704a2a 100644 --- a/ppd/hpcups/hp-deskjet_955c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_955c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_957c.ppd.gz b/ppd/hpcups/hp-deskjet_957c.ppd.gz Binary files differindex 02ddec392..336837d70 100644 --- a/ppd/hpcups/hp-deskjet_957c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_957c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_959c.ppd.gz b/ppd/hpcups/hp-deskjet_959c.ppd.gz Binary files differindex 254883215..a2e1cc307 100644 --- a/ppd/hpcups/hp-deskjet_959c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_959c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_9600.ppd.gz b/ppd/hpcups/hp-deskjet_9600.ppd.gz Binary files differindex 114047310..15599ce88 100644 --- a/ppd/hpcups/hp-deskjet_9600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_9600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_960c.ppd.gz b/ppd/hpcups/hp-deskjet_960c.ppd.gz Binary files differindex 53f85498f..10b94b088 100644 --- a/ppd/hpcups/hp-deskjet_960c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_960c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_970c.ppd.gz b/ppd/hpcups/hp-deskjet_970c.ppd.gz Binary files differindex 86595417a..19c945de1 100644 --- a/ppd/hpcups/hp-deskjet_970c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_970c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_975c.ppd.gz b/ppd/hpcups/hp-deskjet_975c.ppd.gz Binary files differindex a912ed24c..0f8f25dec 100644 --- a/ppd/hpcups/hp-deskjet_975c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_975c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_9800.ppd.gz b/ppd/hpcups/hp-deskjet_9800.ppd.gz Binary files differindex 758564c86..9a0fba19c 100644 --- a/ppd/hpcups/hp-deskjet_9800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_9800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_980c.ppd.gz b/ppd/hpcups/hp-deskjet_980c.ppd.gz Binary files differindex e7a1ca3be..7384657d9 100644 --- a/ppd/hpcups/hp-deskjet_980c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_980c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_990c.ppd.gz b/ppd/hpcups/hp-deskjet_990c.ppd.gz Binary files differindex db1656eb3..c19c3c0a3 100644 --- a/ppd/hpcups/hp-deskjet_990c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_990c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_995c.ppd.gz b/ppd/hpcups/hp-deskjet_995c.ppd.gz Binary files differindex b723a1778..c0b9759af 100644 --- a/ppd/hpcups/hp-deskjet_995c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_995c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz Binary files differindex afb6cb6a3..d5b36c506 100644 --- a/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz Binary files differindex 0731f534d..13a40c189 100644 --- a/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz Binary files differindex d25ae61c4..0320d266d 100644 --- a/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz b/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz Binary files differindex 13278e61f..07c98500b 100644 --- a/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d1600_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz Binary files differindex 456c3f271..85a5aa269 100644 --- a/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz Binary files differindex caa56291b..1a2e37d82 100644 --- a/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz Binary files differindex 697a38780..f589f6faa 100644 --- a/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz b/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz Binary files differindex 2b12de2a1..e01efc752 100644 --- a/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d2600_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz Binary files differindex d28e382d8..0e08c941d 100644 --- a/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d4100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz Binary files differindex a175908b3..1a80c86d1 100644 --- a/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d4200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz b/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz Binary files differindex b9f8ba1fd..e9fa9e39e 100644 --- a/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d4300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz b/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz Binary files differindex 56bf1944d..a74793408 100644 --- a/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d5500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_d730.ppd.gz b/ppd/hpcups/hp-deskjet_d730.ppd.gz Binary files differindex 64e8eb4a0..7d57527d1 100644 --- a/ppd/hpcups/hp-deskjet_d730.ppd.gz +++ b/ppd/hpcups/hp-deskjet_d730.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz Binary files differindex 073d8f071..d1b7eeaa1 100644 --- a/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f2100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz Binary files differindex 5da3ea591..a983f0c70 100644 --- a/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f2200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz Binary files differindex c400f6882..bf529a748 100644 --- a/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f2400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f300_series.ppd.gz b/ppd/hpcups/hp-deskjet_f300_series.ppd.gz Binary files differindex e93fc0e28..86f087234 100644 --- a/ppd/hpcups/hp-deskjet_f300_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f300_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz Binary files differindex c8cfa2213..39a1ba429 100644 --- a/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4100_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz Binary files differindex 9e8deeb8e..d20cdbe47 100644 --- a/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz Binary files differindex cd64d3ffd..60e827433 100644 --- a/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4210_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz Binary files differindex d4420fa5a..4a329fb49 100644 --- a/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4213_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz Binary files differindex abb137dd1..e6ba02d3e 100644 --- a/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz Binary files differindex 5a39dc660..c16733f7f 100644 --- a/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f4500_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_f735.ppd.gz b/ppd/hpcups/hp-deskjet_f735.ppd.gz Binary files differindex 67e24907a..9629a0aee 100644 --- a/ppd/hpcups/hp-deskjet_f735.ppd.gz +++ b/ppd/hpcups/hp-deskjet_f735.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz Binary files differnew file mode 100644 index 000000000..342d6c732 --- /dev/null +++ b/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz Binary files differnew file mode 100644 index 000000000..772c5e898 --- /dev/null +++ b/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz Binary files differindex 3b10e3ec3..f44528a3f 100644 --- a/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_advant_k109a-z.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz b/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz Binary files differindex ec7c557d8..9fa59b966 100644 --- a/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz +++ b/ppd/hpcups/hp-deskjet_ink_advant_k209a-z.ppd.gz diff --git a/ppd/hpcups/hp-dj350.ppd.gz b/ppd/hpcups/hp-dj350.ppd.gz Binary files differindex e30885c50..75eb62813 100644 --- a/ppd/hpcups/hp-dj350.ppd.gz +++ b/ppd/hpcups/hp-dj350.ppd.gz diff --git a/ppd/hpcups/hp-dj450.ppd.gz b/ppd/hpcups/hp-dj450.ppd.gz Binary files differindex e54a71ed4..5c30cc24b 100644 --- a/ppd/hpcups/hp-dj450.ppd.gz +++ b/ppd/hpcups/hp-dj450.ppd.gz diff --git a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz Binary files differindex c39bbead0..a2ff8a2b5 100644 --- a/ppd/hpcups/hp-envy_100_d410_series.ppd.gz +++ b/ppd/hpcups/hp-envy_100_d410_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz Binary files differindex ef2373900..38959b518 100644 --- a/ppd/hpcups/hp-laserjet_1000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1005_series.ppd.gz b/ppd/hpcups/hp-laserjet_1005_series.ppd.gz Binary files differindex 9b8e24f82..0d1cbae34 100644 --- a/ppd/hpcups/hp-laserjet_1005_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1005_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1010.ppd.gz b/ppd/hpcups/hp-laserjet_1010.ppd.gz Binary files differindex 98157c1df..8e96aa4c0 100644 --- a/ppd/hpcups/hp-laserjet_1010.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1010.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1012.ppd.gz b/ppd/hpcups/hp-laserjet_1012.ppd.gz Binary files differindex 9b8b31c8e..be6950112 100644 --- a/ppd/hpcups/hp-laserjet_1012.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1012.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1015.ppd.gz b/ppd/hpcups/hp-laserjet_1015.ppd.gz Binary files differindex 80d1e7ed7..b9a2fc7c3 100644 --- a/ppd/hpcups/hp-laserjet_1015.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1015.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1018.ppd.gz b/ppd/hpcups/hp-laserjet_1018.ppd.gz Binary files differindex 7591e04a7..927f79477 100644 --- a/ppd/hpcups/hp-laserjet_1018.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1018.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1020.ppd.gz b/ppd/hpcups/hp-laserjet_1020.ppd.gz Binary files differindex 70194cb47..9d7b145c0 100644 --- a/ppd/hpcups/hp-laserjet_1020.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1020.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz Binary files differindex d9d1eec40..6ecd533d1 100644 --- a/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz Binary files differindex 6bd0062ba..b584c835e 100644 --- a/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz Binary files differindex 5449f633d..b8761c681 100644 --- a/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz Binary files differindex 4e1f9e34f..b65c71190 100644 --- a/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022n-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz Binary files differindex 0eb213638..a73011439 100644 --- a/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz Binary files differindex fed910f3f..536e6151e 100644 --- a/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1022nw-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1100.ppd.gz b/ppd/hpcups/hp-laserjet_1100.ppd.gz Binary files differindex b1d152221..2600d31e6 100644 --- a/ppd/hpcups/hp-laserjet_1100.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1100a.ppd.gz b/ppd/hpcups/hp-laserjet_1100a.ppd.gz Binary files differindex 24af736c4..fe673924d 100644 --- a/ppd/hpcups/hp-laserjet_1100a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1100a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1100xi.ppd.gz b/ppd/hpcups/hp-laserjet_1100xi.ppd.gz Binary files differindex 2884681ca..1414d8e70 100644 --- a/ppd/hpcups/hp-laserjet_1100xi.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1100xi.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1150.ppd.gz b/ppd/hpcups/hp-laserjet_1150.ppd.gz Binary files differindex dc532b772..e86b353ee 100644 --- a/ppd/hpcups/hp-laserjet_1150.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1150.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1160.ppd.gz b/ppd/hpcups/hp-laserjet_1160.ppd.gz Binary files differindex abb32eb7b..f95e881b9 100644 --- a/ppd/hpcups/hp-laserjet_1160.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1160.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1160_series.ppd.gz b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz Binary files differindex c2141737a..cb516c3e3 100644 --- a/ppd/hpcups/hp-laserjet_1160_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz Binary files differindex 561817494..1ee82624f 100644 --- a/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1200n.ppd.gz b/ppd/hpcups/hp-laserjet_1200n.ppd.gz Binary files differindex 87bbe9e02..4b282e8e3 100644 --- a/ppd/hpcups/hp-laserjet_1200n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1200n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz Binary files differindex 6d9690036..2f4cf875e 100644 --- a/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1220-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1220se.ppd.gz b/ppd/hpcups/hp-laserjet_1220se.ppd.gz Binary files differindex 3718e9f20..2bcb19a2e 100644 --- a/ppd/hpcups/hp-laserjet_1220se.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1220se.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz Binary files differindex d14b07367..42a6336db 100644 --- a/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz Binary files differindex 94def8885..6ef09fe71 100644 --- a/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1300n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz Binary files differindex 6d8c5bb6d..53efb7b9e 100644 --- a/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1300xi-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320.ppd.gz b/ppd/hpcups/hp-laserjet_1320.ppd.gz Binary files differindex 795b491b4..c040a05a8 100644 --- a/ppd/hpcups/hp-laserjet_1320.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz Binary files differindex 89bcf1dc3..ec9c035d4 100644 --- a/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320n.ppd.gz b/ppd/hpcups/hp-laserjet_1320n.ppd.gz Binary files differindex 4b5af6de3..517b5900e 100644 --- a/ppd/hpcups/hp-laserjet_1320n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320nw.ppd.gz b/ppd/hpcups/hp-laserjet_1320nw.ppd.gz Binary files differindex 1523ebecd..703426905 100644 --- a/ppd/hpcups/hp-laserjet_1320nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1320tn.ppd.gz b/ppd/hpcups/hp-laserjet_1320tn.ppd.gz Binary files differindex 0d84570fd..c21cb3dce 100644 --- a/ppd/hpcups/hp-laserjet_1320tn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_1320tn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2100.ppd.gz b/ppd/hpcups/hp-laserjet_2100.ppd.gz Binary files differindex bf49b3aa1..8cbd30016 100644 --- a/ppd/hpcups/hp-laserjet_2100.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2100.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz Binary files differindex 3bc0c9414..967187188 100644 --- a/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz Binary files differindex 90283a56b..55d4f51bb 100644 --- a/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz Binary files differindex b159ffff6..35facc264 100644 --- a/ppd/hpcups/hp-laserjet_2200_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz Binary files differindex d3d73e8e8..3419ddcd3 100644 --- a/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2300_series.ppd.gz b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz Binary files differindex 9111d24ca..d48639999 100644 --- a/ppd/hpcups/hp-laserjet_2300_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz Binary files differindex 599dd7ef1..605e14088 100644 --- a/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2410-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz Binary files differindex 09c90360e..c4f072776 100644 --- a/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2420-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz Binary files differindex 62534fa79..f2726886b 100644 --- a/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_2430-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz Binary files differindex fc601f907..df94896a8 100644 --- a/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3015-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz Binary files differindex 64ac6ea2d..4bbe4db89 100644 --- a/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3020-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz Binary files differindex d2d506b53..6b8453547 100644 --- a/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3030-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz Binary files differindex fcf824370..9018c5ea9 100644 --- a/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3050-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz Binary files differindex 4eb41a959..d96307ff3 100644 --- a/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3052-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3055.ppd.gz b/ppd/hpcups/hp-laserjet_3055.ppd.gz Binary files differindex 05c1fdeed..83f120dab 100644 --- a/ppd/hpcups/hp-laserjet_3055.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3055.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3100.ppd.gz b/ppd/hpcups/hp-laserjet_3100.ppd.gz Binary files differindex 4cd64be11..ccea038f4 100644 --- a/ppd/hpcups/hp-laserjet_3100.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3100.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3150.ppd.gz b/ppd/hpcups/hp-laserjet_3150.ppd.gz Binary files differindex c075a00ac..173bfa803 100644 --- a/ppd/hpcups/hp-laserjet_3150.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3150.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200.ppd.gz b/ppd/hpcups/hp-laserjet_3200.ppd.gz Binary files differindex 609965f28..5c73f1395 100644 --- a/ppd/hpcups/hp-laserjet_3200.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz Binary files differindex 76d6a9485..6f63ab5bf 100644 --- a/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200m-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3200se.ppd.gz b/ppd/hpcups/hp-laserjet_3200se.ppd.gz Binary files differindex f65468c89..0921bd38e 100644 --- a/ppd/hpcups/hp-laserjet_3200se.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200se.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz Binary files differindex 0a006a2d9..1aac8eee6 100644 --- a/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3300_3310_3320-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3330.ppd.gz b/ppd/hpcups/hp-laserjet_3330.ppd.gz Binary files differindex 0a70f0bad..95fe763b2 100644 --- a/ppd/hpcups/hp-laserjet_3330.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3330.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz Binary files differindex 224d4eda7..063408812 100644 --- a/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3380-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz Binary files differindex 2f5d72601..d2fa359d6 100644 --- a/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3390-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_3392.ppd.gz b/ppd/hpcups/hp-laserjet_3392.ppd.gz Binary files differindex f5bc982d2..396f234ab 100644 --- a/ppd/hpcups/hp-laserjet_3392.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3392.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz Binary files differindex 091492f98..8d1b6ac21 100644 --- a/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz Binary files differindex cdb00b61f..10b55ffd6 100644 --- a/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4050_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz Binary files differindex 96b1394f5..e0a0aa47a 100644 --- a/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4100_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz Binary files differindex f2d3af9a3..c098b9df0 100644 --- a/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4150_series.ppd.gz b/ppd/hpcups/hp-laserjet_4150_series.ppd.gz Binary files differindex fc59ec2fd..f80762ea9 100644 --- a/ppd/hpcups/hp-laserjet_4150_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4150_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz Binary files differindex 992479c98..e0bd0b54e 100644 --- a/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz Binary files differindex 00e56311e..f3bf6bf33 100644 --- a/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4240-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz Binary files differindex b024e96ea..ee8a60bfb 100644 --- a/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4250-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz Binary files differindex f564face4..9314e1219 100644 --- a/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4300-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz Binary files differindex fd351432d..32b22f387 100644 --- a/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4345_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz Binary files differindex 1dfa7ccc7..06538e78a 100644 --- a/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4350-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz Binary files differindex 8166ae722..06a681b8f 100644 --- a/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4_plus-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4l.ppd.gz b/ppd/hpcups/hp-laserjet_4l.ppd.gz Binary files differindex 67b59bb16..a1d935435 100644 --- a/ppd/hpcups/hp-laserjet_4l.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4l.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4ml.ppd.gz b/ppd/hpcups/hp-laserjet_4ml.ppd.gz Binary files differindex d9f46daca..33f1972c1 100644 --- a/ppd/hpcups/hp-laserjet_4ml.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4ml.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz Binary files differindex 595955ada..11d6359de 100644 --- a/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4mp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz Binary files differindex 0575bf2e1..a66c7915d 100644 --- a/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4si-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz Binary files differindex fbb49ee82..cad2e4ad1 100644 --- a/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_4v-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5000.ppd.gz b/ppd/hpcups/hp-laserjet_5000.ppd.gz Binary files differindex c59339697..93a7cad80 100644 --- a/ppd/hpcups/hp-laserjet_5000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz Binary files differindex 566c2da9c..c9214ae1e 100644 --- a/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz Binary files differindex 496915dfa..5e0d14c48 100644 --- a/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz Binary files differindex 09294b08f..4277cb4c0 100644 --- a/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5200-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz Binary files differindex b52356d75..71fbde5d5 100644 --- a/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5200l-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5200lx.ppd.gz b/ppd/hpcups/hp-laserjet_5200lx.ppd.gz Binary files differindex aacae901e..3d277f7dc 100644 --- a/ppd/hpcups/hp-laserjet_5200lx.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5200lx.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5l.ppd.gz b/ppd/hpcups/hp-laserjet_5l.ppd.gz Binary files differindex 5b5a6677d..a92b16ae4 100644 --- a/ppd/hpcups/hp-laserjet_5l.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5l.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz Binary files differindex 41a4e28b5..3baeb218c 100644 --- a/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5mp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5p.ppd.gz b/ppd/hpcups/hp-laserjet_5p.ppd.gz Binary files differindex 5bd25142f..d93a53b86 100644 --- a/ppd/hpcups/hp-laserjet_5p.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5p.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz Binary files differindex 7c2b6b6b7..d0673c3da 100644 --- a/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5si-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz Binary files differindex 97c52c6c8..e83cc2503 100644 --- a/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_5si_mopier-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_6l.ppd.gz b/ppd/hpcups/hp-laserjet_6l.ppd.gz Binary files differindex 3a99ba0e6..ad5e27323 100644 --- a/ppd/hpcups/hp-laserjet_6l.ppd.gz +++ b/ppd/hpcups/hp-laserjet_6l.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz Binary files differindex cbce28f15..ddc3634be 100644 --- a/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_6mp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_6p.ppd.gz b/ppd/hpcups/hp-laserjet_6p.ppd.gz Binary files differindex 9f31ac2b8..3404f5584 100644 --- a/ppd/hpcups/hp-laserjet_6p.ppd.gz +++ b/ppd/hpcups/hp-laserjet_6p.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8000.ppd.gz b/ppd/hpcups/hp-laserjet_8000.ppd.gz Binary files differindex fc8d683eb..891a9cd48 100644 --- a/ppd/hpcups/hp-laserjet_8000.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8000.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz Binary files differindex a3bba4c3f..ecbc8de60 100644 --- a/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz Binary files differindex 82bd7e54d..657e161dd 100644 --- a/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8100_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz Binary files differindex c337e3dbb..a5e33ca19 100644 --- a/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz Binary files differindex 94030cc4d..ec1a02ad5 100644 --- a/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8150_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz Binary files differindex 210754a21..3f3d12064 100644 --- a/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_8150_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz Binary files differindex 7db1bf235..118ea3912 100644 --- a/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9000_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz Binary files differindex 8ec294070..37fc77d8b 100644 --- a/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9000_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz Binary files differindex 6b0869453..04dc389ab 100644 --- a/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9040-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz Binary files differindex 696de6aac..ef0e18152 100644 --- a/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9040_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz Binary files differindex 67e7a1864..ede953289 100644 --- a/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9050-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz Binary files differindex 3059ae89e..f9fd193f0 100644 --- a/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9050_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz Binary files differindex 4c706f103..075ec2220 100644 --- a/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9055mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz Binary files differindex f60beed4b..f7257a1af 100644 --- a/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_9065mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..9947bb98e --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..d95b95792 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..12cab76ae --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..36fb4e456 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..6a7ef66ad --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..65369a270 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..0804ecdbf --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..23e2516a2 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1021.ppd.gz b/ppd/hpcups/hp-laserjet_cp1021.ppd.gz Binary files differnew file mode 100644 index 000000000..526ac6d12 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1021.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1022.ppd.gz b/ppd/hpcups/hp-laserjet_cp1022.ppd.gz Binary files differnew file mode 100644 index 000000000..9da1fb591 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1022.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1023.ppd.gz b/ppd/hpcups/hp-laserjet_cp1023.ppd.gz Binary files differnew file mode 100644 index 000000000..d3f81a929 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1023.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz Binary files differnew file mode 100644 index 000000000..d32d3362b --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz Binary files differnew file mode 100644 index 000000000..cce0c8a14 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz Binary files differnew file mode 100644 index 000000000..67bd58385 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1026nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz Binary files differnew file mode 100644 index 000000000..844217ae7 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz Binary files differnew file mode 100644 index 000000000..78196a476 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1005.ppd.gz b/ppd/hpcups/hp-laserjet_m1005.ppd.gz Binary files differindex 04bf71ca4..4cc0f10e4 100644 --- a/ppd/hpcups/hp-laserjet_m1005.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz Binary files differindex f9a6b8445..c44d7be64 100644 --- a/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz Binary files differindex 0878e2991..39aff91a0 100644 --- a/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1120n_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz Binary files differindex 292ad3e80..6076fe829 100644 --- a/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1319f_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz Binary files differindex 69017a4c3..4c22f415c 100644 --- a/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..d3aa22c81 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..036a8c1c9 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..89927cfd1 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..e7093ffee --- /dev/null +++ b/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz Binary files differindex 04bb4920a..b03e18df1 100644 --- a/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m2727_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz Binary files differindex 0e395ef88..34fe934d2 100644 --- a/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m3027_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz Binary files differindex fab19e16d..6cecd1f4c 100644 --- a/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m3035_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz Binary files differindex 4b57fbb9a..ecb04df43 100644 --- a/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m4345_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz Binary files differindex 7bac87fc8..f3d0012c3 100644 --- a/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m4349_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz Binary files differindex 836125670..b01b80eb8 100644 --- a/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5025_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz Binary files differindex d8a8defad..d51d8955d 100644 --- a/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5035_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz Binary files differindex b69b80879..6253be167 100644 --- a/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m5039_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz Binary files differindex 474a18638..c1f9f18eb 100644 --- a/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m9040_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz Binary files differindex 89ee8e99b..970641ad9 100644 --- a/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m9050_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz Binary files differindex 653c89ac8..b932e7d12 100644 --- a/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m9059_mfp-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1005.ppd.gz b/ppd/hpcups/hp-laserjet_p1005.ppd.gz Binary files differindex 519752acd..a0f23e1b4 100644 --- a/ppd/hpcups/hp-laserjet_p1005.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1006.ppd.gz b/ppd/hpcups/hp-laserjet_p1006.ppd.gz Binary files differindex 55409a7e3..697d32d87 100644 --- a/ppd/hpcups/hp-laserjet_p1006.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1006.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1007.ppd.gz b/ppd/hpcups/hp-laserjet_p1007.ppd.gz Binary files differindex f1261ed64..155113c0b 100644 --- a/ppd/hpcups/hp-laserjet_p1007.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1007.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1008.ppd.gz b/ppd/hpcups/hp-laserjet_p1008.ppd.gz Binary files differindex 9ecdfaeef..eb13b5672 100644 --- a/ppd/hpcups/hp-laserjet_p1008.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1008.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1009.ppd.gz b/ppd/hpcups/hp-laserjet_p1009.ppd.gz Binary files differindex fa47be422..77dc0cee9 100644 --- a/ppd/hpcups/hp-laserjet_p1009.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1009.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505.ppd.gz b/ppd/hpcups/hp-laserjet_p1505.ppd.gz Binary files differindex 03a9fa008..7f321ab63 100644 --- a/ppd/hpcups/hp-laserjet_p1505.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz Binary files differindex 650735ab6..760d45962 100644 --- a/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz Binary files differindex 4486a1baa..96c040efe 100644 --- a/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz Binary files differindex 0492f0e47..174590bcb 100644 --- a/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz Binary files differindex ab0c5fd85..f0b30e09c 100644 --- a/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz Binary files differindex d159f10bb..5609b4c0f 100644 --- a/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz Binary files differindex 019ba695d..15d5ce5fc 100644 --- a/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz Binary files differindex c97ff829a..6ce41cb18 100644 --- a/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz Binary files differindex 65ce03078..a1bfbbfd0 100644 --- a/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015d_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz Binary files differindex 5108132d3..f5abbaab1 100644 --- a/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015dn_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz Binary files differindex 5fb27e3fb..ae873d47b 100644 --- a/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015n_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz b/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz Binary files differindex 98b200db9..e93d00d9a 100644 --- a/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2015x_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz Binary files differindex 9c9123004..d918d08d7 100644 --- a/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz Binary files differindex d950b9584..ebd3a9923 100644 --- a/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz Binary files differindex 5563f50ca..daab056a8 100644 --- a/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz Binary files differindex 8cc8a3d44..79ef0bbb1 100644 --- a/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2035n-zjs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz Binary files differindex 63589a204..b19d21703 100644 --- a/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz Binary files differindex 9aa48fc54..0639e074f 100644 --- a/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055d-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz Binary files differindex 670f792c1..450197d9b 100644 --- a/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055dn-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz Binary files differindex 9d1db1c3b..98add4446 100644 --- a/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p2055x-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz Binary files differindex ba619fb08..af93dec4e 100644 --- a/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p3004-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz Binary files differindex 8aaff6527..70483aae6 100644 --- a/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p3005-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz Binary files differindex 4f39a2de9..810934cfb 100644 --- a/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p3010_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4014.ppd.gz b/ppd/hpcups/hp-laserjet_p4014.ppd.gz Binary files differindex 7e01a0c5b..c0c523e36 100644 --- a/ppd/hpcups/hp-laserjet_p4014.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4014.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz b/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz Binary files differindex 1ff97de7f..f6342588f 100644 --- a/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4014dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4014n.ppd.gz b/ppd/hpcups/hp-laserjet_p4014n.ppd.gz Binary files differindex 311c02f89..ce1c10fc2 100644 --- a/ppd/hpcups/hp-laserjet_p4014n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4014n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015.ppd.gz b/ppd/hpcups/hp-laserjet_p4015.ppd.gz Binary files differindex facf4c26e..e0de272bd 100644 --- a/ppd/hpcups/hp-laserjet_p4015.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz b/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz Binary files differindex d4daea390..3835cae3d 100644 --- a/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015n.ppd.gz b/ppd/hpcups/hp-laserjet_p4015n.ppd.gz Binary files differindex 124400c33..859e75a3a 100644 --- a/ppd/hpcups/hp-laserjet_p4015n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz b/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz Binary files differindex 64c6421a3..33d85cd5b 100644 --- a/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015tn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4015x.ppd.gz b/ppd/hpcups/hp-laserjet_p4015x.ppd.gz Binary files differindex 8dea79d35..50ed3d996 100644 --- a/ppd/hpcups/hp-laserjet_p4015x.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4015x.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515.ppd.gz b/ppd/hpcups/hp-laserjet_p4515.ppd.gz Binary files differindex 3115a6571..1329362c3 100644 --- a/ppd/hpcups/hp-laserjet_p4515.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515n.ppd.gz b/ppd/hpcups/hp-laserjet_p4515n.ppd.gz Binary files differindex 222d1f4a0..61b801d70 100644 --- a/ppd/hpcups/hp-laserjet_p4515n.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515n.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz b/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz Binary files differindex 69e29c4ee..e0f980edc 100644 --- a/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515tn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515x.ppd.gz b/ppd/hpcups/hp-laserjet_p4515x.ppd.gz Binary files differindex 99b096a5c..4dd48b08a 100644 --- a/ppd/hpcups/hp-laserjet_p4515x.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515x.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz Binary files differindex 7a958f534..d02e1cf53 100644 --- a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz Binary files differindex 6e26c8972..4379cde28 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1132_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz Binary files differindex ac7e25911..4bc167de0 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1136_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz Binary files differindex 8b2c390fa..5df0bf072 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1212nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz Binary files differnew file mode 100644 index 000000000..07d214ec2 --- /dev/null +++ b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz Binary files differindex 4b0415f1c..7b7886974 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1217nfw_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz Binary files differindex 21d67dc58..ed93122b5 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1102.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz Binary files differindex e9c656553..cf44f32dc 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz Binary files differindex a981a46d8..4fea33129 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1566.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz Binary files differindex ede01da79..ba84fb597 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1606dn.ppd.gz diff --git a/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz b/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz Binary files differindex e96fc7b20..2e4448168 100644 --- a/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz +++ b/ppd/hpcups/hp-mopier_240-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz b/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz Binary files differindex 26c001b2c..45e5fbf2b 100644 --- a/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz +++ b/ppd/hpcups/hp-mopier_320-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-officejet.ppd.gz b/ppd/hpcups/hp-officejet.ppd.gz Binary files differindex d22f0a8ad..8c2ee4153 100644 --- a/ppd/hpcups/hp-officejet.ppd.gz +++ b/ppd/hpcups/hp-officejet.ppd.gz diff --git a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz Binary files differindex caaff2b8b..efa9fa1c1 100644 --- a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz +++ b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz Binary files differindex 51c3e3b13..bd237efac 100644 --- a/ppd/hpcups/hp-officejet_4000_k210.ppd.gz +++ b/ppd/hpcups/hp-officejet_4000_k210.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4100_series.ppd.gz b/ppd/hpcups/hp-officejet_4100_series.ppd.gz Binary files differindex 21542f854..d5fad4732 100644 --- a/ppd/hpcups/hp-officejet_4100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4105.ppd.gz b/ppd/hpcups/hp-officejet_4105.ppd.gz Binary files differindex 2aced85a1..091b35159 100644 --- a/ppd/hpcups/hp-officejet_4105.ppd.gz +++ b/ppd/hpcups/hp-officejet_4105.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4115_series.ppd.gz b/ppd/hpcups/hp-officejet_4115_series.ppd.gz Binary files differindex 822264d84..ad58cd865 100644 --- a/ppd/hpcups/hp-officejet_4115_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4115_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4200_series.ppd.gz b/ppd/hpcups/hp-officejet_4200_series.ppd.gz Binary files differindex c35b8a796..5ae2a3819 100644 --- a/ppd/hpcups/hp-officejet_4200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4200_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4255.ppd.gz b/ppd/hpcups/hp-officejet_4255.ppd.gz Binary files differindex 809142d8b..c56ff55fa 100644 --- a/ppd/hpcups/hp-officejet_4255.ppd.gz +++ b/ppd/hpcups/hp-officejet_4255.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4300_series.ppd.gz b/ppd/hpcups/hp-officejet_4300_series.ppd.gz Binary files differindex 456b26383..f3aaf5119 100644 --- a/ppd/hpcups/hp-officejet_4300_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4300_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz Binary files differindex 6910a7771..8abe51d32 100644 --- a/ppd/hpcups/hp-officejet_4400_k410.ppd.gz +++ b/ppd/hpcups/hp-officejet_4400_k410.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz Binary files differindex e7ef7abe2..4dbfd9e34 100644 --- a/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510a-f.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz Binary files differindex c32c265aa..a31426d62 100644 --- a/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510g-m.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz Binary files differindex 4e0ae3940..d55805b7d 100644 --- a/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_g510n-z.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz Binary files differindex 1d0b724d8..5f3939591 100644 --- a/ppd/hpcups/hp-officejet_4500_k710.ppd.gz +++ b/ppd/hpcups/hp-officejet_4500_k710.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5100_series.ppd.gz b/ppd/hpcups/hp-officejet_5100_series.ppd.gz Binary files differindex 870050136..6cb6bb1bb 100644 --- a/ppd/hpcups/hp-officejet_5100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5105.ppd.gz b/ppd/hpcups/hp-officejet_5105.ppd.gz Binary files differindex ffad3d4f3..44702506a 100644 --- a/ppd/hpcups/hp-officejet_5105.ppd.gz +++ b/ppd/hpcups/hp-officejet_5105.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5110.ppd.gz b/ppd/hpcups/hp-officejet_5110.ppd.gz Binary files differindex dc2b19c1e..005dc75c0 100644 --- a/ppd/hpcups/hp-officejet_5110.ppd.gz +++ b/ppd/hpcups/hp-officejet_5110.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5110v.ppd.gz b/ppd/hpcups/hp-officejet_5110v.ppd.gz Binary files differindex 7d671972f..18998582c 100644 --- a/ppd/hpcups/hp-officejet_5110v.ppd.gz +++ b/ppd/hpcups/hp-officejet_5110v.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5500_series.ppd.gz b/ppd/hpcups/hp-officejet_5500_series.ppd.gz Binary files differindex d23352388..1beeb7b77 100644 --- a/ppd/hpcups/hp-officejet_5500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_5600_series.ppd.gz b/ppd/hpcups/hp-officejet_5600_series.ppd.gz Binary files differindex a628c21e8..2cdc3274d 100644 --- a/ppd/hpcups/hp-officejet_5600_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5600_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz b/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz Binary files differindex f44f96223..50f630ca3 100644 --- a/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz +++ b/ppd/hpcups/hp-officejet_6000_e609a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz b/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz Binary files differindex b7b8b94e4..95ff76360 100644 --- a/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz +++ b/ppd/hpcups/hp-officejet_6000_e609n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6100_series.ppd.gz b/ppd/hpcups/hp-officejet_6100_series.ppd.gz Binary files differindex 931766497..2cede5970 100644 --- a/ppd/hpcups/hp-officejet_6100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6150_series.ppd.gz b/ppd/hpcups/hp-officejet_6150_series.ppd.gz Binary files differindex e88e9f7d4..25d5c7282 100644 --- a/ppd/hpcups/hp-officejet_6150_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6150_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6200_series.ppd.gz b/ppd/hpcups/hp-officejet_6200_series.ppd.gz Binary files differindex ebb800541..1d65af757 100644 --- a/ppd/hpcups/hp-officejet_6200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6200_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6300_series.ppd.gz b/ppd/hpcups/hp-officejet_6300_series.ppd.gz Binary files differindex bea8a45bc..34db62c70 100644 --- a/ppd/hpcups/hp-officejet_6300_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_6300_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz b/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz Binary files differindex 5c714742c..71f161523 100644 --- a/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e709a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz b/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz Binary files differindex 8b343d324..32301e098 100644 --- a/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e709n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz Binary files differindex 7d6d8735e..cdba0adca 100644 --- a/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e710a-f.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz Binary files differindex 917c3a443..beaa0b359 100644 --- a/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz +++ b/ppd/hpcups/hp-officejet_6500_e710n-z.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz Binary files differindex 901ba6d61..7ec9273db 100644 --- a/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz +++ b/ppd/hpcups/hp-officejet_7000_e809a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz Binary files differindex 1030a75bd..d92855cce 100644 --- a/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7000_e809a_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7100_series.ppd.gz b/ppd/hpcups/hp-officejet_7100_series.ppd.gz Binary files differindex 7eb298111..c6c6a26df 100644 --- a/ppd/hpcups/hp-officejet_7100_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7100_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7200_series.ppd.gz b/ppd/hpcups/hp-officejet_7200_series.ppd.gz Binary files differindex df6eb8628..47c4f460f 100644 --- a/ppd/hpcups/hp-officejet_7200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7200_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7300_series.ppd.gz b/ppd/hpcups/hp-officejet_7300_series.ppd.gz Binary files differindex 590706231..cabd6d32b 100644 --- a/ppd/hpcups/hp-officejet_7300_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7300_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7400_series.ppd.gz b/ppd/hpcups/hp-officejet_7400_series.ppd.gz Binary files differindex ce19a7ec4..b468cb8bf 100644 --- a/ppd/hpcups/hp-officejet_7400_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7400_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz Binary files differindex a7628d951..593b02c83 100644 --- a/ppd/hpcups/hp-officejet_7500_e910.ppd.gz +++ b/ppd/hpcups/hp-officejet_7500_e910.ppd.gz diff --git a/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz Binary files differindex e6c3cfdac..42ee39c00 100644 --- a/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz +++ b/ppd/hpcups/hp-officejet_9100_series-pcl3.ppd.gz diff --git a/ppd/hpcups/hp-officejet_d_series.ppd.gz b/ppd/hpcups/hp-officejet_d_series.ppd.gz Binary files differindex 76e16783d..34e2f059b 100644 --- a/ppd/hpcups/hp-officejet_d_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_d_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g55.ppd.gz b/ppd/hpcups/hp-officejet_g55.ppd.gz Binary files differindex 4fa47e810..d2a3fc63d 100644 --- a/ppd/hpcups/hp-officejet_g55.ppd.gz +++ b/ppd/hpcups/hp-officejet_g55.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g55xi.ppd.gz b/ppd/hpcups/hp-officejet_g55xi.ppd.gz Binary files differindex 09754fdc2..43abd8ef5 100644 --- a/ppd/hpcups/hp-officejet_g55xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_g55xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g85.ppd.gz b/ppd/hpcups/hp-officejet_g85.ppd.gz Binary files differindex ce76c786e..9515aa3f3 100644 --- a/ppd/hpcups/hp-officejet_g85.ppd.gz +++ b/ppd/hpcups/hp-officejet_g85.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g85xi.ppd.gz b/ppd/hpcups/hp-officejet_g85xi.ppd.gz Binary files differindex ca4708da3..16f1a996c 100644 --- a/ppd/hpcups/hp-officejet_g85xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_g85xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_g95.ppd.gz b/ppd/hpcups/hp-officejet_g95.ppd.gz Binary files differindex e17ebcb69..8093c35a0 100644 --- a/ppd/hpcups/hp-officejet_g95.ppd.gz +++ b/ppd/hpcups/hp-officejet_g95.ppd.gz diff --git a/ppd/hpcups/hp-officejet_h470.ppd.gz b/ppd/hpcups/hp-officejet_h470.ppd.gz Binary files differindex 23cc79154..452e03465 100644 --- a/ppd/hpcups/hp-officejet_h470.ppd.gz +++ b/ppd/hpcups/hp-officejet_h470.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz Binary files differindex fe7b438f0..1e559bf5f 100644 --- a/ppd/hpcups/hp-officejet_j3500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j3500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j3600_series.ppd.gz b/ppd/hpcups/hp-officejet_j3600_series.ppd.gz Binary files differindex df8be03fb..698a3c502 100644 --- a/ppd/hpcups/hp-officejet_j3600_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j3600_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j4500_series.ppd.gz b/ppd/hpcups/hp-officejet_j4500_series.ppd.gz Binary files differindex 50a92be8f..b24882dea 100644 --- a/ppd/hpcups/hp-officejet_j4500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j4500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j4660_series.ppd.gz b/ppd/hpcups/hp-officejet_j4660_series.ppd.gz Binary files differindex 746a72f85..ef07beae5 100644 --- a/ppd/hpcups/hp-officejet_j4660_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j4660_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j4680_series.ppd.gz b/ppd/hpcups/hp-officejet_j4680_series.ppd.gz Binary files differindex 183b478d8..377001dd7 100644 --- a/ppd/hpcups/hp-officejet_j4680_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j4680_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j5500_series.ppd.gz b/ppd/hpcups/hp-officejet_j5500_series.ppd.gz Binary files differindex bcac74b4c..67f917d06 100644 --- a/ppd/hpcups/hp-officejet_j5500_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j5500_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j5700_series.ppd.gz b/ppd/hpcups/hp-officejet_j5700_series.ppd.gz Binary files differindex a841e9d29..e894a3f6b 100644 --- a/ppd/hpcups/hp-officejet_j5700_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j5700_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_j6400_series.ppd.gz b/ppd/hpcups/hp-officejet_j6400_series.ppd.gz Binary files differindex 845a059f4..852330870 100644 --- a/ppd/hpcups/hp-officejet_j6400_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_j6400_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k60.ppd.gz b/ppd/hpcups/hp-officejet_k60.ppd.gz Binary files differindex 0bcd4b0bb..3b8e108ad 100644 --- a/ppd/hpcups/hp-officejet_k60.ppd.gz +++ b/ppd/hpcups/hp-officejet_k60.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k60xi.ppd.gz b/ppd/hpcups/hp-officejet_k60xi.ppd.gz Binary files differindex 155bd5a12..0c1de1f85 100644 --- a/ppd/hpcups/hp-officejet_k60xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_k60xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k7100.ppd.gz b/ppd/hpcups/hp-officejet_k7100.ppd.gz Binary files differindex cdeb4749d..be8dc097c 100644 --- a/ppd/hpcups/hp-officejet_k7100.ppd.gz +++ b/ppd/hpcups/hp-officejet_k7100.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k80.ppd.gz b/ppd/hpcups/hp-officejet_k80.ppd.gz Binary files differindex b5d5a37c9..4678fb073 100644 --- a/ppd/hpcups/hp-officejet_k80.ppd.gz +++ b/ppd/hpcups/hp-officejet_k80.ppd.gz diff --git a/ppd/hpcups/hp-officejet_k80xi.ppd.gz b/ppd/hpcups/hp-officejet_k80xi.ppd.gz Binary files differindex 99f44ab8c..ae3cf7560 100644 --- a/ppd/hpcups/hp-officejet_k80xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_k80xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_lx.ppd.gz b/ppd/hpcups/hp-officejet_lx.ppd.gz Binary files differindex 85d39b234..becad124d 100644 --- a/ppd/hpcups/hp-officejet_lx.ppd.gz +++ b/ppd/hpcups/hp-officejet_lx.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz b/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz Binary files differindex 8964802cf..0c58b0c95 100644 --- a/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_1150c.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz Binary files differindex d76792d48..cb5b82d42 100644 --- a/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_1170c_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz Binary files differindex aa3b94872..7f3d27129 100644 --- a/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz Binary files differindex 621f3d023..af5f72878 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz Binary files differindex 8d43ce659..59f8ea0eb 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz Binary files differindex 12907ed48..41ebffff9 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a909n.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz Binary files differindex bd4e1e7e3..a2e9896dd 100644 --- a/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8500_a910.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz Binary files differindex c58c91439..cdd08c9c1 100644 --- a/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k5300.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz b/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz Binary files differindex cfb6d098e..031a02452 100644 --- a/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k5400.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k550.ppd.gz b/ppd/hpcups/hp-officejet_pro_k550.ppd.gz Binary files differindex cedd08c2b..a40d32724 100644 --- a/ppd/hpcups/hp-officejet_pro_k550.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k550.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k850.ppd.gz b/ppd/hpcups/hp-officejet_pro_k850.ppd.gz Binary files differindex 26737133f..2114caa7e 100644 --- a/ppd/hpcups/hp-officejet_pro_k850.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k850.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz b/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz Binary files differindex 60248c563..bd08d8649 100644 --- a/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_k8600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz Binary files differindex cd2767655..080c4c401 100644 --- a/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7300.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz Binary files differindex 4d5f6d31b..642b64726 100644 --- a/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7400.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz Binary files differindex a42f25ce3..8e61175ef 100644 --- a/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7500.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz Binary files differindex 4819566f6..1af5d685a 100644 --- a/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz b/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz Binary files differindex f1dc88412..c638eb04f 100644 --- a/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_l7700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r40.ppd.gz b/ppd/hpcups/hp-officejet_r40.ppd.gz Binary files differindex 986ba8e61..2122eb463 100644 --- a/ppd/hpcups/hp-officejet_r40.ppd.gz +++ b/ppd/hpcups/hp-officejet_r40.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r40xi.ppd.gz b/ppd/hpcups/hp-officejet_r40xi.ppd.gz Binary files differindex c18482130..685c98071 100644 --- a/ppd/hpcups/hp-officejet_r40xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_r40xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r45.ppd.gz b/ppd/hpcups/hp-officejet_r45.ppd.gz Binary files differindex ec3ac269c..bcd067ea0 100644 --- a/ppd/hpcups/hp-officejet_r45.ppd.gz +++ b/ppd/hpcups/hp-officejet_r45.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r60.ppd.gz b/ppd/hpcups/hp-officejet_r60.ppd.gz Binary files differindex 4ba202e20..e61619a60 100644 --- a/ppd/hpcups/hp-officejet_r60.ppd.gz +++ b/ppd/hpcups/hp-officejet_r60.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r65.ppd.gz b/ppd/hpcups/hp-officejet_r65.ppd.gz Binary files differindex 3228ef401..0e1bea159 100644 --- a/ppd/hpcups/hp-officejet_r65.ppd.gz +++ b/ppd/hpcups/hp-officejet_r65.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r80.ppd.gz b/ppd/hpcups/hp-officejet_r80.ppd.gz Binary files differindex d2329bf41..6c2510f07 100644 --- a/ppd/hpcups/hp-officejet_r80.ppd.gz +++ b/ppd/hpcups/hp-officejet_r80.ppd.gz diff --git a/ppd/hpcups/hp-officejet_r80xi.ppd.gz b/ppd/hpcups/hp-officejet_r80xi.ppd.gz Binary files differindex b8dcfb9fb..ce23b9119 100644 --- a/ppd/hpcups/hp-officejet_r80xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_r80xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_300.ppd.gz b/ppd/hpcups/hp-officejet_series_300.ppd.gz Binary files differindex 180c67d97..5ce605a46 100644 --- a/ppd/hpcups/hp-officejet_series_300.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_300.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_310.ppd.gz b/ppd/hpcups/hp-officejet_series_310.ppd.gz Binary files differindex 54bc3a796..6cb8b7e5c 100644 --- a/ppd/hpcups/hp-officejet_series_310.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_310.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_320.ppd.gz b/ppd/hpcups/hp-officejet_series_320.ppd.gz Binary files differindex 1ee23ec10..04429ba40 100644 --- a/ppd/hpcups/hp-officejet_series_320.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_320.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_330.ppd.gz b/ppd/hpcups/hp-officejet_series_330.ppd.gz Binary files differindex 255f6438e..b347566c1 100644 --- a/ppd/hpcups/hp-officejet_series_330.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_330.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_350.ppd.gz b/ppd/hpcups/hp-officejet_series_350.ppd.gz Binary files differindex fd52f93ec..8eece4111 100644 --- a/ppd/hpcups/hp-officejet_series_350.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_350.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_500.ppd.gz b/ppd/hpcups/hp-officejet_series_500.ppd.gz Binary files differindex 1e928aef4..ae207dec6 100644 --- a/ppd/hpcups/hp-officejet_series_500.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_500.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_520.ppd.gz b/ppd/hpcups/hp-officejet_series_520.ppd.gz Binary files differindex cf9e1c3d2..fabaf42e8 100644 --- a/ppd/hpcups/hp-officejet_series_520.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_520.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_570.ppd.gz b/ppd/hpcups/hp-officejet_series_570.ppd.gz Binary files differindex aab3c10a1..4cbea5945 100644 --- a/ppd/hpcups/hp-officejet_series_570.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_570.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_580.ppd.gz b/ppd/hpcups/hp-officejet_series_580.ppd.gz Binary files differindex ded291b81..aa6de2765 100644 --- a/ppd/hpcups/hp-officejet_series_580.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_580.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_590.ppd.gz b/ppd/hpcups/hp-officejet_series_590.ppd.gz Binary files differindex 66266bee5..b646fa4a4 100644 --- a/ppd/hpcups/hp-officejet_series_590.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_590.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_600.ppd.gz b/ppd/hpcups/hp-officejet_series_600.ppd.gz Binary files differindex 1fae7bc36..0efa80bc8 100644 --- a/ppd/hpcups/hp-officejet_series_600.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_610.ppd.gz b/ppd/hpcups/hp-officejet_series_610.ppd.gz Binary files differindex b6ec4b3fb..703dbbb42 100644 --- a/ppd/hpcups/hp-officejet_series_610.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_630.ppd.gz b/ppd/hpcups/hp-officejet_series_630.ppd.gz Binary files differindex 468e7b196..f2e6a4720 100644 --- a/ppd/hpcups/hp-officejet_series_630.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_630.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_700.ppd.gz b/ppd/hpcups/hp-officejet_series_700.ppd.gz Binary files differindex 6a5c76994..0e9209dd5 100644 --- a/ppd/hpcups/hp-officejet_series_700.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_710.ppd.gz b/ppd/hpcups/hp-officejet_series_710.ppd.gz Binary files differindex 66de5e778..8e935a1e4 100644 --- a/ppd/hpcups/hp-officejet_series_710.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_710.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_720.ppd.gz b/ppd/hpcups/hp-officejet_series_720.ppd.gz Binary files differindex 9e588ca5f..b5ae549df 100644 --- a/ppd/hpcups/hp-officejet_series_720.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_720.ppd.gz diff --git a/ppd/hpcups/hp-officejet_series_725.ppd.gz b/ppd/hpcups/hp-officejet_series_725.ppd.gz Binary files differindex 128e420c8..d60bf9446 100644 --- a/ppd/hpcups/hp-officejet_series_725.ppd.gz +++ b/ppd/hpcups/hp-officejet_series_725.ppd.gz diff --git a/ppd/hpcups/hp-officejet_t_series.ppd.gz b/ppd/hpcups/hp-officejet_t_series.ppd.gz Binary files differindex a5891ac86..2e5967a98 100644 --- a/ppd/hpcups/hp-officejet_t_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_t_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v30.ppd.gz b/ppd/hpcups/hp-officejet_v30.ppd.gz Binary files differindex 125945bc3..ae0f9095e 100644 --- a/ppd/hpcups/hp-officejet_v30.ppd.gz +++ b/ppd/hpcups/hp-officejet_v30.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v40.ppd.gz b/ppd/hpcups/hp-officejet_v40.ppd.gz Binary files differindex e5e5dd33e..a66414c6b 100644 --- a/ppd/hpcups/hp-officejet_v40.ppd.gz +++ b/ppd/hpcups/hp-officejet_v40.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v40xi.ppd.gz b/ppd/hpcups/hp-officejet_v40xi.ppd.gz Binary files differindex bf3998c38..e825c0a0f 100644 --- a/ppd/hpcups/hp-officejet_v40xi.ppd.gz +++ b/ppd/hpcups/hp-officejet_v40xi.ppd.gz diff --git a/ppd/hpcups/hp-officejet_v45.ppd.gz b/ppd/hpcups/hp-officejet_v45.ppd.gz Binary files differindex 1dbb28581..0db482f4e 100644 --- a/ppd/hpcups/hp-officejet_v45.ppd.gz +++ b/ppd/hpcups/hp-officejet_v45.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_100.ppd.gz b/ppd/hpcups/hp-photosmart_100.ppd.gz Binary files differindex 1b6e6b767..057b97e0d 100644 --- a/ppd/hpcups/hp-photosmart_100.ppd.gz +++ b/ppd/hpcups/hp-photosmart_100.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1115.ppd.gz b/ppd/hpcups/hp-photosmart_1115.ppd.gz Binary files differindex d8b5ec0dc..95fc6f325 100644 --- a/ppd/hpcups/hp-photosmart_1115.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1115.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1215.ppd.gz b/ppd/hpcups/hp-photosmart_1215.ppd.gz Binary files differindex 9a892b7f3..68faa184a 100644 --- a/ppd/hpcups/hp-photosmart_1215.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1215.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1218.ppd.gz b/ppd/hpcups/hp-photosmart_1218.ppd.gz Binary files differindex c7d0fb978..4d58a79ed 100644 --- a/ppd/hpcups/hp-photosmart_1218.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1218.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_130.ppd.gz b/ppd/hpcups/hp-photosmart_130.ppd.gz Binary files differindex 69f0492a7..371df4465 100644 --- a/ppd/hpcups/hp-photosmart_130.ppd.gz +++ b/ppd/hpcups/hp-photosmart_130.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_1315.ppd.gz b/ppd/hpcups/hp-photosmart_1315.ppd.gz Binary files differindex a8302c34e..c6939d539 100644 --- a/ppd/hpcups/hp-photosmart_1315.ppd.gz +++ b/ppd/hpcups/hp-photosmart_1315.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_140_series.ppd.gz b/ppd/hpcups/hp-photosmart_140_series.ppd.gz Binary files differindex 7b0e53222..229ef4f07 100644 --- a/ppd/hpcups/hp-photosmart_140_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_140_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_230.ppd.gz b/ppd/hpcups/hp-photosmart_230.ppd.gz Binary files differindex 6d3979f4c..828753047 100644 --- a/ppd/hpcups/hp-photosmart_230.ppd.gz +++ b/ppd/hpcups/hp-photosmart_230.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_240_series.ppd.gz b/ppd/hpcups/hp-photosmart_240_series.ppd.gz Binary files differindex 37efe38cf..e70445167 100644 --- a/ppd/hpcups/hp-photosmart_240_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_240_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_2570_series.ppd.gz b/ppd/hpcups/hp-photosmart_2570_series.ppd.gz Binary files differindex caa08d4f4..e3c74cd15 100644 --- a/ppd/hpcups/hp-photosmart_2570_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_2570_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_2600_series.ppd.gz b/ppd/hpcups/hp-photosmart_2600_series.ppd.gz Binary files differindex 6cfff3a07..443be7c53 100644 --- a/ppd/hpcups/hp-photosmart_2600_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_2600_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_2700_series.ppd.gz b/ppd/hpcups/hp-photosmart_2700_series.ppd.gz Binary files differindex 4b8bcfab4..d545f79e5 100644 --- a/ppd/hpcups/hp-photosmart_2700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_2700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_3100_series.ppd.gz b/ppd/hpcups/hp-photosmart_3100_series.ppd.gz Binary files differindex 576ded124..d72e8d841 100644 --- a/ppd/hpcups/hp-photosmart_3100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_3100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_3200_series.ppd.gz b/ppd/hpcups/hp-photosmart_3200_series.ppd.gz Binary files differindex aceeddaf8..d3992d53e 100644 --- a/ppd/hpcups/hp-photosmart_3200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_3200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_320_series.ppd.gz b/ppd/hpcups/hp-photosmart_320_series.ppd.gz Binary files differindex b20813ccb..1f10a5bd9 100644 --- a/ppd/hpcups/hp-photosmart_320_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_320_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_3300_series.ppd.gz b/ppd/hpcups/hp-photosmart_3300_series.ppd.gz Binary files differindex b454c446b..ef28dfb6d 100644 --- a/ppd/hpcups/hp-photosmart_3300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_3300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_330_series.ppd.gz b/ppd/hpcups/hp-photosmart_330_series.ppd.gz Binary files differindex 23fcc2ac4..9f59981d5 100644 --- a/ppd/hpcups/hp-photosmart_330_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_330_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_370_series.ppd.gz b/ppd/hpcups/hp-photosmart_370_series.ppd.gz Binary files differindex 7443b2942..064bb932d 100644 --- a/ppd/hpcups/hp-photosmart_370_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_370_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_380_series.ppd.gz b/ppd/hpcups/hp-photosmart_380_series.ppd.gz Binary files differindex 95a034e0d..cabb9a546 100644 --- a/ppd/hpcups/hp-photosmart_380_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_380_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_420_series.ppd.gz b/ppd/hpcups/hp-photosmart_420_series.ppd.gz Binary files differindex 9c88c0210..f309c396f 100644 --- a/ppd/hpcups/hp-photosmart_420_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_420_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_470_series.ppd.gz b/ppd/hpcups/hp-photosmart_470_series.ppd.gz Binary files differindex 5601440d7..4e6b3aeb0 100644 --- a/ppd/hpcups/hp-photosmart_470_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_470_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7150.ppd.gz b/ppd/hpcups/hp-photosmart_7150.ppd.gz Binary files differindex 86845ea8b..7237f7f2d 100644 --- a/ppd/hpcups/hp-photosmart_7150.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7150.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz Binary files differindex 97b4001f5..b6948c1a7 100644 --- a/ppd/hpcups/hp-photosmart_7200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7345.ppd.gz b/ppd/hpcups/hp-photosmart_7345.ppd.gz Binary files differindex d58047733..37303ba09 100644 --- a/ppd/hpcups/hp-photosmart_7345.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7345.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7350.ppd.gz b/ppd/hpcups/hp-photosmart_7350.ppd.gz Binary files differindex ce9bb7967..fa14a326e 100644 --- a/ppd/hpcups/hp-photosmart_7350.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7350.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz Binary files differindex 1668cc7e5..b93e506ce 100644 --- a/ppd/hpcups/hp-photosmart_7400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7550.ppd.gz b/ppd/hpcups/hp-photosmart_7550.ppd.gz Binary files differindex 24e8d7211..c84a52cf4 100644 --- a/ppd/hpcups/hp-photosmart_7550.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7550.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7600_series.ppd.gz b/ppd/hpcups/hp-photosmart_7600_series.ppd.gz Binary files differindex a186adeaa..036addbd8 100644 --- a/ppd/hpcups/hp-photosmart_7600_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7600_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7700_series.ppd.gz b/ppd/hpcups/hp-photosmart_7700_series.ppd.gz Binary files differindex f9a257c4f..cdb94caf8 100644 --- a/ppd/hpcups/hp-photosmart_7700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7800_series.ppd.gz b/ppd/hpcups/hp-photosmart_7800_series.ppd.gz Binary files differindex 4f4c77f4a..55488aea1 100644 --- a/ppd/hpcups/hp-photosmart_7800_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7800_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7900_series.ppd.gz b/ppd/hpcups/hp-photosmart_7900_series.ppd.gz Binary files differindex 959170819..a612fd19d 100644 --- a/ppd/hpcups/hp-photosmart_7900_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7900_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8000_series.ppd.gz b/ppd/hpcups/hp-photosmart_8000_series.ppd.gz Binary files differindex c19b352bf..b89646c54 100644 --- a/ppd/hpcups/hp-photosmart_8000_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8000_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8100_series.ppd.gz b/ppd/hpcups/hp-photosmart_8100_series.ppd.gz Binary files differindex c86fa3e6f..14fc94755 100644 --- a/ppd/hpcups/hp-photosmart_8100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8200_series.ppd.gz b/ppd/hpcups/hp-photosmart_8200_series.ppd.gz Binary files differindex ffa6ab18a..06593723c 100644 --- a/ppd/hpcups/hp-photosmart_8200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8400_series.ppd.gz b/ppd/hpcups/hp-photosmart_8400_series.ppd.gz Binary files differindex dd3614f9f..972d6b363 100644 --- a/ppd/hpcups/hp-photosmart_8400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_8700_series.ppd.gz b/ppd/hpcups/hp-photosmart_8700_series.ppd.gz Binary files differindex 19ac48a05..c903d0e63 100644 --- a/ppd/hpcups/hp-photosmart_8700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_8700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a310_series.ppd.gz b/ppd/hpcups/hp-photosmart_a310_series.ppd.gz Binary files differindex ed0585441..a39b3472a 100644 --- a/ppd/hpcups/hp-photosmart_a310_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a310_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a320_series.ppd.gz b/ppd/hpcups/hp-photosmart_a320_series.ppd.gz Binary files differindex 34809792e..0170ab7c5 100644 --- a/ppd/hpcups/hp-photosmart_a320_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a320_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a430_series.ppd.gz b/ppd/hpcups/hp-photosmart_a430_series.ppd.gz Binary files differindex 1afa9a344..c7c965dc2 100644 --- a/ppd/hpcups/hp-photosmart_a430_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a430_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a440_series.ppd.gz b/ppd/hpcups/hp-photosmart_a440_series.ppd.gz Binary files differindex e5e5d1e9c..ddd7a11d7 100644 --- a/ppd/hpcups/hp-photosmart_a440_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a440_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a510_series.ppd.gz b/ppd/hpcups/hp-photosmart_a510_series.ppd.gz Binary files differindex b5fa39fa3..4daaaf03e 100644 --- a/ppd/hpcups/hp-photosmart_a510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a520_series.ppd.gz b/ppd/hpcups/hp-photosmart_a520_series.ppd.gz Binary files differindex ea3174d57..dcd3dc4f4 100644 --- a/ppd/hpcups/hp-photosmart_a520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a530_series.ppd.gz b/ppd/hpcups/hp-photosmart_a530_series.ppd.gz Binary files differindex 351a0203b..aca2e711a 100644 --- a/ppd/hpcups/hp-photosmart_a530_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a530_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a610_series.ppd.gz b/ppd/hpcups/hp-photosmart_a610_series.ppd.gz Binary files differindex e04fa07b3..bf50f336c 100644 --- a/ppd/hpcups/hp-photosmart_a610_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a610_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a620_series.ppd.gz b/ppd/hpcups/hp-photosmart_a620_series.ppd.gz Binary files differindex 42b44c221..cf7ddff90 100644 --- a/ppd/hpcups/hp-photosmart_a620_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a620_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a630_series.ppd.gz b/ppd/hpcups/hp-photosmart_a630_series.ppd.gz Binary files differindex 7b8bc99d5..4738bb8f5 100644 --- a/ppd/hpcups/hp-photosmart_a630_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a630_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a640_series.ppd.gz b/ppd/hpcups/hp-photosmart_a640_series.ppd.gz Binary files differindex 52090cd73..f4a3570c5 100644 --- a/ppd/hpcups/hp-photosmart_a640_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a640_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a710_series.ppd.gz b/ppd/hpcups/hp-photosmart_a710_series.ppd.gz Binary files differindex 40ab8d4e3..90dc17114 100644 --- a/ppd/hpcups/hp-photosmart_a710_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a710_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_a820_series.ppd.gz b/ppd/hpcups/hp-photosmart_a820_series.ppd.gz Binary files differindex 56d644a92..8addbb391 100644 --- a/ppd/hpcups/hp-photosmart_a820_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_a820_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz Binary files differindex 50d05cfaf..2d0b246d5 100644 --- a/ppd/hpcups/hp-photosmart_b010_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b010_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz b/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz Binary files differindex 91c479206..5d62d6a4e 100644 --- a/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b109a-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz Binary files differindex 3553038d4..1f2297784 100644 --- a/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz Binary files differindex 25bffba60..ecda3aaab 100644 --- a/ppd/hpcups/hp-photosmart_b110_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b110_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz Binary files differindex e85234f25..e2fe15af9 100644 --- a/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_b8500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz b/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz Binary files differindex 9b9423d66..dd8af7dbb 100644 --- a/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c309a_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz Binary files differindex 88fad9f1d..d6b156199 100644 --- a/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c3100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz Binary files differindex 475e99dbf..5b090478c 100644 --- a/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz Binary files differindex 04fd72014..02cc037a1 100644 --- a/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz Binary files differindex e568715ea..779d85615 100644 --- a/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4340_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz Binary files differindex b0a6cbc3a..82d64c40f 100644 --- a/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4380_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz Binary files differindex c058893e8..4afb360e0 100644 --- a/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz Binary files differindex 422fe81e8..a11b2f14b 100644 --- a/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz Binary files differindex 631f83e23..6142d44bc 100644 --- a/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4600_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz b/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz Binary files differindex 54bf42b80..0242647ca 100644 --- a/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c4700_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz Binary files differindex 9d820f04b..ed71e03af 100644 --- a/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz Binary files differindex deb6a91dc..693f8050d 100644 --- a/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz Binary files differindex cca0b8a17..37fa2aba3 100644 --- a/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz b/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz Binary files differindex 9630876b7..9965cbb91 100644 --- a/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c5500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz Binary files differindex ee46f0754..e74199473 100644 --- a/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c6100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz Binary files differindex 0ba755884..8f1639e9a 100644 --- a/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c6200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz b/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz Binary files differindex d8fb5ed23..02a9dfa15 100644 --- a/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c6300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz Binary files differindex 0602fcc80..451ae3e19 100644 --- a/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c7100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz Binary files differindex 33249e3f7..4e621f0a0 100644 --- a/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c7200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz b/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz Binary files differindex 615f9f496..06f36cbea 100644 --- a/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_c8100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz Binary files differindex e0ac2195b..8203360f5 100644 --- a/ppd/hpcups/hp-photosmart_d110_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d110_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz Binary files differindex 01249b5b1..ac684012d 100644 --- a/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5060_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz Binary files differindex a9915e17e..c3b59e74a 100644 --- a/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz Binary files differindex ed7f6949d..3f6579737 100644 --- a/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz b/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz Binary files differindex cb2828100..d89b90c0e 100644 --- a/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d5400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz Binary files differindex 3d1b39ec4..175853716 100644 --- a/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d6100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz Binary files differindex ed78fdf62..07a54fccf 100644 --- a/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7100_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz Binary files differindex 09c7664e9..72c37f404 100644 --- a/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7200_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz Binary files differindex 24366c819..5847c7e35 100644 --- a/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz Binary files differindex 79fe102e4..0f5f70ccd 100644 --- a/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7400_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz b/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz Binary files differindex 5fa7d62c0..6a082cd6e 100644 --- a/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_d7500_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz Binary files differindex e69e94af6..972073ade 100644 --- a/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_estn_c510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz Binary files differnew file mode 100644 index 000000000..1be8e0232 --- /dev/null +++ b/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_p1000.ppd.gz b/ppd/hpcups/hp-photosmart_p1000.ppd.gz Binary files differindex 4296fd71f..4ee805c37 100644 --- a/ppd/hpcups/hp-photosmart_p1000.ppd.gz +++ b/ppd/hpcups/hp-photosmart_p1000.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_p1100.ppd.gz b/ppd/hpcups/hp-photosmart_p1100.ppd.gz Binary files differindex f7ffce365..ee6fcd4c5 100644 --- a/ppd/hpcups/hp-photosmart_p1100.ppd.gz +++ b/ppd/hpcups/hp-photosmart_p1100.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz b/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz Binary files differindex 467627620..967f15faa 100644 --- a/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_plus_b209a-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz Binary files differindex e837e9489..d78e94777 100644 --- a/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_plus_b210_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz Binary files differindex 3cc1b5cc4..40c6ff2b9 100644 --- a/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem-web_c309n-s.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz Binary files differindex 5121096f8..090b7f902 100644 --- a/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem_c310_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz Binary files differindex 61d5fdc28..f4b058800 100644 --- a/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_prem_c410_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz Binary files differindex faf08f997..a916ddebd 100644 --- a/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz +++ b/ppd/hpcups/hp-photosmart_premium_c309g-m.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz b/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz Binary files differindex a6ee97a54..ba6443fe2 100644 --- a/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_pro_b8300_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz b/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz Binary files differindex 375ab0d90..8305e2705 100644 --- a/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_pro_b8800_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz b/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz Binary files differindex 5d15a0452..50807610a 100644 --- a/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz +++ b/ppd/hpcups/hp-photosmart_wireless_b109n-z.ppd.gz diff --git a/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz b/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz Binary files differindex 8ed6237cc..cc77f4206 100644 --- a/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz +++ b/ppd/hpcups/hp-printer_scanner_copier_300.ppd.gz diff --git a/ppd/hpcups/hp-psc_1000_series.ppd.gz b/ppd/hpcups/hp-psc_1000_series.ppd.gz Binary files differindex 572821617..ebca1d8b2 100644 --- a/ppd/hpcups/hp-psc_1000_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1000_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1100_series.ppd.gz b/ppd/hpcups/hp-psc_1100_series.ppd.gz Binary files differindex 960c56153..2e3bbaaf7 100644 --- a/ppd/hpcups/hp-psc_1100_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1100_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1200_series.ppd.gz b/ppd/hpcups/hp-psc_1200_series.ppd.gz Binary files differindex 0b4717f7e..4132b848a 100644 --- a/ppd/hpcups/hp-psc_1200_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1200_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1300_series.ppd.gz b/ppd/hpcups/hp-psc_1300_series.ppd.gz Binary files differindex 78c8e3474..02cc3ec2a 100644 --- a/ppd/hpcups/hp-psc_1300_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1300_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1310_series.ppd.gz b/ppd/hpcups/hp-psc_1310_series.ppd.gz Binary files differindex 985620f77..b0cb9fd1b 100644 --- a/ppd/hpcups/hp-psc_1310_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1310_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1358_series.ppd.gz b/ppd/hpcups/hp-psc_1358_series.ppd.gz Binary files differindex 409231fdd..c9053b4fd 100644 --- a/ppd/hpcups/hp-psc_1358_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1358_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1400_series.ppd.gz b/ppd/hpcups/hp-psc_1400_series.ppd.gz Binary files differindex 2de5de5d4..0e25ec3c7 100644 --- a/ppd/hpcups/hp-psc_1400_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1400_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1500_series.ppd.gz b/ppd/hpcups/hp-psc_1500_series.ppd.gz Binary files differindex 28eb596fe..7d761d17b 100644 --- a/ppd/hpcups/hp-psc_1500_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1500_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1510_series.ppd.gz b/ppd/hpcups/hp-psc_1510_series.ppd.gz Binary files differindex 7c8db9d25..8eb0c4a56 100644 --- a/ppd/hpcups/hp-psc_1510_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1510_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_1600_series.ppd.gz b/ppd/hpcups/hp-psc_1600_series.ppd.gz Binary files differindex 1eb9437cc..21c0017c9 100644 --- a/ppd/hpcups/hp-psc_1600_series.ppd.gz +++ b/ppd/hpcups/hp-psc_1600_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2100_series.ppd.gz b/ppd/hpcups/hp-psc_2100_series.ppd.gz Binary files differindex ab98e9c1c..b6285b62c 100644 --- a/ppd/hpcups/hp-psc_2100_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2100_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2150_series.ppd.gz b/ppd/hpcups/hp-psc_2150_series.ppd.gz Binary files differindex 60f5fdda6..37fbeb9de 100644 --- a/ppd/hpcups/hp-psc_2150_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2150_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2170_series.ppd.gz b/ppd/hpcups/hp-psc_2170_series.ppd.gz Binary files differindex 01e71edc3..edf7499ca 100644 --- a/ppd/hpcups/hp-psc_2170_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2170_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2200_series.ppd.gz b/ppd/hpcups/hp-psc_2200_series.ppd.gz Binary files differindex aecd4330b..90a47ccd3 100644 --- a/ppd/hpcups/hp-psc_2200_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2200_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2210_series.ppd.gz b/ppd/hpcups/hp-psc_2210_series.ppd.gz Binary files differindex 909a25e36..8847d9eb8 100644 --- a/ppd/hpcups/hp-psc_2210_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2210_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2300_series.ppd.gz b/ppd/hpcups/hp-psc_2300_series.ppd.gz Binary files differindex d1e249db9..5f5ed1056 100644 --- a/ppd/hpcups/hp-psc_2300_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2300_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2350_series.ppd.gz b/ppd/hpcups/hp-psc_2350_series.ppd.gz Binary files differindex e2c393ac7..1e7fcb1f0 100644 --- a/ppd/hpcups/hp-psc_2350_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2350_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2400_series.ppd.gz b/ppd/hpcups/hp-psc_2400_series.ppd.gz Binary files differindex ee765a477..30652ef5d 100644 --- a/ppd/hpcups/hp-psc_2400_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2400_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_2500_series.ppd.gz b/ppd/hpcups/hp-psc_2500_series.ppd.gz Binary files differindex 182e2499f..70cec6cf0 100644 --- a/ppd/hpcups/hp-psc_2500_series.ppd.gz +++ b/ppd/hpcups/hp-psc_2500_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_500.ppd.gz b/ppd/hpcups/hp-psc_500.ppd.gz Binary files differindex 220754bb5..c2749b92d 100644 --- a/ppd/hpcups/hp-psc_500.ppd.gz +++ b/ppd/hpcups/hp-psc_500.ppd.gz diff --git a/ppd/hpcups/hp-psc_720.ppd.gz b/ppd/hpcups/hp-psc_720.ppd.gz Binary files differindex 2f9714f36..77a44a9a9 100644 --- a/ppd/hpcups/hp-psc_720.ppd.gz +++ b/ppd/hpcups/hp-psc_720.ppd.gz diff --git a/ppd/hpcups/hp-psc_750.ppd.gz b/ppd/hpcups/hp-psc_750.ppd.gz Binary files differindex dc5f542bc..3a0173949 100644 --- a/ppd/hpcups/hp-psc_750.ppd.gz +++ b/ppd/hpcups/hp-psc_750.ppd.gz diff --git a/ppd/hpcups/hp-psc_750xi.ppd.gz b/ppd/hpcups/hp-psc_750xi.ppd.gz Binary files differindex 02bb431db..91fa14543 100644 --- a/ppd/hpcups/hp-psc_750xi.ppd.gz +++ b/ppd/hpcups/hp-psc_750xi.ppd.gz diff --git a/ppd/hpcups/hp-psc_760.ppd.gz b/ppd/hpcups/hp-psc_760.ppd.gz Binary files differindex d7f81cb8c..e97c62ed6 100644 --- a/ppd/hpcups/hp-psc_760.ppd.gz +++ b/ppd/hpcups/hp-psc_760.ppd.gz diff --git a/ppd/hpcups/hp-psc_780.ppd.gz b/ppd/hpcups/hp-psc_780.ppd.gz Binary files differindex f6fd4bb8a..bf7db1fe1 100644 --- a/ppd/hpcups/hp-psc_780.ppd.gz +++ b/ppd/hpcups/hp-psc_780.ppd.gz diff --git a/ppd/hpcups/hp-psc_780xi.ppd.gz b/ppd/hpcups/hp-psc_780xi.ppd.gz Binary files differindex 407dadc5f..d77d99ceb 100644 --- a/ppd/hpcups/hp-psc_780xi.ppd.gz +++ b/ppd/hpcups/hp-psc_780xi.ppd.gz diff --git a/ppd/hpcups/hp-psc_900_series.ppd.gz b/ppd/hpcups/hp-psc_900_series.ppd.gz Binary files differindex a7c94f270..59cfbb6c0 100644 --- a/ppd/hpcups/hp-psc_900_series.ppd.gz +++ b/ppd/hpcups/hp-psc_900_series.ppd.gz diff --git a/ppd/hpcups/hp-psc_920.ppd.gz b/ppd/hpcups/hp-psc_920.ppd.gz Binary files differindex 88407859a..1ffb30af3 100644 --- a/ppd/hpcups/hp-psc_920.ppd.gz +++ b/ppd/hpcups/hp-psc_920.ppd.gz diff --git a/ppd/hpcups/hp-psc_950.ppd.gz b/ppd/hpcups/hp-psc_950.ppd.gz Binary files differindex 375608d13..f047e9341 100644 --- a/ppd/hpcups/hp-psc_950.ppd.gz +++ b/ppd/hpcups/hp-psc_950.ppd.gz diff --git a/ppd/hpcups/hp-psc_950vr.ppd.gz b/ppd/hpcups/hp-psc_950vr.ppd.gz Binary files differindex 1071d8a66..44ee41d0f 100644 --- a/ppd/hpcups/hp-psc_950vr.ppd.gz +++ b/ppd/hpcups/hp-psc_950vr.ppd.gz diff --git a/ppd/hpcups/hp-psc_950xi.ppd.gz b/ppd/hpcups/hp-psc_950xi.ppd.gz Binary files differindex b2aede982..236af1773 100644 --- a/ppd/hpcups/hp-psc_950xi.ppd.gz +++ b/ppd/hpcups/hp-psc_950xi.ppd.gz diff --git a/ppd/hpijs/hp-2000c-hpijs.ppd.gz b/ppd/hpijs/hp-2000c-hpijs.ppd.gz Binary files differindex eb7eaab20..749b41327 100644 --- a/ppd/hpijs/hp-2000c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-2000c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-2500c-hpijs.ppd.gz b/ppd/hpijs/hp-2500c-hpijs.ppd.gz Binary files differindex b651229a5..91458646d 100644 --- a/ppd/hpijs/hp-2500c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-2500c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-910-hpijs.ppd.gz b/ppd/hpijs/hp-910-hpijs.ppd.gz Binary files differindex ed5dd1934..59dfe15a6 100644 --- a/ppd/hpijs/hp-910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-915-hpijs.ppd.gz b/ppd/hpijs/hp-915-hpijs.ppd.gz Binary files differindex 29a1dd868..990d4c805 100644 --- a/ppd/hpijs/hp-915-hpijs.ppd.gz +++ b/ppd/hpijs/hp-915-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz Binary files differindex afcacc91d..2e14025e9 100644 --- a/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz Binary files differindex d565962ce..870893e84 100644 --- a/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz Binary files differindex 0b05429f5..5f6d95540 100644 --- a/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_1200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz Binary files differindex 44c0a820c..c374f3156 100644 --- a/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz b/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz Binary files differindex 90a2cb9c1..8c3472de4 100644 --- a/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2230-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz Binary files differindex 04b3f1969..fd527bc22 100644 --- a/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz Binary files differindex ee5abad1f..243b0b656 100644 --- a/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz Binary files differindex 1d24dbd7a..a36078505 100644 --- a/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz Binary files differindex d5c0ec6c5..b303c8fa8 100644 --- a/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz Binary files differindex d771ef485..2188dcbc6 100644 --- a/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz Binary files differindex 5924b0153..6de22012f 100644 --- a/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz b/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz Binary files differindex 7b48027dc..30188bb15 100644 --- a/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_inkjet_cp1700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz b/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz Binary files differindex a88e7093e..b5ad00cfc 100644 --- a/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz Binary files differindex 2a36532cb..fe7de382e 100644 --- a/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_1600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz Binary files differindex 27aaeb37b..d3a642eb8 100644 --- a/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz Binary files differindex 0545f41aa..c11c9bdc4 100644 --- a/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz Binary files differindex 885b4f133..538f25531 100644 --- a/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_2600n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz Binary files differindex 3234fe438..11ccbf15f 100644 --- a/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz Binary files differindex 31cf30f16..4c816d749 100644 --- a/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz Binary files differindex c079bca4f..677e24f71 100644 --- a/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3500n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz Binary files differindex 95b970ce3..f276bc055 100644 --- a/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz Binary files differindex 1ddad7212..3926143b8 100644 --- a/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3550n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz Binary files differindex 02a620280..7b6a3dce2 100644 --- a/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz Binary files differindex 08d9b9d47..2e9153e51 100644 --- a/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz Binary files differindex 4be2eeebc..f3f2a9fcc 100644 --- a/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3700n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz Binary files differindex 136a0e516..02eb8100e 100644 --- a/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz Binary files differindex 45c69d713..9c4e70c62 100644 --- a/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz Binary files differindex 9b39a3864..a394085e9 100644 --- a/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz Binary files differindex 3cd9a67fb..6cb857b1a 100644 --- a/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz Binary files differindex ad3d98e50..fa7d383ef 100644 --- a/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz Binary files differindex 0e0e48f5a..3b75c8c32 100644 --- a/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz Binary files differindex 386266182..59195279b 100644 --- a/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz Binary files differindex d5186bdcb..73b3d5148 100644 --- a/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz Binary files differindex cf40adb7f..bffeaa344 100644 --- a/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz Binary files differindex 6bc30647b..3f76a7b8c 100644 --- a/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz Binary files differindex f943a2a7d..1a97d044b 100644 --- a/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz Binary files differindex d1fc55efc..23cf97e4c 100644 --- a/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz Binary files differindex 1e8b638d3..f44dc4790 100644 --- a/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz Binary files differindex 8c4cfb95d..fce1c1512 100644 --- a/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz Binary files differindex f788a55f1..a87df12fa 100644 --- a/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz Binary files differindex 716457547..44515b69b 100644 --- a/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz Binary files differindex 3fee66ec9..19be5b26c 100644 --- a/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz Binary files differindex a623fb804..2fcf3d8a4 100644 --- a/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz Binary files differindex 3ed4f10f9..34716f55e 100644 --- a/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz Binary files differindex 3f48fdbc6..bd0b4ced3 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz Binary files differindex d8e941d85..2dbfe8bf2 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz Binary files differindex c9dfd78c1..8a82b97ed 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz Binary files differindex bb7a3e4ff..9733f7fcf 100644 --- a/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz Binary files differindex 4905e08c9..6baf39e6e 100644 --- a/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..fffe09ca6 --- /dev/null +++ b/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz Binary files differindex 794761b30..ef953df71 100644 --- a/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz Binary files differindex 1a93d10cc..8f94ffa63 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz Binary files differindex e9c2294f9..ea09da2b4 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz Binary files differindex be50035f9..cf1b17dc8 100644 --- a/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz Binary files differindex e2f801853..e4cd81258 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1215-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz Binary files differindex a676f643a..a66a50744 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz Binary files differindex 09272500d..34c22b1e2 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz Binary files differindex ec8e41215..0bc2330cb 100644 --- a/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz Binary files differindex 518e873e4..47cbffe68 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz Binary files differindex 59e524485..f23b12992 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz Binary files differindex 1d3b01430..1d33272b8 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz Binary files differindex 9aa434fd3..c3e455d8b 100644 --- a/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz Binary files differindex 722a81fbb..0d09d3ab0 100644 --- a/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz Binary files differindex 0184c7196..bf58ff5d5 100644 --- a/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz Binary files differindex ec5d31212..22e36006b 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz Binary files differindex 451dc6c77..ac3ad37fa 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz Binary files differindex 6b594437d..5757fe2d1 100644 --- a/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz Binary files differindex 81931ea00..1f4ee55cd 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz Binary files differindex 8abf7ca81..c57ed39a1 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz Binary files differindex d6731a43b..0b3ed80b0 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..66e34d0e6 --- /dev/null +++ b/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz Binary files differindex 1194a1503..09d132f47 100644 --- a/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-cp1160-hpijs.ppd.gz b/ppd/hpijs/hp-cp1160-hpijs.ppd.gz Binary files differindex d7f295866..275161a5f 100644 --- a/ppd/hpijs/hp-cp1160-hpijs.ppd.gz +++ b/ppd/hpijs/hp-cp1160-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz Binary files differindex 54c2c3829..ae8e98750 100644 --- a/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1000_j110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz Binary files differindex b9c8ad5d8..90de6fb09 100644 --- a/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1050_j410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz Binary files differindex a92538828..ba7aeebc4 100644 --- a/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz Binary files differindex a6d9dbc23..4c72cf7f6 100644 --- a/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1120-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz Binary files differindex 33a9aeb5d..ab2d9ac4a 100644 --- a/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1125-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz Binary files differindex 1b4385246..e39e3cb26 100644 --- a/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1200c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz Binary files differindex 14766612f..cba4a84e4 100644 --- a/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1220c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz Binary files differindex f25c6fe05..ddfb67867 100644 --- a/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1280-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz Binary files differindex d2027a716..22132f653 100644 --- a/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz Binary files differindex d1bcac917..8446fcabb 100644 --- a/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz Binary files differindex f5885e959..fdcb2a113 100644 --- a/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_1600cn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz Binary files differindex 5423f3d9b..574168a43 100644 --- a/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2000_j210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz Binary files differindex dc22f379d..d968a3ee4 100644 --- a/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_2050_j510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz Binary files differindex 9b3158591..61290497e 100644 --- a/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3000_j310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz Binary files differindex 06534d597..b02363ba3 100644 --- a/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3050_j610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz Binary files differindex c805764a3..ec6820b24 100644 --- a/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz Binary files differindex 6bf977b7b..b74369853 100644 --- a/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3325-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz Binary files differindex 9085fc8e5..324c2f128 100644 --- a/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3420-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz Binary files differindex 30d974ade..3dfd91b2d 100644 --- a/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3425-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz Binary files differindex 6eaf77ef8..deef49b9c 100644 --- a/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3450-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz Binary files differindex a6e8143bb..dacb15d03 100644 --- a/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz Binary files differindex 40ce0f914..326d46786 100644 --- a/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz Binary files differindex 56a69d7d2..031be7493 100644 --- a/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz Binary files differindex b41b7e3ea..3adef8cc1 100644 --- a/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3650-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz Binary files differindex 0555835c2..d8fc0d867 100644 --- a/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3740-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz Binary files differindex 063bd25a7..b86e71dd0 100644 --- a/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3810-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz Binary files differindex 92fb903e9..dc9206acd 100644 --- a/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3816-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz Binary files differindex c624b9124..c5f4e14c9 100644 --- a/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3819-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz Binary files differindex c5de90aab..c0f70669c 100644 --- a/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3820-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz Binary files differindex 820fa6245..f54dbc46f 100644 --- a/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz Binary files differindex fe3c9f09d..2d88a11a3 100644 --- a/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3840-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz Binary files differindex d33de97f1..47e49ac33 100644 --- a/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3870-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz Binary files differindex b71df499d..cb943370c 100644 --- a/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz Binary files differindex 489a89a8c..8bd8facc1 100644 --- a/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz Binary files differindex 99d8c1be2..4b7e3e21e 100644 --- a/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3920-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz Binary files differindex e04458bdb..974c3dd7d 100644 --- a/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3940-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz Binary files differindex 48c664c69..4eed01c37 100644 --- a/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz Binary files differindex ecdb802f2..7da9c790c 100644 --- a/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_400l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz Binary files differindex 6a0aa9898..671ab2699 100644 --- a/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_460-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz Binary files differindex e26ad95c1..093bf2880 100644 --- a/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz Binary files differindex c67955a33..b006a9615 100644 --- a/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_500c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz Binary files differindex 0a668251b..9055f932b 100644 --- a/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_505j-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz Binary files differindex ea906a7e6..e8340baf1 100644 --- a/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_510-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz Binary files differindex 9368750ad..5b75753da 100644 --- a/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz Binary files differindex bcd91ab93..f769543bb 100644 --- a/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_520-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz Binary files differindex 3a9cdb6b8..16f415813 100644 --- a/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz Binary files differindex bf44ba3a7..c2a678020 100644 --- a/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz Binary files differindex 33f481bd1..65669fa5d 100644 --- a/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_550c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz Binary files differindex f1350b41e..83b198a2c 100644 --- a/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz Binary files differindex 2fb565c26..3d5f720e4 100644 --- a/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5551-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz Binary files differindex 2030778d8..60429a365 100644 --- a/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5552-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz Binary files differindex aa0761b21..45a7e7287 100644 --- a/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz Binary files differindex a1b85dfa2..93a6d0920 100644 --- a/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5650-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz Binary files differindex b9f3ea0bc..a249e1a2f 100644 --- a/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz Binary files differindex 854fa9a4f..384e35b1f 100644 --- a/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz Binary files differindex 2a7980ae1..cdb71c9a3 100644 --- a/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz Binary files differindex bb39ff663..d8a76580d 100644 --- a/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5850-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz Binary files differindex 4e398a90e..4d8fb920b 100644 --- a/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_5900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz Binary files differindex 2a835f6b4..ad3faaca5 100644 --- a/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz Binary files differindex 4d6834a7c..99d3cecd9 100644 --- a/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz Binary files differindex c4f94fe19..b81bf02d0 100644 --- a/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_610cl-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz Binary files differindex 53fe0ac4d..95bf2e427 100644 --- a/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6120-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz Binary files differindex a26efc026..927e07089 100644 --- a/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6122-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz Binary files differindex 8ee502f50..8ddaad2cb 100644 --- a/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6127-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz Binary files differindex bc153eb56..82d822166 100644 --- a/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_612c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz Binary files differindex d18435160..f78ad0e44 100644 --- a/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_630c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz Binary files differindex aa9733af1..315ccabd9 100644 --- a/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_632c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz Binary files differindex c623817ed..2b2a3166b 100644 --- a/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_640c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz Binary files differindex fe6ae53ad..e13ca452f 100644 --- a/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_648c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz Binary files differindex c5b975b43..605e9f6bb 100644 --- a/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz Binary files differindex f8193e29a..f882f8cef 100644 --- a/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz Binary files differindex 6b44a3742..ff81a3ce9 100644 --- a/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_660-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz Binary files differindex cd59cdf0b..5a3b30272 100644 --- a/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz Binary files differindex d25591e0a..b510af1c1 100644 --- a/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz Binary files differindex d198b1b32..ce271d5a5 100644 --- a/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz Binary files differindex 83e51c566..8adb39dd8 100644 --- a/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_670tv-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz Binary files differindex bd550b88f..e350d1b7d 100644 --- a/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_672c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz Binary files differindex a4975240f..333a5721c 100644 --- a/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_680-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz Binary files differindex 4aba0e3ee..8c79bd2c4 100644 --- a/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz Binary files differindex 4776a9cfc..d8a5bf943 100644 --- a/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_682-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz Binary files differindex 55300f956..60296b051 100644 --- a/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_690-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz Binary files differindex 89063a2ea..c09162488 100644 --- a/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_690c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz Binary files differindex ae82cc4f8..fad780a96 100644 --- a/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_692-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz Binary files differindex 523ad577a..73c382d5e 100644 --- a/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_693-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz Binary files differindex f242f13d9..eeef4e03f 100644 --- a/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_694-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz Binary files differindex eef137f14..e5044040c 100644 --- a/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6940_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz Binary files differindex d2644cc85..3e55d14b7 100644 --- a/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_695-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz Binary files differindex a301f3b7e..d75f1a13f 100644 --- a/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_697-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz Binary files differindex 363d21bd4..8b74fa2dd 100644 --- a/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_6980_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz Binary files differindex a137b5126..eade07d37 100644 --- a/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_810c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz Binary files differindex 582e313b5..aaa612dbc 100644 --- a/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz Binary files differindex 43115e24c..1ad5bb3fb 100644 --- a/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz Binary files differindex f1eadad48..56af7184a 100644 --- a/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_816c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz Binary files differindex 6d327696d..b0dda1e4e 100644 --- a/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_825c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz Binary files differindex d3b34faa2..89b797fad 100644 --- a/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz Binary files differindex a73619edd..fd7d2108b 100644 --- a/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_832c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz Binary files differindex 39f74ad6f..b952c3c16 100644 --- a/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_840c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz Binary files differindex f47aa24cf..f57192f49 100644 --- a/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_841c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz Binary files differindex dbd2b8166..c659bee61 100644 --- a/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_842c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz Binary files differindex b84fde52f..cba1e3f3e 100644 --- a/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz Binary files differindex a095ac4c1..85f0b4fec 100644 --- a/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_845c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz Binary files differindex 6850647a4..cf53ce251 100644 --- a/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_850c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz Binary files differindex 4c217f359..c78469f2d 100644 --- a/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_855c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz Binary files differindex 1862c0d24..30ecec461 100644 --- a/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_870c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz Binary files differindex 94c625426..801f4774e 100644 --- a/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_880c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz Binary files differindex a369ed729..a20efcb42 100644 --- a/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz Binary files differindex 13b47ecee..d1fc48c5e 100644 --- a/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_890c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz Binary files differindex 8f7ca84e5..8f441c907 100644 --- a/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_895c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz Binary files differindex e329a55e5..db3c22501 100644 --- a/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_916c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz Binary files differindex 10340147d..27de9a21c 100644 --- a/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_920c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz Binary files differindex 6a97cba97..e981b1943 100644 --- a/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz Binary files differindex aa65f6d11..d1fa4504f 100644 --- a/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz Binary files differindex e62a68b22..2ae9914d5 100644 --- a/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_932c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz Binary files differindex 7b6c38c9b..b6ecef1ad 100644 --- a/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_933c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz Binary files differindex 6e22a3b96..45ee77bfa 100644 --- a/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_934c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz Binary files differindex 76a622534..246da2c00 100644 --- a/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_935c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz Binary files differindex 93a8f2233..5d150a0c8 100644 --- a/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_940c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz Binary files differindex 3205d9b45..324f7d520 100644 --- a/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_948c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz Binary files differindex 8a62c6e9a..c334058a3 100644 --- a/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_950c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz Binary files differindex c9f15d176..5d5595d3f 100644 --- a/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_952c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz Binary files differindex dcaf56451..b576ef290 100644 --- a/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_955c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz Binary files differindex 1ac99b0a8..68fe19ced 100644 --- a/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_957c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz Binary files differindex 9ecde535b..894b0aa4d 100644 --- a/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_959c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz Binary files differindex e8778697e..f37922739 100644 --- a/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz Binary files differindex 96748d471..44b4e7a64 100644 --- a/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_960c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz Binary files differindex 885d0bea1..3fda11d28 100644 --- a/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_970c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz Binary files differindex 4cca10e57..0fe602193 100644 --- a/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_975c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz Binary files differindex d32c100e5..c2ae5d129 100644 --- a/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_9800-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz Binary files differindex 670eec7a7..97b94f1c0 100644 --- a/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_980c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz Binary files differindex 7448ed161..d69bfae55 100644 --- a/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz Binary files differindex 1aff226fe..bbf4569f7 100644 --- a/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_995c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz Binary files differindex 10c40133d..79350f68b 100644 --- a/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz Binary files differindex 7a4458d7a..57bcd0720 100644 --- a/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz Binary files differindex c29636a28..5eaffd314 100644 --- a/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz Binary files differindex 7bf405941..d6c24e81b 100644 --- a/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d1600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz Binary files differindex 91cb7423a..799714759 100644 --- a/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz Binary files differindex 5530e3296..a533937fa 100644 --- a/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz Binary files differindex 8246f1f1c..48a5378a2 100644 --- a/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz Binary files differindex 4c9667348..bb3acb1d7 100644 --- a/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d2600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz Binary files differindex 657aee0c6..00be37aba 100644 --- a/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz Binary files differindex 33b26f0bc..8e64498d9 100644 --- a/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz Binary files differindex 0de35dc5d..eeacc35b2 100644 --- a/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d4300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz Binary files differindex 270afcc71..48235424f 100644 --- a/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz Binary files differindex 08154340e..499fe256c 100644 --- a/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_d730-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz Binary files differindex d33947d1d..d80470454 100644 --- a/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz Binary files differindex e8a4a544a..b61add366 100644 --- a/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz Binary files differindex de3ef2ea7..49a0b3b61 100644 --- a/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz Binary files differindex aa235032c..07dcd7aaf 100644 --- a/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz Binary files differindex 4694ae410..b0f802d49 100644 --- a/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz Binary files differindex 94ed17d8a..199c7a2db 100644 --- a/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz Binary files differindex 25463fca2..2eb012002 100644 --- a/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz Binary files differindex d31e314e0..f2938973b 100644 --- a/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4213_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz Binary files differindex 7aead79ce..2a0679d57 100644 --- a/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz Binary files differindex 70aecc435..22a1866a4 100644 --- a/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz Binary files differindex 798a77794..c211ff3fb 100644 --- a/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_f735-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..8df4db587 --- /dev/null +++ b/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..bd132948b --- /dev/null +++ b/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz Binary files differindex d8e1949cd..9a2a9bb56 100644 --- a/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz Binary files differindex ab4cd7bdc..825837e4d 100644 --- a/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-dj350-hpijs.ppd.gz b/ppd/hpijs/hp-dj350-hpijs.ppd.gz Binary files differindex 0f7689756..ef4657354 100644 --- a/ppd/hpijs/hp-dj350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-dj350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-dj450-hpijs.ppd.gz b/ppd/hpijs/hp-dj450-hpijs.ppd.gz Binary files differindex f2eb3ec86..07ede8b70 100644 --- a/ppd/hpijs/hp-dj450-hpijs.ppd.gz +++ b/ppd/hpijs/hp-dj450-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz Binary files differindex 54a27918b..9d2087e7a 100644 --- a/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_100_d410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz Binary files differindex e5713de11..f8ff7c233 100644 --- a/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz Binary files differindex dbbd40adb..f4f844ad2 100644 --- a/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1005_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz Binary files differindex 9bfa489f6..3f6f3e248 100644 --- a/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1010-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz Binary files differindex 50463d5b9..a595055f8 100644 --- a/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1012-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz Binary files differindex 579def8df..f90b87ba3 100644 --- a/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1015-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz Binary files differindex 4d79ce2ad..c8d3f35cb 100644 --- a/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1018-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz Binary files differindex c1a1b677b..39ae19046 100644 --- a/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1020-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz Binary files differindex e80e74868..d6b556dd6 100644 --- a/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz Binary files differindex d96aebbec..af78fa3bc 100644 --- a/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz Binary files differindex 6ce7aa7f7..2492a7da2 100644 --- a/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz Binary files differindex fdac28b57..ece211acb 100644 --- a/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022n-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz Binary files differindex a884fc3e5..0ea807589 100644 --- a/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz Binary files differindex 9aac67688..4ae80a404 100644 --- a/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1022nw-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz Binary files differindex c61191d64..2aaa4a282 100644 --- a/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz Binary files differindex 428d5ad64..c3412065d 100644 --- a/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz Binary files differindex 89a632a1a..1dfebd84a 100644 --- a/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1100xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz Binary files differindex 2f1ea1c21..f875397dd 100644 --- a/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz Binary files differindex a2d3ffdef..d39331d77 100644 --- a/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1160-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz Binary files differindex 42bbf990c..692282018 100644 --- a/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1160_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz Binary files differindex 050de01bb..d5c295908 100644 --- a/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz Binary files differindex 916cfee9d..9ee7e668c 100644 --- a/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1200n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz Binary files differindex 88d230bd3..2f6120df4 100644 --- a/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1220-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz Binary files differindex c7b601cc6..af6297cf7 100644 --- a/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1220se-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz Binary files differindex 806f9b2e5..2be1150bd 100644 --- a/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz Binary files differindex 6bda49f3d..5fbd2f797 100644 --- a/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz Binary files differindex d1736a2ab..1107a77aa 100644 --- a/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz Binary files differindex 9b57f06ee..1a9f364bd 100644 --- a/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz Binary files differindex 0486766cc..4395958d3 100644 --- a/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz Binary files differindex e572187b2..e1a3cb345 100644 --- a/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz Binary files differindex 9d92008e6..c6973f69d 100644 --- a/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz Binary files differindex a1bb5a7ab..854d09d17 100644 --- a/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_1320tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz Binary files differindex fa26edeb8..f995dbed3 100644 --- a/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz Binary files differindex 90431f275..d686d53f6 100644 --- a/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz Binary files differindex 8b27736ad..964e78e7a 100644 --- a/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz Binary files differindex 2080802ae..4f53b171c 100644 --- a/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz Binary files differindex 235e4451c..84ab98abe 100644 --- a/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz Binary files differindex 0ce4d2cad..b34426e2c 100644 --- a/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz Binary files differindex 8079cf9d5..10f3af4d4 100644 --- a/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2410-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz Binary files differindex ee731911e..c11199347 100644 --- a/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2420-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz Binary files differindex 6d45ee630..b19201bad 100644 --- a/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_2430-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz Binary files differindex e900660b9..cd5cf4266 100644 --- a/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3015-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz Binary files differindex 10233ace0..ca576f918 100644 --- a/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3020-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz Binary files differindex 7242b7675..43a4f3ec5 100644 --- a/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3030-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz Binary files differindex bfa900433..6e3552957 100644 --- a/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3050-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz Binary files differindex 223669960..fc0ede253 100644 --- a/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3052-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz Binary files differindex 8b70ad26a..7e3782bcc 100644 --- a/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3055-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz Binary files differindex c11d337f3..d5a99c444 100644 --- a/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz Binary files differindex cdf5302b6..5b9e0b348 100644 --- a/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz Binary files differindex 4c0083997..8dcb917c0 100644 --- a/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz Binary files differindex 5720f207b..d9b47f732 100644 --- a/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200m-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz Binary files differindex 7381cb330..f5bc3f41d 100644 --- a/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3200se-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz Binary files differindex 3ce86127a..8b8f6be68 100644 --- a/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz Binary files differindex 7ad640bf7..411e98264 100644 --- a/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3330-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz Binary files differindex 4926c3446..d7a80d8e0 100644 --- a/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3380-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz Binary files differindex ccd99dc9a..f72fb02f0 100644 --- a/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3390-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz Binary files differindex 58747ef0e..abba51360 100644 --- a/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_3392-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz Binary files differindex 2ab451362..4fd8c1f38 100644 --- a/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz Binary files differindex 37982670b..fadec33b9 100644 --- a/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz Binary files differindex f0c3051c4..548c61d67 100644 --- a/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz Binary files differindex 9e5baf157..b3e566db5 100644 --- a/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz Binary files differindex dbb74282b..2a0a47e3b 100644 --- a/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz Binary files differindex d1c1267ef..8e2d8a774 100644 --- a/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz Binary files differindex 2f2df42c5..086f4a821 100644 --- a/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4240-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz Binary files differindex 9bdab306c..d9b99d1f6 100644 --- a/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4250-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz Binary files differindex f05891799..0d66475e0 100644 --- a/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4300-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz Binary files differindex dc6921e9a..08afc8842 100644 --- a/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz Binary files differindex 325cc2f01..b6deca043 100644 --- a/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4350-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz Binary files differindex f2cd25c7a..bce47f81a 100644 --- a/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz Binary files differindex d120f8b86..1076f34ea 100644 --- a/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz Binary files differindex 090106d1a..0c02e97f9 100644 --- a/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4ml-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz Binary files differindex c9f2776d8..1476a499b 100644 --- a/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz Binary files differindex 399d98c68..6b937a7dd 100644 --- a/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4si-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz Binary files differindex 675281750..7ea80c54a 100644 --- a/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_4v-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz Binary files differindex 6aa953d68..9e365f022 100644 --- a/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz Binary files differindex 977b92e6b..c79382a3a 100644 --- a/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz Binary files differindex fbe17adf5..171b341c5 100644 --- a/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz Binary files differindex cc935e3dd..9db0df680 100644 --- a/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz Binary files differindex 1e392151c..ab40aa481 100644 --- a/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200l-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz Binary files differindex 54d625166..a9a9ba522 100644 --- a/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5200lx-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz Binary files differindex 5c837437a..c96c8c831 100644 --- a/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz Binary files differindex a1ab7aa72..ff2668e11 100644 --- a/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz Binary files differindex 01b22f605..fc3512f1d 100644 --- a/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5p-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz Binary files differindex 07f39baed..35b533da6 100644 --- a/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5si-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz Binary files differindex e30d71e42..ee04938c6 100644 --- a/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz Binary files differindex 5f4fd67ee..428139e31 100644 --- a/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6l-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz Binary files differindex 4db61a1de..a8472784e 100644 --- a/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6mp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz Binary files differindex 083e6856e..721c50f06 100644 --- a/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_6p-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz Binary files differindex 60a8df7c1..f0616d496 100644 --- a/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz Binary files differindex 251fa919c..bd5edf959 100644 --- a/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz Binary files differindex ea2db0f4a..6a1977b17 100644 --- a/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz Binary files differindex 91c9137b0..f46473651 100644 --- a/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz Binary files differindex ecef1878d..18db16cac 100644 --- a/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8150_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz Binary files differindex 228c1ae23..f62374787 100644 --- a/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz Binary files differindex 77dd753cf..11e98a498 100644 --- a/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz Binary files differindex 4aac3162d..56e02d5a8 100644 --- a/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz Binary files differindex 560c34f3d..1f902449e 100644 --- a/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9040-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz Binary files differindex 75ba13af8..bd4105cc7 100644 --- a/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz Binary files differindex 6b70c9f6b..58159d1f2 100644 --- a/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9050-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz Binary files differindex dc0deee47..5db5c29ac 100644 --- a/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz Binary files differindex c7530d616..3a11d9d33 100644 --- a/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz Binary files differindex 4a88e8a2b..41d96e99f 100644 --- a/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..3a8525556 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..8e869ceb6 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..cb50c39cd --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..c01129b5e --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..cc17f36ad --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..6b78ff3cb --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..7ea2199fd --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..4a9fc1098 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1021-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1021-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..3cbf643d6 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1021-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1022-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1022-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..3e3568451 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1022-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1023-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1023-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..be2a71b84 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1023-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..f55800225 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..0bb931771 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..5ebf244b5 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1026nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1027nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1027nw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..1e153f27b --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1027nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_cp1028nw-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_cp1028nw-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..415b235c1 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_cp1028nw-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz Binary files differindex 7feacadc0..df9689e3a 100644 --- a/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1005-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz Binary files differindex 0700ff691..8d84ac197 100644 --- a/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1120_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz Binary files differindex ac02f499c..779b7f68b 100644 --- a/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1120n_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz Binary files differindex 6ecc86718..f666c1773 100644 --- a/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1319f_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz Binary files differindex 27df641e9..555be3837 100644 --- a/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..e7a8ab1bc --- /dev/null +++ b/ppd/hpijs/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..417842c9e --- /dev/null +++ b/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..d5ba663b8 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz Binary files differnew file mode 100644 index 000000000..d0e78108d --- /dev/null +++ b/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz Binary files differindex 676849f0a..fd48e00fe 100644 --- a/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz Binary files differindex f640db567..43ce6e1ea 100644 --- a/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz Binary files differindex c8478d98a..a4bbcc09a 100644 --- a/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz Binary files differindex c40b1eb2e..e33360553 100644 --- a/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz Binary files differindex 29cf30e93..becbb2d97 100644 --- a/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz Binary files differindex de58905f9..73b3ad855 100644 --- a/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz Binary files differindex 13adffe22..f0dd65d87 100644 --- a/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz Binary files differindex 10fce5446..51d3c68d9 100644 --- a/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz Binary files differindex bebc60837..196f43a3b 100644 --- a/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz Binary files differindex 298246f58..30e4d2daa 100644 --- a/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz Binary files differindex b93e18a8b..e4f96a159 100644 --- a/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz Binary files differindex 3df21db6b..89e1d2706 100644 --- a/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1005-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz Binary files differindex 89bcfa720..bcd30810e 100644 --- a/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1006-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz Binary files differindex 369d316f9..9fb1302ed 100644 --- a/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1007-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz Binary files differindex c2ff08955..8ac5a1e30 100644 --- a/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1008-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz Binary files differindex c65e68649..c0ab305c5 100644 --- a/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1009-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz Binary files differindex 611800c4a..7283de63f 100644 --- a/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz Binary files differindex c75b17ba5..51faa1a48 100644 --- a/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz Binary files differindex 01469910f..cad6eb060 100644 --- a/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p1505n-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz Binary files differindex c3d1ff796..36b05aa0a 100644 --- a/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz Binary files differindex 328227f94..d8c0218ef 100644 --- a/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz Binary files differindex 5576d158c..f1f9a03fc 100644 --- a/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz b/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz Binary files differindex d9fa0b445..84c8bac57 100644 --- a/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2014n-hpijs-zxs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz Binary files differindex 77987ee94..efcca65ad 100644 --- a/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz Binary files differindex 7799ee6b0..fa61f305c 100644 --- a/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz Binary files differindex 4c2ee91b6..1983de11d 100644 --- a/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015dn_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz Binary files differindex a0ba6bb7f..7d442061e 100644 --- a/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015n_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz Binary files differindex 76be27930..a3aeeda97 100644 --- a/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2015x_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz Binary files differindex 25e0ebaf7..182b39519 100644 --- a/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz Binary files differindex 46ed87101..020e43fe9 100644 --- a/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz Binary files differindex 2bf344f66..aa2d5ae33 100644 --- a/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz b/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz Binary files differindex 0d8ba0b2c..7b8793258 100644 --- a/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2035n-hpijs-zjs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz Binary files differindex 9bd775fd2..ed9afbabd 100644 --- a/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz Binary files differindex 6e5b14f30..2854fdea9 100644 --- a/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz Binary files differindex 9c1f69e88..f79d67a6b 100644 --- a/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz Binary files differindex e7dfcd9e2..4e83785cc 100644 --- a/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz Binary files differindex 52cae1dc4..f3e323083 100644 --- a/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3004-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz Binary files differindex 0b30084c7..ba5b656b2 100644 --- a/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3005-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz Binary files differindex 8a5520a32..186c00a3d 100644 --- a/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz Binary files differindex 1002f039c..5a3d635ac 100644 --- a/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz Binary files differindex 4ebcddd64..12920bce3 100644 --- a/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz Binary files differindex 3832d69a4..9f31d1007 100644 --- a/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4014n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz Binary files differindex e6008a5e3..b70e69df0 100644 --- a/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz Binary files differindex 2ee94a720..7fdf09349 100644 --- a/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz Binary files differindex 8186c6922..5e9d25774 100644 --- a/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz Binary files differindex 93a5fc846..2f5a0a26e 100644 --- a/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz Binary files differindex 078967777..eeb99a874 100644 --- a/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz Binary files differindex c3e1e605b..cfe3f4fb0 100644 --- a/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz Binary files differindex 75c3bf79b..139c695f8 100644 --- a/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz Binary files differindex 950a2e1bd..2c1cffe3c 100644 --- a/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515tn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz Binary files differindex 2a923172b..8046530b7 100644 --- a/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515x-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz Binary files differindex ba951b4be..e3164b58b 100644 --- a/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_p4515xm-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz Binary files differindex 535cd0ef5..a67439f00 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz Binary files differindex 8f8c854dc..f6cb18ce0 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz Binary files differindex 2fbe9f0d1..b2533e865 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..37cb26d72 --- /dev/null +++ b/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz Binary files differindex 5d3ae86cd..de71eef53 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz Binary files differindex d0e3ce349..db8be0bc6 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1102-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz Binary files differindex 7cf414cd8..afdb2657a 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1102w-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz Binary files differindex f3f3f8697..a029c53df 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1566-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz Binary files differindex cc5c1977d..b839018cc 100644 --- a/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p1606dn-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz Binary files differindex db69dcc03..1d1646f0d 100644 --- a/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-mopier_240-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz Binary files differindex 4347f87b2..fa2454b3b 100644 --- a/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-mopier_320-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-officejet-hpijs.ppd.gz b/ppd/hpijs/hp-officejet-hpijs.ppd.gz Binary files differindex c54cddbda..29990b07a 100644 --- a/ppd/hpijs/hp-officejet-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz Binary files differindex 219ba53e9..a5be92f36 100644 --- a/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_150_mobile_l511-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz Binary files differindex 3c66d5f90..639dba648 100644 --- a/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4000_k210-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz Binary files differindex 119024b4b..be1d4fac6 100644 --- a/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz Binary files differindex f0cfd8015..f833ed1f2 100644 --- a/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4105-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz Binary files differindex 70cc50aec..10ddcf479 100644 --- a/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4115_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz Binary files differindex 1061f484b..36e1c99c8 100644 --- a/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz Binary files differindex 17f1dc0de..e3de9471f 100644 --- a/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4255-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz Binary files differindex 238042abe..194f37f71 100644 --- a/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz Binary files differindex 04cbebee3..f3ccf71a5 100644 --- a/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4400_k410-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz Binary files differindex a95d45981..21d637fd7 100644 --- a/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510a-f-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz Binary files differindex 8dcd3e6d3..0dfb56b8b 100644 --- a/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510g-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz Binary files differindex be484171c..00100e24d 100644 --- a/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_g510n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz Binary files differindex afad47cb4..7005a6a98 100644 --- a/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_4500_k710-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz Binary files differindex e8a7b5130..b7c0d2c90 100644 --- a/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz Binary files differindex bb968e517..780feb90e 100644 --- a/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5105-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz Binary files differindex d3e975f3e..d539d40aa 100644 --- a/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5110-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz Binary files differindex 19ef65e0c..f4f30eb2b 100644 --- a/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5110v-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz Binary files differindex 9438844dd..47a6bae07 100644 --- a/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz Binary files differindex 97ff50a8d..87a475774 100644 --- a/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_5600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz Binary files differindex ef900ab4d..a3ad42214 100644 --- a/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6000_e609a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz Binary files differindex 85499b0be..becaaa2c4 100644 --- a/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6000_e609n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz Binary files differindex 8df9afa5a..7c21f42a5 100644 --- a/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz Binary files differindex 6433ef84a..26c8b01b9 100644 --- a/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz Binary files differindex 73e9b5ecc..692b12e32 100644 --- a/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz Binary files differindex 04ca9652d..322d230cc 100644 --- a/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz Binary files differindex 446200435..632b3e2fc 100644 --- a/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e709a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz Binary files differindex 020d69053..146e0f7d6 100644 --- a/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e709n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz Binary files differindex d4f73a76c..cb9e66806 100644 --- a/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e710a-f-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz Binary files differindex fc86fa359..5bbf7a81f 100644 --- a/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_6500_e710n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz Binary files differindex a3eca5780..5a501bc49 100644 --- a/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7000_e809a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz Binary files differindex a2326f5ef..cc3f9b0a6 100644 --- a/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7000_e809a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz Binary files differindex 105f93227..7e30b405a 100644 --- a/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz Binary files differindex 968eff4b3..b4e909da6 100644 --- a/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz Binary files differindex 7a60aa0ef..27c63196e 100644 --- a/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz Binary files differindex c6daedf76..2c10f185d 100644 --- a/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz Binary files differindex 8c2e8f4a9..7d3297fe1 100644 --- a/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz b/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz Binary files differindex d68016b1d..49bb0528a 100644 --- a/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz +++ b/ppd/hpijs/hp-officejet_9100_series-hpijs-pcl3.ppd.gz diff --git a/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz Binary files differindex c9c0208a1..16ba7b0d4 100644 --- a/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz Binary files differindex 056d6dc99..9e72fb74d 100644 --- a/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g55-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz Binary files differindex 5da931df4..5d6fdfa2b 100644 --- a/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g55xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz Binary files differindex 2c959cf48..0712e3335 100644 --- a/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g85-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz Binary files differindex 0e6e11017..75361f3f0 100644 --- a/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g85xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz Binary files differindex a0532c653..5156e40c2 100644 --- a/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_g95-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz Binary files differindex 995d93e77..644411845 100644 --- a/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_h470-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz Binary files differindex e1c723638..2740985b2 100644 --- a/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j3500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz Binary files differindex e98d3c5d3..9c5381920 100644 --- a/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j3600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz Binary files differindex 271e7d849..83e9a4cb0 100644 --- a/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz Binary files differindex 927ab1147..003633e7d 100644 --- a/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4660_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz Binary files differindex 58bcb5f2f..d61e4ccfa 100644 --- a/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j4680_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz Binary files differindex 05a7a4e54..8d1392481 100644 --- a/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz Binary files differindex 8b83348ee..33036537e 100644 --- a/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j5700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz Binary files differindex 6037d4474..8ae04a2a9 100644 --- a/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_j6400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz Binary files differindex 7ca28dcec..ca3e69cb5 100644 --- a/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k60-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz Binary files differindex 4fcb74bd7..69038c4ab 100644 --- a/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k60xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz Binary files differindex c72843b95..8d2ad0df1 100644 --- a/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k7100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz Binary files differindex ae0d69469..805daaf60 100644 --- a/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz Binary files differindex a535f525e..a564dc1e4 100644 --- a/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_k80xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz Binary files differindex c1d358317..7c2416c99 100644 --- a/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_lx-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz Binary files differindex 99177d59a..19823ddad 100644 --- a/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_1150c-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz Binary files differindex 0f893c13d..66a4ea510 100644 --- a/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_1170c_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz Binary files differindex 5707f3025..39e4b4875 100644 --- a/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8000_a809-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz Binary files differindex bdf5a902a..902968acd 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909a-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz Binary files differindex 17af28965..0a162daad 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909g-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz Binary files differindex 2a4b3c292..665efb6dd 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a909n-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz Binary files differindex a855dad3b..1fd3b173d 100644 --- a/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8500_a910-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz Binary files differindex c6929b43b..f06b18318 100644 --- a/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k5300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz Binary files differindex 9b5676243..4b9d3a6cc 100644 --- a/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k5400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz Binary files differindex 43c1c4bcb..395612a83 100644 --- a/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz Binary files differindex e2c903c52..b67a33b4b 100644 --- a/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k850-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz Binary files differindex 969cb3aa3..83e6ce4be 100644 --- a/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_k8600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz Binary files differindex 1d4f1deab..7cb2830b8 100644 --- a/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz Binary files differindex 229bbaa4f..23f64df56 100644 --- a/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz Binary files differindex 941beffda..25f26bba3 100644 --- a/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz Binary files differindex ebd773d25..f74b768ae 100644 --- a/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz Binary files differindex 9af5611b7..60e6a4488 100644 --- a/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_l7700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz Binary files differindex 273802fe2..3e6ae7430 100644 --- a/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r40-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz Binary files differindex 4055a7303..04a994e7d 100644 --- a/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r40xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz Binary files differindex 53f2ed939..a12ec1648 100644 --- a/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r45-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz Binary files differindex c89622a3a..36cc99e35 100644 --- a/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r60-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz Binary files differindex e5499c41a..05ee0ee87 100644 --- a/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r65-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz Binary files differindex c3c41b28e..9e4c257f3 100644 --- a/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r80-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz Binary files differindex 24a9600aa..08ff04290 100644 --- a/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_r80xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz Binary files differindex 901b89c82..3d7357d7c 100644 --- a/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz Binary files differindex 1a2c59f57..5b3dff2e6 100644 --- a/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_310-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz Binary files differindex 403595208..1d2c52b09 100644 --- a/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_320-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz Binary files differindex b5e5ef49f..bc10bf249 100644 --- a/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_330-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz Binary files differindex 911b68350..7d5758e84 100644 --- a/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz Binary files differindex ae04ea625..f461f7d42 100644 --- a/ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz Binary files differindex 2b5e2da23..61537683b 100644 --- a/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_520-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz Binary files differindex bc5bdb683..bada70538 100644 --- a/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_570-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz Binary files differindex cf10db106..be7e811d1 100644 --- a/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_580-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz Binary files differindex dd8e9564b..eaaa90f7d 100644 --- a/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_590-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz Binary files differindex 90164611b..4a3f3579a 100644 --- a/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_600-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz Binary files differindex 7975cb981..8ca59b528 100644 --- a/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_610-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz Binary files differindex 438e1ba86..0c690713d 100644 --- a/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz Binary files differindex 379353168..d2f100cd1 100644 --- a/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_700-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz Binary files differindex e430ad803..c4e412b85 100644 --- a/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_710-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz Binary files differindex 6f56b6baf..1dd8546c7 100644 --- a/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_720-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz Binary files differindex 89a479656..b5967d749 100644 --- a/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_series_725-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz Binary files differindex 403324bae..bfd1b71f9 100644 --- a/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_t_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz Binary files differindex eeb834a1f..937b33275 100644 --- a/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v30-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz Binary files differindex 983afc921..41f42f2c4 100644 --- a/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v40-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz Binary files differindex c4a807103..4d031cbf1 100644 --- a/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v40xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz Binary files differindex ad541a0b0..131b86a19 100644 --- a/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_v45-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz Binary files differindex 3a7e1b770..7db01f5d9 100644 --- a/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz Binary files differindex d22ef3dec..165624440 100644 --- a/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1115-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz Binary files differindex 8581156e7..814da354b 100644 --- a/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1215-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz Binary files differindex adbede6bd..f27034e12 100644 --- a/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1218-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz Binary files differindex c290a5d3e..5a981cc9c 100644 --- a/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_130-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz Binary files differindex 588d7fa25..adbac08cc 100644 --- a/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_1315-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz Binary files differindex cfad668dc..2f23315f3 100644 --- a/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_140_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz Binary files differindex 3b0bd64e2..131e1fb07 100644 --- a/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_230-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz Binary files differindex eb0c68de0..2698427a6 100644 --- a/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_240_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz Binary files differindex ad86836ed..78004f227 100644 --- a/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2570_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz Binary files differindex 80efccd00..98d3aaa87 100644 --- a/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz Binary files differindex 6183263ed..dbed913b1 100644 --- a/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_2700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz Binary files differindex ba3db373b..2a32b6d43 100644 --- a/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz Binary files differindex ddba4cd8d..301cc5b07 100644 --- a/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz Binary files differindex 9b4d45c2b..8e6aaef1c 100644 --- a/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_320_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz Binary files differindex 23b68eeb5..262a18edc 100644 --- a/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_3300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz Binary files differindex 91c9d7f94..e5090a7a7 100644 --- a/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_330_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz Binary files differindex e4288406e..a1569d890 100644 --- a/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_370_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz Binary files differindex dabcd593c..391169162 100644 --- a/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_380_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz Binary files differindex 2cdb64fff..8b7372e3a 100644 --- a/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_420_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz Binary files differindex 30c61eb02..9db0bc498 100644 --- a/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_470_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz Binary files differindex f69664e45..bc2310fe9 100644 --- a/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7150-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz Binary files differindex 6843ed472..f559b3c1c 100644 --- a/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz Binary files differindex ef2edddf4..cc6226463 100644 --- a/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7345-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz Binary files differindex c7dc1497a..46c8b2119 100644 --- a/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7350-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz Binary files differindex d41130682..3365c377c 100644 --- a/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz Binary files differindex 9b094c043..3b4f51617 100644 --- a/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz Binary files differindex 4cf88d6cf..3bad73cf2 100644 --- a/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz Binary files differindex c126c9251..1d91737e3 100644 --- a/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz Binary files differindex 44da605ed..a33292ead 100644 --- a/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7800_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz Binary files differindex e250d1cd5..b0ecf20e0 100644 --- a/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz Binary files differindex 88eb3c92a..29294d279 100644 --- a/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8000_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz Binary files differindex 28ee96063..7667276bc 100644 --- a/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz Binary files differindex 513e170cf..f2cd9ff6a 100644 --- a/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz Binary files differindex cbed4d9ca..5563374be 100644 --- a/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz Binary files differindex 7d58d8e07..068445bab 100644 --- a/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_8700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz Binary files differindex 20ef5231c..08bf7dfd4 100644 --- a/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz Binary files differindex 943690e10..63f35bea9 100644 --- a/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a320_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz Binary files differindex a93dfd064..450be5b06 100644 --- a/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a430_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz Binary files differindex 26b21fa6c..d4f0847ce 100644 --- a/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a440_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz Binary files differindex 9bb7b8969..ef569bbeb 100644 --- a/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz Binary files differindex a8a64359e..1f60fb62f 100644 --- a/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a520_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz Binary files differindex fe8621934..3d93557d8 100644 --- a/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a530_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz Binary files differindex 845cf40e5..bd7725302 100644 --- a/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a610_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz Binary files differindex a779ff266..d56e3b53f 100644 --- a/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a620_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz Binary files differindex ee714b6d0..a0c541d47 100644 --- a/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a630_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz Binary files differindex 3d54ba9f2..12f60df9a 100644 --- a/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a640_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz Binary files differindex 5f7dd0583..c197a38dc 100644 --- a/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a710_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz Binary files differindex c828dca3a..c75dd5a12 100644 --- a/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_a820_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz Binary files differindex d10d27834..09c24f1cc 100644 --- a/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz Binary files differindex 4c387f71b..3463a7ffb 100644 --- a/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b109a-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz Binary files differindex d51b07e92..cacf6b67b 100644 --- a/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b109a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz Binary files differindex 3a03349ac..dfdc250c9 100644 --- a/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz Binary files differindex 0617f9a5b..2f283fdda 100644 --- a/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_b8500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz Binary files differindex e19c9a9ba..fb7a0f5ce 100644 --- a/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c309a_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz Binary files differindex d4a048c55..0d8e6dadf 100644 --- a/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c3100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz Binary files differindex 2b1cc803a..7229a5db6 100644 --- a/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz Binary files differindex 947750f81..be21f2cde 100644 --- a/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz Binary files differindex 538ecfefc..4c9dbc637 100644 --- a/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4340_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz Binary files differindex c048f0703..2a6826851 100644 --- a/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4380_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz Binary files differindex 55e59a40e..05e708a90 100644 --- a/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz Binary files differindex 648256988..0993cd1b6 100644 --- a/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz Binary files differindex abc496c46..b7f8c5583 100644 --- a/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz Binary files differindex 6b9e9ff76..49263ff0a 100644 --- a/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c4700_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz Binary files differindex c93e0f2cc..2eaa61af7 100644 --- a/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz Binary files differindex 1d8723442..5c8c6cd9f 100644 --- a/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz Binary files differindex d6c603720..f35dfd99a 100644 --- a/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz Binary files differindex 82eff1866..d4d168e80 100644 --- a/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c5500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz Binary files differindex e3eb40569..1139ae16b 100644 --- a/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz Binary files differindex b2774b1e3..c97355bf0 100644 --- a/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz Binary files differindex 2898eb317..38a009bdd 100644 --- a/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c6300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz Binary files differindex 3f473ce5a..c5f1fe837 100644 --- a/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz Binary files differindex 3acd328df..7b76a0de2 100644 --- a/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz Binary files differindex bd4d96939..4ad37f3d9 100644 --- a/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_c8100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz Binary files differindex 49de7847c..eee5c67f0 100644 --- a/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d110_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz Binary files differindex 00f9d21af..681dc484f 100644 --- a/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5060_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz Binary files differindex ef077efcc..11b55c3ad 100644 --- a/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz Binary files differindex d12ebac30..07ea1947e 100644 --- a/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz Binary files differindex dc348dcae..4159aadda 100644 --- a/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d5400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz Binary files differindex 6256c57d5..cbbaa5b7a 100644 --- a/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d6100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz Binary files differindex 032ae82a3..731a0ea66 100644 --- a/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz Binary files differindex 2786f3e6b..2488de7c7 100644 --- a/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz Binary files differindex 24f125e4b..4662f8bb1 100644 --- a/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz Binary files differindex fb420ad0c..5d4d09368 100644 --- a/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz Binary files differindex 963ef6ade..55470d465 100644 --- a/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_d7500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz Binary files differindex 6b0db1e95..af6cdb4cb 100644 --- a/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_estn_c510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..292010e12 --- /dev/null +++ b/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz Binary files differindex ff22adae0..53375dc84 100644 --- a/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_p1000-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz Binary files differindex 6d2e5ac44..eeb43f222 100644 --- a/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_p1100-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz Binary files differindex 7fce5b435..d02afc2b1 100644 --- a/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_plus_b209a-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz Binary files differindex 68f0d917b..17cfd134c 100644 --- a/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_plus_b210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz Binary files differindex e502f6694..5313281ec 100644 --- a/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz Binary files differindex 5cd18dcd8..17bde3798 100644 --- a/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem_c310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz Binary files differindex 1e905658c..16836c85b 100644 --- a/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_prem_c410_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz Binary files differindex 5dd58596d..d88679e3f 100644 --- a/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_premium_c309g-m-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz Binary files differindex b64349f57..1e81664fb 100644 --- a/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_pro_b8300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz Binary files differindex b90664c0f..bbf5a5f80 100644 --- a/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_pro_b8800_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz Binary files differindex 3b0973d1e..17e938c9d 100644 --- a/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz b/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz Binary files differindex 3ce7533cc..79854fdd2 100644 --- a/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz +++ b/ppd/hpijs/hp-printer_scanner_copier_300-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz Binary files differindex 1de14d706..a789859e5 100644 --- a/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1000_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz Binary files differindex aa67c1c25..959e2664b 100644 --- a/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz Binary files differindex 6dd7c6967..b8cb3907f 100644 --- a/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz Binary files differindex 93e3d4d1a..b07738110 100644 --- a/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz Binary files differindex 2da0ee2dd..b97c4c608 100644 --- a/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1310_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz Binary files differindex db561825b..120ed4e22 100644 --- a/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1358_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz Binary files differindex 777208a30..f97ccfebd 100644 --- a/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz Binary files differindex 0bc2e5047..d5af8e250 100644 --- a/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz Binary files differindex 6b2d9a52f..146006f89 100644 --- a/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz Binary files differindex ae594b0c2..d54f6af72 100644 --- a/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_1600_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz Binary files differindex c696661c2..ba787f12f 100644 --- a/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2100_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz Binary files differindex f21940e66..ad753225f 100644 --- a/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2150_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz Binary files differindex 2b6e3322c..c31f5ea6f 100644 --- a/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2170_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz Binary files differindex 8b100bf11..b6dc7cde9 100644 --- a/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz Binary files differindex 6b631930b..02ba2f56f 100644 --- a/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2210_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz Binary files differindex 0e1d12e05..2eceae771 100644 --- a/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2300_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz Binary files differindex 4e96dfb5d..acee79a81 100644 --- a/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2350_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz Binary files differindex 066499022..2e27c7f4e 100644 --- a/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2400_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz Binary files differindex a1404bf66..737f2d4a3 100644 --- a/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_2500_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_500-hpijs.ppd.gz b/ppd/hpijs/hp-psc_500-hpijs.ppd.gz Binary files differindex 040492e10..035217b1f 100644 --- a/ppd/hpijs/hp-psc_500-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_500-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_720-hpijs.ppd.gz b/ppd/hpijs/hp-psc_720-hpijs.ppd.gz Binary files differindex e8dcd37b7..f37183178 100644 --- a/ppd/hpijs/hp-psc_720-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_720-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_750-hpijs.ppd.gz b/ppd/hpijs/hp-psc_750-hpijs.ppd.gz Binary files differindex fca2c92a7..303750929 100644 --- a/ppd/hpijs/hp-psc_750-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_750-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz Binary files differindex 446c2a181..8cfdd0219 100644 --- a/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_750xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_760-hpijs.ppd.gz b/ppd/hpijs/hp-psc_760-hpijs.ppd.gz Binary files differindex 4b0e3e891..8a4389107 100644 --- a/ppd/hpijs/hp-psc_760-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_760-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_780-hpijs.ppd.gz b/ppd/hpijs/hp-psc_780-hpijs.ppd.gz Binary files differindex 15e8e4386..9e9119e10 100644 --- a/ppd/hpijs/hp-psc_780-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_780-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz Binary files differindex f2ca06719..5fb5a2d26 100644 --- a/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_780xi-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz b/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz Binary files differindex ad490013a..227ee1af4 100644 --- a/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_900_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_920-hpijs.ppd.gz b/ppd/hpijs/hp-psc_920-hpijs.ppd.gz Binary files differindex 7a651f59d..88aabc2e2 100644 --- a/ppd/hpijs/hp-psc_920-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_920-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950-hpijs.ppd.gz Binary files differindex a5ba00573..a6d8e63c9 100644 --- a/ppd/hpijs/hp-psc_950-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz Binary files differindex f0b299aa4..1d7a397ab 100644 --- a/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950vr-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz Binary files differindex a20f1917c..60a561e5a 100644 --- a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz diff --git a/prnt/cupsext/cupsext.c b/prnt/cupsext/cupsext.c index f04469362..0f42ddab5 100644 --- a/prnt/cupsext/cupsext.c +++ b/prnt/cupsext/cupsext.c @@ -1,1881 +1,1890 @@ -/* -cupsext - Python extension class for CUPS 1.1+ - -(c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Portions based on: -"lpadmin" command for the Common UNIX Printing System (CUPS). - -Copyright 1997-2003 by Easy Software Products. - -These coded instructions, statements, and computer programs are the -property of Easy Software Products 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 missing or damaged please contact Easy Software Products -at: - -Attn: CUPS Licensing Information -Easy Software Products -44141 Airport View Drive, Suite 204 -Hollywood, Maryland 20636-3111 USA - -Voice: (301) 373-9603 -EMail: cups-info@cups.org - WWW: http://www.cups.org - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. -3. Neither the name of Hewlett-Packard nor the names of its -contributors may be used to endorse or promote products derived -from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PATENT INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -Requires: -CUPS 1.1+ -Python 2.2+ - -Author: -Don Welch - -*/ - - -#include <Python.h> -#include <structmember.h> -#include <cups/cups.h> -#include <cups/language.h> -#include <cups/ppd.h> - -/* Ref: PEP 353 (Python 2.5) */ -#if PY_VERSION_HEX < 0x02050000 -typedef int Py_ssize_t; -#define PY_SSIZE_T_MAX INT_MAX -#define PY_SSIZE_T_MIN INT_MIN -#endif - - -int g_num_options = 0; -cups_option_t * g_options; - -ppd_file_t * ppd = NULL; -cups_dest_t * dest = NULL; - -cups_dest_t * g_dests = NULL; -int g_num_dests = 0; - -const char * g_ppd_file = NULL; - -/* - * 'validate_name()' - Make sure the printer name only contains valid chars. - */ - -static int /* O - 0 if name is no good, 1 if name is good */ -validate_name( const char *name ) /* I - Name to check */ -{ - return 1; // TODO: Make it work with utf-8 encoding -} - -static PyObject * PyObj_from_UTF8(const char *utf8) -{ - PyObject *val = PyUnicode_Decode(utf8, strlen(utf8), "utf-8", NULL); - - if (!val) - { - // CUPS 1.2 always gives us UTF-8. Before CUPS 1.2, the - // ppd-* strings come straight from the PPD with no - // transcoding, but the attributes-charset is still 'utf-8' - // so we've no way of knowing the real encoding. - // In that case, detect the error and force it to ASCII. - char * ascii; - const char * orig = utf8; - int i; - - PyErr_Clear(); - ascii = malloc(1 + strlen (orig)); - - for (i = 0; orig[i]; i++) - { - ascii[i] = orig[i] & 0x7f; - } - - ascii[i] = '\0'; - val = PyString_FromString( ascii ); - free( ascii ); - } - - return val; -} - -void debug(const char * text) -{ - char buf[4096]; - sprintf( buf, "print '%s'", text); - PyRun_SimpleString( buf ); - -} - -staticforward PyTypeObject printer_Type; - -#define printerObject_Check(v) ((v)->ob_type == &printer_Type) - -typedef struct -{ - PyObject_HEAD - PyObject * device_uri; - PyObject * printer_uri; - PyObject * name; - PyObject * location; - PyObject * makemodel; - PyObject * info; - int accepting; - int state; -} -printer_Object; - - -static void printer_dealloc( printer_Object * self ) -{ - - Py_XDECREF( self->name ); - Py_XDECREF( self->device_uri ); - Py_XDECREF( self->printer_uri ); - Py_XDECREF( self->location ); - Py_XDECREF( self->makemodel ); - Py_XDECREF( self->info ); - PyObject_DEL( self ); -} - - -static PyMemberDef printer_members[] = - { - { "device_uri", T_OBJECT_EX, offsetof( printer_Object, device_uri ), 0, "Device URI (device-uri)" }, - { "printer_uri", T_OBJECT_EX, offsetof( printer_Object, printer_uri ), 0, "Printer URI (printer-uri)" }, - { "name", T_OBJECT_EX, offsetof( printer_Object, name ), 0, "Name (printer-name)" }, - { "location", T_OBJECT_EX, offsetof( printer_Object, location ), 0, "Location (printer-location)" }, - { "makemodel", T_OBJECT_EX, offsetof( printer_Object, makemodel ), 0, "Make and model (printer-make-and-model)" }, - { "state", T_INT, offsetof( printer_Object, state ), 0, "State (printer-state)" }, - { "info", T_OBJECT_EX, offsetof( printer_Object, info ), 0, "Info/description (printer-info)" }, - { "accepting", T_INT, offsetof( printer_Object, accepting ), 0, "Accepting/rejecting" }, - {0} - }; - -static PyTypeObject printer_Type = - { - PyObject_HEAD_INIT( &PyType_Type ) - 0, /* ob_size */ - "cupsext.Printer", /* tp_name */ - sizeof( printer_Object ), /* tp_basicsize */ - 0, /* tp_itemsize */ - ( destructor ) printer_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - PyObject_GenericSetAttr, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - "CUPS Printer object", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /*job_methods, */ /* tp_methods */ - printer_members, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ - }; - - - - -static PyObject * _newPrinter( char * device_uri, - char * name, - char * printer_uri, - char * location, - char * makemodel, - char * info, - int state, - int accepting ) -{ - printer_Object * self = PyObject_New( printer_Object, &printer_Type ); - - if ( !self ) - return NULL; - - if ( device_uri != NULL ) - self->device_uri = Py_BuildValue( "s", device_uri ); - - if ( printer_uri != NULL ) - self->printer_uri = Py_BuildValue( "s", printer_uri ); - - if ( name != NULL ) - self->name = Py_BuildValue( "s", name ); - - if ( location != NULL ) - self->location = Py_BuildValue( "s", location ); - - if ( makemodel != NULL ) - self->makemodel = Py_BuildValue( "s", makemodel ); - - if ( info != NULL ) - self->info = Py_BuildValue( "s", info ); - - self->accepting = accepting; - self->state = state; - - return ( PyObject * ) self; -} - -static PyObject * newPrinter( PyObject * self, PyObject * args, PyObject * kwargs ) -{ - char * device_uri = ""; - char * name = ""; - char * location = ""; - char * makemodel = ""; - int state = 0; - char * printer_uri = ""; - char * info = ""; - int accepting = 0; - - char * kwds[] = { "device_uri", "name", "printer_uri", "location", - "makemodel", "info", "state", "accepting", NULL }; - - if ( !PyArg_ParseTupleAndKeywords( args, kwargs, "zz|zzzzii", kwds, - &device_uri, &name, &printer_uri, - &location, &makemodel, &info, &state, - &accepting ) ) - return NULL; - - return _newPrinter( device_uri, printer_uri, name, location, makemodel, info, state, accepting); -} - - - -PyObject * getPrinters( PyObject * self, PyObject * args ) -{ - http_t * http = NULL; /* HTTP object */ - ipp_t *request = NULL; /* IPP request object */ - ipp_t *response = NULL; /* IPP response object */ - ipp_attribute_t *attr; /* Current IPP attribute */ - PyObject * printer_list; - cups_lang_t * language; - - static const char * attrs[] = /* Requested attributes */ - { - "printer-info", - "printer-location", - "printer-make-and-model", - "printer-state", - "printer-name", - "device-uri", - "printer-uri-supported", - "printer-is-accepting-jobs", - }; - - /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) - { - goto abort; - } - - /* Assemble the IPP request */ - request = ippNew(); - language = cupsLangDefault(); - - request->request.op.operation_id = CUPS_GET_PRINTERS; - request->request.any.request_id = 1; - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, - "attributes-charset", NULL, cupsLangEncoding( language ) ); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, - "attributes-natural-language", NULL, language->language ); - - ippAddStrings( request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", sizeof( attrs ) / sizeof( attrs[ 0 ] ), - NULL, attrs ); - - /* Send the request and get a response. */ - if ( ( response = cupsDoRequest( http, request, "/" ) ) == NULL ) - { - goto abort; - } - - Py_ssize_t max_count = 0; - - for ( attr = ippFindAttribute( response, "printer-name", IPP_TAG_NAME ), - max_count = 0; - attr != NULL; - attr = ippFindNextAttribute( response, "printer-name", IPP_TAG_NAME ), - max_count++ ) - ; - - if ( max_count > 0 ) - { - - //printer_list = PyList_New( max_count ); - printer_list = PyList_New( 0 ); - - char * device_uri = ""; - char * printer_uri = ""; - char * info = ""; - char * location = ""; - char * make_model = ""; - char * name = ""; - int accepting = 0; - cups_ptype_t type; - ipp_pstate_t state; - int i = 0; - - for ( attr = response->attrs; attr != NULL; attr = attr->next ) - { - while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER ) - attr = attr->next; - - if ( attr == NULL ) - break; - - type = CUPS_PRINTER_REMOTE; - state = IPP_PRINTER_IDLE; - accepting = 0; - - while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER ) - { - if ( strcmp( attr->name, "printer-name" ) == 0 && - attr->value_tag == IPP_TAG_NAME ) - name = attr->values[ 0 ].string.text; - - else if ( strcmp( attr->name, "device-uri" ) == 0 && - attr->value_tag == IPP_TAG_URI ) - device_uri = attr->values[ 0 ].string.text; - - else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 && - attr->value_tag == IPP_TAG_URI ) - printer_uri = attr->values[ 0 ].string.text; - - else if ( strcmp( attr->name, "printer-info" ) == 0 && - attr->value_tag == IPP_TAG_TEXT ) - info = attr->values[ 0 ].string.text; - - else if ( strcmp( attr->name, "printer-location" ) == 0 && - attr->value_tag == IPP_TAG_TEXT ) - location = attr->values[ 0 ].string.text; - - else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 && - attr->value_tag == IPP_TAG_TEXT ) - make_model = attr->values[ 0 ].string.text; - - else if ( strcmp( attr->name, "printer-state" ) == 0 && - attr->value_tag == IPP_TAG_ENUM ) - state = ( ipp_pstate_t ) attr->values[ 0 ].integer; - - else if (!strcmp(attr->name, "printer-is-accepting-jobs") && - attr->value_tag == IPP_TAG_BOOLEAN) - accepting = attr->values[ 0 ].boolean; - - attr = attr->next; - } - - if ( device_uri == NULL ) - { - if ( attr == NULL ) - break; - else - continue; - } - - printer_Object * printer; - printer = ( printer_Object * ) _newPrinter( device_uri, name, printer_uri, location, make_model, - info, state, accepting ); - - //PyList_SetItem( printer_list, i, ( PyObject * ) printer ); - PyList_Append( printer_list, ( PyObject * ) printer ); - - i++; - - if ( attr == NULL ) - break; - } - - return printer_list; - } -abort: - if ( response != NULL ) - ippDelete( response ); - - if ( http != NULL ) - httpClose( http ); - - printer_list = PyList_New( ( Py_ssize_t ) 0 ); - return printer_list; -} - - -PyObject * addPrinter( PyObject * self, PyObject * args ) -{ - //char buf[1024]; - ipp_status_t status; - http_t *http = NULL; /* HTTP object */ - ipp_t *request = NULL; /* IPP request object */ - ipp_t *response = NULL; /* IPP response object */ - cups_lang_t * language; - int r; - char printer_uri[ HTTP_MAX_URI ]; - char * name, * device_uri, *location, *ppd_file, * info, * model; - const char * status_str = "successful-ok"; - - if ( !PyArg_ParseTuple( args, "zzzzzz", - &name, // name of printer - &device_uri, // DeviceURI (e.g., hp:/usb/PSC_2200_Series?serial=0000000010) - &location, // location of printer - &ppd_file, // path to PPD file (uncompressed, must exist) - &model, // model name (e.g., foomatic:...) - &info // info/description - ) ) - { - r = 0; - status_str = "Invalid arguments"; - goto abort; - } - - if ( ( strlen( ppd_file ) > 0 && strlen( model ) > 0 ) || - ( strlen( ppd_file ) == 0 && strlen( model ) == 0) ) - { - r = 0; - status_str = "Invalid arguments: specify only ppd_file or model, not both or neither"; - goto abort; - } - - if ( !validate_name( name ) ) - { - r = 0; - status_str = "Invalid printer name"; - goto abort; - } - - - sprintf( printer_uri, "ipp://localhost/printers/%s", name ); - - if ( info == NULL ) - strcpy( info, name ); - - /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) - { - r = 0; - status_str = "Unable to connect to CUPS server"; - goto abort; - } - - /* Assemble the IPP request */ - request = ippNew(); - language = cupsLangDefault(); - - request->request.op.operation_id = CUPS_ADD_PRINTER; - request->request.any.request_id = 1; - - 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 ); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, printer_uri ); - - ippAddInteger( request, IPP_TAG_PRINTER, IPP_TAG_ENUM, - "printer-state", IPP_PRINTER_IDLE ); - - ippAddBoolean( request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1 ); - - ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL, - device_uri ); - - ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info", NULL, - info ); - - ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-location", NULL, - location ); - - if ( strlen( model ) > 0 ) - { - ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name", NULL, model ); - - /* Send the request and get a response. */ - response = cupsDoRequest( http, request, "/admin/" ); - } - else - { - /* Send the request and get a response. */ - response = cupsDoFileRequest( http, request, "/admin/", ppd_file ); - } - - if ( response == NULL ) - { - status = cupsLastError(); - r = 0; - } - else - { - status = response->request.status.status_code; - //ippDelete( response ); - r = 1; - } - - status_str = ippErrorString( status ); - -abort: - - if ( http != NULL ) - httpClose( http ); - - if ( response != NULL ) - ippDelete( response ); - - return Py_BuildValue( "is", r, status_str ); - -} - -/* - * 'delPrinter()' - Delete a printer from the system... - */ -PyObject * delPrinter( PyObject * self, PyObject * args ) -{ - ipp_t * request = NULL, /* IPP Request */ - *response = NULL; /* IPP Response */ - cups_lang_t *language; /* Default language */ - char uri[ HTTP_MAX_URI ]; /* URI for printer/class */ - char * name; - http_t *http = NULL; /* HTTP object */ - int r = 0; - const char *username = NULL; - - username = cupsUser(); - - if ( !PyArg_ParseTuple( args, "z", - &name ) ) // name of printer - { - goto abort; - } - - if ( !validate_name( name ) ) - { - goto abort; - } - - /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) - { - goto abort; - } - snprintf( uri, sizeof( uri ), "ipp://localhost/printers/%s", name ); - - /* - * Build a CUPS_DELETE_PRINTER request, which requires the following - * attributes: - * - * attributes-charset - * attributes-natural-language - * printer-uri - */ - request = ippNew(); - - request->request.op.operation_id = CUPS_DELETE_PRINTER; - 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 ); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, uri ); - - /* - * Do the request and get back a response... - */ - response = cupsDoRequest( http, request, "/admin/" ); - - if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) - { - r = 1; - } - -abort: - if (username) - cupsSetUser(username); - - if ( http != NULL ) - httpClose( http ); - - if ( response != NULL ) - ippDelete( response ); - - return Py_BuildValue( "i", r ); - -} - -/* - * 'setDefaultPrinter()' - Set the default printing destination. - */ - -PyObject * setDefaultPrinter( PyObject * self, PyObject * args ) - -{ - char uri[ HTTP_MAX_URI ]; /* URI for printer/class */ - ipp_t *request = NULL, /* IPP Request */ - *response = NULL; /* IPP Response */ - cups_lang_t *language; /* Default language */ - char * name; - http_t *http = NULL; /* HTTP object */ - int r = 0; - const char *username = NULL; - - username = cupsUser(); - - if ( !PyArg_ParseTuple( args, "z", - &name ) ) // name of printer - { - goto abort; - } - - //char buf[1024]; - //sprintf( buf, "print '%s'", name); - //PyRun_SimpleString( buf ); - - if ( !validate_name( name ) ) - { - goto abort; - } - - /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) - { - goto abort; - } - - /* - * Build a CUPS_SET_DEFAULT request, which requires the following - * attributes: - * - * attributes-charset - * attributes-natural-language - * printer-uri - */ - - snprintf( uri, sizeof( uri ), "ipp://localhost/printers/%s", name ); - - request = ippNew(); - - request->request.op.operation_id = CUPS_SET_DEFAULT; - request->request.op.request_id = 1; - - language = cupsLangDefault(); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, - "attributes-charset", NULL, "utf-8" ); //cupsLangEncoding( language ) ); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, - "attributes-natural-language", - //NULL, language != NULL ? language->language : "en"); - NULL, language->language ); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, uri ); - - /* - * Do the request and get back a response... - */ - - response = cupsDoRequest( http, request, "/admin/" ); - - if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) - { - r = 1; - } - -abort: - if (username) - cupsSetUser(username); - - if ( http != NULL ) - httpClose( http ); - - if ( response != NULL ) - ippDelete( response ); - - return Py_BuildValue( "i", r ); - - -} - - - -PyObject * controlPrinter( PyObject * self, PyObject * args ) -{ - ipp_t *request = NULL, /* IPP Request */ - *response = NULL; /* IPP Response */ - char * name; - http_t *http = NULL; /* HTTP object */ - int op; - int r = 0; - char uri[ HTTP_MAX_URI ]; /* URI for printer/class */ - cups_lang_t *language; - const char *username = NULL; - - username = cupsUser(); - - if ( !PyArg_ParseTuple( args, "zi", &name, &op) ) - { - goto abort; - } - - if ( !validate_name( name ) ) - { - goto abort; - } - - /* Connect to the HTTP server */ - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) - { - goto abort; - } - - request = ippNew(); - - request->request.op.operation_id = op; - request->request.op.request_id = 1; - - language = cupsLangDefault(); - - snprintf( uri, sizeof( uri ), "ipp://localhost/printers/%s", name ); - - 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 ); - - ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, uri ); - - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, - "requesting-user-name", NULL, cupsUser()); - - if (op == IPP_PURGE_JOBS) - ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", 1); - - response = cupsDoRequest(http, request, "/admin/"); - - if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT)) - { - r = 1; - } - -abort: - if (username) - cupsSetUser(username); - - if ( http != NULL ) - httpClose( http ); - - if ( response != NULL ) - ippDelete( response ); - - return Py_BuildValue( "i", r );; -} - - - -staticforward PyTypeObject job_Type; - -typedef struct -{ - PyObject_HEAD - int id; - PyObject * dest; - PyObject * title; - PyObject * user; - int state; - int size; -} -job_Object; - - - -static void job_dealloc( job_Object * self ) -{ - - Py_XDECREF( self->dest ); - Py_XDECREF( self->title ); - Py_XDECREF( self->user ); - PyObject_DEL( self ); -} - -static PyMemberDef job_members[] = - { - { "id", T_INT, offsetof( job_Object, id ), 0, "Id" }, - { "dest", T_OBJECT_EX, offsetof( job_Object, dest ), 0, "Destination" }, - { "state", T_INT, offsetof( job_Object, state ), 0, "State" }, - { "title", T_OBJECT_EX, offsetof( job_Object, title ), 0, "Title" }, - { "user", T_OBJECT_EX, offsetof( job_Object, user ), 0, "User" }, - { "size", T_INT, offsetof( job_Object, size ), 0, "Size" }, - {0} - }; - - - -static PyTypeObject job_Type = - { - PyObject_HEAD_INIT( &PyType_Type ) - 0, /* ob_size */ - "Job", /* tp_name */ - sizeof( job_Object ), /* tp_basicsize */ - 0, /* tp_itemsize */ - ( destructor ) job_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - PyObject_GenericSetAttr, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - "CUPS Job object", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /*job_methods, */ /* tp_methods */ - job_members, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, //(initproc)job_init, /* tp_init */ - 0, /* tp_alloc */ - //PyType_GenericAlloc, - 0, //job_new, /* tp_new */ - //PyType_GenericNew, - }; - - -static /*job_Object **/ PyObject * _newJob( int id, int state, char * dest, char * title, char * user, int size ) -{ - job_Object * jo; - jo = PyObject_New( job_Object, &job_Type ); - if ( jo == NULL ) - return NULL; - jo->id = id; - jo->size = size; - jo->state = state; - if ( dest != NULL ) - jo->dest = PyObj_from_UTF8( dest ); - else - jo->dest = Py_BuildValue( "" ); - - if ( title != NULL ) - jo->title = PyObj_from_UTF8( title ); - else - jo->title = Py_BuildValue( "" ); - - if ( user != NULL ) - jo->user = PyObj_from_UTF8( user ); - else - jo->user = Py_BuildValue( "" ); - - return ( PyObject * ) jo; - -} - -static /*job_Object **/ PyObject * newJob( PyObject * self, PyObject * args, PyObject * kwargs ) -{ - char * dest = ""; - int id = 0; - int state = 0; - char * title = ""; - char * user = ""; - int size = 0; - - char * kwds[] = { "id", "state", "dest", "title", "user", "size", NULL }; - - if ( !PyArg_ParseTupleAndKeywords( args, kwargs, "i|izzzi", kwds, - &id, &state, &dest, &title, &user, &size ) ) - return NULL; - - return _newJob( id, state, dest, title, user, size ); - -} - - - - -PyObject * getDefaultPrinter( PyObject * self, PyObject * args ) -{ - const char * defdest; - defdest = cupsGetDefault(); - - /*char buf[1024]; - sprintf( buf, "print 'Default Printer: %s'", defdest); - PyRun_SimpleString( buf ); - */ - - if ( defdest == NULL ) - return Py_BuildValue( "" ); // None - else - return Py_BuildValue( "s", defdest ); - -} - - -PyObject * cancelJob( PyObject * self, PyObject * args ) // cancelJob( dest, jobid ) -{ - int status; - int jobid; - char * dest; - - if ( !PyArg_ParseTuple( args, "si", &dest, &jobid ) ) - { - return Py_BuildValue( "i", 0 ); - } - - status = cupsCancelJob( dest, jobid ); - - return Py_BuildValue( "i", status ); -} - -PyObject * getJobs( PyObject * self, PyObject * args ) -{ - cups_job_t * jobs; - Py_ssize_t i; - int num_jobs; - PyObject * job_list; - int my_job; - int completed; - - if ( !PyArg_ParseTuple( args, "ii", &my_job, &completed ) ) - { - return PyList_New( ( Py_ssize_t ) 0 ); - } - - num_jobs = cupsGetJobs( &jobs, NULL, my_job, completed ); - - if ( num_jobs > 0 ) - { - job_list = PyList_New( num_jobs ); - - for ( i = 0; i < num_jobs; i++ ) - { - job_Object * newjob; - newjob = ( job_Object * ) _newJob( jobs[ i ].id, - jobs[ i ].state, - jobs[ i ].dest, - jobs[ i ].title, - jobs[ i ].user, - jobs[ i ].size ); - - PyList_SetItem( job_list, i, ( PyObject * ) newjob ); - - } - cupsFreeJobs( num_jobs, jobs ); - } - else - { - job_list = PyList_New( ( Py_ssize_t ) 0 ); - } - return job_list; -} - -PyObject * getVersion( PyObject * self, PyObject * args ) -{ - return Py_BuildValue( "f", CUPS_VERSION ); -} - -PyObject * getVersionTuple( PyObject * self, PyObject * args ) -{ - return Py_BuildValue( "(iii)", CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH ); -} - -PyObject * getServer( PyObject * self, PyObject * args ) -{ - return Py_BuildValue( "s", cupsServer() ); -} - -PyObject * setServer( PyObject * self, PyObject * args ) -{ - char * server = NULL; - - if (!PyArg_ParseTuple(args, "z", &server)) - return Py_BuildValue( "" ); - - if (!strlen(server)) // Pass an empty string to restore default server - server = NULL; - - cupsSetServer(server); - - return Py_BuildValue( "" ); -} - - -// *************************************************************************************************** - -PyObject * getPPDList( PyObject * self, PyObject * args ) -{ - -/* - * Build a CUPS_GET_PPDS request, which requires the following - * attributes: - * - * attributes-charset - * attributes-natural-language - * printer-uri - */ - - ipp_t *request = NULL, /* IPP Request */ - *response = NULL; /* IPP Response */ - PyObject * result; - cups_lang_t *language; - ipp_attribute_t * attr; - //PyObject * ppd_list; - http_t *http = NULL; /* HTTP object */ - //char buf[1024]; - - result = PyDict_New (); - - if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) - { - goto abort; - } - - request = ippNew(); - - request->request.op.operation_id = CUPS_GET_PPDS; - 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); - - //ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", - // NULL, "ipp://localhost/printers/"); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", - NULL, "ipp://localhost/printers/officejet_4100"); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "requested-attributes", - NULL, "all"); - - /* - * Do the request and get back a response... - */ - - if ((response = cupsDoRequest(http, request, "/")) != NULL) - { - - for (attr = response->attrs; attr; attr = attr->next) - { - PyObject *dict; - char *ppdname = NULL; - - while (attr && attr->group_tag != IPP_TAG_PRINTER) - attr = attr->next; - - if (!attr) - break; - - dict = PyDict_New (); - - for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next) - { - PyObject *val = NULL; - - if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME) - { - ppdname = attr->values[0].string.text; - - //sprintf( buf, "print '%s'", ppdname); - //PyRun_SimpleString( buf ); - } - - else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD) - //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) || - // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) || - // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) || - // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT)) - { - val = PyObj_from_UTF8(attr->values[0].string.text); - } - - if (val) - { - PyDict_SetItemString (dict, attr->name, val); - Py_DECREF (val); - } - } - - if (ppdname) - { - PyDict_SetItemString (result, ppdname, dict); - } - else - { - Py_DECREF (dict); - } - - if (!attr) - break; - } - - //return result; - } - -abort: - if ( http != NULL ) - httpClose( http ); - - if ( response != NULL ) - ippDelete( response ); - - return result; -} - - -PyObject * openPPD( PyObject * self, PyObject * args ) -{ - char * printer; - FILE * file; - int j; - - if ( !PyArg_ParseTuple( args, "z", &printer ) ) - { - return Py_BuildValue( "" ); // None - } - - g_ppd_file = cupsGetPPD( ( const char * ) printer ); - - file = fopen( g_ppd_file, "r" ); - ppd = ppdOpen( file ); - ppdLocalize( ppd ); - fclose( file ); - - g_num_dests = cupsGetDests( &g_dests ); - - if ( g_num_dests == 0 ) - { - goto bailout; - } - - if ( ( dest = cupsGetDest( printer, NULL, g_num_dests, g_dests ) ) == NULL ) - { - goto bailout; - } - - ppdMarkDefaults( ppd ); - cupsMarkOptions( ppd, dest->num_options, dest->options ); - - for ( j = 0; j < dest->num_options; j++ ) - { - if ( cupsGetOption( dest->options[ j ].name, g_num_options, g_options ) == NULL ) - { - g_num_options = cupsAddOption( dest->options[ j ].name, dest->options[ j ].value, g_num_options, &g_options ); - } - } - -bailout: - return Py_BuildValue( "s", g_ppd_file ); -} - - -PyObject * closePPD( PyObject * self, PyObject * args ) -{ - if ( ppd != NULL ) - { - ppdClose( ppd ); - unlink( g_ppd_file ); - } - - ppd = NULL; - - return Py_BuildValue( "" ); // None -} - - -PyObject * getPPD( PyObject * self, PyObject * args ) -{ - char * printer; - - if ( !PyArg_ParseTuple( args, "z", &printer ) ) - { - return Py_BuildValue( "" ); // None - } - - const char * ppd_file; - ppd_file = cupsGetPPD( ( const char * ) printer ); - - return Py_BuildValue( "s", ppd_file ); - -} - - -PyObject * getPPDOption( PyObject * self, PyObject * args ) -{ - if ( ppd != NULL ) - { - char * option; - - if ( !PyArg_ParseTuple( args, "z", &option ) ) - { - return Py_BuildValue( "" ); // None - } - - ppd_choice_t * marked_choice; - marked_choice = ppdFindMarkedChoice( ppd, option ); - - if ( marked_choice == NULL ) - { - return Py_BuildValue( "" ); // None - } - else - { - return Py_BuildValue( "s", marked_choice->text ); - } - } - else - { - return Py_BuildValue( "" ); // None - } -} - -PyObject * getPPDPageSize( PyObject * self, PyObject * args ) -{ - //char buf[1024]; - - if ( ppd != NULL ) - { - ppd_size_t * size = NULL; - float width = 0.0; - float length = 0.0; - ppd_choice_t * page_size = NULL; - - page_size = ppdFindMarkedChoice( ppd, "PageSize" ); - - //sprintf( buf, "print '%s'", page_size->text ); - //PyRun_SimpleString( buf ); - - if ( page_size == NULL ) - goto bailout; - - size = ppdPageSize( ppd, page_size->text ); - - if ( size == NULL ) - goto bailout; - - //sprintf( buf, "print '%s'", size->name ); - //PyRun_SimpleString( buf ); - - width = ppdPageWidth( ppd, page_size->text ); - length = ppdPageLength( ppd, page_size->text ); - - return Py_BuildValue( "(sffffff)", page_size->text, width, length, size->left, - size->bottom, size->right, size->top ); - } - -bailout: - return Py_BuildValue( "(sffffff)", "", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ); -} - -// *************************************************************************************************** - - - -PyObject * resetOptions( PyObject * self, PyObject * args ) -{ - if ( g_num_options > 0 ) - cupsFreeOptions( g_num_options, g_options ); - g_num_options = 0; - g_options = ( cups_option_t * ) 0; - - return Py_BuildValue( "" ); - -} - -PyObject * addOption( PyObject * self, PyObject * args ) -{ - char * option; - - if ( !PyArg_ParseTuple( args, "z", &option ) ) - { - return Py_BuildValue( "i", 0 ); - } - - g_num_options = cupsParseOptions( option, g_num_options, &g_options ); - - return Py_BuildValue( "i", g_num_options ); // >0 -} - -PyObject * removeOption( PyObject * self, PyObject * args ) -{ - char * option; - int j; - int r = 0; - - if ( !PyArg_ParseTuple( args, "z", &option ) ) - { - return Py_BuildValue( "i", 0 ); - } - - for (j = 0; j < g_num_options; j++) - { - if ( !strcasecmp(g_options[j].name, option) ) - { - g_num_options--; - - if ( j < g_num_options ) - { - memcpy( (g_options + j), (g_options + j + 1), - sizeof(cups_option_t) * (g_num_options - j) ); - - r = 1; - } - } - } - - return Py_BuildValue( "i", r ); -} - - -PyObject * getOptions( PyObject * self, PyObject * args ) -{ - PyObject * option_list; - int j; - - option_list = PyList_New( ( Py_ssize_t ) 0 ); - for ( j = 0; j < g_num_options; j++ ) - { - PyList_Append( option_list, Py_BuildValue( "(ss)", g_options[ j ].name, g_options[ j ].value ) ); - } - - return option_list; -} - - -// *************************************************************************************************** - - - -PyObject * getGroupList( PyObject * self, PyObject * args ) -{ - PyObject * group_list; - ppd_group_t *group; - int i; - -/* debug("at 0"); */ - - if ( ppd != NULL && dest != NULL ) - { -/* debug("at 1"); */ - - group_list = PyList_New( ( Py_ssize_t ) 0 ); - for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ ) - { -/* debug(group->name); */ - PyList_Append( group_list, PyObj_from_UTF8( group->name ) ); - } - - return group_list; - } - - return PyList_New( ( Py_ssize_t ) 0 ); -} - - -PyObject * getGroup( PyObject * self, PyObject * args ) -{ - const char *the_group; - ppd_group_t *group; - int i; - - if ( !PyArg_ParseTuple( args, "z", &the_group ) ) - { - goto bailout; - } - - if ( ppd != NULL && dest != NULL ) - { - for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ ) - { - if ( strcasecmp( group->name, the_group ) == 0 ) - { - return Py_BuildValue( "(si)", group->text, group->num_subgroups); - } - } - } - -bailout: - return Py_BuildValue( "" ); -} - - - -PyObject * getOptionList( PyObject * self, PyObject * args ) -{ - PyObject * option_list; - const char *the_group; - ppd_group_t *group; - int i, j; - ppd_option_t *option; - - if ( !PyArg_ParseTuple( args, "z", &the_group ) ) - { - goto bailout; - } - - if ( ppd != NULL && dest != NULL ) - { - option_list = PyList_New( ( Py_ssize_t ) 0 ); - - for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ ) - { - if ( strcasecmp( group->name, the_group ) == 0 ) - { - for ( j = group->num_options, option = group->options; j > 0; j--, option++ ) - { - PyList_Append( option_list, PyObj_from_UTF8( option->keyword ) ); - } - - break; - } - } - - return option_list; - } - - - -bailout: - return PyList_New( ( Py_ssize_t ) 0 ); -} - - - - -PyObject * getOption( PyObject * self, PyObject * args ) -{ - const char *the_group; - const char *the_option; - ppd_group_t *group; - int i, j; - ppd_option_t *option; - - - if ( !PyArg_ParseTuple( args, "zz", &the_group, &the_option ) ) - { - goto bailout; - } - - if ( ppd != NULL && dest != NULL ) - { - - for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ ) - { - if ( strcasecmp( group->name, the_group ) == 0 ) - { - for ( j = group->num_options, option = group->options; j > 0; j--, option++ ) - { - if ( strcasecmp( option->keyword, the_option ) == 0 ) - { - return Py_BuildValue( "(ssbi)", option->text, option->defchoice, - option->conflicted > 0 ? 1 : 0, option->ui ); - } - } - } - } - } - -bailout: - return Py_BuildValue( "" ); -} - - -PyObject * getChoiceList( PyObject * self, PyObject * args ) -{ - PyObject * choice_list; - const char *the_group; - const char *the_option; - ppd_group_t *group; - int i, j, k; - ppd_option_t *option; - ppd_choice_t *choice; - - if ( !PyArg_ParseTuple( args, "zz", &the_group, &the_option ) ) - { - goto bailout; - } - - if ( ppd != NULL && dest != NULL ) - { - choice_list = PyList_New( ( Py_ssize_t ) 0 ); - - for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ ) - { - if ( strcasecmp( group->name, the_group ) == 0 ) - { - for ( j = group->num_options, option = group->options; j > 0; j--, option++ ) - { - if ( strcasecmp( option->keyword, the_option ) == 0 ) - { - for ( k = option->num_choices, choice = option->choices; k > 0; k--, choice++ ) - { - PyList_Append( choice_list, PyObj_from_UTF8( choice->choice ) ); - } - - break; - } - } - break; - } - } - - return choice_list; - } - - -bailout: - return PyList_New( ( Py_ssize_t ) 0 ); -} - - - -PyObject * getChoice( PyObject * self, PyObject * args ) -{ - const char * the_group; - const char *the_option; - const char *the_choice; - ppd_group_t *group; - int i, j, k; - ppd_option_t *option; - ppd_choice_t *choice; - - - if ( !PyArg_ParseTuple( args, "zzz", &the_group, &the_option, &the_choice ) ) - { - goto bailout; - } - - if ( ppd != NULL && dest != NULL ) - { - for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ ) - { - if ( strcasecmp( group->name, the_group ) == 0 ) - { - for ( j = group->num_options, option = group->options; j > 0; j--, option++ ) - { - if ( strcasecmp( option->keyword, the_option ) == 0 ) - { - for ( k = option->num_choices, choice = option->choices; k > 0; k--, choice++ ) - { - if ( strcasecmp( choice->choice, the_choice ) == 0 ) - { - return Py_BuildValue( "(sb)", choice->text, choice->marked > 0 ? 1 : 0 ); - } - } - } - } - } - } - } - - -bailout: - return Py_BuildValue( "" ); - - - -} - -PyObject * setOptions( PyObject * self, PyObject * args ) -{ - if ( ppd != NULL && dest != NULL ) - { - cupsFreeOptions( dest->num_options, dest->options ); - dest->num_options = g_num_options; - dest->options = g_options; - cupsSetDests( g_num_dests, g_dests ); - cupsMarkOptions( ppd, dest->num_options, dest->options ); - } - - return Py_BuildValue( "" ); -} - -// *************************************************************************************************** - -PyObject * printFileWithOptions( PyObject * self, PyObject * args ) -{ - char * printer; - char * filename; - char * title; - int job_id = -1; - cups_dest_t * dests = NULL; - cups_dest_t * dest = NULL; - int num_dests = 0; - int i = 0; - - if ( !PyArg_ParseTuple( args, "zzz", &printer, &filename, &title ) ) - { - return Py_BuildValue( "" ); // None - } - - num_dests = cupsGetDests(&dests); - dest = cupsGetDest( printer, NULL, num_dests, dests ); - - if ( dest != NULL ) - { - for( i = 0; i < dest->num_options; i++ ) - { - if ( cupsGetOption( dest->options[i].name, g_num_options, g_options ) == NULL ) - g_num_options = cupsAddOption( dest->options[i].name, dest->options[i].value, g_num_options, &g_options ); - - } - - job_id = cupsPrintFile( dest->name, filename, title, g_num_options, g_options ); - - return Py_BuildValue( "i", job_id ); - } - - return Py_BuildValue( "i", -1 ); -} - -// *************************************************************************************************** - -static PyObject * passwordFunc = NULL; -static char *passwordPrompt = NULL; - -const char * password_callback(const char * prompt) -{ - - PyObject *result = NULL; - PyObject *usernameObj = NULL; - PyObject *passwordObj = NULL; - char *username = NULL; - char *password = NULL; - - if (passwordFunc != NULL) { - - if (passwordPrompt) - prompt = passwordPrompt; - - result = PyObject_CallFunction(passwordFunc, "s", prompt); - if (!result) - return ""; - - usernameObj = PyTuple_GetItem(result, 0); - if (!usernameObj) - return ""; - username = PyString_AsString(usernameObj); -/* printf("usernameObj=%p, username='%s'\n", usernameObj, username); */ - if (!username) - return ""; - - passwordObj = PyTuple_GetItem(result, 1); - if (!passwordObj) - return ""; - password = PyString_AsString(passwordObj); -/* printf("passwordObj=%p, password='%s'\n", passwordObj, password); */ - if (!password) - return ""; - - cupsSetUser(username); - return password; - - } - - return ""; - -} - -PyObject *setPasswordPrompt(PyObject *self, PyObject *args) -{ - - char *userPrompt = NULL; - - if (!PyArg_ParseTuple(args, "z", &userPrompt)) - return Py_BuildValue(""); - - if (strlen(userPrompt) != 0) - passwordPrompt = userPrompt; - else - passwordPrompt = NULL; - - return Py_BuildValue(""); - -} - -PyObject * setPasswordCallback( PyObject * self, PyObject * args ) -{ - if( !PyArg_ParseTuple( args, "O", &passwordFunc ) ) - { - return Py_BuildValue( "i", 0 ); - } - - cupsSetPasswordCB(password_callback); - - return Py_BuildValue( "i", 1 ); -} - - -PyObject * getPassword( PyObject * self, PyObject * args ) -{ - const char * pwd; - char * prompt; - - if( !PyArg_ParseTuple( args, "s", &prompt ) ) - { - return Py_BuildValue( "" ); - } - - pwd = cupsGetPassword( prompt ); - - if( pwd ) - { - return Py_BuildValue( "s", pwd ); - } - else - { - return Py_BuildValue( "" ); - } -} - - - - - - -// *************************************************************************************************** - -static PyMethodDef cupsext_methods[] = - { - { "getPrinters", ( PyCFunction ) getPrinters, METH_VARARGS }, - { "addPrinter", ( PyCFunction ) addPrinter, METH_VARARGS }, - { "delPrinter", ( PyCFunction ) delPrinter, METH_VARARGS }, - { "getDefaultPrinter", ( PyCFunction ) getDefaultPrinter, METH_VARARGS }, - { "setDefaultPrinter", ( PyCFunction ) setDefaultPrinter, METH_VARARGS }, - { "controlPrinter", ( PyCFunction ) controlPrinter, METH_VARARGS }, - { "getPPDList", ( PyCFunction ) getPPDList, METH_VARARGS }, - { "getPPD", ( PyCFunction ) getPPD, METH_VARARGS }, - { "openPPD", ( PyCFunction ) openPPD, METH_VARARGS }, - { "closePPD", ( PyCFunction ) closePPD, METH_VARARGS }, - { "getPPDOption", ( PyCFunction ) getPPDOption, METH_VARARGS }, - { "getPPDPageSize", ( PyCFunction ) getPPDPageSize, METH_VARARGS }, - { "getVersion", ( PyCFunction ) getVersion, METH_VARARGS }, - { "getVersionTuple", ( PyCFunction ) getVersionTuple, METH_VARARGS }, - { "cancelJob", ( PyCFunction ) cancelJob, METH_VARARGS }, - { "getJobs", ( PyCFunction ) getJobs, METH_VARARGS }, - { "getServer", ( PyCFunction ) getServer, METH_VARARGS }, - { "setServer", ( PyCFunction ) setServer, METH_VARARGS }, - { "addOption", ( PyCFunction ) addOption, METH_VARARGS }, - { "removeOption", ( PyCFunction ) removeOption, METH_VARARGS }, - { "resetOptions", ( PyCFunction ) resetOptions, METH_VARARGS }, - { "printFileWithOptions", ( PyCFunction ) printFileWithOptions, METH_VARARGS }, - { "Job", ( PyCFunction ) newJob, METH_VARARGS | METH_KEYWORDS }, - { "Printer", ( PyCFunction ) newPrinter, METH_VARARGS | METH_KEYWORDS }, - { "getGroupList", ( PyCFunction ) getGroupList, METH_VARARGS }, - { "getGroup", ( PyCFunction ) getGroup, METH_VARARGS }, - { "getOptionList", ( PyCFunction ) getOptionList, METH_VARARGS }, - { "getOption", ( PyCFunction ) getOption, METH_VARARGS }, - { "getChoiceList", ( PyCFunction ) getChoiceList, METH_VARARGS }, - { "getChoice", ( PyCFunction ) getChoice, METH_VARARGS }, - { "setOptions", ( PyCFunction ) setOptions, METH_VARARGS }, - { "getOptions", ( PyCFunction ) getOptions, METH_VARARGS }, - { "setPasswordPrompt", (PyCFunction) setPasswordPrompt, METH_VARARGS }, - { "setPasswordCallback", ( PyCFunction ) setPasswordCallback, METH_VARARGS }, - { "getPassword", ( PyCFunction ) getPassword, METH_VARARGS }, - { NULL, NULL } - }; - - -static char cupsext_documentation[] = "Python extension for CUPS 1.x"; - -void initcupsext( void ) -{ - - PyObject * mod = Py_InitModule4( "cupsext", cupsext_methods, - cupsext_documentation, ( PyObject* ) NULL, - PYTHON_API_VERSION ); - - if ( mod == NULL ) - return ; - - -} - - +/*
+cupsext - Python extension class for CUPS 1.1+
+
+(c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Portions based on:
+"lpadmin" command for the Common UNIX Printing System (CUPS).
+
+Copyright 1997-2003 by Easy Software Products.
+
+These coded instructions, statements, and computer programs are the
+property of Easy Software Products 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 missing or damaged please contact Easy Software Products
+at:
+
+Attn: CUPS Licensing Information
+Easy Software Products
+44141 Airport View Drive, Suite 204
+Hollywood, Maryland 20636-3111 USA
+
+Voice: (301) 373-9603
+EMail: cups-info@cups.org
+ WWW: http://www.cups.org
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of Hewlett-Packard nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PATENT INFRINGEMENT; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Requires:
+CUPS 1.1+
+Python 2.2+
+
+Author:
+Don Welch
+
+*/
+
+
+#include <Python.h>
+#include <structmember.h>
+#include <cups/cups.h>
+#include <cups/language.h>
+#include <cups/ppd.h>
+
+/* Ref: PEP 353 (Python 2.5) */
+#if PY_VERSION_HEX < 0x02050000
+typedef int Py_ssize_t;
+#define PY_SSIZE_T_MAX INT_MAX
+#define PY_SSIZE_T_MIN INT_MIN
+#endif
+
+
+int g_num_options = 0;
+cups_option_t * g_options;
+
+ppd_file_t * ppd = NULL;
+cups_dest_t * dest = NULL;
+
+cups_dest_t * g_dests = NULL;
+int g_num_dests = 0;
+
+const char * g_ppd_file = NULL;
+
+/*
+ * 'validate_name()' - Make sure the printer name only contains valid chars.
+ */
+
+static int /* O - 0 if name is no good, 1 if name is good */
+validate_name( const char *name ) /* I - Name to check */
+{
+ return 1; // TODO: Make it work with utf-8 encoding
+}
+
+static PyObject * PyObj_from_UTF8(const char *utf8)
+{
+ PyObject *val = PyUnicode_Decode(utf8, strlen(utf8), "utf-8", NULL);
+
+ if (!val)
+ {
+ // CUPS 1.2 always gives us UTF-8. Before CUPS 1.2, the
+ // ppd-* strings come straight from the PPD with no
+ // transcoding, but the attributes-charset is still 'utf-8'
+ // so we've no way of knowing the real encoding.
+ // In that case, detect the error and force it to ASCII.
+ char * ascii;
+ const char * orig = utf8;
+ int i;
+
+ PyErr_Clear();
+ ascii = malloc(1 + strlen (orig));
+
+ for (i = 0; orig[i]; i++)
+ {
+ ascii[i] = orig[i] & 0x7f;
+ }
+
+ ascii[i] = '\0';
+ val = PyString_FromString( ascii );
+ free( ascii );
+ }
+
+ return val;
+}
+
+void debug(const char * text)
+{
+ char buf[4096];
+ sprintf( buf, "print '%s'", text);
+ PyRun_SimpleString( buf );
+
+}
+
+staticforward PyTypeObject printer_Type;
+
+#define printerObject_Check(v) ((v)->ob_type == &printer_Type)
+
+typedef struct
+{
+ PyObject_HEAD
+ PyObject * device_uri;
+ PyObject * printer_uri;
+ PyObject * name;
+ PyObject * location;
+ PyObject * makemodel;
+ PyObject * info;
+ int accepting;
+ int state;
+}
+printer_Object;
+
+
+static void printer_dealloc( printer_Object * self )
+{
+
+ Py_XDECREF( self->name );
+ Py_XDECREF( self->device_uri );
+ Py_XDECREF( self->printer_uri );
+ Py_XDECREF( self->location );
+ Py_XDECREF( self->makemodel );
+ Py_XDECREF( self->info );
+ PyObject_DEL( self );
+}
+
+
+static PyMemberDef printer_members[] =
+ {
+ { "device_uri", T_OBJECT_EX, offsetof( printer_Object, device_uri ), 0, "Device URI (device-uri)" },
+ { "printer_uri", T_OBJECT_EX, offsetof( printer_Object, printer_uri ), 0, "Printer URI (printer-uri)" },
+ { "name", T_OBJECT_EX, offsetof( printer_Object, name ), 0, "Name (printer-name)" },
+ { "location", T_OBJECT_EX, offsetof( printer_Object, location ), 0, "Location (printer-location)" },
+ { "makemodel", T_OBJECT_EX, offsetof( printer_Object, makemodel ), 0, "Make and model (printer-make-and-model)" },
+ { "state", T_INT, offsetof( printer_Object, state ), 0, "State (printer-state)" },
+ { "info", T_OBJECT_EX, offsetof( printer_Object, info ), 0, "Info/description (printer-info)" },
+ { "accepting", T_INT, offsetof( printer_Object, accepting ), 0, "Accepting/rejecting" },
+ {0}
+ };
+
+static PyTypeObject printer_Type =
+ {
+ PyObject_HEAD_INIT( &PyType_Type )
+ 0, /* ob_size */
+ "cupsext.Printer", /* tp_name */
+ sizeof( printer_Object ), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ ( destructor ) printer_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ PyObject_GenericGetAttr, /* tp_getattro */
+ PyObject_GenericSetAttr, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+ "CUPS Printer object", /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ 0, /*job_methods, */ /* tp_methods */
+ printer_members, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ 0, /* tp_new */
+ };
+
+
+
+
+static PyObject * _newPrinter( char * device_uri,
+ char * name,
+ char * printer_uri,
+ char * location,
+ char * makemodel,
+ char * info,
+ int state,
+ int accepting )
+{
+ printer_Object * self = PyObject_New( printer_Object, &printer_Type );
+
+ if ( !self )
+ return NULL;
+
+ if ( device_uri != NULL )
+ self->device_uri = Py_BuildValue( "s", device_uri );
+
+ if ( printer_uri != NULL )
+ self->printer_uri = Py_BuildValue( "s", printer_uri );
+
+ if ( name != NULL )
+ self->name = Py_BuildValue( "s", name );
+
+ if ( location != NULL )
+ self->location = Py_BuildValue( "s", location );
+
+ if ( makemodel != NULL )
+ self->makemodel = Py_BuildValue( "s", makemodel );
+
+ if ( info != NULL )
+ self->info = Py_BuildValue( "s", info );
+
+ self->accepting = accepting;
+ self->state = state;
+
+ return ( PyObject * ) self;
+}
+
+static PyObject * newPrinter( PyObject * self, PyObject * args, PyObject * kwargs )
+{
+ char * device_uri = "";
+ char * name = "";
+ char * location = "";
+ char * makemodel = "";
+ int state = 0;
+ char * printer_uri = "";
+ char * info = "";
+ int accepting = 0;
+
+ char * kwds[] = { "device_uri", "name", "printer_uri", "location",
+ "makemodel", "info", "state", "accepting", NULL };
+
+ if ( !PyArg_ParseTupleAndKeywords( args, kwargs, "zz|zzzzii", kwds,
+ &device_uri, &name, &printer_uri,
+ &location, &makemodel, &info, &state,
+ &accepting ) )
+ return NULL;
+
+ return _newPrinter( device_uri, printer_uri, name, location, makemodel, info, state, accepting);
+}
+
+
+
+PyObject * getPrinters( PyObject * self, PyObject * args )
+{
+ http_t * http = NULL; /* HTTP object */
+ ipp_t *request = NULL; /* IPP request object */
+ ipp_t *response = NULL; /* IPP response object */
+ ipp_attribute_t *attr; /* Current IPP attribute */
+ PyObject * printer_list;
+ cups_lang_t * language;
+
+ static const char * attrs[] = /* Requested attributes */
+ {
+ "printer-info",
+ "printer-location",
+ "printer-make-and-model",
+ "printer-state",
+ "printer-name",
+ "device-uri",
+ "printer-uri-supported",
+ "printer-is-accepting-jobs",
+ };
+
+ /* Connect to the HTTP server */
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ goto abort;
+ }
+
+ /* Assemble the IPP request */
+ request = ippNew();
+ language = cupsLangDefault();
+
+ request->request.op.operation_id = CUPS_GET_PRINTERS;
+ request->request.any.request_id = 1;
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+ "attributes-charset", NULL, cupsLangEncoding( language ) );
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+ "attributes-natural-language", NULL, language->language );
+
+ ippAddStrings( request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+ "requested-attributes", sizeof( attrs ) / sizeof( attrs[ 0 ] ),
+ NULL, attrs );
+
+ /* Send the request and get a response. */
+ if ( ( response = cupsDoRequest( http, request, "/" ) ) == NULL )
+ {
+ goto abort;
+ }
+
+ Py_ssize_t max_count = 0;
+
+ for ( attr = ippFindAttribute( response, "printer-name", IPP_TAG_NAME ),
+ max_count = 0;
+ attr != NULL;
+ attr = ippFindNextAttribute( response, "printer-name", IPP_TAG_NAME ),
+ max_count++ )
+ ;
+
+ if ( max_count > 0 )
+ {
+
+ //printer_list = PyList_New( max_count );
+ printer_list = PyList_New( 0 );
+
+ char * device_uri = "";
+ char * printer_uri = "";
+ char * info = "";
+ char * location = "";
+ char * make_model = "";
+ char * name = "";
+ int accepting = 0;
+ cups_ptype_t type;
+ ipp_pstate_t state;
+ int i = 0;
+
+ for ( attr = response->attrs; attr != NULL; attr = attr->next )
+ {
+ while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
+ attr = attr->next;
+
+ if ( attr == NULL )
+ break;
+
+ type = CUPS_PRINTER_REMOTE;
+ state = IPP_PRINTER_IDLE;
+ accepting = 0;
+
+ while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
+ {
+ if ( strcmp( attr->name, "printer-name" ) == 0 &&
+ attr->value_tag == IPP_TAG_NAME )
+ name = attr->values[ 0 ].string.text;
+
+ else if ( strcmp( attr->name, "device-uri" ) == 0 &&
+ attr->value_tag == IPP_TAG_URI )
+ device_uri = attr->values[ 0 ].string.text;
+
+ else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
+ attr->value_tag == IPP_TAG_URI )
+ printer_uri = attr->values[ 0 ].string.text;
+
+ else if ( strcmp( attr->name, "printer-info" ) == 0 &&
+ attr->value_tag == IPP_TAG_TEXT )
+ info = attr->values[ 0 ].string.text;
+
+ else if ( strcmp( attr->name, "printer-location" ) == 0 &&
+ attr->value_tag == IPP_TAG_TEXT )
+ location = attr->values[ 0 ].string.text;
+
+ else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
+ attr->value_tag == IPP_TAG_TEXT )
+ make_model = attr->values[ 0 ].string.text;
+
+ else if ( strcmp( attr->name, "printer-state" ) == 0 &&
+ attr->value_tag == IPP_TAG_ENUM )
+ state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
+
+ else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+ attr->value_tag == IPP_TAG_BOOLEAN)
+ accepting = attr->values[ 0 ].boolean;
+
+ attr = attr->next;
+ }
+
+ if ( device_uri == NULL )
+ {
+ if ( attr == NULL )
+ break;
+ else
+ continue;
+ }
+
+ printer_Object * printer;
+ printer = ( printer_Object * ) _newPrinter( device_uri, name, printer_uri, location, make_model,
+ info, state, accepting );
+
+ //PyList_SetItem( printer_list, i, ( PyObject * ) printer );
+ PyList_Append( printer_list, ( PyObject * ) printer );
+
+ i++;
+
+ if ( attr == NULL )
+ break;
+ }
+
+ return printer_list;
+ }
+abort:
+ if ( response != NULL )
+ ippDelete( response );
+
+ if ( http != NULL )
+ httpClose( http );
+
+ printer_list = PyList_New( ( Py_ssize_t ) 0 );
+ return printer_list;
+}
+
+
+PyObject * addPrinter( PyObject * self, PyObject * args )
+{
+ //char buf[1024];
+ ipp_status_t status;
+ http_t *http = NULL; /* HTTP object */
+ ipp_t *request = NULL; /* IPP request object */
+ ipp_t *response = NULL; /* IPP response object */
+ cups_lang_t * language;
+ int r;
+ char printer_uri[ HTTP_MAX_URI ];
+ char * name, * device_uri, *location, *ppd_file, * info, * model;
+ const char * status_str = "successful-ok";
+
+ if ( !PyArg_ParseTuple( args, "zzzzzz",
+ &name, // name of printer
+ &device_uri, // DeviceURI (e.g., hp:/usb/PSC_2200_Series?serial=0000000010)
+ &location, // location of printer
+ &ppd_file, // path to PPD file (uncompressed, must exist)
+ &model, // model name (e.g., foomatic:...)
+ &info // info/description
+ ) )
+ {
+ r = 0;
+ status_str = "Invalid arguments";
+ goto abort;
+ }
+
+ if ( ( strlen( ppd_file ) > 0 && strlen( model ) > 0 ) ||
+ ( strlen( ppd_file ) == 0 && strlen( model ) == 0) )
+ {
+ r = 0;
+ status_str = "Invalid arguments: specify only ppd_file or model, not both or neither";
+ goto abort;
+ }
+
+ if ( !validate_name( name ) )
+ {
+ r = 0;
+ status_str = "Invalid printer name";
+ goto abort;
+ }
+
+
+ sprintf( printer_uri, "ipp://localhost/printers/%s", name );
+
+ if ( info == NULL )
+ strcpy( info, name );
+
+ /* Connect to the HTTP server */
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ r = 0;
+ status_str = "Unable to connect to CUPS server";
+ goto abort;
+ }
+
+ /* Assemble the IPP request */
+ request = ippNew();
+ language = cupsLangDefault();
+
+ request->request.op.operation_id = CUPS_ADD_PRINTER;
+ request->request.any.request_id = 1;
+
+ 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 );
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI,
+ "printer-uri", NULL, printer_uri );
+
+ ippAddInteger( request, IPP_TAG_PRINTER, IPP_TAG_ENUM,
+ "printer-state", IPP_PRINTER_IDLE );
+
+ ippAddBoolean( request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1 );
+
+ ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL,
+ device_uri );
+
+ ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info", NULL,
+ info );
+
+ ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-location", NULL,
+ location );
+
+ if ( strlen( model ) > 0 )
+ {
+ ippAddString( request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name", NULL, model );
+
+ /* Send the request and get a response. */
+ response = cupsDoRequest( http, request, "/admin/" );
+ }
+ else
+ {
+ /* Send the request and get a response. */
+ response = cupsDoFileRequest( http, request, "/admin/", ppd_file );
+ }
+
+ if ( response == NULL )
+ {
+ status = cupsLastError();
+ r = 0;
+ }
+ else
+ {
+ status = response->request.status.status_code;
+ //ippDelete( response );
+ r = 1;
+ }
+
+ status_str = ippErrorString( status );
+
+abort:
+
+ if ( http != NULL )
+ httpClose( http );
+
+ if ( response != NULL )
+ ippDelete( response );
+
+ return Py_BuildValue( "is", r, status_str );
+
+}
+
+/*
+ * 'delPrinter()' - Delete a printer from the system...
+ */
+PyObject * delPrinter( PyObject * self, PyObject * args )
+{
+ ipp_t * request = NULL, /* IPP Request */
+ *response = NULL; /* IPP Response */
+ cups_lang_t *language; /* Default language */
+ char uri[ HTTP_MAX_URI ]; /* URI for printer/class */
+ char * name;
+ http_t *http = NULL; /* HTTP object */
+ int r = 0;
+ const char *username = NULL;
+
+ username = cupsUser();
+
+ if ( !PyArg_ParseTuple( args, "z",
+ &name ) ) // name of printer
+ {
+ goto abort;
+ }
+
+ if ( !validate_name( name ) )
+ {
+ goto abort;
+ }
+
+ /* Connect to the HTTP server */
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ goto abort;
+ }
+ snprintf( uri, sizeof( uri ), "ipp://localhost/printers/%s", name );
+
+ /*
+ * Build a CUPS_DELETE_PRINTER request, which requires the following
+ * attributes:
+ *
+ * attributes-charset
+ * attributes-natural-language
+ * printer-uri
+ */
+ request = ippNew();
+
+ request->request.op.operation_id = CUPS_DELETE_PRINTER;
+ 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 );
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI,
+ "printer-uri", NULL, uri );
+
+ /*
+ * Do the request and get back a response...
+ */
+ response = cupsDoRequest( http, request, "/admin/" );
+
+ if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+ {
+ r = 1;
+ }
+
+abort:
+ if (username)
+ cupsSetUser(username);
+
+ if ( http != NULL )
+ httpClose( http );
+
+ if ( response != NULL )
+ ippDelete( response );
+
+ return Py_BuildValue( "i", r );
+
+}
+
+/*
+ * 'setDefaultPrinter()' - Set the default printing destination.
+ */
+
+PyObject * setDefaultPrinter( PyObject * self, PyObject * args )
+
+{
+ char uri[ HTTP_MAX_URI ]; /* URI for printer/class */
+ ipp_t *request = NULL, /* IPP Request */
+ *response = NULL; /* IPP Response */
+ cups_lang_t *language; /* Default language */
+ char * name;
+ http_t *http = NULL; /* HTTP object */
+ int r = 0;
+ const char *username = NULL;
+
+ username = cupsUser();
+
+ if ( !PyArg_ParseTuple( args, "z",
+ &name ) ) // name of printer
+ {
+ goto abort;
+ }
+
+ //char buf[1024];
+ //sprintf( buf, "print '%s'", name);
+ //PyRun_SimpleString( buf );
+
+ if ( !validate_name( name ) )
+ {
+ goto abort;
+ }
+
+ /* Connect to the HTTP server */
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ goto abort;
+ }
+
+ /*
+ * Build a CUPS_SET_DEFAULT request, which requires the following
+ * attributes:
+ *
+ * attributes-charset
+ * attributes-natural-language
+ * printer-uri
+ */
+
+ snprintf( uri, sizeof( uri ), "ipp://localhost/printers/%s", name );
+
+ request = ippNew();
+
+ request->request.op.operation_id = CUPS_SET_DEFAULT;
+ request->request.op.request_id = 1;
+
+ language = cupsLangDefault();
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+ "attributes-charset", NULL, "utf-8" ); //cupsLangEncoding( language ) );
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+ "attributes-natural-language",
+ //NULL, language != NULL ? language->language : "en");
+ NULL, language->language );
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI,
+ "printer-uri", NULL, uri );
+
+ /*
+ * Do the request and get back a response...
+ */
+
+ response = cupsDoRequest( http, request, "/admin/" );
+
+ if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+ {
+ r = 1;
+ }
+
+abort:
+ if (username)
+ cupsSetUser(username);
+
+ if ( http != NULL )
+ httpClose( http );
+
+ if ( response != NULL )
+ ippDelete( response );
+
+ return Py_BuildValue( "i", r );
+
+
+}
+
+
+
+PyObject * controlPrinter( PyObject * self, PyObject * args )
+{
+ ipp_t *request = NULL, /* IPP Request */
+ *response = NULL; /* IPP Response */
+ char * name;
+ http_t *http = NULL; /* HTTP object */
+ int op;
+ int r = 0;
+ char uri[ HTTP_MAX_URI ]; /* URI for printer/class */
+ cups_lang_t *language;
+ const char *username = NULL;
+
+ username = cupsUser();
+
+ if ( !PyArg_ParseTuple( args, "zi", &name, &op) )
+ {
+ goto abort;
+ }
+
+ if ( !validate_name( name ) )
+ {
+ goto abort;
+ }
+
+ /* Connect to the HTTP server */
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ goto abort;
+ }
+
+ request = ippNew();
+
+ request->request.op.operation_id = op;
+ request->request.op.request_id = 1;
+
+ language = cupsLangDefault();
+
+ snprintf( uri, sizeof( uri ), "ipp://localhost/printers/%s", name );
+
+ 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 );
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_URI,
+ "printer-uri", NULL, uri );
+
+
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+ "requesting-user-name", NULL, cupsUser());
+
+ if (op == IPP_PURGE_JOBS)
+ ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", 1);
+
+ response = cupsDoRequest(http, request, "/admin/");
+
+ if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
+ {
+ r = 1;
+ }
+
+abort:
+ if (username)
+ cupsSetUser(username);
+
+ if ( http != NULL )
+ httpClose( http );
+
+ if ( response != NULL )
+ ippDelete( response );
+
+ return Py_BuildValue( "i", r );;
+}
+
+
+
+staticforward PyTypeObject job_Type;
+
+typedef struct
+{
+ PyObject_HEAD
+ int id;
+ PyObject * dest;
+ PyObject * title;
+ PyObject * user;
+ int state;
+ int size;
+}
+job_Object;
+
+
+
+static void job_dealloc( job_Object * self )
+{
+
+ Py_XDECREF( self->dest );
+ Py_XDECREF( self->title );
+ Py_XDECREF( self->user );
+ PyObject_DEL( self );
+}
+
+static PyMemberDef job_members[] =
+ {
+ { "id", T_INT, offsetof( job_Object, id ), 0, "Id" },
+ { "dest", T_OBJECT_EX, offsetof( job_Object, dest ), 0, "Destination" },
+ { "state", T_INT, offsetof( job_Object, state ), 0, "State" },
+ { "title", T_OBJECT_EX, offsetof( job_Object, title ), 0, "Title" },
+ { "user", T_OBJECT_EX, offsetof( job_Object, user ), 0, "User" },
+ { "size", T_INT, offsetof( job_Object, size ), 0, "Size" },
+ {0}
+ };
+
+
+
+static PyTypeObject job_Type =
+ {
+ PyObject_HEAD_INIT( &PyType_Type )
+ 0, /* ob_size */
+ "Job", /* tp_name */
+ sizeof( job_Object ), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ ( destructor ) job_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ PyObject_GenericGetAttr, /* tp_getattro */
+ PyObject_GenericSetAttr, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT, /* tp_flags */
+ "CUPS Job object", /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ 0, /*job_methods, */ /* tp_methods */
+ job_members, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, //(initproc)job_init, /* tp_init */
+ 0, /* tp_alloc */
+ //PyType_GenericAlloc,
+ 0, //job_new, /* tp_new */
+ //PyType_GenericNew,
+ };
+
+
+static /*job_Object **/ PyObject * _newJob( int id, int state, char * dest, char * title, char * user, int size )
+{
+ job_Object * jo;
+ jo = PyObject_New( job_Object, &job_Type );
+ if ( jo == NULL )
+ return NULL;
+ jo->id = id;
+ jo->size = size;
+ jo->state = state;
+ if ( dest != NULL )
+ jo->dest = PyObj_from_UTF8( dest );
+ else
+ jo->dest = Py_BuildValue( "" );
+
+ if ( title != NULL )
+ jo->title = PyObj_from_UTF8( title );
+ else
+ jo->title = Py_BuildValue( "" );
+
+ if ( user != NULL )
+ jo->user = PyObj_from_UTF8( user );
+ else
+ jo->user = Py_BuildValue( "" );
+
+ return ( PyObject * ) jo;
+
+}
+
+static /*job_Object **/ PyObject * newJob( PyObject * self, PyObject * args, PyObject * kwargs )
+{
+ char * dest = "";
+ int id = 0;
+ int state = 0;
+ char * title = "";
+ char * user = "";
+ int size = 0;
+
+ char * kwds[] = { "id", "state", "dest", "title", "user", "size", NULL };
+
+ if ( !PyArg_ParseTupleAndKeywords( args, kwargs, "i|izzzi", kwds,
+ &id, &state, &dest, &title, &user, &size ) )
+ return NULL;
+
+ return _newJob( id, state, dest, title, user, size );
+
+}
+
+
+
+
+PyObject * getDefaultPrinter( PyObject * self, PyObject * args )
+{
+ const char * defdest;
+ defdest = cupsGetDefault();
+
+ /*char buf[1024];
+ sprintf( buf, "print 'Default Printer: %s'", defdest);
+ PyRun_SimpleString( buf );
+ */
+
+ if ( defdest == NULL )
+ return Py_BuildValue( "" ); // None
+ else
+ return Py_BuildValue( "s", defdest );
+
+}
+
+
+PyObject * cancelJob( PyObject * self, PyObject * args ) // cancelJob( dest, jobid )
+{
+ int status;
+ int jobid;
+ char * dest;
+
+ if ( !PyArg_ParseTuple( args, "si", &dest, &jobid ) )
+ {
+ return Py_BuildValue( "i", 0 );
+ }
+
+ status = cupsCancelJob( dest, jobid );
+
+ return Py_BuildValue( "i", status );
+}
+
+PyObject * getJobs( PyObject * self, PyObject * args )
+{
+ cups_job_t * jobs;
+ Py_ssize_t i;
+ int num_jobs;
+ PyObject * job_list;
+ int my_job;
+ int completed;
+
+ if ( !PyArg_ParseTuple( args, "ii", &my_job, &completed ) )
+ {
+ return PyList_New( ( Py_ssize_t ) 0 );
+ }
+
+ num_jobs = cupsGetJobs( &jobs, NULL, my_job, completed );
+
+ if ( num_jobs > 0 )
+ {
+ job_list = PyList_New( num_jobs );
+
+ for ( i = 0; i < num_jobs; i++ )
+ {
+ job_Object * newjob;
+ newjob = ( job_Object * ) _newJob( jobs[ i ].id,
+ jobs[ i ].state,
+ jobs[ i ].dest,
+ jobs[ i ].title,
+ jobs[ i ].user,
+ jobs[ i ].size );
+
+ PyList_SetItem( job_list, i, ( PyObject * ) newjob );
+
+ }
+ cupsFreeJobs( num_jobs, jobs );
+ }
+ else
+ {
+ job_list = PyList_New( ( Py_ssize_t ) 0 );
+ }
+ return job_list;
+}
+
+PyObject * getVersion( PyObject * self, PyObject * args )
+{
+ return Py_BuildValue( "f", CUPS_VERSION );
+}
+
+PyObject * getVersionTuple( PyObject * self, PyObject * args )
+{
+ return Py_BuildValue( "(iii)", CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH );
+}
+
+PyObject * getServer( PyObject * self, PyObject * args )
+{
+ return Py_BuildValue( "s", cupsServer() );
+}
+
+PyObject * setServer( PyObject * self, PyObject * args )
+{
+ char * server = NULL;
+
+ if (!PyArg_ParseTuple(args, "z", &server))
+ return Py_BuildValue( "" );
+
+ if (!strlen(server)) // Pass an empty string to restore default server
+ server = NULL;
+
+ cupsSetServer(server);
+
+ return Py_BuildValue( "" );
+}
+
+
+// ***************************************************************************************************
+
+PyObject * getPPDList( PyObject * self, PyObject * args )
+{
+
+/*
+ * Build a CUPS_GET_PPDS request, which requires the following
+ * attributes:
+ *
+ * attributes-charset
+ * attributes-natural-language
+ * printer-uri
+ */
+
+ ipp_t *request = NULL, /* IPP Request */
+ *response = NULL; /* IPP Response */
+ PyObject * result;
+ cups_lang_t *language;
+ ipp_attribute_t * attr;
+ //PyObject * ppd_list;
+ http_t *http = NULL; /* HTTP object */
+ //char buf[1024];
+
+ result = PyDict_New ();
+
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ goto abort;
+ }
+
+ request = ippNew();
+
+ request->request.op.operation_id = CUPS_GET_PPDS;
+ 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);
+
+ //ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+ // NULL, "ipp://localhost/printers/");
+
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+ NULL, "ipp://localhost/printers/officejet_4100");
+
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "requested-attributes",
+ NULL, "all");
+
+ /*
+ * Do the request and get back a response...
+ */
+
+ if ((response = cupsDoRequest(http, request, "/")) != NULL)
+ {
+
+ for (attr = response->attrs; attr; attr = attr->next)
+ {
+ PyObject *dict;
+ char *ppdname = NULL;
+
+ while (attr && attr->group_tag != IPP_TAG_PRINTER)
+ attr = attr->next;
+
+ if (!attr)
+ break;
+
+ dict = PyDict_New ();
+
+ for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
+ {
+ PyObject *val = NULL;
+
+ if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
+ {
+ ppdname = attr->values[0].string.text;
+
+ //sprintf( buf, "print '%s'", ppdname);
+ //PyRun_SimpleString( buf );
+ }
+
+ else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
+ //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
+ // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
+ // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
+ // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
+ {
+ val = PyObj_from_UTF8(attr->values[0].string.text);
+ }
+
+ if (val)
+ {
+ PyDict_SetItemString (dict, attr->name, val);
+ Py_DECREF (val);
+ }
+ }
+
+ if (ppdname)
+ {
+ PyDict_SetItemString (result, ppdname, dict);
+ }
+ else
+ {
+ Py_DECREF (dict);
+ }
+
+ if (!attr)
+ break;
+ }
+
+ //return result;
+ }
+
+abort:
+ if ( http != NULL )
+ httpClose( http );
+
+ if ( response != NULL )
+ ippDelete( response );
+
+ return result;
+}
+
+
+PyObject * openPPD( PyObject * self, PyObject * args )
+{
+ char * printer;
+ FILE * file;
+ int j;
+
+ if ( !PyArg_ParseTuple( args, "z", &printer ) )
+ {
+ return Py_BuildValue( "" ); // None
+ }
+
+ if ( ( g_ppd_file = cupsGetPPD( ( const char * ) printer ) ) == NULL )
+ {
+ goto bailout;
+ }
+
+ if ( ( file = fopen( g_ppd_file, "r" )) == NULL )
+ {
+ unlink(g_ppd_file);
+ g_ppd_file = NULL;
+ goto bailout;
+ }
+
+ ppd = ppdOpen( file );
+ ppdLocalize( ppd );
+ fclose( file );
+
+ g_num_dests = cupsGetDests( &g_dests );
+
+ if ( g_num_dests == 0 )
+ {
+ goto bailout;
+ }
+
+ if ( ( dest = cupsGetDest( printer, NULL, g_num_dests, g_dests ) ) == NULL )
+ {
+ goto bailout;
+ }
+
+ ppdMarkDefaults( ppd );
+ cupsMarkOptions( ppd, dest->num_options, dest->options );
+
+ for ( j = 0; j < dest->num_options; j++ )
+ {
+ if ( cupsGetOption( dest->options[ j ].name, g_num_options, g_options ) == NULL )
+ {
+ g_num_options = cupsAddOption( dest->options[ j ].name, dest->options[ j ].value, g_num_options, &g_options );
+ }
+ }
+
+bailout:
+ return Py_BuildValue( "s", g_ppd_file );
+}
+
+
+PyObject * closePPD( PyObject * self, PyObject * args )
+{
+ if ( ppd != NULL )
+ {
+ ppdClose( ppd );
+ unlink( g_ppd_file );
+ }
+
+ ppd = NULL;
+
+ return Py_BuildValue( "" ); // None
+}
+
+
+PyObject * getPPD( PyObject * self, PyObject * args )
+{
+ char * printer;
+
+ if ( !PyArg_ParseTuple( args, "z", &printer ) )
+ {
+ return Py_BuildValue( "" ); // None
+ }
+
+ const char * ppd_file;
+ ppd_file = cupsGetPPD( ( const char * ) printer );
+
+ return Py_BuildValue( "s", ppd_file );
+
+}
+
+
+PyObject * getPPDOption( PyObject * self, PyObject * args )
+{
+ if ( ppd != NULL )
+ {
+ char * option;
+
+ if ( !PyArg_ParseTuple( args, "z", &option ) )
+ {
+ return Py_BuildValue( "" ); // None
+ }
+
+ ppd_choice_t * marked_choice;
+ marked_choice = ppdFindMarkedChoice( ppd, option );
+
+ if ( marked_choice == NULL )
+ {
+ return Py_BuildValue( "" ); // None
+ }
+ else
+ {
+ return Py_BuildValue( "s", marked_choice->text );
+ }
+ }
+ else
+ {
+ return Py_BuildValue( "" ); // None
+ }
+}
+
+PyObject * getPPDPageSize( PyObject * self, PyObject * args )
+{
+ //char buf[1024];
+
+ if ( ppd != NULL )
+ {
+ ppd_size_t * size = NULL;
+ float width = 0.0;
+ float length = 0.0;
+ ppd_choice_t * page_size = NULL;
+
+ page_size = ppdFindMarkedChoice( ppd, "PageSize" );
+
+ //sprintf( buf, "print '%s'", page_size->text );
+ //PyRun_SimpleString( buf );
+
+ if ( page_size == NULL )
+ goto bailout;
+
+ size = ppdPageSize( ppd, page_size->text );
+
+ if ( size == NULL )
+ goto bailout;
+
+ //sprintf( buf, "print '%s'", size->name );
+ //PyRun_SimpleString( buf );
+
+ width = ppdPageWidth( ppd, page_size->text );
+ length = ppdPageLength( ppd, page_size->text );
+
+ return Py_BuildValue( "(sffffff)", page_size->text, width, length, size->left,
+ size->bottom, size->right, size->top );
+ }
+
+bailout:
+ return Py_BuildValue( "(sffffff)", "", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 );
+}
+
+// ***************************************************************************************************
+
+
+
+PyObject * resetOptions( PyObject * self, PyObject * args )
+{
+ if ( g_num_options > 0 )
+ cupsFreeOptions( g_num_options, g_options );
+ g_num_options = 0;
+ g_options = ( cups_option_t * ) 0;
+
+ return Py_BuildValue( "" );
+
+}
+
+PyObject * addOption( PyObject * self, PyObject * args )
+{
+ char * option;
+
+ if ( !PyArg_ParseTuple( args, "z", &option ) )
+ {
+ return Py_BuildValue( "i", 0 );
+ }
+
+ g_num_options = cupsParseOptions( option, g_num_options, &g_options );
+
+ return Py_BuildValue( "i", g_num_options ); // >0
+}
+
+PyObject * removeOption( PyObject * self, PyObject * args )
+{
+ char * option;
+ int j;
+ int r = 0;
+
+ if ( !PyArg_ParseTuple( args, "z", &option ) )
+ {
+ return Py_BuildValue( "i", 0 );
+ }
+
+ for (j = 0; j < g_num_options; j++)
+ {
+ if ( !strcasecmp(g_options[j].name, option) )
+ {
+ g_num_options--;
+
+ if ( j < g_num_options )
+ {
+ memcpy( (g_options + j), (g_options + j + 1),
+ sizeof(cups_option_t) * (g_num_options - j) );
+
+ r = 1;
+ }
+ }
+ }
+
+ return Py_BuildValue( "i", r );
+}
+
+
+PyObject * getOptions( PyObject * self, PyObject * args )
+{
+ PyObject * option_list;
+ int j;
+
+ option_list = PyList_New( ( Py_ssize_t ) 0 );
+ for ( j = 0; j < g_num_options; j++ )
+ {
+ PyList_Append( option_list, Py_BuildValue( "(ss)", g_options[ j ].name, g_options[ j ].value ) );
+ }
+
+ return option_list;
+}
+
+
+// ***************************************************************************************************
+
+
+
+PyObject * getGroupList( PyObject * self, PyObject * args )
+{
+ PyObject * group_list;
+ ppd_group_t *group;
+ int i;
+
+/* debug("at 0"); */
+
+ if ( ppd != NULL && dest != NULL )
+ {
+/* debug("at 1"); */
+
+ group_list = PyList_New( ( Py_ssize_t ) 0 );
+ for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ )
+ {
+/* debug(group->name); */
+ PyList_Append( group_list, PyObj_from_UTF8( group->name ) );
+ }
+
+ return group_list;
+ }
+
+ return PyList_New( ( Py_ssize_t ) 0 );
+}
+
+
+PyObject * getGroup( PyObject * self, PyObject * args )
+{
+ const char *the_group;
+ ppd_group_t *group;
+ int i;
+
+ if ( !PyArg_ParseTuple( args, "z", &the_group ) )
+ {
+ goto bailout;
+ }
+
+ if ( ppd != NULL && dest != NULL )
+ {
+ for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ )
+ {
+ if ( strcasecmp( group->name, the_group ) == 0 )
+ {
+ return Py_BuildValue( "(si)", group->text, group->num_subgroups);
+ }
+ }
+ }
+
+bailout:
+ return Py_BuildValue( "" );
+}
+
+
+
+PyObject * getOptionList( PyObject * self, PyObject * args )
+{
+ PyObject * option_list;
+ const char *the_group;
+ ppd_group_t *group;
+ int i, j;
+ ppd_option_t *option;
+
+ if ( !PyArg_ParseTuple( args, "z", &the_group ) )
+ {
+ goto bailout;
+ }
+
+ if ( ppd != NULL && dest != NULL )
+ {
+ option_list = PyList_New( ( Py_ssize_t ) 0 );
+
+ for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ )
+ {
+ if ( strcasecmp( group->name, the_group ) == 0 )
+ {
+ for ( j = group->num_options, option = group->options; j > 0; j--, option++ )
+ {
+ PyList_Append( option_list, PyObj_from_UTF8( option->keyword ) );
+ }
+
+ break;
+ }
+ }
+
+ return option_list;
+ }
+
+
+
+bailout:
+ return PyList_New( ( Py_ssize_t ) 0 );
+}
+
+
+
+
+PyObject * getOption( PyObject * self, PyObject * args )
+{
+ const char *the_group;
+ const char *the_option;
+ ppd_group_t *group;
+ int i, j;
+ ppd_option_t *option;
+
+
+ if ( !PyArg_ParseTuple( args, "zz", &the_group, &the_option ) )
+ {
+ goto bailout;
+ }
+
+ if ( ppd != NULL && dest != NULL )
+ {
+
+ for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ )
+ {
+ if ( strcasecmp( group->name, the_group ) == 0 )
+ {
+ for ( j = group->num_options, option = group->options; j > 0; j--, option++ )
+ {
+ if ( strcasecmp( option->keyword, the_option ) == 0 )
+ {
+ return Py_BuildValue( "(ssbi)", option->text, option->defchoice,
+ option->conflicted > 0 ? 1 : 0, option->ui );
+ }
+ }
+ }
+ }
+ }
+
+bailout:
+ return Py_BuildValue( "" );
+}
+
+
+PyObject * getChoiceList( PyObject * self, PyObject * args )
+{
+ PyObject * choice_list;
+ const char *the_group;
+ const char *the_option;
+ ppd_group_t *group;
+ int i, j, k;
+ ppd_option_t *option;
+ ppd_choice_t *choice;
+
+ if ( !PyArg_ParseTuple( args, "zz", &the_group, &the_option ) )
+ {
+ goto bailout;
+ }
+
+ if ( ppd != NULL && dest != NULL )
+ {
+ choice_list = PyList_New( ( Py_ssize_t ) 0 );
+
+ for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ )
+ {
+ if ( strcasecmp( group->name, the_group ) == 0 )
+ {
+ for ( j = group->num_options, option = group->options; j > 0; j--, option++ )
+ {
+ if ( strcasecmp( option->keyword, the_option ) == 0 )
+ {
+ for ( k = option->num_choices, choice = option->choices; k > 0; k--, choice++ )
+ {
+ PyList_Append( choice_list, PyObj_from_UTF8( choice->choice ) );
+ }
+
+ break;
+ }
+ }
+ break;
+ }
+ }
+
+ return choice_list;
+ }
+
+
+bailout:
+ return PyList_New( ( Py_ssize_t ) 0 );
+}
+
+
+
+PyObject * getChoice( PyObject * self, PyObject * args )
+{
+ const char * the_group;
+ const char *the_option;
+ const char *the_choice;
+ ppd_group_t *group;
+ int i, j, k;
+ ppd_option_t *option;
+ ppd_choice_t *choice;
+
+
+ if ( !PyArg_ParseTuple( args, "zzz", &the_group, &the_option, &the_choice ) )
+ {
+ goto bailout;
+ }
+
+ if ( ppd != NULL && dest != NULL )
+ {
+ for ( i = ppd->num_groups, group = ppd->groups; i > 0; i--, group++ )
+ {
+ if ( strcasecmp( group->name, the_group ) == 0 )
+ {
+ for ( j = group->num_options, option = group->options; j > 0; j--, option++ )
+ {
+ if ( strcasecmp( option->keyword, the_option ) == 0 )
+ {
+ for ( k = option->num_choices, choice = option->choices; k > 0; k--, choice++ )
+ {
+ if ( strcasecmp( choice->choice, the_choice ) == 0 )
+ {
+ return Py_BuildValue( "(sb)", choice->text, choice->marked > 0 ? 1 : 0 );
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+bailout:
+ return Py_BuildValue( "" );
+
+
+
+}
+
+PyObject * setOptions( PyObject * self, PyObject * args )
+{
+ if ( ppd != NULL && dest != NULL )
+ {
+ cupsFreeOptions( dest->num_options, dest->options );
+ dest->num_options = g_num_options;
+ dest->options = g_options;
+ cupsSetDests( g_num_dests, g_dests );
+ cupsMarkOptions( ppd, dest->num_options, dest->options );
+ }
+
+ return Py_BuildValue( "" );
+}
+
+// ***************************************************************************************************
+
+PyObject * printFileWithOptions( PyObject * self, PyObject * args )
+{
+ char * printer;
+ char * filename;
+ char * title;
+ int job_id = -1;
+ cups_dest_t * dests = NULL;
+ cups_dest_t * dest = NULL;
+ int num_dests = 0;
+ int i = 0;
+
+ if ( !PyArg_ParseTuple( args, "zzz", &printer, &filename, &title ) )
+ {
+ return Py_BuildValue( "" ); // None
+ }
+
+ num_dests = cupsGetDests(&dests);
+ dest = cupsGetDest( printer, NULL, num_dests, dests );
+
+ if ( dest != NULL )
+ {
+ for( i = 0; i < dest->num_options; i++ )
+ {
+ if ( cupsGetOption( dest->options[i].name, g_num_options, g_options ) == NULL )
+ g_num_options = cupsAddOption( dest->options[i].name, dest->options[i].value, g_num_options, &g_options );
+
+ }
+
+ job_id = cupsPrintFile( dest->name, filename, title, g_num_options, g_options );
+
+ return Py_BuildValue( "i", job_id );
+ }
+
+ return Py_BuildValue( "i", -1 );
+}
+
+// ***************************************************************************************************
+
+static PyObject * passwordFunc = NULL;
+static char *passwordPrompt = NULL;
+
+const char * password_callback(const char * prompt)
+{
+
+ PyObject *result = NULL;
+ PyObject *usernameObj = NULL;
+ PyObject *passwordObj = NULL;
+ char *username = NULL;
+ char *password = NULL;
+
+ if (passwordFunc != NULL) {
+
+ if (passwordPrompt)
+ prompt = passwordPrompt;
+
+ result = PyObject_CallFunction(passwordFunc, "s", prompt);
+ if (!result)
+ return "";
+
+ usernameObj = PyTuple_GetItem(result, 0);
+ if (!usernameObj)
+ return "";
+ username = PyString_AsString(usernameObj);
+/* printf("usernameObj=%p, username='%s'\n", usernameObj, username); */
+ if (!username)
+ return "";
+
+ passwordObj = PyTuple_GetItem(result, 1);
+ if (!passwordObj)
+ return "";
+ password = PyString_AsString(passwordObj);
+/* printf("passwordObj=%p, password='%s'\n", passwordObj, password); */
+ if (!password)
+ return "";
+
+ cupsSetUser(username);
+ return password;
+
+ }
+
+ return "";
+
+}
+
+PyObject *setPasswordPrompt(PyObject *self, PyObject *args)
+{
+
+ char *userPrompt = NULL;
+
+ if (!PyArg_ParseTuple(args, "z", &userPrompt))
+ return Py_BuildValue("");
+
+ if (strlen(userPrompt) != 0)
+ passwordPrompt = userPrompt;
+ else
+ passwordPrompt = NULL;
+
+ return Py_BuildValue("");
+
+}
+
+PyObject * setPasswordCallback( PyObject * self, PyObject * args )
+{
+ if( !PyArg_ParseTuple( args, "O", &passwordFunc ) )
+ {
+ return Py_BuildValue( "i", 0 );
+ }
+
+ cupsSetPasswordCB(password_callback);
+
+ return Py_BuildValue( "i", 1 );
+}
+
+
+PyObject * getPassword( PyObject * self, PyObject * args )
+{
+ const char * pwd;
+ char * prompt;
+
+ if( !PyArg_ParseTuple( args, "s", &prompt ) )
+ {
+ return Py_BuildValue( "" );
+ }
+
+ pwd = cupsGetPassword( prompt );
+
+ if( pwd )
+ {
+ return Py_BuildValue( "s", pwd );
+ }
+ else
+ {
+ return Py_BuildValue( "" );
+ }
+}
+
+
+
+
+
+
+// ***************************************************************************************************
+
+static PyMethodDef cupsext_methods[] =
+ {
+ { "getPrinters", ( PyCFunction ) getPrinters, METH_VARARGS },
+ { "addPrinter", ( PyCFunction ) addPrinter, METH_VARARGS },
+ { "delPrinter", ( PyCFunction ) delPrinter, METH_VARARGS },
+ { "getDefaultPrinter", ( PyCFunction ) getDefaultPrinter, METH_VARARGS },
+ { "setDefaultPrinter", ( PyCFunction ) setDefaultPrinter, METH_VARARGS },
+ { "controlPrinter", ( PyCFunction ) controlPrinter, METH_VARARGS },
+ { "getPPDList", ( PyCFunction ) getPPDList, METH_VARARGS },
+ { "getPPD", ( PyCFunction ) getPPD, METH_VARARGS },
+ { "openPPD", ( PyCFunction ) openPPD, METH_VARARGS },
+ { "closePPD", ( PyCFunction ) closePPD, METH_VARARGS },
+ { "getPPDOption", ( PyCFunction ) getPPDOption, METH_VARARGS },
+ { "getPPDPageSize", ( PyCFunction ) getPPDPageSize, METH_VARARGS },
+ { "getVersion", ( PyCFunction ) getVersion, METH_VARARGS },
+ { "getVersionTuple", ( PyCFunction ) getVersionTuple, METH_VARARGS },
+ { "cancelJob", ( PyCFunction ) cancelJob, METH_VARARGS },
+ { "getJobs", ( PyCFunction ) getJobs, METH_VARARGS },
+ { "getServer", ( PyCFunction ) getServer, METH_VARARGS },
+ { "setServer", ( PyCFunction ) setServer, METH_VARARGS },
+ { "addOption", ( PyCFunction ) addOption, METH_VARARGS },
+ { "removeOption", ( PyCFunction ) removeOption, METH_VARARGS },
+ { "resetOptions", ( PyCFunction ) resetOptions, METH_VARARGS },
+ { "printFileWithOptions", ( PyCFunction ) printFileWithOptions, METH_VARARGS },
+ { "Job", ( PyCFunction ) newJob, METH_VARARGS | METH_KEYWORDS },
+ { "Printer", ( PyCFunction ) newPrinter, METH_VARARGS | METH_KEYWORDS },
+ { "getGroupList", ( PyCFunction ) getGroupList, METH_VARARGS },
+ { "getGroup", ( PyCFunction ) getGroup, METH_VARARGS },
+ { "getOptionList", ( PyCFunction ) getOptionList, METH_VARARGS },
+ { "getOption", ( PyCFunction ) getOption, METH_VARARGS },
+ { "getChoiceList", ( PyCFunction ) getChoiceList, METH_VARARGS },
+ { "getChoice", ( PyCFunction ) getChoice, METH_VARARGS },
+ { "setOptions", ( PyCFunction ) setOptions, METH_VARARGS },
+ { "getOptions", ( PyCFunction ) getOptions, METH_VARARGS },
+ { "setPasswordPrompt", (PyCFunction) setPasswordPrompt, METH_VARARGS },
+ { "setPasswordCallback", ( PyCFunction ) setPasswordCallback, METH_VARARGS },
+ { "getPassword", ( PyCFunction ) getPassword, METH_VARARGS },
+ { NULL, NULL }
+ };
+
+
+static char cupsext_documentation[] = "Python extension for CUPS 1.x";
+
+void initcupsext( void )
+{
+
+ PyObject * mod = Py_InitModule4( "cupsext", cupsext_methods,
+ cupsext_documentation, ( PyObject* ) NULL,
+ PYTHON_API_VERSION );
+
+ if ( mod == NULL )
+ return ;
+
+
+}
+
+
diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index 54e6e82e2..b829a4c86 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -2704,28 +2704,6 @@ Manufacturer "HP" Attribute "Product" "" "(HP Photosmart c4194 All-in-one Printer)" } { - ModelName "HP Photosmart c4200 Series" - Attribute "NickName" "" "HP Photosmart c4200 Series, $Version" - Attribute "ShortNickName" "" "HP Photosmart c4200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart c4200 series;DES:photosmart c4200 series;" - PCFileName "hp-photosmart_c4200_series.ppd" - Attribute "Product" "" "(HP Photosmart c4205 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4210 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4235 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4240 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4250 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4270 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4272 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4273 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4275 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4280 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4283 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4285 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4288 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4293 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4294 All-in-one Printer)" - } - { ModelName "HP Deskjet f4200 Series" Attribute "NickName" "" "HP Deskjet f4200 Series, $Version" Attribute "ShortNickName" "" "HP Deskjet f4200 Series" @@ -2750,6 +2728,28 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet f4294 All-in-one Printer)" } { + ModelName "HP Photosmart c4200 Series" + Attribute "NickName" "" "HP Photosmart c4200 Series, $Version" + Attribute "ShortNickName" "" "HP Photosmart c4200 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart c4200 series;DES:photosmart c4200 series;" + PCFileName "hp-photosmart_c4200_series.ppd" + Attribute "Product" "" "(HP Photosmart c4205 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4210 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4235 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4240 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4250 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4270 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4272 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4273 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4275 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4280 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4283 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4285 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4288 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4293 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4294 All-in-one Printer)" + } + { ModelName "HP Deskjet f4210 Series" Attribute "NickName" "" "HP Deskjet f4210 Series, $Version" Attribute "ShortNickName" "" "HP Deskjet f4210 Series" @@ -4545,6 +4545,14 @@ Manufacturer "HP" Attribute "Product" "" "(HP Photosmart d110 Series Printer)" } { + ModelName "HP Photosmart Ink Adv k510" + Attribute "NickName" "" "HP Photosmart Ink Adv k510, $Version" + Attribute "ShortNickName" "" "HP Photosmart Ink Adv k510" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart ink adv k510;DES:photosmart ink adv k510;" + PCFileName "hp-photosmart_ink_adv_k510.ppd" + Attribute "Product" "" "(HP Photosmart Ink Adv k510)" + } + { ModelName "HP Deskjet f4400 Series" Attribute "NickName" "" "HP Deskjet f4400 Series, $Version" Attribute "ShortNickName" "" "HP Deskjet f4400 Series" @@ -7428,6 +7436,14 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet 2000 j210 Series)" } { + ModelName "HP Deskjet Ink Adv 2010 k010" + Attribute "NickName" "" "HP Deskjet Ink Adv 2010 k010, $Version" + Attribute "ShortNickName" "" "HP Deskjet Ink Adv 2010 k010" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet ink adv 2010 k010;DES:deskjet ink adv 2010 k010;" + PCFileName "hp-deskjet_ink_adv_2010_k010.ppd" + Attribute "Product" "" "(HP Deskjet Ink Adv 2010 k010)" + } + { ModelName "HP Deskjet 2050 j510 Series" Attribute "NickName" "" "HP Deskjet 2050 j510 Series, $Version" Attribute "ShortNickName" "" "HP Deskjet 2050 j510 Series" @@ -7436,6 +7452,14 @@ Manufacturer "HP" Attribute "Product" "" "(HP Deskjet 2050 j510 All-in-one Printer)" } { + ModelName "HP Deskjet Ink Adv 2060 k110" + Attribute "NickName" "" "HP Deskjet Ink Adv 2060 k110, $Version" + Attribute "ShortNickName" "" "HP Deskjet Ink Adv 2060 k110" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet ink adv 2060 k110;DES:deskjet ink adv 2060 k110;" + PCFileName "hp-deskjet_ink_adv_2060_k110.ppd" + Attribute "Product" "" "(HP Deskjet Ink Adv 2060 k110)" + } + { ModelName "HP Deskjet 3000 j310 Series" Attribute "NickName" "" "HP Deskjet 3000 j310 Series, $Version" Attribute "ShortNickName" "" "HP Deskjet 3000 j310 Series" @@ -10005,6 +10029,50 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)" } { + ModelName "HP LaserJet m1536dnf MFP" + Attribute "NickName" "" "HP LaserJet m1536dnf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1536dnf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1536dnf mfp;DES:hp laserjet m1536dnf mfp;" + PCFileName "hp-laserjet_m1536dnf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { + ModelName "HP LaserJet m1537dnf MFP" + Attribute "NickName" "" "HP LaserJet m1537dnf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1537dnf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1537dnf mfp;DES:hp laserjet m1537dnf mfp;" + PCFileName "hp-laserjet_m1537dnf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { + ModelName "HP LaserJet m1538dnf MFP" + Attribute "NickName" "" "HP LaserJet m1538dnf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1538dnf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1538dnf mfp;DES:hp laserjet m1538dnf mfp;" + PCFileName "hp-laserjet_m1538dnf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { + ModelName "HP LaserJet m1539dnf MFP" + Attribute "NickName" "" "HP LaserJet m1539dnf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1539dnf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1539dnf mfp;DES:hp laserjet m1539dnf mfp;" + PCFileName "hp-laserjet_m1539dnf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { ModelName "HP LaserJet p2014" Attribute "NickName" "" "HP LaserJet p2014 pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014" @@ -11099,6 +11167,70 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } { + ModelName "HP LaserJet cm1411fn" + Attribute "NickName" "" "HP LaserJet cm1411fn pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1411fn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1411fn;DES:hp laserjet cm1411fn;" + PCFileName "hp-laserjet_cm1411fn-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1411fn)" + } + { + ModelName "HP LaserJet cm1412fn" + Attribute "NickName" "" "HP LaserJet cm1412fn pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1412fn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1412fn;DES:hp laserjet cm1412fn;" + PCFileName "hp-laserjet_cm1412fn-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1412fn)" + } + { + ModelName "HP LaserJet cm1413fn" + Attribute "NickName" "" "HP LaserJet cm1413fn pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1413fn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1413fn;DES:hp laserjet cm1413fn;" + PCFileName "hp-laserjet_cm1413fn-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1413fn)" + } + { + ModelName "HP LaserJet cm1415fnw" + Attribute "NickName" "" "HP LaserJet cm1415fnw pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1415fnw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1415fnw;DES:hp laserjet cm1415fnw;" + PCFileName "hp-laserjet_cm1415fnw-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1415fnw)" + } + { + ModelName "HP LaserJet cm1415fn" + Attribute "NickName" "" "HP LaserJet cm1415fn pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1415fn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1415fn;DES:hp laserjet cm1415fn;" + PCFileName "hp-laserjet_cm1415fn-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1415fn)" + } + { + ModelName "HP LaserJet cm1416fnw" + Attribute "NickName" "" "HP LaserJet cm1416fnw pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1416fnw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1416fnw;DES:hp laserjet cm1416fnw;" + PCFileName "hp-laserjet_cm1416fnw-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1416fnw)" + } + { + ModelName "HP LaserJet cm1417fnw" + Attribute "NickName" "" "HP LaserJet cm1417fnw pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1417fnw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1417fnw;DES:hp laserjet cm1417fnw;" + PCFileName "hp-laserjet_cm1417fnw-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1417fnw)" + } + { + ModelName "HP LaserJet cm1418fnw" + Attribute "NickName" "" "HP LaserJet cm1418fnw pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1418fnw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1418fnw;DES:hp laserjet cm1418fnw;" + PCFileName "hp-laserjet_cm1418fnw-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1418fnw)" + } + { ModelName "HP Color LaserJet cp1514n" Attribute "NickName" "" "HP Color LaserJet cp1514n pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1514n" @@ -11324,6 +11456,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" } { + ModelName "HP Color LaserJet cm4540 MFP" + Attribute "NickName" "" "HP Color LaserJet cm4540 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm4540 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4540 mfp;DES:hp color laserjet cm4540 mfp;" + PCFileName "hp-color_laserjet_cm4540_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm4540 Multifunction Printer)" + } + { ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" @@ -11435,6 +11575,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP Color LaserJet cp5225dn)" } { + ModelName "HP Color LaserJet cp5520 Series" + Attribute "NickName" "" "HP Color LaserJet cp5520 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp5520 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5520 series;DES:hp color laserjet cp5520 series;" + PCFileName "hp-color_laserjet_cp5520_series-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp5520 Series Printer)" + } + { ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -13868,6 +14016,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" } { + ModelName "HP LaserJet Professional m1213nf MFP" + Attribute "NickName" "" "HP LaserJet Professional m1213nf MFP, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Professional m1213nf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1213nf mfp;DES:hp laserjet professional m1213nf mfp;" + PCFileName "hp-laserjet_professional_m1213nf_mfp.ppd" + Attribute "Product" "" "(HP LaserJet Professional m1213nf Multifunction Printer)" + } + { ModelName "HP LaserJet Professional m1217nfw MFP" Attribute "NickName" "" "HP LaserJet Professional m1217nfw MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional m1217nfw MFP" @@ -14023,22 +14179,6 @@ Group "RLT/HP Real Life Technologies" Group "General/General" - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "PhotoTray/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Upper Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Lower Tray" "<</MediaPosition 4>>setpagedevice" - Choice "Envelope/Envelope Feeder" "<</MediaPosition 3>>setpagedevice" - Choice "LargeCapacity/Large Capacity Tray" "<</MediaPosition 5>>setpagedevice" - Choice "Manual/Manual Feeder" "<</MediaPosition 2>>setpagedevice" - Choice "MPTray/Multi Purpose Tray" "<</MediaPosition 1>>setpagedevice" - // cupsRowCount values map to PEN_TYPE + 1 from global_types.h Option "ColorModel/Output Mode" PickOne AnySetup 10.0 Choice "Gray/Grayscale" "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsRowCount 3/cupsRowStep 2>>setpagedevice" @@ -14054,15 +14194,8 @@ Group "RLT/HP Real Life Technologies" *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" Choice "Draft/Draft" "<</OutputType(-1)/HWResolution[600 600]>>setpagedevice" - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - - // Constraints - UIConstraints "*Duplex *OptionDuplex False" - Attribute "cupsModelName" "" "HP Color LaserJet 2600n" // APDK device class - { // 4x6 or smaller CustomMedia "Card3x5/Index Card 3x5in" 216 360 12.96 14.40 12.96 14.40 "<</PageSize [216 360]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 96/PageSize[216 360]/ImagingBBox null>>setpagedevice" @@ -14079,7 +14212,7 @@ Group "RLT/HP Real Life Technologies" CustomMedia "Card5x8/Index Card 5x8in" 360 576 18.72 14.40 18.72 14.40 "<</PageSize[360 576]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 96/PageSize[360 576]/ImagingBBox null>>setpagedevice" CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 567 420 18.54 14.40 18.54 14.40 "<</PageSize[567 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 43/PageSize[567 420]/ImagingBBox null>>setpagedevice" + "<</cupsInteger0 101/PageSize[567 420]/ImagingBBox null>>setpagedevice" CustomMedia "A5/A5 148x210mm" 419.76 595.44 18.00 14.40 18.00 14.40 "<</PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice" "<</cupsInteger0 11/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice" @@ -14129,6 +14262,30 @@ Group "RLT/HP Real Life Technologies" MinSize 1in 4in MaxSize 8.5in 14in + { + Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 + Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" + *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" + + + // MediaPosition values map to MediaSource enumeration in global_types.h + Option "InputSlot/Media Source" PickOne AnySetup 10.0 + *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" + Choice "PhotoTray/Photo Tray" "<</MediaPosition 1>>setpagedevice" + Choice "Upper/Upper Tray" "<</MediaPosition 1>>setpagedevice" + Choice "Lower/Lower Tray" "<</MediaPosition 4>>setpagedevice" + Choice "Envelope/Envelope Feeder" "<</MediaPosition 3>>setpagedevice" + Choice "LargeCapacity/Large Capacity Tray" "<</MediaPosition 5>>setpagedevice" + Choice "Manual/Manual Feeder" "<</MediaPosition 2>>setpagedevice" + Choice "MPTray/Multi Purpose Tray" "<</MediaPosition 1>>setpagedevice" + + // Duplexer is optional... + Installable "OptionDuplex/Duplexer Installed" + + // Constraints + UIConstraints "*Duplex *OptionDuplex False" + // <%LJZjsColor:Normal%> { ModelName "HP Color LaserJet cp1215" @@ -14155,6 +14312,79 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" } } // End Supported media sizes. + + { + Option "InputSlot/Media Source" PickOne AnySetup 10.0 + *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" + Choice "Manual/Manual Feeder" "<</MediaPosition 2>>setpagedevice" + + Attribute "hpLJZjsColorVersion" "" "2" + // <%LJZjsColor:Advanced%> + { + ModelName "HP LaserJet cp1021" + Attribute "NickName" "" "HP LaserJet cp1021, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1021" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1021;DES:hp laserjet cp1021;" + PCFileName "hp-laserjet_cp1021.ppd" + Attribute "Product" "" "(HP LaserJet cp1021)" + } + { + ModelName "HP LaserJet cp1022" + Attribute "NickName" "" "HP LaserJet cp1022, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1022" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1022;DES:hp laserjet cp1022;" + PCFileName "hp-laserjet_cp1022.ppd" + Attribute "Product" "" "(HP LaserJet cp1022)" + } + { + ModelName "HP LaserJet cp1023" + Attribute "NickName" "" "HP LaserJet cp1023, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1023" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1023;DES:hp laserjet cp1023;" + PCFileName "hp-laserjet_cp1023.ppd" + Attribute "Product" "" "(HP LaserJet cp1023)" + } + { + ModelName "HP LaserJet cp1025nw" + Attribute "NickName" "" "HP LaserJet cp1025nw, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1025nw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1025nw;DES:hp laserjet cp1025nw;" + PCFileName "hp-laserjet_cp1025nw.ppd" + Attribute "Product" "" "(HP LaserJet cp1025nw)" + } + { + ModelName "HP LaserJet cp1025" + Attribute "NickName" "" "HP LaserJet cp1025, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1025" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1025;DES:hp laserjet cp1025;" + PCFileName "hp-laserjet_cp1025.ppd" + Attribute "Product" "" "(HP LaserJet cp1025)" + } + { + ModelName "HP LaserJet cp1026nw" + Attribute "NickName" "" "HP LaserJet cp1026nw, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1026nw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1026nw;DES:hp laserjet cp1026nw;" + PCFileName "hp-laserjet_cp1026nw.ppd" + Attribute "Product" "" "(HP LaserJet cp1026nw)" + } + { + ModelName "HP LaserJet cp1027nw" + Attribute "NickName" "" "HP LaserJet cp1027nw, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1027nw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1027nw;DES:hp laserjet cp1027nw;" + PCFileName "hp-laserjet_cp1027nw.ppd" + Attribute "Product" "" "(HP LaserJet cp1027nw)" + } + { + ModelName "HP LaserJet cp1028nw" + Attribute "NickName" "" "HP LaserJet cp1028nw, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1028nw" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1028nw;DES:hp laserjet cp1028nw;" + PCFileName "hp-laserjet_cp1028nw.ppd" + Attribute "Product" "" "(HP LaserJet cp1028nw)" + } + } } // End LJZjsColor (for proprietary plugin) ///////////// LJJetReady (color, for both open and proprietary plugin) diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index 94b5cf539..fc63680bf 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -2841,28 +2841,6 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Photosmart c4194 All-in-one Printer)" } { - ModelName "HP Photosmart c4200 Series hpijs" - Attribute "NickName" "" "HP Photosmart c4200 Series hpijs, $Version" - Attribute "ShortNickName" "" "HP PS c4200 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart c4200 series;DES:photosmart c4200 series;" - PCFileName "hp-photosmart_c4200_series-hpijs.ppd" - Attribute "Product" "" "(HP Photosmart c4205 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4210 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4235 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4240 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4250 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4270 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4272 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4273 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4275 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4280 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4283 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4285 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4288 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4293 All-in-one Printer)" - Attribute "Product" "" "(HP Photosmart c4294 All-in-one Printer)" - } - { ModelName "HP Deskjet f4200 Series hpijs" Attribute "NickName" "" "HP Deskjet f4200 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet f4200 Series hpijs" @@ -2887,6 +2865,28 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet f4294 All-in-one Printer)" } { + ModelName "HP Photosmart c4200 Series hpijs" + Attribute "NickName" "" "HP Photosmart c4200 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP PS c4200 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart c4200 series;DES:photosmart c4200 series;" + PCFileName "hp-photosmart_c4200_series-hpijs.ppd" + Attribute "Product" "" "(HP Photosmart c4205 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4210 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4235 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4240 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4250 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4270 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4272 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4273 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4275 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4280 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4283 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4285 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4288 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4293 All-in-one Printer)" + Attribute "Product" "" "(HP Photosmart c4294 All-in-one Printer)" + } + { ModelName "HP Deskjet f4210 Series hpijs" Attribute "NickName" "" "HP Deskjet f4210 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet f4210 Series hpijs" @@ -6604,6 +6604,50 @@ t=0" Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)" } { + ModelName "HP LaserJet m1536dnf MFP hpijs" + Attribute "NickName" "" "HP LaserJet m1536dnf MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1536dnf MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1536dnf mfp;DES:hp laserjet m1536dnf mfp;" + PCFileName "hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { + ModelName "HP LaserJet m1537dnf MFP hpijs" + Attribute "NickName" "" "HP LaserJet m1537dnf MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1537dnf MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1537dnf mfp;DES:hp laserjet m1537dnf mfp;" + PCFileName "hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { + ModelName "HP LaserJet m1538dnf MFP hpijs" + Attribute "NickName" "" "HP LaserJet m1538dnf MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1538dnf MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1538dnf mfp;DES:hp laserjet m1538dnf mfp;" + PCFileName "hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { + ModelName "HP LaserJet m1539dnf MFP hpijs" + Attribute "NickName" "" "HP LaserJet m1539dnf MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m1539dnf MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1539dnf mfp;DES:hp laserjet m1539dnf mfp;" + PCFileName "hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1537dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1538dnf MFP)" + Attribute "Product" "" "(HP LaserJet m1539dnf MFP)" + } + { ModelName "HP LaserJet p2014 hpijs" Attribute "NickName" "" "HP LaserJet p2014 hpijs pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014 hpijs" @@ -7897,6 +7941,70 @@ nSet=2" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } { + ModelName "HP LaserJet cm1411fn hpijs" + Attribute "NickName" "" "HP LaserJet cm1411fn hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1411fn hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1411fn;DES:hp laserjet cm1411fn;" + PCFileName "hp-laserjet_cm1411fn-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1411fn)" + } + { + ModelName "HP LaserJet cm1412fn hpijs" + Attribute "NickName" "" "HP LaserJet cm1412fn hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1412fn hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1412fn;DES:hp laserjet cm1412fn;" + PCFileName "hp-laserjet_cm1412fn-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1412fn)" + } + { + ModelName "HP LaserJet cm1413fn hpijs" + Attribute "NickName" "" "HP LaserJet cm1413fn hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1413fn hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1413fn;DES:hp laserjet cm1413fn;" + PCFileName "hp-laserjet_cm1413fn-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1413fn)" + } + { + ModelName "HP LaserJet cm1415fnw hpijs" + Attribute "NickName" "" "HP LaserJet cm1415fnw hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1415fnw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1415fnw;DES:hp laserjet cm1415fnw;" + PCFileName "hp-laserjet_cm1415fnw-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1415fnw)" + } + { + ModelName "HP LaserJet cm1415fn hpijs" + Attribute "NickName" "" "HP LaserJet cm1415fn hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1415fn hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1415fn;DES:hp laserjet cm1415fn;" + PCFileName "hp-laserjet_cm1415fn-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1415fn)" + } + { + ModelName "HP LaserJet cm1416fnw hpijs" + Attribute "NickName" "" "HP LaserJet cm1416fnw hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1416fnw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1416fnw;DES:hp laserjet cm1416fnw;" + PCFileName "hp-laserjet_cm1416fnw-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1416fnw)" + } + { + ModelName "HP LaserJet cm1417fnw hpijs" + Attribute "NickName" "" "HP LaserJet cm1417fnw hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1417fnw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1417fnw;DES:hp laserjet cm1417fnw;" + PCFileName "hp-laserjet_cm1417fnw-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1417fnw)" + } + { + ModelName "HP LaserJet cm1418fnw hpijs" + Attribute "NickName" "" "HP LaserJet cm1418fnw hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet cm1418fnw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cm1418fnw;DES:hp laserjet cm1418fnw;" + PCFileName "hp-laserjet_cm1418fnw-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet Professional cm1418fnw)" + } + { ModelName "HP Color LaserJet cp1514n hpijs" Attribute "NickName" "" "HP Color LaserJet cp1514n hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1514n hpijs" @@ -8122,6 +8230,14 @@ nSet=2" Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" } { + ModelName "HP Color LaserJet cm4540 MFP hpijs" + Attribute "NickName" "" "HP Color LaserJet cm4540 MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LJ cm4540 MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4540 mfp;DES:hp color laserjet cm4540 mfp;" + PCFileName "hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm4540 Multifunction Printer)" + } + { ModelName "HP Color LaserJet 4550 hpijs" Attribute "NickName" "" "HP Color LaserJet 4550 hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550 hpijs" @@ -8233,6 +8349,14 @@ nSet=2" Attribute "Product" "" "(HP Color LaserJet cp5225dn)" } { + ModelName "HP Color LaserJet cp5520 Series hpijs" + Attribute "NickName" "" "HP Color LaserJet cp5520 Series hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LJ cp5520 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5520 series;DES:hp color laserjet cp5520 series;" + PCFileName "hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp5520 Series Printer)" + } + { ModelName "HP Officejet 9100 Series hpijs" Attribute "NickName" "" "HP Officejet 9100 Series hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series hpijs" @@ -11411,6 +11535,14 @@ Transparency" Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" } { + ModelName "HP LaserJet Professional m1213nf MFP hpijs" + Attribute "NickName" "" "HP LaserJet Professional m1213nf MFP hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LJ Pro m1213nf MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1213nf mfp;DES:hp laserjet professional m1213nf mfp;" + PCFileName "hp-laserjet_professional_m1213nf_mfp-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet Professional m1213nf Multifunction Printer)" + } + { ModelName "HP LaserJet Professional m1217nfw MFP hpijs" Attribute "NickName" "" "HP LaserJet Professional m1217nfw MFP hpijs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Pro m1217nfw MFP hpijs" @@ -12046,30 +12178,101 @@ Transparency" CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" CustomMedia "w558h774/16K" 558.00 774.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" - // <%LJZjsColor:Normal%> - { - ModelName "HP Color LaserJet cp1215 hpijs" - Attribute "NickName" "" "HP Color LaserJet cp1215 hpijs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet cp1215 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" - PCFileName "hp-color_laserjet_cp1215-hpijs.ppd" - Attribute "Product" "" "(HP Color LaserJet cp1215 Printer)" - } + { - ModelName "HP Color LaserJet 1600 hpijs" - Attribute "NickName" "" "HP Color LaserJet 1600 hpijs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet 1600 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" - PCFileName "hp-color_laserjet_1600-hpijs.ppd" - Attribute "Product" "" "(HP Color LaserJet 1600 Printer)" + // <%LJZjsColor:Normal%> + { + ModelName "HP Color LaserJet cp1215 hpijs" + Attribute "NickName" "" "HP Color LaserJet cp1215 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet cp1215 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" + PCFileName "hp-color_laserjet_cp1215-hpijs.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1215 Printer)" + } + { + ModelName "HP Color LaserJet 1600 hpijs" + Attribute "NickName" "" "HP Color LaserJet 1600 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 1600 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" + PCFileName "hp-color_laserjet_1600-hpijs.ppd" + Attribute "Product" "" "(HP Color LaserJet 1600 Printer)" + } + { + ModelName "HP Color LaserJet 2600n hpijs" + Attribute "NickName" "" "HP Color LaserJet 2600n hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 2600n hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" + PCFileName "hp-color_laserjet_2600n-hpijs.ppd" + Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" + } } { - ModelName "HP Color LaserJet 2600n hpijs" - Attribute "NickName" "" "HP Color LaserJet 2600n hpijs, $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet 2600n hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" - PCFileName "hp-color_laserjet_2600n-hpijs.ppd" - Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" + Attribute "hpLJZjsColorVersion" "" "2" + // <%LJZjsColor:Advanced%> + { + ModelName "HP LaserJet cp1021 hpijs" + Attribute "NickName" "" "HP LaserJet cp1021 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1021 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1021;DES:hp laserjet cp1021;" + PCFileName "hp-laserjet_cp1021-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1021)" + } + { + ModelName "HP LaserJet cp1022 hpijs" + Attribute "NickName" "" "HP LaserJet cp1022 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1022 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1022;DES:hp laserjet cp1022;" + PCFileName "hp-laserjet_cp1022-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1022)" + } + { + ModelName "HP LaserJet cp1023 hpijs" + Attribute "NickName" "" "HP LaserJet cp1023 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1023 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1023;DES:hp laserjet cp1023;" + PCFileName "hp-laserjet_cp1023-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1023)" + } + { + ModelName "HP LaserJet cp1025nw hpijs" + Attribute "NickName" "" "HP LaserJet cp1025nw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1025nw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1025nw;DES:hp laserjet cp1025nw;" + PCFileName "hp-laserjet_cp1025nw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1025nw)" + } + { + ModelName "HP LaserJet cp1025 hpijs" + Attribute "NickName" "" "HP LaserJet cp1025 hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1025 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1025;DES:hp laserjet cp1025;" + PCFileName "hp-laserjet_cp1025-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1025)" + } + { + ModelName "HP LaserJet cp1026nw hpijs" + Attribute "NickName" "" "HP LaserJet cp1026nw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1026nw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1026nw;DES:hp laserjet cp1026nw;" + PCFileName "hp-laserjet_cp1026nw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1026nw)" + } + { + ModelName "HP LaserJet cp1027nw hpijs" + Attribute "NickName" "" "HP LaserJet cp1027nw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1027nw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1027nw;DES:hp laserjet cp1027nw;" + PCFileName "hp-laserjet_cp1027nw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1027nw)" + } + { + ModelName "HP LaserJet cp1028nw hpijs" + Attribute "NickName" "" "HP LaserJet cp1028nw hpijs, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet cp1028nw hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet cp1028nw;DES:hp laserjet cp1028nw;" + PCFileName "hp-laserjet_cp1028nw-hpijs.ppd" + Attribute "Product" "" "(HP LaserJet cp1028nw)" + } } } // end LJZjsColor (for proprietary plugin) @@ -12776,6 +12979,14 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Photosmart d110 Series Printer)" } { + ModelName "HP Photosmart Ink Adv k510 hpijs" + Attribute "NickName" "" "HP Photosmart Ink Adv k510 hpijs, $Version" + Attribute "ShortNickName" "" "HP PS Ink Adv k510 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart ink adv k510;DES:photosmart ink adv k510;" + PCFileName "hp-photosmart_ink_adv_k510-hpijs.ppd" + Attribute "Product" "" "(HP Photosmart Ink Adv k510)" + } + { ModelName "HP Deskjet f4400 Series hpijs" Attribute "NickName" "" "HP Deskjet f4400 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Deskjet f4400 Series hpijs" @@ -14612,6 +14823,14 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet 2000 j210 Series)" } { + ModelName "HP Deskjet Ink Adv 2010 k010 hpijs" + Attribute "NickName" "" "HP Deskjet Ink Adv 2010 k010 hpijs, $Version" + Attribute "ShortNickName" "" "HP DJ Ink Adv 2010 k010 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet ink adv 2010 k010;DES:deskjet ink adv 2010 k010;" + PCFileName "hp-deskjet_ink_adv_2010_k010-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Adv 2010 k010)" + } + { ModelName "HP Deskjet 2050 j510 Series hpijs" Attribute "NickName" "" "HP Deskjet 2050 j510 Series hpijs, $Version" Attribute "ShortNickName" "" "HP DJ 2050 j510 Series hpijs" @@ -14620,6 +14839,14 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Deskjet 2050 j510 All-in-one Printer)" } { + ModelName "HP Deskjet Ink Adv 2060 k110 hpijs" + Attribute "NickName" "" "HP Deskjet Ink Adv 2060 k110 hpijs, $Version" + Attribute "ShortNickName" "" "HP DJ Ink Adv 2060 k110 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet ink adv 2060 k110;DES:deskjet ink adv 2060 k110;" + PCFileName "hp-deskjet_ink_adv_2060_k110-hpijs.ppd" + Attribute "Product" "" "(HP Deskjet Ink Adv 2060 k110)" + } + { ModelName "HP Deskjet 3000 j310 Series hpijs" Attribute "NickName" "" "HP Deskjet 3000 j310 Series hpijs, $Version" Attribute "ShortNickName" "" "HP DJ 3000 j310 Series hpijs" diff --git a/prnt/drv/hpijs.drv.in.template b/prnt/drv/hpijs.drv.in.template index 8922da7cb..bd44fb6e2 100644 --- a/prnt/drv/hpijs.drv.in.template +++ b/prnt/drv/hpijs.drv.in.template @@ -6214,7 +6214,14 @@ Transparency" CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" CustomMedia "w558h774/16K" 558.00 774.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" - // <%LJZjsColor:Normal%> + + { + // <%LJZjsColor:Normal%> + } + { + Attribute "hpLJZjsColorVersion" "" "2" + // <%LJZjsColor:Advanced%> + } } // end LJZjsColor (for proprietary plugin) ///////////// LJP1XXX (for proprietary plugin) diff --git a/prnt/hpcups/CommonDefinitions.h b/prnt/hpcups/CommonDefinitions.h index bfa3021e8..4f9e68414 100644 --- a/prnt/hpcups/CommonDefinitions.h +++ b/prnt/hpcups/CommonDefinitions.h @@ -26,6 +26,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Author: Naga Samrat Chowdary Narla, \*****************************************************************************/ #ifndef COMMON_DEFINITIONS_H @@ -455,6 +457,7 @@ typedef struct JobAttributes_s char printer_platform[32]; char printer_language[32]; int integer_values[16]; + int printer_platform_version; } JobAttributes; #endif // COMMON_DEFINITIONS_H diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index 1afde4f00..6ade2e9a9 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -26,6 +26,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Author: Naga Samrat Chowdary Narla, \*****************************************************************************/ #include "HPCupsFilter.h" @@ -352,6 +354,11 @@ DRIVER_ERROR HPCupsFilter::startPage (cups_page_header2_t *cups_header) if (m_iLogLevel & BASIC_LOG) { dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value); } + if(strcmp(m_JA.printer_platform, "ljzjscolor") == 0) + { + if(((attr = ppdFindAttr(m_ppd, "hpLJZjsColorVersion", NULL)) != NULL) && (attr->value != NULL)) + m_JA.printer_platform_version = atoi(attr->value); + } } // Get the encapsulation technology from ppd diff --git a/prnt/hpcups/LJZjStream.cpp b/prnt/hpcups/LJZjStream.cpp index 9c90bd8eb..738ca583f 100644 --- a/prnt/hpcups/LJZjStream.cpp +++ b/prnt/hpcups/LJZjStream.cpp @@ -26,6 +26,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Author: Naga Samrat Chowdary Narla, \*****************************************************************************/ #include "CommonDefinitions.h" @@ -169,6 +171,12 @@ DRIVER_ERROR LJZjStream::Configure(Pipeline **pipeline) m_iPlanes = 4; } height = ZJC_BAND_HEIGHT; + + if(m_pJA->printer_platform_version == 2) + { + height = m_pMA->printable_height; + ezj_platform = ZJCOLOR2; + } } err = m_pModeJbig->Init(height, m_iPlanes, m_iBpp, ezj_platform); @@ -176,6 +184,29 @@ DRIVER_ERROR LJZjStream::Configure(Pipeline **pipeline) return err; } +DRIVER_ERROR LJZjStream::StartPage_ljzjcolor2 (JobAttributes *pJA) +{ + DWORD dwNumItems = 13; + BYTE szStr[16 + 12 * 13]; + int i=0; + + i = SendChunkHeader (szStr, 16 + dwNumItems * 12, ZJT_START_PAGE, dwNumItems); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_PLANE, m_iPlanes); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_DMPAPER, m_pMA->pcl_id); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_DMCOPIES, 1); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_DMDEFAULTSOURCE, m_pJA->media_source); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_DMMEDIATYPE, m_pQA->media_type); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_NBIE, m_iPlanes); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_RESOLUTION_X, m_pQA->horizontal_resolution); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_RESOLUTION_Y, m_pQA->vertical_resolution); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_RASTER_X, (((m_pMA->printable_width + 31) / 32) * 32) * m_iBpp); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_RASTER_Y, m_pMA->printable_height); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_VIDEO_BPP, m_iBpp); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_VIDEO_X, (((m_pMA->printable_width + 31) / 32) * 32)); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_VIDEO_Y, m_pMA->printable_height); + return Send ((const BYTE *) szStr, i); +} + DRIVER_ERROR LJZjStream::StartPage (JobAttributes *pJA) { DRIVER_ERROR err = NO_ERROR; @@ -184,6 +215,11 @@ DRIVER_ERROR LJZjStream::StartPage (JobAttributes *pJA) int i; int width; + if((strcmp(m_pJA->printer_platform, "ljzjscolor") == 0) && (m_pJA->printer_platform_version == 2)) + { + return StartPage_ljzjcolor2(pJA); + } + m_iPlaneNumber = 0; m_iCurRaster = 0; @@ -248,6 +284,10 @@ DRIVER_ERROR LJZjStream::sendBlankBands() { return NO_ERROR; } + if(m_pJA->printer_platform_version == 2) + { + return NO_ERROR; + } DRIVER_ERROR err = NO_ERROR; int remaining_rasters = m_pMA->printable_height - m_iCurRaster; int num_planes = (m_pJA->color_mode == 0) ? 4 : 1; @@ -318,7 +358,11 @@ DRIVER_ERROR LJZjStream::FormFeed () if (err != NO_ERROR) return err; - SendChunkHeader (szStr, 16, ZJT_END_PAGE, 0); + if(((strcmp(m_pJA->printer_platform, "ljzjscolor") == 0) && (m_pJA->printer_platform_version == 2)) == 0) + { + SendChunkHeader (szStr, 16, ZJT_END_PAGE, 0); + } + if (!strcmp(m_pJA->printer_platform, "ljzjscolor")) { int i = 0; @@ -331,6 +375,10 @@ DRIVER_ERROR LJZjStream::FormFeed () i += SendItem (szStr+i, ZJIT_UINT32, 0x8200+j, (j % 4 == 3) ? 1 : iCol); } size = 112; + if(m_pJA->printer_platform_version == 2) + { + return Send ((const BYTE *) szStr, size); + } } err = sendBuffer ((const BYTE *) szStr, size); @@ -365,9 +413,7 @@ if (raster->rasterdata[COLORTYPE_COLOR] == NULL || raster->rastersize[COLORTYPE_ int i = 0; int iTotalSize = raster->rastersize[COLORTYPE_COLOR]; -/* - * Send JBIG header info - */ + /* Send JBIG header info */ i = SendChunkHeader (szStr, 36, ZJT_JBIG_BIH, 0); @@ -412,6 +458,87 @@ if (raster->rasterdata[COLORTYPE_COLOR] == NULL || raster->rastersize[COLORTYPE_ return err; } +DRIVER_ERROR LJZjStream::encapsulateColor2 (RASTERDATA *raster) +{ + DRIVER_ERROR err = NO_ERROR; + BYTE szStr[256]; + int i = 0; + int plane[] = {3, 2, 1, 4}; + + if (m_pJA->color_mode == 0) + { + i = SendChunkHeader (szStr, 28, ZJT_START_PLANE, 1); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_PLANE, plane[m_iPlaneNumber]); + err = Send ((const BYTE *) szStr, i); + } + + i=0; + i += SendChunkHeader (szStr+i, 36, ZJT_JBIG_BIH, 0); + err = Send ((const BYTE *) szStr, i); + err = Send ((const BYTE *) raster->rasterdata[COLORTYPE_COLOR], 20); + + BYTE *p = raster->rasterdata[COLORTYPE_COLOR] + 20; + + DWORD dwTotalSize = raster->rastersize[COLORTYPE_COLOR]; + dwTotalSize -= 20; + int iPadCount = 0; + + i = 0; + if (dwTotalSize % 4) + { + iPadCount = ((dwTotalSize / 4 + 1) * 4) - dwTotalSize; + } + + DWORD dwMaxChunkSize = 0x10000; + DWORD dwCurrentChunkSize = 0; + bool bLastChunk = false; + + for(DWORD dwLoopCount = 0; dwLoopCount < dwTotalSize ; dwLoopCount +=dwMaxChunkSize) + { + memset (szStr, 0, sizeof(szStr)); + dwCurrentChunkSize = dwMaxChunkSize; + + if(dwLoopCount + dwCurrentChunkSize > dwTotalSize) + { + dwCurrentChunkSize = dwTotalSize - (dwLoopCount); + bLastChunk = true; + } + if (!bLastChunk) + { + i = SendChunkHeader (szStr, dwCurrentChunkSize + 16, ZJT_JBIG_HID, 0); + } + else + { + i = SendChunkHeader (szStr, dwCurrentChunkSize + 16 + iPadCount, ZJT_JBIG_HID, 0); + } + err = Send ((const BYTE *) szStr, i); + err = Send ((const BYTE *) p, dwCurrentChunkSize); + p += dwCurrentChunkSize; + } + if(iPadCount != 0) + { + memset (szStr, 0, iPadCount); + err = Send ((const BYTE *) szStr, iPadCount); + } + + i=0; + memset (szStr, 0, sizeof(szStr)); + i = SendChunkHeader (szStr, 16, ZJT_END_JBIG, 0); + if (m_pJA->color_mode == 0) + { + i += SendChunkHeader (szStr+i, 28, ZJT_END_PLANE, 1); + i += SendItem (szStr+i, ZJIT_UINT32, ZJI_PLANE, plane[m_iPlaneNumber]); + } + err = Send ((const BYTE *) szStr, i); + + if (m_pJA->color_mode == 0) + { + m_iPlaneNumber++; + if (m_iPlaneNumber == 4) m_iPlaneNumber = 0; + } + return err; +} + DRIVER_ERROR LJZjStream::encapsulateColor (RASTERDATA *raster) { bool bLastStride = true; @@ -420,6 +547,11 @@ DRIVER_ERROR LJZjStream::encapsulateColor (RASTERDATA *raster) BYTE szStr[256]; int i = 0; + if (m_pJA->printer_platform_version == 2) + { + return encapsulateColor2(raster); + } + HPLJZjsJbgEncSt *se = (HPLJZjsJbgEncSt *) (raster->rasterdata[COLORTYPE_COLOR] + raster->rastersize[COLORTYPE_COLOR]); if (m_pJA->color_mode == 0) diff --git a/prnt/hpcups/LJZjStream.h b/prnt/hpcups/LJZjStream.h index 571b9e131..4926a2c5f 100644 --- a/prnt/hpcups/LJZjStream.h +++ b/prnt/hpcups/LJZjStream.h @@ -26,6 +26,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Author: Naga Samrat Chowdary Narla, \*****************************************************************************/ @@ -41,6 +43,7 @@ public: ~LJZjStream (); DRIVER_ERROR Encapsulate (RASTERDATA *InputRaster, bool bLastPlane); DRIVER_ERROR StartPage(JobAttributes *pJA); + DRIVER_ERROR StartPage_ljzjcolor2(JobAttributes *pJA); DRIVER_ERROR Configure(Pipeline **pipeline); DRIVER_ERROR FormFeed(); DRIVER_ERROR EndJob(); @@ -52,6 +55,7 @@ protected: virtual DRIVER_ERROR addJobSettings(); private: DRIVER_ERROR encapsulateColor(RASTERDATA *input); + DRIVER_ERROR encapsulateColor2(RASTERDATA *input); DRIVER_ERROR EndPage (); DRIVER_ERROR sendBlankBands(); PrintMode m_PM; diff --git a/prnt/hpcups/ModeJbig.cpp b/prnt/hpcups/ModeJbig.cpp index 3cf586ee4..8f0d94b01 100644 --- a/prnt/hpcups/ModeJbig.cpp +++ b/prnt/hpcups/ModeJbig.cpp @@ -26,6 +26,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Author: Naga Samrat Chowdary Narla, \*****************************************************************************/ #include "CommonDefinitions.h" @@ -151,6 +153,11 @@ DRIVER_ERROR ModeJbig::Init(int iLastRaster, int iPlanes, int iBPP, ZJPLATFORM z m_iP[1] = 0; m_iP[2] = 1; m_iP[3] = 2; + if(zj_platform == ZJCOLOR2) + { + m_iP[1] = 2; + m_iP[3] = 0; + } } int buffer_size = m_iWidth * m_iLastRaster * m_iPlanes * m_iBPP; @@ -202,6 +209,7 @@ bool ModeJbig::Process (RASTERDATA* input) bResult = processZXStream(input); break; case ZJCOLOR: + case ZJCOLOR2: if (m_iPlanes == 1) { bResult = processZXStream(input); diff --git a/prnt/hpcups/ModeJbig.h b/prnt/hpcups/ModeJbig.h index d792722c3..34faf682e 100644 --- a/prnt/hpcups/ModeJbig.h +++ b/prnt/hpcups/ModeJbig.h @@ -26,6 +26,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Author: Naga Samrat Chowdary Narla, \*****************************************************************************/ #ifndef MODE_JBIG_H @@ -40,7 +42,8 @@ typedef enum { ZJSTREAM, ZXSTREAM, - ZJCOLOR + ZJCOLOR, + ZJCOLOR2 } ZJPLATFORM; class ModeJbig : public Compressor diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp index c29a40be8..a38172939 100644 --- a/prnt/hpijs/hpcupsfax.cpp +++ b/prnt/hpijs/hpcupsfax.cpp @@ -44,6 +44,7 @@ #include <math.h> #include <cups/cups.h> #include <cups/raster.h> +#include <string> #ifdef FALSE #undef FALSE #endif @@ -53,8 +54,9 @@ #include "hpip.h" #include "hpcupsfax.h" #include "bug.h" +using namespace std; -int fax_encoding = RASTER_MH; +int fax_encoding = RASTER_MMR; char device_name[16]; BYTE szFileHeader[68]; BYTE szPageHeader[64]; @@ -191,15 +193,6 @@ int ProcessRasterData (cups_raster_t *cups_raster, int fdFax) { fax_encoding = RASTER_JPEG; } - else if (cups_header.cupsCompression == RASTER_AUTO) - { - pDev = getenv ("DEVICE_URI"); - if ((strstr (pDev, "Laser") || strstr (pDev, "laser"))) - { - fax_encoding = RASTER_MMR; - } - } - memset (szFileHeader, 0, sizeof (szFileHeader)); memcpy (szFileHeader, "hplip_g3", 8); p = szFileHeader + 8; @@ -216,17 +209,20 @@ int ProcessRasterData (cups_raster_t *cups_raster, int fdFax) } widthMMR = (((cups_header.cupsWidth + 7) >> 3)) << 3; - + /* * Devices in the HPFax2 category require fixed width of 2528 pixels. * Example: LaserJet 2727 MFP */ - - if (!strcmp (device_name, "HPFax2")) + + if (strcmp (device_name, "HPFax4") ==0) { - widthMMR = 2528; + widthMMR = 1728; } - + else if (!strcmp (device_name, "HPFax2")) + { + widthMMR = 2528; + } iInputBufSize = widthMMR * cups_header.cupsHeight; pInputBuf = (LPBYTE) malloc (iInputBufSize); @@ -696,13 +692,42 @@ int main (int argc, char **argv) ppdClose (ppd); BUG ("ERROR: Required DefaultEncoding is missing in ppd file\n"); return 1; + } + if (strstr(argv[5],"Encoding=MMR")) + { + fax_encoding = RASTER_MMR; + } + else if(strstr(argv[5],"Encoding=MH")) + { + fax_encoding = RASTER_MH; + } + else if (strstr(argv[5],"Encoding=Auto")) + { + BUG ("WARNING: AUTO is selected for Fax Encoding! Ensure this type is correct for the device"); + fax_encoding = RASTER_AUTO; + } + else if (strstr(argv[5],"Encoding=TIFF")) + { + fax_encoding = RASTER_TIFF; + } + else + { + if(strcmp(attr->value,"MH") == 0) { + fax_encoding = RASTER_MH; + } else if(strcmp(attr->value,"MMR") == 0){ + fax_encoding = RASTER_MMR; + }else if(strcmp(attr->value,"TIFF") ==0){ + fax_encoding = RASTER_TIFF; + }else if(strcmp(attr->value,"Auto") ==0){ + BUG ("WARNING: AUTO is selected for Fax Encoding! Ensure this type is correct for the device"); + fax_encoding = RASTER_AUTO; + } } - fax_encoding = atoi(attr->value); if (fax_encoding < 0) { BUG ("ERROR: Required DefaultEncoding is invalid in ppd file\n"); return 1; } - DBG("hpcupsfax: main: fax_encoding from ppd = %d \n", fax_encoding); + DBG("hpcupsfax: main: fax_encoding = %d \n", fax_encoding); ppdClose (ppd); if (fax_encoding == RASTER_TIFF) diff --git a/prnt/hpijs/hpijs.cpp b/prnt/hpijs/hpijs.cpp index f18ef7788..e3af856ca 100644 --- a/prnt/hpijs/hpijs.cpp +++ b/prnt/hpijs/hpijs.cpp @@ -433,7 +433,7 @@ int hpijs_get_cb(void *get_cb_data, IjsServerCtx *ctx, IjsJobId job_id, const ch { fY = pSS->pPC->PrintableHeight (); /* If duplexing, adjust printable height to 1/2 inch top/bottom margins, except laserjets. */ - if ((pSS->pPC->QueryDuplexMode() != DUPLEXMODE_NONE) && pSS->pPC->RotateImageForBackPage()) + if ((pSS->pPC->QueryDuplexMode() != DUPLEXMODE_NONE) && pSS->pPC->RotateImageForBackPage() && (FALSE == pSS->pPC->IsBorderless())) { // User has requested fullbleed printing and printer supports 4-sided fullbleed or // top and bottom margin are equal (0.125"), then @@ -473,7 +473,7 @@ int hpijs_get_cb(void *get_cb_data, IjsServerCtx *ctx, IjsJobId job_id, const ch { fY = pSS->pPC->PrintableStartY (); /* If duplexing, adjust printable top to 1/2 inch top margin, except laserjets. */ - if ((pSS->pPC->QueryDuplexMode() != DUPLEXMODE_NONE) && pSS->pPC->RotateImageForBackPage()) + if ((pSS->pPC->QueryDuplexMode() != DUPLEXMODE_NONE) && pSS->pPC->RotateImageForBackPage() && (FALSE == pSS->pPC->IsBorderless())) { #if 0 if ((pSS->pPC->PrintableHeight () + 0.28) < pSS->pPC->PhysicalPageSizeY ()) diff --git a/prnt/hpijs/ljzjs.cpp b/prnt/hpijs/ljzjs.cpp index be3c4628c..e02505c69 100644 --- a/prnt/hpijs/ljzjs.cpp +++ b/prnt/hpijs/ljzjs.cpp @@ -135,6 +135,13 @@ LJZjs::LJZjs (SystemServices* pSS, int numfonts, BOOL proto) { constructor_error = PLUGIN_LIBRARY_MISSING; } + //Issue: LJZJSMono class printers not printing in RHEL
+ //Cause: Since start page is common for LJZJSMono and LJZJSColor class, the items of
+ //LJZJSColor-2 format was used for LJZJSMono due to below variable not initialised
+ //Fix: Added initialisation so that correct LJZJSMono items are used.
+ //Variable is updated in LJZJSColor.
+ m_bLJZjsColor2Printer = FALSE;
+ } LJZjs::~LJZjs () @@ -313,7 +320,7 @@ DRIVER_ERROR LJZjs::StartPage (DWORD dwWidth, DWORD dwHeight) return err; } - if(m_bSIDModel) + if(m_bLJZjsColor2Printer) { dwNumItems = 13; } @@ -341,7 +348,7 @@ DRIVER_ERROR LJZjs::StartPage (DWORD dwWidth, DWORD dwHeight) i += SendItem (szStr+i, ZJIT_UINT32, ZJI_VIDEO_BPP, m_iBPP); i += SendItem (szStr+i, ZJIT_UINT32, ZJI_VIDEO_X, dwWidth/m_iBPP); i += SendItem (szStr+i, ZJIT_UINT32, ZJI_VIDEO_Y, m_dwLastRaster); - if(!m_bSIDModel) + if(!m_bLJZjsColor2Printer) { i += SendItem (szStr+i, ZJIT_UINT32, ZJI_RET, RET_ON); i += SendItem (szStr+i, ZJIT_UINT32, ZJI_TONER_SAVE, (cqm == QUALITY_DRAFT) ? 1 : 0); @@ -502,10 +509,10 @@ DRIVER_ERROR LJZjs::JbigCompress () } -/*JBig Compress for SID -Separate function written for SID since for SID, compression is done for whole plane data at a time -whereas Yoda does compression for 100 lines of each plane*/ -DRIVER_ERROR LJZjs::JbigCompress_SID () +/*JBig Compress for LJZjsColor-2 Printers +Separate function written for LJZjsColor-2 Printers, since for them, compression is done for whole plane data at a time +whereas for other deiveces, compression is done for 100 lines of each plane*/ +DRIVER_ERROR LJZjs::JbigCompress_LJZjsColor2 () { DRIVER_ERROR err = NO_ERROR; HPLJZjcBuff myBuffer; @@ -539,7 +546,7 @@ DRIVER_ERROR LJZjs::JbigCompress_SID () memset (myBuffer.pszCompressedData, 0, m_dwWidth * m_dwLastRaster * m_iBPP); myBuffer.dwTotalSize = 0; - if(4 == iPlanes)/*If there are 4 planes follow SID order of 3 2 1 4*/ + if(4 == iPlanes)/*If there are 4 planes follow LJZjsColor-2 order of 3 2 1 4*/ { pbUnCompressedData = bitmaps[arrPlanesOrder[nPlaneCount]-1] ; } diff --git a/prnt/hpijs/ljzjs.h b/prnt/hpijs/ljzjs.h index 4bf0eee89..1ec7f7682 100644 --- a/prnt/hpijs/ljzjs.h +++ b/prnt/hpijs/ljzjs.h @@ -84,7 +84,7 @@ protected: //private: int MapPaperSize (); DRIVER_ERROR JbigCompress (); - DRIVER_ERROR JbigCompress_SID (); + DRIVER_ERROR JbigCompress_LJZjsColor2 (); DRIVER_ERROR SendItemData (BYTE ItemType, WORD Item, DWORD dwValue); DRIVER_ERROR StartPage (DWORD dwWidth, DWORD dwHeight); virtual DRIVER_ERROR EndPage () @@ -116,7 +116,7 @@ protected: int m_iPlaneNumber; int m_iBPP; int m_iP[4]; - BOOL m_bSIDModel ; /*TRUE when the Color model is SID else FALSE(for Yoda)*/ + BOOL m_bLJZjsColor2Printer ; /*TRUE when the Printer model follows LJZjsColor-2 encapsulation format, else FALSE*/ }; // LJZjs typedef enum diff --git a/prnt/hpijs/ljzjscolor.cpp b/prnt/hpijs/ljzjscolor.cpp index bd8caf9cc..ebb45e3f0 100644 --- a/prnt/hpijs/ljzjscolor.cpp +++ b/prnt/hpijs/ljzjscolor.cpp @@ -40,6 +40,8 @@ APDK_BEGIN_NAMESPACE +#define LJZJSCOLOR2DEVICESCOUNT 8 + extern uint32_t ulMapGRAY_K_6x6x1[9 * 9 * 9]; extern uint32_t ulMapDJ600_CCM_K[9 * 9 * 9]; @@ -80,19 +82,8 @@ LJZjsColor::LJZjsColor (SystemServices* pSS, int numfonts, BOOL proto) m_bIamColor = TRUE; m_iPrinterType = eLJZjsColor; - /*Checking for SID*/ - char szSIDModelName[] = "HP LaserJet CP1025nw\0"; - BYTE strDeviceID[DevIDBuffSize]; - DRIVER_ERROR err; - - m_bSIDModel = FALSE; - err = pSS->GetDeviceID(strDeviceID,DevIDBuffSize,FALSE); - if( NO_ERROR == err && - (strnlen((const char*)strDeviceID, DevIDBuffSize)< DevIDBuffSize) && - (strstr((const char*)strDeviceID, (const char*)szSIDModelName))) - { - m_bSIDModel = TRUE; - } + /*Checking for LJZjsColor-2 format Printers*/ + m_bLJZjsColor2Printer = IsLJZjsColor2Printer(pSS); } LJZjsColor::~LJZjsColor () @@ -248,9 +239,9 @@ DRIVER_ERROR LJZjsColor::Encapsulate (const RASTERDATA *pRasterData, BOOL bLastP if (m_dwCurrentRaster == m_dwLastRaster) { - if(TRUE == m_bSIDModel) + if(TRUE == m_bLJZjsColor2Printer) { - err = JbigCompress_SID (); + err = JbigCompress_LJZjsColor2 (); } else { @@ -284,27 +275,27 @@ DRIVER_ERROR LJZjsColor::EndPage () /* SendPlaneData -Description: Call the appropriate SendPlaneData based on whether its SID or YODA +Description: Call the appropriate SendPlaneData based on whether its LJZjsColor-2 printer or not Arguments: -se: Not used for SID. For YODA used to send header for last stride +se: Not used for LJZjsColor-2 printer. Otherwise used to send header for last stride pcBuff: Pointer to struct having Compressed Data and size -bLastStride: Last scan line. Not used for SID. Used to send header in YODA +bLastStride: Last scan line. Not used for LJZjsColor-2 printer. Used to send header otherwise. */ DRIVER_ERROR LJZjsColor::SendPlaneData (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride) { DRIVER_ERROR err = NO_ERROR; - if(TRUE == m_bSIDModel) + if(TRUE == m_bLJZjsColor2Printer) { - err = SendPlaneData_SID (iPlaneNumber,se, pcBuff,bLastStride); + err = SendPlaneData_LJZjsColor2 (iPlaneNumber,se, pcBuff,bLastStride); } else { - err = SendPlaneData_YODA (iPlaneNumber, se, pcBuff, bLastStride); + err = SendPlaneData_LJZjsColor (iPlaneNumber, se, pcBuff, bLastStride); } return err; } -DRIVER_ERROR LJZjsColor::SendPlaneData_YODA (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride) +DRIVER_ERROR LJZjsColor::SendPlaneData_LJZjsColor (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride) { DRIVER_ERROR err = NO_ERROR; BYTE szStr[256]; @@ -400,15 +391,15 @@ DRIVER_ERROR LJZjsColor::SendPlaneData_YODA (int iPlaneNumber, HPLJZjsJbgEncSt * -/*SendPlaneData for SID +/*SendPlaneData for LJZjsColor-2 printer Description: Send the compressed data for the particular plane. Data sent in chunks of max size 64k or 0x10000 Arguments: -se: Not used for SID +se: Not used for LJZjsColor-2 printer pcBuff: Pointer to struct having Compressed Data and size -bLastStride: Last scan line. Not used for SID. +bLastStride: Last scan line. Not used for LJZjsColor-2 printer. */ -DRIVER_ERROR LJZjsColor::SendPlaneData_SID (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride) +DRIVER_ERROR LJZjsColor::SendPlaneData_LJZjsColor2 (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride) { DRIVER_ERROR err = NO_ERROR; BYTE szStr[256]; /*Buffer to send commands*/ @@ -512,6 +503,39 @@ DRIVER_ERROR LJZjsColor::ParsePenInfo (PEN_TYPE& ePen, BOOL QueryPrinter) return NO_ERROR; } +bool LJZjsColor::IsLJZjsColor2Printer(SystemServices* pSS) +{ + if (pSS == NULL) + return false; + char szLJZjsColor2ModelNames[LJZJSCOLOR2DEVICESCOUNT][25] = { + "HP LaserJet CP1025\0", + "HP LaserJet CP1021\0", + "HP LaserJet CP1022\0", + "HP LaserJet CP1023\0", + "HP LaserJet CP1025nw\0", + "HP LaserJet CP1026nw\0", + "HP LaserJet CP1027nw\0", + "HP LaserJet CP1028nw\0" + }; //Device models that follow LJZjsColor-2 encapsulation format + + BYTE strDeviceID[DevIDBuffSize]; + DRIVER_ERROR err; + bool bLJZjsColor2Printer = FALSE; + err = pSS->GetDeviceID(strDeviceID,DevIDBuffSize,FALSE); + + for(int i=0; i< LJZJSCOLOR2DEVICESCOUNT; i++) + { + if( NO_ERROR == err && + (strnlen((const char*)strDeviceID, DevIDBuffSize)< DevIDBuffSize) && + (strstr((const char*)strDeviceID, (const char*)szLJZjsColor2ModelNames[i]))) + { + bLJZjsColor2Printer = TRUE; + break; + } + } + return bLJZjsColor2Printer; +} + APDK_END_NAMESPACE #endif // defined APDK_LJZJS_COLOR diff --git a/prnt/hpijs/ljzjscolor.h b/prnt/hpijs/ljzjscolor.h index 97155192d..0efd9f2bf 100644 --- a/prnt/hpijs/ljzjscolor.h +++ b/prnt/hpijs/ljzjscolor.h @@ -57,10 +57,11 @@ protected: #endif
private:
+ bool IsLJZjsColor2Printer(SystemServices* pSS);
virtual DRIVER_ERROR EndPage ();
virtual DRIVER_ERROR SendPlaneData (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride);
- virtual DRIVER_ERROR SendPlaneData_YODA (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride);
- virtual DRIVER_ERROR SendPlaneData_SID (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride);
+ virtual DRIVER_ERROR SendPlaneData_LJZjsColor (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride);
+ virtual DRIVER_ERROR SendPlaneData_LJZjsColor2 (int iPlaneNumber, HPLJZjsJbgEncSt *se, HPLJZjcBuff *pcBuff, BOOL bLastStride);
}; // LJZjsColor
@@ -99,7 +100,14 @@ public: "HP Color LaserJet 1600\0" // models with null at end of each
"HP Color LaserJet 2600n\0"
"HP Color LaserJet CP1215\0"
+ "Hp LaserJet CP1025\0"
+ "HP LaserJet CP1021\0"
+ "HP LaserJet CP1022\0"
+ "HP LaserJet CP1023\0"
"HP LaserJet CP1025nw\0"
+ "HP LaserJet CP1026nw\0"
+ "HP LaserJet CP1027nw\0"
+ "HP LaserJet CP1028nw\0"
) {m_iPrinterType = eLJZjsColor;}
inline Printer* CreatePrinter(SystemServices* pSS) const { return new LJZjsColor(pSS); }
inline PRINTER_TYPE GetPrinterType() const { return eLJZjsColor;}
diff --git a/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz Binary files differindex 773670aee..5c81a9789 100644 --- a/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2250-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz Binary files differindex cf57e5ebd..361728d26 100644 --- a/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2280-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz Binary files differindex 7c5427dfa..94292baec 100644 --- a/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2300-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz Binary files differindex b1657efaa..15605a526 100644 --- a/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2600-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz b/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz Binary files differindex 8b0c71e97..4eafa9c54 100644 --- a/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_2800-ps.ppd.gz diff --git a/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz b/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz Binary files differindex d66576b6f..74cffac8d 100644 --- a/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz +++ b/prnt/ps/hp-business_inkjet_3000-ps.ppd.gz diff --git a/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz b/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz Binary files differindex 74a9771d3..4db36c1c0 100644 --- a/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz +++ b/prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz diff --git a/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz b/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz Binary files differindex c5df8fd14..591070cc8 100644 --- a/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz +++ b/prnt/ps/hp-cm8060_mfp_with_edgeline-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet-ps.ppd.gz b/prnt/ps/hp-color_laserjet-ps.ppd.gz Binary files differindex ef4c620a3..5946121d3 100644 --- a/prnt/ps/hp-color_laserjet-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz Binary files differindex 9b008d25d..0e02c16b8 100644 --- a/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz Binary files differindex cc0ffe679..3301f8f6b 100644 --- a/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz Binary files differindex f480be62d..bcb420d00 100644 --- a/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz Binary files differindex 92486461c..d09b34bee 100644 --- a/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2605-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz Binary files differindex 235d09057..6594ae523 100644 --- a/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz Binary files differindex 954fcdb1f..40e0167b2 100644 --- a/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2605dtn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz Binary files differindex 99caced85..040e7b27a 100644 --- a/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2700-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz Binary files differindex 7a427f30c..d00f88d86 100644 --- a/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz Binary files differindex 563fee2ac..d50a95fc4 100644 --- a/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2800-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz Binary files differindex ecb537d31..986e2e3d0 100644 --- a/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2820-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz Binary files differindex 18c6bcdd5..11039576a 100644 --- a/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2830-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz b/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz Binary files differindex 1a3de8dde..8e892f4d8 100644 --- a/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_2840-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz Binary files differindex f0810ee91..0c3599a92 100644 --- a/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3000-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz Binary files differindex 6ef7e987a..a040f6775 100644 --- a/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3700-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz Binary files differindex eb40cb8da..9902c2b7a 100644 --- a/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz b/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz Binary files differindex a432f720d..50bb11ee5 100644 --- a/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_3800-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz Binary files differindex ea3b36203..43f657bc7 100644 --- a/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz Binary files differindex 984a2feb2..ef8eeff9e 100644 --- a/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4550-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz Binary files differindex c4b511145..28d95aef4 100644 --- a/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4600-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz Binary files differindex 569655732..2da7397a7 100644 --- a/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz Binary files differindex 14a246db7..894f8f349 100644 --- a/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4610-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz Binary files differindex d951ee9c3..001c2b105 100644 --- a/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4650-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz Binary files differindex 1841356aa..11544a347 100644 --- a/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4700-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz Binary files differindex 30b813685..95889b425 100644 --- a/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_4730mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz Binary files differindex 24af4c0b0..a561b175a 100644 --- a/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_5500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz Binary files differindex fdd95d451..edd5f49af 100644 --- a/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_5550-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz b/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz Binary files differindex 5adb1a0b7..98e80db91 100644 --- a/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_5m-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz Binary files differindex a965b9dd4..6e76d0df9 100644 --- a/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_8500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz b/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz Binary files differindex 771b7eeef..fa8084d9b 100644 --- a/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_8550-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz b/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz Binary files differindex 452e3b198..52c380db5 100644 --- a/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_9500-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz Binary files differindex 26e80d0e3..7018350ad 100644 --- a/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_9500_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz Binary files differindex 505846156..d3ee680fb 100644 --- a/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz Binary files differindex c98ec6b5c..17a0d03bf 100644 --- a/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1017-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz Binary files differindex 0637c0f20..bc9b839ce 100644 --- a/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz Binary files differindex 56cb8f483..fa598563f 100644 --- a/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz Binary files differindex bc1bf2e9b..ad1900dca 100644 --- a/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz Binary files differindex a0f1c565c..fcb7091da 100644 --- a/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz Binary files differindex 9ff1505d9..c6c5b3fe4 100644 --- a/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz Binary files differindex 0e494d62e..7b8dcc66a 100644 --- a/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz Binary files differindex b7a5ec9fe..67be3fc1a 100644 --- a/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..1478e8c03 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz Binary files differindex bcb983046..6c77d9841 100644 --- a/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz Binary files differindex 565bf3b37..b9726c069 100644 --- a/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz Binary files differindex 8b614d0eb..f09223484 100644 --- a/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz Binary files differindex 845edccc0..1ff48dda9 100644 --- a/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cm6049_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz Binary files differindex 5ae6f79dd..cf0e6de09 100644 --- a/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp1514n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz Binary files differindex 1649f6ded..ad3cbf762 100644 --- a/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp1515n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz Binary files differindex b9ed2bade..763d352f7 100644 --- a/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp1518ni-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz Binary files differindex 265b44fa7..6f2d4ae4c 100644 --- a/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz Binary files differindex d1c6999dd..fb9b05d89 100644 --- a/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025dn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz Binary files differindex 54e101294..7ee194fb5 100644 --- a/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz Binary files differindex 8ea3e8393..f683afce7 100644 --- a/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp2025x-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz Binary files differindex ea7180690..52d338c0e 100644 --- a/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp3505-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz Binary files differindex 3fd4f3cb4..76b06a832 100644 --- a/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz Binary files differindex bc3c29867..b1795ed92 100644 --- a/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz Binary files differindex e45ceff4b..8b9f16113 100644 --- a/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz Binary files differindex 12fd71bc2..b263851de 100644 --- a/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp4520_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz Binary files differindex b5ac79bac..3a9a9c56b 100644 --- a/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5225-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz Binary files differindex 1050454d4..3018599a6 100644 --- a/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5225dn-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz Binary files differindex a668e0a85..8dbf7031e 100644 --- a/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp5225n-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..8b2a2f578 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz Binary files differindex 23f46d5d5..eab08eefb 100644 --- a/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_cp6015-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz Binary files differindex b4d9456ce..28dc5b3a1 100644 --- a/prnt/ps/hp-designjet_4020ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4020ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4500mfp.ppd.gz b/prnt/ps/hp-designjet_4500mfp.ppd.gz Binary files differindex 1f228ba71..264d066f1 100644 --- a/prnt/ps/hp-designjet_4500mfp.ppd.gz +++ b/prnt/ps/hp-designjet_4500mfp.ppd.gz diff --git a/prnt/ps/hp-designjet_4500ps.ppd.gz b/prnt/ps/hp-designjet_4500ps.ppd.gz Binary files differindex 8644edfa4..48267690d 100644 --- a/prnt/ps/hp-designjet_4500ps.ppd.gz +++ b/prnt/ps/hp-designjet_4500ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz Binary files differindex ee88ba47b..608ae3514 100644 --- a/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4520mfp-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4520ps-ps.ppd.gz b/prnt/ps/hp-designjet_4520ps-ps.ppd.gz Binary files differindex 4765aa0de..0ee18508b 100644 --- a/prnt/ps/hp-designjet_4520ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_4520ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz Binary files differindex cda037988..3ff9a1210 100644 --- a/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz Binary files differindex 1be877f87..6057da711 100644 --- a/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz Binary files differindex 5214f3a16..5c468a243 100644 --- a/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz Binary files differindex c390f214d..06e624c5d 100644 --- a/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1120ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz Binary files differindex 103f6b02a..66896a777 100644 --- a/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1200_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz Binary files differindex f80f6aa8c..63537acce 100644 --- a/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t770_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz Binary files differindex abf2fbf09..96fc1f034 100644 --- a/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1200-ps.ppd.gz b/prnt/ps/hp-laserjet_1200-ps.ppd.gz Binary files differindex 9b05dd168..ee2e3389b 100644 --- a/prnt/ps/hp-laserjet_1200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1200n-ps.ppd.gz b/prnt/ps/hp-laserjet_1200n-ps.ppd.gz Binary files differindex a6bcf9c84..99a88eca9 100644 --- a/prnt/ps/hp-laserjet_1200n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1200n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1220-ps.ppd.gz b/prnt/ps/hp-laserjet_1220-ps.ppd.gz Binary files differindex b07047467..9f07cc921 100644 --- a/prnt/ps/hp-laserjet_1220-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1220-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1220se-ps.ppd.gz b/prnt/ps/hp-laserjet_1220se-ps.ppd.gz Binary files differindex 25eaf311b..ad2181234 100644 --- a/prnt/ps/hp-laserjet_1220se-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1220se-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1300-ps.ppd.gz b/prnt/ps/hp-laserjet_1300-ps.ppd.gz Binary files differindex a83e20d82..44106c952 100644 --- a/prnt/ps/hp-laserjet_1300-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1300-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1300n-ps.ppd.gz b/prnt/ps/hp-laserjet_1300n-ps.ppd.gz Binary files differindex 408ab12a5..b7df9cdbe 100644 --- a/prnt/ps/hp-laserjet_1300n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1300n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz b/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz Binary files differindex de6fbfcb7..fa8172c5b 100644 --- a/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1300xi-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320-ps.ppd.gz b/prnt/ps/hp-laserjet_1320-ps.ppd.gz Binary files differindex 6ba593160..d961eb2b6 100644 --- a/prnt/ps/hp-laserjet_1320-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz b/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz Binary files differindex f9d8e16fd..0fd28c4ef 100644 --- a/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320n-ps.ppd.gz b/prnt/ps/hp-laserjet_1320n-ps.ppd.gz Binary files differindex 2e246494b..7520b76f1 100644 --- a/prnt/ps/hp-laserjet_1320n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz b/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz Binary files differindex 48a8a8eee..26e457f9c 100644 --- a/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320nw-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz b/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz Binary files differindex d59ce9aea..6909f8431 100644 --- a/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_1320tn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2100-ps.ppd.gz b/prnt/ps/hp-laserjet_2100-ps.ppd.gz Binary files differindex 033c2667a..b6a081cc6 100644 --- a/prnt/ps/hp-laserjet_2100-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2100-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz Binary files differindex de3b6687d..5f4c500aa 100644 --- a/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2200-ps.ppd.gz b/prnt/ps/hp-laserjet_2200-ps.ppd.gz Binary files differindex 4aec7b41b..92f82ab93 100644 --- a/prnt/ps/hp-laserjet_2200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz Binary files differindex b3c595bc4..c88eb3357 100644 --- a/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2200_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2300-ps.ppd.gz b/prnt/ps/hp-laserjet_2300-ps.ppd.gz Binary files differindex 49a9a7d6d..18c9dbe0c 100644 --- a/prnt/ps/hp-laserjet_2300-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2300-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz b/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz Binary files differindex 349d42a4c..8ed42f7b1 100644 --- a/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2300_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2410-ps.ppd.gz b/prnt/ps/hp-laserjet_2410-ps.ppd.gz Binary files differindex d60e51e7b..8edb8a678 100644 --- a/prnt/ps/hp-laserjet_2410-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2410-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2420-ps.ppd.gz b/prnt/ps/hp-laserjet_2420-ps.ppd.gz Binary files differindex b09d56374..ffca623d8 100644 --- a/prnt/ps/hp-laserjet_2420-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2420-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_2430-ps.ppd.gz b/prnt/ps/hp-laserjet_2430-ps.ppd.gz Binary files differindex 2de0b53ca..961e2f623 100644 --- a/prnt/ps/hp-laserjet_2430-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_2430-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3015-ps.ppd.gz b/prnt/ps/hp-laserjet_3015-ps.ppd.gz Binary files differindex 717845ccd..6f76b8a2f 100644 --- a/prnt/ps/hp-laserjet_3015-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3015-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3020-ps.ppd.gz b/prnt/ps/hp-laserjet_3020-ps.ppd.gz Binary files differindex 80027c2d3..ffb2f4a09 100644 --- a/prnt/ps/hp-laserjet_3020-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3020-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3030-ps.ppd.gz b/prnt/ps/hp-laserjet_3030-ps.ppd.gz Binary files differindex cef2a8855..a1a4baae0 100644 --- a/prnt/ps/hp-laserjet_3030-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3030-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3050-ps.ppd.gz b/prnt/ps/hp-laserjet_3050-ps.ppd.gz Binary files differindex f3fb4dc75..d104e945d 100644 --- a/prnt/ps/hp-laserjet_3050-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3050-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3052-ps.ppd.gz b/prnt/ps/hp-laserjet_3052-ps.ppd.gz Binary files differindex 39d6b57d9..09ded9ad8 100644 --- a/prnt/ps/hp-laserjet_3052-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3052-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3200m-ps.ppd.gz b/prnt/ps/hp-laserjet_3200m-ps.ppd.gz Binary files differindex 783fa2755..918568f38 100644 --- a/prnt/ps/hp-laserjet_3200m-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3200m-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz b/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz Binary files differindex 447e38478..c6e7f3120 100644 --- a/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3380-ps.ppd.gz b/prnt/ps/hp-laserjet_3380-ps.ppd.gz Binary files differindex 791b3067a..4771b2c2f 100644 --- a/prnt/ps/hp-laserjet_3380-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3380-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_3390-ps.ppd.gz b/prnt/ps/hp-laserjet_3390-ps.ppd.gz Binary files differindex 5a968c0e8..18b8f5602 100644 --- a/prnt/ps/hp-laserjet_3390-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_3390-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4-ps.ppd.gz b/prnt/ps/hp-laserjet_4-ps.ppd.gz Binary files differindex 060421810..6f9949f47 100644 --- a/prnt/ps/hp-laserjet_4-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz Binary files differindex e69e24c2d..3cd52099f 100644 --- a/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz Binary files differindex bf53fbf70..6fb07116a 100644 --- a/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4050_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz Binary files differindex 9b4473250..f054d0280 100644 --- a/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4100_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz Binary files differindex 010f39687..bdd499df3 100644 --- a/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4200-ps.ppd.gz b/prnt/ps/hp-laserjet_4200-ps.ppd.gz Binary files differindex d9de080ef..95ef38dbe 100644 --- a/prnt/ps/hp-laserjet_4200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4240-ps.ppd.gz b/prnt/ps/hp-laserjet_4240-ps.ppd.gz Binary files differindex ae06bef97..4b94892e0 100644 --- a/prnt/ps/hp-laserjet_4240-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4240-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4250-ps.ppd.gz b/prnt/ps/hp-laserjet_4250-ps.ppd.gz Binary files differindex 4632baa78..609a1e1a1 100644 --- a/prnt/ps/hp-laserjet_4250-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4250-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4300-ps.ppd.gz b/prnt/ps/hp-laserjet_4300-ps.ppd.gz Binary files differindex 99df69916..8c49be09f 100644 --- a/prnt/ps/hp-laserjet_4300-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4300-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz Binary files differindex 59a88ed17..5024927a9 100644 --- a/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4345_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4350-ps.ppd.gz b/prnt/ps/hp-laserjet_4350-ps.ppd.gz Binary files differindex efaa0a136..82deebf40 100644 --- a/prnt/ps/hp-laserjet_4350-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4350-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz b/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz Binary files differindex f7cf9ffac..97ed3c883 100644 --- a/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4_plus-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4ml-ps.ppd.gz b/prnt/ps/hp-laserjet_4ml-ps.ppd.gz Binary files differindex de2d9d836..f448f0a0e 100644 --- a/prnt/ps/hp-laserjet_4ml-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4ml-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4mp-ps.ppd.gz b/prnt/ps/hp-laserjet_4mp-ps.ppd.gz Binary files differindex 4cb021559..df4c6f0c5 100644 --- a/prnt/ps/hp-laserjet_4mp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4mp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4si-ps.ppd.gz b/prnt/ps/hp-laserjet_4si-ps.ppd.gz Binary files differindex 0a1b406f2..843ab2b6f 100644 --- a/prnt/ps/hp-laserjet_4si-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4si-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_4v-ps.ppd.gz b/prnt/ps/hp-laserjet_4v-ps.ppd.gz Binary files differindex e457af624..75627f035 100644 --- a/prnt/ps/hp-laserjet_4v-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_4v-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5000-ps.ppd.gz b/prnt/ps/hp-laserjet_5000-ps.ppd.gz Binary files differindex 3d477fa17..cb1b5782a 100644 --- a/prnt/ps/hp-laserjet_5000-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5000-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz Binary files differindex 51bcac6c0..a59ee63eb 100644 --- a/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz Binary files differindex 0a648c2ed..06b7733ba 100644 --- a/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5200-ps.ppd.gz b/prnt/ps/hp-laserjet_5200-ps.ppd.gz Binary files differindex be25c323d..ecbc02f73 100644 --- a/prnt/ps/hp-laserjet_5200-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5200-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5200l-ps.ppd.gz b/prnt/ps/hp-laserjet_5200l-ps.ppd.gz Binary files differindex f8b9652d1..fc2b9422b 100644 --- a/prnt/ps/hp-laserjet_5200l-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5200l-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz b/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz Binary files differindex 150c3962f..c96a402d7 100644 --- a/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5200lx-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5mp-ps.ppd.gz b/prnt/ps/hp-laserjet_5mp-ps.ppd.gz Binary files differindex 2b92666ca..742184ca0 100644 --- a/prnt/ps/hp-laserjet_5mp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5mp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5p-ps.ppd.gz b/prnt/ps/hp-laserjet_5p-ps.ppd.gz Binary files differindex f1d83fec4..4f757aab0 100644 --- a/prnt/ps/hp-laserjet_5p-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5p-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5si-ps.ppd.gz b/prnt/ps/hp-laserjet_5si-ps.ppd.gz Binary files differindex 4ee95b41c..95b0a9329 100644 --- a/prnt/ps/hp-laserjet_5si-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5si-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz b/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz Binary files differindex b3d59b66f..8095ce296 100644 --- a/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_6mp-ps.ppd.gz b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz Binary files differindex ccfc3cdc6..ea2dac06c 100644 --- a/prnt/ps/hp-laserjet_6mp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_6mp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_6p-ps.ppd.gz b/prnt/ps/hp-laserjet_6p-ps.ppd.gz Binary files differindex 5a53ffe0c..9be01f0e0 100644 --- a/prnt/ps/hp-laserjet_6p-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_6p-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8000-ps.ppd.gz b/prnt/ps/hp-laserjet_8000-ps.ppd.gz Binary files differindex d8d0ebc56..456a71a99 100644 --- a/prnt/ps/hp-laserjet_8000-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8000-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz Binary files differindex 3b3d789d1..9ec71e270 100644 --- a/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz Binary files differindex b2c0ecab3..1b9f8e5bf 100644 --- a/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz b/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz Binary files differindex 91d72ce04..c75b60463 100644 --- a/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8100_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz Binary files differindex 0bb4cfb38..93989785d 100644 --- a/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz Binary files differindex 253ce6a77..246293a55 100644 --- a/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz b/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz Binary files differindex 3988667b8..8be9821e7 100644 --- a/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9000_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9040-ps.ppd.gz b/prnt/ps/hp-laserjet_9040-ps.ppd.gz Binary files differindex b6b841aff..d457688ac 100644 --- a/prnt/ps/hp-laserjet_9040-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9040-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz Binary files differindex 387f38847..4e669b39d 100644 --- a/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9040_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9050-ps.ppd.gz b/prnt/ps/hp-laserjet_9050-ps.ppd.gz Binary files differindex c7cf41c2f..d1bd89008 100644 --- a/prnt/ps/hp-laserjet_9050-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9050-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz Binary files differindex f13f9a726..a9a3f24ba 100644 --- a/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz Binary files differindex 0e153508c..be45c8e0b 100644 --- a/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz Binary files differindex 4cee40366..56dc8f146 100644 --- a/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_9065mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_cm1415fnw-ps.ppd.gz b/prnt/ps/hp-laserjet_cm1415fnw-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..f80e55c45 --- /dev/null +++ b/prnt/ps/hp-laserjet_cm1415fnw-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz Binary files differindex 9416fa4fa..466d3ba5d 100644 --- a/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1522_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz Binary files differindex e28e62d73..d59cd57b8 100644 --- a/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1522n_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz Binary files differindex 5a3988822..21f03b0ca 100644 --- a/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m1536dnf_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m1536dnf_mfp-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..8a2aea646 --- /dev/null +++ b/prnt/ps/hp-laserjet_m1536dnf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz Binary files differindex 56684b491..ea891513b 100644 --- a/prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz Binary files differindex d31a9bd8c..107258695 100644 --- a/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727nf_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727nfs_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727nfs_mfp-ps.ppd.gz Binary files differindex 47bca15c9..0c35cc9a3 100644 --- a/prnt/ps/hp-laserjet_m2727nfs_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727nfs_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz Binary files differindex a9c52133e..78d83ef53 100644 --- a/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz Binary files differindex 8df205349..7f3f4030d 100644 --- a/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz Binary files differindex 7ccbf5865..b8788f7d8 100644 --- a/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4345_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz Binary files differindex dec839f14..4af28a88f 100644 --- a/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4349_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz Binary files differindex 17b6df6f7..e48d447dc 100644 --- a/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m5025_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz Binary files differindex 0ea0b5ad0..23a8e2585 100644 --- a/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m5035_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz Binary files differindex bf634b3e7..e7a264466 100644 --- a/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m9040_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz Binary files differindex 581e802f8..4c7c973a8 100644 --- a/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m9050_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz Binary files differindex 276808d27..674903f25 100644 --- a/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz Binary files differindex 2b4955734..5758dfb99 100644 --- a/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.gz Binary files differindex 09b76df68..f262624dc 100644 --- a/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz Binary files differindex 9874a82f1..f54932988 100644 --- a/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz Binary files differindex 19379ce73..9a85b3656 100644 --- a/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055-ps.ppd.gz Binary files differindex c5b4bb5bb..6fe2469bf 100644 --- a/prnt/ps/hp-laserjet_p2055-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz Binary files differindex c5e490b44..f2f8d2e8d 100644 --- a/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055d-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz Binary files differindex b791a4acc..8df09763a 100644 --- a/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p2055x-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055x-ps.ppd.gz Binary files differindex 001b29807..4a1f73a68 100644 --- a/prnt/ps/hp-laserjet_p2055x-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055x-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p3004-ps.ppd.gz b/prnt/ps/hp-laserjet_p3004-ps.ppd.gz Binary files differindex 8eae39632..f4ea23321 100644 --- a/prnt/ps/hp-laserjet_p3004-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p3004-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p3005-ps.ppd.gz b/prnt/ps/hp-laserjet_p3005-ps.ppd.gz Binary files differindex bae9b3fc7..aa9ab84ec 100644 --- a/prnt/ps/hp-laserjet_p3005-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p3005-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz Binary files differindex 9866a00b1..404038c0e 100644 --- a/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4014-ps.ppd.gz b/prnt/ps/hp-laserjet_p4014-ps.ppd.gz Binary files differindex 86f5b06f2..548a73759 100644 --- a/prnt/ps/hp-laserjet_p4014-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4014-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz Binary files differindex cf1098962..c852b8463 100644 --- a/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4014dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz b/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz Binary files differindex 60c7a9ecf..001e3bf3b 100644 --- a/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4014n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015-ps.ppd.gz Binary files differindex 4e6517363..323db9eb4 100644 --- a/prnt/ps/hp-laserjet_p4015-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz Binary files differindex fafca3aec..dd0cc8f41 100644 --- a/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz Binary files differindex f588c3649..a7a52fba6 100644 --- a/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz Binary files differindex ec781d86b..045ef5cc7 100644 --- a/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015tn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz b/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz Binary files differindex cf9193d16..d4d6750f0 100644 --- a/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4015x-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515-ps.ppd.gz Binary files differindex 2017a3096..1b68eedfa 100644 --- a/prnt/ps/hp-laserjet_p4515-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz Binary files differindex fcf18331d..055cc54ae 100644 --- a/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz Binary files differindex 974cd29cf..9ed5bd52a 100644 --- a/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515tn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz Binary files differindex f584d8495..c401576e1 100644 --- a/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515x-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_p4515xm-ps.ppd.gz b/prnt/ps/hp-laserjet_p4515xm-ps.ppd.gz Binary files differindex 4b00ecdd2..356a6f8dc 100644 --- a/prnt/ps/hp-laserjet_p4515xm-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4515xm-ps.ppd.gz diff --git a/prnt/ps/hp-mopier_240-ps.ppd.gz b/prnt/ps/hp-mopier_240-ps.ppd.gz Binary files differindex d4d71a594..8895f02f6 100644 --- a/prnt/ps/hp-mopier_240-ps.ppd.gz +++ b/prnt/ps/hp-mopier_240-ps.ppd.gz diff --git a/prnt/ps/hp-mopier_320-ps.ppd.gz b/prnt/ps/hp-mopier_320-ps.ppd.gz Binary files differindex 2c15fe2b1..16f297ca2 100644 --- a/prnt/ps/hp-mopier_320-ps.ppd.gz +++ b/prnt/ps/hp-mopier_320-ps.ppd.gz @@ -767,7 +767,7 @@ try: if not adf: try: - #device.setOption("source", "Auto") + device.setOption("source", "Flatbed") device.setOption("batch-scan", False) except scanext.error: log.debug("Error setting source or batch-scan option (this is probably OK).") diff --git a/scan/sane/bb_ledm.c b/scan/sane/bb_ledm.c index d3b2d7fbc..62d174ad9 100644 --- a/scan/sane/bb_ledm.c +++ b/scan/sane/bb_ledm.c @@ -191,7 +191,7 @@ Keep-Alive: 20\r\nProxy-Connection: keep-alive\r\nCookie: AccessCounter=new\r\n0 <scan:ColorSpace>%s</scan:ColorSpace>\ <scan:BitDepth>%d</scan:BitDepth>\ <scan:InputSource>%s</scan:InputSource>\ -<scan:AdfOptions>DetectPaperLoaded</scan:AdfOptions>\ +<scan:AdfOptions>SelectSinglePage</scan:AdfOptions>\ <scan:GrayRendering>NTSC</scan:GrayRendering>\ <scan:ToneMap>\ <scan:Gamma>0</scan:Gamma>\ @@ -305,6 +305,7 @@ static int parse_scan_elements(const char *payload, int size, struct wscn_scan_e get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); i=1; + elements->config.platen.platen_resolution_list[0]=0; while(strcmp(tag, "/SupportedResolutions")) { get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); @@ -312,7 +313,8 @@ static int parse_scan_elements(const char *payload, int size, struct wscn_scan_e { get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); get_element(tail, size-(tail-payload), value, sizeof(value), &tail); - elements->config.platen.platen_resolution_list[i++]=strtol(value, NULL, 10); + if(strtol(value, NULL, 10) && elements->config.platen.platen_resolution_list[i-1] != strtol(value, NULL, 10)) + elements->config.platen.platen_resolution_list[i++]=strtol(value, NULL, 10); } } elements->config.platen.platen_resolution_list[0]=i-1; @@ -364,6 +366,7 @@ static int parse_scan_elements(const char *payload, int size, struct wscn_scan_e get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); i=1; + elements->config.adf.adf_resolution_list[0]=0; while(strcmp(tag, "/SupportedResolutions")) { get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); @@ -371,7 +374,8 @@ static int parse_scan_elements(const char *payload, int size, struct wscn_scan_e { get_tag(tail, size-(tail-payload), tag, sizeof(tag), &tail); get_element(tail, size-(tail-payload), value, sizeof(value), &tail); - elements->config.adf.adf_resolution_list[i++]=strtol(value, NULL, 10); + if(strtol(value, NULL, 10) && elements->config.adf.adf_resolution_list[i-1] != strtol(value, NULL, 10)) + elements->config.adf.adf_resolution_list[i++]=strtol(value, NULL, 10); } } elements->config.adf.adf_resolution_list[0]=i-1; @@ -624,6 +628,16 @@ int bb_open(struct ledm_session *ps) ps->adf_tlyRange.max = SANE_FIX(pbb->elements.config.adf.maximum_size.height/11.811023); ps->adf_bryRange.max = ps->adf_tlyRange.max; + i = pbb->elements.config.platen.platen_resolution_list[0] + 1; + while(i--) + { + ps->platen_resolutionList[i] = pbb->elements.config.platen.platen_resolution_list[i]; + ps->resolutionList[i] = pbb->elements.config.platen.platen_resolution_list[i]; + } + + i = pbb->elements.config.adf.adf_resolution_list[0] + 1; + while(i--) ps->adf_resolutionList[i] = pbb->elements.config.adf.adf_resolution_list[i]; + stat = 0; bugout: @@ -791,7 +805,7 @@ int bb_start_scan(struct ledm_session *ps) (int) (ps->currentBrx / 5548.7133), (int) (ps->currentBry / 5548.7133), "Jpeg", - (! strcmp(ce_element[ps->currentScanMode], "Color8")) ? "Color" : (! strcmp(ce_element[ps->currentScanMode], "Gray8")) ? "Gray" : "K", + (! strcmp(ce_element[ps->currentScanMode], "Color8")) ? "Color" : (! strcmp(ce_element[ps->currentScanMode], "Gray8")) ? "Gray" : "Gray", ((! strcmp(ce_element[ps->currentScanMode], "Color8")) || (! strcmp(ce_element[ps->currentScanMode], "Gray8"))) ? 8: 8, is_element[ps->currentInputSource]); @@ -876,7 +890,7 @@ int get_size(struct ledm_session* ps) char buffer[7]; int i=0, tmo=50, len; - if(ps->currentResolution == 1200) tmo *= 3; + if(ps->currentResolution >= 1200) tmo *= 5; while(1) { @@ -895,7 +909,7 @@ int bb_get_image_data(struct ledm_session* ps, int maxLength) char buf_size[2]; int len=0, tmo=50; - if(ps->currentResolution == 1200) tmo *= 3; + if(ps->currentResolution >= 1200) tmo *= 5; if (ps->cnt == 0) { @@ -918,7 +932,7 @@ int bb_end_page(struct ledm_session *ps, int io_error) { struct bb_ledm_session *pbb = ps->bb_session; -// _DBG("bb_end_page(error=%d)\n", io_error); + _DBG("bb_end_page(error=%d)\n", io_error); if (pbb->http_handle) { @@ -932,7 +946,7 @@ int bb_end_scan(struct ledm_session* ps, int io_error) { struct bb_ledm_session *pbb = ps->bb_session; -// _DBG("bb_end_scan(error=%d)\n", io_error); + _DBG("bb_end_scan(error=%d)\n", io_error); if (pbb->http_handle) { diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c index 9e65d0d09..c180026b4 100644 --- a/scan/sane/hpaio.c +++ b/scan/sane/hpaio.c @@ -22,6 +22,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Contributing Authors: David Paschal, Don Welch, David Suffield, Narla Naga Samrat Chowdary, + Yashwant Sahu \************************************************************************************/ @@ -1635,7 +1636,7 @@ extern SANE_Status sane_hpaio_open(SANE_String_Const devicename, SANE_Handle * p /* Get device attributes and determine what backend to call. */ snprintf(devname, sizeof(devname)-1, "hp:%s", devicename); /* prepend "hp:" */ hpmud_query_model(devname, &ma); - if (ma.scantype == HPMUD_SCANTYPE_MARVELL) + if ((ma.scantype == HPMUD_SCANTYPE_MARVELL) || (ma.scantype == HPMUD_SCANTYPE_MARVELL2)) return marvell_open(devicename, pHandle); if (ma.scantype == HPMUD_SCANTYPE_SOAP) return soap_open(devicename, pHandle); diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index 2fb90ff1e..3d24053a6 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -232,6 +232,9 @@ :model "HP Photosmart Estn c510 Series" :status :good +:model "HP Photosmart Ink Adv k510" +:status :good + :model "HP Officejet 520 All-in-one Printer" :status :good @@ -403,6 +406,9 @@ :model "HP LaserJet Professional m1212nf Multifunction Printer" :status :good +:model "HP LaserJet Professional m1213nf Multifunction Printer" +:status :good + :model "HP PSC 1213 All-in-one Printer" :status :good @@ -511,12 +517,36 @@ :model "HP PSC 1410xi All-in-one Printer" :status :good +:model "HP LaserJet Professional cm1411fn" +:status :good + +:model "HP LaserJet Professional cm1412fn" +:status :good + +:model "HP LaserJet Professional cm1413fn" +:status :good + :model "HP PSC 1415 All-in-one Printer" :status :good +:model "HP LaserJet Professional cm1415fnw" +:status :good + +:model "HP LaserJet Professional cm1415fn" +:status :good + +:model "HP LaserJet Professional cm1416fnw" +:status :good + +:model "HP LaserJet Professional cm1417fnw" +:status :good + :model "HP PSC 1417 All-in-one Printer" :status :good +:model "HP LaserJet Professional cm1418fnw" +:status :good + :model "HP PSC 1503 All-in-one Printer" :status :good @@ -559,6 +589,18 @@ :model "HP LaserJet m1522 Multifunction Printer" :status :good +:model "HP LaserJet m1536dnf MFP" +:status :good + +:model "HP LaserJet m1537dnf MFP" +:status :good + +:model "HP LaserJet m1538dnf MFP" +:status :good + +:model "HP LaserJet m1539dnf MFP" +:status :good + :model "HP PSC 1600 All-in-one Printer" :status :good @@ -586,6 +628,12 @@ :model "HP PSC 1615 All-in-one Printer" :status :good +:model "HP Deskjet 2050 j510 All-in-one Printer" +:status :good + +:model "HP Deskjet Ink Adv 2060 k110" +:status :good + :model "HP PSC 2105 All-in-one Printer" :status :good @@ -829,10 +877,10 @@ :model "HP Photosmart 2574 All-in-one Printer" :status :good -:model "HP Photosmart 2575a All-in-one Printer" +:model "HP Photosmart 2575v All-in-one Printer" :status :good -:model "HP Photosmart 2575v All-in-one Printer" +:model "HP Photosmart 2575a All-in-one Printer" :status :good :model "HP Photosmart 2575xi All-in-one Printer" @@ -1210,10 +1258,10 @@ :model "HP Deskjet f4230 All-in-one Printer" :status :good -:model "HP Photosmart c4235 All-in-one Printer" +:model "HP Deskjet f4235 All-in-one Printer" :status :good -:model "HP Deskjet f4235 All-in-one Printer" +:model "HP Photosmart c4235 All-in-one Printer" :status :good :model "HP Deskjet f4238 All-in-one Printer" @@ -1297,10 +1345,10 @@ :model "HP Deskjet f4292 All-in-one Printer" :status :good -:model "HP Deskjet f4293 All-in-one Printer" +:model "HP Photosmart c4293 All-in-one Printer" :status :good -:model "HP Photosmart c4293 All-in-one Printer" +:model "HP Deskjet f4293 All-in-one Printer" :status :good :model "HP Deskjet f4294 All-in-one Printer" @@ -1531,6 +1579,9 @@ :model "HP Officejet j4535 All-in-one Printer" :status :good +:model "HP Color LaserJet cm4540 Multifunction Printer" +:status :good + :model "HP Photosmart c4540 All-in-one Printer" :status :good diff --git a/scan/sane/io.h b/scan/sane/io.h index 80d2d024c..28e3d8787 100755 --- a/scan/sane/io.h +++ b/scan/sane/io.h @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Contributing Author: Don Welch, David Suffield + Contributing Author: Don Welch, David Suffield, Naga Samrat Chowdary Narla, \************************************************************************************/ @@ -40,6 +40,7 @@ int __attribute__ ((visibility ("hidden"))) ReadChannelEx(int deviceid, int chan #define EVENT_SCANNER_FAIL 2002 #define EVENT_PLUGIN_FAIL 2003 #define EVENT_SCAN_CANCEL 2009 +#define EVENT_SIZE_WARNING 2010 #define DBUS_INTERFACE "com.hplip.StatusService" #define DBUS_PATH "/" diff --git a/scan/sane/ledm.c b/scan/sane/ledm.c index 4c053dd93..3bf702d4d 100644 --- a/scan/sane/ledm.c +++ b/scan/sane/ledm.c @@ -43,6 +43,9 @@ # include "saneopts.h" # include "io.h" +# define DEBUG_DECLARE_ONLY +# include "sanei_debug.h" + static struct ledm_session *session = NULL; /* Verify current x/y extents and set effective extents. */ @@ -123,8 +126,8 @@ static int get_ip_data(struct ledm_session *ps, SANE_Byte *data, SANE_Int maxLen ip_ret = ipConvert(ps->ip_handle, inputAvail, input, &inputUsed, &inputNextPos, outputAvail, output, &outputUsed, &outputThisPos); -// DBG6("cnt=%d index=%d input=%p inputAvail=%d inputUsed=%d inputNextPos=%d output=%p outputAvail=%d outputUsed=%d outputThisPos=%d\n", ps->cnt, ps->index, input, -// inputAvail, inputUsed, inputNextPos, output, outputAvail, outputUsed, outputThisPos); + DBG6("cnt=%d index=%d input=%p inputAvail=%d inputUsed=%d inputNextPos=%d output=%p outputAvail=%d outputUsed=%d outputThisPos=%d\n", ps->cnt, ps->index, input, + inputAvail, inputUsed, inputNextPos, output, outputAvail, outputUsed, outputThisPos); if (input != NULL) { @@ -383,18 +386,10 @@ SANE_Status __attribute__ ((visibility ("hidden"))) ledm_open(SANE_String_Const /* Set supported Scan Modes as determined by bb_open. */ ledm_control_option(session, LEDM_OPTION_SCAN_MODE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ -/* Set scan input sources as determined by bb_open. */ + /* Set scan input sources as determined by bb_open. */ ledm_control_option(session, LEDM_OPTION_INPUT_SOURCE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ /* Set supported resolutions. */ - int i=1; - session->resolutionList[i++] = 75; - session->resolutionList[i++] = 100; - session->resolutionList[i++] = 200; - session->resolutionList[i++] = 300; - session->resolutionList[i++] = 600; - session->resolutionList[i++] = 1200; - session->resolutionList[0] = i-1; /* length of word_list */ ledm_control_option(session, LEDM_OPTION_SCAN_RESOLUTION, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ /* Set supported contrast. */ @@ -416,20 +411,19 @@ SANE_Status __attribute__ ((visibility ("hidden"))) ledm_open(SANE_String_Const stat = SANE_STATUS_GOOD; - //bb_unload(session); return stat; } const SANE_Option_Descriptor *ledm_get_option_descriptor(SANE_Handle handle, SANE_Int option) { - struct ledm_session *ps = (struct ledm_session *)handle; + struct ledm_session *ps = (struct ledm_session *)handle; -// DBG8("sane_hpaio_get_option_descriptor(option=%s)\n", ps->option[option].name); + DBG8("sane_hpaio_get_option_descriptor(option=%s)\n", ps->option[option].name); - if (option < 0 || option >= LEDM_OPTION_MAX) - return NULL; + if (option < 0 || option >= LEDM_OPTION_MAX) + return NULL; - return &ps->option[option]; + return &ps->option[option]; } /* ledm_get_option_descriptor */ SANE_Status ledm_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void *value, SANE_Int *set_result) @@ -502,6 +496,17 @@ SANE_Status ledm_control_option(SANE_Handle handle, SANE_Int option, SANE_Action { ps->currentInputSource = ps->inputSourceMap[i]; set_input_source_side_effects(ps, ps->currentInputSource); + if(ps->currentInputSource == IS_PLATEN) + { + i = session->platen_resolutionList[0] + 1; + while(i--) session->resolutionList[i] = session->platen_resolutionList[i]; + } + else + { + i = session->adf_resolutionList[0] + 1; + while(i--) session->resolutionList[i] = session->adf_resolutionList[i]; + } + mset_result |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; stat = SANE_STATUS_GOOD; break; } @@ -511,6 +516,7 @@ SANE_Status ledm_control_option(SANE_Handle handle, SANE_Int option, SANE_Action { /* Set default. */ ps->currentInputSource = IS_PLATEN; set_input_source_side_effects(ps, ps->currentInputSource); + mset_result |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; stat = SANE_STATUS_GOOD; } break; @@ -527,6 +533,7 @@ SANE_Status ledm_control_option(SANE_Handle handle, SANE_Int option, SANE_Action if (ps->resolutionList[i] == *int_value) { ps->currentResolution = *int_value; + if(ps->currentResolution == 4800) SendScanEvent(ps->uri, EVENT_SIZE_WARNING); mset_result |= SANE_INFO_RELOAD_PARAMS; stat = SANE_STATUS_GOOD; break; @@ -708,12 +715,10 @@ SANE_Status ledm_control_option(SANE_Handle handle, SANE_Int option, SANE_Action if (set_result) *set_result = mset_result; - if (stat != SANE_STATUS_GOOD) - { -// BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, -// action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); - } - + if (stat != SANE_STATUS_GOOD) + { + BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); + } return stat; } /* ledm_control_option */ @@ -727,10 +732,10 @@ SANE_Status ledm_get_parameters(SANE_Handle handle, SANE_Parameters *params) /* Get scan parameters for sane client. */ bb_get_parameters(ps, params, ps->ip_handle ? SPO_STARTED : SPO_BEST_GUESS); -// DBG8("sane_hpaio_get_parameters(): format=%d, last_frame=%d, lines=%d, depth=%d, pixels_per_line=%d, bytes_per_line=%d\n", -// params->format, params->last_frame, params->lines, params->depth, params->pixels_per_line, params->bytes_per_line); + DBG8("sane_hpaio_get_parameters(): format=%d, last_frame=%d, lines=%d, depth=%d, pixels_per_line=%d, bytes_per_line=%d\n", + params->format, params->last_frame, params->lines, params->depth, params->pixels_per_line, params->bytes_per_line); - return SANE_STATUS_GOOD; + return SANE_STATUS_GOOD; } /* ledm_get_parameters */ SANE_Status ledm_start(SANE_Handle handle) @@ -741,7 +746,7 @@ SANE_Status ledm_start(SANE_Handle handle) IP_XFORM_SPEC xforms[IP_MAX_XFORMS], *pXform=xforms; int stat, ret; -// DBG8("sane_hpaio_start()\n"); + DBG8("sane_hpaio_start()\n"); ps -> user_cancel = 0; ps -> cnt = 0; @@ -759,7 +764,7 @@ SANE_Status ledm_start(SANE_Handle handle) ret = bb_is_paper_in_adf(ps); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */ if (ret == 0) { - stat = SANE_STATUS_NO_DOCS; /* done scanning */ + stat = SANE_STATUS_NO_DOCS; /* done scanning */ goto bugout; } else if (ret < 0) @@ -846,13 +851,13 @@ SANE_Status ledm_start(SANE_Handle handle) traits.iPixelsPerRow = pp.pixels_per_line; switch(ps->currentScanMode) { - case CE_K1: /* lineart (let IP create Mono from Gray8) */ + case CE_K1: /* lineart (let IP create Mono from Gray8) */ case CE_GRAY8: traits.iBitsPerPixel = 8; /* grayscale */ break; case CE_COLOR8: default: - traits.iBitsPerPixel = 24; /* color */ + traits.iBitsPerPixel = 24; /* color */ break; } traits.lHorizDPI = ps->currentResolution << 16; @@ -943,7 +948,7 @@ bugout: bb_end_page(ps, 0); } -// DBG8("-sane_hpaio_read() output=%p bytes_read=%d maxLength=%d status=%d\n", data, *length, maxLength, stat); + DBG8("-sane_hpaio_read() output=%p bytes_read=%d maxLength=%d status=%d\n", data, *length, maxLength, stat); return stat; } /* ledm_read */ @@ -952,7 +957,7 @@ void ledm_cancel(SANE_Handle handle) { struct ledm_session *ps = (struct ledm_session *)handle; -// DBG8("sane_hpaio_cancel()\n"); + DBG8("sane_hpaio_cancel()\n"); ps -> user_cancel = 1; /* Sane_cancel is always called at the end of the scan job. diff --git a/scan/sane/ledmi.h b/scan/sane/ledmi.h index fa16e65e8..d0a718bdf 100644 --- a/scan/sane/ledmi.h +++ b/scan/sane/ledmi.h @@ -85,16 +85,16 @@ enum COLOR_ENTRY enum SCAN_PARAM_OPTION { - SPO_BEST_GUESS = 0, /* scan not started, return "best guess" scan parameters */ - SPO_STARTED = 1, /* scan started, return "job resonse" or "image processor" scan parameters */ - SPO_STARTED_JR = 2, /* scan started, but return "job response" scan parameters only */ + SPO_BEST_GUESS = 0, /* scan not started, return "best guess" scan parameters */ + SPO_STARTED = 1, /* scan started, return "job resonse" or "image processor" scan parameters */ + SPO_STARTED_JR = 2, /* scan started, but return "job response" scan parameters only */ }; struct ledm_session { - char *tag; /* handle identifier */ - HPMUD_DEVICE dd; /* hpiod device descriptor */ - HPMUD_CHANNEL cd; /* hpiod LEDM channel descriptor */ + char *tag; /* handle identifier */ + HPMUD_DEVICE dd; /* hpiod device descriptor */ + HPMUD_CHANNEL cd; /* hpiod LEDM channel descriptor */ char uri[HPMUD_LINE_SIZE]; char model[HPMUD_LINE_SIZE]; char url[256]; @@ -130,20 +130,20 @@ struct ledm_session SANE_Fixed currentTlx, currentTly, currentBrx, currentBry; SANE_Fixed effectiveTlx, effectiveTly, effectiveBrx, effectiveBry; SANE_Fixed min_width, min_height; + SANE_Int platen_resolutionList[MAX_LIST_SIZE]; SANE_Fixed platen_min_width, platen_min_height; SANE_Range platen_tlxRange, platen_tlyRange, platen_brxRange, platen_bryRange; SANE_Fixed adf_min_width, adf_min_height; SANE_Range adf_tlxRange, adf_tlyRange, adf_brxRange, adf_bryRange; + SANE_Int adf_resolutionList[MAX_LIST_SIZE]; IP_HANDLE ip_handle; - int index; /* image buffer index */ - int cnt; /* image buffer count */ - unsigned char buf[32768]; /* image chunk buffer */ + int index; /* image buffer index */ + int cnt; /* image buffer count */ + unsigned char buf[32768]; /* image chunk buffer */ - void *hpmud_handle; /* returned by dlopen */ - void *math_handle; /* returned by dlopen */ void *bb_session; /* Add new elements here. */ }; @@ -151,7 +151,7 @@ struct ledm_session int bb_open(struct ledm_session*); int bb_close(struct ledm_session*); int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int); -int bb_is_paper_in_adf(); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */ +int bb_is_paper_in_adf(); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */ int bb_start_scan(struct ledm_session*); int bb_get_image_data(struct ledm_session*, int); int bb_end_page(struct ledm_session*, int); diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c index c36caa7f4..fbf4dd5fe 100644 --- a/scan/sane/marvell.c +++ b/scan/sane/marvell.c @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Author: David Suffield + Author: David Suffield, Yashwant Sahu \************************************************************************************/ @@ -393,7 +393,18 @@ SANE_Status marvell_open(SANE_String_Const device, SANE_Handle *handle) hpmud_query_model(session->uri, &ma); session->scan_type = ma.scantype; session->scansrc = ma.scansrc; - session->scancolor= ma.scancolor; + + switch (ma.scantype) + { + case HPMUD_SCANTYPE_MARVELL: + session->version = MARVELL_1; + break; + case HPMUD_SCANTYPE_MARVELL2: + session->version = MARVELL_2; + break; + default: + session->version = MARVELL_1; + }; if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK) { @@ -429,33 +440,17 @@ SANE_Status marvell_open(SANE_String_Const device, SANE_Handle *handle) /* Set supported Scan Modes and set sane option. */ i=0; - - /* Tsunami doesnt support color scan, getting scan color option from the model file.*/ - if ( session->scancolor == HPMUD_SCANCOLOR_MONO) - { - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_LINEART; - session->scan_mode_map[i++] = CE_BLACK_AND_WHITE1; - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_GRAY; - session->scan_mode_map[i++] = CE_GRAY8; - DBG8("scan color HPMUD_SCANCOLOR_MONO \n"); - } - /* 0 value set in the model file, set all the scan color option */ - else - { - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_LINEART; - session->scan_mode_map[i++] = CE_BLACK_AND_WHITE1; - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_GRAY; - session->scan_mode_map[i++] = CE_GRAY8; - session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_COLOR; - session->scan_mode_map[i++] = CE_RGB24; - DBG8("scan color All \n"); - } + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_LINEART; + session->scan_mode_map[i++] = CE_BLACK_AND_WHITE1; + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_GRAY; + session->scan_mode_map[i++] = CE_GRAY8; + session->scan_mode_list[i] = SANE_VALUE_SCAN_MODE_COLOR; + session->scan_mode_map[i++] = CE_RGB24; marvell_control_option(session, MARVELL_OPTION_SCAN_MODE, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ /* Determine scan input source. */ i=0; - /* Some of the marvell devices supports both flatbed and ADF, No command to get the src types supported */ /* Getting from the model file */ if ( session->scansrc == HPMUD_SCANSRC_BOTH) @@ -479,7 +474,7 @@ SANE_Status marvell_open(SANE_String_Const device, SANE_Handle *handle) DBG8("scan src HPMUD_SCANSRC_FLATBED \n"); } /* Values if un specified in the, value is 0, get ADF state from the printer */ - else if (session->bb_is_paper_in_adf(session) == 2) + else if (session->bb_is_paper_in_adf(session) == 2) { session->input_source_list[i] = STR_ADF_MODE_FLATBED; session->input_source_map[i++] = IS_PLATEN; @@ -622,7 +617,6 @@ SANE_Status marvell_control_option(SANE_Handle handle, SANE_Int option, SANE_Act else { /* Set default. */ ps->current_scan_mode = ps->scan_mode_map[0]; - ps->scan_mode_map[i]; stat = SANE_STATUS_GOOD; } break; @@ -861,7 +855,6 @@ SANE_Status marvell_start(SANE_Handle handle) goto bugout; } } - /* Start scan and get actual image traits. */ if (ps->bb_start_scan(ps)) { diff --git a/scan/sane/marvelli.h b/scan/sane/marvelli.h index 572c5207f..98f521c11 100644 --- a/scan/sane/marvelli.h +++ b/scan/sane/marvelli.h @@ -21,6 +21,8 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Author: David Suffield, Yashwant Sahu \************************************************************************************/ @@ -68,6 +70,12 @@ enum INPUT_SOURCE IS_MAX, }; +enum MARVELL_VERSION +{ + MARVELL_1 = 1, + MARVELL_2, +}; + struct marvell_session { char *tag; /* handle identifier */ @@ -119,7 +127,7 @@ struct marvell_session /* Add new elements here. */ void *math_handle; /* returned by dlopen */ enum HPMUD_SCANSRC scansrc; /* 0=NA */ - enum HPMUD_SCANCOLOR scancolor; /* 0=NA*/ + enum MARVELL_VERSION version; }; #endif // _MARVELLI_H @@ -684,12 +684,12 @@ else: # INTERACTIVE_MODE fax_type = mq.get('fax-type', FAX_TYPE_NONE) if prop.hpcups_build: - if fax_type == FAX_TYPE_SOAP: + if fax_type == FAX_TYPE_SOAP or fax_type == FAX_TYPE_LEDMSOAP: fax_ppd_name = 'HP-Fax2-hpcups' else: fax_ppd_name = 'HP-Fax-hpcups' else: # hpijs - if fax_type == FAX_TYPE_SOAP: + if fax_type == FAX_TYPE_SOAP or fax_type == FAX_TYPE_LEDMSOAP: fax_ppd_name = 'HP-Fax2-hpijs' else: fax_ppd_name = 'HP-Fax-hpijs' diff --git a/ui/devmgr4.py b/ui/devmgr4.py index 43f145be0..b1c22fb93 100644 --- a/ui/devmgr4.py +++ b/ui/devmgr4.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Authors: Don Welch, Pete Parks +# Authors: Don Welch, Pete Parks, Naga Samrat Chowdary Narla, # from __future__ import generators @@ -1696,6 +1696,12 @@ class DevMgr4(DevMgr4_base): elif align_type == ALIGN_TYPE_AIO: maint.AlignType13(d, self.LoadPaperUI, self.Align13UI) + elif align_type == ALIGN_TYPE_LEDM: + maint.AlignType15(d, self.LoadPaperUI, self.Align13UI) + + elif align_type == ALIGN_TYPE_LEDM_MANUAL: + maint.AlignType16(d, self.LoadPaperUI, self.AlignmentNumberUI) + else: self.CheckDeviceUI() diff --git a/ui/nodevicesform.py b/ui/nodevicesform.py index f26e831db..dd67de992 100644 --- a/ui/nodevicesform.py +++ b/ui/nodevicesform.py @@ -43,7 +43,7 @@ class NoDevicesForm(NoDevicesForm_base): def CUPSButton_clicked(self): self.close() - utils.openURL("http://localhost:631/admin?op=add-printer") + utils.openURL("http://localhost:631/admin") def ExitButton_clicked(self): diff --git a/ui/setupform.py b/ui/setupform.py index 824310ccb..3cc87ba9b 100644 --- a/ui/setupform.py +++ b/ui/setupform.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Author: Don Welch +# Author: Don Welch, Goutam Korra, Naga Samrat Chowdary Narla, # Std Lib import sys @@ -423,7 +423,7 @@ class SetupForm(SetupForm_base): else: filter_dict[f] = (operator.gt, 0) else: - filter_dict['scan-type'] = (operator.gt, SCAN_TYPE_NONE) + filter_dict['scan-type'] = (operator.ge, SCAN_TYPE_NONE) devices = device.probeDevices([self.bus], self.timeout, self.ttl, filter_dict, self.search, net_search='slp') @@ -888,9 +888,12 @@ class SetupForm(SetupForm_base): if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL: fax_ppd_name = "HP-Fax3-hplip" # Fixed width (2528 pixels) and 300dpi rendering nick = "HP Fax 3" - if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP: + if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP or self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDMSOAP: fax_ppd_name = "HP-Fax2-hplip" # Fixed width (2528 pixels) and 300dpi rendering nick = "HP Fax 2" + if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDM: + fax_ppd_name = "HP-Fax4-hplip" # Fixed width (1728 pixels) and 200dpi rendering + nick = "HP Fax 4" else: fax_ppd_name = "HP-Fax-hplip" # Standard nick = "HP Fax" diff --git a/ui4/aligndialog.py b/ui4/aligndialog.py index 66083bfe8..37c322ae8 100644 --- a/ui4/aligndialog.py +++ b/ui4/aligndialog.py @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Authors: Don Welch +# Authors: Don Welch, Naga Samrat Chowdary Narla, # # StdLib @@ -98,6 +98,8 @@ class AlignDialog(QDialog, Ui_Dialog): ALIGN_TYPE_TEST : 0, ALIGN_TYPE_AIO : 3, ALIGN_TYPE_LIDIL_DJ_D1600: 0, + ALIGN_TYPE_LEDM: 0, + ALIGN_TYPE_LEDM_MANUAL: 0, } self.seq = { # (func|method, tuple of params|None) @@ -351,6 +353,40 @@ class AlignDialog(QDialog, Ui_Dialog): (self.close, None), ], + ALIGN_TYPE_LEDM : [ # 15 + (self.showLoadPaperPage, None), + (maint.AlignType15Phase1, (lambda : self.dev, lambda: self.showAioPage)), + (self.close, None), + ], + + ALIGN_TYPE_LEDM_MANUAL : [ # 16 + (self.showLoadPaperPage, None), + (maint.AlignType15Phase1, (lambda : self.dev, lambda: true)), + (self.showAlignmentNumberPage, ('A', 'v', 'kc', 3, 23)), + (self.endAlignmentNumberPage, ('A',)), + (self.showAlignmentNumberPage, ('B', 'h', 'kc', 3, 11)), + (self.endAlignmentNumberPage, ('B',)), + (self.showAlignmentNumberPage, ('C', 'v', 'k', 3, 23)), + (self.endAlignmentNumberPage, ('C',)), + (self.showAlignmentNumberPage, ('D', 'v', 'c', 3, 23)), + (self.endAlignmentNumberPage, ('D',)), + (self.showAlignmentNumberPage, ('E', 'h', 'k', 3, 11)), + (self.endAlignmentNumberPage, ('E',)), + (self.showAlignmentNumberPage, ('F', 'h', 'k', 3, 11)), + (self.endAlignmentNumberPage, ('F',)), + (self.showAlignmentNumberPage, ('G', 'h', 'k', 3, 11)), + (self.endAlignmentNumberPage, ('G',)), + (self.showAlignmentNumberPage, ('H', 'v', 'k', 3, 9)), + (self.endAlignmentNumberPage, ('H',)), + (self.showAlignmentNumberPage, ('I', 'v', 'c', 3, 9)), + (self.endAlignmentNumberPage, ('I',)), + (maint.AlignType16Phase1, (lambda: self.dev, lambda: self.a, lambda: self.b, + lambda: self.c, lambda: self.d, lambda: self.e, + lambda: self.f, lambda: self.g, lambda: self.h, + lambda: self.i)), + (self.close, None), + ], + } self.setupUi(self) @@ -480,7 +516,7 @@ class AlignDialog(QDialog, Ui_Dialog): # colors: 'k' or 'c' or 'kc' # line_count: 2 or 3 # choice_count: 5, 7, 9, 11, etc. (odd) - self.AlignmentNumberTitle.setText(self.__tr("Choose the set of lines in group %1 where the line segments are <b>best</b> aligned.").arg(line_id)) + self.AlignmentNumberTitle.setText(self.__tr("From the printed Alignment page, Choose the set of lines in group %1 where the line segments are <b>best</b> aligned.").arg(line_id)) self.AlignmentNumberIcon.setPixmap(load_pixmap('%s-%s-%d' % (orientation, colors, line_count), 'other')) self.AlignmentNumberComboBox.clear() @@ -488,6 +524,7 @@ class AlignDialog(QDialog, Ui_Dialog): self.AlignmentNumberComboBox.addItem(QString("%1%2").arg(line_id).arg(x+1)) self.displayPage(PAGE_ALIGNMENT_NUMBER) + return def endAlignmentNumberPage(self, line_id): @@ -509,6 +546,25 @@ class AlignDialog(QDialog, Ui_Dialog): self.d = v log.debug("D=%d" % v) + elif line_id == 'E': + self.e = v + log.debug("E=%d" % v) + + elif line_id == 'F': + self.f = v + log.debug("F=%d" % v) + + elif line_id == 'G': + self.g = v + log.debug("G=%d" % v) + + elif line_id == 'H': + self.h = v + log.debug("H=%d" % v) + + elif line_id == 'I': + self.i = v + log.debug("I=%d" % v) def showPageEdgePage(self, prefix=None, count=13): self.PageEdgeTitle.setText(self.__tr("Choose the <b>numbered arrow</b> that <b>best </b>marks the edge of the paper.")) diff --git a/ui4/faxsetupdialog.py b/ui4/faxsetupdialog.py index 5796e8e77..aebcc6470 100644 --- a/ui4/faxsetupdialog.py +++ b/ui4/faxsetupdialog.py @@ -109,6 +109,8 @@ class FaxSetupDialog(QDialog, Ui_Dialog): self.connect(self.EmailLineEdit, SIGNAL("textChanged(const QString &)"), self.EmailLineEdit_textChanged) + + self.connect(self.tabWidget,SIGNAL("currentChanged(int)"),self.Tabs_currentChanged) self.name_company_dirty = False self.fax_number_dirty = False @@ -123,6 +125,7 @@ class FaxSetupDialog(QDialog, Ui_Dialog): return self.FaxComboBox.updateUi() + self.tabWidget.setCurrentIndex(0) def FaxComboBox_currentChanged(self, device_uri): @@ -239,6 +242,15 @@ class FaxSetupDialog(QDialog, Ui_Dialog): def CancelButton_clicked(self): self.close() + def Tabs_currentChanged(self, tab=0): + """ Called when the active tab changes. + Update newly displayed tab. + """ + if tab == 0: + self.updateHeaderTab() + elif tab ==1: + self.updateCoverpageTab() + def updateHeaderTab(self): beginWaitCursor() diff --git a/ui4/nodevicesdialog.py b/ui4/nodevicesdialog.py index 41d018d08..4114b9a74 100644 --- a/ui4/nodevicesdialog.py +++ b/ui4/nodevicesdialog.py @@ -71,7 +71,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base): def CUPSButton_clicked(self): self.close() - utils.openURL("http://localhost:631/admin?op=add-printer") + utils.openURL("http://localhost:631/admin") def CloseButton_clicked(self): diff --git a/ui4/sendfaxdialog.py b/ui4/sendfaxdialog.py index 281a6a2eb..ed497f9e7 100644 --- a/ui4/sendfaxdialog.py +++ b/ui4/sendfaxdialog.py @@ -861,7 +861,8 @@ class SendFaxDialog(QDialog, Ui_Dialog): elif status == fax.STATUS_CLEANUP: self.addStatusMessage(self.__tr("Cleaning up..."), self.busy_icon) - elif status in (fax.STATUS_ERROR, fax.STATUS_BUSY, fax.STATUS_COMPLETED): + elif status in (fax.STATUS_ERROR, fax.STATUS_BUSY, fax.STATUS_COMPLETED, fax.STATUS_ERROR_IN_CONNECTING, + fax.STATUS_ERROR_IN_TRANSMITTING, fax.STATUS_ERROR_PROBLEM_IN_FAXLINE, fax.STATUS_JOB_CANCEL ): self.busy = False self.send_fax_active = False self.setCancelCloseButton() @@ -876,6 +877,22 @@ class SendFaxDialog(QDialog, Ui_Dialog): self.addStatusMessage(self.__tr("Fax send error (%1)").arg(pml.DN_ERROR_STR.get(error_state, "Unknown error")), self.error_icon) self.dev.sendEvent(EVENT_FAX_JOB_FAIL, self.printer_name, 0, '') + elif status == fax.STATUS_ERROR_IN_CONNECTING: + self.addStatusMessage(self.__tr("Fax send error (Error in connecting)"), self.error_icon) + self.dev.sendEvent(EVENT_FAX_JOB_FAIL, self.printer_name, 0, '') + + elif status == fax.STATUS_ERROR_IN_TRANSMITTING: + self.addStatusMessage(self.__tr("Fax send error (Error in transmitting)"), self.error_icon) + self.dev.sendEvent(EVENT_FAX_JOB_FAIL, self.printer_name, 0, '') + + elif status == fax.STATUS_ERROR_PROBLEM_IN_FAXLINE: + self.addStatusMessage(self.__tr("Fax send error (Problem with the fax line)"), self.error_icon) + self.dev.sendEvent(EVENT_FAX_JOB_FAIL, self.printer_name, 0, '') + + elif status == fax.STATUS_JOB_CANCEL: + self.addStatusMessage(self.__tr("(Fax Job Cancelled)"), self.error_icon) + self.dev.sendEvent(EVENT_FAX_JOB_FAIL, self.printer_name, 0, '') + elif status == fax.STATUS_BUSY: #FailureUI(self, self.__tr("<b>Fax device is busy.</b><p>Please try again later.")) self.addStatusMessage(self.__tr("Fax is busy."), self.error_icon) diff --git a/ui4/setupdialog.py b/ui4/setupdialog.py index 530814880..07c9eafa7 100644 --- a/ui4/setupdialog.py +++ b/ui4/setupdialog.py @@ -744,9 +744,12 @@ class SetupDialog(QDialog, Ui_Dialog): if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL: fax_ppd_name = "HP-Fax3-hpcups" # Fixed width (2528 pixels) and 300dpi rendering nick = "HP Fax3 hpcups" - elif self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP: + elif self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP or self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDMSOAP: fax_ppd_name = "HP-Fax2-hpcups" # Fixed width (2528 pixels) and 300dpi rendering nick = "HP Fax2 hpcups" + elif self.mq.get('fax-type', FAX_TYPE_LEDM) == FAX_TYPE_LEDM: + fax_ppd_name = "HP-Fax4-hpcups"# Fixed width (2528 pixels) and 300dpi rendering + nick = "HP Fax4 hpcups" else: fax_ppd_name = "HP-Fax-hpcups" # Standard nick = "HP Fax hpcups" @@ -755,9 +758,12 @@ class SetupDialog(QDialog, Ui_Dialog): if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL: fax_ppd_name = "HP-Fax3-hpijs" # Fixed width (2528 pixels) and 300dpi rendering nick = "HP Fax3 hpijs" - if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP: + if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP or self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDMSOAP: fax_ppd_name = "HP-Fax2-hpijs" # Fixed width (2528 pixels) and 300dpi rendering nick = "HP Fax2 hpijs" + if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDM: + fax_ppd_name = "HP-Fax4-hpijs" # Fixed width (2528 pixels) and 300dpi rendering + nick = "HP Fax4 hpijs" else: fax_ppd_name = "HP-Fax-hpijs" # Standard nick = "HP Fax hpijs" @@ -1217,9 +1223,9 @@ class SetupDialog(QDialog, Ui_Dialog): self.manual = True self.param = dlg.hn self.bus = 'net' - - self.showDevicesPage() - + if not self.WirelessButton.isChecked(): + self.showDevicesPage() + elif p == PAGE_DEVICES: row = self.DevicesTableWidget.currentRow() self.device_uri = self.DevicesTableWidget.item(row, 0).device_uri |
