diff options
| author | Didier Raboud <odyx@debian.org> | 2016-01-06 11:55:24 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2016-01-06 11:55:24 +0100 |
| commit | a1755d38c4bb475c7c9fec2e03945a602ae5db85 (patch) | |
| tree | a797cfa272887ca4ae65121c60c23202dc62eef5 | |
| parent | a56bf82d863adbf5addc31c221e85353fac20d7b (diff) | |
Imported Upstream version 3.11.12
1614 files changed, 4363 insertions, 2351 deletions
diff --git a/Makefile.am b/Makefile.am index 38a4dc0e3..2ac05dc56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,6 +93,7 @@ hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" # hpmud.rules
rulesdir = /etc/udev/rules.d
dist_rules_DATA = data/rules/56-hpmud_support.rules
+dist_rules_DATA += data/rules/86-hpmud_plugin.rules
if UDEV_ACL_RULES
dist_rules_DATA += data/rules/40-hplip.rules
else
@@ -113,6 +114,9 @@ pstotiff_SCRIPTS = fax/filters/pstotiff hplip_statedir = /var/lib/hp
dist_hplip_state_DATA = hplip.state
+# Log Files
+hplip_Logdir=/var/log/hp
+
if FULL_BUILD
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
@@ -122,7 +126,7 @@ dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall in 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
+ faxsetup.py devicesettings.py printsettings.py query.py pkservice.py wificonfig.py check-plugin.py diagnose_plugin.py
# base
basedir = $(hplipdir)/base
@@ -182,6 +186,7 @@ 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
+dist_hplip_Log_DATA=
if GUI_BUILD
dist_images_16x16_DATA = data/images/16x16/*
@@ -423,7 +428,7 @@ if HPCUPS_INSTALL #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 \
+hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hpcups/dbuscomm.cpp prnt/hpcups/dbuscomm.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 \
@@ -455,8 +460,8 @@ prnt/hpcups/LJZjStream.cpp prnt/hpcups/LJZjStream.h \ prnt/hpcups/dj3600ColorMaps.cpp prnt/hpcups/dj3320PrintModes.h \
prnt/hpcups/dj4100PrintModes.h
-hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG)
-hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage
+hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
+hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage $(DBUS_LIBS)
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -498,6 +503,18 @@ cupsdrv2dir = $(drvdir) cupsdrv2_DATA = $(cups_drv)
endif
+install-dist_hplip_LogDATA:
+if FULL_BUILD
+ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+ chmod 774 $(DESTDIR)$(hplip_Logdir)
+endif #FULL_BUILD
+if HPLIP_BUILD
+ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+ chmod 774 $(DESTDIR)$(hplip_Logdir)
+endif #FULL_BUILD
+
install-data-hook:
if HPLIP_BUILD
# If scanner build, add hpaio entry to sane dll.conf.
diff --git a/Makefile.in b/Makefile.in index 8f3e408be..37753758f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,8 +74,9 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_base_DATA_DIST) \ $(am__dist_rules_DATA_DIST) $(am__dist_scan_DATA_DIST) \ $(am__dist_ui4_DATA_DIST) $(am__dist_ui_DATA_DIST) \ $(am__dist_www0_DATA_DIST) $(am__dist_www3_DATA_DIST) \ - $(am__dist_www4_DATA_DIST) $(dist_plugins4_SCRIPTS) \ - $(dist_unrel_DATA) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(am__dist_www4_DATA_DIST) $(dist_hplip_Log_DATA) \ + $(dist_plugins4_SCRIPTS) $(dist_unrel_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/cups_drv.inc $(srcdir)/foomatic_drv.inc \ $(srcdir)/hplip-systray.desktop.in $(srcdir)/hplip.conf.in \ $(srcdir)/hplip.desktop.in $(srcdir)/hplip.list.in \ @@ -174,8 +175,8 @@ am__installdirs = "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" \ "$(DESTDIR)$(basedir)" "$(DESTDIR)$(copierdir)" \ "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" \ "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(hpcupsfaxppddir)" \ - "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_statedir)" \ - "$(DESTDIR)$(images_128x128dir)" \ + "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_Logdir)" \ + "$(DESTDIR)$(hplip_statedir)" "$(DESTDIR)$(images_128x128dir)" \ "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" \ "$(DESTDIR)$(images_256x256dir)" \ "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" \ @@ -379,7 +380,8 @@ hp_mkuri_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(hp_mkuri_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ am__hpcups_SOURCES_DIST = prnt/hpcups/HPCupsFilter.cpp \ - prnt/hpcups/HPCupsFilter.h prnt/hpcups/Compressor.cpp \ + prnt/hpcups/HPCupsFilter.h prnt/hpcups/dbuscomm.cpp \ + prnt/hpcups/dbuscomm.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 \ @@ -430,6 +432,7 @@ am__hpcups_SOURCES_DIST = prnt/hpcups/HPCupsFilter.cpp \ prnt/hpcups/dj4100PrintModes.h @HPCUPS_INSTALL_TRUE@am_hpcups_OBJECTS = \ @HPCUPS_INSTALL_TRUE@ hpcups-HPCupsFilter.$(OBJEXT) \ +@HPCUPS_INSTALL_TRUE@ hpcups-dbuscomm.$(OBJEXT) \ @HPCUPS_INSTALL_TRUE@ hpcups-Compressor.$(OBJEXT) \ @HPCUPS_INSTALL_TRUE@ hpcups-Mode2.$(OBJEXT) \ @HPCUPS_INSTALL_TRUE@ hpcups-Mode3.$(OBJEXT) \ @@ -472,7 +475,7 @@ am__hpcups_SOURCES_DIST = prnt/hpcups/HPCupsFilter.cpp \ @HPCUPS_INSTALL_TRUE@ hpcups-dj3320ColorMaps.$(OBJEXT) \ @HPCUPS_INSTALL_TRUE@ hpcups-dj3600ColorMaps.$(OBJEXT) hpcups_OBJECTS = $(am_hpcups_OBJECTS) -hpcups_DEPENDENCIES = +@HPCUPS_INSTALL_TRUE@hpcups_DEPENDENCIES = $(am__DEPENDENCIES_1) hpcups_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(hpcups_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -531,7 +534,8 @@ am__dist_cmd_SCRIPTS_DIST = align.py info.py print.py toolbox.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 + printsettings.py query.py pkservice.py wificonfig.py \ + check-plugin.py diagnose_plugin.py am__dist_hpfax_SCRIPTS_DIST = fax/backend/hpfax.py am__dist_hplip_SCRIPTS_DIST = hpssd.py __init__.py hpdio.py am__dist_noinst_SCRIPTS_DIST = dat2drv.py install.py hplip-install \ @@ -684,6 +688,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4000ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz \ + prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz \ prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz \ @@ -766,6 +771,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \ prnt/ps/hp-color_laserjet_8550-ps.ppd.gz \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz \ @@ -1148,6 +1154,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz \ @@ -2097,6 +2104,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ ppd/hpcups/hp-photosmart_380_series.ppd.gz \ ppd/hpcups/hp-photosmart_420_series.ppd.gz \ ppd/hpcups/hp-photosmart_470_series.ppd.gz \ + ppd/hpcups/hp-photosmart_5510d_series.ppd.gz \ ppd/hpcups/hp-photosmart_5510_series.ppd.gz \ ppd/hpcups/hp-photosmart_6510_series.ppd.gz \ ppd/hpcups/hp-photosmart_7150.ppd.gz \ @@ -2207,7 +2215,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_4250-ps.ppd.gz \ am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \ prnt/pcl.py prnt/colorcal.py am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \ - data/rules/40-hplip.rules data/rules/55-hpmud.rules + data/rules/86-hpmud_plugin.rules data/rules/40-hplip.rules \ + data/rules/55-hpmud.rules am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \ ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \ @@ -2261,15 +2270,15 @@ am__dist_www4_DATA_DIST = $(wwwsrc)/images/* DATA = $(cupsdrv_DATA) $(cupsdrv2_DATA) $(dist_base_DATA) \ $(dist_copier_DATA) $(dist_fax_DATA) $(dist_fax_filters_DATA) \ $(dist_halpre_DATA) $(dist_hpcupsfaxppd_DATA) \ - $(dist_hpijsfaxppd_DATA) $(dist_hplip_state_DATA) \ - $(dist_images_128x128_DATA) $(dist_images_16x16_DATA) \ - $(dist_images_24x24_DATA) $(dist_images_256x256_DATA) \ - $(dist_images_32x32_DATA) $(dist_images_64x64_DATA) \ - $(dist_images_devices_DATA) $(dist_images_other_DATA) \ - $(dist_install_DATA) $(dist_ldl_DATA) $(dist_localz_DATA) \ - $(dist_models_DATA) $(dist_noinst_DATA) $(dist_pcard_DATA) \ - $(dist_pcl_DATA) $(dist_plugins_DATA) \ - $(dist_policykit_dbus_etc_DATA) \ + $(dist_hpijsfaxppd_DATA) $(dist_hplip_Log_DATA) \ + $(dist_hplip_state_DATA) $(dist_images_128x128_DATA) \ + $(dist_images_16x16_DATA) $(dist_images_24x24_DATA) \ + $(dist_images_256x256_DATA) $(dist_images_32x32_DATA) \ + $(dist_images_64x64_DATA) $(dist_images_devices_DATA) \ + $(dist_images_other_DATA) $(dist_install_DATA) \ + $(dist_ldl_DATA) $(dist_localz_DATA) $(dist_models_DATA) \ + $(dist_noinst_DATA) $(dist_pcard_DATA) $(dist_pcl_DATA) \ + $(dist_plugins_DATA) $(dist_policykit_dbus_etc_DATA) \ $(dist_policykit_dbus_share_DATA) \ $(dist_policykit_policy_DATA) $(dist_postscript_DATA) \ $(dist_ppd_DATA) $(dist_prnt_DATA) $(dist_rules_DATA) \ @@ -2769,6 +2778,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz \ @@ -3174,6 +3184,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4000ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz \ + prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz \ prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz \ @@ -3256,6 +3267,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \ prnt/ps/hp-color_laserjet_8550-ps.ppd.gz \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz \ @@ -3924,6 +3936,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-photosmart_380_series.ppd.gz \ ppd/hpcups/hp-photosmart_420_series.ppd.gz \ ppd/hpcups/hp-photosmart_470_series.ppd.gz \ + ppd/hpcups/hp-photosmart_5510d_series.ppd.gz \ ppd/hpcups/hp-photosmart_5510_series.ppd.gz \ ppd/hpcups/hp-photosmart_6510_series.ppd.gz \ ppd/hpcups/hp-photosmart_7150.ppd.gz \ @@ -4095,6 +4108,7 @@ cups_drv = prnt/drv/hpcups.drv # hpmud.rules @HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d @HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \ +@HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \ @HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3) @HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor @HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi @@ -4110,11 +4124,14 @@ cups_drv = prnt/drv/hpcups.drv # hplip.state @HPLIP_BUILD_TRUE@hplip_statedir = /var/lib/hp @HPLIP_BUILD_TRUE@dist_hplip_state_DATA = hplip.state + +# Log Files +@HPLIP_BUILD_TRUE@hplip_Logdir = /var/log/hp @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir) @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@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 \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ sendfax.py setup.py makecopies.py probe.py timedate.py firmware.py scan.py systray.py plugin.py linefeedcal.py pqdiag.py \ -@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ faxsetup.py devicesettings.py printsettings.py query.py pkservice.py wificonfig.py +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ faxsetup.py devicesettings.py printsettings.py query.py pkservice.py wificonfig.py check-plugin.py diagnose_plugin.py # base @@ -4166,6 +4183,7 @@ cups_drv = prnt/drv/hpcups.drv @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_Log_DATA = @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_16x16_DATA = data/images/16x16/* @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_24x24_DATA = data/images/24x24/* @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_32x32_DATA = data/images/32x32/* @@ -4358,7 +4376,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs # hpcups #if NEW_HPCUPS @HPCUPS_INSTALL_TRUE@hpcupsdir = $(cupsfilterdir) -@HPCUPS_INSTALL_TRUE@hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hpcups/Compressor.cpp prnt/hpcups/Compressor.h \ +@HPCUPS_INSTALL_TRUE@hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hpcups/dbuscomm.cpp prnt/hpcups/dbuscomm.h prnt/hpcups/Compressor.cpp prnt/hpcups/Compressor.h \ @HPCUPS_INSTALL_TRUE@ prnt/hpcups/Mode2.cpp prnt/hpcups/Mode2.h prnt/hpcups/Mode3.cpp prnt/hpcups/Mode3.h \ @HPCUPS_INSTALL_TRUE@ prnt/hpcups/Mode9.cpp prnt/hpcups/Mode9.h prnt/hpcups/Mode10.cpp prnt/hpcups/Mode10.h \ @HPCUPS_INSTALL_TRUE@ prnt/hpcups/ModeDeltaPlus.cpp prnt/hpcups/ModeDeltaPlus.h prnt/hpcups/ModeJbig.cpp prnt/hpcups/ModeJbig.h \ @@ -4390,8 +4408,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs @HPCUPS_INSTALL_TRUE@ prnt/hpcups/dj3600ColorMaps.cpp prnt/hpcups/dj3320PrintModes.h \ @HPCUPS_INSTALL_TRUE@ prnt/hpcups/dj4100PrintModes.h -@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) -@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage +@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) +@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage $(DBUS_LIBS) #else #hpcupsdir = $(cupsfilterdir) #hpcups_PROGRAMS = hpcups @@ -5300,6 +5318,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-Scaler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-SystemServices.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-Utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-dbuscomm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-dj3320ColorMaps.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-dj3600ColorMaps.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpcups-dj400ColorMaps.Po@am__quote@ @@ -6562,6 +6581,20 @@ hpcups-HPCupsFilter.obj: prnt/hpcups/HPCupsFilter.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-HPCupsFilter.obj `if test -f 'prnt/hpcups/HPCupsFilter.cpp'; then $(CYGPATH_W) 'prnt/hpcups/HPCupsFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/HPCupsFilter.cpp'; fi` +hpcups-dbuscomm.o: prnt/hpcups/dbuscomm.cpp +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-dbuscomm.o -MD -MP -MF $(DEPDIR)/hpcups-dbuscomm.Tpo -c -o hpcups-dbuscomm.o `test -f 'prnt/hpcups/dbuscomm.cpp' || echo '$(srcdir)/'`prnt/hpcups/dbuscomm.cpp +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hpcups-dbuscomm.Tpo $(DEPDIR)/hpcups-dbuscomm.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='prnt/hpcups/dbuscomm.cpp' object='hpcups-dbuscomm.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-dbuscomm.o `test -f 'prnt/hpcups/dbuscomm.cpp' || echo '$(srcdir)/'`prnt/hpcups/dbuscomm.cpp + +hpcups-dbuscomm.obj: prnt/hpcups/dbuscomm.cpp +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-dbuscomm.obj -MD -MP -MF $(DEPDIR)/hpcups-dbuscomm.Tpo -c -o hpcups-dbuscomm.obj `if test -f 'prnt/hpcups/dbuscomm.cpp'; then $(CYGPATH_W) 'prnt/hpcups/dbuscomm.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/dbuscomm.cpp'; fi` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hpcups-dbuscomm.Tpo $(DEPDIR)/hpcups-dbuscomm.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='prnt/hpcups/dbuscomm.cpp' object='hpcups-dbuscomm.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-dbuscomm.obj `if test -f 'prnt/hpcups/dbuscomm.cpp'; then $(CYGPATH_W) 'prnt/hpcups/dbuscomm.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/dbuscomm.cpp'; fi` + hpcups-Compressor.o: prnt/hpcups/Compressor.cpp @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-Compressor.o -MD -MP -MF $(DEPDIR)/hpcups-Compressor.Tpo -c -o hpcups-Compressor.o `test -f 'prnt/hpcups/Compressor.cpp' || echo '$(srcdir)/'`prnt/hpcups/Compressor.cpp @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hpcups-Compressor.Tpo $(DEPDIR)/hpcups-Compressor.Po @@ -7380,6 +7413,14 @@ uninstall-dist_hpijsfaxppdDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(hpijsfaxppddir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(hpijsfaxppddir)" && rm -f $$files + +uninstall-dist_hplip_LogDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_hplip_Log_DATA)'; test -n "$(hplip_Logdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(hplip_Logdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(hplip_Logdir)" && rm -f $$files install-dist_hplip_stateDATA: $(dist_hplip_state_DATA) @$(NORMAL_INSTALL) test -z "$(hplip_statedir)" || $(MKDIR_P) "$(DESTDIR)$(hplip_statedir)" @@ -8265,7 +8306,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libsane_hpaiodir)" "$(DESTDIR)$(pcardextdir)" "$(DESTDIR)$(scanextdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(hpdir)" "$(DESTDIR)$(hp_mkuridir)" "$(DESTDIR)$(hpcupsdir)" "$(DESTDIR)$(hpcupsfaxdir)" "$(DESTDIR)$(hplipjsdir)" "$(DESTDIR)$(hppsdir)" "$(DESTDIR)$(cacdir)" "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(cupsdrvdir)" "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(basedir)" "$(DESTDIR)$(copierdir)" "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(hpcupsfaxppddir)" "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_statedir)" "$(DESTDIR)$(images_128x128dir)" "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" "$(DESTDIR)$(images_256x256dir)" "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" "$(DESTDIR)$(images_devicesdir)" "$(DESTDIR)$(images_otherdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(ldldir)" "$(DESTDIR)$(localzdir)" "$(DESTDIR)$(modelsdir)" "$(DESTDIR)$(pcarddir)" "$(DESTDIR)$(pcldir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(policykit_dbus_etcdir)" "$(DESTDIR)$(policykit_dbus_sharedir)" "$(DESTDIR)$(policykit_policydir)" "$(DESTDIR)$(postscriptdir)" "$(DESTDIR)$(ppddir)" "$(DESTDIR)$(prntdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(scandir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(ui4dir)" "$(DESTDIR)$(unreldir)" "$(DESTDIR)$(www0dir)" "$(DESTDIR)$(www3dir)" "$(DESTDIR)$(www4dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(hplip_confdir)" "$(DESTDIR)$(hplip_desktopdir)" "$(DESTDIR)$(hplip_systraydir)"; do \ + for dir in "$(DESTDIR)$(cupsextdir)" "$(DESTDIR)$(hpmudextdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libsane_hpaiodir)" "$(DESTDIR)$(pcardextdir)" "$(DESTDIR)$(scanextdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(hpdir)" "$(DESTDIR)$(hp_mkuridir)" "$(DESTDIR)$(hpcupsdir)" "$(DESTDIR)$(hpcupsfaxdir)" "$(DESTDIR)$(hplipjsdir)" "$(DESTDIR)$(hppsdir)" "$(DESTDIR)$(cacdir)" "$(DESTDIR)$(cmddir)" "$(DESTDIR)$(hpfaxdir)" "$(DESTDIR)$(hplipdir)" "$(DESTDIR)$(plugins4dir)" "$(DESTDIR)$(ripdir)" "$(DESTDIR)$(pstotiffdir)" "$(DESTDIR)$(cupsdrvdir)" "$(DESTDIR)$(cupsdrv2dir)" "$(DESTDIR)$(basedir)" "$(DESTDIR)$(copierdir)" "$(DESTDIR)$(faxdir)" "$(DESTDIR)$(fax_filtersdir)" "$(DESTDIR)$(halpredir)" "$(DESTDIR)$(hpcupsfaxppddir)" "$(DESTDIR)$(hpijsfaxppddir)" "$(DESTDIR)$(hplip_Logdir)" "$(DESTDIR)$(hplip_statedir)" "$(DESTDIR)$(images_128x128dir)" "$(DESTDIR)$(images_16x16dir)" "$(DESTDIR)$(images_24x24dir)" "$(DESTDIR)$(images_256x256dir)" "$(DESTDIR)$(images_32x32dir)" "$(DESTDIR)$(images_64x64dir)" "$(DESTDIR)$(images_devicesdir)" "$(DESTDIR)$(images_otherdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(ldldir)" "$(DESTDIR)$(localzdir)" "$(DESTDIR)$(modelsdir)" "$(DESTDIR)$(pcarddir)" "$(DESTDIR)$(pcldir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(policykit_dbus_etcdir)" "$(DESTDIR)$(policykit_dbus_sharedir)" "$(DESTDIR)$(policykit_policydir)" "$(DESTDIR)$(postscriptdir)" "$(DESTDIR)$(ppddir)" "$(DESTDIR)$(prntdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(scandir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(ui4dir)" "$(DESTDIR)$(unreldir)" "$(DESTDIR)$(www0dir)" "$(DESTDIR)$(www3dir)" "$(DESTDIR)$(www4dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(hplip_confdir)" "$(DESTDIR)$(hplip_desktopdir)" "$(DESTDIR)$(hplip_systraydir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -8330,15 +8371,16 @@ install-data-am: install-cupsdrv2DATA install-cupsdrvDATA \ install-dist_fax_filtersDATA install-dist_halpreDATA \ install-dist_hpcupsfaxppdDATA install-dist_hpfaxSCRIPTS \ install-dist_hpijsfaxppdDATA install-dist_hplipSCRIPTS \ - install-dist_hplip_stateDATA install-dist_images_128x128DATA \ - install-dist_images_16x16DATA install-dist_images_24x24DATA \ - install-dist_images_256x256DATA install-dist_images_32x32DATA \ - install-dist_images_64x64DATA install-dist_images_devicesDATA \ - install-dist_images_otherDATA install-dist_installDATA \ - install-dist_ldlDATA install-dist_localzDATA \ - install-dist_modelsDATA install-dist_pcardDATA \ - install-dist_pclDATA install-dist_plugins4SCRIPTS \ - install-dist_pluginsDATA install-dist_policykit_dbus_etcDATA \ + install-dist_hplip_LogDATA install-dist_hplip_stateDATA \ + install-dist_images_128x128DATA install-dist_images_16x16DATA \ + install-dist_images_24x24DATA install-dist_images_256x256DATA \ + install-dist_images_32x32DATA install-dist_images_64x64DATA \ + install-dist_images_devicesDATA install-dist_images_otherDATA \ + install-dist_installDATA install-dist_ldlDATA \ + install-dist_localzDATA install-dist_modelsDATA \ + install-dist_pcardDATA install-dist_pclDATA \ + install-dist_plugins4SCRIPTS install-dist_pluginsDATA \ + install-dist_policykit_dbus_etcDATA \ install-dist_policykit_dbus_shareDATA \ install-dist_policykit_policyDATA install-dist_postscriptDATA \ install-dist_ppdDATA install-dist_prntDATA \ @@ -8408,7 +8450,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-dist_faxDATA uninstall-dist_fax_filtersDATA \ uninstall-dist_halpreDATA uninstall-dist_hpcupsfaxppdDATA \ uninstall-dist_hpfaxSCRIPTS uninstall-dist_hpijsfaxppdDATA \ - uninstall-dist_hplipSCRIPTS uninstall-dist_hplip_stateDATA \ + uninstall-dist_hplipSCRIPTS uninstall-dist_hplip_LogDATA \ + uninstall-dist_hplip_stateDATA \ uninstall-dist_images_128x128DATA \ uninstall-dist_images_16x16DATA \ uninstall-dist_images_24x24DATA \ @@ -8464,15 +8507,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ install-dist_fax_filtersDATA install-dist_halpreDATA \ install-dist_hpcupsfaxppdDATA install-dist_hpfaxSCRIPTS \ install-dist_hpijsfaxppdDATA install-dist_hplipSCRIPTS \ - install-dist_hplip_stateDATA install-dist_images_128x128DATA \ - install-dist_images_16x16DATA install-dist_images_24x24DATA \ - install-dist_images_256x256DATA install-dist_images_32x32DATA \ - install-dist_images_64x64DATA install-dist_images_devicesDATA \ - install-dist_images_otherDATA install-dist_installDATA \ - install-dist_ldlDATA install-dist_localzDATA \ - install-dist_modelsDATA install-dist_pcardDATA \ - install-dist_pclDATA install-dist_plugins4SCRIPTS \ - install-dist_pluginsDATA install-dist_policykit_dbus_etcDATA \ + install-dist_hplip_LogDATA install-dist_hplip_stateDATA \ + install-dist_images_128x128DATA install-dist_images_16x16DATA \ + install-dist_images_24x24DATA install-dist_images_256x256DATA \ + install-dist_images_32x32DATA install-dist_images_64x64DATA \ + install-dist_images_devicesDATA install-dist_images_otherDATA \ + install-dist_installDATA install-dist_ldlDATA \ + install-dist_localzDATA install-dist_modelsDATA \ + install-dist_pcardDATA install-dist_pclDATA \ + install-dist_plugins4SCRIPTS install-dist_pluginsDATA \ + install-dist_policykit_dbus_etcDATA \ install-dist_policykit_dbus_shareDATA \ install-dist_policykit_policyDATA install-dist_postscriptDATA \ install-dist_ppdDATA install-dist_prntDATA \ @@ -8502,7 +8546,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-dist_faxDATA uninstall-dist_fax_filtersDATA \ uninstall-dist_halpreDATA uninstall-dist_hpcupsfaxppdDATA \ uninstall-dist_hpfaxSCRIPTS uninstall-dist_hpijsfaxppdDATA \ - uninstall-dist_hplipSCRIPTS uninstall-dist_hplip_stateDATA \ + uninstall-dist_hplipSCRIPTS uninstall-dist_hplip_LogDATA \ + uninstall-dist_hplip_stateDATA \ uninstall-dist_images_128x128DATA \ uninstall-dist_images_16x16DATA \ uninstall-dist_images_24x24DATA \ @@ -8535,6 +8580,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \ uninstall-scanextLTLIBRARIES +install-dist_hplip_LogDATA: +@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +@FULL_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) +@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) + install-data-hook: # If scanner build, add hpaio entry to sane dll.conf. @HPLIP_BUILD_TRUE@ if [ "$(scan_build)" = "yes" ]; then \ diff --git a/base/codes.py b/base/codes.py index 4288464be..830c5e206 100644 --- a/base/codes.py +++ b/base/codes.py @@ -860,4 +860,5 @@ WIFI_CONFIG_LEDM = 3 SUPPORT_UNRELEASED = 0 SUPPORT_RELEASED = 1 - +#USB-Autoplugin-installation +EVENT_AUTO_CONFIGURE = 900 diff --git a/base/device.py b/base/device.py index 03640579c..43d74b0cc 100644 --- a/base/device.py +++ b/base/device.py @@ -94,6 +94,11 @@ ip_pat = re.compile(r"""\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25 dev_pat = re.compile(r"""/dev/.+""", re.IGNORECASE) usb_pat = re.compile(r"""(\d+):(\d+)""", re.IGNORECASE) +### **********Lambda Function UniStar for checking type of arguments to constructor of class event******************************* + +UniStr = lambda title: isinstance(title, str) and utils.xrstrip(title, '\x00')[:128] or utils.xrstrip(title, '\x00')[:128].encode('utf-8') + + # # Event Wrapper Class for pipe IPC # @@ -102,13 +107,13 @@ class Event(object): def __init__(self, device_uri, printer_name, event_code, username=prop.username, job_id=0, title='', timedate=0): - - self.device_uri = unicode(utils.xrstrip(device_uri, '\x00'))[:128].encode('utf-8') - self.printer_name = unicode(utils.xrstrip(printer_name, '\x00'))[:128].encode('utf-8') + # UniStr = lambda title: isinstance(title, str) and utils.xrstrip(title, '\x00')[:128] or utils.xrstrip(title, '\x00')[:128].encode('utf-8') + self.device_uri = UniStr(device_uri) + self.printer_name = UniStr(printer_name) self.event_code = int(event_code) - self.username = unicode(utils.xrstrip(username, '\x00'))[:32].encode('utf-8') + self.username = UniStr(username) self.job_id = int(job_id) - self.title = unicode(utils.xrstrip(title, '\x00'))[:128].encode('utf-8') + self.title = UniStr(title) if timedate: self.timedate = float(timedate) @@ -2631,3 +2636,6 @@ class LocalOpener_LEDM(urllib.URLopener): reply.seek(0) return reply.getvalue() + + + diff --git a/base/models.py b/base/models.py index 37973b490..ff66417ec 100644 --- a/base/models.py +++ b/base/models.py @@ -160,7 +160,6 @@ TECH_CLASS_PDLS = { "StingrayOJ" : 'pcl3', "Copperhead" : 'pcl3', "Ampere" : 'pcl3' - } PDL_TYPE_PCL = 0 # less preferred diff --git a/base/pkit.py b/base/pkit.py index b068d9e63..fedb440db 100644 --- a/base/pkit.py +++ b/base/pkit.py @@ -479,16 +479,25 @@ def run_plugin_command(required=True, plugin_reason=PLUGIN_REASON_NONE): if not required: req = '--optional' + if utils.which("hp-plugin"): - cmd = su_sudo % ("hp-plugin -u %s --reason %s" % (req, plugin_reason)) + p_path="hp-plugin" + else: + p_path="python ./plugin.py" + + if 'gksu' in su_sudo: + cmd = su_sudo % ("%s -u %s --reason %s" % (p_path, req, plugin_reason)) + cmd +=" -m" + cmd += (" \"hp-plugin:- HP Device requires to install HP proprietary plugin. Please enter user (sudo) password to continue\"") else: - cmd = su_sudo % ("python ./plugin.py -u %s --reason %s" % (req, plugin_reason)) + cmd = su_sudo % ("%s -u %s --reason %s To_install_plugin_for_HP_Device" % (p_path, req, plugin_reason)) log.debug("%s" % cmd) if password_f is not None: status, output = utils.run(cmd, log_output=True, password_func=password_f, timeout=1) else: status, output = utils.run(cmd, log_output=True, password_func=None, timeout=1) + return (status == 0, True) diff --git a/base/utils.py b/base/utils.py index b5185752f..b31c7fc74 100644 --- a/base/utils.py +++ b/base/utils.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, Naga Samrat Chowdary Narla, Goutam Kodu +# Author: Don Welch, Naga Samrat Chowdary Narla, Goutam Kodu, Amarnath Chitumalla # # Thanks to Henrique M. Holschuh <hmh@debian.org> for various security patches # @@ -26,6 +26,7 @@ from __future__ import generators # Std Lib import sys import os +from subprocess import Popen, PIPE import grp import fnmatch import tempfile @@ -1042,13 +1043,13 @@ def get_password_ui(): fp.close() if qt is "qt4": from ui4.setupdialog import showPasswordUI - username, password = showPasswordUI("Your printer requires to install HP proprietary plugin\nPlease enter root/superuser password to continue") + username, password = showPasswordUI("Your HP Device requires to install HP proprietary plugin\nPlease enter root/superuser password to continue", "root", False) if qt is "qt3": from ui.setupform import showPasswordUI - username, password = showPasswordUI("Your priter requires to install HP proprietary plugin\nPlease enter root/superuser password to continue") - return password + username, password = showPasswordUI("Your HP Device requires to install HP proprietary plugin\nPlease enter root/superuser password to continue", "root", False) + return password -def run(cmd, log_output=True, password_func=get_password, timeout=1): +def run(cmd, log_output=True, password_func=get_password, timeout=1, spinner=True): output = cStringIO.StringIO() try: @@ -1058,7 +1059,9 @@ def run(cmd, log_output=True, password_func=get_password, timeout=1): try: while True: - update_spinner() + if spinner: + update_spinner() + i = child.expect(["[pP]assword:", pexpect.EOF, pexpect.TIMEOUT]) if child.before: @@ -1074,7 +1077,8 @@ def run(cmd, log_output=True, password_func=get_password, timeout=1): child.sendline(password_func()) else: child.sendline(get_password()) - + + elif i == 1: # EOF break @@ -1084,8 +1088,8 @@ def run(cmd, log_output=True, password_func=get_password, timeout=1): except Exception, e: log.error("Exception: %s" % e) - - cleanup_spinner() + if spinner: + cleanup_spinner() child.close() return child.exitstatus, output.getvalue() @@ -1581,7 +1585,7 @@ encoding: utf8 log.info("contact the HPLIP Team.") log.info(".SH COPYRIGHT") - log.info("Copyright (c) 2001-9 Hewlett-Packard Development Company, L.P.") + log.info("Copyright (c) 2011-14 Hewlett-Packard Development Company, L.P.") log.info(".LP") log.info("This software comes with ABSOLUTELY NO WARRANTY.") log.info("This is free software, and you are welcome to distribute it") @@ -1600,7 +1604,7 @@ def log_title(program_name, version, show_ver=True): # TODO: Move to base/module log.info(log.bold("%s ver. %s" % (program_name, version))) log.info("") - log.info("Copyright (c) 2001-9 Hewlett-Packard Development Company, LP") + log.info("Copyright (c) 2011-14 Hewlett-Packard Development Company, LP") log.info("This software comes with ABSOLUTELY NO WARRANTY.") log.info("This is free software, and you are welcome to distribute it") log.info("under certain conditions. See COPYING file for more details.") @@ -1708,3 +1712,42 @@ def escape(s): s = s.replace(unichr(c), u"&#%d;" % c) return s + +# checks if given process is running. +#return value: +# True or False +# None - if process is not running +# grep output - if process is running + +def Is_Process_Running(process_name): + try: + p1 = Popen(["ps", "aux"], stdout=PIPE) + p2 = Popen(["grep", process_name], stdin=p1.stdout, stdout=PIPE) + p3 = Popen(["grep", "-v", "grep"], stdin=p2.stdout, stdout=PIPE) + output = p3.communicate()[0] + log.debug("Is_Process_Running outpu = %s " %output) + + if process_name in output: + return True, output + else: + return False, None + + except Exception, e: + log.error("Execution failed: process Name[%s]" %process_name) + print >>sys.stderr, "Execution failed:", e + return False, None + +class Sync_Lock: + def __init__(self, filename): + self.Lock_filename = filename + self.handler = open(self.Lock_filename, 'w') + +# Wait for another process to release resource and acquires the resource. + def acquire(self): + fcntl.flock(self.handler, fcntl.LOCK_EX) + + def release(self): + fcntl.flock(self.handler, fcntl.LOCK_UN) + + def __del__(self): + self.handler.close() diff --git a/base/wifi.py b/base/wifi.py index c035412d2..a0c460e84 100644 --- a/base/wifi.py +++ b/base/wifi.py @@ -578,7 +578,7 @@ def getHostname(dev): return ret if errorreturn != 'ok': - log.error("GetHostname returned an error: %s" % errorreturn) + # log.error("GetHostname returned an error: %s" % errorreturn) return ret try: diff --git a/check-plugin.py b/check-plugin.py new file mode 100755 index 000000000..316a4ffe4 --- /dev/null +++ b/check-plugin.py @@ -0,0 +1,303 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# (c) Copyright 2011-2014 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: Suma Byrappa, Amarnath Chitumalla +# +# + +__version__ = '1.0' +__title__ = 'AutoConfig Utility for Plug-in Installation' +__mod__ = 'hp-check-plugin' +__doc__ = "Auto config utility for HPLIP supported multifunction Devices for installing proprietary plug-ins." + +# Std Lib +import sys +import os +import os.path +import getopt +import signal +import operator +import time + +# Local +from base.g import * +from base import utils, device, tui, module, pkit +from installer import core_install + + +# Temp values for testing; May not be needed +username = "" +device_uri = "" +printer_name = "" +LOG_FILE = "/var/log/hp/hplip_ac.log" +DBUS_SERVICE='com.hplip.StatusService' + +##### METHODS ##### + +# Send dbus event to hpssd on dbus system bus +def send_message(device_uri, printer_name, event_code, username, job_id, title, pipe_name=''): + log.debug("send_message() entered") + args = [device_uri, printer_name, event_code, username, job_id, title, pipe_name] + msg = lowlevel.SignalMessage('/', DBUS_SERVICE, 'Event') + msg.append(signature='ssisiss', *args) + + SystemBus().send_message(msg) + log.debug("send_message() returning") + +# plugin installation +def install_Plugin(systray_running_status, run_directly=False): + if run_directly: + plugin = PLUGIN_REQUIRED + plugin_reason = PLUGIN_REASON_NONE + ok, sudo_ok = pkit.run_plugin_command(plugin == PLUGIN_REQUIRED, plugin_reason) + if not ok or not sudo_ok: + log.error("Failed to install plug-in.") + elif systray_running_status: + send_message( device_uri, printer_name, EVENT_AUTO_CONFIGURE, username, 0, "AutoConfig") + log.debug("Event EVENT_AUTO_CONFIGURE sent to hp-systray to invoke hp-plugin") + else: + log.error("Run hp-systray manually and re-plugin printer") + #TBD: needs to run hp-plugin in silent mode. or needs to show error UI to user. + + +#install Firmware after plugin installation completion. +def install_firmware(Plugin_Installation_Completed): + + #timeout check for plugin installation + sleep_timeout = 6000 # 10 mins time out + while Plugin_Installation_Completed is False and sleep_timeout != 0: + time.sleep(0.3) #0.3 sec delay + sleep_timeout = sleep_timeout -3 + + ps_plugin,output = utils.Is_Process_Running('hp-plugin') + ps_diagnose_plugin,output = utils.Is_Process_Running('hp-diagnose_plugin') + + if ps_plugin is False and ps_diagnose_plugin is False: + Plugin_Installation_Completed = True + if core.check_for_plugin() is True: + break + else: + log.error("Failed to download firmware required files. manually run hp-plugin command in terminal fisrt") + sys.exit(1) + + execmd="hp-firmware" + options="" + if usb_bus_id is not None and usb_device_id is not None: + options += " -y3 %s:%s"%(usb_bus_id, usb_device_id) + + if log_level is 'debug': + options += " -g" + + cmd= execmd + options + log.info("Starting Firmware installation.") + log.debug("Running command : %s " %cmd) + Status, out=utils.run(cmd) + +# if Status == 0: +# log.info("Installed firmware ") +# else: +# log.error("Failed to install firmware = %s" %Status) + + +#Usage details +USAGE = [(__doc__, "", "name", True), + ("Usage: %s [MODE] [OPTIONS]" % __mod__, "", "summary", True), + utils.USAGE_MODE, + utils.USAGE_GUI_MODE, + ("Run in interactive mode:", "-i or --interactive (For future use)", "option", False), + utils.USAGE_OPTIONS, + ("Install Plug-in through HP System Tray:", "-m (Default)", "option", False), + ("Install Plug-in through hp-plugin:", "-p", "option", False), + ("Download firmware into the device:", "-F", "option", False), + ("Download firmware into the known device:", "-f bbb:ddd, where bbb is the USB bus ID and ddd is the USB device ID. The ':' and all leading zeroes must be present", "option", False), + utils.USAGE_HELP, + utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, + utils.USAGE_NOTES, + ("-m and -p options can't be used together. ","","note",False), + ("-f and -F options can't be used together. ","","note",False) + ] + + +def usage(typ='text'): + if typ == 'text': + utils.log_title(__title__, __version__) + + utils.format_text(USAGE, typ, __title__, __mod__, __version__) + sys.exit(0) + +##### MAIN ##### + + +try: + import dbus + from dbus import SystemBus, lowlevel +except ImportError: + log.error("hp-check-plugin Tool requires dBus and python-dbus") + sys.exit(1) +try: + opts, args = getopt.getopt(sys.argv[1:],'l:hHuUmMf:FpPgG',['gui','help', 'help-rest', 'help-man', 'help-desc','logging=']) + +except getopt.GetoptError, e: + log.error(e.msg) + usage() + sys.exit(1) + +if os.getenv("HPLIP_DEBUG"): + log.set_level('debug') + +log_level = 'info' +Systray_Msg_Enabled = False +Plugin_option_Enabled = False +Firmware_Option_Enabled = False +Firmware_GUI_Option_Enabled = False +GUI_Mode = True +Is_Plugin_Already_Installed = False +usb_bus_id=None +usb_device_id=None + +for o, a in opts: + if o in ('-h','-H', '--help'): + usage() + + elif o == '--help-rest': + usage('rest') + + elif o == '--help-man': + usage('man') + + elif o in ('-u', '-U','--gui'): + # currenlty only GUI mode is supported. hence not reading this option + GUI_Mode = True + +# elif o in ('-i', '-I', '--interactive'): +# #this is future use +# GUI_Mode = False + + elif o == '--help-desc': + print __doc__, + sys.exit(0) + + elif o in ('-l', '--logging'): + log_level = a.lower().strip() + + elif o in('-g', '-G'): + log_level = 'debug' + + elif o in ('-m', '-M'): + Systray_Msg_Enabled = True + + elif o in ('-p', '-P'): + Plugin_option_Enabled = True + + elif o== '-F': + Firmware_GUI_Option_Enabled = True + + elif o =='-f': + usb_bus_id, usb_device_id = a.split(":", 1) + Firmware_Option_Enabled = True + +if not log.set_level (log_level): + usage() + +LOG_FILE = os.path.normpath(LOG_FILE) +log.info(log.bold("Saving output in log file: %s" % LOG_FILE)) +#if os.path.exists(LOG_FILE): +# os.remove(LOG_FILE) + +log.set_logfile(LOG_FILE) +log.set_where(log.LOG_TO_CONSOLE_AND_FILE) +cmd="chmod 774 "+LOG_FILE +sts,output = utils.run(cmd) +if sts != 0: + log.warn("Failed to change log file permissions: %s" %output) + +cmd="chgrp lp "+LOG_FILE +sts,output = utils.run(cmd) +if sts != 0: + log.warn("Failed to change log file group permissions: %s" %output) + +log.debug(" hp-check-plugin started") + +if Plugin_option_Enabled and Systray_Msg_Enabled: + log.error("Both -m and -p options can't be used together.") + usage() + sys.exit(1) + +if Firmware_GUI_Option_Enabled and Firmware_Option_Enabled: + log.error("Both -f and -F options can't be used together.") + usage() + sys.exit(1) + +if Firmware_GUI_Option_Enabled: + Firmware_Option_Enabled =True # Firmware_GUI_Option_Enabled is just to check both -f: and -F enabled or not + +if not Plugin_option_Enabled: + Systray_Msg_Enabled = True + +# checking whether HP-systray is running or not. Invokes, if systray is not running +status,output = utils.Is_Process_Running('hp-systray') +if status is False: + Systray_Is_Running=False + log.info("hp-systray is not running.") + if os.getuid() == 0: + log.error(" hp-systray must be running.\n Run \'hp-systray &\' in a terminal. ") + else: + log.info("Starting hp-systray service") + child_pid = os.fork() + if child_pid == 0: + Systray_Is_Running=True + status,output =utils.run('hp-systray &', True, None, 1, False) + if status is not 0: + log.error("Failed to start \'hp-systray\' service. Manually run \'hp-sysray &\' from terminal as non-root user.") + Systray_Is_Running=False + + sys.exit() + else: + Systray_Is_Running=True + time.sleep(2) +else: + Systray_Is_Running=True + log.info("hp-systray service is running\n") + +core = core_install.CoreInstall() +core.set_plugin_version() +if core.check_for_plugin(): + log.info("Device Plugin is already installed") + Is_Plugin_Already_Installed = True +else: + log.info("Device Plugin is not found") + +if Systray_Msg_Enabled: + if not Is_Plugin_Already_Installed: + install_Plugin( Systray_Is_Running) + +elif Plugin_option_Enabled: + if not Is_Plugin_Already_Installed: + install_Plugin (Systray_Is_Running, True) # needs to run hp-plugin without usig systray + +if Firmware_Option_Enabled: + if Is_Plugin_Already_Installed is False: + Plugin_Installation_Completed = False + else: + Plugin_Installation_Completed = True + + install_firmware(Plugin_Installation_Completed) + +log.info() +log.info("Done.") @@ -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.11.10. +# Generated by GNU Autoconf 2.63 for HP Linux Imaging and Printing 3.11.12. # -# Report bugs to <3.11.10>. +# Report bugs to <3.11.12>. # # 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.11.10' -PACKAGE_STRING='HP Linux Imaging and Printing 3.11.10' -PACKAGE_BUGREPORT='3.11.10' +PACKAGE_VERSION='3.11.12' +PACKAGE_STRING='HP Linux Imaging and Printing 3.11.12' +PACKAGE_BUGREPORT='3.11.12' # 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.11.10 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.11.12 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.11.10:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.11.12:";; 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.11.10>. +Report bugs to <3.11.12>. _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.11.10 +HP Linux Imaging and Printing configure 3.11.12 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.11.10, which was +It was created by HP Linux Imaging and Printing $as_me 3.11.12, 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.11.10' + VERSION='3.11.12' 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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10 ## +## Report this to 3.11.12 ## ## ---------------------- ## _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.11.10, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.11.12, 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.11.10 +HP Linux Imaging and Printing config.status 3.11.12 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 9189dedc6..b676335a2 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.11.10], [3.11.10], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.11.12], [3.11.12], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC diff --git a/cups_drv.inc b/cups_drv.inc index 24aef09a9..c33d29976 100644 --- a/cups_drv.inc +++ b/cups_drv.inc @@ -569,6 +569,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-photosmart_380_series.ppd.gz \ ppd/hpcups/hp-photosmart_420_series.ppd.gz \ ppd/hpcups/hp-photosmart_470_series.ppd.gz \ + ppd/hpcups/hp-photosmart_5510d_series.ppd.gz \ ppd/hpcups/hp-photosmart_5510_series.ppd.gz \ ppd/hpcups/hp-photosmart_6510_series.ppd.gz \ ppd/hpcups/hp-photosmart_7150.ppd.gz \ diff --git a/data/images/devices/OfficeJet_8500_a910.png b/data/images/devices/OfficeJet_8500_a910.png Binary files differnew file mode 100644 index 000000000..06e740311 --- /dev/null +++ b/data/images/devices/OfficeJet_8500_a910.png diff --git a/data/models/models.dat b/data/models/models.dat index eafd7c73b..b3d5e627b 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, 28 Sep 2011 11:32:15 by goutam. +# Last written on Thu, 08 Dec 2011 10:40:31 by goutam. # Model editor version 10.2 (Qt4). @@ -884,6 +884,50 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_5l] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=HP_LaserJet_4M.png +io-mfp-mode=6 +io-mode=1 +io-support=1 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet 5L Printer +model2=HP LaserJet 5L-FS Printer +model3=HP LaserJet 5L Xtra 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=C3906A +r0-agent1-type=1 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=0 +support-released=True +support-subtype=2e7c +support-type=2 +support-ver=0.9.5 +tech-class=LJMono +tech-subclass=Normal +tech-type=3 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_5si_mopier] align-type=0 clean-type=0 @@ -1077,50 +1121,6 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 -[hp_laserjet_5l] -align-type=0 -clean-type=0 -color-cal-type=0 -copy-type=0 -embedded-server-type=0 -fax-type=0 -fw-download=False -icon=HP_LaserJet_4M.png -io-mfp-mode=6 -io-mode=1 -io-support=1 -job-storage=0 -linefeed-cal-type=0 -model1=HP LaserJet 5L Printer -model2=HP LaserJet 5L-FS Printer -model3=HP LaserJet 5L Xtra 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=C3906A -r0-agent1-type=1 -scan-style=0 -scan-type=0 -status-battery-check=0 -status-dynamic-counters=0 -status-type=0 -support-released=True -support-subtype=2e7c -support-type=2 -support-ver=0.9.5 -tech-class=LJMono -tech-subclass=Normal -tech-type=3 -usb-pid=0 -usb-vid=3f0 -wifi-config=0 - [hp_laserjet_5p] align-type=0 clean-type=0 @@ -2727,7 +2727,7 @@ usb-vid=3f0 wifi-config=0 [envy_100_d410_series] -align-type=15 +align-type=16 clean-type=3 color-cal-type=0 copy-type=0 @@ -2789,7 +2789,7 @@ scan-style=0 scan-type=7 status-battery-check=0 status-dynamic-counters=1 -status-type=10 +status-type=2 support-released=True support-subtype=219b2b support-type=2 @@ -3618,7 +3618,7 @@ usb-vid=3f0 wifi-config=0 [envy_110_series] -align-type=15 +align-type=16 clean-type=3 color-cal-type=0 copy-type=0 @@ -3680,7 +3680,7 @@ scan-style=1 scan-type=7 status-battery-check=0 status-dynamic-counters=1 -status-type=10 +status-type=2 support-released=True support-subtype=219b2b support-type=2 @@ -4041,6 +4041,159 @@ usb-pid=1002 usb-vid=3f0 wifi-config=0 +[hp_laserjet_200_colormfp_m275s] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=HP_LaserJet_4000.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=Hewlett-Packard LaserJet 200 color MFP M275s +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=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE323A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE322A +r0-agent4-type=6 +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.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=c2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_200_colormfp_m275u] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=HP_LaserJet_4000.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=Hewlett-Packard LaserJet 200 color MFP M275u +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=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE323A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE322A +r0-agent4-type=6 +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.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=c2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_200_colormfp_m275t] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=HP_LaserJet_4000.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=Hewlett-Packard LaserJet 200 color MFP M275t +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=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE323A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE322A +r0-agent4-type=6 +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.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=c2a +usb-vid=3f0 +wifi-config=0 + [hp_deskjet_200] align-type=0 clean-type=1 @@ -4081,6 +4234,57 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_200_colormfp_m275nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=HP_LaserJet_4000.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=Hewlett-Packard LaserJet 200 color MFP M275nw +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=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE323A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE322A +r0-agent4-type=6 +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.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=c2a +usb-vid=3f0 +wifi-config=0 + [hp_designjet_200] align-type=0 clean-type=0 @@ -8453,6 +8657,140 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_600_m601] +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_LaserJet_4345_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise 600 M601n +model2=HP LaserJet Enterprise 600 M601dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_600_m601_m602_m603-ps.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE390A +r0-agent1-type=1 +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.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=a517 +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_600_m602] +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_LaserJet_4345_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise 600 M602n +model2=HP LaserJet Enterprise 600 M602dn +model3=HP LaserJet Enterprise 600 M602x +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_600_m601_m602_m603-ps.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE390A +r0-agent1-type=1 +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.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=a517 +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_600_m603] +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_LaserJet_4345_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP laserJet Enterprise 600 M603n +model2=HP laserJet Enterprise 600 M603dn +model3=HP laserJet Enterprise 600 M603xh +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_600_m601_m602_m603-ps.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE390A +r0-agent1-type=1 +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.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=a517 +usb-vid=3f0 +wifi-config=0 + [photosmart_a610_series] align-type=1 clean-type=1 @@ -13618,46 +13956,6 @@ usb-pid=517 usb-vid=3f0 wifi-config=0 -[hp_deskjet_1000c] -align-type=0 -clean-type=1 -color-cal-type=0 -copy-type=0 -embedded-server-type=0 -fax-type=0 -fw-download=False -icon=default_printer.png -io-mfp-mode=6 -io-mode=1 -io-support=0 -job-storage=0 -linefeed-cal-type=0 -model1=HP Deskjet 1000cxi Printer -model2=HP Deskjet 1000cse 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=3044 -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 - [deskjet_1000_j110_series] align-type=16 clean-type=1 @@ -13721,7 +14019,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=10 +status-type=2 support-released=True support-subtype=219b2b support-type=2 @@ -13733,6 +14031,46 @@ usb-pid=8811 usb-vid=3f0 wifi-config=0 +[hp_deskjet_1000c] +align-type=0 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=6 +io-mode=1 +io-support=0 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet 1000cxi Printer +model2=HP Deskjet 1000cse 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=3044 +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 + [business_inkjet_1000] align-type=1 clean-type=1 @@ -16372,45 +16710,6 @@ usb-pid=317 usb-vid=3f0 wifi-config=0 -[hp_designjet_t1200_postscript] -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_designjet.png -io-mfp-mode=1 -io-mode=1 -io-support=6 -job-storage=0 -linefeed-cal-type=0 -model1=HP Designjet T1200 Postscript -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=1 -support-released=True -support-subtype=219b2b -support-type=2 -support-ver=3.9.12 -tech-class=Postscript -tech-subclass=Normal -tech-type=2 -usb-pid=d14 -usb-vid=3f0 -wifi-config=0 - [business_inkjet_1200] align-type=1 clean-type=1 @@ -16478,6 +16777,45 @@ usb-pid=f12 usb-vid=3f0 wifi-config=0 +[hp_designjet_t1200_postscript] +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_designjet.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Designjet T1200 Postscript +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=1 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.9.12 +tech-class=Postscript +tech-subclass=Normal +tech-type=2 +usb-pid=d14 +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_1200n] align-type=0 clean-type=0 @@ -17639,24 +17977,24 @@ usb-pid=3f11 usb-vid=3f0 wifi-config=0 -[hp_color_laserjet_cm1312_mfp] +[hp_color_laserjet_cm1312nfi_mfp] align-type=0 clean-type=0 color-cal-type=0 copy-type=0 embedded-server-type=0 -fax-type=0 +fax-type=4 fw-download=False icon=hp_color_laserjet_cm1312_mfp.png io-mfp-mode=1 io-mode=1 -io-support=2 +io-support=6 job-storage=0 linefeed-cal-type=0 -model1=HP Color LaserJet CM1312 Multifunction Printer +model1=HP Color LaserJet CM1312nfi Multifunction Printer monitor-type=0 panel-check-type=1 -pcard-type=0 +pcard-type=2 plugin=1 plugin-reason=64 power-settings=0 @@ -17686,28 +18024,28 @@ support-ver=2.8.10 tech-class=LJColor,Postscript tech-subclass=Normal tech-type=4 -usb-pid=4e17 +usb-pid=4f17 usb-vid=3f0 wifi-config=0 -[hp_color_laserjet_cm1312nfi_mfp] +[hp_color_laserjet_cm1312_mfp] align-type=0 clean-type=0 color-cal-type=0 copy-type=0 embedded-server-type=0 -fax-type=4 +fax-type=0 fw-download=False icon=hp_color_laserjet_cm1312_mfp.png io-mfp-mode=1 io-mode=1 -io-support=6 +io-support=2 job-storage=0 linefeed-cal-type=0 -model1=HP Color LaserJet CM1312nfi Multifunction Printer +model1=HP Color LaserJet CM1312 Multifunction Printer monitor-type=0 panel-check-type=1 -pcard-type=2 +pcard-type=0 plugin=1 plugin-reason=64 power-settings=0 @@ -17737,7 +18075,7 @@ support-ver=2.8.10 tech-class=LJColor,Postscript tech-subclass=Normal tech-type=4 -usb-pid=4f17 +usb-pid=4e17 usb-vid=3f0 wifi-config=0 @@ -23274,7 +23612,7 @@ support-subtype=3ee5 support-type=2 support-ver=2.8.10 tech-class=LJColor,Postscript -tech-subclass=Normal +tech-subclass=Normal,Advanced tech-type=4 usb-pid=5917 usb-vid=3f0 @@ -23325,7 +23663,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=LJColor,Postscript -tech-subclass=Normal +tech-subclass=Normal,Advanced tech-type=4 usb-pid=5b17 usb-vid=3f0 @@ -23376,7 +23714,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=LJColor,Postscript -tech-subclass=Normal +tech-subclass=Normal,Advanced tech-type=4 usb-pid=5917 usb-vid=3f0 @@ -23427,7 +23765,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=LJColor,Postscript -tech-subclass=Normal +tech-subclass=Normal,Advanced tech-type=4 usb-pid=5a17 usb-vid=3f0 @@ -26035,7 +26373,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=10 +status-type=2 support-released=True support-subtype=219b2b support-type=2 @@ -26437,7 +26775,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_3050_j610_series] -align-type=15 +align-type=16 clean-type=1 color-cal-type=0 copy-type=0 @@ -37064,6 +37402,93 @@ usb-pid=7211 usb-vid=3f0 wifi-config=0 +[photosmart_5510d_series] +align-type=0 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=psc_2300_series.png +io-mfp-mode=3 +io-mode=3 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Photosmart 5510d e-All-in-One +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=2 +r0-agent1-sku=564/564XL +r0-agent1-type=1 +r0-agent2-kind=2 +r0-agent2-sku=564/564XL +r0-agent2-type=4 +r0-agent3-kind=2 +r0-agent3-sku=564/564XL +r0-agent3-type=5 +r0-agent4-kind=2 +r0-agent4-sku=564/564XL +r0-agent4-type=6 +r1-agent1-kind=2 +r1-agent1-sku=364/364XL +r1-agent1-type=1 +r1-agent2-kind=2 +r1-agent2-sku=364/364XL +r1-agent2-type=4 +r1-agent3-kind=2 +r1-agent3-sku=364/364XL +r1-agent3-type=5 +r1-agent4-kind=2 +r1-agent4-sku=364/364XL +r1-agent4-type=6 +r2-agent1-kind=2 +r2-agent1-sku=178/178XL +r2-agent1-type=1 +r2-agent2-kind=2 +r2-agent2-sku=178/178XL +r2-agent2-type=4 +r2-agent3-kind=2 +r2-agent3-sku=178/178XL +r2-agent3-type=5 +r2-agent4-kind=2 +r2-agent4-sku=178/178XL +r2-agent4-type=6 +r3-agent1-kind=2 +r3-agent1-sku=862/862XL +r3-agent1-type=1 +r3-agent2-kind=2 +r3-agent2-sku=862/862XL +r3-agent2-type=4 +r3-agent3-kind=2 +r3-agent3-sku=862/862XL +r3-agent3-type=5 +r3-agent4-kind=2 +r3-agent4-sku=862/862XL +r3-agent4-type=6 +scan-style=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.10 +tech-class=Copperhead +tech-subclass=AutoDuplex +tech-type=2 +usb-pid=b411 +usb-vid=3f0 +wifi-config=0 + [photosmart_5510_series] align-type=0 clean-type=1 @@ -39925,7 +40350,7 @@ usb-vid=3f0 wifi-config=0 [officejet_6500_e710n-z] -align-type=15 +align-type=1 clean-type=3 color-cal-type=0 copy-type=0 @@ -40140,7 +40565,7 @@ scan-style=0 scan-type=7 status-battery-check=0 status-dynamic-counters=2 -status-type=10 +status-type=2 support-released=True support-subtype=219b2b support-type=2 @@ -46095,7 +46520,7 @@ usb-vid=3f0 wifi-config=0 [officejet_pro_8500_a910] -align-type=15 +align-type=1 clean-type=1 color-cal-type=0 copy-type=0 @@ -46108,7 +46533,9 @@ io-mode=1 io-support=14 job-storage=0 linefeed-cal-type=0 -model1=HP Officejet Pro 8500 A910a +model1=HP Officejet Pro 8500A e-AiO Printer A910a +model2=HP Officejet Pro 8500A e-AiO Printer A910g +model3=HP Officejet Pro 8500A e-AiO Printer A910n monitor-type=0 panel-check-type=1 pcard-type=2 @@ -46552,7 +46979,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.4 tech-class=Python -tech-subclass=LargeFormatA3,NoAutoDuplex +tech-subclass=LargeFormatA3,NoAutoDuplex,Advanced tech-type=2 usb-pid=d002 usb-vid=3f0 diff --git a/data/rules/55-hpmud.rules b/data/rules/55-hpmud.rules index 2b260f223..ec4b12354 100644 --- a/data/rules/55-hpmud.rules +++ b/data/rules/55-hpmud.rules @@ -21,128 +21,128 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" LABEL="hplip_pid_test" # Check for AiO products (0x03f0xx11). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660" # Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02). # The xx02 pid has been retired so this explicit list should not change. # photosmart_d2300_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660" # photosmart_100 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660" # photosmart_1115 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660" # photosmart_1215 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660" # photosmart_1218 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660" # photosmart_130 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660" # photosmart_1315 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660" # photosmart_140_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660" # photosmart_230 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660" # photosmart_240_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660" # photosmart_320_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660" # photosmart_330_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660" # photosmart_370_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660" # photosmart_380_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660" # photosmart_420_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660" # photosmart_470_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660" # photosmart_7150 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660" -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660" # photosmart_7200_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660" # photosmart_7345 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660" # photosmart_7350 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660" # photosmart_7400_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660" # photosmart_7550 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660" # photosmart_7600_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660" # photosmart_7700_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660" # photosmart_7800_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660" # photosmart_7900_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660" # photosmart_8000_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660" # photosmart_8100_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660" # photosmart_8200_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660" # photosmart_8400_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660" # photosmart_8700_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a310_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a320_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a430_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660" # photosmart_a440_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a510_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a520_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660" # photosmart_a530_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a610_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a620_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660" # photosmart_a630_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a710_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660" # photosmart_a820_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660" # photosmart_d5060_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660" # photosmart_d5100_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660" # photosmart_d6100_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660" # photosmart_d7100_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660" # photosmart_d7300_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660" # photosmart_pro_b8300_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660" # photosmart_b8800_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660" # photosmart_pro_b9100_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660" # Photosmart_B8500_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660" # Photosmart_A640_series -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660" # Check for Business Inkjet products (0x03f0xx12). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660" # Check for Deskjet products (0x03f0xx04). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660" # Check for LaserJet products (0x03f0xx17). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" +ATTRS{idVendor}=="03f0", ATTRS{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" +ATTRS{idVendor}=="03f0", ATTRS{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" +ATTRS{idVendor}=="03f0", ATTRS{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/data/rules/56-hpmud_support.rules b/data/rules/56-hpmud_support.rules index 68ad2049e..1487a121e 100644 --- a/data/rules/56-hpmud_support.rules +++ b/data/rules/56-hpmud_support.rules @@ -7,9 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" LABEL="pid_test" # Check for LaserJet products (0x03f0xx17). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes" # Check for LaserJet products (0x03f0xx2a). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes" ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" LABEL="hpmud_rules_end" diff --git a/data/rules/86-hpmud_plugin.rules b/data/rules/86-hpmud_plugin.rules new file mode 100755 index 000000000..97d037b19 --- /dev/null +++ b/data/rules/86-hpmud_plugin.rules @@ -0,0 +1,9 @@ +# Load hp firmware for this printer. + +ACTION!="add", GOTO="hpmud_rules_end" + +# hp_Marvel_Device (These printer requires the plugin files. installling when device is detected) +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'" +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'" + +LABEL="hpmud_rules_end" diff --git a/diagnose_plugin.py b/diagnose_plugin.py new file mode 100755 index 000000000..520695387 --- /dev/null +++ b/diagnose_plugin.py @@ -0,0 +1,130 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# (c) Copyright 2011 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: Amarnath Chitumalla, Suma Byrappa +# + +__version__ = '1.0' +__mod__ = 'hp-diagnose_plugin' +__title__ = 'Plugin Download and Install Utility' +__doc__ = "" + +# Std Lib +import sys +import getopt +import time +import os.path +import re +import os + +# Local +from base.g import * +from base import utils, module + +pm = None + + + +USAGE = [ (__doc__, "", "name", True), + ("Usage: %s [MODE] [OPTIONS]" % __mod__, "", "summary", True), + utils.USAGE_MODE, + ("Installation for required printer mode:", "--required (Qt4 only)", "option", False), + ("Installation for optional printer mode:", "--optional (Qt4 only)", "option", False), + #("Installation generic mode:", "--generic (default)", "option", False), + utils.USAGE_LANGUAGE, + utils.USAGE_OPTIONS, + utils.USAGE_LOGGING1, utils.USAGE_LOGGING2, utils.USAGE_LOGGING3, + utils.USAGE_HELP, + utils.USAGE_SPACE, + utils.USAGE_SEEALSO, + ("hp-plugin", "", "seealso", False), + ("hp-setup", "", "seealso", False), + ("hp-firmware", "", "seealso", False), + ] + + +mod = module.Module(__mod__, __title__, __version__, __doc__, USAGE, + (INTERACTIVE_MODE, GUI_MODE), + (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4), True) + +opts, device_uri, printer_name, mode, ui_toolkit, loc = \ + mod.parseStdOpts( handle_device_printer=False) + +plugin_path = None +install_mode = PLUGIN_NONE # reuse plugin types for mode (PLUGIN_NONE = generic) +plugin_reason = PLUGIN_REASON_NONE + +for o, a in opts: + if o == '--required': + install_mode = PLUGIN_REQUIRED + if ui_toolkit == 'qt3': + log.warn("--required switch ignored.") + + elif o == '--optional': + install_mode = PLUGIN_OPTIONAL + if ui_toolkit == 'qt3': + log.warn("--optional switch ignored.") + + elif o == '--reason': + plugin_reason = int(a) + + +version = prop.installed_version + + + +if mode == GUI_MODE: + if ui_toolkit == 'qt3': + if not utils.canEnterGUIMode(): + log.error("%s requires GUI support (try running with --qt4). Try using interactive (-i) mode." % __mod__) + sys.exit(1) + else: + if not utils.canEnterGUIMode4(): + log.error("%s requires GUI support (try running with --qt3). Try using interactive (-i) mode." % __mod__) + sys.exit(1) + + +if mode == GUI_MODE: + if ui_toolkit == 'qt3': + log.error("Unable to load Qt3. Please use qt4") + + else: # qt4 + try: + from PyQt4.QtGui import QApplication, QMessageBox + from ui4.plugindiagnose import PluginDiagnose + except ImportError: + log.error("Unable to load Qt4 support. Is it installed?") + sys.exit(1) + + app = QApplication(sys.argv) + + dialog = PluginDiagnose(None, install_mode, plugin_reason) + dialog.show() + + try: + log.debug("Starting GUI loop...") + app.exec_() + except KeyboardInterrupt: + log.error("User exit") + sys.exit(0) + + +log.info("") +log.info("Done.") + diff --git a/fax/fax.py b/fax/fax.py index ea3551f2c..58a0e29d3 100644 --- a/fax/fax.py +++ b/fax/fax.py @@ -206,17 +206,18 @@ class FaxAddressBook(object): # Pickle based address book self.load() def load(self): - self._fab = os.path.join(prop.user_dir, "fab.pickle") - #old_fab = os.path.join(prop.user_dir, "fab.db") - - # Load the existing pickle if present - if os.path.exists(self._fab): - pickle_file = open(self._fab, "r") - self._data = cPickle.load(pickle_file) - pickle_file.close() - - else: - self.save() # save the empty file to create the file + self._fab = "/dev/null" + if prop.user_dir != None: + self._fab = os.path.join(prop.user_dir, "fab.pickle") + #old_fab = os.path.join(prop.user_dir, "fab.db") + + # Load the existing pickle if present + if os.path.exists(self._fab): + pickle_file = open(self._fab, "r") + self._data = cPickle.load(pickle_file) + pickle_file.close() + else: + self.save() # save the empty file to create the file def set(self, name, title, firstname, lastname, fax, groups, notes): diff --git a/fax/marvellfax.py b/fax/marvellfax.py index de1c0bbfe..4d5ced35b 100644 --- a/fax/marvellfax.py +++ b/fax/marvellfax.py @@ -98,7 +98,14 @@ class MarvellFaxDevice(FaxDevice): lib_name = head+"/fax/plugins/fax_marvell.so" log.debug("Load the library %s\n" % lib_name) - self.libfax_marvell = cdll.LoadLibrary(lib_name) + if not os.path.exists(lib_name): + log.error("Loading %s failed. Try after installing plugin libraries\n" %lib_name); + log.info("Run \"hp-plugin\" to installa plugin libraries if you are not automatically prompted\n") + job_id =0; + self.service.SendEvent(device_uri, printer_name, EVENT_FAX_FAILED_MISSING_PLUGIN, os.getenv('USER'), job_id, "Plugin is not installed") + sys.exit(1) + else: + self.libfax_marvell = cdll.LoadLibrary(lib_name) except Error, e: log.error("Loading fax_marvell failed (%s)\n" % e.msg); sys.exit(1) diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex 55bb34150..8fb2d8c1c 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 c7888d20b..3b9647827 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 4f0883f42..a073e4723 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 6ea212516..bee65f7f5 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 450ce2335..0ed74e3cf 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 d3b7bf65b..a498a5fbf 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 differindex 7a52248cd..9d1db18a7 100644 --- a/fax/ppd/HP-Fax4-hpcups.ppd.gz +++ 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 differindex 33c099963..1ede8384e 100644 --- a/fax/ppd/HP-Fax4-hpijs.ppd.gz +++ b/fax/ppd/HP-Fax4-hpijs.ppd.gz diff --git a/foomatic_drv.inc b/foomatic_drv.inc index d6bf63feb..4f4317103 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -288,6 +288,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_5600-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz \ + ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_8100_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_4mp-hpijs-pcl3.ppd.gz \ ppd/hpijs/hp-deskjet_540-hpijs.ppd.gz \ @@ -693,6 +694,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm6040_mfp-ps.ppd.gz \ prnt/ps/hp-designjet_4000ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605dn-ps.ppd.gz \ + prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz \ prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000_series-ps.ppd.gz \ prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz \ @@ -775,6 +777,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1015-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz \ prnt/ps/hp-color_laserjet_8550-ps.ppd.gz \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2700n-ps.ppd.gz \ diff --git a/hplip.list.in b/hplip.list.in index d49d3db11..56a46891d 100644 --- a/hplip.list.in +++ b/hplip.list.in @@ -232,6 +232,8 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz @epm_full@f 644 root root $home/scan/__init__.py scan/__init__.py @epm_full@f 644 root root $home/scan/sane.py scan/sane.py @epm_full@f 755 root root $home/plugin.py plugin.py +@epm_full@f 755 root root $home/check-plugin.py check-plugin.py +@epm_full@f 755 root root $home/diagnose_plugin.py diagnose_plugin.py @epm_full@f 755 root root $home/print.py print.py @epm_full@f 755 root root $home/firmware.py firmware.py @epm_full@d 775 root root $home/plugins - @@ -286,6 +288,8 @@ f 0644 root root $ppd/HP prnt/ps/*.ppd.gz @epm_full@l 755 root root $bindir/hp-probe ../share/hplip/probe.py @epm_full@l 755 root root $bindir/hp-timedate ../share/hplip/timedate.py @epm_full@l 755 root root $bindir/hp-plugin ../share/hplip/plugin.py +@epm_full@l 755 root root $bindir/hp-check-plugin ../share/hplip/check-plugin.py +@epm_full@l 755 root root $bindir/hp-diagnose_plugin ../share/hplip/diagnose_plugin.py @epm_full@l 755 root root $bindir/hp-check ../share/hplip/check.py @epm_full@l 755 root root $bindir/hp-info ../share/hplip/info.py @epm_full@l 755 root root $bindir/hp-makecopies ../share/hplip/makecopies.py @@ -433,6 +437,7 @@ f 0644 root root $docdir/copyright prnt/plugins/copyright f 0644 root root /var/lib/hp/hplip.state hplip-plugin.state f 0644 root root $home/data/firmware data/firmware/*.fw.gz d 0775 root root $home/data/plugin - +d 0775 root lp /var/log/hp - #scan @@ -464,8 +469,10 @@ EOF f 0644 root root $docdir/COPYING COPYING f 0644 root root $docdir/copyright copyright f 0644 root root /var/lib/hp/hplip.state hplip.state +d 0775 root lp /var/log/hp - %system !darwin @epm_print_only_exclude@f 0644 root root /etc/udev/rules.d/56-hpmud_support.rules data/rules/56-hpmud_support.rules +@epm_print_only_exclude@f 0644 root root /etc/udev/rules.d/86-hpmud_plugin.rules data/rules/86-hpmud_plugin.rules %system all %endif #end PLUGIN @@ -42,7 +42,8 @@ from cPickle import loads, HIGHEST_PROTOCOL # Local from base.g import * from base.codes import * -from base import utils, device, status, models +from base import utils, device, status, models, module +from installer import core_install # dBus try: @@ -346,6 +347,39 @@ def handle_hpdio_event(event, bytes_written): send_toolbox_event(event, EVENT_DEVICE_UPDATE_REPLY) +def handle_plugin_install(): + +# child_process=os.fork() +# if child_process ==0: ### child process +# child_pid=os.getpid() +# utils.run('hp-diagnose_plugin',True, None, 1, False) +# os.kill(child_pid,signal.SIGKILL) +# +# else: ## parent process +# log.debug("Started Plug-in installation wizard") + +##### TBD: Valdiation pending for Plug-in is already running or not?... + child_process=os.fork() + if child_process== 0: # child process + lockObj = utils.Sync_Lock("/tmp/pluginInstall.tmp") + lockObj.acquire() + child_pid=os.getpid() + core = core_install.CoreInstall() + core.set_plugin_version() + if not core.check_for_plugin(): + sts,out = utils.run('hp-diagnose_plugin',True, None, 1, False) + if sts != 0: + log.error("Failed to load hp-diagnose_plugin") + #TBD FailureUI needs to add + else: + log.debug("Device Plug-in was already installed. Not Invoking Plug-in installation wizard") + + lockObj.release() + os.kill(child_pid,signal.SIGKILL) + + else: #parent process + log.debug("Started Plug-in installation wizard") + def handle_event(event, more_args=None): @@ -358,6 +392,10 @@ def handle_event(event, more_args=None): more_args = [] event.debug() + + if event.event_code == EVENT_AUTO_CONFIGURE: + handle_plugin_install() + return if event.device_uri and check_device(event.device_uri) != ERROR_SUCCESS: return @@ -408,6 +446,9 @@ def handle_event(event, more_args=None): # send EVENT_HISTORY_UPDATE signal to hp-toolbox send_toolbox_event(event, EVENT_HISTORY_UPDATE) + + if event.event_code in (EVENT_PRINT_FAILED_MISSING_PLUGIN, EVENT_SCAN_FAILED_MISSING_PLUGIN,EVENT_FAX_FAILED_MISSING_PLUGIN): + handle_plugin_install() # Handle fax signals elif EVENT_FAX_MIN <= event.event_code <= EVENT_FAX_MAX and more_args: diff --git a/installer/core_install.py b/installer/core_install.py index 2792b854b..79c4016d0 100644 --- a/installer/core_install.py +++ b/installer/core_install.py @@ -251,6 +251,7 @@ class CoreInstall(object): 'add_user_to_group': TYPE_STRING,
'open_mdns_port' : TYPE_LIST, # command to use to open mdns multicast port 5353
'acl_rules' : TYPE_BOOL, # Use ACL uDEV rules (Ubuntu 9.10+)
+ 'libdir_path' : TYPE_STRING,
}
# components
@@ -1187,9 +1188,12 @@ class CoreInstall(object): configuration['cups-ppd-install'] = True
if self.ppd_dir is not None:
- configure_cmd += ' --with-hpppddir=%s' % self.ppd_dir
-
- if self.bitness == 64:
+ configure_cmd += ' --with-hpppddir=%s' % self.ppd_dir +
+ libdir_path = self.get_distro_ver_data('libdir_path',False)
+ if libdir_path and self.bitness == 64: + configure_cmd += ' --libdir=%s' % (libdir_path)
+ elif self.bitness == 64:
configure_cmd += ' --libdir=/usr/lib64'
configure_cmd += ' --prefix=%s' % self.install_location
@@ -1797,7 +1801,12 @@ class CoreInstall(object): return True
if callback is not None:
- callback("", "Password incorrect. %d attempt(s) left." % (3-x))
+ if "not in the sudoers file" in output:
+ callback("", "%s is not in the sudoers file. Check privileges\n" %(os.getenv('USER')) )
+ return False
+ else:
+ callback("", "Password incorrect. %d attempt(s) left." % (3-x ))
+
x += 1
@@ -1933,7 +1942,7 @@ class CoreInstall(object): plugin_file = os.path.join(self.plugin_path, self.plugin_name)
- #Check whether plugin is accessible in Openprinting.org website otherwise dowload plugin from alternate location.
+ #Check whether plugin is accessible in Openprinting.org website otherwise dowload plugin from alternate location.
wget = utils.which("wget")
if wget:
wget = os.path.join(wget, "wget")
@@ -1943,7 +1952,7 @@ class CoreInstall(object): log.debug("wget returned: %d" % status)
try:
- if (status != 0):
+ if (status != 0) and 'file://' not in url:
url = os.path.join(PLUGIN_FALLBACK_LOCATION, self.plugin_name)
log.info("Plugin is not accessible. Trying to download it from fallback location: [%s]" % url)
diff --git a/installer/distros.dat b/installer/distros.dat index 900d4b7c9..7d2380b55 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -82,6 +82,7 @@ # add_user_to_group=<usermod params> [TYPE_STRING] (leave empty for none) [ex. "-a -G sys" or "-G lp"] # open_mdns_port=<command(s) to use to open the mdns multicast port 5353> [TYPE_LIST] # acl_rules=1|0 [TYPE_BOOL] # For Karmic+ +# libdir_path=<lib directory path> [TYPE_STRING] # Used if libdir location is to be provided in 64 bit machines # # Only include these sections if supported==1 for this <distro name>:<version name>. # [<distro name>:<version name>:<dependency name>] @@ -111,7 +112,7 @@ supported=0 [suse] index=3 -versions=11.3,11.4 +versions=11.3,11.4,12.1 display_name=SUSE Linux alt_names= display=1 @@ -594,6 +595,10 @@ packages=cups-devel [suse:11.4:python-notify] packages=python-notify + +[suse:12.1] +same_as_version=11.4 + # **************************************** [redhat] index=6 @@ -794,7 +799,7 @@ ui_toolkit=qt3 # **************************************** [fedora] index=5 -versions=14,15 +versions=14,15,16 display_name=Fedora alt_names=Fedora Core display=1 @@ -2311,13 +2316,15 @@ packages=polkit,polkit-gnome [fedora:12.0] same_as_version=12 - [fedora:13.0] same_as_version=12 [fedora:14.0] same_as_version=12 +[fedora:16] +same_as_version=15 + # **************************************** [linspire] index=15 @@ -4330,6 +4337,7 @@ ui_toolkit=qt4 native_cups=1 acl_rules=1 add_user_to_group=-a -Glp,lpadmin +libdir_path=/usr/lib [ubuntu:11.04:cups] packages=libcups2 @@ -4429,7 +4437,7 @@ same_as_version=11.04 # **************************************** [debian] index=2 -versions=5.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,6.0,6.0.1,6.0.2 +versions=5.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,6.0,6.0.1,6.0.2,6.0.3 display_name=Debian alt_names= display=1 @@ -5574,6 +5582,8 @@ same_as_version=6.0 [debian:6.0.2] same_as_version=6.0 +[debian:6.0.3] +same_as_version=6.0 # **************************************** [xandros] diff --git a/installer/text_install.py b/installer/text_install.py index 0ec92f024..11e4aca75 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -31,6 +31,20 @@ from base.g import * from base import utils, tui from core_install import * +def start_systray(): + path = utils.which('hp-systray') + if path: + path = os.path.join(path, 'hp-systray') + else: + path = os.path.join(prop.home_dir, 'systray.py') + if not os.path.exists(path): + log.warn("Unable to start hp-systray") + + log.debug("Running hp-systray: %s --force-startup" % path) + os.spawnlp(os.P_NOWAIT, path, 'hp-systray', '--force-startup') + log.debug("Waiting for hp-systray to start...") + time.sleep(1) + def progress_callback(cmd="", desc="Working..."): if cmd: @@ -354,7 +368,7 @@ def start(language, auto=True, test_depends=False, ok = core.check_password(password_entry, progress_callback) if not ok: - log.error("3 incorrect attempts. Exiting.") + log.error("3 incorrect attempts. (or) Insufficient permissions(i.e. try with sudo user).\nExiting.") sys.exit(1) # @@ -845,8 +859,12 @@ def start(language, auto=True, test_depends=False, tui.title("CLOSE HP_SYSTRAY") log.info("Sending close message to hp-systray (if it is currently running)...") SessionBus().send_message(msg) + time.sleep(0.5) except: pass + + tui.title("RE-STARTING HP_SYSTRAY") + start_systray() # Restart or re-plugin if necessary (always True in 2.7.9+) if core.selected_component == 'hplip': diff --git a/io/hpmud/hpmud.c b/io/hpmud/hpmud.c index 05aaf4077..8be7b7878 100644 --- a/io/hpmud/hpmud.c +++ b/io/hpmud/hpmud.c @@ -305,6 +305,7 @@ static int new_device(const char *uri, enum HPMUD_IO_MODE mode, int *result) { BUG("invalid uri %s\n", uri); *result = HPMUD_R_INVALID_URI; + index = 0; goto bugout; } msp->device[i].io_mode = mode; @@ -49,7 +49,9 @@ def plugin_download_callback(c, s, t): def plugin_install_callback(s): print s - +def clean_exit(code=0): + mod.unlockInstance() + sys.exit(code) USAGE = [ (__doc__, "", "name", True), ("Usage: %s [MODE] [OPTIONS]" % __mod__, "", "summary", True), @@ -105,21 +107,26 @@ for o, a in opts: version = prop.installed_version plugin_filename = 'hplip-%s-plugin.run' % version +ok= mod.lockInstance() +if ok is False: + log.error("Plug-in lock acquire failed. check if hp-plugin is already running") + sys.exit(1) + if plugin_path is not None: if not os.path.exists(plugin_path): log.error("Plug-in path '%s' not found." % plugin_path) - sys.exit(1) + clean_exit(1) if os.path.isdir(plugin_path): plugin_path = os.path.join(plugin_path, 'hplip-%s-plugin.run' % version) if not os.path.exists(plugin_path): log.error("Plug-in path '%s' not found." % plugin_path) - sys.exit(1) + clean_exit(1) if os.path.basename(plugin_path) != plugin_filename: log.error("Plug-in filename must be '%s'." % plugin_filename) - sys.exit(1) + clean_exit(1) size, checksum, timestamp = os.stat(plugin_path)[6], '', 0.0 @@ -131,11 +138,11 @@ if mode == GUI_MODE: if ui_toolkit == 'qt3': if not utils.canEnterGUIMode(): log.error("%s requires GUI support (try running with --qt4). Try using interactive (-i) mode." % __mod__) - sys.exit(1) + clean_exit(1) else: if not utils.canEnterGUIMode4(): log.error("%s requires GUI support (try running with --qt3). Try using interactive (-i) mode." % __mod__) - sys.exit(1) + clean_exit(1) PKIT = utils.to_bool(sys_conf.get('configure', 'policy-kit')) @@ -162,7 +169,7 @@ if mode == GUI_MODE: from ui import pluginform2 except ImportError: log.error("Unable to load Qt3 support. Is it installed?") - sys.exit(1) + clean_exit(1) app = QApplication(sys.argv) QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) @@ -215,7 +222,7 @@ if mode == GUI_MODE: QMessageBox.NoButton, QMessageBox.NoButton) - sys.exit(1) + clean_exit(1) w = pluginform2.PluginForm2() app.setMainWidget(w) @@ -229,7 +236,7 @@ if mode == GUI_MODE: from ui4.plugindialog import PluginDialog except ImportError: log.error("Unable to load Qt4 support. Is it installed?") - sys.exit(1) + clean_exit(1) app = QApplication(sys.argv) @@ -243,7 +250,7 @@ if mode == GUI_MODE: QMessageBox.NoButton, QMessageBox.NoButton) - sys.exit(1) + clean_exit(1) dialog = PluginDialog(None, install_mode, plugin_reason) @@ -253,14 +260,14 @@ if mode == GUI_MODE: app.exec_() except KeyboardInterrupt: log.error("User exit") - sys.exit(0) + clean_exit(0) else: # INTERACTIVE_MODE try: if not os.geteuid() == 0: log.error("You must be root to run this utility.") - sys.exit(1) + clean_exit(1) log.info("(Note: Defaults for each question are maked with a '*'. Press <enter> to accept the default.)") log.info("") @@ -278,7 +285,7 @@ else: # INTERACTIVE_MODE cont, ans = tui.enter_yes_no("Do you wish to download and re-install the plug-in?") if not cont or not ans: - sys.exit(0) + clean_exit(0) if plugin_path is None: @@ -293,7 +300,7 @@ else: # INTERACTIVE_MODE ['d', 'p'], 'd') if not cont: # q - sys.exit(0) + clean_exit(0) if ans == 'd': # d - download @@ -310,7 +317,7 @@ else: # INTERACTIVE_MODE if not ok: log.error("Network connection not detected.") - sys.exit(1) + clean_exit(1) log.info("Downloading configuration file from: %s" % plugin_conf_url) @@ -331,7 +338,7 @@ else: # INTERACTIVE_MODE version)).strip() if plugin_path.strip().lower() == 'q': - sys.exit(1) + clean_exit(1) if not plugin_path.startswith('http://'): plugin_path = os.path.normpath(os.path.abspath(os.path.expanduser(plugin_path))) @@ -367,7 +374,7 @@ else: # INTERACTIVE_MODE if not ok: log.error("Network connection not detected.") - sys.exit(1) + clean_exit(1) log.info("Downloading plug-in from: %s" % plugin_path) pm = tui.ProgressMeter("Downloading plug-in:") @@ -380,7 +387,7 @@ else: # INTERACTIVE_MODE cont, ans = tui.enter_yes_no("Do you still want to install the plug-in?", 'n') if not cont or not ans: - sys.exit(0) + clean_exit(0) elif status != core_install.PLUGIN_INSTALL_ERROR_NONE: @@ -401,7 +408,7 @@ else: # INTERACTIVE_MODE core.delete_plugin() log.error(desc) - sys.exit(1) + clean_exit(1) tui.header("INSTALLING PLUG-IN") @@ -428,7 +435,7 @@ else: # INTERACTIVE_MODE d = device.Device(dev) except Error: log.error("Error opening device. Exiting.") - sys.exit(1) + clean_exit(1) if d.downloadFirmware(): log.info("Firmware download successful.\n") @@ -441,4 +448,5 @@ else: # INTERACTIVE_MODE log.info("") log.info("Done.") +clean_exit(0) diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex e7596d442..aab356aa3 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 18ae17db8..31f35b4aa 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 f7e4834c4..47fc8d357 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 27124ee0d..a05f29548 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 ec88caa44..990bedd82 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 a1bc9a218..2ffa4fe98 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 9b6dc32ed..eb456edc3 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 571876e72..8421af892 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 4408c0593..64741159f 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 e5b405feb..f4edd8356 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 a0de8adf1..424f8a1c8 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 334bcb649..bbb2ac795 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 ecc6021d2..7d7fe3099 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 8a32fdbbb..e469bd646 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 c654b4759..3ca8331aa 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 289d5b162..6d4111b1f 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 38c494f35..9832d63c7 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 d499d9757..1b30f33b9 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 0e5c36988..8b08930e7 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 0b4009e45..cc1cc527b 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 bcd351b0c..dcf55eaa8 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 5191c4e80..1326f2f01 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 36ca026fa..d48c394d4 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 91aafeb09..509c3a3d8 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 be06cdd05..bc46603bb 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 e5e2556cb..82bb249f8 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 68e5a54b7..199e1db27 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 f9b3b5756..5371dfd54 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 a3fa70ade..eaaa43b10 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 038f25970..b66b3a903 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 24b161859..ebca576c3 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 d76cf5e96..b73b69b59 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 438b3d1e4..8f46f975f 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 60e531727..be97174da 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 ab77a5081..62a309935 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 27be33007..7403cc806 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 62de739df..04ab83858 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 ec94cc912..4d6a8fc2e 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 97cad7205..21fe6bd19 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 9e033eb51..b3105e018 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 2a35144e2..5fd120151 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 1a92fd426..0cfba9a11 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 8e815a625..99a5254e6 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 f9f48a280..c1de0cc1e 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 ac8fc0e99..b310f3452 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 817dc24df..3d6b01ad2 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 b4dcf8f83..0f7f383b0 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 38836db06..7b34e7513 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 a00f8ee6f..45526ffd5 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 e55811a13..86d435671 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 5bac047bd..e6e92f639 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 14ecd7508..52cab7ef3 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 4bf264294..79ff092d9 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 f887751a8..84f988896 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 52013f499..71548a69b 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 f16dd6395..0ea66292a 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 8180c8e18..e9439ca45 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 d611dc52e..e40f6744e 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 0438f4515..2c75cf0ed 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 4b64297d0..87499e78f 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 81ad26eaf..a491f2839 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 differindex be22d551b..2fde56631 100644 --- a/ppd/hpcups/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz +++ 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 23dda58a9..aa6e3e7f8 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 35590d1c4..e26f77480 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 440e1959d..0eac5de9b 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 7d44cb51e..32875d9ec 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 d88781df2..6faac7ab2 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 4b919f542..e988abe5d 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 5e6028c66..c01092dcb 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 94e2ba607..363b5f8c3 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 aa8843c92..5d5641356 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 fc845a852..3afe4bb39 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 620654c9f..24d1a0c65 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 85e554fec..f5de8324b 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 ebc811d62..f46a56968 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 ea6d483df..17456b7fb 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 d79adffcc..0d5c1d180 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 415a1a473..cd2ab64bf 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 54e2a0d79..d17b9c247 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 8c889cb92..884d056b0 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 67a30194c..939a21666 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 3bfa0e79a..a906ab85c 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 differindex a9973636c..8e97020c1 100644 --- a/ppd/hpcups/hp-color_laserjet_cp5520_series-pcl3.ppd.gz +++ 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 e31e9941e..681ef9ecf 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 ce9d6fe18..2fa3d6b02 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 c3b67024a..937c7d161 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 f941d334a..cd0d83515 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 8de6f312b..639a9e8e2 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 a2fcd8f85..79357e2ef 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 8f2231e02..795a809e6 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 f950e3692..a3ce464f3 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 129d42570..eef237831 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 671744d9c..f405a77ba 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 e341cd8be..6e9f0b374 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 739122412..5f75f5a23 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 e03081ab4..01307fc5d 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 0302ae88d..2a81d1eea 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 f8aab5284..d747b4957 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 98f87ffc2..514bd167c 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 ba545d920..29613887e 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_3050a_j611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz Binary files differindex c14e38cd8..7329aa1f0 100644 --- a/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3050a_j611_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz Binary files differindex 4bdee11ef..b22f30fff 100644 --- a/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3070_b611_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3320.ppd.gz b/ppd/hpcups/hp-deskjet_3320.ppd.gz Binary files differindex 3f2dd4fec..907b86b7e 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 4406f74c5..1e4b04f04 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 3508ff26d..35aca536b 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 ec27f1882..6bbf86849 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 468c0f493..3c9822ccb 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 8a39dd711..91a60ab17 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 fd0ca2c39..f44597840 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 dd45d9491..5df9489c7 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 26c9d1b52..27a899237 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 7578f2de6..6cb6c1925 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 d36c54430..95e39cb4c 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 037f2ca37..8d6e66f38 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 79f486d4b..c4d6807a8 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 8c42dea16..cfaff701e 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 d89ab97f6..ce40596ad 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 6b119a49c..e927241aa 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 1e2576220..8bb2867f4 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 9a98dfd66..61d684836 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 50b82c0bc..6adb82aa8 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 8aa55f35a..0b2e6a4f8 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 9a09f6eba..62f7e9f1d 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 34e8f32f1..9df73a1a5 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 6baaf422a..ca47bf2e0 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 7ab0c2207..cb3a0f249 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 9574b818f..8b574a63c 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 18178c7a5..507a8dad0 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 a5d640b30..bfe596bf4 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 67df8802d..e9cf60409 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 144335294..29855bf01 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 71f3d214a..8bd7b6c92 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 38611d300..baf8d47ca 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 889d6a6e8..6d74a6398 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 24df70cd7..1b67a32f1 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 ec19c1559..bbab48dc4 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 7a771c765..8fc7e55d3 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 00a6bca94..ea1f1bd97 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 07f50cb88..379b9f9ad 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 3c9b5ed46..4617696e6 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 b7285d4c0..99930f91c 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 2e4a65b08..176a503f4 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 8f11874f6..fe36458f8 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 aa95a1e22..584d352bc 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 2b52316fd..e024bb536 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 daecc5da7..48a7928d8 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 c161b1254..2065692b1 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 f8fe44e62..e5d971232 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 a91ef5f33..f7b942e39 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 6fe6a4fca..d02902a0c 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 27aa952ba..1946f8312 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 7f072f85a..9f59de09a 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 729f7a852..678dd5537 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 c63c66526..e0173e9d9 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 e7d0fa81b..e6a125ad0 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 c59f1970d..205d4bf71 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 f7e53d21d..4c544600b 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 8c3c83550..53a142eb0 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 a01a6c082..ff787927e 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 4343e203b..9b2c52ba6 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 8f09949e0..4d47d3656 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 b477ea37a..ec87ab1a3 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 9318481db..314931d7d 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 7a427106f..f0c4c1fb4 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 26d8f3afc..c4823333e 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 297aaa190..080c2752e 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 e0882df94..bff9f4746 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 433a8607d..fe859ff38 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 582d599a4..13d34476d 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 7718ce43d..10575b722 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 6d723e93c..df2b3249f 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 c4539871e..eed88c69a 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 d3a578ddf..e5ebd3632 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 be7528c5c..c03eaae50 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 a29878a24..e157b6976 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 349d0e0ad..7f0df103c 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 2d9d41c45..a99c60d09 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 489da23fb..77b848a36 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 b7fb439bf..c611811a1 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 57d56df84..f44698c00 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 0e641665f..9d29193e6 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 f6a224c21..1c623ef27 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 9be3292ce..c77208182 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 6f6bbc84e..5cff1772e 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 c40b40dea..6c3d03812 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 bed8fa6e4..5471a145a 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 d87f2bdbe..33567852b 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 e26171548..a69f45dc4 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 a13a9c8f8..85740b471 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 6e42d140e..a4e49b902 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 483b741fa..7b0f71c3a 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 e0f548462..3680570e2 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 77f90b94f..c811cb588 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 7281648cc..7920ca77b 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 c888b1b5c..3e7e05ee2 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 e880f244e..9a6a0ba72 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 ed82a95f5..73f3b91d2 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 e552822cf..7b4d84b2f 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 021a9ced4..23cc87210 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 cab288cdd..3be82ffd6 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 4c1e6cfb1..9858596d4 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 14bb34bfb..7874ccb5d 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 f5d529339..87b9c1e60 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 217f00f0a..362441af6 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 cf5822e39..eaa6e6909 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 9a50ba9e3..0934f6928 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 93f64540f..dda53fc18 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 57c4a38ce..16b28aac3 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 0f11c7db5..8fb9abf33 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 14499cef9..944c22c24 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 2d850bbad..d98887b67 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 12afa2f48..d51c4b091 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 823c502b5..3b5140cd0 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 17afa437f..80086ff17 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 5755892e6..c2816743c 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 32d976158..7b3ddb90c 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 482b44faa..9853a0f30 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 a8b903d6b..9ae906f14 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 5a1d0733d..7552c7248 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 1150c46b3..1633ef8d4 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 b42298017..1f25ed909 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 5d81075bd..9ee903942 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 fd8a1fa01..6112a37a3 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 e185c2d93..e94f0e4c1 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 e54a9df99..c7eab224b 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 882db2569..7d6c73ddc 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 300ed8175..314ea075e 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 07dd8ca1d..ea0493339 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 a1259c842..c4464c25f 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 1c77b8715..61949be01 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 452d563be..ed4b2c7b3 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 8769fdb07..d3a7d1a5a 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 1dd3aeb40..be596fe38 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 71d765130..2de89d86f 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 1df710471..b7c9c4a23 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 6b5d00b01..551c54e63 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 203e80dba..2adaaa93c 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 e3c648461..c4569e705 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 d6b6c86d9..8b5c5002c 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 125b32391..03d93b986 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 c8b049a9a..caa99cdc2 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 db4ce3174..3a0a03dd4 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 differindex 1d254ab43..05a5e22a2 100644 --- a/ppd/hpcups/hp-deskjet_ink_adv_2010_k010.ppd.gz +++ 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 differindex 11febd1cc..0f1ad4785 100644 --- a/ppd/hpcups/hp-deskjet_ink_adv_2060_k110.ppd.gz +++ 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 55f8d5fe3..3866b2071 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 0ba7c0db1..33421bf29 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 0e07e9ab7..6b5fb128d 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 2664077bb..7c11f61ca 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 7f1b29f30..9a69717c6 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-envy_110_series.ppd.gz b/ppd/hpcups/hp-envy_110_series.ppd.gz Binary files differindex 651cb5b31..b928aab0d 100644 --- a/ppd/hpcups/hp-envy_110_series.ppd.gz +++ b/ppd/hpcups/hp-envy_110_series.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz Binary files differindex 1ca3286f0..c367998e5 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 4d74103bb..1896c82a6 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 4bad39008..26052de41 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 7337bd71e..514f2d2f3 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 e4861881c..318243a4b 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 a4cccdf3e..78d49d997 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 9d31fb555..4d396a813 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 30dc56ad2..1dc0892b1 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 a5a1eaad1..10a0e13ce 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 5216ed6c4..06598c647 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 b7a36e0c8..68f718519 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 b97345f08..691b16261 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 f89681766..f4b2f081e 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 6df7e71df..e5ea5056e 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 29448a073..d7477df47 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 f2e23c5a9..78672c050 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 5c6d63c88..de6c5b210 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 eefeb5d06..188af3523 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 c4a31d799..27595fba8 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 f966a2e49..d9e23c935 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 bc3f2894f..d02396277 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 bce1f0617..7e7a40212 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 f2fd47f6d..615dcf775 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 70c514f39..d7677a040 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 128955117..12c877fb8 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 207739d74..52500a76f 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 29c2031bb..811ca9e81 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 73a8fc7e9..d68d023dd 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 163a0ef37..8dc4527b3 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 3b828e5f2..c0d264f00 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 d54da0649..4241739ad 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 35dcb2019..438bec47f 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 5532e3bc9..cf02e0fc5 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 fa00210f2..6d7701a14 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 38e5a128f..636d08f2e 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 7776096f7..a84b2c4b0 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 f26ec05a8..5e503c785 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 c1a6203d1..a1ce8312e 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 c90864860..9fbd701e8 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 fa73d3482..f6c9dcd1c 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 b81f2d363..c55ba9bc1 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 454ade0f2..87b52a50b 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 4cfddffc2..3fcd87f1a 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 94177db34..1269c68c6 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 24452d232..5df4e6f43 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 66e7d30bd..35c4d346f 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 40a3be8e3..a3c33e55b 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 815f2489e..913046ddb 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 3ddc329e3..7e18db1ad 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 67ad838c5..2428a6613 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 fe0e7fed2..2a6e45364 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 5b4140d6a..a690d6afe 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 33d494d78..fecb343c2 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 630850945..be2c7be29 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 4a7e2053f..2ad50b239 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 553eac562..faebcc46e 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 990943719..c6b9700a5 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 9b374bbe0..c2256e15a 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 6b5199138..1b18be08c 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 acd5b5d59..01394bf71 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 4910a185e..0bdec03cf 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 32c65ec91..5dee001b1 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 a7c1e5d0d..315eb0ba1 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 3026b36a1..4d8341a24 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 9d7b48e12..23538b6a0 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 1aa7377fc..50df61fc1 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 cd10ccc1c..d42a07652 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 b0f017074..91bddeb50 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 e40a1ad73..3587942fe 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 3b79dd0a5..1cb387409 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 5964ec9c0..3232ae643 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 633b14625..4cf1fa5c7 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 3415758df..ce9d5d679 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 2e3fcd0ee..b2137a66b 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 9e9d5a3ba..88fde3b17 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 518f4adc2..b7cb18888 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 8454eee4e..bbf9bdecc 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 366bd2ad0..3d372cf3b 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 150db5f72..f55e7175d 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 3f5a3451a..c44952101 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 1e49cedd6..b6d5f79ee 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 4643067ad..471457256 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 17c135a52..d47d6affd 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 6c45d4995..be4e7fff5 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 231a49c03..2b3da6d2d 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 cfd3d966a..e49c6912c 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 40578c5de..9afa0af70 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 7a9c8a304..a8170d0bc 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 d99e2d997..ed84a3969 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 d571dc445..998f0d331 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 c43aefc65..69bfbb974 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 bcf0fde36..57fcb362c 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 f3fefa0b0..d47d49d7e 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 45f721cf4..0f2b97b78 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 9976eb4cf..7eeb1cbaf 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 d3d547395..945de2162 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 424ca054d..b3c487536 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 937e5e059..ca96a972d 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 559062f2b..f59d0991a 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 1a4f3cb79..c85b3ceb1 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 bc87142b4..d05b74aab 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 differindex 9d7cbdc8e..7bbba381e 100644 --- a/ppd/hpcups/hp-laserjet_cm1411fn-pcl3.ppd.gz +++ 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 differindex c4fa9dfec..2d620a068 100644 --- a/ppd/hpcups/hp-laserjet_cm1412fn-pcl3.ppd.gz +++ 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 differindex 51709e9af..9e122a56e 100644 --- a/ppd/hpcups/hp-laserjet_cm1413fn-pcl3.ppd.gz +++ 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 differindex 4677ad609..168118719 100644 --- a/ppd/hpcups/hp-laserjet_cm1415fn-pcl3.ppd.gz +++ 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 differindex f8a751f19..61745d957 100644 --- a/ppd/hpcups/hp-laserjet_cm1415fnw-pcl3.ppd.gz +++ 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 differindex 47ffa21ec..f6bfbb733 100644 --- a/ppd/hpcups/hp-laserjet_cm1416fnw-pcl3.ppd.gz +++ 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 differindex 703f2c5d1..57570d540 100644 --- a/ppd/hpcups/hp-laserjet_cm1417fnw-pcl3.ppd.gz +++ 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 differindex 36541263c..4761e114f 100644 --- a/ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz +++ 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 differindex 9942b1651..0cf0cc2ba 100644 --- a/ppd/hpcups/hp-laserjet_cp1021.ppd.gz +++ 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 differindex 5ef572def..70918cc3c 100644 --- a/ppd/hpcups/hp-laserjet_cp1022.ppd.gz +++ 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 differindex bd9aa6d28..a53dd4bb2 100644 --- a/ppd/hpcups/hp-laserjet_cp1023.ppd.gz +++ 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 differindex a4e3ac695..89fceb44a 100644 --- a/ppd/hpcups/hp-laserjet_cp1025.ppd.gz +++ 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 differindex 50f3d1cb5..7683cc429 100644 --- a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz b/ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz Binary files differindex 535bbce8b..f1b04daa4 100644 --- a/ppd/hpcups/hp-laserjet_cp1027nw.ppd.gz +++ 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 differindex 23d6ce4c9..66002a7e0 100644 --- a/ppd/hpcups/hp-laserjet_cp1028nw.ppd.gz +++ 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 dbcd51c76..60cd9ec07 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 7ef93fab3..3822bfee0 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 a10cb8a16..05c73f413 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 5f7b1ae39..e39f81dd9 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 89b0d1784..fb08f7dc1 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 differindex ff491fd06..a51d43ba5 100644 --- a/ppd/hpcups/hp-laserjet_m1536dnf_mfp-pcl3.ppd.gz +++ 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 differindex 6f40bbfbd..1c296a367 100644 --- a/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz +++ 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 differindex c16b26c93..544a6598e 100644 --- a/ppd/hpcups/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz +++ 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 differindex ef65dac9f..db594965a 100644 --- a/ppd/hpcups/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz +++ 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 fce326998..b8f4ded96 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 c8a7d7004..63ca9b484 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 724590667..74b552e6a 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 b4420e4a0..8e1bf1c75 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 cacbc7aa1..dd4333f82 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 6a61cefe1..74df25525 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 5a0b09357..af6d3a547 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 6969dc2b2..bfba77a3d 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 aa43982c4..ea52eb276 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 c1022c81d..8d51d049d 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 545158c13..8d3b69923 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 e55c81de9..3d0e1e73a 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 425473c85..103d2e33b 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 4aa29c4a4..2cba98255 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 3cc37f970..64631d4b9 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 04a5026ad..6b7bd2e92 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 1fbfc1d4b..c34962cfc 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 e99fd305a..cb0661989 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 3e0376db7..06efe7c71 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 d8f1134e4..6a3844d62 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 4a95b8a5c..3c52966cd 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 ef68ab9fe..e4778bb9c 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 7a8b81048..2b578e308 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 864b0e38a..905c46a13 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 20da67a7a..5850c8268 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 a7c09a445..c291b3150 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 973637c56..f6fc46601 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 e9a256dc5..b592e3173 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 f1af1f19f..e72c833e2 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 2a941b20b..8619b7b50 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 f55645bba..b4e7452cf 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 3eb04a1cd..3c58526b3 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 af864662f..c7d8d9439 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 d85102730..a6dbcfb19 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 3d1699ad8..57829474c 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 4d0421a2b..0e4cd43a4 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 dbe4ab7b0..d6414c48a 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 e3e2edf82..8bacfc9d0 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 c6fe6ada2..a6974d0be 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 41317607f..2f006f691 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 21faa3cfc..4c5b92aec 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 594c3708d..5f10fca69 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 fb1272532..ab56359b0 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 1f84e6857..e95526f34 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 aefd09c7d..18746cd14 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 1f5662237..866154f42 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 648fbf2d5..6307e39a8 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 db33c0457..358bbb26c 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 3a230b47e..6d18e5c28 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 2fa7db5d1..19a9643f6 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 46e9b9943..8a49b6f6f 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 97b7860fe..b3dbdf0d4 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 73c8d5566..46e07b191 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 1c0ede6f1..81882d3fb 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 3c7512068..194f1c5a3 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 differindex 1ef827925..4735700a8 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1213nf_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz Binary files differindex 6510a2fa9..26a28fbe6 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1214nfh_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz Binary files differindex 8c7c80beb..7a2067709 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1216nfh_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1216nfh_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 8b5aab7af..d2f2b7382 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_m1219nf_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz Binary files differindex 4d7c65d17..4dfa77604 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nf_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nf_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 da39262a1..cbe4befdb 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 55985db72..c12a960a5 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 950c3f6bb..09228a3a4 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 96965b12b..0cbe95d34 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-laserjet_professional_p_1102w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz Binary files differindex 924173f0f..062870140 100644 --- a/ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p_1102w.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 93e367be3..e2c14baf8 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 27572d732..efd9bc01a 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 87e138ed3..74a6f1d82 100644 --- a/ppd/hpcups/hp-officejet.ppd.gz +++ b/ppd/hpcups/hp-officejet.ppd.gz diff --git a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz b/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz Binary files differindex eef6ef970..3fd5b8b82 100644 --- a/ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz +++ b/ppd/hpcups/hp-officejet_100_mobile_l411.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 bf6ed44c4..206641584 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 3c8216a77..89ba16c1d 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 ff17add65..ce810c0fd 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 7b7e8807b..bfe59a127 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 d3314897e..d8e3647df 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 8efad2be1..e0845e02d 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 78ef91561..389eeba25 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 bbcd91c03..5abaaeb0c 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 7b225a3ee..2b4c82e34 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 7d469333e..972839d47 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 5e5ac9a47..520bbb902 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 478d02aff..4ec1ac8c2 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 d41eddd75..da1cb5aa7 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 c30393ffa..f4af18426 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 fe4421e19..3a14c0d69 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 abd8cd61b..c632d393c 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 0ce227e96..933dbac41 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 145547f68..1bbbfc51d 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 ea11e520c..b5a0d1f27 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 b6f63cab0..552a36143 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 ccbd29f41..8cb17cbc8 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 f7d2791b2..0696cadbe 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 976eb4642..2cbf03f0c 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 302ef0d47..9f55d810a 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 abd6a093a..dbc4a1df8 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 5594d2777..8d57cb86e 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 205eda054..0c2ce2ac5 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 3fa92042d..933a7db85 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 39c82e189..4ecf58e2f 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 9dafdbf2a..180b3a076 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 43b5f7e70..b692dbb30 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 4c9172268..97dbcef66 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 0d4b5b73e..fb2ad610e 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 2c12eb6ee..a9a4bdec7 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 0a6d957a1..175489f3b 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 39e9ed1c7..2fbc76d74 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 89b326bf0..9cb3bff5d 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 a060acfb1..29cd29bcb 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 7697574aa..a72f58056 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 325370383..b6b7fdd3a 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 919c9053f..fbf83408b 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 d5a4f0c03..9997163f6 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 c5b113503..0370e8424 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 e20323ee2..2a73d566f 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 1d290f3a1..fad97d25e 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 029e0cd71..6a4a6be8e 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 0b6a67b0c..df1b8f3f2 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 be601617e..e63abf781 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 1246cbb7e..52b900f3e 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 a49f12e92..781e148b1 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 90373759e..8feedac39 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 f2d31224f..a909b42f3 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 397b368be..564e95e77 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 cc267d846..fc7046d69 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 4d7494855..9ef450c59 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 9fe487aab..9ac28f79a 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 ff5563923..66c33afed 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 b78d79590..1e7371e27 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 a6ff95516..159dc516e 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 c448139d6..258f9af54 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_8100.ppd.gz b/ppd/hpcups/hp-officejet_pro_8100.ppd.gz Binary files differindex 58f6d2dcb..6b1412b1f 100644 --- a/ppd/hpcups/hp-officejet_pro_8100.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8100.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 adcc7f2b8..7680e5758 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 6ec716929..574b1508e 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 582ce432b..12ac955a7 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 0e02c8067..1793bcf9c 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_8600.ppd.gz b/ppd/hpcups/hp-officejet_pro_8600.ppd.gz Binary files differindex 4be1b1903..b0acfd66f 100644 --- a/ppd/hpcups/hp-officejet_pro_8600.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8600.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 ef4abb32c..333c122ab 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 7a85fe800..c0f21a7bc 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 68da1d18c..73b612f4b 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 337a9f9d8..832686753 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 bdb65e947..d9ac87aee 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 6847fcd45..00b9a41e0 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 a18203801..974526b4e 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 b8e004636..1b2ee298c 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 96daadfec..3de32c970 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 a524bb8e3..6296f2e34 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 cc84c7d7b..ff8efb085 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 e8a223c96..c33f3eada 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 8c8eed5db..7b0fdcf8c 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 51fc4704a..57494d1f4 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 fc5a6ce76..a03823aec 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 23b151a53..0856f1a4f 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 34c94cfbb..14bd94e32 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 a06029e60..3708ebdb2 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 d37711a50..c62d04f29 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 de4387700..980019f33 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 a5dac0c80..93760052b 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 cd6149fe5..2c1adf44b 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 08442c755..5fe43a79a 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 d716ccf76..c438ee9f8 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 55d9ac6d3..8baa20ffe 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 448a76c12..3073ac8f7 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 35e280e19..010b474a3 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 6ad72684f..904fd163f 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 674f5a420..9763ff581 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 182c7a3fc..89202aa02 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 83dee1bc3..fd7cbc10c 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 c4d934679..2c5a437f5 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 b891b7da1..92feb331e 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 053c2227b..886fcf9b7 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 6500b4e7a..38670775f 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 5ec3d259c..6019939d4 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 dfc6b76f2..cbf0e946a 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 dd2b0e723..b16463db3 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 7c300b746..8a1104c54 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 35fbb95ce..3d3086353 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 0c5209dad..391fc4c10 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 e2f53f7cf..8a68cca6d 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 cdb5bc9e8..041223db5 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 5257c23b7..0a5ae2bd2 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 59534c90e..6527933ff 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 9ce161016..c9af26491 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 f1ccf1258..eb85ef46b 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 d99f67df9..0790f93eb 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 0bdf179e7..0618c0841 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 944b1d116..b1dc13e21 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 0c866a130..3610254b2 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 5878ca999..f6320f231 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 84def9f4d..213e828f7 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 983b1818b..37ff60026 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 879468c86..d44184b19 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 b9b12d4e7..a8d15e1de 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 868f6c83e..05326b271 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 e7b3cb077..be2f141bf 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 f0624addb..44e1d6d19 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 22c5d8d0e..5af34360d 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_5510_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz Binary files differindex 32cbb073a..1bc61ea31 100644 --- a/ppd/hpcups/hp-photosmart_5510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz Binary files differnew file mode 100644 index 000000000..57f535457 --- /dev/null +++ b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz Binary files differindex b93ebd17c..f43239927 100644 --- a/ppd/hpcups/hp-photosmart_6510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_6510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7150.ppd.gz b/ppd/hpcups/hp-photosmart_7150.ppd.gz Binary files differindex 4f87dd371..f62c294fa 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 e8619a614..b05b5936b 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 ffcd0fcd5..05ce63a2d 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 f85aa68e0..4032c108b 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 eb1035f51..86c9ad8a4 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_7510_series.ppd.gz b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz Binary files differindex a2355294f..128c39a22 100644 --- a/ppd/hpcups/hp-photosmart_7510_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7510_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7550.ppd.gz b/ppd/hpcups/hp-photosmart_7550.ppd.gz Binary files differindex 8fd04c85f..b4eceb11d 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 8beeb8f0e..1a165c50d 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 57429a712..acafe354f 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 b6d5793c1..fb44bbdb8 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 e6bfec6a2..b4db9bb44 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 437385e62..e92a4f167 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 b99973c6d..75d08572b 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 9d157a013..0075926ff 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 02ef34503..7eb65f1b9 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 30b7431f1..ccf2405d5 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 676f35d9f..1b90c25ce 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 f24d03f39..8b7be4de9 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 cb7a44441..0af18bf28 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 aa9324f2c..45f0ceaa1 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 fa51fb632..2c1b97e6b 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 837a03c70..a875159e9 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 be6de33be..32aa1eedf 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 70d4a4993..085f5581b 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 a03b7e17a..402b0bd40 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 628dd182b..5e6c20ae3 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 72eee0b65..9de7fa8c1 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 b8c34fe35..5c348ac63 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 48f375171..38c3ada2b 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 febf12209..983585f1c 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 f36e4a3bb..aad07b4cd 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 8c8c6ab92..c25e5bd89 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 4fc9b04d8..0a1b4ecd5 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 17492a30f..ea9fa227c 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 7ef1903d7..57299bc10 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 c8bfc6dce..02b3e5352 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 f636cdeac..4755c7ca4 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 a2f4d2d63..a827d5104 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 d74cf22d9..cce72263d 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 8c7be2299..9cb8de691 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 992372a25..0b0206b3c 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 b6c24049a..5c1c2cee0 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 587c82d84..c9f3ee33c 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 f1b4aa7df..83823c7fa 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 f5351624f..4289e6086 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 65a0abce3..02f8ffa22 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 85f92fa02..3ba266035 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 5d4e74cc9..87fe5b484 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 6158a2726..d63b9d843 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 8be9465b4..cbd1e763b 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 7849507b7..f76483954 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 5e5e5e19c..177a5be50 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 67ac62fc0..0cbda155e 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 c7b079c33..03cd90c94 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 6442d7e9a..5aefa13a7 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 7aebb40a6..84c33922d 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 fe1871f1d..32da330e6 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 97bf0a28d..683b42f66 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 741fbd11c..1ec5b85a0 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 709e427d9..ccc81a1f1 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 41aadde77..92c59fc57 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 fae925233..97014e9d1 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 3c9b8c04d..e2dfb075a 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 1c59597c5..c3da63a93 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 a5c161aec..bb192c566 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 22446d5e1..3e64b889e 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 differindex c8617509e..e999cf820 100644 --- a/ppd/hpcups/hp-photosmart_ink_adv_k510.ppd.gz +++ 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 590ab0337..47c35c2b1 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 aad933de2..1090ecd0c 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 2735fa123..12cef8d3e 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 c6a6fb43a..174e39859 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 0432f6d48..445e090a7 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 db56fb87a..98649484e 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 bd09612da..3229343a7 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 d0897496e..4410f8d1d 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 b6b52690f..b6836db9b 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 15108c53d..f33504cf5 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 07d70c5a0..4173cfec5 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 0acc66e4f..e6aaf6185 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 08b7fb581..49c09b69a 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 3119886b9..aadf68e8b 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 9ce8c9425..fc38462bb 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 7f6cc9384..cc0be3ef4 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 a00e29eca..287c09e7d 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 8333e308e..17dddae12 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 526bc40b2..fd75102e4 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 eaaae732c..122eccf22 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 fa7b502e0..7a011bc76 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 d23c40b7b..66177aaed 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 9ddd1858f..3f95b2980 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 2def2eafe..644b59104 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 b8c969add..8e875ef1a 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 5cfab627e..15d32bccb 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 4713ebe6b..52b637d1b 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 41f789e3e..e921cac98 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 7d5f9f524..a5445c82f 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 9cb0458af..344e38c55 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 726c80566..5dad1a93e 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 ca3006e38..b3dd03b71 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 f8ea01859..a84e7398e 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 cd7a50cc2..490b53e0a 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 fee619d01..28229a925 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 7ec6c0769..05d1c6e7d 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 ca3585d50..076cafb07 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 8aa595c1c..3c447e0a8 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 899ccc139..91445322d 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 e20c17a67..b08dc34c6 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 2ccc0053d..26b14d497 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 9bbbef8b0..9b0ac524e 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 0ef6049bc..7639c8a71 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 3d6944135..a32b2af5b 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 a7f80018d..591bef22c 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 2220540b2..a66ed3379 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 e8b78236d..d1f5dd7c2 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 cdfb9745d..3a1145113 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 a0fc710d6..5cc76bf4a 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 8b371c34f..86a950a2b 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 8d7a390fe..7887d0a36 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 5b5b43f3c..c2545c674 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 13372c888..16d8118ad 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 db22380bc..728d558f8 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 e1fd4702b..959e27026 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 817678064..f6a3e64ee 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 37490c46a..299f0e070 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 3e065ae9b..faa556c6a 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 c2b805943..b1a96439d 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 36dbc601e..bd1df2887 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 a256a3fa8..94a6a051a 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 26487c26e..76cae5ed7 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 5570d4932..e56cb8c02 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 5ea22cb3b..c5ca4953e 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 4f05570af..b7a2eb05d 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 d6538a444..7957a2cfd 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 dc8c013fa..b9f1e47c9 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 e7a7ee921..4c2553551 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 a9fecbc23..95c87d042 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 6d6dafcea..d49683598 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 61f0e0e14..a4ae0603c 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 b47533ea8..8dfdc9638 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 43a760f29..125e57816 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 b9b187870..b64db0854 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 5bfa644d4..d60351228 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 e8374b10a..6658a2daa 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 a44ffce2e..29cbd0e8e 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 3d9e7b366..0cf5c2d60 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 9f44c83b5..c5d80998c 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 e8af53215..1d33756b2 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 a1824ebdc..7f39719da 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 6662d7443..651d0b58c 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 376990278..05e2faa85 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 7623fb54f..0d7470c32 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 1ce2674db..b8f1cef88 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 f54d3d17f..369102e6d 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 6599126ac..3708632c5 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 7d7d631b7..6661dda1c 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 f408af434..a5607f65d 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 7e2b48ee3..2c45ca464 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 c9501223e..ba17740d8 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 45e126423..73dc4e826 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 e3cd681c8..e306dad5b 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 15f1fc2a7..419bcafaa 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 6e8fc6746..a1c6ccf20 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 ad1782b18..15e504150 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 differindex b64b0bcd4..63589d456 100644 --- a/ppd/hpijs/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz +++ 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 b15d93354..f229a2997 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 062ac7fe3..fbbbc596a 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 21311984c..8d471bcce 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 33eb30652..64305f58c 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 657b8ac64..7e7d844dc 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 b3b942b8e..8179fcce1 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 3866e461d..b30227db0 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 c2afa3ac3..2f13f1171 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 75fd91993..8528bd13d 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 135b0a85a..99d116447 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 17dad3933..5c8199497 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 b2d590840..618e31811 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 99df376b1..f416ae75e 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 579d33594..2c9d9b793 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 7268d7818..b36dca8f4 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 56d16d923..5d84a842e 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 2331ede44..2355f1ec6 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 18c19d3dc..e0394c2ea 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 4cff79f2c..1e9ac5345 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 5fef04bf1..433e7df2f 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 differindex b52685289..589df2385 100644 --- a/ppd/hpijs/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz +++ 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 d3d09cd24..b034facaf 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 8fb2af425..9ffd02d30 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 9e22182b6..f4790956a 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 438365e44..768a0f0bb 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 f75c78f38..e479d9988 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 32a80450e..72c6c631a 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 ef19b9fc5..5fab67164 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 07535823b..e0bcb55a7 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 8c9ba31a8..21274af6d 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 1fd793243..91728d44a 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 655a294b5..563394dbb 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 3e29329d9..50907d0ba 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 cf703d225..2714d414b 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 69872cefd..db9c6701b 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 c03c9ccdc..75b8e27d8 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 1eaa592c1..c4599fea6 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 e7810429c..2080a9c5f 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_3050a_j611_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz Binary files differindex 2312d7bff..cbd394e12 100644 --- a/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3050a_j611_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz b/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz Binary files differindex 1c5310126..c20a578f6 100644 --- a/ppd/hpijs/hp-deskjet_3070_b611_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-deskjet_3070_b611_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 e6592a9ed..87bd5fb71 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 d7aa7120e..4d06f803b 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 a0a985b97..bf06f09ed 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 2df105856..d2509e565 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 a19160c30..daaecc195 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 d04d8e557..90143a333 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 956f79c99..ddabade19 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 6a84f48bc..1d607190c 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 494334e25..a9d870196 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 e6d86ad11..9e65d75a1 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 e84a503a0..94322f01b 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 8283fde50..87e044620 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 03fcae973..e5fe948e3 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 5cd90b2fd..fd79c68ee 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 0ec3eaa90..191577791 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 75733da76..163ba2136 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 3b65391ee..6447c3700 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 516a1c4e3..6d561fd54 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 8cd500323..d581e5cd0 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 954651ec5..cea169822 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 ccef2126c..cc908f029 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 d74f803d4..3d3b7fc9d 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 cac7bcbe6..2a2946542 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 78fe2fdfc..d2029fc23 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 c7d6041f9..5947ecae6 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 94d763c79..399fee26d 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 e58cd9b50..d975a19a2 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 589fd1ebc..803c5108c 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 ae94a4267..6e07101cd 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 25c45db3d..1604d75f5 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 3f8197a90..90391be0a 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 3a9530391..c0d7da0ee 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 a95907a7e..1f80cc196 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 d1e41515f..0bf01e46c 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 fd6277061..8a7715500 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 9a81903ea..1e688a94a 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 52a6548b0..4870f67fe 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 a27b1be5e..4d6ddead5 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 5f29e1ee0..0e1f7d02e 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 1dec5ee5b..cf41a7784 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 46c3745f5..5c39b6667 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 a0c77ef9b..f85e73206 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 09b8eb761..4394fdc5e 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 0a6a6d898..ef29bbb07 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 eda7e25be..4281e1415 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 7fe987176..8c7d2c129 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 3c9563ef4..812d6f37a 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 3a4007761..7acb2262a 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 a9a3fd521..5a6629cf8 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 0b19bd4fc..ef8ad9d3f 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 c2fe21e04..ab2508181 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 fff43e3de..ee4372c15 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 69f82b056..eaa655436 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 5027a3ba4..2d049e5cc 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 41e8e5638..77ec34186 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 1b23de0d5..ca8984532 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 6068ac8f6..b903d94e1 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 6c6a24872..ccf4be7df 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 35567fb62..165a83e46 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 d8131ea01..47f9a8ba7 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 7c21afe59..0164f35fc 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 210b74403..6d21c5ac8 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 c396fc117..7a5c48a08 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 b80956663..f3228cb16 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 43993ebf3..b6fe3bde7 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 c422690b6..8dd9a0776 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 330f4fcf9..667f1d583 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 deac87c06..fd9c62f34 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 9cad5cda3..11a427243 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 c5ba56bee..e619884c4 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 79795a3c8..af73ecdb6 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 4c642a5a4..d2c7db850 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 afe0114d0..eff32eb1a 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 584c5ce0c..aae3a8534 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 9fb589902..da049b016 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 86bedaa65..7ff9887a6 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 3bd73873e..c91ba0e4e 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 7762eb958..da52df9fe 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 915665d1b..fbe7d3060 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 7442bd505..f1bd672d7 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 20eeaf63a..c0f09e988 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 1066e923b..e22dfeb60 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 86bc14f2a..320ee1230 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 a760a0a2c..a4f452463 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 4db38980f..8a235e946 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 9fa8e26a4..29047b613 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 69c517c78..a40017172 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 cf89694b2..b9a956001 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 2247e5fd0..3f3e83008 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 2eeebcfc5..23a1b5e9a 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 87980ac5b..7fe2d5f3e 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 5cf8ee450..5c570536e 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 48df86e96..1614f710d 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 63e660448..8be26b49f 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 6e2842d4a..129f6c7da 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 1a3af94aa..453228f41 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 7f910284f..2f4fc110a 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 459997b5a..01f3c7e94 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 287e7e676..68eae382b 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 1a20f6e89..8adfc0c7f 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 9dad104d9..7e20255d8 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 2a2ca462d..ea53cd72f 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 02de0c432..afa85d9f7 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 7b8b04ac9..7bf7ae44e 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 12851e21f..1c5277372 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 5d0a2b4a2..0da60f7ff 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 69f8fab1e..a645d2ba9 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 bd31bad21..7ce38d3c4 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 d661ef59b..44bb88112 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 1f5d57c75..dd712af12 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 1d2eb963c..695511672 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 cdd9c1f4b..25bd530e9 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 02c966783..f47115735 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 da83a2f15..a64f75f84 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 31c79347c..f2836aacf 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 2a2aaeeeb..96843ba1f 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 7f15b4665..c8e8144a4 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 b6f8d8efe..e0a3239a1 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 e7336c711..e48e32e67 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 a9f5e9fe1..b75c5a5fd 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 170b3e33b..d5f7919d6 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 27d00d06c..d3b1124d3 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 f94aa8a47..16647a370 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 d258ad87b..53bb5a7aa 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 3425beb5f..9af6877ab 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 9c5b92a9c..1b9883cec 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 25aadae27..420325c1c 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 68be53d46..90414a464 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 2f0bcf461..20447e363 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 08352c070..4850a53c9 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 f325b3cc7..8fe77879a 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 4d320dbbb..e715e7bea 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 2bda305b4..4bf41ca20 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 ebb668df5..50073ea33 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 6d5a16711..d663a34dc 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 d409d6ec8..93b798014 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 3feb7fe92..a2b7edba5 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 a12378aca..0652eee06 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 41dd7e57c..4827f3a78 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 8f9079e8a..896c82636 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 differindex 9cfa5c853..8fe1dbc8b 100644 --- a/ppd/hpijs/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz +++ 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 differindex c94b15644..0ea5d4090 100644 --- a/ppd/hpijs/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz +++ 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 57c42a327..a71afb3d2 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 17e58be3d..7717bfc23 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 c67b0dd75..f6c176227 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 566501c58..cdfc2b14c 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 24880456b..9e4a8f23b 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-envy_110_series-hpijs.ppd.gz b/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz Binary files differindex 849417deb..e8ff24a2f 100644 --- a/ppd/hpijs/hp-envy_110_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-envy_110_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 2c60db071..ba08b536b 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 cd988ac49..785969de3 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 2da1c077e..8e3bed276 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 007ec381a..4698880cc 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 8f2a03784..c800a9f0e 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 a0f82d29e..3789e03a8 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 0d4d99181..551796d9e 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 6fbf76dc1..61c17e55b 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 3c9fadb85..7213ff955 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 c6ece8b74..fb889f41e 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 6838ce638..794f0b6eb 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 f925bfdf8..8053cf0f0 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 285c522f4..89724a518 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 220b9f7af..c144bbd7b 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 156fe6bf0..08c7fb0d7 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 71030da8d..ed4a0b132 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 bd2432b08..f7b714a31 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 e19ca7dbc..9bb7dfe2d 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 bfc878773..6364e889e 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 c4411be39..003e826a4 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 583ed9c01..43aa8acf0 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 e34b04ed5..9e542c95f 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 8fdd1c501..3a34367f6 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 9e4825ce1..fecaf50fe 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 6cae7af21..b897bdfdb 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 08a14fc9d..85c2dc957 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 a4b74a538..9ce2eb020 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 11d66bbfd..596fc1e1c 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 0f57c53d6..b1289e779 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 bc947d91b..060713d19 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 42038f6e8..a3a2403d4 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 ff64d2dc8..90184e4b2 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 d86d2a985..cf0484c12 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 e2a7eafe7..c26a58338 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 58d9f0545..b6db212fe 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 046f5de1d..9ba9adb2d 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 69795a61c..c733856db 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 a9402031b..8e1cc4d6a 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 cbf23704c..d23c26c1f 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 64852ddd2..ea9d6d0e2 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 24656aef8..1ea6fbf55 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 11cf1d4cc..f6116d198 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 d6b33988f..8eb9ee5b3 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 497e1b6f3..63a77b23c 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 1715345b1..b26240e26 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 2001f2fe0..3e7250f48 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 2a9224839..d856c052a 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 a997d56b0..96fc03a25 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 8667147bb..bf9e6acf3 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 424edef2a..b88da952c 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 895543043..c01cfe017 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 df6d1c88f..ba1c22a62 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 3bf176f7e..9b41a9a17 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 cde80980b..61179758f 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 e5a536bcf..fa246c802 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 bddec99ff..ddf3cb1e3 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 79ef0f5bf..1bf80671f 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 c530ebd5f..8bdc2a678 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 d839c80da..d343ea782 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 a7ed025e4..3d6c21c8a 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 220d638d7..4062262d9 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 3ce2d1043..428492744 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 61a9b920f..303f04288 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 31f445a47..10e002a5f 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 59117639b..0aa34c1e1 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 6244fb6fb..e56adf68c 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 d3ba09f31..099ccda13 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 bfe543c6b..df6f19f0c 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 dd86518db..5ba04aa51 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 44ca2973c..ac3542343 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 142df4817..97da12bbf 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 dad716088..a462cb288 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 18531f5d6..bb71fe22c 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 58a5bfedc..b1fae4780 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 fac9a406c..e6b1c6330 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 3078b6968..43d778f8b 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 0104b80b6..139f83c7f 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 b4b36d2c0..829684c13 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 06ac72292..d455cddfd 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 34573aa55..c8e01739e 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 6d38a0211..85a39d022 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 98369e519..d0d14bcd2 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 3b3c6a9cd..d09ae7646 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 52474afb0..82a5e8cb4 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 4cb648b78..78265d2f1 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 bc3d74f7b..f6e1305d6 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 5da033061..2403b0ee3 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 e0b45150f..e3a8dbb7e 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 76d016f9e..bfae9820e 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 5e3307674..f3b5cb755 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 8901b3686..d58d49281 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 feb276c27..d24e9f1a9 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 74fc73ac1..4479010ad 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 beeb7fefb..51f97e98f 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 1bf71c3a8..9a4f3ff12 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 b48b6dba2..e183411fd 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 fe1ecd192..52f70c41f 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 e768f8d33..dec8b3971 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 cc7c4adb5..8816e2866 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 d3d589a9f..f8d833b20 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 ca99db0c5..07becf7c3 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 differindex b0753a46d..cec2d815c 100644 --- a/ppd/hpijs/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz +++ 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 differindex 6f74f187d..ae92d4515 100644 --- a/ppd/hpijs/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz +++ 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 differindex ca149f692..958695e9d 100644 --- a/ppd/hpijs/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz +++ 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 differindex 94a29e144..77dbdc56d 100644 --- a/ppd/hpijs/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz +++ 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 differindex 41b0ea69f..32f9851f1 100644 --- a/ppd/hpijs/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz +++ 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 differindex f9d07060c..7ffe836f7 100644 --- a/ppd/hpijs/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz +++ 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 differindex 4a1d02bd0..2fdefdffc 100644 --- a/ppd/hpijs/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz +++ 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 differindex bda2c4024..b481e26d2 100644 --- a/ppd/hpijs/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz +++ 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 differindex 0395db05e..464a27901 100644 --- a/ppd/hpijs/hp-laserjet_cp1021-hpijs.ppd.gz +++ 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 differindex 12db6744a..8f8e9237d 100644 --- a/ppd/hpijs/hp-laserjet_cp1022-hpijs.ppd.gz +++ 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 differindex fbe734474..d396b6ca0 100644 --- a/ppd/hpijs/hp-laserjet_cp1023-hpijs.ppd.gz +++ 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 differindex 15654501d..cbb2b14db 100644 --- a/ppd/hpijs/hp-laserjet_cp1025-hpijs.ppd.gz +++ 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 differindex d7a89d328..d8b5306df 100644 --- a/ppd/hpijs/hp-laserjet_cp1025nw-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_cp1025nw-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 differindex 2cf8c1d57..5ceda24cc 100644 --- a/ppd/hpijs/hp-laserjet_cp1027nw-hpijs.ppd.gz +++ 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 differindex 1d7fe1eda..a53f2fca0 100644 --- a/ppd/hpijs/hp-laserjet_cp1028nw-hpijs.ppd.gz +++ 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 fd03e94eb..753f4313f 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 7f24da978..01bf57799 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 b78194a71..24cdb1bc0 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 2f029f886..28f625769 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 321fb0cfe..cc2bc14db 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 differindex 4a8095466..6c85a3e18 100644 --- a/ppd/hpijs/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz +++ 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 differindex 5d4650ab5..a9ed732dc 100644 --- a/ppd/hpijs/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz +++ 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 differindex 7e90985e0..7b3b3d956 100644 --- a/ppd/hpijs/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz +++ 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 differindex fa24e7808..6ba9b2693 100644 --- a/ppd/hpijs/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz +++ 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 64211dec2..a2f4ea5be 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 6e0110ec7..5bfb6e234 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 0fc0f009e..3b61797bc 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 7dddf8bf2..4af29843a 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 658173d4d..7c0c918c1 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 d47b5b958..0fc8eeb5d 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 d0d08426a..cda601283 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 458601f8f..4a1698e56 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 c925ce9ee..4444daed6 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 9954cfdaa..f247afadf 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 507e565b1..85507ad82 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 d16680b9a..e7a36057d 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 a1d99d2c9..fe5a1e9ae 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 7ab2728b3..293a809a1 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 db9ff3424..fcbfbe531 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 10d3d66ac..c37c6c7f9 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 de5bb808b..40fcec13e 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 5bb4861c4..55c837627 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 41f802e0b..192bdce40 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 04b65a6f6..d9a5cbccc 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 40ef94e24..1ec693d8f 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 eb9f6af2f..fb5e9ee11 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 51ce30404..17093a51b 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 ee34b3159..da4abfcf4 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 838004a5e..d1428597c 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 070b733c3..d30f12402 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 52e7bd9f6..19047216e 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 dbeeb60ae..d535d95f4 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 2540b481c..25cc796ba 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 7e720d8cf..64e3a8fc4 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 bdd76150e..2d9bc1d56 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 9c3c0ca70..3577a4b84 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 f39a3617c..0acdb42c5 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 3e2ebf3e9..d693f2d69 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 fe9d2ec62..d51bc9e4d 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 d58ea92c8..d463d84b8 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 cb281e4ee..5a93d0bff 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 5606707a0..a4341346b 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 4ec33a8dd..b2537b2f7 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 2c5d1bc01..04a26034a 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 3e830ecff..7c644a41e 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 2d16ef4f7..ca8c1e316 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 6ae2938ef..8bcd32419 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 246324e50..9029ce1d5 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 6a086ceba..8795fa209 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 683f4f78c..16ad8df51 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 ec6bcf74b..c5f95cb4b 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 a69183b0f..78fff8ba9 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 2a7ff15f7..d45668fa1 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 95f19b912..b83453da6 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 6e6c2c31b..f0f968ec2 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 6f6bedce9..ec716ebf8 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 e9fadd1a0..9b22921be 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 9c4305d21..a3bed7668 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 cbffbf764..c0391d970 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 differindex af95c00c8..c73217547 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz Binary files differindex cdffa9fc8..b9ab88edf 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz Binary files differindex 3369c5072..34aa9ae29 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1216nfh_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 1f2f35945..f0704cfad 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_m1219nf_mfp-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz Binary files differindex 3a1d2ebef..488278804 100644 --- a/ppd/hpijs/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_m1219nf_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 8ceea9f76..9937ca2e0 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 98d30c67b..11ebd3e9a 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 e5b3427cd..29a9123b9 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 8f6d2b471..26bfd59e8 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-laserjet_professional_p_1102w-hpijs.ppd.gz b/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz Binary files differindex 80ef79254..5258ac846 100644 --- a/ppd/hpijs/hp-laserjet_professional_p_1102w-hpijs.ppd.gz +++ b/ppd/hpijs/hp-laserjet_professional_p_1102w-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 47fb2d0fb..41e3af59e 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 104bc61d0..028fd440e 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 06dfcb672..386670289 100644 --- a/ppd/hpijs/hp-officejet-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz Binary files differindex 1adb70e07..ba96ee757 100644 --- a/ppd/hpijs/hp-officejet_100_mobile_l411-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_100_mobile_l411-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 68957aa78..d1c3c5128 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 19e3e006d..1cc35d3b7 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 18d1abf87..d12c71898 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 ed99b5c12..6484368dc 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 f370f9bc1..69794bfc5 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 1a361f531..85572981c 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 5f72854a0..7073ab35a 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 2732e27df..72c9d41b2 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 15b6a5e7e..6db1ca0d9 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 2b80a00f4..2956cb54d 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 505755ccf..23d194baf 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 83e914ea0..4cf58d108 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 5beab6cc9..a08cb8c2b 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 5d650b48f..e19d2a57c 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 2f07a9493..576486c08 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 b145f3b5f..ea62c5b38 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 414144c3e..46a73d584 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 beca2efe0..53eddf134 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 dd3a2c6b1..db8a8d987 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 e324adb50..399378ea8 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 6275a82b5..c70901cd6 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 36c96c9ec..28120f1bf 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 41d4059aa..67b236004 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 a4985e5f3..3085267a0 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 321b0f4df..d1fd7287a 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 c531b86a6..7390f8871 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 5fe9ec5e7..9b30c7614 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 75e45bca0..cbd539104 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 276c22b25..716756057 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 35df328b9..f370bb792 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 bb9a48876..7f542d289 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 75dbb2d99..7011e9fb7 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 7bfc7199b..aee21dc17 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 00b113f82..5c7d66c8b 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 dc5cc5b25..3142b5d5c 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 87cbcd024..5de20c39e 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 0c869efde..cc830bec8 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 a17029e98..431512ca9 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 9495244ad..777ac444a 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 685dad896..dfb9765e6 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 e36a07027..42de8aba5 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 b00eb5df5..a47b51c79 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 187a12b35..42b7f444e 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 6751b2849..b4a83fe30 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 3e5d83bc9..7618f47a5 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 826412344..e590e0936 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 9576f9b69..0e4ececb1 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 f888ec32e..650f460b8 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 2be9fbd5c..2a5c2881e 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 41739a18c..ed77738ec 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 f418fe801..f621f75cd 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 9551c8059..e672c6e4b 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 11739545c..6e4626976 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 1191b3a64..c9b05956e 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 e323d7440..447e78930 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 ae56e2ed5..bb9459f9a 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 09002d56f..14c68f4b7 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 f78f73ae8..af09a2669 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 97d54a81a..2d7b4ac53 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 ed69f9ab4..ac5796ca7 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_8100-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz Binary files differindex 3140f2cee..1ae025bc1 100644 --- a/ppd/hpijs/hp-officejet_pro_8100-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8100-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 4605cb155..6fdc7b809 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 933ce2572..288ad7bad 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 a352510cc..793a4d8e3 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 82953d9e3..5faa22f43 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_8600-hpijs.ppd.gz b/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz Binary files differindex ada4ada45..30780024a 100644 --- a/ppd/hpijs/hp-officejet_pro_8600-hpijs.ppd.gz +++ b/ppd/hpijs/hp-officejet_pro_8600-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 99dc2fd19..21f2b917d 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 5bc28e5eb..d54c412fa 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 cab54e010..348c12ad5 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 eff2b7fd0..431151c3f 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 1cad6533b..904d3a705 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 0b2b8db92..3dc54fc37 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 cda78e098..13c11c1f2 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 61d6060d2..1dea2a297 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 115814d2f..db0abfeb0 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 c60e6aeca..e875c5271 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 ea7ec374f..06fd15369 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 a17fd25c1..69c61efd3 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 18ac910cd..f45182762 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 5754cea2c..46ea719fb 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 2d997c86e..cf1f1574b 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 851ae830f..ab1528ddb 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 45ad10f3f..d87879fdc 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 fe3a97e75..e764f3eeb 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 a63cc4be9..9108fff2a 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 3a19ec034..6ea477250 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 b4194d0db..4639908e0 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 37e555305..7b6f92fdb 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 3d78d4fd0..0ce65475f 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 37e859121..75e86e113 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 9fd9b21d9..9ba2386ad 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 dbfff18c2..98b5d5b3a 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 7e9268e64..27f39d469 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 b8a34a495..6868edf19 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 3a36fab88..22b47a2cc 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 dab36dfda..abbd01b28 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 75466342b..e7e062ca0 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 5aa33cdb0..20e1ff57c 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 1d1788892..e85f4facf 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 c7719e0cd..c0f1732b4 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 3306d903c..d2d6ced74 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 db28219ed..f55d8bb74 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 7b22025a5..3c663c82c 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 e90c1a10d..b62e36954 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 6d2fab312..349b8d1c0 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 8fa16b8c9..be4ef1b63 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 a3f12932a..9a0c061f0 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 71d5d817e..6299f9639 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 d036223d4..a39872867 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 244efd401..74f33c92f 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 dfa5aedbd..3b8ac1955 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 8dafdaf6b..bf4427bac 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 1318bfe5a..23a96aac2 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 4c907013a..554356fe0 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 f0807c3d7..8b6cd4f67 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 b75aab6de..394476e66 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 a84ba1182..d2f164540 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 b286b0319..918b86df0 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 fa139887a..36b54c696 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 33ae81546..57976728b 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 a2f19570c..0595efe73 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 c5a752687..8087380b7 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 73a27acfa..bad523e5e 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 73453929d..92ae01f29 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 23c5752c9..faa6f4ce1 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 8839cc028..3b2002cbd 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_5510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz Binary files differindex 0bcfd84c5..dbc0e6bd8 100644 --- a/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_5510_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz Binary files differnew file mode 100644 index 000000000..46e2fccd8 --- /dev/null +++ b/ppd/hpijs/hp-photosmart_5510d_series-hpijs.ppd.gz diff --git a/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz Binary files differindex b30d50928..9dc832fe8 100644 --- a/ppd/hpijs/hp-photosmart_6510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_6510_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 127778c62..d0cc0611f 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 fff365e7c..17beb72eb 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 1cd58ffb5..b78aa47df 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 df999e859..8b650827c 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 841b179dc..3457edf02 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_7510_series-hpijs.ppd.gz b/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz Binary files differindex eccaaa208..c9d4b5364 100644 --- a/ppd/hpijs/hp-photosmart_7510_series-hpijs.ppd.gz +++ b/ppd/hpijs/hp-photosmart_7510_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 d2f8f6e9b..41b1cc4e2 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 08962c977..7f0cebc0f 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 3e2f8584c..0d6de7b01 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 df1489773..ed3bc9b20 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 f73362a74..6f10087d7 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 38712cf29..61bc1e866 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 981b31b93..274dfd2a6 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 8d5fed0a0..84c6915c7 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 812d114c5..2275b618f 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 7741107a4..8d734c3ed 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 8b5558d05..a4380bb44 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 7dcc19eda..34d2bbe34 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 7af642f27..a41ff34dc 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 54490d802..62b0a26e0 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 d8fbcb7bf..0a4a08f39 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 957cb3901..8771b95db 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 5182f5274..073f636c9 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 7b64a1b83..1538eef20 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 b0709db69..174f16e94 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 8898fcaf5..e21540eab 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 a37e8eb42..0e75c3b1a 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 c74392252..a3671fbd3 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 a2722a779..d975b0143 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 e8da1d8c3..db2dab128 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 6d083e3b5..b820b5cd2 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 bb457c779..2204ef044 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 aedbe551f..e83c7b3be 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 56bc96c7b..f4e0a98be 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 ebecd048f..fa4702802 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 fffadc181..32c097fbb 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 f788f596b..cf1df23fa 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 95b818df4..691b13d05 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 368cc3e13..d70f60f97 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 7755004d6..a6c991fa0 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 10e2a8162..179a113fd 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 f5f6825dc..7f0aeeee8 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 b29705f25..c4666d734 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 b72cb1115..d28425cba 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 ff438f8cb..4a19e32dd 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 dfe5d6b55..b41aff639 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 afd2d1db8..3155a0bbe 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 4826938eb..790f73cd4 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 299d087b4..1eab3fb13 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 fac495b64..3f93c55be 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 39793eed1..182d3cf0d 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 bd0c0eca1..9bb43ea92 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 fce85f89d..b2718a8f5 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 67ab1654f..ce5fb0e93 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 ab2c9e605..bf679cccf 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 0dc84c2b0..a4e681a98 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 67a4e9c23..036154b8c 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 1e2644dec..feda7d645 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 52e3ea052..5366add43 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 d6153cd5a..ec6272647 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 2f7809e37..3e90bfc07 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 9100e3894..062b59a0b 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 035bb16e5..516441b7f 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 3c9347d04..4f2382de6 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 4434a5031..0d9105f5a 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 f8120dd82..3a6a1e906 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 differindex c417dcfa2..4d38a19ad 100644 --- a/ppd/hpijs/hp-photosmart_ink_adv_k510-hpijs.ppd.gz +++ 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 ce8c0d3e9..56d46dddf 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 daeddde82..c8a49db99 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 325cdd192..968501d66 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 f22246b96..9286fcd13 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 771d205c3..9eac0a15c 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 0f195d7f5..2bbba4174 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 7c06c824f..59c203208 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 65f1d6ac7..817309f7c 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 6b4e8ff67..63ee863a1 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 96ea66357..7b6e8bcab 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 2cbcd9407..7e87a2531 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 5507c52e5..ca32fe2bb 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 696e58993..0bec3a95f 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 174e24f6b..041a37dcb 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 8fe03873b..65af57317 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 a35128af9..5540a2abf 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 223536b5e..4c5b5c58c 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 1ac33187c..23577d893 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 a82b838ba..4797c8c81 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 bdaabd811..3dc5faa4d 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 6367ef518..8ba3a9c75 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 9b60fa89f..fb20179d0 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 0cc850186..e89109fcc 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 6086bec41..908baa1c5 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 497825ead..44bff240e 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 f23cfd79c..99ce08d91 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 ed6dbb74d..182cb1eea 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 64b0e8bd0..11b3980fa 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 13dc59cc2..f73f61b3d 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 cfc4b3219..2f4de0c3d 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 d3152b0c0..0930f2039 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 f5634e384..b23b61b81 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 dac2de5d2..a2b15676f 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 3eca1c162..a065812ad 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 9f60bfa92..81e8a1a22 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 b32f557c2..8cdbd39d9 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 b0190f70a..762d18223 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 46994b864..0027d2a54 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 28c349a1c..a53adbc1d 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 ec9e888cf..fb7524bda 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 b0d70ecef..59d6459fb 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 9b3af43d2..319e768a3 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 c9f2fa68b..c9f12ad30 100644 --- a/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz +++ b/ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz diff --git a/prnt/cups.py b/prnt/cups.py index e4429a08f..421942d47 100644 --- a/prnt/cups.py +++ b/prnt/cups.py @@ -712,7 +712,11 @@ def getOptions(): def printFile(printer, filename, title): if os.path.exists(filename): + printer = printer.encode('utf-8') + filename = filename.encode('utf-8') + title = title.encode('utf-8') return cupsext.printFileWithOptions(printer, filename, title) + else: return -1 diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index 3e0262d01..98765b960 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -236,7 +236,8 @@ // Added new tech class Ampere // 13 September 2011 Goutam -// Added AutoDuplex PaperSizes in Copperhead techclass +// Added AutoDuplex PaperSizes in Copperhead techclass + // Include necessary files... #include <font.defs> @@ -4786,6 +4787,14 @@ Manufacturer "HP" "<</cupsInteger0 72/PageSize[566.64 410.76]/ImagingBBox null>>setpagedevice" // <%Copperhead:AutoDuplex%> { + ModelName "HP Photosmart 5510d Series" + Attribute "NickName" "" "HP Photosmart 5510d Series, $Version" + Attribute "ShortNickName" "" "HP Photosmart 5510d Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 5510d series;DES:photosmart 5510d series;" + PCFileName "hp-photosmart_5510d_series.ppd" + Attribute "Product" "" "(HP Photosmart 5510d E-all-in-one)" + } + { ModelName "HP Photosmart 6510 Series" Attribute "NickName" "" "HP Photosmart 6510 Series, $Version" Attribute "ShortNickName" "" "HP Photosmart 6510 Series" @@ -4796,7 +4805,7 @@ Manufacturer "HP" } } // End Copperhead - +//Added by Goutam Kodu //////// Python11 { Attribute "cupsEvenDuplex" "" "True" @@ -6085,7 +6094,9 @@ Manufacturer "HP" Attribute "ShortNickName" "" "HP Officejet Pro 8500 a910" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a910;DES:officejet pro 8500 a910;" PCFileName "hp-officejet_pro_8500_a910.ppd" - Attribute "Product" "" "(HP Officejet Pro 8500 a910a)" + Attribute "Product" "" "(HP Officejet Pro 8500a E-aio Printer a910a)" + Attribute "Product" "" "(HP Officejet Pro 8500a E-aio Printer a910g)" + Attribute "Product" "" "(HP Officejet Pro 8500a E-aio Printer a910n)" } } // End Supported media sizes with full bleed. @@ -7684,14 +7695,24 @@ Manufacturer "HP" Attribute "Product" "" "(HP Photosmart b8553 Photo Printer)" Attribute "Product" "" "(HP Photosmart b8558 Photo Printer)" } + + //Adding Speciality Media Tray Support (LP#105443) { - ModelName "HP Photosmart Pro b8800 Series" - Attribute "NickName" "" "HP Photosmart Pro b8800 Series, $Version" - Attribute "ShortNickName" "" "HP Photosmart Pro b8800 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart pro b8800 series;DES:photosmart pro b8800 series;" - PCFileName "hp-photosmart_pro_b8800_series.ppd" - Attribute "Product" "" "(HP Photosmart Pro b8850 Printer)" + Option "InputSlot/Media Source" PickOne AnySetup 10.0 + Choice "MediaTray/Speciality Media Tray" "<</MediaPosition 2>>setpagedevice" + // <%Python:LargeFormatA3:NoAutoDuplex:Advanced%> + { + ModelName "HP Photosmart Pro b8800 Series" + Attribute "NickName" "" "HP Photosmart Pro b8800 Series, $Version" + Attribute "ShortNickName" "" "HP Photosmart Pro b8800 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart pro b8800 series;DES:photosmart pro b8800 series;" + PCFileName "hp-photosmart_pro_b8800_series.ppd" + Attribute "Product" "" "(HP Photosmart Pro b8850 Printer)" + } } + + + } // End Large format media sizes with full bleed } // End Python B-size @@ -10767,14 +10788,6 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet 4si Mx Printer)" } { - ModelName "HP LaserJet 5mp" - Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" - Attribute "ShortNickName" "" "HP LaserJet 5mp" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" - PCFileName "hp-laserjet_5mp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 5mp Printer)" - } - { ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -10785,6 +10798,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet 5l Xtra Printer)" } { + ModelName "HP LaserJet 5mp" + Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5mp" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" + PCFileName "hp-laserjet_5mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5mp Printer)" + } + { ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -12029,17 +12050,6 @@ Group "RLT/HP Real Life Technologies" 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" @@ -12130,449 +12140,470 @@ Group "RLT/HP Real Life Technologies" VariablePaperSize Yes MinSize 1in 4in MaxSize 8.5in 14in - - // <%LJColor:Normal%> - { - ModelName "HP Color LaserJet cm1312 MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" - PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm1312 Multifunction Printer)" - } - { - ModelName "HP Color LaserJet cm1312nfi MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" - PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" - 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" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1514n;DES:hp color laserjet cp1514n;" - PCFileName "hp-color_laserjet_cp1514n-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp1514n Printer)" - } - { - ModelName "HP Color LaserJet cp1515n" - Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" - PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" + { + // 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" + // <%LJColor:Normal%> + { + ModelName "HP Color LaserJet cm1312nfi MFP" + Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" + PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" + } + { + ModelName "HP Color LaserJet cm1312 MFP" + Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" + PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm1312 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" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1514n;DES:hp color laserjet cp1514n;" + PCFileName "hp-color_laserjet_cp1514n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1514n Printer)" + } + { + ModelName "HP Color LaserJet cp1515n" + Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" + PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" + } + { + ModelName "HP Color LaserJet cp1518ni" + Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" + PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" + } + { + ModelName "HP Color LaserJet cp2025dn" + Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" + PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" + } + { + ModelName "HP Color LaserJet cp2025" + Attribute "NickName" "" "HP Color LaserJet cp2025 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025;DES:hp color laserjet cp2025;" + PCFileName "hp-color_laserjet_cp2025-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025 Printer)" + } + { + ModelName "HP Color LaserJet cp2025n" + Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" + PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" + } + { + ModelName "HP Color LaserJet cp2025x" + Attribute "NickName" "" "HP Color LaserJet cp2025x pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025x" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025x;DES:hp color laserjet cp2025x;" + PCFileName "hp-color_laserjet_cp2025x-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025x Printer)" + } + { + ModelName "HP Business Inkjet 2300" + Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2300" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" + PCFileName "hp-business_inkjet_2300-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" + Attribute "Product" "" "(HP Business Inkjet 2300dtn Printer)" + } + { + ModelName "HP Color LaserJet 2500" + Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 2500" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" + PCFileName "hp-color_laserjet_2500-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" + } + { + ModelName "HP Color LaserJet 2500 Series" + Attribute "NickName" "" "HP Color LaserJet 2500 Series, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 2500 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500 series;DES:hp color laserjet 2500 series;" + PCFileName "hp-color_laserjet_2500_series.ppd" + Attribute "Product" "" "(HP Color LaserJet 2500l Printer)" + Attribute "Product" "" "(HP Color LaserJet 2500lse Printer)" + Attribute "Product" "" "(HP Color LaserJet 2500n Printer)" + Attribute "Product" "" "(HP Color LaserJet 2500tn Printer)" + } + { + ModelName "HP Color LaserJet 3000" + Attribute "NickName" "" "HP Color LaserJet 3000 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3000" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3000;DES:hp color laserjet 3000;" + PCFileName "hp-color_laserjet_3000-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3000 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3000n Printer)" + Attribute "Product" "" "(HP Color LaserJet 3000dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 3000dtn Printer)" + } + { + ModelName "HP Color LaserJet cp3505" + Attribute "NickName" "" "HP Color LaserJet cp3505 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp3505" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3505;DES:hp color laserjet cp3505;" + PCFileName "hp-color_laserjet_cp3505-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp3505n Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3505dn Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3505x Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3505 Printer)" + } + { + ModelName "HP Color LaserJet cp3525" + Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp3525" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" + PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3525dn Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3525x Printer)" + } + { + ModelName "HP Color LaserJet cm3530 MFP" + Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" + PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" + } + { + ModelName "HP Color LaserJet 3700" + Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3700" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" + PCFileName "hp-color_laserjet_3700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" + } + { + ModelName "HP Color LaserJet 3700n" + Attribute "NickName" "" "HP Color LaserJet 3700n, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3700n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700n;DES:hp color laserjet 3700n;" + PCFileName "hp-color_laserjet_3700n.ppd" + Attribute "Product" "" "(HP Color LaserJet 3700n Printer)" + Attribute "Product" "" "(HP Color LaserJet 3700dtn Printer)" + Attribute "Product" "" "(HP Color LaserJet 3700dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 3700d Printer)" + } + { + ModelName "HP Color LaserJet 3800" + Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3800" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" + PCFileName "hp-color_laserjet_3800-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" + Attribute "Product" "" "(HP Color LaserJet 3800dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 3800dtn Printer)" + } + { + ModelName "HP Color LaserJet cp4005" + Attribute "NickName" "" "HP Color LaserJet cp4005 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp4005" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" + PCFileName "hp-color_laserjet_cp4005-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp4005n Printer)" + Attribute "Product" "" "(HP Color LaserJet cp4005dn Printer)" + Attribute "Product" "" "(HP Color LaserJet cp4005 Series Printer)" + } + { + ModelName "HP Color LaserJet cp4020 Series" + Attribute "NickName" "" "HP Color LaserJet cp4020 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp4020 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4020 series;DES:hp color laserjet cp4020 series;" + PCFileName "hp-color_laserjet_cp4020_series-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp4020 Series Printer)" + } + { + ModelName "HP Color LaserJet 4500" + Attribute "NickName" "" "HP Color LaserJet 4500 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4500" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4500;DES:hp color laserjet 4500;" + PCFileName "hp-color_laserjet_4500-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4500 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4500dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4500n Printer)" + } + { + ModelName "HP Color LaserJet cp4520 Series" + Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" + PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" + 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" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" + PCFileName "hp-color_laserjet_4550-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550hdn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550n Plus Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550hdn Plus Printer)" + } + { + ModelName "HP Color LaserJet 4600 Series" + Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" + PCFileName "hp-color_laserjet_4600_series.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600dtn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600hdn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600n Printer)" + } + { + ModelName "HP Color LaserJet 4600" + Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" + PCFileName "hp-color_laserjet_4600-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" + } + { + ModelName "HP Color LaserJet 4610" + Attribute "NickName" "" "HP Color LaserJet 4610 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4610" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4610;DES:hp color laserjet 4610;" + PCFileName "hp-color_laserjet_4610-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4610n Printer)" + } + { + ModelName "HP Color LaserJet 4650" + Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4650" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" + PCFileName "hp-color_laserjet_4650-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" + Attribute "Product" "" "(HP Color LaserJet 4650dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4650dtn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4650hdn Printer)" + } + { + ModelName "HP Color LaserJet 4700" + Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4700" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" + PCFileName "hp-color_laserjet_4700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4700dtn Printer)" + Attribute "Product" "" "(HP Color LaserJet 4700n Printer)" + Attribute "Product" "" "(HP Color LaserJet 4700ph+ Printer)" + } + { + ModelName "HP Color LaserJet cm4730 MFP" + Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" + PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm4730fm Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm4730fsk Multifunction Printer)" + } + { + ModelName "HP Color LaserJet 4730mfp" + Attribute "NickName" "" "HP Color LaserJet 4730mfp pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4730mfp" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4730mfp;DES:hp color laserjet 4730mfp;" + PCFileName "hp-color_laserjet_4730mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4730xs Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet 4730xm Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet 4730x Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet 4730 Multifunction Printer)" + } + { + ModelName "HP Color LaserJet cp5225" + Attribute "NickName" "" "HP Color LaserJet cp5225 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp5225" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5225;DES:hp color laserjet cp5225;" + PCFileName "hp-color_laserjet_cp5225-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp5225)" + } + { + ModelName "HP Color LaserJet cp5225n" + Attribute "NickName" "" "HP Color LaserJet cp5225n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp5225n" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5225n;DES:hp color laserjet cp5225n;" + PCFileName "hp-color_laserjet_cp5225n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp5225n)" + } + { + ModelName "HP Color LaserJet cp5225dn" + Attribute "NickName" "" "HP Color LaserJet cp5225dn pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp5225dn" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5225dn;DES:hp color laserjet cp5225dn;" + PCFileName "hp-color_laserjet_cp5225dn-pcl3.ppd" + 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" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" + PCFileName "hp-officejet_9100_series-pcl3.ppd" + Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 9130 All-in-one Printer)" + } } + { - ModelName "HP Color LaserJet cp1518ni" - Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" - PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" - } - { - ModelName "HP Color LaserJet cp2025dn" - Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" - PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" - } - { - ModelName "HP Color LaserJet cp2025" - Attribute "NickName" "" "HP Color LaserJet cp2025 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025;DES:hp color laserjet cp2025;" - PCFileName "hp-color_laserjet_cp2025-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025 Printer)" - } - { - ModelName "HP Color LaserJet cp2025n" - Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" - PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" - } - { - ModelName "HP Color LaserJet cp2025x" - Attribute "NickName" "" "HP Color LaserJet cp2025x pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025x" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025x;DES:hp color laserjet cp2025x;" - PCFileName "hp-color_laserjet_cp2025x-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025x Printer)" - } - { - ModelName "HP Business Inkjet 2300" - Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" - PCFileName "hp-business_inkjet_2300-pcl3.ppd" - Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" - Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" - Attribute "Product" "" "(HP Business Inkjet 2300dtn Printer)" - } - { - ModelName "HP Color LaserJet cm2320 MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" - PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320 Multifuntion Printer)" - } - { - ModelName "HP Color LaserJet cm2320fxi MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" - PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320fxi Multifunction Printer)" - } - { - ModelName "HP Color LaserJet cm2320n MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" - PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320n Multifunction Printer)" - } - { - ModelName "HP Color LaserJet cm2320nf MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" - PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" - } - { - ModelName "HP Color LaserJet 2500" - Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 2500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" - PCFileName "hp-color_laserjet_2500-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" - } - { - ModelName "HP Color LaserJet 2500 Series" - Attribute "NickName" "" "HP Color LaserJet 2500 Series, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 2500 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500 series;DES:hp color laserjet 2500 series;" - PCFileName "hp-color_laserjet_2500_series.ppd" - Attribute "Product" "" "(HP Color LaserJet 2500l Printer)" - Attribute "Product" "" "(HP Color LaserJet 2500lse Printer)" - Attribute "Product" "" "(HP Color LaserJet 2500n Printer)" - Attribute "Product" "" "(HP Color LaserJet 2500tn Printer)" - } - { - ModelName "HP Color LaserJet 3000" - Attribute "NickName" "" "HP Color LaserJet 3000 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3000" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3000;DES:hp color laserjet 3000;" - PCFileName "hp-color_laserjet_3000-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 3000 Printer)" - Attribute "Product" "" "(HP Color LaserJet 3000n Printer)" - Attribute "Product" "" "(HP Color LaserJet 3000dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 3000dtn Printer)" - } - { - ModelName "HP Color LaserJet cp3505" - Attribute "NickName" "" "HP Color LaserJet cp3505 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp3505" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3505;DES:hp color laserjet cp3505;" - PCFileName "hp-color_laserjet_cp3505-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp3505n Printer)" - Attribute "Product" "" "(HP Color LaserJet cp3505dn Printer)" - Attribute "Product" "" "(HP Color LaserJet cp3505x Printer)" - Attribute "Product" "" "(HP Color LaserJet cp3505 Printer)" - } - { - ModelName "HP Color LaserJet cp3525" - Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp3525" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" - PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" - Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" - Attribute "Product" "" "(HP Color LaserJet cp3525dn Printer)" - Attribute "Product" "" "(HP Color LaserJet cp3525x Printer)" - } - { - ModelName "HP Color LaserJet cm3530 MFP" - Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" - PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" - } - { - ModelName "HP Color LaserJet 3700" - Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" - PCFileName "hp-color_laserjet_3700-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" - } - { - ModelName "HP Color LaserJet 3700n" - Attribute "NickName" "" "HP Color LaserJet 3700n, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3700n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700n;DES:hp color laserjet 3700n;" - PCFileName "hp-color_laserjet_3700n.ppd" - Attribute "Product" "" "(HP Color LaserJet 3700n Printer)" - Attribute "Product" "" "(HP Color LaserJet 3700dtn Printer)" - Attribute "Product" "" "(HP Color LaserJet 3700dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 3700d Printer)" - } - { - ModelName "HP Color LaserJet 3800" - Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3800" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" - PCFileName "hp-color_laserjet_3800-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" - Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" - Attribute "Product" "" "(HP Color LaserJet 3800dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 3800dtn Printer)" - } - { - ModelName "HP Color LaserJet cp4005" - Attribute "NickName" "" "HP Color LaserJet cp4005 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp4005" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" - PCFileName "hp-color_laserjet_cp4005-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp4005n Printer)" - Attribute "Product" "" "(HP Color LaserJet cp4005dn Printer)" - Attribute "Product" "" "(HP Color LaserJet cp4005 Series Printer)" - } - { - ModelName "HP Color LaserJet cp4020 Series" - Attribute "NickName" "" "HP Color LaserJet cp4020 Series pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp4020 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4020 series;DES:hp color laserjet cp4020 series;" - PCFileName "hp-color_laserjet_cp4020_series-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp4020 Series Printer)" - } - { - ModelName "HP Color LaserJet 4500" - Attribute "NickName" "" "HP Color LaserJet 4500 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4500;DES:hp color laserjet 4500;" - PCFileName "hp-color_laserjet_4500-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4500 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4500dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4500n Printer)" - } - { - ModelName "HP Color LaserJet cp4520 Series" - Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" - PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" - 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" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" - PCFileName "hp-color_laserjet_4550-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" - Attribute "Product" "" "(HP Color LaserJet 4550dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4550hdn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4550n Plus Printer)" - Attribute "Product" "" "(HP Color LaserJet 4550hdn Plus Printer)" - } - { - ModelName "HP Color LaserJet 4600 Series" - Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" - PCFileName "hp-color_laserjet_4600_series.ppd" - Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4600dtn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4600hdn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4600n Printer)" - } - { - ModelName "HP Color LaserJet 4600" - Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" - PCFileName "hp-color_laserjet_4600-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" - } - { - ModelName "HP Color LaserJet 4610" - Attribute "NickName" "" "HP Color LaserJet 4610 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4610" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4610;DES:hp color laserjet 4610;" - PCFileName "hp-color_laserjet_4610-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4610n Printer)" - } - { - ModelName "HP Color LaserJet 4650" - Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4650" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" - PCFileName "hp-color_laserjet_4650-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" - Attribute "Product" "" "(HP Color LaserJet 4650dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4650dtn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4650hdn Printer)" - } - { - ModelName "HP Color LaserJet 4700" - Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" - PCFileName "hp-color_laserjet_4700-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4700dtn Printer)" - Attribute "Product" "" "(HP Color LaserJet 4700n Printer)" - Attribute "Product" "" "(HP Color LaserJet 4700ph+ Printer)" - } - { - ModelName "HP Color LaserJet cm4730 MFP" - Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" - PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet cm4730fm Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet cm4730fsk Multifunction Printer)" - } - { - ModelName "HP Color LaserJet 4730mfp" - Attribute "NickName" "" "HP Color LaserJet 4730mfp pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4730mfp" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4730mfp;DES:hp color laserjet 4730mfp;" - PCFileName "hp-color_laserjet_4730mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4730xs Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet 4730xm Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet 4730x Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet 4730 Multifunction Printer)" - } - { - ModelName "HP Color LaserJet cp5225" - Attribute "NickName" "" "HP Color LaserJet cp5225 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp5225" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5225;DES:hp color laserjet cp5225;" - PCFileName "hp-color_laserjet_cp5225-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp5225)" - } - { - ModelName "HP Color LaserJet cp5225n" - Attribute "NickName" "" "HP Color LaserJet cp5225n pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp5225n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5225n;DES:hp color laserjet cp5225n;" - PCFileName "hp-color_laserjet_cp5225n-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp5225n)" - } - { - ModelName "HP Color LaserJet cp5225dn" - Attribute "NickName" "" "HP Color LaserJet cp5225dn pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp5225dn" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp5225dn;DES:hp color laserjet cp5225dn;" - PCFileName "hp-color_laserjet_cp5225dn-pcl3.ppd" - 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" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" - PCFileName "hp-officejet_9100_series-pcl3.ppd" - Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet 9130 All-in-one Printer)" + // 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 "Tray1_Man/Tray 1 (Manual)" "<</MediaPosition 3>>setpagedevice" + Choice "Tray2/Tray 2" "<</MediaPosition 0>>setpagedevice" + Choice "Tray3/Tray 3" "<</MediaPosition 1>>setpagedevice" + // <%LJColor:Normal:Advanced%> + { + ModelName "HP Color LaserJet cm2320 MFP" + Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" + PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320 Multifuntion Printer)" + } + { + ModelName "HP Color LaserJet cm2320fxi MFP" + Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" + PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320fxi Multifunction Printer)" + } + { + ModelName "HP Color LaserJet cm2320n MFP" + Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" + PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320n Multifunction Printer)" + } + { + ModelName "HP Color LaserJet cm2320nf MFP" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" + PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" + } } } // End supported media sizes. @@ -14671,7 +14702,7 @@ Group "RLT/HP Real Life Technologies" Group "General/General" - Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" + Attribute "cupsIPPReason" "hplip.plugin-error/HP Device requires a proprietary binary Plug-in, run hp-plugin" "" Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" @@ -14882,7 +14913,7 @@ Group "RLT/HP Real Life Technologies" Group "General/General" - Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" + Attribute "cupsIPPReason" "hplip.plugin-error/HP Device requires a proprietary binary Plug-in, run hp-plugin" "" // MediaPosition values map to MediaSource enumeration in global_types.h Option "InputSlot/Media Source" PickOne AnySetup 10.0 @@ -15062,10 +15093,12 @@ Group "RLT/HP Real Life Technologies" Attribute "cupsBackSide" "" "Rotated" Attribute "cupsFlipDuplex" "" "True" Attribute "hpPrinterLanguage" "" "ljzjstream" + Attribute "hpPrinterPlatform" "" "ljzjsmono" + Attribute "hpReverseRasterPages" "" "1" Group "General/General" - Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" + Attribute "cupsIPPReason" "hplip.plugin-error/HP Device requires a proprietary binary Plug-in, run hp-plugin" "" Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index f6f0ff2df..f21d227a7 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -6321,14 +6321,6 @@ t=0" Attribute "Product" "" "(HP LaserJet 4si Mx Printer)" } { - ModelName "HP LaserJet 5mp hpijs" - Attribute "NickName" "" "HP LaserJet 5mp hpijs pcl3, $Version" - Attribute "ShortNickName" "" "HP LaserJet 5mp hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" - PCFileName "hp-laserjet_5mp-hpijs-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 5mp Printer)" - } - { ModelName "HP LaserJet 5l hpijs" Attribute "NickName" "" "HP LaserJet 5l hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l hpijs" @@ -6339,6 +6331,14 @@ t=0" Attribute "Product" "" "(HP LaserJet 5l Xtra Printer)" } { + ModelName "HP LaserJet 5mp hpijs" + Attribute "NickName" "" "HP LaserJet 5mp hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5mp hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" + PCFileName "hp-laserjet_5mp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5mp Printer)" + } + { ModelName "HP LaserJet 5p hpijs" Attribute "NickName" "" "HP LaserJet 5p hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p hpijs" @@ -7886,14 +7886,6 @@ nSet=2" CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 14.40 18.00 14.40 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" // <%LJColor:Normal%> { - ModelName "HP Color LaserJet cm1312 MFP hpijs" - Attribute "NickName" "" "HP Color LaserJet cm1312 MFP hpijs pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LJ cm1312 MFP hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" - PCFileName "hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm1312 Multifunction Printer)" - } - { ModelName "HP Color LaserJet cm1312nfi MFP hpijs" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP Color LJ cm1312nfi MFP hpijs" @@ -7902,6 +7894,14 @@ nSet=2" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } { + ModelName "HP Color LaserJet cm1312 MFP hpijs" + Attribute "NickName" "" "HP Color LaserJet cm1312 MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LJ cm1312 MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" + PCFileName "hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm1312 Multifunction Printer)" + } + { ModelName "HP LaserJet cm1411fn hpijs" Attribute "NickName" "" "HP LaserJet cm1411fn hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet cm1411fn hpijs" @@ -8032,38 +8032,6 @@ nSet=2" Attribute "Product" "" "(HP Business Inkjet 2300dtn Printer)" } { - ModelName "HP Color LaserJet cm2320 MFP hpijs" - Attribute "NickName" "" "HP Color LaserJet cm2320 MFP hpijs pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LJ cm2320 MFP hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" - PCFileName "hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320 Multifuntion Printer)" - } - { - ModelName "HP Color LaserJet cm2320fxi MFP hpijs" - Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP hpijs pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LJ cm2320fxi MFP hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" - PCFileName "hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320fxi Multifunction Printer)" - } - { - ModelName "HP Color LaserJet cm2320n MFP hpijs" - Attribute "NickName" "" "HP Color LaserJet cm2320n MFP hpijs pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LJ cm2320n MFP hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" - PCFileName "hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320n Multifunction Printer)" - } - { - ModelName "HP Color LaserJet cm2320nf MFP hpijs" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP hpijs pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LJ cm2320nf MFP hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" - PCFileName "hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" - } - { ModelName "HP Color LaserJet 2500 hpijs" Attribute "NickName" "" "HP Color LaserJet 2500 hpijs pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 2500 hpijs" @@ -8327,6 +8295,39 @@ nSet=2" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9130 All-in-one Printer)" } + // <%LJColor:Normal:Advanced%> + { + ModelName "HP Color LaserJet cm2320 MFP hpijs" + Attribute "NickName" "" "HP Color LaserJet cm2320 MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LJ cm2320 MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" + PCFileName "hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320 Multifuntion Printer)" + } + { + ModelName "HP Color LaserJet cm2320fxi MFP hpijs" + Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LJ cm2320fxi MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" + PCFileName "hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320fxi Multifunction Printer)" + } + { + ModelName "HP Color LaserJet cm2320n MFP hpijs" + Attribute "NickName" "" "HP Color LaserJet cm2320n MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LJ cm2320n MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" + PCFileName "hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320n Multifunction Printer)" + } + { + ModelName "HP Color LaserJet cm2320nf MFP hpijs" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP hpijs pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LJ cm2320nf MFP hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" + PCFileName "hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" + } { // Large format SuperB paper support CustomMedia "B4JIS/B4 (JIS)" 729.00 1033.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=B4JIS" "%% FoomaticRIPOptionSetting: PageSize=B4JIS" @@ -13192,6 +13193,14 @@ lity:PenSet=2,Quality:FullBleed=1" } // <%Copperhead:AutoDuplex%> { + ModelName "HP Photosmart 5510d Series hpijs" + Attribute "NickName" "" "HP Photosmart 5510d Series hpijs, $Version" + Attribute "ShortNickName" "" "HP PS 5510d Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 5510d series;DES:photosmart 5510d series;" + PCFileName "hp-photosmart_5510d_series-hpijs.ppd" + Attribute "Product" "" "(HP Photosmart 5510d E-all-in-one)" + } + { ModelName "HP Photosmart 6510 Series hpijs" Attribute "NickName" "" "HP Photosmart 6510 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Photosmart 6510 Series hpijs" @@ -14842,7 +14851,9 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "ShortNickName" "" "HP OJ Pro 8500 a910 hpijs" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a910;DES:officejet pro 8500 a910;" PCFileName "hp-officejet_pro_8500_a910-hpijs.ppd" - Attribute "Product" "" "(HP Officejet Pro 8500 a910a)" + Attribute "Product" "" "(HP Officejet Pro 8500a E-aio Printer a910a)" + Attribute "Product" "" "(HP Officejet Pro 8500a E-aio Printer a910g)" + Attribute "Product" "" "(HP Officejet Pro 8500a E-aio Printer a910n)" } } // end Corbett @@ -15487,6 +15498,7 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Photosmart b8553 Photo Printer)" Attribute "Product" "" "(HP Photosmart b8558 Photo Printer)" } + // <%Python:LargeFormatA3:NoAutoDuplex:Advanced%> { ModelName "HP Photosmart Pro b8800 Series hpijs" Attribute "NickName" "" "HP Photosmart Pro b8800 Series hpijs, $Version" diff --git a/prnt/drv/hpijs.drv.in.template b/prnt/drv/hpijs.drv.in.template index 4974e93d4..d137230e7 100644 --- a/prnt/drv/hpijs.drv.in.template +++ b/prnt/drv/hpijs.drv.in.template @@ -3613,6 +3613,7 @@ nSet=2" 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" // <%LJColor:Normal%> + // <%LJColor:Normal:Advanced%> { // Large format SuperB paper support CustomMedia "B4JIS/B4 (JIS)" 729.00 1033.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=B4JIS" "%% FoomaticRIPOptionSetting: PageSize=B4JIS" @@ -8884,6 +8885,7 @@ lity:PenSet=2,Quality:FullBleed=1" CustomMedia "w774h1116/8K" 774.00 1116.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w774h1116" "%% FoomaticRIPOptionSetting: PageSize=w774h1116" CustomMedia "A3/A3" 842.00 1190.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=A3" "%% FoomaticRIPOptionSetting: PageSize=A3" // <%Python:LargeFormatA3:NoAutoDuplex%> + // <%Python:LargeFormatA3:NoAutoDuplex:Advanced%> // <%OJ7000:LargeFormatA3%> // <%OJ7000:LargeFormatA3:SmallMargins%> } diff --git a/prnt/hpcups/CommonDefinitions.h b/prnt/hpcups/CommonDefinitions.h index 4f9e68414..cca7990d8 100644 --- a/prnt/hpcups/CommonDefinitions.h +++ b/prnt/hpcups/CommonDefinitions.h @@ -1,464 +1,466 @@ -/*****************************************************************************\ - CommonDefinitions.h : common header - - Copyright (c) 1996 - 2009, Hewlett-Packard Co. - All rights reserved. - - 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. - - Author: Naga Samrat Chowdary Narla, -\*****************************************************************************/ - -#ifndef COMMON_DEFINITIONS_H -#define COMMON_DEFINITIONS_H - -#include <stdio.h> -#include <inttypes.h> -#include <stdint.h> -//#include <machine/types.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <cups/cups.h> -#include <cups/raster.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <syslog.h> -#include <assert.h> -#include <time.h> -#include <sys/timeb.h> -#include <string.h> - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif - -#define BASIC_LOG 1 -#define SAVE_PCL_FILE 2 -#define SAVE_INPUT_RASTERS 4 -#define SEND_TO_PRINTER_ALSO 8 - -#define MAX_COLORTYPE 2 -#define NUMBER_PLANES 3 - -#define ASSERT assert - -#define _STRINGIZE(x) #x -#define STRINGIZE(x) _STRINGIZE(x) - -#define dbglog(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); \ -fprintf(stderr, __FILE__ " " STRINGIZE(__LINE__) ": " args);} - - -typedef unsigned char BYTE; - -#ifndef ABS - #define ABS(x) ( ((x)<0) ? -(x) : (x) ) -#endif - -#ifndef MIN - #define MIN(a,b) (((a)>=(b))?(b):(a)) -#endif - -#ifndef MAX - #define MAX(a,b) (((a)<=(b))?(b):(a)) -#endif - -#ifdef APDK_LITTLE_ENDIAN - #define GetRed(x) (((x >> 16) & 0x0FF)) - #define GetGreen(x) (((x >> 8) & 0x0FF)) - #define GetBlue(x) ((x & 0x0FF)) - #else - #define GetRed(x) (((x >> 24) & 0x0FF)) - #define GetGreen(x) (((x >> 16) & 0x0FF)) - #define GetBlue(x) (((x >> 8) & 0x0FF)) - #endif - -#ifdef BLACK_PEN - #undef BLACK_PEN -#endif - -#ifdef NO_ERROR - #undef NO_ERROR -#endif - -#define HIBYTE(sVar) (BYTE) ((sVar & 0xFF00) >> 8) -#define LOBYTE(sVar) (BYTE) ((sVar & 0x00FF)) -#ifndef LOWORD - #define LOWORD(l) ((unsigned short) (l)) -#endif - -#ifndef HIWORD - #define HIWORD(l) ((unsigned short) (((uint32_t) (l) >> 16) & 0xFFFF)) -#endif - -#define PCL_BUFFER_SIZE 10000 - -typedef unsigned short UInt16; -typedef unsigned long UInt32; -typedef unsigned char UChar; -typedef unsigned int Int16; -typedef long Int32; - -typedef struct RASTERDATA -{ - int rastersize[MAX_COLORTYPE]; - BYTE *rasterdata[MAX_COLORTYPE]; -} RASTERDATA; - -const int MAXCOLORDEPTH = 3; - -const int MAXCOLORPLANES = 6; // current max anticipated, 6 for 690 photopen - -const int MAXCOLORROWS = 2; // multiple of high-to-low for mixed-resolution cases - -enum HALFTONING_ALGORITHM -{ - FED, - MATRIX -}; - -/* - * values of DRIVER_ERROR - * Values < 0 are warnings - */ - -typedef enum -{ - -// general or system errors - NO_ERROR = 0x00, //!< everything okay - JOB_CANCELED = 0x01, //!< CANCEL chosen by user - SYSTEM_ERROR = 0x02, //!< something bad that should not have happened - ALLOCMEM_ERROR = 0x03, //!< failed to allocate memory - NO_PRINTER_SELECTED = 0x04, //!< indicates improper calling sequence or unidi - INDEX_OUT_OF_RANGE = 0x05, //!< what it says - ILLEGAL_RESOLUTION = 0x06, //!< tried to set resolution at unacceptable value - NULL_POINTER = 0x07, //!< supplied ptr was null - MISSING_PENS = 0x08, //!< one or more printhead/pen missing - -// build-related -// (items either absent from current build, or just bad index from client code) - UNSUPPORTED_PRINTER = 0x10, //!< selected printer-type unsupported in build - UNSUPPORTED_PEN = 0x11, //!< selected pen-type unsupported - GRAPHICS_UNSUPPORTED = 0x13, //!< no graphics allowed in current build - ILLEGAL_COORDS = 0x15, //!< bad (x,y) passed to TextOut - BAD_INPUT_WIDTH = 0x18, //!< inputwidth is 0 and - OUTPUTWIDTH_EXCEEDS_PAGEWIDTH = 0x19, //!< inputwidth exceeds printable width - UNSUPPORTED_PRINTMODE = 0x19, //!< requested printmode not available - -// I/O related - IO_ERROR = 0x20, //!< I/O error communicating with printer - BAD_DEVICE_ID = 0x21, //!< bad or garbled device id from printer - CONTINUE_FROM_BLOCK = 0x22, //!< continue from blocked state for printers with no buttons - -// Runtime related - PLUGIN_LIBRARY_MISSING = 0x30, //!< a required plugin (dynamic) library is missing - -// WARNINGS -// convention is that values < 0 can be ignored (at user's peril) - WARN_MODE_MISMATCH = -1, //!< printmode selection incompatible with pen, tray, etc. - WARN_DUPLEX = -2, //!< duplexer installed; our driver can't use it - WARN_LOW_INK_BOTH_PENS= -3, //!< sensor says pens below threshold - WARN_LOW_INK_BLACK = -4, //!< sensor says black pen below threshold - WARN_LOW_INK_COLOR = -5, //!< sensor says color pen below threshold - - WARN_LOW_INK_PHOTO = -10, //!< sensor says photo pen below threshold - WARN_LOW_INK_GREY = -11, //!< sensor says grey pen below threshold - WARN_LOW_INK_BLACK_PHOTO = -12, //!< sensor says black and photo pens below threshold - WARN_LOW_INK_COLOR_PHOTO = -13, //!< sensor says color and photo pens below threshold - WARN_LOW_INK_GREY_PHOTO = -14, //!< sensor says grey and photo pens below threshold - WARN_LOW_INK_COLOR_GREY = -15, //!< sensor says color and grey pens below threshold - WARN_LOW_INK_COLOR_GREY_PHOTO = -16, //!< sensor says color, photo, and grey pens below threshold - WARN_LOW_INK_COLOR_BLACK_PHOTO = -17, //!< sensor says color, photo, and black pens below threshold - WARN_LOW_INK_CYAN = -18, //!< sensor says cyan ink below threshold - WARN_LOW_INK_MAGENTA = -19, //!< sensor says magenta ink below threshold - WARN_LOW_INK_YELLOW = -20, //!< sensor says yellow ink below threshold - WARN_LOW_INK_MULTIPLE_PENS = - 21, //!< sensor says more than one pen below threshold - WARN_ILLEGAL_PAPERSIZE = -8, //!< papersize illegal for given hardware - ILLEGAL_PAPERSIZE = -8, - WARN_INVALID_MEDIA_SOURCE = -9, //!< media source tray is invalid - - eCreate_Thread_Error = 128 //! Thread error creating the error.... -} DRIVER_ERROR; //DRIVER_ERROR - -enum DUPLEXMODE -{ - DUPLEXMODE_NONE, - DUPLEXMODE_BOOK, - DUPLEXMODE_TABLET -}; - -enum ENDIAN_TYPE -{ - LITTLEENDIAN, - BIGENDIAN -}; - -// used to encourage consistent ordering of color planes -#define PLANE_K 0 -#define PLANE_C 1 -#define PLANE_M 2 -#define PLANE_Y 3 -#define Clight 4 -#define Mlight 5 -#define kWhite 0x00FFFFFE - -#define K 0 -#define C 1 -#define M 2 -#define Y 3 -#define Clight 4 -#define Mlight 5 -#define RANDSEED 77 - -/* - * ZJStream related definitions - */ - -typedef uint32_t DWORD; -typedef unsigned short WORD; -typedef enum -{ - ZJT_START_DOC, - ZJT_END_DOC, - ZJT_START_PAGE, - ZJT_END_PAGE, - ZJT_JBIG_BIH, - ZJT_JBIG_HID, - ZJT_END_JBIG, - ZJT_SIGNATURE, - ZJT_RAW_IMAGE, - ZJT_START_PLANE, - ZJT_END_PLANE, - ZJT_PAUSE, - ZJT_BITMAP -} CHUNK_TYPE; - -typedef enum -{ -/* 0x00*/ ZJI_PAGECOUNT, -/* 0x01*/ ZJI_DMCOLLATE, -/* 0x02*/ ZJI_DMDUPLEX, - -/* 0x03*/ ZJI_DMPAPER, -/* 0x04*/ ZJI_DMCOPIES, -/* 0x05*/ ZJI_DMDEFAULTSOURCE, -/* 0x06*/ ZJI_DMMEDIATYPE, -/* 0x07*/ ZJI_NBIE, -/* 0x08*/ ZJI_RESOLUTION_X, -/* 0x09*/ ZJI_RESOLUTION_Y, -/* 0x0A */ ZJI_OFFSET_X, -/* 0x0B */ ZJI_OFFSET_Y, -/* 0x0C */ ZJI_RASTER_X, -/* 0x0D */ ZJI_RASTER_Y, - -/* 0x0E */ ZJI_COLLATE, -/* 0x0F */ ZJI_QUANTITY, - -/* 0x10 */ ZJI_VIDEO_BPP, -/* 0x11 */ ZJI_VIDEO_X, -/* 0x12 */ ZJI_VIDEO_Y, -/* 0x13 */ ZJI_INTERLACE, -/* 0x14 */ ZJI_PLANE, -/* 0x15 */ ZJI_PALETTE, - -/* 0x16 */ ZJI_RET, -/* 0x17 */ ZJI_TONER_SAVE, - -/* 0x18 */ ZJI_MEDIA_SIZE_X, -/* 0x19 */ ZJI_MEDIA_SIZE_Y, -/* 0x1A */ ZJI_MEDIA_SIZE_UNITS, - -/* 0x1B */ ZJI_CHROMATIC, - -/* 0x63 */ ZJI_PAD = 99, - -/* 0x64 */ ZJI_PROMPT, - -/* 0x65 */ ZJI_BITMAP_TYPE, -/* 0x66 */ ZJI_ENCODING_DATA, -/* 0x67 */ ZJI_END_PLANE, - -/* 0x68 */ ZJI_BITMAP_PIXELS, -/* 0x69 */ ZJI_BITMAP_LINES, -/* 0x6A */ ZJI_BITMAP_BPP, -/* 0x6B */ ZJI_BITMAP_STRIDE, - -} ZJ_ITEM; - -typedef enum -{ - RET_OFF = 0, - RET_ON, - RET_AUTO, - RET_LIGHT, - RET_MEDIUM, - RET_DARK -} RET_VALUE; - -typedef enum -{ - ZJIT_UINT32 = 1, - ZJIT_INT32, - ZJIT_STRING, - ZJIT_BYTELUT -} CHUNK_ITEM_TYPE; - -// very frequently used fragments made into macros for readability -#define CERRCHECK if (constructor_error != NO_ERROR) {dbglog("CERRCHECK fired\n"); return;} -#define ERRCHECK if (err != NO_ERROR) {dbglog("ERRCHECK fired\n"); return err;} -#define NEWCHECK(x) if (x==NULL) return ALLOCMEM_ERROR; -#define CNEWCHECK(x) if (x==NULL) { constructor_error=ALLOCMEM_ERROR; return; } - -#define CUSTOM_MEDIA_SIZE 101 - -enum COLORTYPE -{ - COLORTYPE_COLOR, // 0 - COLORTYPE_BLACK, // 1 - COLORTYPE_BOTH -}; - -typedef struct ColorMap_s -{ - uint32_t *ulMap1; - uint32_t *ulMap2; - unsigned char *ulMap3; -} ColorMap; - -enum COMPRESS_MODE -{ - COMPRESS_MODE0 = 0, - COMPRESS_MODE2 = 2, - COMPRESS_MODE9 = 9, - COMPRESS_MODE_AUTO = 10, - COMPRESS_MODE_JPEG = 11, - COMPRESS_MODE_LJ = 12, - COMPRESS_MODE_GRAFIT = 16 -}; - -enum COMPRESSOR_TYPE -{ - COMPRESSOR_JPEG_QUICKCONNECT, - COMPRESSOR_JPEG_JETREADY, - COMPRESSOR_TAOS -}; - -const int QTABLE_SIZE = 64; -// jpeglib.h declares these as UINT16, which is defined as unsigned short in jmorecfg.h -typedef struct QTableInfo_s -{ - DWORD qtable0[QTABLE_SIZE]; - DWORD qtable1[QTABLE_SIZE]; - DWORD qtable2[QTABLE_SIZE]; - unsigned int qFactor; -} QTableInfo; - -typedef struct PrintMode_s -{ - const char *name; -// The resolutions can be different for different planes - unsigned int ResolutionX[MAXCOLORPLANES]; - unsigned int ResolutionY[MAXCOLORPLANES]; - - unsigned int ColorDepth[MAXCOLORPLANES]; - unsigned int dyeCount; // number of inks in the pen(s) - - HALFTONING_ALGORITHM eHT; - - ColorMap cmap; - - unsigned int BaseResX,BaseResY; - bool MixedRes; - - const unsigned char* BlackFEDTable; - const unsigned char* ColorFEDTable; -} PrintMode; - -typedef struct -{ - const char *printer_platform_name; - PrintMode *print_modes; - int count; -} PrintModeTable; - -typedef struct QualityAttributes_s -{ - int media_type; - int media_subtype; - int print_quality; - unsigned int horizontal_resolution; - unsigned int vertical_resolution; - unsigned int actual_vertical_resolution; - char print_mode_name[32]; -} QualityAttributes; - -typedef struct MediaAttributes_s -{ - int pcl_id; - int physical_width; - int physical_height; - int printable_width; - int printable_height; - int printable_start_x; - int printable_start_y; - int horizontal_overspray; - int vertical_overspray; - int left_overspray; - int top_overspray; -} MediaAttributes; - -typedef struct JobAttributes_s -{ - int media_source; - int color_mode; - DUPLEXMODE e_duplex_mode; - int print_borderless; - int krgb_mode; - int mech_offset; - QualityAttributes quality_attributes; - MediaAttributes media_attributes; - int job_id; - int page_order; - int total_pages; - char job_title[128]; - char user_name[32]; - char host_name[32]; - char domain_name[32]; - char os_name[160]; - char driver_version[32]; - char driver_name[128]; - char printer_name[160]; - char job_start_time[32]; - char uuid[64]; - char printer_platform[32]; - char printer_language[32]; - int integer_values[16]; - int printer_platform_version; -} JobAttributes; - -#endif // COMMON_DEFINITIONS_H - +/*****************************************************************************\
+ CommonDefinitions.h : common header
+
+ Copyright (c) 1996 - 2009, Hewlett-Packard Co.
+ All rights reserved.
+
+ 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.
+
+ Author: Naga Samrat Chowdary Narla,
+\*****************************************************************************/
+
+#ifndef COMMON_DEFINITIONS_H
+#define COMMON_DEFINITIONS_H
+
+#include <stdio.h>
+#include <inttypes.h>
+#include <stdint.h>
+//#include <machine/types.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <cups/cups.h>
+#include <cups/raster.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <assert.h>
+#include <time.h>
+#include <sys/timeb.h>
+#include <string.h>
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#define BASIC_LOG 1
+#define SAVE_PCL_FILE 2
+#define SAVE_INPUT_RASTERS 4
+#define SEND_TO_PRINTER_ALSO 8
+
+#define MAX_COLORTYPE 2
+#define NUMBER_PLANES 3
+
+#define ASSERT assert
+
+#define _STRINGIZE(x) #x
+#define STRINGIZE(x) _STRINGIZE(x)
+
+#define dbglog(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); \
+fprintf(stderr, __FILE__ " " STRINGIZE(__LINE__) ": " args);}
+
+
+typedef unsigned char BYTE;
+
+#ifndef ABS
+ #define ABS(x) ( ((x)<0) ? -(x) : (x) )
+#endif
+
+#ifndef MIN
+ #define MIN(a,b) (((a)>=(b))?(b):(a))
+#endif
+
+#ifndef MAX
+ #define MAX(a,b) (((a)<=(b))?(b):(a))
+#endif
+
+#ifdef APDK_LITTLE_ENDIAN
+ #define GetRed(x) (((x >> 16) & 0x0FF))
+ #define GetGreen(x) (((x >> 8) & 0x0FF))
+ #define GetBlue(x) ((x & 0x0FF))
+ #else
+ #define GetRed(x) (((x >> 24) & 0x0FF))
+ #define GetGreen(x) (((x >> 16) & 0x0FF))
+ #define GetBlue(x) (((x >> 8) & 0x0FF))
+ #endif
+
+#ifdef BLACK_PEN
+ #undef BLACK_PEN
+#endif
+
+#ifdef NO_ERROR
+ #undef NO_ERROR
+#endif
+
+#define HIBYTE(sVar) (BYTE) ((sVar & 0xFF00) >> 8)
+#define LOBYTE(sVar) (BYTE) ((sVar & 0x00FF))
+#ifndef LOWORD
+ #define LOWORD(l) ((unsigned short) (l))
+#endif
+
+#ifndef HIWORD
+ #define HIWORD(l) ((unsigned short) (((uint32_t) (l) >> 16) & 0xFFFF))
+#endif
+
+#define PCL_BUFFER_SIZE 10000
+
+typedef unsigned short UInt16;
+typedef unsigned long UInt32;
+typedef unsigned char UChar;
+typedef unsigned int Int16;
+typedef long Int32;
+
+typedef struct RASTERDATA
+{
+ int rastersize[MAX_COLORTYPE];
+ BYTE *rasterdata[MAX_COLORTYPE];
+} RASTERDATA;
+
+const int MAXCOLORDEPTH = 3;
+
+const int MAXCOLORPLANES = 6; // current max anticipated, 6 for 690 photopen
+
+const int MAXCOLORROWS = 2; // multiple of high-to-low for mixed-resolution cases
+
+enum HALFTONING_ALGORITHM
+{
+ FED,
+ MATRIX
+};
+
+/*
+ * values of DRIVER_ERROR
+ * Values < 0 are warnings
+ */
+
+typedef enum
+{
+
+// general or system errors
+ NO_ERROR = 0x00, //!< everything okay
+ JOB_CANCELED = 0x01, //!< CANCEL chosen by user
+ SYSTEM_ERROR = 0x02, //!< something bad that should not have happened
+ ALLOCMEM_ERROR = 0x03, //!< failed to allocate memory
+ NO_PRINTER_SELECTED = 0x04, //!< indicates improper calling sequence or unidi
+ INDEX_OUT_OF_RANGE = 0x05, //!< what it says
+ ILLEGAL_RESOLUTION = 0x06, //!< tried to set resolution at unacceptable value
+ NULL_POINTER = 0x07, //!< supplied ptr was null
+ MISSING_PENS = 0x08, //!< one or more printhead/pen missing
+
+// build-related
+// (items either absent from current build, or just bad index from client code)
+ UNSUPPORTED_PRINTER = 0x10, //!< selected printer-type unsupported in build
+ UNSUPPORTED_PEN = 0x11, //!< selected pen-type unsupported
+ GRAPHICS_UNSUPPORTED = 0x13, //!< no graphics allowed in current build
+ ILLEGAL_COORDS = 0x15, //!< bad (x,y) passed to TextOut
+ BAD_INPUT_WIDTH = 0x18, //!< inputwidth is 0 and
+ OUTPUTWIDTH_EXCEEDS_PAGEWIDTH = 0x19, //!< inputwidth exceeds printable width
+ UNSUPPORTED_PRINTMODE = 0x19, //!< requested printmode not available
+
+// I/O related
+ IO_ERROR = 0x20, //!< I/O error communicating with printer
+ BAD_DEVICE_ID = 0x21, //!< bad or garbled device id from printer
+ CONTINUE_FROM_BLOCK = 0x22, //!< continue from blocked state for printers with no buttons
+
+// Runtime related
+ PLUGIN_LIBRARY_MISSING = 0x30, //!< a required plugin (dynamic) library is missing
+
+// WARNINGS
+// convention is that values < 0 can be ignored (at user's peril)
+ WARN_MODE_MISMATCH = -1, //!< printmode selection incompatible with pen, tray, etc.
+ WARN_DUPLEX = -2, //!< duplexer installed; our driver can't use it
+ WARN_LOW_INK_BOTH_PENS= -3, //!< sensor says pens below threshold
+ WARN_LOW_INK_BLACK = -4, //!< sensor says black pen below threshold
+ WARN_LOW_INK_COLOR = -5, //!< sensor says color pen below threshold
+
+ WARN_LOW_INK_PHOTO = -10, //!< sensor says photo pen below threshold
+ WARN_LOW_INK_GREY = -11, //!< sensor says grey pen below threshold
+ WARN_LOW_INK_BLACK_PHOTO = -12, //!< sensor says black and photo pens below threshold
+ WARN_LOW_INK_COLOR_PHOTO = -13, //!< sensor says color and photo pens below threshold
+ WARN_LOW_INK_GREY_PHOTO = -14, //!< sensor says grey and photo pens below threshold
+ WARN_LOW_INK_COLOR_GREY = -15, //!< sensor says color and grey pens below threshold
+ WARN_LOW_INK_COLOR_GREY_PHOTO = -16, //!< sensor says color, photo, and grey pens below threshold
+ WARN_LOW_INK_COLOR_BLACK_PHOTO = -17, //!< sensor says color, photo, and black pens below threshold
+ WARN_LOW_INK_CYAN = -18, //!< sensor says cyan ink below threshold
+ WARN_LOW_INK_MAGENTA = -19, //!< sensor says magenta ink below threshold
+ WARN_LOW_INK_YELLOW = -20, //!< sensor says yellow ink below threshold
+ WARN_LOW_INK_MULTIPLE_PENS = - 21, //!< sensor says more than one pen below threshold
+ WARN_ILLEGAL_PAPERSIZE = -8, //!< papersize illegal for given hardware
+ ILLEGAL_PAPERSIZE = -8,
+ WARN_INVALID_MEDIA_SOURCE = -9, //!< media source tray is invalid
+
+ eCreate_Thread_Error = 128 //! Thread error creating the error....
+} DRIVER_ERROR; //DRIVER_ERROR
+
+enum DUPLEXMODE
+{
+ DUPLEXMODE_NONE,
+ DUPLEXMODE_BOOK,
+ DUPLEXMODE_TABLET
+};
+
+enum ENDIAN_TYPE
+{
+ LITTLEENDIAN,
+ BIGENDIAN
+};
+
+// used to encourage consistent ordering of color planes
+#define PLANE_K 0
+#define PLANE_C 1
+#define PLANE_M 2
+#define PLANE_Y 3
+#define Clight 4
+#define Mlight 5
+#define kWhite 0x00FFFFFE
+
+#define K 0
+#define C 1
+#define M 2
+#define Y 3
+#define Clight 4
+#define Mlight 5
+#define RANDSEED 77
+
+/*
+ * ZJStream related definitions
+ */
+
+typedef uint32_t DWORD;
+typedef unsigned short WORD;
+typedef enum
+{
+ ZJT_START_DOC,
+ ZJT_END_DOC,
+ ZJT_START_PAGE,
+ ZJT_END_PAGE,
+ ZJT_JBIG_BIH,
+ ZJT_JBIG_HID,
+ ZJT_END_JBIG,
+ ZJT_SIGNATURE,
+ ZJT_RAW_IMAGE,
+ ZJT_START_PLANE,
+ ZJT_END_PLANE,
+ ZJT_PAUSE,
+ ZJT_BITMAP
+} CHUNK_TYPE;
+
+typedef enum
+{
+/* 0x00*/ ZJI_PAGECOUNT,
+/* 0x01*/ ZJI_DMCOLLATE,
+/* 0x02*/ ZJI_DMDUPLEX,
+
+/* 0x03*/ ZJI_DMPAPER,
+/* 0x04*/ ZJI_DMCOPIES,
+/* 0x05*/ ZJI_DMDEFAULTSOURCE,
+/* 0x06*/ ZJI_DMMEDIATYPE,
+/* 0x07*/ ZJI_NBIE,
+/* 0x08*/ ZJI_RESOLUTION_X,
+/* 0x09*/ ZJI_RESOLUTION_Y,
+/* 0x0A */ ZJI_OFFSET_X,
+/* 0x0B */ ZJI_OFFSET_Y,
+/* 0x0C */ ZJI_RASTER_X,
+/* 0x0D */ ZJI_RASTER_Y,
+
+/* 0x0E */ ZJI_COLLATE,
+/* 0x0F */ ZJI_QUANTITY,
+
+/* 0x10 */ ZJI_VIDEO_BPP,
+/* 0x11 */ ZJI_VIDEO_X,
+/* 0x12 */ ZJI_VIDEO_Y,
+/* 0x13 */ ZJI_INTERLACE,
+/* 0x14 */ ZJI_PLANE,
+/* 0x15 */ ZJI_PALETTE,
+
+/* 0x16 */ ZJI_RET,
+/* 0x17 */ ZJI_TONER_SAVE,
+
+/* 0x18 */ ZJI_MEDIA_SIZE_X,
+/* 0x19 */ ZJI_MEDIA_SIZE_Y,
+/* 0x1A */ ZJI_MEDIA_SIZE_UNITS,
+
+/* 0x1B */ ZJI_CHROMATIC,
+
+/* 0x63 */ ZJI_PAD = 99,
+
+/* 0x64 */ ZJI_PROMPT,
+
+/* 0x65 */ ZJI_BITMAP_TYPE,
+/* 0x66 */ ZJI_ENCODING_DATA,
+/* 0x67 */ ZJI_END_PLANE,
+
+/* 0x68 */ ZJI_BITMAP_PIXELS,
+/* 0x69 */ ZJI_BITMAP_LINES,
+/* 0x6A */ ZJI_BITMAP_BPP,
+/* 0x6B */ ZJI_BITMAP_STRIDE,
+
+} ZJ_ITEM;
+
+typedef enum
+{
+ RET_OFF = 0,
+ RET_ON,
+ RET_AUTO,
+ RET_LIGHT,
+ RET_MEDIUM,
+ RET_DARK
+} RET_VALUE;
+
+typedef enum
+{
+ ZJIT_UINT32 = 1,
+ ZJIT_INT32,
+ ZJIT_STRING,
+ ZJIT_BYTELUT
+} CHUNK_ITEM_TYPE;
+
+// very frequently used fragments made into macros for readability
+#define CERRCHECK if (constructor_error != NO_ERROR) {dbglog("CERRCHECK fired\n"); return;}
+#define ERRCHECK if (err != NO_ERROR) {dbglog("ERRCHECK fired\n"); return err;}
+#define NEWCHECK(x) if (x==NULL) return ALLOCMEM_ERROR;
+#define CNEWCHECK(x) if (x==NULL) { constructor_error=ALLOCMEM_ERROR; return; }
+
+#define CUSTOM_MEDIA_SIZE 101
+
+#define EVENT_PRINT_FAILED_MISSING_PLUGIN 502
+enum COLORTYPE
+{
+ COLORTYPE_COLOR, // 0
+ COLORTYPE_BLACK, // 1
+ COLORTYPE_BOTH
+};
+
+typedef struct ColorMap_s
+{
+ uint32_t *ulMap1;
+ uint32_t *ulMap2;
+ unsigned char *ulMap3;
+} ColorMap;
+
+enum COMPRESS_MODE
+{
+ COMPRESS_MODE0 = 0,
+ COMPRESS_MODE2 = 2,
+ COMPRESS_MODE9 = 9,
+ COMPRESS_MODE_AUTO = 10,
+ COMPRESS_MODE_JPEG = 11,
+ COMPRESS_MODE_LJ = 12,
+ COMPRESS_MODE_GRAFIT = 16
+};
+
+enum COMPRESSOR_TYPE
+{
+ COMPRESSOR_JPEG_QUICKCONNECT,
+ COMPRESSOR_JPEG_JETREADY,
+ COMPRESSOR_TAOS
+};
+
+const int QTABLE_SIZE = 64;
+// jpeglib.h declares these as UINT16, which is defined as unsigned short in jmorecfg.h
+typedef struct QTableInfo_s
+{
+ DWORD qtable0[QTABLE_SIZE];
+ DWORD qtable1[QTABLE_SIZE];
+ DWORD qtable2[QTABLE_SIZE];
+ unsigned int qFactor;
+} QTableInfo;
+
+typedef struct PrintMode_s
+{
+ const char *name;
+// The resolutions can be different for different planes
+ unsigned int ResolutionX[MAXCOLORPLANES];
+ unsigned int ResolutionY[MAXCOLORPLANES];
+
+ unsigned int ColorDepth[MAXCOLORPLANES];
+ unsigned int dyeCount; // number of inks in the pen(s)
+
+ HALFTONING_ALGORITHM eHT;
+
+ ColorMap cmap;
+
+ unsigned int BaseResX,BaseResY;
+ bool MixedRes;
+
+ const unsigned char* BlackFEDTable;
+ const unsigned char* ColorFEDTable;
+} PrintMode;
+
+typedef struct
+{
+ const char *printer_platform_name;
+ PrintMode *print_modes;
+ int count;
+} PrintModeTable;
+
+typedef struct QualityAttributes_s
+{
+ int media_type;
+ int media_subtype;
+ int print_quality;
+ unsigned int horizontal_resolution;
+ unsigned int vertical_resolution;
+ unsigned int actual_vertical_resolution;
+ char print_mode_name[32];
+} QualityAttributes;
+
+typedef struct MediaAttributes_s
+{
+ int pcl_id;
+ int physical_width;
+ int physical_height;
+ int printable_width;
+ int printable_height;
+ int printable_start_x;
+ int printable_start_y;
+ int horizontal_overspray;
+ int vertical_overspray;
+ int left_overspray;
+ int top_overspray;
+} MediaAttributes;
+
+typedef struct JobAttributes_s
+{
+ int media_source;
+ int color_mode;
+ DUPLEXMODE e_duplex_mode;
+ int print_borderless;
+ int krgb_mode;
+ int mech_offset;
+ QualityAttributes quality_attributes;
+ MediaAttributes media_attributes;
+ int job_id;
+ int page_order;
+ int total_pages;
+ char job_title[128];
+ char user_name[32];
+ char host_name[32];
+ char domain_name[32];
+ char os_name[160];
+ char driver_version[32];
+ char driver_name[128];
+ char printer_name[160];
+ char job_start_time[32];
+ char uuid[64];
+ char printer_platform[32];
+ char printer_language[32];
+ int integer_values[16];
+ int printer_platform_version;
+ int pre_process_raster;
+} JobAttributes;
+
+#endif // COMMON_DEFINITIONS_H
+
diff --git a/prnt/hpcups/Encapsulator.cpp b/prnt/hpcups/Encapsulator.cpp index 894e5fcc7..530fb9634 100644 --- a/prnt/hpcups/Encapsulator.cpp +++ b/prnt/hpcups/Encapsulator.cpp @@ -274,3 +274,10 @@ void Encapsulator::sendJobHeader() return; } + +DRIVER_ERROR Encapsulator::preProcessRasterData(cups_raster_t **cups_raster, cups_page_header2_t* firstpage_cups_header, char* pSwapedPagesFileName) +{ + dbglog ("DEBUG: Encapsulator::preProcessRasterData.............. \n"); + return NO_ERROR; +} + diff --git a/prnt/hpcups/Encapsulator.h b/prnt/hpcups/Encapsulator.h index ac14a33f4..50587bce1 100644 --- a/prnt/hpcups/Encapsulator.h +++ b/prnt/hpcups/Encapsulator.h @@ -53,6 +53,7 @@ public: virtual void SetLastBand() {} virtual bool UnpackBits() {return true;} virtual void CancelJob(); + virtual DRIVER_ERROR preProcessRasterData(cups_raster_t **cups_raster, cups_page_header2_t* firstpage_cups_header, char* pSwapedPagesFileName); protected: void addToHeader(const BYTE *command_string, int length); diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index 0967fcc9e..514e285d9 100644 --- a/prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp @@ -1,825 +1,866 @@ -/*****************************************************************************\ - HPCupsFilter.cpp : Interface for HPCupsFilter class - - Copyright (c) 1996 - 2009, Hewlett-Packard Co. - All rights reserved. - - 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. - - Author: Naga Samrat Chowdary Narla, -\*****************************************************************************/ - -#include "HPCupsFilter.h" -#include <signal.h> -#include <sys/wait.h> -#include <sys/utsname.h> -#include <time.h> -#include <sys/timeb.h> - -#define HP_FILE_VERSION_STR "03.09.08.0" - -static HPCupsFilter filter; -int main (int argc, char *argv[]) -{ - openlog("hpcups", LOG_PID, LOG_DAEMON); - - if (argc < 6 || argc > 7) { - dbglog("ERROR: %s job-id user title copies options [file]\n", *argv); - return JOB_CANCELED; - } - - return filter.StartPrintJob(argc, argv); -} - -void HPCancelJob(int sig) -{ - filter.CancelJob(); - exit(0); -} - -void HPCupsFilter::CreateBMPHeader (int width, int height, int planes, int bpp) -{ - memset (&this->bmfh, 0, 14); - memset (&this->bmih, 0, 40); - bmfh.bfOffBits = 54; - bmfh.bfType = 0x4d42; - bmfh.bfReserved1 = 0; - bmfh.bfReserved2 = 0; - bmih.biSize = DBITMAPINFOHEADER; - bmih.biWidth = width; - bmih.biHeight = -height; - bmih.biPlanes = 1; - bmih.biBitCount = planes * bpp; - bmih.biCompression = 0; - bmih.biSizeImage = width * height * planes * bpp / 8; - bmih.biClrImportant = 0; - bmih.biClrUsed = (planes == 3) ? 0 : 2; - bmih.biXPelsPerMeter = 0; - bmih.biYPelsPerMeter = 0; - - bmfh.bfOffBits += bmih.biClrUsed * 4; - bmfh.bfSize = bmih.biSizeImage + bmfh.bfOffBits; -} - -void HPCupsFilter::WriteBMPHeader (FILE *fp, int width, int height, eRasterType raster_type) -{ - if (fp == NULL) - { - return; - } - if (raster_type == BLACK_RASTER) - { - WriteKBMPHeader (fp, width, height); - } - else - { - WriteCBMPHeader (fp, width, height); - } -} - -void HPCupsFilter::WriteCBMPHeader (FILE *fp, int width, int height) -{ - if (fp == NULL) - return; - adj_c_width = width; - if (width % 4) - { - adj_c_width = (width / 4 + 1) * 4; - } - color_raster = new BYTE[adj_c_width * 3]; - memset (color_raster, 0xFF, adj_c_width * 3); - CreateBMPHeader(adj_c_width, height, 3, 8); - fwrite (&this->bmfh.bfType, 1, sizeof (short), fp); - fwrite (&this->bmfh.bfSize, 1, sizeof (int), fp); - fwrite (&this->bmfh.bfReserved1, 1, sizeof (short), fp); - fwrite (&this->bmfh.bfReserved2, 1, sizeof (short), fp); - fwrite (&this->bmfh.bfOffBits, 1, sizeof (int), fp); - fwrite (&this->bmih, 1, DBITMAPINFOHEADER, fp); -} - -void HPCupsFilter::WriteKBMPHeader(FILE *fp, int width, int height) -{ - BYTE cmap[8]; - if (fp == NULL) - return; - adj_k_width = width; - if (width % 32) - { - adj_k_width = (width / 32 + 1) * 32; - } - CreateBMPHeader(adj_k_width, height, 1, 1); - adj_k_width /= 8; - black_raster = new BYTE[adj_k_width]; - memset (black_raster, 0, adj_k_width); - - fwrite (&this->bmfh.bfType, 1, sizeof (short), fp); - fwrite (&this->bmfh.bfSize, 1, sizeof (int), fp); - fwrite (&this->bmfh.bfReserved1, 1, sizeof (short), fp); - fwrite (&this->bmfh.bfReserved2, 1, sizeof (short), fp); - fwrite (&this->bmfh.bfOffBits, 1, sizeof (int), fp); - fwrite (&this->bmih, 1, DBITMAPINFOHEADER, fp); - memset(cmap, 0, sizeof(cmap)); - cmap[0] = cmap[1] = cmap[2] = cmap[3] = 255; - fwrite(cmap, 1, sizeof(cmap), fp); -} - -void HPCupsFilter::WriteBMPRaster (FILE *fp, BYTE *raster, int width, eRasterType raster_type) -{ - if (raster_type == BLACK_RASTER) - return WriteKBMPRaster (fp, raster, width); - else - return WriteCBMPRaster (fp, raster, width); -} - -void HPCupsFilter::WriteCBMPRaster (FILE *fp, BYTE *pbyrgb, int width) -{ - if (fp == NULL) - return; - //BYTE c[3]; - int i; - BYTE *p = pbyrgb; - BYTE *q = color_raster; - if (pbyrgb == NULL) - { - memset (color_raster, 0xFF, adj_c_width * 3); - } - else - { - for (i = 0; i < width; i++) { - q[0] = p[2]; - q[1] = p[1]; - q[2] = p[0]; - p += 3; - q += 3; - } - } - fwrite (color_raster, 1, adj_c_width * 3, fp); -} - -void HPCupsFilter::WriteKBMPRaster (FILE *fp, BYTE *pbyk, int width) -{ - if (fp == NULL) - return; - if (pbyk == NULL) - { - memset (black_raster, 0, adj_k_width); - } - else - { - memcpy (black_raster, pbyk, width); - } - fwrite (black_raster, 1, adj_k_width, fp); -} - -HPCupsFilter::HPCupsFilter() : m_pPrinterBuffer(NULL) -{ - setbuf (stderr, NULL); - - adj_c_width = 0; - adj_k_width = 0; - black_raster = NULL; - color_raster = NULL; -} - -HPCupsFilter::~HPCupsFilter() -{ - -} - -void HPCupsFilter::closeFilter () -{ - //! If we printed any pages, end the current job instance. - m_Job.Cleanup(); - cleanup(); -} - -void HPCupsFilter::cleanup() -{ - if (m_pPrinterBuffer) { - delete [] m_pPrinterBuffer; - } - - if(m_ppd){ - ppdClose(m_ppd); - m_ppd = NULL; - } -} - -void HPCupsFilter::CancelJob() -{ - m_Job.CancelJob(); - cleanup(); -} - -DRIVER_ERROR HPCupsFilter::startPage (cups_page_header2_t *cups_header) -{ - DRIVER_ERROR err = NO_ERROR; - ppd_attr_t *attr; - int xoverspray = 120; - int yoverspray = 60; - -/* - * Check for invalid data - */ - if (cups_header->HWResolution[0] == 100 && cups_header->HWResolution[1] == 100) - { - -/* - * Something went wrong, cups is defaulting to 100 dpi. - * Some inkjet printers do not support 100 dpi. Return error. - */ - - dbglog("ERROR: Unsupported resolution\n"); - return JOB_CANCELED; - } - -// XOverSpray and YOverSpray are entered as fractional value * 1000 - - if (((attr = ppdFindAttr(m_ppd, "HPXOverSpray", NULL)) != NULL) && - (attr && attr->value != NULL)) { - xoverspray = atoi(attr->value); - } - if (((attr = ppdFindAttr(m_ppd, "HPYOverSpray", NULL)) != NULL) && - (attr && attr->value != NULL)) { - yoverspray = atoi(attr->value); - } - - if (m_iLogLevel & BASIC_LOG) { - printCupsHeaderInfo(cups_header); - } - - m_JA.quality_attributes.media_type = cups_header->cupsMediaType; - m_JA.quality_attributes.print_quality = atoi(cups_header->OutputType); - m_JA.quality_attributes.horizontal_resolution = cups_header->HWResolution[0]; - m_JA.quality_attributes.vertical_resolution = cups_header->HWResolution[1]; - m_JA.quality_attributes.actual_vertical_resolution = cups_header->HWResolution[1]; - -// Get the printer's actual resolution, may be different than what is reported - char *p; - if ((p = strstr (cups_header->OutputType, "_"))) { - int x = 0, y = 0; - p++; - x = atoi(p); - while (*p && *p != 'x') - p++; - if (*p && *p == 'x') { - p++; - y = atoi(p); - } -// Currently, there is one printer with one printmode that supports lower y-resolution - if (y != 0) { - m_JA.quality_attributes.actual_vertical_resolution = y; - } - } - m_JA.color_mode = cups_header->cupsRowStep; - m_JA.media_source = cups_header->MediaPosition; - - m_JA.print_borderless = (cups_header->ImagingBoundingBox[0] == 0) ? true : false; - if (cups_header->Duplex) { - m_JA.e_duplex_mode = (cups_header->Tumble == 0) ? DUPLEXMODE_BOOK : DUPLEXMODE_TABLET; - } - else { - m_JA.e_duplex_mode = DUPLEXMODE_NONE; - } - m_JA.krgb_mode = (cups_header->cupsColorSpace == CUPS_CSPACE_RGBW) ? true : false; - - /* - * Cups PageSize dimensions are in PostScript units, which are 72 units to an inch - * and is stored as <width, height> - * The ImagingBoundingBox is in PostScript units and are stored as <lower_left> <upper_right> - * and <0, 0> is at the bottom left - * lower_left_x = ImagingBoundingBox[0] - * lower_left_y = ImagingBoundingBox[1] - * upper_right_x = ImagingBoundingBox[2] - * upper_right_y = ImagingBoundingBox[3] - * We require <top_left> <bottom_right> values and <0, 0> is top left - * So, - * PrintableStartX = lower_left_x - * PrintableStartY = PhysicalPageHeight - upper_right_y - */ - - int horz_res = cups_header->HWResolution[0]; - int vert_res = cups_header->HWResolution[1]; - m_JA.media_attributes.pcl_id = cups_header->cupsInteger[0]; - m_JA.media_attributes.physical_width = (cups_header->PageSize[0] * horz_res) / 72; - m_JA.media_attributes.physical_height = (cups_header->PageSize[1] * vert_res) / 72; - m_JA.media_attributes.printable_width = cups_header->cupsWidth; - m_JA.media_attributes.printable_height = cups_header->cupsHeight; - - m_JA.media_attributes.printable_start_x = (cups_header->Margins[0] * horz_res) / 72; - m_JA.media_attributes.printable_start_y = ((cups_header->PageSize[1] - cups_header->ImagingBoundingBox[3]) * vert_res) / 72; - - m_JA.media_attributes.horizontal_overspray = (xoverspray * horz_res) / 1000; - m_JA.media_attributes.vertical_overspray = (yoverspray * vert_res) / 1000; - - /* - * Left and top overspray in dots. We haven't defined ovespray for all classes in the drv. - * Hence using default values in the case of older classes. - */ - m_JA.media_attributes.left_overspray = cups_header->cupsReal[0] ? (cups_header->cupsReal[0] * horz_res) : m_JA.media_attributes.horizontal_overspray / 2; - m_JA.media_attributes.top_overspray = cups_header->cupsReal[1] ? (cups_header->cupsReal[1] * vert_res) : m_JA.media_attributes.vertical_overspray / 2; - - if (((attr = ppdFindAttr(m_ppd, "HPMechOffset", NULL)) != NULL) && - (attr && attr->value != NULL)) { - m_JA.mech_offset = atoi(attr->value); - } - -// Get printer platform name - if (((attr = ppdFindAttr(m_ppd, "hpPrinterPlatform", NULL)) != NULL) && - (attr->value != NULL)) { - strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1); - 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 - - if (((attr = ppdFindAttr(m_ppd, "hpPrinterLanguage", NULL)) == NULL) || - (attr && attr->value == NULL)) { - dbglog("DEBUG: Bad PPD - hpPrinterLanguage not found\n"); - ppdClose(m_ppd); - m_ppd = NULL; - return SYSTEM_ERROR; - } - strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1); - if (m_iLogLevel & BASIC_LOG) { - dbglog("HPCUPS: found Printer Language, it is - %s", attr->value); - } - -// Fill in the other PCL header info - - struct utsname uts_name; - uname(&uts_name); - strncpy(m_JA.job_title, m_argv[3], sizeof(m_JA.job_title)-1); - strncpy(m_JA.user_name, m_argv[2], sizeof(m_JA.user_name)-1); - strncpy(m_JA.host_name, uts_name.nodename, sizeof(m_JA.host_name)-1); - strncpy(m_JA.os_name, uts_name.sysname, sizeof(m_JA.os_name)-1); - getdomainname(m_JA.domain_name, sizeof(m_JA.domain_name) - 1); - int i = strlen(m_argv[0]) - 1; - while (i >= 0 && m_argv[0][i] != '/') { - i--; - } - snprintf(m_JA.driver_name, sizeof(m_JA.driver_name), "%s; %s", &m_argv[0][i+1], HP_FILE_VERSION_STR); - char *ptr = getenv("DEVICE_URI"); - i = 0; - if (ptr) { - while (*ptr) { - if (*ptr == '%') { - ptr += 3; - m_JA.printer_name[i++] = ' '; - } - m_JA.printer_name[i++] = *ptr++; - } - } - ptr = strstr(m_argv[5], "job-uuid"); - if (ptr) { - strncpy(m_JA.uuid, ptr + strlen("job-uuid=urn:uuid:"), sizeof(m_JA.uuid)-1); - } - - for (i = 0; i < 16; i++) - m_JA.integer_values[i] = cups_header->cupsInteger[i]; - - if (cups_header->cupsString[0]) { - strncpy(m_JA.quality_attributes.print_mode_name, &cups_header->cupsString[0][0], - sizeof(m_JA.quality_attributes.print_mode_name)-1); - } - Encapsulator *encap_interface = EncapsulatorFactory::GetEncapsulator(attr->value); - if ((err = m_Job.Init(m_pSys, &m_JA, encap_interface)) != NO_ERROR) - { - if (err == PLUGIN_LIBRARY_MISSING) - fputs ("STATE: +hplip.plugin-error\n", stderr); - dbglog ("m_Job initialization failed with error = %d", err); - ppdClose(m_ppd); - m_ppd = NULL; - return err; - } - - if (m_iLogLevel & BASIC_LOG) { - dbglog("HPCUPS: returning NO_ERROR from startPage"); - } - - m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; - - - return NO_ERROR; -} - -int HPCupsFilter::StartPrintJob(int argc, char *argv[]) -{ - int fd = 0; - cups_raster_t *cups_raster; - int err = 0; - - memset(&m_JA, 0, sizeof(JobAttributes)); - struct tm *t; - struct timeb tb; - time_t long_time; - time(&long_time); - t = localtime(&long_time); - ftime(&tb); - strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1); // returns Fri Jun 5 08:12:16 2009 - snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds - - getLogLevel(); - m_JA.job_id = atoi(argv[1]); - FILE *fp; - char dFileName[32]; - memset(dFileName, 0, sizeof(dFileName)); - m_JA.job_id = atoi(argv[1]); - snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id); - if ((fp = fopen (dFileName, "r"))) - { - char line[258]; - for (int i = 0; i < 10; i++) - { - fgets (line, 256, fp); - if (!strncmp (line, "%%Pages:", 8)) - { - sscanf (line+9, "%d", &m_JA.total_pages); - break; - } - } - fclose (fp); - } - - m_ppd = ppdOpenFile(getenv("PPD")); - if (m_ppd == NULL) { - dbglog("DEBUG: ppdOpenFile failed for %s\n", getenv("PPD")); - return SYSTEM_ERROR; - } - - m_argv = argv; - if (m_iLogLevel & BASIC_LOG) { - for (int i = 0; i < argc; i++) { - dbglog("argv[%d] = %s\n", i, argv[i]); - } - } - - if (argc == 7) - { - if (m_iLogLevel & BASIC_LOG) - { - dbglog("Page Stream Data Name: %s\n", argv[6] ); - } - if ((fd = open (argv[6], O_RDONLY)) == -1) - { - perror("ERROR: Unable to open raster file - "); - return 1; - } - } - - m_pSys = new SystemServices(m_iLogLevel, m_JA.job_id); - -/* - * When user cancels a print job, the spooler sends SIGTERM signal - * to the filter. Must catch this signal to send end job sequence - * to the printer. - */ - - signal(SIGTERM, HPCancelJob); - - cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ); - - if (cups_raster == NULL) { - dbglog("cupsRasterOpen failed, fd = %d\n", fd); - if (fd != 0) { - close(fd); - } - closeFilter(); - return 1; - } - - if ((err = processRasterData(cups_raster))) { - if (fd != 0) { - close(fd); - } - if (m_iLogLevel & BASIC_LOG) - dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err); - closeFilter(); - cupsRasterClose(cups_raster); - return 1; - } - - if (fd != 0) { - close(fd); - } - if (m_iLogLevel & BASIC_LOG) - dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()"); - closeFilter(); - cupsRasterClose(cups_raster); - return 0; -} - -bool HPCupsFilter::isBlankRaster(BYTE *input_raster, cups_page_header2_t *header) -{ - int length_in_bytes = (int)header->cupsBytesPerLine; - if (input_raster == NULL) { - return true; - } - - if(header->cupsColorSpace == CUPS_CSPACE_K){ - if (*input_raster == 0x00 && - !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) { - return true; - } - } - else{ - if (*input_raster == 0xFF && - !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) { - return true; - } - } - return false; -} - -int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) -{ - FILE *kfp = NULL; - FILE *cfp = NULL; - BYTE *kRaster = NULL; - BYTE *rgbRaster = NULL; - int current_page_number = 0; - cups_page_header2_t cups_header; - DRIVER_ERROR err; - int ret_status = 0; - - - while (cupsRasterReadHeader2(cups_raster, &cups_header)) - { - current_page_number++; - - if (current_page_number == 1) { - if (startPage(&cups_header) != NO_ERROR) { - return JOB_CANCELED; - } - if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW) { - rgbRaster = new BYTE[cups_header.cupsWidth * 3]; - if (rgbRaster == NULL) { - return ALLOCMEM_ERROR; - } - kRaster = new BYTE[cups_header.cupsWidth]; - if (kRaster == NULL) { - delete [] rgbRaster; - return ALLOCMEM_ERROR; - } - memset (kRaster, 0, cups_header.cupsWidth); - memset (rgbRaster, 0xFF, cups_header.cupsWidth * 3); - } - } // current_page_number == 1 - - if (cups_header.cupsColorSpace == CUPS_CSPACE_K) { - kRaster = m_pPrinterBuffer; - rgbRaster = NULL; - } - else if (cups_header.cupsColorSpace != CUPS_CSPACE_RGBW) { - dbglog("5......\n"); - rgbRaster = m_pPrinterBuffer; - kRaster = NULL; - } - - BYTE *color_raster = NULL; - BYTE *black_raster = NULL; - - err = m_Job.StartPage(&m_JA); - if (err != NO_ERROR) { - if (m_iLogLevel & BASIC_LOG) { - dbglog ("DEBUG: Job::StartPage failed with err = %d\n", err); - } - ret_status = JOB_CANCELED; - break; - } - - if (m_iLogLevel & SAVE_INPUT_RASTERS) - { - char szFileName[32]; - memset(szFileName, 0, sizeof(szFileName)); - snprintf (szFileName, sizeof(szFileName), "/tmp/hpcupsfilterc_%d.bmp", current_page_number); - if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW || - cups_header.cupsColorSpace == CUPS_CSPACE_RGB) - { - cfp = fopen (szFileName, "w"); - chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - } - if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW || - cups_header.cupsColorSpace == CUPS_CSPACE_K) - { - szFileName[17] = 'k'; - kfp = fopen (szFileName, "w"); - chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - } - dbglog("9......\n"); - WriteBMPHeader (cfp, cups_header.cupsWidth, cups_header.cupsHeight, COLOR_RASTER); - WriteBMPHeader (kfp, cups_header.cupsWidth, cups_header.cupsHeight, BLACK_RASTER); - dbglog("10......\n"); - } - - fprintf(stderr, "PAGE: %d %s", current_page_number, m_argv[4]); - // Iterating through the raster per page - for (int y = 0; y < (int) cups_header.cupsHeight; y++) { - cupsRasterReadPixels (cups_raster, m_pPrinterBuffer, cups_header.cupsBytesPerLine); - color_raster = rgbRaster; - black_raster = kRaster; - - if (this->isBlankRaster((BYTE *) m_pPrinterBuffer, &cups_header)) { - - color_raster = NULL; - black_raster = NULL; - } - extractBlackPixels(&cups_header, black_raster, color_raster); - //! Sending Raster bits off to encapsulation - err = m_Job.SendRasters (black_raster, color_raster); - if (err != NO_ERROR) { - break; - } - WriteBMPRaster (cfp, color_raster, cups_header.cupsWidth, COLOR_RASTER); - WriteBMPRaster (kfp, black_raster, cups_header.cupsWidth/8, BLACK_RASTER); - } - m_Job.NewPage(); - if (err != NO_ERROR) { - break; - } - } - - //! Remove the old processing band data... - if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW) { - delete [] kRaster; - delete [] rgbRaster; - } - return ret_status; -} - -void HPCupsFilter::extractBlackPixels(cups_page_header2_t *cups_header, BYTE *kRaster, BYTE *rgbRaster) -{ -/* - * DON'T DO BITPACKING HERE, DO IT IN HALFTONER FOR CMYK PRINTES - * AND IN MODE9 FOR RGB PRINTERS - */ - -static BYTE pixel_value[8] = { - 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 - }; - - if (rgbRaster == NULL) { - return; - } - - if (cups_header->cupsColorSpace == CUPS_CSPACE_RGBW) { - int k = 0; - BYTE *pIn = m_pPrinterBuffer; - BYTE kVal = 0; - BYTE b; - BYTE *rgb = rgbRaster; - BYTE *black = kRaster; - memset (kRaster, 0, cups_header->cupsWidth); - - - for (unsigned int i = 0; i < cups_header->cupsWidth; i++) { - rgb[0] = *pIn++; - rgb[1] = *pIn++; - rgb[2] = *pIn++; - b = *pIn++; - - if (b != 0 && b != 0xFF) { - -#ifdef __linux - // rgb[0] -= (255 - b); - // rgb[1] -= (255 - b); - // rgb[2] -= (255 - b); - int cr,cg,cb; - cr = rgb[0] - (int)(255 - b); - rgb[0] = cr >= 0 ? cr : 0; - - cg = rgb[1] - (int)(255 - b); - rgb[1] = cg >= 0 ? cg : 0; - - cb = rgb[2] - (int)(255 - b); - rgb[2] = cb >= 0 ? cb : 0; -#else // This alternate path is for Mac.... - - rgb[0] &= b; - rgb[1] &= b; - rgb[2] &= b; -#endif - } - else - kVal |= (b == 0) ? pixel_value[k] : 0; - // else if (rgb[0] == rgb[1] && rgb[1] ==rgb[2]) - // kVal |= (rgb[0] == 0) ? pixel_value[k] : 0; - rgb += 3; - if (k == 7) { - *black++ = kVal; - kVal = 0; - k = 0; - } - else { - k++; - } - } // end of for loop - *black = kVal; - - } // end of if condition -} - -void HPCupsFilter::printCupsHeaderInfo(cups_page_header2_t *header) -{ - - dbglog ("DEBUG: startPage...\n"); - dbglog ("DEBUG: MediaClass = \"%s\"\n", header->MediaClass); - dbglog ("DEBUG: MediaColor = \"%s\"\n", header->MediaColor); - dbglog ("DEBUG: MediaType = \"%s\"\n", header->MediaType); - dbglog ("DEBUG: OutputType = \"%s\"\n", header->OutputType); - dbglog ("DEBUG: AdvanceDistance = %d\n", header->AdvanceDistance); - dbglog ("DEBUG: AdvanceMedia = %d\n", header->AdvanceMedia); - dbglog ("DEBUG: Collate = %d\n", header->Collate); - dbglog ("DEBUG: CutMedia = %d\n", header->CutMedia); - dbglog ("DEBUG: Duplex = %d\n", header->Duplex); - dbglog ("DEBUG: HWResolution = [ %d %d ]\n", header->HWResolution[0], header->HWResolution[1]); - dbglog ("DEBUG: ImagingBoundingBox = [ %d %d %d %d ]\n", - header->ImagingBoundingBox[0], header->ImagingBoundingBox[1], - header->ImagingBoundingBox[2], header->ImagingBoundingBox[3]); - dbglog ("DEBUG: InsertSheet = %d\n", header->InsertSheet); - dbglog ("DEBUG: Jog = %d\n", header->Jog); - dbglog ("DEBUG: LeadingEdge = %d\n", header->LeadingEdge); - dbglog ("DEBUG: Margins = [ %d %d ]\n", header->Margins[0], header->Margins[1]); - dbglog ("DEBUG: ManualFeed = %d\n", header->ManualFeed); - dbglog ("DEBUG: MediaPosition = %d\n", header->MediaPosition); - dbglog ("DEBUG: MediaWeight = %d\n", header->MediaWeight); - dbglog ("DEBUG: MirrorPrint = %d\n", header->MirrorPrint); - dbglog ("DEBUG: NegativePrint = %d\n", header->NegativePrint); - dbglog ("DEBUG: NumCopies = %d\n", header->NumCopies); - dbglog ("DEBUG: Orientation = %d\n", header->Orientation); - dbglog ("DEBUG: OutputFaceUp = %d\n", header->OutputFaceUp); - dbglog ("DEBUG: PageSize = [ %d %d ]\n", header->PageSize[0], header->PageSize[1]); - dbglog ("DEBUG: Separations = %d\n", header->Separations); - dbglog ("DEBUG: TraySwitch = %d\n", header->TraySwitch); - dbglog ("DEBUG: Tumble = %d\n", header->Tumble); - dbglog ("DEBUG: cupsWidth = %d\n", header->cupsWidth); - dbglog ("DEBUG: cupsHeight = %d\n", header->cupsHeight); - dbglog ("DEBUG: cupsMediaType = %d\n", header->cupsMediaType); - dbglog ("DEBUG: cupsRowStep = %d\n", header->cupsRowStep); - dbglog ("DEBUG: cupsBitsPerColor = %d\n", header->cupsBitsPerColor); - dbglog ("DEBUG: cupsBitsPerPixel = %d\n", header->cupsBitsPerPixel); - dbglog ("DEBUG: cupsBytesPerLine = %d\n", header->cupsBytesPerLine); - dbglog ("DEBUG: cupsColorOrder = %d\n", header->cupsColorOrder); - dbglog ("DEBUG: cupsColorSpace = %d\n", header->cupsColorSpace); - dbglog ("DEBUG: cupsCompression = %d\n", header->cupsCompression); - dbglog ("DEBUG: cupsPageSizeName = %s\n", header->cupsPageSizeName); - dbglog ("DEBUG: cupsInteger0 = %d\n", header->cupsInteger[0]); // max jpeg filesize - dbglog ("DEBUG: cupsInteger1 = %d\n", header->cupsInteger[1]); // Red eye removal - dbglog ("DEBUG: cupsInteger2 = %d\n", header->cupsInteger[2]); // Photo fix (RLT) - dbglog ("DEBUG: cupsString0 = %s\n", header->cupsString[0]); // print_mode_name - dbglog ("DEBUG: cupsReal0 = %f\n", header->cupsReal[0]); // Left overspray - dbglog ("DEBUG: cupsReal1 = %f\n", header->cupsReal[1]); // Top overspray -} - -void HPCupsFilter::getLogLevel () -{ - FILE *fp; - char str[258]; - char *p; - fp = fopen ("/etc/cups/cupsd.conf", "r"); - if (fp == NULL) - return; - while (!feof (fp)) - { - if (!fgets (str, 256, fp)) - { - break; - } - if ((p = strstr (str, "hpLogLevel"))) - { - p += strlen ("hpLogLevel") + 1; - m_iLogLevel = atoi (p); - break; - } - } - fclose (fp); -} - +/*****************************************************************************\
+ HPCupsFilter.cpp : Interface for HPCupsFilter class
+
+ Copyright (c) 1996 - 2009, Hewlett-Packard Co.
+ All rights reserved.
+
+ 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.
+
+ Author: Naga Samrat Chowdary Narla, Sanjay Kumar, Amarnath Chitumalla
+\*****************************************************************************/
+
+#include "HPCupsFilter.h"
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/utsname.h>
+#include <time.h>
+#include <sys/timeb.h>
+
+#define HP_FILE_VERSION_STR "03.09.08.0"
+
+static HPCupsFilter filter;
+int main (int argc, char *argv[])
+{
+ openlog("hpcups", LOG_PID, LOG_DAEMON);
+
+ if (argc < 6 || argc > 7) {
+ dbglog("ERROR: %s job-id user title copies options [file]\n", *argv);
+ return JOB_CANCELED;
+ }
+
+ return filter.StartPrintJob(argc, argv);
+}
+
+void HPCancelJob(int sig)
+{
+ filter.CancelJob();
+ exit(0);
+}
+
+void HPCupsFilter::CreateBMPHeader (int width, int height, int planes, int bpp)
+{
+ memset (&this->bmfh, 0, 14);
+ memset (&this->bmih, 0, 40);
+ bmfh.bfOffBits = 54;
+ bmfh.bfType = 0x4d42;
+ bmfh.bfReserved1 = 0;
+ bmfh.bfReserved2 = 0;
+ bmih.biSize = DBITMAPINFOHEADER;
+ bmih.biWidth = width;
+ bmih.biHeight = -height;
+ bmih.biPlanes = 1;
+ bmih.biBitCount = planes * bpp;
+ bmih.biCompression = 0;
+ bmih.biSizeImage = width * height * planes * bpp / 8;
+ bmih.biClrImportant = 0;
+ bmih.biClrUsed = (planes == 3) ? 0 : 2;
+ bmih.biXPelsPerMeter = 0;
+ bmih.biYPelsPerMeter = 0;
+
+ bmfh.bfOffBits += bmih.biClrUsed * 4;
+ bmfh.bfSize = bmih.biSizeImage + bmfh.bfOffBits;
+}
+
+void HPCupsFilter::WriteBMPHeader (FILE *fp, int width, int height, eRasterType raster_type)
+{
+ if (fp == NULL)
+ {
+ return;
+ }
+ if (raster_type == BLACK_RASTER)
+ {
+ WriteKBMPHeader (fp, width, height);
+ }
+ else
+ {
+ WriteCBMPHeader (fp, width, height);
+ }
+}
+
+void HPCupsFilter::WriteCBMPHeader (FILE *fp, int width, int height)
+{
+ if (fp == NULL)
+ return;
+ adj_c_width = width;
+ if (width % 4)
+ {
+ adj_c_width = (width / 4 + 1) * 4;
+ }
+ color_raster = new BYTE[adj_c_width * 3];
+ memset (color_raster, 0xFF, adj_c_width * 3);
+ CreateBMPHeader(adj_c_width, height, 3, 8);
+ fwrite (&this->bmfh.bfType, 1, sizeof (short), fp);
+ fwrite (&this->bmfh.bfSize, 1, sizeof (int), fp);
+ fwrite (&this->bmfh.bfReserved1, 1, sizeof (short), fp);
+ fwrite (&this->bmfh.bfReserved2, 1, sizeof (short), fp);
+ fwrite (&this->bmfh.bfOffBits, 1, sizeof (int), fp);
+ fwrite (&this->bmih, 1, DBITMAPINFOHEADER, fp);
+}
+
+void HPCupsFilter::WriteKBMPHeader(FILE *fp, int width, int height)
+{
+ BYTE cmap[8];
+ if (fp == NULL)
+ return;
+ adj_k_width = width;
+ if (width % 32)
+ {
+ adj_k_width = (width / 32 + 1) * 32;
+ }
+ CreateBMPHeader(adj_k_width, height, 1, 1);
+ adj_k_width /= 8;
+ black_raster = new BYTE[adj_k_width];
+ memset (black_raster, 0, adj_k_width);
+
+ fwrite (&this->bmfh.bfType, 1, sizeof (short), fp);
+ fwrite (&this->bmfh.bfSize, 1, sizeof (int), fp);
+ fwrite (&this->bmfh.bfReserved1, 1, sizeof (short), fp);
+ fwrite (&this->bmfh.bfReserved2, 1, sizeof (short), fp);
+ fwrite (&this->bmfh.bfOffBits, 1, sizeof (int), fp);
+ fwrite (&this->bmih, 1, DBITMAPINFOHEADER, fp);
+ memset(cmap, 0, sizeof(cmap));
+ cmap[0] = cmap[1] = cmap[2] = cmap[3] = 255;
+ fwrite(cmap, 1, sizeof(cmap), fp);
+}
+
+void HPCupsFilter::WriteBMPRaster (FILE *fp, BYTE *raster, int width, eRasterType raster_type)
+{
+ if (raster_type == BLACK_RASTER)
+ return WriteKBMPRaster (fp, raster, width);
+ else
+ return WriteCBMPRaster (fp, raster, width);
+}
+
+void HPCupsFilter::WriteCBMPRaster (FILE *fp, BYTE *pbyrgb, int width)
+{
+ if (fp == NULL)
+ return;
+ //BYTE c[3];
+ int i;
+ BYTE *p = pbyrgb;
+ BYTE *q = color_raster;
+ if (pbyrgb == NULL)
+ {
+ memset (color_raster, 0xFF, adj_c_width * 3);
+ }
+ else
+ {
+ for (i = 0; i < width; i++) {
+ q[0] = p[2];
+ q[1] = p[1];
+ q[2] = p[0];
+ p += 3;
+ q += 3;
+ }
+ }
+ fwrite (color_raster, 1, adj_c_width * 3, fp);
+}
+
+void HPCupsFilter::WriteKBMPRaster (FILE *fp, BYTE *pbyk, int width)
+{
+ if (fp == NULL)
+ return;
+ if (pbyk == NULL)
+ {
+ memset (black_raster, 0, adj_k_width);
+ }
+ else
+ {
+ memcpy (black_raster, pbyk, width);
+ }
+ fwrite (black_raster, 1, adj_k_width, fp);
+}
+
+HPCupsFilter::HPCupsFilter() : m_pPrinterBuffer(NULL)
+{
+ setbuf (stderr, NULL);
+
+ adj_c_width = 0;
+ adj_k_width = 0;
+ black_raster = NULL;
+ color_raster = NULL;
+}
+
+HPCupsFilter::~HPCupsFilter()
+{
+
+}
+
+void HPCupsFilter::closeFilter ()
+{
+ //! If we printed any pages, end the current job instance.
+ m_Job.Cleanup();
+ cleanup();
+}
+
+void HPCupsFilter::cleanup()
+{
+ if (m_pPrinterBuffer) {
+ delete [] m_pPrinterBuffer;
+ }
+
+ if(m_ppd){
+ ppdClose(m_ppd);
+ m_ppd = NULL;
+ }
+}
+
+void HPCupsFilter::CancelJob()
+{
+ m_Job.CancelJob();
+ cleanup();
+}
+
+DRIVER_ERROR HPCupsFilter::startPage (cups_page_header2_t *cups_header)
+{
+ DRIVER_ERROR err = NO_ERROR;
+ ppd_attr_t *attr;
+ int xoverspray = 120;
+ int yoverspray = 60;
+
+/*
+ * Check for invalid data
+ */
+ if (cups_header->HWResolution[0] == 100 && cups_header->HWResolution[1] == 100)
+ {
+
+/*
+ * Something went wrong, cups is defaulting to 100 dpi.
+ * Some inkjet printers do not support 100 dpi. Return error.
+ */
+
+ dbglog("ERROR: Unsupported resolution\n");
+ return JOB_CANCELED;
+ }
+
+// XOverSpray and YOverSpray are entered as fractional value * 1000
+
+ if (((attr = ppdFindAttr(m_ppd, "HPXOverSpray", NULL)) != NULL) &&
+ (attr && attr->value != NULL)) {
+ xoverspray = atoi(attr->value);
+ }
+ if (((attr = ppdFindAttr(m_ppd, "HPYOverSpray", NULL)) != NULL) &&
+ (attr && attr->value != NULL)) {
+ yoverspray = atoi(attr->value);
+ }
+
+ if (m_iLogLevel & BASIC_LOG) {
+ printCupsHeaderInfo(cups_header);
+ }
+
+ m_JA.quality_attributes.media_type = cups_header->cupsMediaType;
+ m_JA.quality_attributes.print_quality = atoi(cups_header->OutputType);
+ m_JA.quality_attributes.horizontal_resolution = cups_header->HWResolution[0];
+ m_JA.quality_attributes.vertical_resolution = cups_header->HWResolution[1];
+ m_JA.quality_attributes.actual_vertical_resolution = cups_header->HWResolution[1];
+
+// Get the printer's actual resolution, may be different than what is reported
+ char *p;
+ if ((p = strstr (cups_header->OutputType, "_"))) {
+ int x = 0, y = 0;
+ p++;
+ x = atoi(p);
+ while (*p && *p != 'x')
+ p++;
+ if (*p && *p == 'x') {
+ p++;
+ y = atoi(p);
+ }
+// Currently, there is one printer with one printmode that supports lower y-resolution
+ if (y != 0) {
+ m_JA.quality_attributes.actual_vertical_resolution = y;
+ }
+ }
+ m_JA.color_mode = cups_header->cupsRowStep;
+ m_JA.media_source = cups_header->MediaPosition;
+
+ m_JA.print_borderless = (cups_header->ImagingBoundingBox[0] == 0) ? true : false;
+ if (cups_header->Duplex) {
+ m_JA.e_duplex_mode = (cups_header->Tumble == 0) ? DUPLEXMODE_BOOK : DUPLEXMODE_TABLET;
+ }
+ else {
+ m_JA.e_duplex_mode = DUPLEXMODE_NONE;
+ }
+ m_JA.krgb_mode = (cups_header->cupsColorSpace == CUPS_CSPACE_RGBW) ? true : false;
+
+ /*
+ * Cups PageSize dimensions are in PostScript units, which are 72 units to an inch
+ * and is stored as <width, height>
+ * The ImagingBoundingBox is in PostScript units and are stored as <lower_left> <upper_right>
+ * and <0, 0> is at the bottom left
+ * lower_left_x = ImagingBoundingBox[0]
+ * lower_left_y = ImagingBoundingBox[1]
+ * upper_right_x = ImagingBoundingBox[2]
+ * upper_right_y = ImagingBoundingBox[3]
+ * We require <top_left> <bottom_right> values and <0, 0> is top left
+ * So,
+ * PrintableStartX = lower_left_x
+ * PrintableStartY = PhysicalPageHeight - upper_right_y
+ */
+
+ int horz_res = cups_header->HWResolution[0];
+ int vert_res = cups_header->HWResolution[1];
+ m_JA.media_attributes.pcl_id = cups_header->cupsInteger[0];
+ m_JA.media_attributes.physical_width = (cups_header->PageSize[0] * horz_res) / 72;
+ m_JA.media_attributes.physical_height = (cups_header->PageSize[1] * vert_res) / 72;
+ m_JA.media_attributes.printable_width = cups_header->cupsWidth;
+ m_JA.media_attributes.printable_height = cups_header->cupsHeight;
+
+ m_JA.media_attributes.printable_start_x = (cups_header->Margins[0] * horz_res) / 72;
+ m_JA.media_attributes.printable_start_y = ((cups_header->PageSize[1] - cups_header->ImagingBoundingBox[3]) * vert_res) / 72;
+
+ m_JA.media_attributes.horizontal_overspray = (xoverspray * horz_res) / 1000;
+ m_JA.media_attributes.vertical_overspray = (yoverspray * vert_res) / 1000;
+
+ /*
+ * Left and top overspray in dots. We haven't defined ovespray for all classes in the drv.
+ * Hence using default values in the case of older classes.
+ */
+ m_JA.media_attributes.left_overspray = cups_header->cupsReal[0] ? (cups_header->cupsReal[0] * horz_res) : m_JA.media_attributes.horizontal_overspray / 2;
+ m_JA.media_attributes.top_overspray = cups_header->cupsReal[1] ? (cups_header->cupsReal[1] * vert_res) : m_JA.media_attributes.vertical_overspray / 2;
+
+ if (((attr = ppdFindAttr(m_ppd, "HPMechOffset", NULL)) != NULL) &&
+ (attr && attr->value != NULL)) {
+ m_JA.mech_offset = atoi(attr->value);
+ }
+
+// Get printer platform name
+ if (((attr = ppdFindAttr(m_ppd, "hpPrinterPlatform", NULL)) != NULL) && (attr->value != NULL)) {
+
+ strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1);
+
+ if (m_iLogLevel & BASIC_LOG) {
+ dbglog("HPCUPS: found Printer Platform, it is - %s\n", 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 Raster Preprocessing status
+ if(((attr = ppdFindAttr(m_ppd, "hpReverseRasterPages", NULL)) != NULL) && (attr->value != NULL)){
+ m_JA.pre_process_raster = atoi(attr->value);
+ }
+
+
+// Get the encapsulation technology from ppd
+
+ if (((attr = ppdFindAttr(m_ppd, "hpPrinterLanguage", NULL)) == NULL) ||
+ (attr && attr->value == NULL)) {
+ dbglog("DEBUG: Bad PPD - hpPrinterLanguage not found\n");
+ ppdClose(m_ppd);
+ m_ppd = NULL;
+ return SYSTEM_ERROR;
+ }
+ strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1);
+ if (m_iLogLevel & BASIC_LOG) {
+ dbglog("HPCUPS: found Printer Language, it is - %s\n", attr->value);
+ }
+
+// Fill in the other PCL header info
+
+ struct utsname uts_name;
+ uname(&uts_name);
+ strncpy(m_JA.job_title, m_argv[3], sizeof(m_JA.job_title)-1);
+ strncpy(m_JA.user_name, m_argv[2], sizeof(m_JA.user_name)-1);
+ strncpy(m_JA.host_name, uts_name.nodename, sizeof(m_JA.host_name)-1);
+ strncpy(m_JA.os_name, uts_name.sysname, sizeof(m_JA.os_name)-1);
+ getdomainname(m_JA.domain_name, sizeof(m_JA.domain_name) - 1);
+ int i = strlen(m_argv[0]) - 1;
+ while (i >= 0 && m_argv[0][i] != '/') {
+ i--;
+ }
+ snprintf(m_JA.driver_name, sizeof(m_JA.driver_name), "%s; %s", &m_argv[0][i+1], HP_FILE_VERSION_STR);
+ char *ptr = getenv("DEVICE_URI");
+ i = 0;
+ if (ptr) {
+ while (*ptr) {
+ if (*ptr == '%') {
+ ptr += 3;
+ m_JA.printer_name[i++] = ' ';
+ }
+ m_JA.printer_name[i++] = *ptr++;
+ }
+ }
+
+ string strPrinterURI="" ,strPrinterName= "";
+ m_DBusComm.initDBusComm(DBUS_PATH,DBUS_INTERFACE, getenv("DEVICE_URI"), m_JA.printer_name);
+
+ ptr = strstr(m_argv[5], "job-uuid");
+ if (ptr) {
+ strncpy(m_JA.uuid, ptr + strlen("job-uuid=urn:uuid:"), sizeof(m_JA.uuid)-1);
+ }
+
+ for (i = 0; i < 16; i++)
+ m_JA.integer_values[i] = cups_header->cupsInteger[i];
+
+ if (cups_header->cupsString[0]) {
+ strncpy(m_JA.quality_attributes.print_mode_name, &cups_header->cupsString[0][0],
+ sizeof(m_JA.quality_attributes.print_mode_name)-1);
+ }
+ Encapsulator *encap_interface = EncapsulatorFactory::GetEncapsulator(attr->value);
+ if ((err = m_Job.Init(m_pSys, &m_JA, encap_interface)) != NO_ERROR)
+ {
+ if (err == PLUGIN_LIBRARY_MISSING)
+ {
+ fputs ("STATE: +hplip.plugin-error\n", stderr);
+
+ m_DBusComm.sendEvent(EVENT_PRINT_FAILED_MISSING_PLUGIN, "Plugin missing", m_JA.job_id, m_JA.user_name);
+
+ }
+ dbglog ("m_Job initialization failed with error = %d", err);
+ ppdClose(m_ppd);
+ m_ppd = NULL;
+ return err;
+ }
+
+ if (m_iLogLevel & BASIC_LOG) {
+ dbglog("HPCUPS: returning NO_ERROR from startPage\n");
+ }
+
+ m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32];
+
+
+ return NO_ERROR;
+}
+
+int HPCupsFilter::StartPrintJob(int argc, char *argv[])
+{
+ int fd = 0;
+ cups_raster_t *cups_raster;
+ int err = 0;
+
+ memset(&m_JA, 0, sizeof(JobAttributes));
+ struct tm *t;
+ struct timeb tb;
+ time_t long_time;
+ time(&long_time);
+ t = localtime(&long_time);
+ ftime(&tb);
+ strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1); // returns Fri Jun 5 08:12:16 2009
+ snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds
+
+ getLogLevel();
+ m_JA.job_id = atoi(argv[1]);
+ FILE *fp;
+ char dFileName[32];
+ memset(dFileName, 0, sizeof(dFileName));
+ m_JA.job_id = atoi(argv[1]);
+ snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id);
+ if ((fp = fopen (dFileName, "r")))
+ {
+ char line[258];
+ for (int i = 0; i < 10; i++)
+ {
+ fgets (line, 256, fp);
+ if (!strncmp (line, "%%Pages:", 8))
+ {
+ sscanf (line+9, "%d", &m_JA.total_pages);
+ break;
+ }
+ }
+ fclose (fp);
+ }
+
+ m_ppd = ppdOpenFile(getenv("PPD"));
+ if (m_ppd == NULL) {
+ dbglog("DEBUG: ppdOpenFile failed for %s\n", getenv("PPD"));
+ return SYSTEM_ERROR;
+ }
+
+ m_argv = argv;
+ if (m_iLogLevel & BASIC_LOG) {
+ for (int i = 0; i < argc; i++) {
+ dbglog("argv[%d] = %s\n", i, argv[i]);
+ }
+ }
+
+ if (argc == 7)
+ {
+ if (m_iLogLevel & BASIC_LOG)
+ {
+ dbglog("Page Stream Data Name: %s\n", argv[6] );
+ }
+ if ((fd = open (argv[6], O_RDONLY)) == -1)
+ {
+ perror("ERROR: Unable to open raster file - ");
+ return 1;
+ }
+ }
+
+ m_pSys = new SystemServices(m_iLogLevel, m_JA.job_id);
+
+/*
+ * When user cancels a print job, the spooler sends SIGTERM signal
+ * to the filter. Must catch this signal to send end job sequence
+ * to the printer.
+ */
+
+ signal(SIGTERM, HPCancelJob);
+
+ cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ);
+
+ if (cups_raster == NULL) {
+ dbglog("cupsRasterOpen failed, fd = %d\n", fd);
+ if (fd != 0) {
+ close(fd);
+ }
+ closeFilter();
+ return 1;
+ }
+
+ if ((err = processRasterData(cups_raster))) {
+ if (fd != 0) {
+ close(fd);
+ }
+ if (m_iLogLevel & BASIC_LOG)
+ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err);
+ closeFilter();
+ cupsRasterClose(cups_raster);
+ return 1;
+ }
+
+ if (fd != 0) {
+ close(fd);
+ }
+ if (m_iLogLevel & BASIC_LOG)
+ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()");
+ closeFilter();
+ cupsRasterClose(cups_raster);
+ return 0;
+}
+
+bool HPCupsFilter::isBlankRaster(BYTE *input_raster, cups_page_header2_t *header)
+{
+ int length_in_bytes = (int)header->cupsBytesPerLine;
+ if (input_raster == NULL) {
+ return true;
+ }
+
+ if(header->cupsColorSpace == CUPS_CSPACE_K){
+ if (*input_raster == 0x00 &&
+ !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) {
+ return true;
+ }
+ }
+ else{
+ if (*input_raster == 0xFF &&
+ !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) {
+ return true;
+ }
+ }
+ return false;
+}
+
+
+int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+{
+ FILE *kfp = NULL;
+ FILE *cfp = NULL;
+ BYTE *kRaster = NULL;
+ BYTE *rgbRaster = NULL;
+ int current_page_number = 0;
+ cups_page_header2_t cups_header;
+ DRIVER_ERROR err;
+ int ret_status = 0;
+ char hpPreProcessedRasterFile[] = "/tmp/hplipSwapedPagesXXXXXX"; //temp file needed to store raster data with swaped pages.
+
+ while (cupsRasterReadHeader2(cups_raster, &cups_header))
+ {
+ current_page_number++;
+
+ if (current_page_number == 1) {
+
+ if (startPage(&cups_header) != NO_ERROR) {
+ return JOB_CANCELED;
+ }
+
+ if(m_JA.pre_process_raster) {
+ err = m_Job.preProcessRasterData(&cups_raster, &cups_header, hpPreProcessedRasterFile);
+ if (err != NO_ERROR) {
+ if (m_iLogLevel & BASIC_LOG) {
+ dbglog ("DEBUG: Job::StartPage failed with err = %d\n", err);
+ }
+ ret_status = JOB_CANCELED;
+ break;
+ }
+ }
+
+ if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+ rgbRaster = new BYTE[cups_header.cupsWidth * 3];
+ if (rgbRaster == NULL) {
+ return ALLOCMEM_ERROR;
+ }
+ kRaster = new BYTE[cups_header.cupsWidth];
+ if (kRaster == NULL) {
+ delete [] rgbRaster;
+ return ALLOCMEM_ERROR;
+ }
+ memset (kRaster, 0, cups_header.cupsWidth);
+ memset (rgbRaster, 0xFF, cups_header.cupsWidth * 3);
+ }
+ } // current_page_number == 1
+
+ if (cups_header.cupsColorSpace == CUPS_CSPACE_K) {
+ kRaster = m_pPrinterBuffer;
+ rgbRaster = NULL;
+ }
+ else if (cups_header.cupsColorSpace != CUPS_CSPACE_RGBW) {
+ rgbRaster = m_pPrinterBuffer;
+ kRaster = NULL;
+ }
+
+ BYTE *color_raster = NULL;
+ BYTE *black_raster = NULL;
+
+ err = m_Job.StartPage(&m_JA);
+ if (err != NO_ERROR) {
+ if (m_iLogLevel & BASIC_LOG) {
+ dbglog ("DEBUG: Job::StartPage failed with err = %d\n", err);
+ }
+ ret_status = JOB_CANCELED;
+ break;
+ }
+
+ if (m_iLogLevel & SAVE_INPUT_RASTERS)
+ {
+ char szFileName[32];
+ memset(szFileName, 0, sizeof(szFileName));
+ snprintf (szFileName, sizeof(szFileName), "/tmp/hpcupsfilterc_%d.bmp", current_page_number);
+ if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
+ cups_header.cupsColorSpace == CUPS_CSPACE_RGB)
+ {
+ cfp = fopen (szFileName, "w");
+ chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+ }
+ if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
+ cups_header.cupsColorSpace == CUPS_CSPACE_K)
+ {
+ szFileName[17] = 'k';
+ kfp = fopen (szFileName, "w");
+ chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+ }
+
+ WriteBMPHeader (cfp, cups_header.cupsWidth, cups_header.cupsHeight, COLOR_RASTER);
+ WriteBMPHeader (kfp, cups_header.cupsWidth, cups_header.cupsHeight, BLACK_RASTER);
+ }
+
+ fprintf(stderr, "PAGE: %d %s\r\n", current_page_number, m_argv[4]);
+ // Iterating through the raster per page
+ for (int y = 0; y < (int) cups_header.cupsHeight; y++) {
+ cupsRasterReadPixels (cups_raster, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
+ color_raster = rgbRaster;
+ black_raster = kRaster;
+
+ if(y == 0 && (0 == strcmp(m_JA.printer_language, "ljmono")) ) + { + //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer + //may not skip blank lines before actual data + //Need to revisit to crosscheck if it is a firmware issue. + + *m_pPrinterBuffer = 0x01; + dbglog("First raster data plane.." ); + } + + if (this->isBlankRaster((BYTE *) m_pPrinterBuffer, &cups_header)) {
+
+ color_raster = NULL;
+ black_raster = NULL;
+ }
+ extractBlackPixels(&cups_header, black_raster, color_raster);
+ //! Sending Raster bits off to encapsulation
+ err = m_Job.SendRasters (black_raster, color_raster);
+ if (err != NO_ERROR) {
+ break;
+ }
+ WriteBMPRaster (cfp, color_raster, cups_header.cupsWidth, COLOR_RASTER);
+ WriteBMPRaster (kfp, black_raster, cups_header.cupsWidth/8, BLACK_RASTER);
+ }
+ m_Job.NewPage();
+ if (err != NO_ERROR) {
+ break;
+ }
+ }
+
+ //! Remove the old processing band data...
+ if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+ delete [] kRaster;
+ delete [] rgbRaster;
+ }
+
+ unlink(hpPreProcessedRasterFile);
+ return ret_status;
+}
+
+void HPCupsFilter::extractBlackPixels(cups_page_header2_t *cups_header, BYTE *kRaster, BYTE *rgbRaster)
+{
+/*
+ * DON'T DO BITPACKING HERE, DO IT IN HALFTONER FOR CMYK PRINTES
+ * AND IN MODE9 FOR RGB PRINTERS
+ */
+
+static BYTE pixel_value[8] = {
+ 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
+ };
+
+ if (rgbRaster == NULL) {
+ return;
+ }
+
+ if (cups_header->cupsColorSpace == CUPS_CSPACE_RGBW) {
+ int k = 0;
+ BYTE *pIn = m_pPrinterBuffer;
+ BYTE kVal = 0;
+ BYTE b;
+ BYTE *rgb = rgbRaster;
+ BYTE *black = kRaster;
+ memset (kRaster, 0, cups_header->cupsWidth);
+
+
+ for (unsigned int i = 0; i < cups_header->cupsWidth; i++) {
+ rgb[0] = *pIn++;
+ rgb[1] = *pIn++;
+ rgb[2] = *pIn++;
+ b = *pIn++;
+
+ if (b != 0 && b != 0xFF) {
+
+#ifdef __linux
+ // rgb[0] -= (255 - b);
+ // rgb[1] -= (255 - b);
+ // rgb[2] -= (255 - b);
+ int cr,cg,cb;
+ cr = rgb[0] - (int)(255 - b);
+ rgb[0] = cr >= 0 ? cr : 0;
+
+ cg = rgb[1] - (int)(255 - b);
+ rgb[1] = cg >= 0 ? cg : 0;
+
+ cb = rgb[2] - (int)(255 - b);
+ rgb[2] = cb >= 0 ? cb : 0;
+#else // This alternate path is for Mac....
+
+ rgb[0] &= b;
+ rgb[1] &= b;
+ rgb[2] &= b;
+#endif
+ }
+ else
+ kVal |= (b == 0) ? pixel_value[k] : 0;
+ // else if (rgb[0] == rgb[1] && rgb[1] ==rgb[2])
+ // kVal |= (rgb[0] == 0) ? pixel_value[k] : 0;
+ rgb += 3;
+ if (k == 7) {
+ *black++ = kVal;
+ kVal = 0;
+ k = 0;
+ }
+ else {
+ k++;
+ }
+ } // end of for loop
+ *black = kVal;
+
+ } // end of if condition
+}
+
+void HPCupsFilter::printCupsHeaderInfo(cups_page_header2_t *header)
+{
+
+ dbglog ("DEBUG: startPage...\n");
+ dbglog ("DEBUG: MediaClass = \"%s\"\n", header->MediaClass);
+ dbglog ("DEBUG: MediaColor = \"%s\"\n", header->MediaColor);
+ dbglog ("DEBUG: MediaType = \"%s\"\n", header->MediaType);
+ dbglog ("DEBUG: OutputType = \"%s\"\n", header->OutputType);
+ dbglog ("DEBUG: AdvanceDistance = %d\n", header->AdvanceDistance);
+ dbglog ("DEBUG: AdvanceMedia = %d\n", header->AdvanceMedia);
+ dbglog ("DEBUG: Collate = %d\n", header->Collate);
+ dbglog ("DEBUG: CutMedia = %d\n", header->CutMedia);
+ dbglog ("DEBUG: Duplex = %d\n", header->Duplex);
+ dbglog ("DEBUG: HWResolution = [ %d %d ]\n", header->HWResolution[0], header->HWResolution[1]);
+ dbglog ("DEBUG: ImagingBoundingBox = [ %d %d %d %d ]\n",
+ header->ImagingBoundingBox[0], header->ImagingBoundingBox[1],
+ header->ImagingBoundingBox[2], header->ImagingBoundingBox[3]);
+ dbglog ("DEBUG: InsertSheet = %d\n", header->InsertSheet);
+ dbglog ("DEBUG: Jog = %d\n", header->Jog);
+ dbglog ("DEBUG: LeadingEdge = %d\n", header->LeadingEdge);
+ dbglog ("DEBUG: Margins = [ %d %d ]\n", header->Margins[0], header->Margins[1]);
+ dbglog ("DEBUG: ManualFeed = %d\n", header->ManualFeed);
+ dbglog ("DEBUG: MediaPosition = %d\n", header->MediaPosition);
+ dbglog ("DEBUG: MediaWeight = %d\n", header->MediaWeight);
+ dbglog ("DEBUG: MirrorPrint = %d\n", header->MirrorPrint);
+ dbglog ("DEBUG: NegativePrint = %d\n", header->NegativePrint);
+ dbglog ("DEBUG: NumCopies = %d\n", header->NumCopies);
+ dbglog ("DEBUG: Orientation = %d\n", header->Orientation);
+ dbglog ("DEBUG: OutputFaceUp = %d\n", header->OutputFaceUp);
+ dbglog ("DEBUG: PageSize = [ %d %d ]\n", header->PageSize[0], header->PageSize[1]);
+ dbglog ("DEBUG: Separations = %d\n", header->Separations);
+ dbglog ("DEBUG: TraySwitch = %d\n", header->TraySwitch);
+ dbglog ("DEBUG: Tumble = %d\n", header->Tumble);
+ dbglog ("DEBUG: cupsWidth = %d\n", header->cupsWidth);
+ dbglog ("DEBUG: cupsHeight = %d\n", header->cupsHeight);
+ dbglog ("DEBUG: cupsMediaType = %d\n", header->cupsMediaType);
+ dbglog ("DEBUG: cupsRowStep = %d\n", header->cupsRowStep);
+ dbglog ("DEBUG: cupsBitsPerColor = %d\n", header->cupsBitsPerColor);
+ dbglog ("DEBUG: cupsBitsPerPixel = %d\n", header->cupsBitsPerPixel);
+ dbglog ("DEBUG: cupsBytesPerLine = %d\n", header->cupsBytesPerLine);
+ dbglog ("DEBUG: cupsColorOrder = %d\n", header->cupsColorOrder);
+ dbglog ("DEBUG: cupsColorSpace = %d\n", header->cupsColorSpace);
+ dbglog ("DEBUG: cupsCompression = %d\n", header->cupsCompression);
+ dbglog ("DEBUG: cupsPageSizeName = %s\n", header->cupsPageSizeName);
+ dbglog ("DEBUG: cupsInteger0 = %d\n", header->cupsInteger[0]); // max jpeg filesize
+ dbglog ("DEBUG: cupsInteger1 = %d\n", header->cupsInteger[1]); // Red eye removal
+ dbglog ("DEBUG: cupsInteger2 = %d\n", header->cupsInteger[2]); // Photo fix (RLT)
+ dbglog ("DEBUG: cupsString0 = %s\n", header->cupsString[0]); // print_mode_name
+ dbglog ("DEBUG: cupsReal0 = %f\n", header->cupsReal[0]); // Left overspray
+ dbglog ("DEBUG: cupsReal1 = %f\n", header->cupsReal[1]); // Top overspray
+}
+
+void HPCupsFilter::getLogLevel ()
+{
+ FILE *fp;
+ char str[258];
+ char *p;
+ fp = fopen ("/etc/cups/cupsd.conf", "r");
+ if (fp == NULL)
+ return;
+ while (!feof (fp))
+ {
+ if (!fgets (str, 256, fp))
+ {
+ break;
+ }
+ if ((p = strstr (str, "hpLogLevel")))
+ {
+ p += strlen ("hpLogLevel") + 1;
+ m_iLogLevel = atoi (p);
+ break;
+ }
+ }
+ fclose (fp);
+}
+
diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h index 4320ae52e..0431a7a6c 100644 --- a/prnt/hpcups/HPCupsFilter.h +++ b/prnt/hpcups/HPCupsFilter.h @@ -1,122 +1,125 @@ -/*****************************************************************************\ - HPCupsFilter.h : Interface for HPCupsFilter class - - Copyright (c) 1996 - 2009, Hewlett-Packard Co. - All rights reserved. - - 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. -\*****************************************************************************/ - -#ifndef HP_CUPSFILTER_H -#define HP_CUPSFILTER_H - -#include "CommonDefinitions.h" -#include "SystemServices.h" -#include "Compressor.h" -#include "Job.h" - -#define DBITMAPFILEHEADER 14 -#define DBITMAPINFOHEADER 40 - -enum eRasterType -{ - BLACK_RASTER, - COLOR_RASTER -}; - -typedef struct -{ - short bfType; - int bfSize; - short bfReserved1; - short bfReserved2; - int bfOffBits; -} BITMAPFILEHEADER; - -typedef struct -{ - int biSize; - int biWidth; - int biHeight; - short biPlanes; - short biBitCount; - int biCompression; - int biSizeImage; - int biXPelsPerMeter; - int biYPelsPerMeter; - int biClrUsed; - int biClrImportant; -} BITMAPINFOHEADER; - -class HPCupsFilter -{ -public: - - HPCupsFilter(); - ~HPCupsFilter(); - int StartPrintJob(int argc, char *argv[]); - void CancelJob(); - void RemoveStatus(); - - void WriteBMPHeader (FILE *fp, int width, int height, eRasterType raster_type); - void WriteBMPRaster (FILE *fp, BYTE *raster, int width, eRasterType raster_type); - -private: - - BYTE *m_pPrinterBuffer; - Job m_Job; - SystemServices *m_pSys; - int child_pid; - char **m_argv; - JobAttributes m_JA; - ppd_file_t *m_ppd; - -private: - - void closeFilter(); - void cleanup(); - void getLogLevel(); - DRIVER_ERROR startPage (cups_page_header2_t *header); - int processRasterData(cups_raster_t *cups_raster); - void extractBlackPixels(cups_page_header2_t *cups_header, - BYTE *kRaster, BYTE *rgbRaster); - void printCupsHeaderInfo(cups_page_header2_t *header); - bool isBlankRaster(BYTE *input_raster, cups_page_header2_t *header); - int m_iLogLevel; - - void CreateBMPHeader(int width, int height, int planes, int bpp); - void WriteCBMPHeader (FILE *fp, int width, int height); - void WriteKBMPHeader (FILE *fp, int width, int height); - void WriteCBMPRaster (FILE *fp, BYTE *rgb_raster, int width); - void WriteKBMPRaster (FILE *fp, BYTE *k_raster, int width); - int adj_c_width; - int adj_k_width; - BYTE *black_raster; - BYTE *color_raster; - BITMAPFILEHEADER bmfh; - BITMAPINFOHEADER bmih; -}; - -#endif // HP_CUPSFILTER_H - +/*****************************************************************************\
+ HPCupsFilter.h : Interface for HPCupsFilter class
+
+ Copyright (c) 1996 - 2009, Hewlett-Packard Co.
+ All rights reserved.
+
+ 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.
+\*****************************************************************************/
+
+#ifndef HP_CUPSFILTER_H
+#define HP_CUPSFILTER_H
+
+#include "CommonDefinitions.h"
+#include "SystemServices.h"
+#include "Compressor.h"
+#include "Job.h"
+
+#include "dbuscomm.h"
+
+#define DBITMAPFILEHEADER 14
+#define DBITMAPINFOHEADER 40
+
+enum eRasterType
+{
+ BLACK_RASTER,
+ COLOR_RASTER
+};
+
+typedef struct
+{
+ short bfType;
+ int bfSize;
+ short bfReserved1;
+ short bfReserved2;
+ int bfOffBits;
+} BITMAPFILEHEADER;
+
+typedef struct
+{
+ int biSize;
+ int biWidth;
+ int biHeight;
+ short biPlanes;
+ short biBitCount;
+ int biCompression;
+ int biSizeImage;
+ int biXPelsPerMeter;
+ int biYPelsPerMeter;
+ int biClrUsed;
+ int biClrImportant;
+} BITMAPINFOHEADER;
+
+class HPCupsFilter
+{
+public:
+
+ HPCupsFilter();
+ ~HPCupsFilter();
+ int StartPrintJob(int argc, char *argv[]);
+ void CancelJob();
+ void RemoveStatus();
+
+ void WriteBMPHeader (FILE *fp, int width, int height, eRasterType raster_type);
+ void WriteBMPRaster (FILE *fp, BYTE *raster, int width, eRasterType raster_type);
+
+private:
+
+ BYTE *m_pPrinterBuffer;
+ Job m_Job;
+ SystemServices *m_pSys;
+ int child_pid;
+ char **m_argv;
+ JobAttributes m_JA;
+ ppd_file_t *m_ppd;
+ DBusCommunicator m_DBusComm;
+
+private:
+
+ void closeFilter();
+ void cleanup();
+ void getLogLevel();
+ DRIVER_ERROR startPage (cups_page_header2_t *header);
+ int processRasterData(cups_raster_t *cups_raster);
+ void extractBlackPixels(cups_page_header2_t *cups_header,
+ BYTE *kRaster, BYTE *rgbRaster);
+ void printCupsHeaderInfo(cups_page_header2_t *header);
+ bool isBlankRaster(BYTE *input_raster, cups_page_header2_t *header);
+ int m_iLogLevel;
+
+ void CreateBMPHeader(int width, int height, int planes, int bpp);
+ void WriteCBMPHeader (FILE *fp, int width, int height);
+ void WriteKBMPHeader (FILE *fp, int width, int height);
+ void WriteCBMPRaster (FILE *fp, BYTE *rgb_raster, int width);
+ void WriteKBMPRaster (FILE *fp, BYTE *k_raster, int width);
+ int adj_c_width;
+ int adj_k_width;
+ BYTE *black_raster;
+ BYTE *color_raster;
+ BITMAPFILEHEADER bmfh;
+ BITMAPINFOHEADER bmih;
+};
+
+#endif // HP_CUPSFILTER_H
+
diff --git a/prnt/hpcups/Job.cpp b/prnt/hpcups/Job.cpp index 41a599f7b..90355688b 100644 --- a/prnt/hpcups/Job.cpp +++ b/prnt/hpcups/Job.cpp @@ -290,3 +290,10 @@ DRIVER_ERROR Job::setBlankRaster() return NO_ERROR; } +DRIVER_ERROR Job::preProcessRasterData(cups_raster_t **ppcups_raster, cups_page_header2_t* firstpage_cups_header, char* pPreProcessedRasterFile) +{ + dbglog ("DEBUG: Job::preProcessRasterData.............. \n"); + return m_pEncap->preProcessRasterData(ppcups_raster, firstpage_cups_header, pPreProcessedRasterFile); +} + + diff --git a/prnt/hpcups/Job.h b/prnt/hpcups/Job.h index 1aa7862bb..4b30bac5e 100644 --- a/prnt/hpcups/Job.h +++ b/prnt/hpcups/Job.h @@ -49,6 +49,7 @@ public: DRIVER_ERROR SendRasters(BYTE* BlackImageData=(BYTE*)NULL, BYTE* ColorImageData=(BYTE*)NULL); DRIVER_ERROR NewPage(); DRIVER_ERROR StartPage(JobAttributes *job_attrs); + DRIVER_ERROR preProcessRasterData(cups_raster_t **cups_raster, cups_page_header2_t* firstpage_cups_header, char* pPreProcessedRasterFile); void CancelJob(); private: diff --git a/prnt/hpcups/LJZjStream.cpp b/prnt/hpcups/LJZjStream.cpp index b7b58517e..35f0cd707 100644 --- a/prnt/hpcups/LJZjStream.cpp +++ b/prnt/hpcups/LJZjStream.cpp @@ -661,3 +661,181 @@ DRIVER_ERROR LJZjStream::encapsulateColor (RASTERDATA *raster) return err; } + +DRIVER_ERROR LJZjStream::preProcessRasterData(cups_raster_t **ppcups_raster, cups_page_header2_t* firstpage_cups_header, char* pSwapedPagesFileName) +{ + int current_page_number = 0; + int fdEven = -1; + int fdOdd = -1; + int fdSwaped = -1; + int loopcntr = 0; + DRIVER_ERROR driver_error = NO_ERROR; + cups_page_header2_t cups_header; + cups_raster_t *swaped_pages_raster=NULL; + cups_raster_t *even_pages_raster=NULL; + cups_raster_t *odd_pages_raster = NULL; + BYTE* pPageDataBuffer = NULL; + char hpEvenPagesFile[] = "/tmp/hplipEvenPagesXXXXXX"; + char hpOddPagesFile[] = "/tmp/hplipOddPagesXXXXXX"; + + if (1 != m_pJA->pre_process_raster || !cups_header.Duplex){ + return NO_ERROR; + } + + dbglog ("DEBUG: Getting Swaped Pages Raster.....\n"); + + memcpy(&cups_header, firstpage_cups_header, sizeof(cups_page_header2_t)); + + //Create temp files to store odd, even and swaped pages. + fdEven = mkstemp (hpEvenPagesFile); + fdOdd = mkstemp (hpOddPagesFile); + fdSwaped = mkstemp (pSwapedPagesFileName); + if (fdEven < 0 || fdOdd < 0 || fdSwaped < 0){ + dbglog ("ERROR: Unable to open temp output files for writing\n"); + driver_error = SYSTEM_ERROR; + goto bugout; + } + + even_pages_raster = cupsRasterOpen(fdEven, CUPS_RASTER_WRITE); + odd_pages_raster = cupsRasterOpen(fdOdd, CUPS_RASTER_WRITE); + if (even_pages_raster == NULL || odd_pages_raster == NULL) { + dbglog("cupsRasterOpen failed for even_pages_raster or odd_pages_raster\n"); + driver_error = NULL_POINTER; + goto bugout; + } + + pPageDataBuffer = new BYTE[cups_header.cupsBytesPerLine+1]; + if (pPageDataBuffer == NULL) { + driver_error = ALLOCMEM_ERROR; + goto bugout; + } + + + do + { + current_page_number++; + if(current_page_number % 2) { + cupsRasterWriteHeader2(odd_pages_raster, &cups_header); + } + else { + cupsRasterWriteHeader2(even_pages_raster, &cups_header); + } + + // Iterating through the raster per page + for (int y = 0; y < (int) cups_header.cupsHeight; y++) { + cupsRasterReadPixels (*ppcups_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + if(current_page_number % 2) { + cupsRasterWritePixels (odd_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + } + else { + cupsRasterWritePixels (even_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + } + } + + } while (cupsRasterReadHeader2(*ppcups_raster, &cups_header)); + + cupsRasterClose(even_pages_raster); + cupsRasterClose(odd_pages_raster); + + //Now read even and odd pages rasters and then put into swaped raster + if ((fdEven = open (hpEvenPagesFile, O_RDONLY)) == -1) { + perror("ERROR: Unable to open evenpage raster file for reading."); + driver_error = SYSTEM_ERROR; + goto bugout; + } + + if ((fdOdd = open (hpOddPagesFile, O_RDONLY)) == -1){ + perror("ERROR: Unable to open odd page raster file for writing. "); + driver_error = SYSTEM_ERROR; + goto bugout; + } + even_pages_raster = cupsRasterOpen(fdEven, CUPS_RASTER_READ); + odd_pages_raster = cupsRasterOpen(fdOdd, CUPS_RASTER_READ); + swaped_pages_raster = cupsRasterOpen(fdSwaped, CUPS_RASTER_WRITE); + + if (swaped_pages_raster == NULL || even_pages_raster == NULL || odd_pages_raster == NULL) { + dbglog("cupsRasterOpen failed for even_pages_raster or odd_pages_raster or swaped_pages_raster\n"); + driver_error = NULL_POINTER; + goto bugout; + + } + + loopcntr = current_page_number / 2; + while (loopcntr--) { + if(cupsRasterReadHeader2(even_pages_raster, &cups_header)){ + cupsRasterWriteHeader2(swaped_pages_raster, &cups_header); + + // Iterating through the raster per line + for (int y = 0; y < (int) cups_header.cupsHeight; y++){ + cupsRasterReadPixels (even_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + cupsRasterWritePixels (swaped_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + } + } + + if(cupsRasterReadHeader2(odd_pages_raster, &cups_header)){ + cupsRasterWriteHeader2(swaped_pages_raster, &cups_header); + + // Iterating through the raster per line + for (int y = 0; y < (int) cups_header.cupsHeight; y++) { + cupsRasterReadPixels (odd_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + cupsRasterWritePixels (swaped_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + } + } + + } + + //Last Page is in odd page file + if(current_page_number%2 == 1){ + cupsRasterReadHeader2(odd_pages_raster, &cups_header); + cupsRasterWriteHeader2(swaped_pages_raster, &cups_header); + + // Iterating through the raster per line + for (int y = 0; y < (int) cups_header.cupsHeight; y++){ + cupsRasterReadPixels (odd_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + cupsRasterWritePixels (swaped_pages_raster, pPageDataBuffer, cups_header.cupsBytesPerLine); + } + } + + cupsRasterClose(even_pages_raster); + cupsRasterClose(odd_pages_raster); + cupsRasterClose(swaped_pages_raster); + + if(pPageDataBuffer){ + delete [] pPageDataBuffer; + pPageDataBuffer = NULL; + } + + //Now send swaped raster file further processing. + if ((fdSwaped = open (pSwapedPagesFileName, O_RDONLY)) == -1){ + perror("ERROR: Unable to open swaped pages raster file - "); + driver_error = SYSTEM_ERROR; + goto bugout; + } + + *ppcups_raster = cupsRasterOpen(fdSwaped, CUPS_RASTER_READ); + cupsRasterReadHeader2(*ppcups_raster, &cups_header); + memcpy(firstpage_cups_header, &cups_header, sizeof(cups_page_header2_t)); + unlink(hpEvenPagesFile); + unlink(hpOddPagesFile); + + return NO_ERROR; //cups_raster; + +bugout: + dbglog ("DEBUG:Something went wrong while creating swaped pages raster..\n"); + if (fdEven > 2) + close(fdEven); + if (fdOdd > 2) + close(fdOdd); + if (fdSwaped > 2) + close(fdSwaped); + //closeFilter(); + + if(pPageDataBuffer){ + delete [] pPageDataBuffer; + } + + unlink(hpEvenPagesFile); + unlink(hpOddPagesFile); + return driver_error; +} + diff --git a/prnt/hpcups/LJZjStream.h b/prnt/hpcups/LJZjStream.h index 4926a2c5f..cbdcf29be 100644 --- a/prnt/hpcups/LJZjStream.h +++ b/prnt/hpcups/LJZjStream.h @@ -48,6 +48,7 @@ public: DRIVER_ERROR FormFeed(); DRIVER_ERROR EndJob(); DRIVER_ERROR SendCAPy(int iOffset) {return NO_ERROR;} + DRIVER_ERROR preProcessRasterData(cups_raster_t **cups_raster, cups_page_header2_t* firstpage_cups_header, char* pSwapedPagesFileName); bool CanSkipRasters() {return false;} protected: diff --git a/prnt/hpcups/dbuscomm.cpp b/prnt/hpcups/dbuscomm.cpp new file mode 100644 index 000000000..dc41960c8 --- /dev/null +++ b/prnt/hpcups/dbuscomm.cpp @@ -0,0 +1,143 @@ +/*****************************************************************************\ + dbuscomm.cpp : Interface for DBusCommunicator class + + Copyright (c) 1996 - 2011, Hewlett-Packard Co. + All rights reserved. + + 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. + Author: Amarnath Chitumalla +\*****************************************************************************/ + +#include "dbuscomm.h" + +DBusCommunicator::DBusCommunicator() +{ + m_strPrinterURI = ""; + m_strPrinterName = ""; +#ifdef HAVE_DBUS + m_DbusConnPtr = NULL; +#endif +} +/* +* +* +*/ + + +bool DBusCommunicator::initDBusComm(string strDbusPath/*=""*/,string strInterfaceName/*=""*/, + string strPrinterURI/*=""*/, string strPrinterName/*= ""*/, int iJobId/*=0*/, string strUser/*=""*/) +{ +#ifdef HAVE_DBUS + DBusError objError; + DBusError * pDBusError=&objError; + + m_strPrinterURI = strPrinterURI; + m_strPrinterName = strPrinterName; + m_strDbusInterface = strInterfaceName; + m_strDbusPath = strDbusPath; + m_strUser = strUser; + m_iJobId = iJobId; + + dbus_error_init(pDBusError); + m_DbusConnPtr = dbus_bus_get(DBUS_BUS_SYSTEM, pDBusError); + if(dbus_error_is_set(pDBusError)) + { + dbglog("Error: dBus Connection Error (%s)!\n", pDBusError->message); + dbus_error_free(pDBusError); + } + + if(m_DbusConnPtr == NULL) + { + dbglog("Error: dBus Connection Error (%s)!\n", pDBusError->message); + return false; + } +#endif + return true; +} + +bool DBusCommunicator::sendEvent(string strDbusPath,string strInterfaceName, string strDeviceURI, string strPrinterName, int iEvent, + string strTitle/*=""*/, int iJobId/*=0*/, string strUser/*=""*/) +{ +#ifdef HAVE_DBUS + + if(NULL == m_DbusConnPtr ) + { + dbglog("Error: dBus connection ptr is NULL.\n"); + return false; + } + if(true == strDbusPath.empty() || true == strInterfaceName.empty() || 0 == iEvent) + { + dbglog("Error: dBus service Name can't be empty. DBus Path(%s) DBus Interface (%s) Event(%d)!\n", + strDbusPath.c_str(), strInterfaceName.c_str(), iEvent); + return false; + } + DBusMessage * msg = dbus_message_new_signal(strDbusPath.c_str(), strInterfaceName.c_str(), "Event"); + if (NULL == msg) + { + dbglog("Error: dBus dbus_message_new_signal returned error. DBus Interface (%s) Event(%d)!\n", strInterfaceName.c_str(), iEvent); + return false; + } + + if (NULL == msg) + { + dbglog("dbus message is NULL!\n"); + return false; + } + const char * stURI=strDeviceURI.c_str(); + const char * stPRNTNM=strPrinterName.c_str(); + const char * stUSR=strUser.c_str(); + const char * stTtl=strTitle.c_str(); + + dbus_message_append_args(msg, + DBUS_TYPE_STRING, &stURI, + DBUS_TYPE_STRING, &stPRNTNM, + DBUS_TYPE_UINT32, &iEvent, + DBUS_TYPE_STRING, &stUSR, + DBUS_TYPE_UINT32, &iJobId, + DBUS_TYPE_STRING, &stTtl, + DBUS_TYPE_INVALID); + + if (!dbus_connection_send(m_DbusConnPtr , msg, NULL)) + { + dbglog("dbus message send failed!\n"); + return false; + } + + dbus_connection_flush(m_DbusConnPtr ); + dbus_message_unref(msg); + +#endif + return true; + +} + +bool DBusCommunicator::sendEvent(int iEvent, string strTitle/*=""*/, int iJobId/*=0*/,string strUser/*=""*/) +{ + return sendEvent(m_strDbusPath, m_strDbusInterface, m_strPrinterURI, m_strPrinterName, iEvent, strTitle, iJobId,strUser); +} + +DBusCommunicator::~DBusCommunicator() +{ + +} diff --git a/prnt/hpcups/dbuscomm.h b/prnt/hpcups/dbuscomm.h new file mode 100644 index 000000000..9932473b9 --- /dev/null +++ b/prnt/hpcups/dbuscomm.h @@ -0,0 +1,81 @@ +/*****************************************************************************\ + dbuscomm.h : Interface for DBusCommunicator class + + Copyright (c) 1996 - 2011, Hewlett-Packard Co. + All rights reserved. + + 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. +\*****************************************************************************/ + +#ifndef __DBUSCOMM_H__ +#define __DBUSCOMM_H__ + +# include <string> +#include "CommonDefinitions.h" +#include "hpmud.h" +#include <pwd.h> + +#ifdef HAVE_DBUS + #include <dbus/dbus.h> + #define DBUS_INTERFACE "com.hplip.StatusService" + #define DBUS_PATH "/" +#else +#define DBUS_INTERFACE "" +#define DBUS_PATH "" +#endif + + +using namespace std; + +/* //DBusBusType + DBUS_BUS_SESSION //The login session bus. + DBUS_BUS_SYSTEM //The systemwide bus. + DBUS_BUS_STARTER //The bus that started us, if any. +*/ + +class DBusCommunicator +{ + private: + string m_strPrinterURI; + string m_strPrinterName; +#ifdef HAVE_DBUS + DBusConnection *m_DbusConnPtr; +#endif + string m_strDbusInterface; + string m_strDbusPath; + string m_strUser; + int m_iJobId; + + + public: + DBusCommunicator(); + bool initDBusComm(string strDbusPath="",string strInterfaceName="", string strPrinterURI="", string strPrinterName = "",int iJobId=0, string strUser=""); + bool sendEvent(int iEvent, string strTitle="", int iJobId=0, string strUser=""); + bool sendEvent(string strDbusPath,string strInterfaceName, string strPrinterURI, string strPrinterName, int event, string strTitle="",int iJobId=0, string strUser=""); + ~DBusCommunicator(); +}; + + +#endif // __DBUSCOMM_H__ + 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 e3ddebf04..99cf769ca 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 7c69194c1..dd1cb14a4 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 b292f0673..c43060bce 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 25b709ec6..294779de2 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 06bc61c68..2db08d82d 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 272847707..63b50c3f6 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 602638336..e28c1d5ba 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 ad62c4ac5..815fa1235 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 996f150a4..4c334523f 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 4c7316a88..a15004631 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 a2cc401d5..648477ad3 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 e4f59c5cb..aef617a60 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 bed2d2c36..0dd90e1a9 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 e606cddd1..b18ae606c 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 19b81a819..2d2ffcd6e 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 4d59acf41..6b910fe5d 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 d4e782ef5..93c6b60eb 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 2197ae389..186e3d7f3 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 ccfb21f83..4a95308d0 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 a53622ee5..3902c2052 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 80a991d84..bf42ce036 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 d0fc00f12..4bae826b4 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 81a5cf463..6c962c7d8 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 5c79478a0..c21597b8c 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 b9ad8b194..a7051821e 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 ba33cdb0c..4b8687c15 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 a5c3fed5e..c1e5b7013 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 6d12f1a8d..065bed513 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 bc1dd7a09..844882cf9 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 b3889ba28..5741307c1 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 fba10cf26..39c191302 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 cd030fd2b..11362fbce 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 0dca0316a..d7d203be9 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 52eee6c0b..e64777250 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 f89b796af..3c27d4afa 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 1c7ca99ed..f7985b283 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 fe9238d5b..9ddc3717e 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 5b724cd21..4ce362879 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 bae50cf5c..140350c09 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 baff5fc4b..31eaf03a7 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 8abece1a8..5ebb7f5d1 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 64e8d5590..790dbbe90 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 4ff23e472..f8f4084b1 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 7e19c9e48..06793a065 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 13f3a9fd9..8d11fddcc 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 42db9c4af..10509b86e 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 1c5d0a68f..d68bcdee4 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 770cbc963..adf83e127 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 34a207386..84570db14 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 differindex 0f74d707f..2dc219d17 100644 --- a/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.gz +++ 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 072efa9a8..2347d5da2 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 db92a831c..2cd87ee69 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 07a9df681..142cdfe48 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 96b58d414..9cbc47dcb 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 dadf8d726..6085237fd 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 d00abff6c..e8d64144f 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 9857dccf2..074452d40 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 dbbffa338..79d6dd9f9 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 b46581ed0..0dd0aab93 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 fa40983d4..5cba685c2 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 552d6efed..46facb10a 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 c56e44bbe..be98f45da 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 4d19d9a69..11dd26a5a 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 3b756bd5c..74e05323f 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 222a8cb7e..220de2762 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 dfd06486a..08c79a950 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 c4a4c427c..6ca74085e 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 1f96c8d75..8ee25b065 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 625abb394..2d79451ac 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 differindex 2fc3e2ff1..bdc3391b8 100644 --- a/prnt/ps/hp-color_laserjet_cp5520_series-ps.ppd.gz +++ 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 7acd9201e..2ad55749d 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_4000ps.ppd.gz b/prnt/ps/hp-designjet_4000ps.ppd.gz Binary files differindex 2b6e9f697..cdd2c7a06 100644 --- a/prnt/ps/hp-designjet_4000ps.ppd.gz +++ b/prnt/ps/hp-designjet_4000ps.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 9ab547eb6..289024134 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 f1469f555..4108564e6 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 1c179b706..fc3b93cca 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 c7ba46a46..9c296e6d9 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 2b9ae796d..c6ba12ce9 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 1289e7acf..4a96ba7dc 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 750337d83..627a72a8f 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 e4050c3e0..2edf32a47 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 3bcce7003..bc1362cf2 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 76cfe4336..705af05c3 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_t1300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz Binary files differindex 5b97aba44..f3666ccf6 100644 --- a/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1300_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz Binary files differindex 2a7004ff6..357c4d419 100644 --- a/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t2300_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz Binary files differindex fe6a7e244..af244fde1 100644 --- a/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7100ps-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz b/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz Binary files differindex 2576f4b85..ac7d0cd7c 100644 --- a/prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7100ps_monochrome-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 78f899a36..07beaaa07 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 fc92c3108..f5bb675bd 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-designjet_t790ps_24in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz Binary files differindex 2e86d3bd7..5c9315fed 100644 --- a/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t790ps_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz Binary files differindex c4212634d..2928fc3aa 100644 --- a/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t790ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz Binary files differindex 2cd1e423f..13563e1c2 100644 --- a/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz Binary files differindex 313d9df96..c9661c9d1 100644 --- a/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6100ps_60in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz Binary files differindex 86ade5fb6..c80252e10 100644 --- a/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz Binary files differindex c8f98ecbd..976cfff53 100644 --- a/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6200_60in_photo-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz b/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz Binary files differindex fb76b649e..a93be1772 100644 --- a/prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_100_color_mfp_m175-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 0d8b06b5c..0073f0b04 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 8c3db5a87..bb1068698 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 7f599e981..31272a889 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 fb825a9d5..a502d94eb 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 e1931f7e9..e0712bc73 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 c1381c16b..0db0fd225 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 cd54be6ac..fbd81b159 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 f91051365..97348654f 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 08c9f7344..88de52623 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 33ba13ff4..4da150a59 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 ec8d126a2..d1434dd0d 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 46653881c..f636abe97 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_200_colormfp_m275-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..5f3d03aa3 --- /dev/null +++ b/prnt/ps/hp-laserjet_200_colormfp_m275-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 c070289fc..4f14c4018 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 9f2060490..95a27b242 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 1f85bbcdd..140fd2dcf 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 46fcc7cb4..cfb9277d9 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 9f8ba4e13..e7d52d27a 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 7da8283de..df2917fc9 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 d9ee14f1d..5205939b3 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 c333749da..0c5e20533 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 ed6e6b699..e4c720c1c 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 dcbeffd1a..96447858f 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 41681a413..04a1f8b89 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 8c427f2dc..f81d1043f 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 1672ec5a2..7610ef02f 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 106f0a7dc..2c577dc83 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 ef1637ab2..4f049a6d6 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 987e726f2..ad065debc 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 baa5e4c46..77aa50b88 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 f073d9288..e48f23db5 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 1c939795a..6592dc8d8 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 2872ae5fd..390861176 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 978b1229f..89cb0e76b 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 3f46ac514..0d1deac88 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 49ff959f9..b7fdb9ca3 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 046debe98..88a43440a 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 588bd0bd2..3f2ec02e5 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 5f936ec15..0093b4dca 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 e446cd620..43a06123a 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 a22923499..e6688c05a 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 c027a3044..b429ce933 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 9a91714e7..20d9c7883 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 e72665bae..28c8dedbb 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 0a1ee5a9d..a177a2961 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 2fa1b2480..c9f9d722c 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 e8e464744..fbc0c4502 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 e256349fa..e96e798e8 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 982def97b..c2af91df2 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_500_color_m551-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz Binary files differindex b94da777a..15143dd14 100644 --- a/prnt/ps/hp-laserjet_500_color_m551-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_m551-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 a20168d99..fcf8b0d0b 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 b2cf6b17f..11e35f836 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 a1ba530ba..b7ac09128 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 e9995c1d2..46ddfa301 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 3a6e03031..5b77f7788 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 1795475de..90932e6b1 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 26a316515..52717f247 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 88671aefc..0ce878ee1 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_600_m601_m602_m603-ps.ppd.gz b/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..19aaa89ad --- /dev/null +++ b/prnt/ps/hp-laserjet_600_m601_m602_m603-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 421ebe440..ecfdea60f 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 f06abc876..a61f128ec 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 49a520261..91aeac817 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 c0036d68d..041d56c2c 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 30f2846f8..bff41460a 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 fbcc4e18d..6db9a46c3 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 28ed66e62..4f6e3c5fa 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 83f81ab67..448f5c720 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 2526893da..dbd631f86 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 4aa9e4cb5..16f6ebaa4 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 2eae063d8..192e9effc 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 9009691d2..7cd5014af 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 c5c5a5b8c..414e5ac52 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 f34a26cb9..a2201c534 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 754e6545c..bfdd2feba 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_cm1410_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz Binary files differindex 0947ee33b..ac59ba431 100644 --- a/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_cm1410_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz b/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz Binary files differindex 2335db70e..05957d8ed 100644 --- a/prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_cp1520_series-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 093fc92d6..91f4b833c 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 47d708c7d..8639367c2 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 d655da248..f364b0fdc 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_m1530_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz Binary files differindex d4fc9487f..25d0e7e28 100644 --- a/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m1530_mfp_series-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz b/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz Binary files differindex 09d877ab7..cda1cd772 100644 --- a/prnt/ps/hp-laserjet_m2727_mfp_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m2727_mfp_series-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 93ccafb7f..3acb36b84 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 d60448fc1..ca024d980 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 1efa963e7..e5799bbd6 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 30841569a..690501a5e 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_m4555_mfp-ps.ppd.gz b/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz Binary files differindex 5ca30d990..b9c9344c2 100644 --- a/prnt/ps/hp-laserjet_m4555_mfp-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m4555_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 1443ff8ba..1f81f5a4f 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 654ffd6c9..d3a88a2e2 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 b7d683619..814da76d6 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 03529fbe7..8803d9d7d 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 929d303f0..ecbcce89a 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 96f501e58..2aa4d7e9a 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_p2055_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz Binary files differindex 75f16f6cd..603d30de1 100644 --- a/prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p2055_series-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 39f1d936f..7c43b5357 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 e2eda3248..60509f846 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 de14c41da..53fe209d9 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_p4010_series-ps.ppd.gz b/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz Binary files differindex c786369da..b7de5ace0 100644 --- a/prnt/ps/hp-laserjet_p4010_series-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_p4010_series-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 e628be94f..211581a4f 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 f67ed5790..93a38d0ff 100644 --- a/prnt/ps/hp-mopier_320-ps.ppd.gz +++ b/prnt/ps/hp-mopier_320-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz Binary files differindex 733d026d3..094ed60d2 100644 --- a/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c index 738b15270..ee80ef594 100644 --- a/scan/sane/hpaio.c +++ b/scan/sane/hpaio.c @@ -22,7 +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 + Yashwant Sahu, Sarbeswar Meher \************************************************************************************/ @@ -268,7 +268,7 @@ static int DevDiscovery(int localOnly) } else { - DBG6("unsupported scantype=%d %s\n", ma.scantype, uri); + DBG(6,"unsupported scantype=%d %s\n", ma.scantype, uri); } } @@ -285,7 +285,7 @@ static int DevDiscovery(int localOnly) } else { - DBG6("unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]); + DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]); } free(cups_printer[i]); } @@ -315,12 +315,12 @@ static hpaioScanner_t hpaioFindScanner( SANE_String_Const name ) { hpaioScanner_t p = FirstScanner; - while( p != LastScanner ) + while( p != NULL ) { if( strcasecmp( name, p->saneDevice.name ) == 0 ) return p; - p++; + p=p->next; } return NULL; @@ -757,6 +757,41 @@ static void hpaioConnEndScan( hpaioScanner_t hpaio ) SendScanEvent( hpaio->deviceuri, EVENT_END_SCAN_JOB); } +static SANE_Status SetResolutionListSCL(hpaioScanner_t hpaio) +{ + int supported_res[] = {50, 75, 100, 150, 200, 300, 600, 1200, 2400, 4800, 9600}; + int i, len = sizeof(supported_res)/sizeof(int); + SANE_Status retcode; + + if (hpaio->currentAdfMode == ADF_MODE_ADF || hpaio->currentAdfMode == ADF_MODE_AUTO) + { + hpaio->resolutionRange.min = hpaio->scl.minResAdf; + hpaio->resolutionRange.max = hpaio->scl.maxResAdf; + } + else + { + hpaio->resolutionRange.min = hpaio->scl.minRes; + hpaio->resolutionRange.max = hpaio->scl.maxRes; + } + + DBG(6,"minRes=%d maxRes=%d minResAdf=%d maxResAdf=%d\n", hpaio->scl.minRes, hpaio->scl.maxRes, hpaio->scl.minResAdf, hpaio->scl.maxResAdf); + + NumListClear( hpaio->resolutionList ); + NumListClear( hpaio->lineartResolutionList ); + for (i = 0; i < len; i++) + { + if (supported_res[i] >= hpaio->resolutionRange.min && + supported_res[i] <= hpaio->resolutionRange.max) + { + NumListAdd (hpaio->resolutionList, supported_res[i]); + NumListAdd (hpaio->lineartResolutionList, supported_res[i]); + } + } + hpaio->option[OPTION_SCAN_RESOLUTION].constraint_type = SANE_CONSTRAINT_WORD_LIST; + + return SANE_STATUS_GOOD; +} + static SANE_Status hpaioSetDefaultValue( hpaioScanner_t hpaio, int option ) { switch( option ) @@ -919,7 +954,9 @@ static int hpaioUpdateDescriptors( hpaioScanner_t hpaio, int option ) { reload |= SANE_INFO_RELOAD_PARAMS; } - + + if (hpaio->scannerType == SCANNER_TYPE_SCL) + SetResolutionListSCL(hpaio); /* OPTION_SCAN_RESOLUTION: */ if( hpaio->option[OPTION_SCAN_RESOLUTION].constraint_type == SANE_CONSTRAINT_WORD_LIST ) @@ -1622,7 +1659,7 @@ extern SANE_Status sane_hpaio_open(SANE_String_Const devicename, SANE_Handle * p struct hpmud_model_attributes ma; SANE_Status retcode = SANE_STATUS_INVAL; hpaioScanner_t hpaio = 0; - int r, bytes_read; + int bytes_read; char deviceIDString[LEN_DEVICE_ID_STRING]; char model[256]; int forceJpegForGrayAndColor = 0; @@ -1941,96 +1978,144 @@ extern SANE_Status sane_hpaio_open(SANE_String_Const devicename, SANE_Handle * p /* Determine the minimum and maximum resolution. * Probe for both X and Y, and pick largest min and smallest max. * For the 1150, set min to 50 to prevent scan head crashes (<42). */ - SclInquire( hpaio->deviceid, hpaio->scan_channelid, + int minXRes, minYRes, maxXRes, maxYRes; + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_MINIMUM_VALUE, SCL_CMD_SET_X_RESOLUTION, - &hpaio->scl.minXRes, + &minXRes, 0, 0 ); - DBG6("min x resolution=%d\n", hpaio->scl.minXRes); + DBG(6, "minXRes=%d retcode=%d\n",minXRes, retcode); - SclInquire( hpaio->deviceid, hpaio->scan_channelid, + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_MINIMUM_VALUE, SCL_CMD_SET_Y_RESOLUTION, - &hpaio->scl.minYRes, + &minYRes, 0, 0 ); - DBG6("min y resolution=%d\n", hpaio->scl.minYRes); - - if( hpaio->scl.compat & SCL_COMPAT_1150 && - hpaio->scl.minYRes < SCL_MIN_Y_RES_1150 ) - { - hpaio->scl.minYRes = SCL_MIN_Y_RES_1150; - } - r = hpaio->scl.minXRes; - if( r < hpaio->scl.minYRes ) - { - r = hpaio->scl.minYRes; - } + DBG(6,"minYRes=%d retcode=%d\n", minYRes, retcode); - hpaio->resolutionRange.min = r; - - SclInquire( hpaio->deviceid, hpaio->scan_channelid, + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_MAXIMUM_VALUE, SCL_CMD_SET_X_RESOLUTION, - &hpaio->scl.maxXRes, + &maxXRes, 0, 0 ); - DBG6("max x resolution=%d\n", hpaio->scl.maxXRes); + DBG(6,"maxXRes=%d retcode=%d\n", maxXRes, retcode); - SclInquire( hpaio->deviceid, hpaio->scan_channelid, + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_MAXIMUM_VALUE, SCL_CMD_SET_Y_RESOLUTION, - &hpaio->scl.maxYRes, + &maxYRes, 0, 0 ); - DBG6("max y resolution=%d\n", hpaio->scl.maxYRes); + DBG(6,"maxYRes=%d retcode=%d\n", maxYRes, retcode); + + if( hpaio->scl.compat & SCL_COMPAT_1150 && + minYRes < SCL_MIN_Y_RES_1150 ) + { + minYRes = SCL_MIN_Y_RES_1150; + } + hpaio->scl.minRes = minXRes; + if( hpaio->scl.minRes < minYRes ) + { + hpaio->scl.minRes = minYRes; + } - r = hpaio->scl.maxXRes; + hpaio->resolutionRange.min = hpaio->scl.minRes; - if( r > hpaio->scl.maxYRes ) + hpaio->scl.maxRes = maxXRes; + + if( hpaio->scl.maxRes > maxYRes ) { - r = hpaio->scl.maxYRes; + hpaio->scl.maxRes = maxYRes; } - if( hpaio->scl.compat & ( SCL_COMPAT_1150 | SCL_COMPAT_1170 ) && r > SCL_MAX_RES_1150_1170 ) + if( hpaio->scl.compat & ( SCL_COMPAT_1150 | SCL_COMPAT_1170 ) + && hpaio->scl.maxRes > SCL_MAX_RES_1150_1170 ) { - r = SCL_MAX_RES_1150_1170; + hpaio->scl.maxRes = SCL_MAX_RES_1150_1170; } - hpaio->resolutionRange.max = r; - + hpaio->resolutionRange.max = hpaio->scl.maxRes; + /* Determine ADF/duplex capabilities. */ { - int flatbedCapability = 1; - - SclInquire( hpaio->deviceid, hpaio->scan_channelid, - SCL_CMD_INQUIRE_MAXIMUM_VALUE, - SCL_PSEUDO_FLATBED_Y_RESOLUTION, - &flatbedCapability, - 0, - 0 ); - - SclInquire( hpaio->deviceid, hpaio->scan_channelid, + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_INQUIRE_DEVICE_PARAMETER, SCL_INQ_ADF_CAPABILITY, &hpaio->scl.adfCapability, 0, 0 ); - DBG(6, "ADF capability=%d: %s %d\n", hpaio->scl.adfCapability, __FILE__, __LINE__); + DBG(6, "ADF capability=%d retcode=%d: %s %d\n", hpaio->scl.adfCapability, retcode,__FILE__, __LINE__); + if (hpaio->scl.adfCapability) + { + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, + SCL_CMD_INQUIRE_MINIMUM_VALUE, + SCL_PSEUDO_ADF_X_RESOLUTION, + &minXRes, + 0, + 0 ); + DBG(6, "minXResAdf=%d retcode=%d\n", minXRes, retcode); + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, + SCL_CMD_INQUIRE_MINIMUM_VALUE, + SCL_PSEUDO_ADF_Y_RESOLUTION, + &minYRes, + 0, + 0 ); + DBG(6, "minYResAdf=%d retcode=%d\n", minYRes, retcode); + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, + SCL_CMD_INQUIRE_MAXIMUM_VALUE, + SCL_PSEUDO_ADF_X_RESOLUTION, + &maxXRes, + 0, + 0 ); + DBG(6, "maxXResAdf=%d retcode=%d\n", maxXRes, retcode); + retcode = SclInquire( hpaio->deviceid, hpaio->scan_channelid, + SCL_CMD_INQUIRE_MAXIMUM_VALUE, + SCL_PSEUDO_ADF_Y_RESOLUTION, + &maxYRes, + 0, + 0 ); + DBG(6, "maxYResAdf=%d retcode=%d\n", maxYRes, retcode); + if( hpaio->scl.compat & SCL_COMPAT_1150 && + minYRes < SCL_MIN_Y_RES_1150 ) + { + minYRes = SCL_MIN_Y_RES_1150; + } + hpaio->scl.minResAdf = minXRes; + if( hpaio->scl.minResAdf < minYRes ) + { + hpaio->scl.minResAdf = minYRes; + } + + hpaio->scl.maxResAdf = maxXRes; + + if( hpaio->scl.maxResAdf > maxYRes ) + { + hpaio->scl.maxResAdf = maxYRes; + } + + if( hpaio->scl.compat & ( SCL_COMPAT_1150 | SCL_COMPAT_1170 ) + && hpaio->scl.maxResAdf > SCL_MAX_RES_1150_1170 ) + { + hpaio->scl.maxResAdf = SCL_MAX_RES_1150_1170; + } + + } if( !hpaio->scl.adfCapability ) { hpaio->supportedAdfModes = ADF_MODE_FLATBED; } - else if( hpaio->scl.compat & SCL_COMPAT_K_SERIES || - !flatbedCapability ) + else if( hpaio->scl.compat & SCL_COMPAT_K_SERIES && + hpaio->scl.adfCapability ) { - hpaio->supportedAdfModes = ADF_MODE_ADF; + hpaio->supportedAdfModes = ADF_MODE_FLATBED | ADF_MODE_ADF; } else { diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index 8c0ac825f..ffab59fb7 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -142,6 +142,18 @@ :model "HP Officejet d155xi All-in-one Printer" :status :good +:model "HP Hewlett-packard LaserJet 200 Color MFP m275u" +:status :good + +:model "HP Hewlett-packard LaserJet 200 Color MFP m275nw" +:status :good + +:model "HP Hewlett-packard LaserJet 200 Color MFP m275s" +:status :good + +:model "HP Hewlett-packard LaserJet 200 Color MFP m275t" +:status :good + :model "HP Deskjet Ink Advantage k209a All-in-one Printer" :status :good @@ -1873,6 +1885,9 @@ :model "HP Officejet 5510v All-in-one Printer" :status :good +:model "HP Photosmart 5510d E-all-in-one" +:status :good + :model "HP Officejet 5510xi All-in-one Printer" :status :good @@ -2365,9 +2380,6 @@ :model "HP Photosmart c8188 All-in-one Printer" :status :good -:model "HP Officejet Pro 8500 a910a" -:status :good - :model "HP Officejet Pro 8500 Premier All-in-one Printer - a909n" :status :good @@ -2377,6 +2389,15 @@ :model "HP Officejet Pro 8500 All-in-one Printer - a909a" :status :good +:model "HP Officejet Pro 8500a E-aio Printer a910g" +:status :good + +:model "HP Officejet Pro 8500a E-aio Printer a910a" +:status :good + +:model "HP Officejet Pro 8500a E-aio Printer a910n" +:status :good + :model "HP Officejet Pro 8600" :status :good diff --git a/scan/sane/hpaio.h b/scan/sane/hpaio.h index a4d59a73e..2ab1db658 100644 --- a/scan/sane/hpaio.h +++ b/scan/sane/hpaio.h @@ -198,12 +198,11 @@ struct hpaioScanner_s int compat; char decipixelChar; - int minXRes, minYRes; - int maxXRes, maxYRes; + int minRes, maxRes; int maxXExtent, maxYExtent; - - int adfCapability; int unloadAfterScan; + int adfCapability; + int minResAdf, maxResAdf; PmlObject_t objSupportedFunctions; } scl; diff --git a/scan/sane/soapht.c b/scan/sane/soapht.c index 55352458a..375cc6593 100644 --- a/scan/sane/soapht.c +++ b/scan/sane/soapht.c @@ -520,7 +520,7 @@ SANE_Status soapht_open(SANE_String_Const device, SANE_Handle *handle) session->resolutionList[i++] = 200; session->resolutionList[i++] = 300; session->resolutionList[i++] = 600; - session->resolutionList[i++] = 1200; + //session->resolutionList[i++] = 1200; session->resolutionList[0] = i-1; /* length of word_list */ soapht_control_option(session, SOAP_OPTION_SCAN_RESOLUTION, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ diff --git a/toolbox.py b/toolbox.py index 0892402ed..e00476d43 100755 --- a/toolbox.py +++ b/toolbox.py @@ -100,8 +100,11 @@ if ui_toolkit == 'qt3': try: from dbus import SessionBus import dbus.service - from dbus.mainloop.glib import DBusGMainLoop + from dbus.mainloop.glib import DBusGMainLoop, threads_init from gobject import MainLoop + import glib + glib.threads_init() + dbus.mainloop.glib.threads_init() except ImportError: log.error("Unable to load dbus - Automatic status updates in HPLIP Device Manager will be disabled.") disable_dbus = True diff --git a/ui/setupform.py b/ui/setupform.py index 62304aeec..a3f00853d 100644 --- a/ui/setupform.py +++ b/ui/setupform.py @@ -1070,6 +1070,13 @@ class PasswordDialog(QDialog): self.connect(self.okPushButton,SIGNAL("clicked()"),self.accept) self.connect(self.passwordLineEdit,SIGNAL("returnPressed()"),self.accept) + + def setDefaultUsername(self, defUser, allowUsernameEdit = True): + self.usernameLineEdit.setText(defUser) + if not allowUsernameEdit: + self.usernameLineEdit.setReadOnly(True) + self.usernameLineEdit.setPaletteBackgroundColor(QColor("lightgray")) + def getUsername(self): return unicode(self.usernameLineEdit.text()) @@ -1087,11 +1094,13 @@ class PasswordDialog(QDialog): return qApp.translate("PasswordDialog",s,c) - -def showPasswordUI(prompt): +def showPasswordUI(prompt, userName=None, allowUsernameEdit=True): try: dlg = PasswordDialog(prompt, None) + if userName != None: + dlg.setDefaultUsername(userName, allowUsernameEdit) + if dlg.exec_loop() == QDialog.Accepted: return (dlg.getUsername(), dlg.getPassword()) diff --git a/ui4/plugindiagnose.py b/ui4/plugindiagnose.py new file mode 100644 index 000000000..5927731e4 --- /dev/null +++ b/ui4/plugindiagnose.py @@ -0,0 +1,113 @@ +# -*- coding: utf-8 -*- +# +# (c) Copyright 2001-2011 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 +# +# Authors: Amarnath Chitumalla +# + + +# Local +from base.g import * +from base import device, utils, pkit +from prnt import cups +from base.codes import * +from ui_utils import * +from installer.core_install import CoreInstall +from installer.core_install import PLUGIN_INSTALL_ERROR_NONE, \ + PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND, \ + PLUGIN_INSTALL_ERROR_DIGITAL_SIG_NOT_FOUND, \ + PLUGIN_INSTALL_ERROR_DIGITAL_SIG_BAD, \ + PLUGIN_INSTALL_ERROR_PLUGIN_FILE_CHECKSUM_ERROR, \ + PLUGIN_INSTALL_ERROR_NO_NETWORK, \ + PLUGIN_INSTALL_ERROR_DIRECTORY_ERROR, \ + PLUGIN_INSTALL_ERROR_UNABLE_TO_RECV_KEYS + +# Qt +from PyQt4.QtCore import * +from PyQt4.QtGui import * + +# Ui +from plugindiagnose_base import Ui_Dialog + + + +class PluginDiagnose(QDialog, Ui_Dialog): + def __init__(self, parent, install_mode=PLUGIN_NONE, plugin_reason=PLUGIN_REASON_NONE): + QDialog.__init__(self, parent) + self.install_mode = install_mode + self.plugin_reason = plugin_reason + self.plugin_path = None + self.result = False + self.core = CoreInstall() + self.core.set_plugin_version() + self.setupUi(self) + + self.user_settings = UserSettings() + self.user_settings.load() + self.user_settings.debug() + + self.initUi() + + + + + def initUi(self): + # connect signals/slots + self.connect(self.CancelButton, SIGNAL("clicked()"), self.CancelButton_clicked) + self.connect(self.NextButton, SIGNAL("clicked()"), self.NextButton_clicked) + + # Application icon + self.setWindowIcon(QIcon(load_pixmap('hp_logo', '128x128'))) + + + def PathLineEdit_textChanged(self, t): + self.plugin_path = unicode(t) + self.setPathIndicators() + + + # + # Misc + # + + def displayPage(self, page): + self.updateStepText(page) + self.StackedWidget.setCurrentIndex(page) + + def CancelButton_clicked(self): + self.close() + + + def NextButton_clicked(self): + self.NextButton.setEnabled(False) + self.CancelButton.setEnabled(False) + try: + plugin = PLUGIN_REQUIRED + plugin_reason = PLUGIN_REASON_NONE + ok, sudo_ok = pkit.run_plugin_command(plugin == PLUGIN_REQUIRED, plugin_reason) + + if not ok or not self.core.check_for_plugin(): + FailureUI(self, self.__tr("Failed to install Plug-in.\nEither you have chosen to skip the Plug-in installation or entered incorrect Password.")) + + finally: + endWaitCursor() + self.result = True + self.close() + + + def __tr(self,s,c = None): + return qApp.translate("PluginDialog",s,c) + diff --git a/ui4/plugindiagnose_base.py b/ui4/plugindiagnose_base.py new file mode 100644 index 000000000..2595d8cc3 --- /dev/null +++ b/ui4/plugindiagnose_base.py @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'ui4/plugindialog_base.ui' +# +#** Created: Mon Nov 14 15:31:49 2011 +#** by: Qt User Interface Compiler version 4.7.0 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +class Ui_Dialog(object): + def setupUi(self, Dialog): + Dialog.setObjectName("Dialog") + Dialog.resize(500, 180) + self.gridlayout = QtGui.QGridLayout(Dialog) + self.gridlayout.setObjectName("gridlayout") + self.StackedWidget = QtGui.QStackedWidget(Dialog) + self.StackedWidget.setObjectName("StackedWidget") + self.page = QtGui.QWidget() + self.page.setObjectName("page") + self.gridlayout1 = QtGui.QGridLayout(self.page) + self.gridlayout1.setObjectName("gridlayout1") + self.label = QtGui.QLabel(self.page) + font = QtGui.QFont() + font.setPointSize(16) + self.label.setFont(font) + self.label.setObjectName("label") + self.gridlayout1.addWidget(self.label, 0, 0, 1, 1) + self.line = QtGui.QFrame(self.page) + self.line.setFrameShape(QtGui.QFrame.HLine) + self.line.setFrameShadow(QtGui.QFrame.Sunken) + self.line.setObjectName("line") + self.gridlayout1.addWidget(self.line, 1, 0, 1, 2) + self.TitleLabel = QtGui.QLabel(self.page) + self.TitleLabel.setWordWrap(True) + self.TitleLabel.setObjectName("TitleLabel") + self.gridlayout1.addWidget(self.TitleLabel, 2, 0, 1, 2) + spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem2 = QtGui.QSpacerItem(278, 51, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridlayout1.addItem(spacerItem2, 5, 1, 1, 1) + self.StackedWidget.addWidget(self.page) + self.gridlayout.addWidget(self.StackedWidget, 0, 0, 1, 5) + self.line_2 = QtGui.QFrame(Dialog) + self.line_2.setFrameShape(QtGui.QFrame.HLine) + self.line_2.setFrameShadow(QtGui.QFrame.Sunken) + self.line_2.setObjectName("line_2") + self.gridlayout.addWidget(self.line_2, 1, 0, 1, 4) + self.NextButton = QtGui.QPushButton(Dialog) + self.NextButton.setObjectName("NextButton") + self.gridlayout.addWidget(self.NextButton, 2, 2, 1, 1) + self.CancelButton = QtGui.QPushButton(Dialog) + self.CancelButton.setObjectName("CancelButton") + self.gridlayout.addWidget(self.CancelButton, 2, 3, 1, 1) + + self.retranslateUi(Dialog) + self.StackedWidget.setCurrentIndex(0) + QtCore.QMetaObject.connectSlotsByName(Dialog) + + def retranslateUi(self, Dialog): + Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "HP Device Manager - Plug-in Installer", None, QtGui.QApplication.UnicodeUTF8)) + self.label.setText(QtGui.QApplication.translate("Dialog", "Driver Plug-in Required", None, QtGui.QApplication.UnicodeUTF8)) + self.TitleLabel.setText(QtGui.QApplication.translate("Dialog", "HP Device requires proprietary plug-in which is missing. Press Next to continue plug-in installation", None, QtGui.QApplication.UnicodeUTF8)) + self.NextButton.setText(QtGui.QApplication.translate("Dialog", "Next >", None, QtGui.QApplication.UnicodeUTF8)) + self.CancelButton.setText(QtGui.QApplication.translate("Dialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8)) + diff --git a/ui4/plugindiagnose_base.ui b/ui4/plugindiagnose_base.ui new file mode 100644 index 000000000..69ac4be9e --- /dev/null +++ b/ui4/plugindiagnose_base.ui @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Dialog</class> + <widget class="QDialog" name="Dialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>180</height> + </rect> + </property> + <property name="windowTitle"> + <string>HP Device Manager - Plug-in Installer</string> + </property> + <layout class="QGridLayout"> + <item row="0" column="0" colspan="4"> + <widget class="QStackedWidget" name="StackedWidget"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="page"> + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="font"> + <font> + <pointsize>16</pointsize> + </font> + </property> + <property name="text"> + <string>Driver Plug-in Installation is required</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QLabel" name="TitleLabel"> + <property name="text"> + <string>HP Device requires proprietary plug-in which is missing. Press Next to continue plug-in installation</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + <item row="1" column="0" colspan="4"> + <widget class="Line" name="line_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QPushButton" name="NextButton"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Next ></string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="QPushButton" name="CancelButton"> + <property name="text"> + <string>Cancel</string> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/ui4/setupdialog.py b/ui4/setupdialog.py index a1efdb2ad..2ae55d545 100644 --- a/ui4/setupdialog.py +++ b/ui4/setupdialog.py @@ -77,6 +77,8 @@ DEVICE_DESC_MULTI_FUNC = 2 class PasswordDialog(QDialog): def __init__(self, prompt, parent=None, name=None, modal=0, fl=0): QDialog.__init__(self, parent) + # Application icon + self.setWindowIcon(QIcon(load_pixmap('hp_logo', '128x128'))) self.prompt = prompt Layout= QGridLayout(self) @@ -110,7 +112,12 @@ class PasswordDialog(QDialog): self.connect(self.OkPushButton, SIGNAL("clicked()"), self.accept) self.connect(self.PasswordLineEdit, SIGNAL("returnPressed()"), self.accept) - + def setDefaultUsername(self, defUser, allowUsernameEdit = True): + self.UsernameLineEdit.setText(defUser) + if not allowUsernameEdit: + self.UsernameLineEdit.setReadOnly(True) + self.UsernameLineEdit.setStyleSheet("QLineEdit {background-color: lightgray}") + def getUsername(self): return unicode(self.UsernameLineEdit.text()) @@ -132,10 +139,13 @@ class PasswordDialog(QDialog): -def showPasswordUI(prompt): - try: +def showPasswordUI(prompt, userName=None, allowUsernameEdit=True): + try: dlg = PasswordDialog(prompt, None) + if userName != None: + dlg.setDefaultUsername(userName, allowUsernameEdit) + if dlg.exec_() == QDialog.Accepted: return (dlg.getUsername(), dlg.getPassword()) @@ -882,8 +892,8 @@ class SetupDialog(QDialog, Ui_Dialog): self.printer_fax_names_same = False self.printer_name_ok = True - self.FaxNameLineEdit.emit(SIGNAL("textChanged(const QString &)"), - (self.FaxNameLineEdit.text(),)) + self.FaxNameLineEdit.emit(SIGNAL("textEdited(const QString &)"), + self.FaxNameLineEdit.text()) self.setIndicators() self.setAddPrinterButton() @@ -914,8 +924,8 @@ class SetupDialog(QDialog, Ui_Dialog): self.printer_fax_names_same = False self.fax_name_ok = True - self.PrinterNameLineEdit.emit(SIGNAL("textChanged(const QString&)"), - (self.PrinterNameLineEdit.text(),)) + self.PrinterNameLineEdit.emit(SIGNAL("textEdited(const QString&)"), + self.PrinterNameLineEdit.text()) self.setIndicators() self.setAddPrinterButton() |
