diff options
| author | Didier Raboud <odyx@debian.org> | 2019-06-21 17:00:56 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2019-06-21 17:00:56 +0200 |
| commit | 27a93943e42f12380aa8d3a16659729bc95acdf7 (patch) | |
| tree | c512bc47f91d52642ac0136fe1bd9b19c57a3d85 | |
| parent | f68a2404a319152b8af4e84b628508cb86a9b4f5 (diff) | |
New upstream version 3.19.5
1296 files changed, 5205 insertions, 3506 deletions
diff --git a/Dat2drv.cpp b/Dat2drv.cpp index 56e5c963a..6742160e2 100755 --- a/Dat2drv.cpp +++ b/Dat2drv.cpp @@ -264,10 +264,8 @@ int TechClassExsist(string tech_class) { if (tech_class == TECH_CLASSES[count]) return 1; - if(count < 4 && tech_class == FAMILY_CLASSES[count]) - return 0 ; } - fprintf(stderr, "DAT2DRV : FAILED IN TechClassExsist(string tech_class) -> = NO TECH CLASS MATCH FOUND\n"); + //fprintf(stderr, "DAT2DRV : FAILED IN TechClassExsist(string tech_class) -> = NO TECH CLASS MATCH FOUND\n"); return -1; } @@ -452,6 +450,8 @@ char CreateFamilyClassDrv(DRV_DATA drv_data, MODEL_DICT_MAP model_dict, string m string family_class = "", line = ""; STRING_VECTOR matches; + STRING_VECTOR sub_class; + fstream file_in_pointer, file_out_pointer; file_in_pointer.open(drv_data.drv_in_template.c_str(), fstream::in); @@ -470,19 +470,34 @@ char CreateFamilyClassDrv(DRV_DATA drv_data, MODEL_DICT_MAP model_dict, string m while((getline(file_in_pointer, line))) { - size_t found = line.find("%"); + string search_family_class; stringstream f(line); + size_t found = line.find("%"); file_out_pointer << line + "\n"; if(found != std::string::npos) { found = line.find("//"); if(found != std::string::npos) { - while(getline(f, family_class, '%')) + while(getline(f, search_family_class, '%')) { - if(family_class[0] == ' ' || family_class[0] == '>' || family_class[3] == '/') + if(search_family_class[0] == ' ' || search_family_class[0] == '>' || search_family_class[3] == '/') continue; + stringstream f1(search_family_class); + unsigned char len = 0; + sub_class.clear(); + while(getline(f1, search_family_class, ':')) + { + if(len == 0) + { + family_class = search_family_class; + len ++; + } + else + sub_class.push_back(search_family_class); + } + for(unsigned char count = 0 ; count < MAX_FAMILY_CLASS; count ++) { found = 0; @@ -703,16 +718,7 @@ char CreateTechClassDrv(DRV_DATA drv_data, MODEL_DICT_MAP model_dict, STRING_PAI else sub_class.push_back(search_tech_class); } - for(unsigned char count = 0 ; count < MAX_FAMILY_CLASS; count ++) - { - found = 0; - if(tech_class == FAMILY_CLASSES[count]) - { - found = 1; - break; - } - } - if((found == 1) || (TechClassExsist(tech_class)) != 1) + if((TechClassExsist(tech_class)) != 1) continue; if((SubClassExsist(sub_class)) != 1) continue; diff --git a/Makefile.am b/Makefile.am index ef6480fbf..891660d02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -630,7 +630,7 @@ endif if HPPS_INSTALL hppsdir = $(cupsfilterdir) hpps_PROGRAMS = hpps -hpps_SOURCES = prnt/hpps/hppsfilter.c prnt/hpps/hppsfilter.h +hpps_SOURCES = prnt/hpps/hppsfilter.c prnt/hpps/hppsfilter.h prnt/hpps/psutil.c prnt/hpps/psutil.h prnt/hpps/pserror.c prnt/hpps/pserror.h prnt/hpps/psbooklet.c prnt/hpps/patchlev.h prnt/hpps/psspec.c prnt/hpps/psspec.h hpps_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) hpps_LDADD = -lcups $(DBUS_LIBS) endif #HPPS_INSTALL diff --git a/Makefile.in b/Makefile.in index f1171e585..34921cda4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -592,8 +592,13 @@ hppgsz_OBJECTS = $(am_hppgsz_OBJECTS) hppgsz_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(hppgsz_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am__hpps_SOURCES_DIST = prnt/hpps/hppsfilter.c prnt/hpps/hppsfilter.h -@HPPS_INSTALL_TRUE@am_hpps_OBJECTS = hppsfilter.$(OBJEXT) +am__hpps_SOURCES_DIST = prnt/hpps/hppsfilter.c prnt/hpps/hppsfilter.h \ + prnt/hpps/psutil.c prnt/hpps/psutil.h prnt/hpps/pserror.c \ + prnt/hpps/pserror.h prnt/hpps/psbooklet.c prnt/hpps/patchlev.h \ + prnt/hpps/psspec.c prnt/hpps/psspec.h +@HPPS_INSTALL_TRUE@am_hpps_OBJECTS = hppsfilter.$(OBJEXT) \ +@HPPS_INSTALL_TRUE@ psutil.$(OBJEXT) pserror.$(OBJEXT) \ +@HPPS_INSTALL_TRUE@ psbooklet.$(OBJEXT) psspec.$(OBJEXT) hpps_OBJECTS = $(am_hpps_OBJECTS) @HPPS_INSTALL_TRUE@hpps_DEPENDENCIES = $(am__DEPENDENCIES_1) am_locatedriver_OBJECTS = locatedriver-FindPPD.$(OBJEXT) @@ -788,9 +793,12 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz \ prnt/ps/hp-laserjet_3030-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m751-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz \ prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz \ prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60175-ps.ppd.gz \ prnt/ps/hp-laserjet_4350-ps.ppd.gz \ prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz \ prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \ @@ -804,9 +812,11 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz \ prnt/ps/hp-designjet_t7200-ps.ppd.gz \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz \ + prnt/ps/hp-laserjet_m507-ps.ppd.gz \ prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ @@ -815,10 +825,12 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-laserjet_5100_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz \ prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60165-ps.ppd.gz \ prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz \ prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz \ @@ -863,11 +875,13 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-designjet_4500ps.ppd.gz \ prnt/ps/hp-pagewide_352_printer-ps.ppd.gz \ prnt/ps/hp-laserjet_4240-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz \ prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2250-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \ @@ -908,12 +922,14 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \ prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_e50145-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2300-ps.ppd.gz \ prnt/ps/hp-officejet_color_mfp_x585.ppd.gz \ prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz \ prnt/ps/hp-laserjet_3052-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ prnt/ps/hp-officejet_pro_8732-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \ @@ -924,6 +940,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_4700-ps.ppd.gz \ prnt/ps/hp-laserjet_4si-ps.ppd.gz \ prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz \ prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz \ @@ -969,6 +986,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \ + prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz \ prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz \ @@ -1002,6 +1020,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m651-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60155-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ prnt/ps/hp-laserjet_9040-ps.ppd.gz \ @@ -1022,8 +1041,10 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz \ prnt/ps/hp-laserjet_2100-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz \ prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3700-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ @@ -1046,6 +1067,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz \ prnt/ps/hp-laserjet_p3004-ps.ppd.gz \ prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz \ @@ -1057,6 +1079,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2280-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2820-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz \ @@ -1065,6 +1088,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz \ prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz \ + prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz \ prnt/ps/hp-laserjet_1320n-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz \ @@ -1087,6 +1111,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz \ prnt/ps/hp-laserjet_3020-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \ prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz \ @@ -1101,10 +1126,12 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m553-ps.ppd.gz \ prnt/ps/hp-laserjet_5200l-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz \ prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m750-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz \ @@ -1404,6 +1431,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ ppd/hpcups/hp-ink_tank_110_series.ppd.gz \ ppd/hpcups/hp-ink_tank_310_series.ppd.gz \ ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz \ + ppd/hpcups/hp-laser_ns_1020.ppd.gz \ + ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz \ ppd/hpcups/hp-laserjet_1000.ppd.gz \ ppd/hpcups/hp-laserjet_1005_series.ppd.gz \ ppd/hpcups/hp-laserjet_1010.ppd.gz \ @@ -1619,6 +1648,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ + ppd/hpcups/hp-neverstop_laser_100x.ppd.gz \ + ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz \ ppd/hpcups/hp-officejet.ppd.gz \ ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \ ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ @@ -1672,6 +1703,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ ppd/hpcups/hp-officejet_7500_e910.ppd.gz \ ppd/hpcups/hp-officejet_7510_series.ppd.gz \ ppd/hpcups/hp-officejet_7610_series.ppd.gz \ + ppd/hpcups/hp-officejet_8010_series.ppd.gz \ + ppd/hpcups/hp-officejet_8020_series.ppd.gz \ ppd/hpcups/hp-officejet_8040_series.ppd.gz \ ppd/hpcups/hp-officejet_8700.ppd.gz \ ppd/hpcups/hp-officejet_9010_series.ppd.gz \ @@ -1709,6 +1742,8 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz \ ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz \ ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz \ ppd/hpcups/hp-officejet_pro_8100.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz \ @@ -1892,8 +1927,30 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ ppd/hpcups/hp-psc_920.ppd.gz ppd/hpcups/hp-psc_950.ppd.gz \ ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz \ ppd/hpcups/hp-smart_tank_350_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_500_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_510_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_530_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_610_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz \ ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz \ ppd/hpcups/hp-tango.ppd.gz \ + ppd/classppd/hpcups/hp-Ampere.ppd.gz \ + ppd/classppd/hpcups/hp-CLE.ppd.gz \ + ppd/classppd/hpcups/hp-CLE17.ppd.gz \ + ppd/classppd/hpcups/hp-Copperhead.ppd.gz \ + ppd/classppd/hpcups/hp-Copperhead12.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz \ + ppd/classppd/hpcups/hp-Corbett.ppd.gz \ + ppd/classppd/hpcups/hp-DJ55xx.ppd.gz \ + ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz \ + ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz \ + ppd/classppd/hpcups/hp-Gemstone.ppd.gz \ + ppd/classppd/hpcups/hp-Kapan.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz \ @@ -1901,16 +1958,37 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class1.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class1A.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class1B.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class2.ppd.gz \ + ppd/classppd/hpcups/hp-Mimas.ppd.gz \ + ppd/classppd/hpcups/hp-Mimas15.ppd.gz \ + ppd/classppd/hpcups/hp-Mimas17.ppd.gz \ + ppd/classppd/hpcups/hp-MimasTDR.ppd.gz \ + ppd/classppd/hpcups/hp-OJ7000.ppd.gz \ + ppd/classppd/hpcups/hp-OJProKx50.ppd.gz \ + ppd/classppd/hpcups/hp-P15_CISS.ppd.gz \ ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz \ ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz \ ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz \ ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz \ ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz \ ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz \ + ppd/classppd/hpcups/hp-PSP100.ppd.gz \ + ppd/classppd/hpcups/hp-PSP470.ppd.gz \ + ppd/classppd/hpcups/hp-Pyramid.ppd.gz \ + ppd/classppd/hpcups/hp-Pyramid15.ppd.gz \ + ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz \ + ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz \ + ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz \ + ppd/classppd/hpcups/hp-Python.ppd.gz \ + ppd/classppd/hpcups/hp-Python10.ppd.gz \ + ppd/classppd/hpcups/hp-Python11.ppd.gz \ + ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz \ + ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz \ + ppd/classppd/hpcups/hp-Saipan.ppd.gz \ + ppd/classppd/hpcups/hp-Saipan15B.ppd.gz \ + ppd/classppd/hpcups/hp-Stabler.ppd.gz \ + ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz \ + ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz \ + ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz \ ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \ ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \ ppd/classppd/ps/hp-postscript-laserjet.ppd.gz @@ -2266,6 +2344,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_610_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3505-pcl3-hpijs.ppd.gz \ @@ -2379,6 +2458,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_plus_550_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz \ @@ -2405,6 +2485,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m101-m106-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laser_ns_mfp_1005-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-dj450-hpijs.ppd.gz \ @@ -2470,6 +2551,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz \ + ppd/hpijs/hp-laser_ns_1020-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz \ ppd/hpijs/hp-psc_760-hpijs.ppd.gz \ @@ -2483,6 +2565,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m9059_mfp-pcl3-hpijs.ppd.gz \ + ppd/hpijs/hp-neverstop_laser_100x-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_5500-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz \ @@ -2534,6 +2617,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz \ ppd/hpijs/hp-envy_5660_series-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_510_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz \ ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz \ @@ -2710,6 +2794,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-mopier_240-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_500_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_2130_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ @@ -2743,6 +2828,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_4000_series-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz \ ppd/hpijs/hp-envy_4520_series-hpijs.ppd.gz \ + ppd/hpijs/hp-neverstop_laser_mfp_120x-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9040-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz \ @@ -2803,6 +2889,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_plus_570_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm2320_mfp-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz \ @@ -2890,6 +2977,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp4005-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3390-pcl3-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_plus_650_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz \ @@ -2960,6 +3048,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3020-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_530_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_cm1412fn-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ @@ -3036,9 +3125,12 @@ foomatic_ps_printers = \ prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz \ prnt/ps/hp-laserjet_3030-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m751-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz \ prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz \ prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60175-ps.ppd.gz \ prnt/ps/hp-laserjet_4350-ps.ppd.gz \ prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz \ prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \ @@ -3052,9 +3144,11 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz \ prnt/ps/hp-designjet_t7200-ps.ppd.gz \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz \ + prnt/ps/hp-laserjet_m507-ps.ppd.gz \ prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ @@ -3063,10 +3157,12 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_5100_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz \ prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60165-ps.ppd.gz \ prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz \ prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz \ @@ -3111,11 +3207,13 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4500ps.ppd.gz \ prnt/ps/hp-pagewide_352_printer-ps.ppd.gz \ prnt/ps/hp-laserjet_4240-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz \ prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2250-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \ @@ -3156,12 +3254,14 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \ prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_e50145-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2300-ps.ppd.gz \ prnt/ps/hp-officejet_color_mfp_x585.ppd.gz \ prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz \ prnt/ps/hp-laserjet_3052-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ prnt/ps/hp-officejet_pro_8732-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \ @@ -3172,6 +3272,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_4700-ps.ppd.gz \ prnt/ps/hp-laserjet_4si-ps.ppd.gz \ prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz \ prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz \ @@ -3217,6 +3318,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \ + prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz \ prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz \ @@ -3250,6 +3352,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_m651-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60155-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ prnt/ps/hp-laserjet_9040-ps.ppd.gz \ @@ -3270,8 +3373,10 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz \ prnt/ps/hp-laserjet_2100-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz \ prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3700-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ @@ -3294,6 +3399,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz \ prnt/ps/hp-laserjet_p3004-ps.ppd.gz \ prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz \ @@ -3305,6 +3411,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2280-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2820-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz \ @@ -3313,6 +3420,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz \ prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz \ + prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz \ prnt/ps/hp-laserjet_1320n-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz \ @@ -3335,6 +3443,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz \ prnt/ps/hp-laserjet_3020-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \ prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz \ @@ -3349,10 +3458,12 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_m553-ps.ppd.gz \ prnt/ps/hp-laserjet_5200l-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz \ prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m750-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz \ @@ -3664,6 +3775,8 @@ dist_unrel_DATA = @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-ink_tank_110_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-ink_tank_310_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laser_ns_1020.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_1000.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_1005_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_1010.ppd.gz \ @@ -3879,6 +3992,8 @@ dist_unrel_DATA = @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-neverstop_laser_100x.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ @@ -3932,6 +4047,8 @@ dist_unrel_DATA = @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_7500_e910.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_7510_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_7610_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_8010_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_8020_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_8040_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_8700.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_9010_series.ppd.gz \ @@ -3969,6 +4086,8 @@ dist_unrel_DATA = @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_8100.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz \ @@ -4157,12 +4276,34 @@ dist_unrel_DATA = @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-psc_950vr.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-psc_950xi.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_350_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_500_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_510_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_530_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_610_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz \ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz \ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-tango.ppd.gz @HPLIP_CLASS_DRIVER_FALSE@cups_drv = prnt/drv/hpcups.drv @HPLIP_CLASS_DRIVER_TRUE@cups_drv = prnt/drv/hpcups.drv @HPLIP_CLASS_DRIVER_TRUE@class_cups_ppd_printers = \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Ampere.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-CLE.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-CLE17.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Copperhead.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Copperhead12.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Corbett.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-DJ55xx.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Gemstone.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Kapan.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz \ @@ -4170,16 +4311,37 @@ dist_unrel_DATA = @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz \ -@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL3-Class1.ppd.gz \ -@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL3-Class1A.ppd.gz \ -@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL3-Class1B.ppd.gz \ -@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL3-Class2.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Mimas.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Mimas15.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Mimas17.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-MimasTDR.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-OJ7000.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-OJProKx50.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-P15_CISS.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PSP100.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PSP470.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Pyramid.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Pyramid15.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Python.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Python10.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Python11.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Saipan.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Saipan15B.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-Stabler.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz \ +@HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \ @HPLIP_CLASS_DRIVER_TRUE@ ppd/classppd/ps/hp-postscript-laserjet.ppd.gz @@ -4629,7 +4791,7 @@ dat2drvdir = $(hplipdir) dat2drv_SOURCES = Common.h Dat2drv.cpp Dat2drv.h Normalize.cpp Normalize.h @GCC_GE_47_TRUE@dat2drv_CXXFLAGS = -std=c++11 @HPPS_INSTALL_TRUE@hppsdir = $(cupsfilterdir) -@HPPS_INSTALL_TRUE@hpps_SOURCES = prnt/hpps/hppsfilter.c prnt/hpps/hppsfilter.h +@HPPS_INSTALL_TRUE@hpps_SOURCES = prnt/hpps/hppsfilter.c prnt/hpps/hppsfilter.h prnt/hpps/psutil.c prnt/hpps/psutil.h prnt/hpps/pserror.c prnt/hpps/pserror.h prnt/hpps/psbooklet.c prnt/hpps/patchlev.h prnt/hpps/psspec.c prnt/hpps/psspec.h @HPPS_INSTALL_TRUE@hpps_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) @HPPS_INSTALL_TRUE@hpps_LDADD = -lcups $(DBUS_LIBS) @@ -5714,6 +5876,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locatedriver-FindPPD.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcardext_la-fat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcardext_la-pcardext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psbooklet.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pserror.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psspec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psutil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanext_la-scanext.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ @@ -6370,6 +6536,62 @@ hppsfilter.obj: prnt/hpps/hppsfilter.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hppsfilter.obj `if test -f 'prnt/hpps/hppsfilter.c'; then $(CYGPATH_W) 'prnt/hpps/hppsfilter.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/hppsfilter.c'; fi` +psutil.o: prnt/hpps/psutil.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psutil.o -MD -MP -MF $(DEPDIR)/psutil.Tpo -c -o psutil.o `test -f 'prnt/hpps/psutil.c' || echo '$(srcdir)/'`prnt/hpps/psutil.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psutil.Tpo $(DEPDIR)/psutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/psutil.c' object='psutil.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psutil.o `test -f 'prnt/hpps/psutil.c' || echo '$(srcdir)/'`prnt/hpps/psutil.c + +psutil.obj: prnt/hpps/psutil.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psutil.obj -MD -MP -MF $(DEPDIR)/psutil.Tpo -c -o psutil.obj `if test -f 'prnt/hpps/psutil.c'; then $(CYGPATH_W) 'prnt/hpps/psutil.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/psutil.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psutil.Tpo $(DEPDIR)/psutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/psutil.c' object='psutil.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psutil.obj `if test -f 'prnt/hpps/psutil.c'; then $(CYGPATH_W) 'prnt/hpps/psutil.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/psutil.c'; fi` + +pserror.o: prnt/hpps/pserror.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pserror.o -MD -MP -MF $(DEPDIR)/pserror.Tpo -c -o pserror.o `test -f 'prnt/hpps/pserror.c' || echo '$(srcdir)/'`prnt/hpps/pserror.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pserror.Tpo $(DEPDIR)/pserror.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/pserror.c' object='pserror.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pserror.o `test -f 'prnt/hpps/pserror.c' || echo '$(srcdir)/'`prnt/hpps/pserror.c + +pserror.obj: prnt/hpps/pserror.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pserror.obj -MD -MP -MF $(DEPDIR)/pserror.Tpo -c -o pserror.obj `if test -f 'prnt/hpps/pserror.c'; then $(CYGPATH_W) 'prnt/hpps/pserror.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/pserror.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pserror.Tpo $(DEPDIR)/pserror.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/pserror.c' object='pserror.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pserror.obj `if test -f 'prnt/hpps/pserror.c'; then $(CYGPATH_W) 'prnt/hpps/pserror.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/pserror.c'; fi` + +psbooklet.o: prnt/hpps/psbooklet.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psbooklet.o -MD -MP -MF $(DEPDIR)/psbooklet.Tpo -c -o psbooklet.o `test -f 'prnt/hpps/psbooklet.c' || echo '$(srcdir)/'`prnt/hpps/psbooklet.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psbooklet.Tpo $(DEPDIR)/psbooklet.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/psbooklet.c' object='psbooklet.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psbooklet.o `test -f 'prnt/hpps/psbooklet.c' || echo '$(srcdir)/'`prnt/hpps/psbooklet.c + +psbooklet.obj: prnt/hpps/psbooklet.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psbooklet.obj -MD -MP -MF $(DEPDIR)/psbooklet.Tpo -c -o psbooklet.obj `if test -f 'prnt/hpps/psbooklet.c'; then $(CYGPATH_W) 'prnt/hpps/psbooklet.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/psbooklet.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psbooklet.Tpo $(DEPDIR)/psbooklet.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/psbooklet.c' object='psbooklet.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psbooklet.obj `if test -f 'prnt/hpps/psbooklet.c'; then $(CYGPATH_W) 'prnt/hpps/psbooklet.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/psbooklet.c'; fi` + +psspec.o: prnt/hpps/psspec.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psspec.o -MD -MP -MF $(DEPDIR)/psspec.Tpo -c -o psspec.o `test -f 'prnt/hpps/psspec.c' || echo '$(srcdir)/'`prnt/hpps/psspec.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psspec.Tpo $(DEPDIR)/psspec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/psspec.c' object='psspec.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psspec.o `test -f 'prnt/hpps/psspec.c' || echo '$(srcdir)/'`prnt/hpps/psspec.c + +psspec.obj: prnt/hpps/psspec.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psspec.obj -MD -MP -MF $(DEPDIR)/psspec.Tpo -c -o psspec.obj `if test -f 'prnt/hpps/psspec.c'; then $(CYGPATH_W) 'prnt/hpps/psspec.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/psspec.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psspec.Tpo $(DEPDIR)/psspec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prnt/hpps/psspec.c' object='psspec.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psspec.obj `if test -f 'prnt/hpps/psspec.c'; then $(CYGPATH_W) 'prnt/hpps/psspec.c'; else $(CYGPATH_W) '$(srcdir)/prnt/hpps/psspec.c'; fi` + ptest.o: pcard/ptest.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptest.o -MD -MP -MF $(DEPDIR)/ptest.Tpo -c -o ptest.o `test -f 'pcard/ptest.c' || echo '$(srcdir)/'`pcard/ptest.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptest.Tpo $(DEPDIR)/ptest.Po diff --git a/Normalize.cpp b/Normalize.cpp index 21c211163..51539394a 100644 --- a/Normalize.cpp +++ b/Normalize.cpp @@ -1,7 +1,7 @@ #include"Normalize.h" /** string array of family classes */ -string FAMILY_CLASSES[MAX_FAMILY_CLASS] = { "PCL3-Class1A", "PCL3-Class1", "PCL3-Class2","PCLM_COLOR","PCLM_MONO","PCL3-Class1B","PCL3-Class1C","PCL3-Class2A","PCL3-Class2B","PCL3-Class3","PCL3-Class3A","PCL3-Class3B","PCL4-Class1","LJ-Class1","LJ-Class2","LJ-Class3","LJ-Class4","LJ-Class4A","LJ-Class5","LJ-Class6"}; +string FAMILY_CLASSES[MAX_FAMILY_CLASS] = {"PCL3-Class3A","PCL3-Class3B","PCL3-Class3","PCLM_COLOR","PCLM_MONO","PCL4-Class1","LJ-Class1","LJ-Class2","LJ-Class3","LJ-Class4","LJ-Class4A","LJ-Class5","LJ-Class6","DJGenericVIP","DJ9xxVIP","DJ55xx","Stabler","StingrayOJ","Copperhead","CopperheadXLP","Copperhead12","CopperheadIPH","CopperheadIPH15","CopperheadIPH17","CLE","CLE17","PyramidRefresh17","Saipan","Saipan15B","Kapan","ViperPlusVIP","ViperMinusVIP","Corbett","Ampere","Python","Python10","Python11","Mimas","Mimas15","Mimas17","MimasTDR","PyramidRefresh15","P15_CISS","Pyramid","Pyramid15","PyramidPlus","Gemstone","SPDOfficejetProAsize","SPDOfficejetProBsize","OJ7000","OJProKx50","PSP100","PSP470"}; /** string array of tech classes */ string TECH_CLASSES[MAX_TECH_CLASS] = { @@ -80,8 +80,8 @@ string TECH_CLASSES[MAX_TECH_CLASS] = { "SPDOfficejetProBsize", "CLE17", "Mimas17", - "P15_CISS", - "SPDMainstreamCoreConsumerA" + "P15_CISS" + }; /** string array of tech sub classes */ @@ -244,7 +244,6 @@ PAIR_VECTOR TechClassPdlKeySvalues() TECH_CLASS_KEY_VALUE.push_back(make_pair("CLE17", "pcl3")); TECH_CLASS_KEY_VALUE.push_back(make_pair("Mimas17", "pcl3")); TECH_CLASS_KEY_VALUE.push_back(make_pair("P15_CISS", "pcl3")); - TECH_CLASS_KEY_VALUE.push_back(make_pair("SPDMainstreamCoreConsumerA", "pcl3")); return TECH_CLASS_KEY_VALUE; } diff --git a/Normalize.h b/Normalize.h index e4589e7ec..b250609ca 100644 --- a/Normalize.h +++ b/Normalize.h @@ -4,8 +4,8 @@ #include"Common.h" #define MAX_TECH_CLASS_PDL 67 -#define MAX_TECH_CLASS 77 -#define MAX_FAMILY_CLASS 20 +#define MAX_TECH_CLASS 76 +#define MAX_FAMILY_CLASS 53 #define MAX_SUB_CLASS 30 diff --git a/base/imageprocessing.py b/base/imageprocessing.py index aa39a59b5..420355d2d 100644 --- a/base/imageprocessing.py +++ b/base/imageprocessing.py @@ -195,8 +195,12 @@ def Deskew_angle1(img): angle = abs(angle) if angle != 0: angles.append(angle) + if not angles: + median_angle = 0 + return median_angle + else: + median_angle = min(angles) - median_angle = min(angles) for item in temp_angles: if median_angle == abs(item): median_angle = item @@ -239,12 +243,17 @@ def Deskew_angle2(img): hist, score = find_score(bin_img, angle) scores.append(score) - best_score = max(scores) + if not scores: + best_angle = 0 + return best_angle + else: + best_score = max(scores) + best_angle = angles[scores.index(best_score)] if best_angle < 0 : - best_angle = best_angle - 1 + best_angle = best_angle else: - best_angle = best_angle + 1 + best_angle = best_angle if (best_angle >= 15 or best_angle <= -15): best_angle = 0 return best_angle @@ -667,6 +676,9 @@ def adjust_color(im, factor): return out def merge_PDF_viewer(output,ocr): + if (output.endswith('.pdf') == False): + print("PDF viewer is trying open other than PDF file") + return pdf_viewer = '' pdf_viewer_list = ['kpdf', 'acroread', 'xpdf', 'evince', 'xdg-open'] for v in pdf_viewer_list: @@ -807,49 +819,87 @@ def dominantcolor(xcord, ycord, radius, img): y2 = punchhole_margin if((0 < ycord < width) and (0 < xcord < y2)): - s1 = (xcord+ radius) - s2 = (xcord+ (radius+ 8)) - s3 = (ycord - 4) - s4 = (ycord + 4) + s1 = (xcord -4) + s2 = (xcord +4) + s3 = (ycord + (radius)) + s4 = (ycord + (8+radius)) myimg = img[s3:s4, s1:s2] w , h, c = myimg.shape for i in range(0, w-1): for j in range(0, h-1): rgblist = myimg[i,j] l.append((rgblist[0],rgblist[1],rgblist[2])) - - - if((0 < ycord < width) and (y1 < xcord < height)): - s1 = (xcord- (radius+8)) - s2 = (xcord- (radius)) - s3 = (ycord - 4) - s4 = (ycord + 4) + s1 = (xcord -4) + s2 = (xcord +4) + s3 = (ycord - (radius)) + s4 = (ycord - (8+radius)) myimg = img[s3:s4, s1:s2] - w , h, c = myimg.shape + w , h, c = myimg.shape for i in range(0, w-1): for j in range(0, h-1): rgblist = myimg[i,j] l.append((rgblist[0],rgblist[1],rgblist[2])) - if((0 < ycord < x1) and (0 < xcord < height)): + if((0 < ycord < width) and (y1 < xcord < height)): s1 = (xcord -4) s2 = (xcord +4) s3 = (ycord + (radius)) - s4 = (ycord + (radius+8)) + s4 = (ycord + (8+radius)) + myimg = img[s3:s4, s1:s2] + w , h, c = myimg.shape + for i in range(0, w-1): + for j in range(0, h-1): + rgblist = myimg[i,j] + l.append((rgblist[0],rgblist[1],rgblist[2])) + s1 = (xcord -4) + s2 = (xcord +4) + s3 = (ycord - (radius)) + s4 = (ycord - (8+radius)) myimg = img[s3:s4, s1:s2] w , h, c = myimg.shape for i in range(0, w-1): for j in range(0, h-1): rgblist = myimg[i,j] l.append((rgblist[0],rgblist[1],rgblist[2])) - if((x2 < ycord < width) and (0 < xcord < height)): - s1 = (xcord -4) - s2 = (xcord +4) - s3 = (ycord - (radius+8)) - s4 = (ycord - (radius)) + s1 = (xcord - (8+radius)) + s2 = (xcord - (radius)) + s3 = (ycord - 4) + s4 = (ycord + 4) + myimg = img[s3:s4, s1:s2] + w , h, c = myimg.shape + for i in range(0, w-1): + for j in range(0, h-1): + rgblist = myimg[i,j] + l.append((rgblist[0],rgblist[1],rgblist[2])) + s1 = (xcord + (8+radius)) + s2 = (xcord + (radius)) + s3 = (ycord - 4) + s4 = (ycord + 4) + myimg = img[s3:s4, s1:s2] + w , h, c = myimg.shape + for i in range(0, w-1): + for j in range(0, h-1): + rgblist = myimg[i,j] + l.append((rgblist[0],rgblist[1],rgblist[2])) + + if((0 < ycord < x1) and (0 < xcord < height)): + s1 = (xcord - (8+radius)) + s2 = (xcord - (radius)) + s3 = (ycord - 4) + s4 = (ycord + 4) + myimg = img[s3:s4, s1:s2] + w , h, c = myimg.shape + for i in range(0, w-1): + for j in range(0, h-1): + rgblist = myimg[i,j] + l.append((rgblist[0],rgblist[1],rgblist[2])) + s1 = (xcord + (8+radius)) + s2 = (xcord + (radius)) + s3 = (ycord - 4) + s4 = (ycord + 4) myimg = img[s3:s4, s1:s2] w , h, c = myimg.shape for i in range(0, w-1): @@ -894,12 +944,10 @@ def punchhole_removal(im): from skimage.util import img_as_ubyte ''' check for punch holes and remove ''' - max_peaks = 24 #maximum number of peaks to be found. changed from 99 to 24 for reducing the unnecessary punch holes being filled. img = np.array(im)# Load picture . - img_rgb = rgba2rgb(img)# convert to RGB - img_gray = rgb2gray(img_rgb)# convert to gray + img_gray = rgb2gray(img)# convert to gray image = img_as_ubyte(img_gray) width, height = image.shape x1 = punchhole_margin @@ -907,13 +955,13 @@ def punchhole_removal(im): y1 = (int)(height - punchhole_margin) y2 = punchhole_margin - edges = canny(image, 3, 10, 40) # perform canny to detect the edges + edges = auto_canny(image) + #edges = canny(image, 3, 10, 40) # perform canny to detect the edges hough_radii = np.arange(31, 34, 1) #get the radius range with step as 1. hough_res = hough_circle(edges, hough_radii) # detect the circles centres coordinates # Select the most prominent circles based on the max_peaks accums, cx, cy, radii = hough_circle_peaks(hough_res, hough_radii,total_num_peaks=max_peaks) - for center_y, center_x, radius in zip(cy, cx, radii): #if the circles centres fall in the border regions, @@ -923,22 +971,12 @@ def punchhole_removal(im): ((0 < center_y < x1) and (0 < center_x < height)) or \ ((x2 < center_y < width) and (0 < center_x < height))): - index=0 rr, cc= circle(center_y, center_x, radius+1, img.shape) - dominantpix = dominantcolor(center_x, center_y, radius, img) - dark_grad = [dominantpix[0], dominantpix[1],dominantpix[2]] - light_grad = [dominantpix[0]+1, dominantpix[1]+1, dominantpix[2]+1] - #white_grad = [255,255,255] - RGBA_list = lineargradient(dark_grad,light_grad,len(list(rr))) - + dominantpix = dominantcolor(center_x, center_y, radius,img) for i , j in zip(list(rr), list(cc)): - pixlist = RGBA_list[index] - pixtuple = tuple(pixlist) - img[i,j]= (pixtuple[0], pixtuple[1], pixtuple[2], 255) - index += 1 - - finalimage=Image.fromarray(img) + img[i,j]= (dominantpix[0], dominantpix[1], dominantpix[2], 255) + finalimage=Image.fromarray(img) return finalimage def color_dropout(im,color,color_range): @@ -1001,4 +1039,14 @@ def rgb2hsv(r, g, b): return h, s, v +def check_scipy(): + scanjet_flag = None + try: + from scipy.ndimage import interpolation as inter + except ImportError as error: + scanjet_flag=str(error) + except: + scanjet_flag=str("Error occurred") + return scanjet_flag + diff --git a/base/models.py b/base/models.py index 2d3709176..fdc23ceee 100644 --- a/base/models.py +++ b/base/models.py @@ -49,7 +49,7 @@ TYPE_URI = TYPE_STR # (7) not used (yet) TYPE_DATE = 8 # format: mm/dd/yyyy -FAMILY_CLASSES = ["PCL3-Class1","PCL3-Class1A","PCL3-Class1B","PCL3-Class2" , "PCL3-Class3", "PCL3-Class3A","PCL3-Class3B","PCLM_COLOR","PCLM_MONO","PCL4-Class1","LJ-Class1","LJ-Class2","LJ-Class3","LJ-Class4","LJ-Class4A","LJ-Class5","LJ-Class6"] +FAMILY_CLASSES = ["PCL3-Class3A","PCL3-Class3B","PCL3-Class3","PCLM_COLOR","PCLM_MONO","PCL4-Class1","LJ-Class1","LJ-Class2","LJ-Class3","LJ-Class4","LJ-Class4A","LJ-Class5","LJ-Class6","DJGenericVIP","DJ9xxVIP","DJ55xx","Stabler","StingrayOJ","Copperhead","CopperheadXLP","Copperhead12","CopperheadIPH","CopperheadIPH15","CopperheadIPH17","CLE","CLE17","PyramidRefresh17","Saipan","Saipan15B","Kapan","ViperPlusVIP","ViperMinusVIP","Corbett","Ampere","Python","Python10","Python11","Mimas","Mimas15","Mimas17","MimasTDR","PyramidRefresh15","P15_CISS","Pyramid","Pyramid15","PyramidPlus","Gemstone","SPDOfficejetProAsize","SPDOfficejetProBsize","OJ7000","OJProKx50","PSP100","PSP470"] TECH_CLASSES = [ "Undefined", # This will show an error (and its the default) @@ -128,8 +128,8 @@ TECH_CLASSES = [ "SPDOfficejetProBsize", "CLE17", "Mimas17", - "P15_CISS", - "SPDMainstreamCoreConsumerA" + "P15_CISS" + ] TECH_CLASSES.sort() @@ -205,8 +205,8 @@ TECH_CLASS_PDLS = { "SPDOfficejetProBsize" : 'pcl3', "CLE17" : 'pcl3', "Mimas17" : 'pcl3', - "P15_CISS" : 'pcl3', - "SPDMainstreamCoreConsumerA" : 'pcl3' + "P15_CISS" : 'pcl3' + } PDL_TYPE_PCL = 0 # less preferred diff --git a/base/module.py b/base/module.py index f906adc43..dd3efa3d0 100644 --- a/base/module.py +++ b/base/module.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (c) Copyright 2003-2015 HP Development Company, L.P. +# (c) Copyright 2003-2018 HP 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 @@ -487,7 +487,7 @@ class Module(object): #if uiscan == False: log.info(log.bold("%s ver. %s" % (self.title, self.version))) log.info("") - log.info("Copyright (c) 2001-15 HP Development Company, LP") + log.info("Copyright (c) 2001-18 HP 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.") diff --git a/base/utils.py b/base/utils.py index a0c74e18c..f268cf830 100644 --- a/base/utils.py +++ b/base/utils.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# (c) Copyright 2001-2015 HP Development Company, L.P. +# (c) Copyright 2001-2018 HP 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 @@ -1866,7 +1866,7 @@ encoding: utf8 log.info("contact the HPLIP Team.") log.info(".SH COPYRIGHT") - log.info("Copyright (c) 2001-15 HP Development Company, L.P.") + log.info("Copyright (c) 2001-18 HP 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") @@ -1885,7 +1885,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-15 HP Development Company, LP") + log.info("Copyright (c) 2001-18 HP 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.") diff --git a/class_cups_drv.inc b/class_cups_drv.inc index 547d0e7fe..d9c7f36bb 100644 --- a/class_cups_drv.inc +++ b/class_cups_drv.inc @@ -1,4 +1,19 @@ class_cups_ppd_printers = \ + ppd/classppd/hpcups/hp-Ampere.ppd.gz \ + ppd/classppd/hpcups/hp-CLE.ppd.gz \ + ppd/classppd/hpcups/hp-CLE17.ppd.gz \ + ppd/classppd/hpcups/hp-Copperhead.ppd.gz \ + ppd/classppd/hpcups/hp-Copperhead12.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz \ + ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz \ + ppd/classppd/hpcups/hp-Corbett.ppd.gz \ + ppd/classppd/hpcups/hp-DJ55xx.ppd.gz \ + ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz \ + ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz \ + ppd/classppd/hpcups/hp-Gemstone.ppd.gz \ + ppd/classppd/hpcups/hp-Kapan.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz \ @@ -6,16 +21,37 @@ class_cups_ppd_printers = \ ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz \ ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class1.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class1A.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class1B.ppd.gz \ - ppd/classppd/hpcups/hp-PCL3-Class2.ppd.gz \ + ppd/classppd/hpcups/hp-Mimas.ppd.gz \ + ppd/classppd/hpcups/hp-Mimas15.ppd.gz \ + ppd/classppd/hpcups/hp-Mimas17.ppd.gz \ + ppd/classppd/hpcups/hp-MimasTDR.ppd.gz \ + ppd/classppd/hpcups/hp-OJ7000.ppd.gz \ + ppd/classppd/hpcups/hp-OJProKx50.ppd.gz \ + ppd/classppd/hpcups/hp-P15_CISS.ppd.gz \ ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz \ ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz \ ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz \ ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz \ ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz \ ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz \ + ppd/classppd/hpcups/hp-PSP100.ppd.gz \ + ppd/classppd/hpcups/hp-PSP470.ppd.gz \ + ppd/classppd/hpcups/hp-Pyramid.ppd.gz \ + ppd/classppd/hpcups/hp-Pyramid15.ppd.gz \ + ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz \ + ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz \ + ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz \ + ppd/classppd/hpcups/hp-Python.ppd.gz \ + ppd/classppd/hpcups/hp-Python10.ppd.gz \ + ppd/classppd/hpcups/hp-Python11.ppd.gz \ + ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz \ + ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz \ + ppd/classppd/hpcups/hp-Saipan.ppd.gz \ + ppd/classppd/hpcups/hp-Saipan15B.ppd.gz \ + ppd/classppd/hpcups/hp-Stabler.ppd.gz \ + ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz \ + ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz \ + ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz \ ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \ ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \ ppd/classppd/ps/hp-postscript-laserjet.ppd.gz @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.19.1. +# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.19.5. # -# Report bugs to <3.19.1>. +# Report bugs to <3.19.5>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -246,7 +246,7 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.19.1 about your + $as_echo "$0: Please tell bug-autoconf@gnu.org and 3.19.5 about your $0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -569,9 +569,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HP Linux Imaging and Printing' PACKAGE_TARNAME='hplip' -PACKAGE_VERSION='3.19.1' -PACKAGE_STRING='HP Linux Imaging and Printing 3.19.1' -PACKAGE_BUGREPORT='3.19.1' +PACKAGE_VERSION='3.19.5' +PACKAGE_STRING='HP Linux Imaging and Printing 3.19.5' +PACKAGE_BUGREPORT='3.19.5' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1488,7 +1488,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.19.1 to adapt to many kinds of systems. +\`configure' configures HP Linux Imaging and Printing 3.19.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1558,7 +1558,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.19.1:";; + short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.19.5:";; esac cat <<\_ACEOF @@ -1661,7 +1661,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.19.1>. +Report bugs to <3.19.5>. _ACEOF ac_status=$? fi @@ -1724,7 +1724,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HP Linux Imaging and Printing configure 3.19.1 +HP Linux Imaging and Printing configure 3.19.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2191,7 +2191,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" > { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ( $as_echo "## --------------------- ## -## Report this to 3.19.1 ## +## Report this to 3.19.5 ## ## --------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -2268,7 +2268,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.19.1, which was +It was created by HP Linux Imaging and Printing $as_me 3.19.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3084,7 +3084,7 @@ fi # Define the identity of the package. PACKAGE='hplip' - VERSION='3.19.1' + VERSION='3.19.5' cat >>confdefs.h <<_ACEOF @@ -18455,7 +18455,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.19.1, which was +This file was extended by HP Linux Imaging and Printing $as_me 3.19.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18506,13 +18506,13 @@ $config_files Configuration commands: $config_commands -Report bugs to <3.19.1>." +Report bugs to <3.19.5>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HP Linux Imaging and Printing config.status 3.19.1 +HP Linux Imaging and Printing config.status 3.19.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 64db8c7f4..40dad9755 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.19.1], [3.19.1], [hplip]) +AC_INIT([HP Linux Imaging and Printing], [3.19.5], [3.19.5], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) AM_INIT_AUTOMAKE AC_DISABLE_STATIC diff --git a/cups_drv.inc b/cups_drv.inc index 0395fa60d..3863c52f0 100644 --- a/cups_drv.inc +++ b/cups_drv.inc @@ -296,6 +296,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-ink_tank_110_series.ppd.gz \ ppd/hpcups/hp-ink_tank_310_series.ppd.gz \ ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz \ + ppd/hpcups/hp-laser_ns_1020.ppd.gz \ + ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz \ ppd/hpcups/hp-laserjet_1000.ppd.gz \ ppd/hpcups/hp-laserjet_1005_series.ppd.gz \ ppd/hpcups/hp-laserjet_1010.ppd.gz \ @@ -511,6 +513,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ + ppd/hpcups/hp-neverstop_laser_100x.ppd.gz \ + ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz \ ppd/hpcups/hp-officejet.ppd.gz \ ppd/hpcups/hp-officejet_100_mobile_l411.ppd.gz \ ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz \ @@ -564,6 +568,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-officejet_7500_e910.ppd.gz \ ppd/hpcups/hp-officejet_7510_series.ppd.gz \ ppd/hpcups/hp-officejet_7610_series.ppd.gz \ + ppd/hpcups/hp-officejet_8010_series.ppd.gz \ + ppd/hpcups/hp-officejet_8020_series.ppd.gz \ ppd/hpcups/hp-officejet_8040_series.ppd.gz \ ppd/hpcups/hp-officejet_8700.ppd.gz \ ppd/hpcups/hp-officejet_9010_series.ppd.gz \ @@ -601,6 +607,8 @@ cups_ppd_printers = \ ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz \ ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz \ ppd/hpcups/hp-officejet_pro_8000_a809.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz \ + ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz \ ppd/hpcups/hp-officejet_pro_8100.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a909a.ppd.gz \ ppd/hpcups/hp-officejet_pro_8500_a909g.ppd.gz \ @@ -789,6 +797,13 @@ cups_ppd_printers = \ ppd/hpcups/hp-psc_950vr.ppd.gz \ ppd/hpcups/hp-psc_950xi.ppd.gz \ ppd/hpcups/hp-smart_tank_350_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_500_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_510_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_530_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_610_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz \ + ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz \ ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz \ ppd/hpcups/hp-tango.ppd.gz cups_drv = prnt/drv/hpcups.drv diff --git a/data/models/models.dat b/data/models/models.dat index b46fa1d7c..3f61eceb1 100644 --- a/data/models/models.dat +++ b/data/models/models.dat @@ -122,7 +122,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=2311 @@ -1130,7 +1130,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.6 tech-class=Stabler -family-class=PCL3-Class1B +family-class=Stabler tech-subclass=Normal tech-type=2 usb-pid=9711 @@ -2261,7 +2261,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.3 tech-class=StingrayOJ -family-class=Undefined +family-class=StingrayOJ tech-subclass=Normal tech-type=2 usb-pid=4912 @@ -2337,7 +2337,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Mimas -family-class=PCL3-Class1A +family-class=Mimas tech-subclass=NoCDDVD tech-type=2 usb-pid=9911 @@ -2380,7 +2380,7 @@ support-subtype=3496 support-type=2 support-ver=0.9.5 tech-class=PSP100 -family-class=Undefined +family-class=PSP100 tech-subclass=Normal tech-type=2 usb-pid=3802 @@ -2480,7 +2480,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.10 tech-class=Stabler -family-class=PCL3-Class1B +family-class=Stabler tech-subclass=Normal tech-type=2 usb-pid=7a11 @@ -2653,7 +2653,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.10 tech-class=Stabler -family-class=PCL3-Class1B +family-class=Stabler tech-subclass=Normal tech-type=2 usb-pid=7b11 @@ -2731,7 +2731,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.10 tech-class=Mimas -family-class=PCL3-Class1A +family-class=Mimas tech-subclass=NoCDDVD tech-type=2 usb-pid=a711 @@ -2807,7 +2807,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.4 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=8d11 @@ -2907,7 +2907,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.6 tech-class=Stabler -family-class=PCL3-Class1B +family-class=Stabler tech-subclass=Normal tech-type=2 usb-pid=8a11 @@ -2984,7 +2984,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.10 tech-class=Mimas -family-class=PCL3-Class1A +family-class=Mimas tech-subclass=NoCDDVD tech-type=2 usb-pid=bb11 @@ -3631,7 +3631,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=PSP100 -family-class=Undefined +family-class=PSP100 tech-subclass=Normal tech-type=2 usb-pid=3902 @@ -3681,7 +3681,7 @@ support-subtype=3849 support-type=2 support-ver=0.9.5 tech-class=PSP100 -family-class=Undefined +family-class=PSP100 tech-subclass=Normal tech-type=2 usb-pid=1002 @@ -3784,7 +3784,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.10 tech-class=StingrayOJ -family-class=Undefined +family-class=StingrayOJ tech-subclass=Normal tech-type=2 usb-pid=4912 @@ -5649,7 +5649,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.8 tech-class=Stabler -family-class=PCL3-Class1B +family-class=Stabler tech-subclass=Normal tech-type=2 usb-pid=7e11 @@ -5725,7 +5725,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.8 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=7811 @@ -5825,7 +5825,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Stabler -family-class=PCL3-Class1B +family-class=Stabler tech-subclass=Normal tech-type=2 usb-pid=8e11 @@ -6079,7 +6079,7 @@ support-subtype=3597 support-type=2 support-ver=0.9.5 tech-class=PSP100 -family-class=Undefined +family-class=PSP100 tech-subclass=Normal tech-type=2 usb-pid=3502 @@ -6171,7 +6171,7 @@ support-subtype=3637 support-type=2 support-ver=0.9.5 tech-class=PSP100 -family-class=Undefined +family-class=PSP100 tech-subclass=Normal tech-type=2 usb-pid=1102 @@ -6659,7 +6659,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.2 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoMaxDPI tech-type=2 usb-pid=7311 @@ -6787,7 +6787,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.10 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoCDDVD,NoMaxDPI tech-type=2 usb-pid=7c11 @@ -6915,7 +6915,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.10 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoCDDVD,NoMaxDPI tech-type=2 usb-pid=7d11 @@ -6961,7 +6961,7 @@ support-subtype=3ee5 support-type=2 support-ver=1.6.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1d02 @@ -7119,7 +7119,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Python10 -family-class=PCL3-Class1B +family-class=Python10 tech-subclass=NoCDDVD,NoMaxDPI tech-type=2 usb-pid=f11 @@ -7294,7 +7294,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1202 @@ -7338,7 +7338,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1e02 @@ -7428,7 +7428,7 @@ support-subtype=3984 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1602 @@ -7657,7 +7657,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1302 @@ -7744,7 +7744,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1702 @@ -8582,7 +8582,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Python10 -family-class=PCL3-Class1B +family-class=Python10 tech-subclass=NoCDDVD,NoMaxDPI tech-type=2 usb-pid=9611 @@ -8675,7 +8675,7 @@ support-subtype=0 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1502 @@ -8722,7 +8722,7 @@ support-subtype=0 support-type=2 support-ver=1.6.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1902 @@ -8809,7 +8809,7 @@ support-subtype=3a05 support-type=2 support-ver=2.7.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1f02 @@ -8863,7 +8863,7 @@ support-subtype=381e support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=512 @@ -9030,7 +9030,7 @@ support-subtype=3b72 support-type=2 support-ver=0.9.6 tech-class=DJ55xx -family-class=PCL3-Class1B +family-class=DJ55xx tech-subclass=Normal tech-type=2 usb-pid=1312 @@ -9118,7 +9118,7 @@ support-subtype=398c support-type=2 support-ver=0.9.5 tech-class=PSP470 -family-class=Undefined +family-class=PSP470 tech-subclass=FullBleed tech-type=2 usb-pid=1802 @@ -9236,7 +9236,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.2 tech-class=DJ55xx -family-class=PCL3-Class1B +family-class=DJ55xx tech-subclass=Normal tech-type=2 usb-pid=2812 @@ -10024,7 +10024,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=1a02 @@ -10100,7 +10100,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.1 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=9e11 @@ -10215,7 +10215,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Python10 -family-class=PCL3-Class1B +family-class=Python10 tech-subclass=NoCDDVD,NoMaxDPI tech-type=2 usb-pid=9011 @@ -10308,7 +10308,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.7 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=4x6FullBleed tech-type=2 usb-pid=2602 @@ -10681,7 +10681,7 @@ support-subtype=3bcd support-type=2 support-ver=0.9.6 tech-class=OJProKx50 -family-class=PCL3-Class1B +family-class=OJProKx50 tech-subclass=NoFullBleed tech-type=2 usb-pid=1812 @@ -11428,7 +11428,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.6 tech-class=PSP470 -family-class=Undefined +family-class=PSP470 tech-subclass=FullBleed tech-type=2 usb-pid=1b02 @@ -11659,7 +11659,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.7 tech-class=PSP470 -family-class=Undefined +family-class=PSP470 tech-subclass=FullBleed tech-type=2 usb-pid=2702 @@ -13307,7 +13307,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.6 tech-class=PSP470 -family-class=Undefined +family-class=PSP470 tech-subclass=FullBleed tech-type=2 usb-pid=1c02 @@ -13570,7 +13570,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.7 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2804 @@ -13640,7 +13640,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.7 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2904 @@ -14421,7 +14421,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.7 tech-class=PSP470 -family-class=Undefined +family-class=PSP470 tech-subclass=FullBleed tech-type=2 usb-pid=2902 @@ -14950,7 +14950,7 @@ support-subtype=3b0c support-type=2 support-ver=0.9.6 tech-class=OJProKx50 -family-class=PCL3-Class1B +family-class=OJProKx50 tech-subclass=LargeFormatSuperB,NoFullBleed tech-type=2 usb-pid=1512 @@ -16550,7 +16550,7 @@ support-subtype=3642 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3104 @@ -16693,7 +16693,7 @@ support-subtype=357e support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3004 @@ -16742,7 +16742,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3304 @@ -16789,7 +16789,7 @@ support-subtype=3a3d support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=5004 @@ -17000,7 +17000,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=8811 @@ -17064,7 +17064,7 @@ support-subtype=39bb support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=1712 @@ -17450,7 +17450,7 @@ support-subtype=447b support-type=2 support-ver=3.13.7 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=K10 tech-type=2 usb-pid=b511 @@ -18041,7 +18041,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.6 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=8911 @@ -18367,7 +18367,7 @@ support-subtype=3672 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=NoFullBleed tech-type=2 usb-pid=912 @@ -18936,7 +18936,7 @@ support-subtype=36c1 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3402 @@ -19561,7 +19561,7 @@ support-subtype=3911 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=4004 @@ -19769,7 +19769,7 @@ support-subtype=3b04 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=NoFullBleed tech-type=2 usb-pid=f12 @@ -20189,7 +20189,7 @@ support-subtype=3496 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3202 @@ -20417,7 +20417,7 @@ support-subtype=3496 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3302 @@ -21353,7 +21353,7 @@ support-subtype=36c1 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3602 @@ -22488,7 +22488,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4c11 @@ -22752,7 +22752,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=0 @@ -22800,7 +22800,7 @@ support-subtype=45ae support-type=2 support-ver=3.13.8 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=K10 tech-type=2 usb-pid=c111 @@ -24118,7 +24118,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4811 @@ -24500,7 +24500,7 @@ support-subtype=372a support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=LargeFormatSuperB tech-type=2 usb-pid=312 @@ -24616,7 +24616,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=9411 @@ -24759,7 +24759,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.1 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=9b11 @@ -25136,7 +25136,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.10 tech-class=PyramidPlus -family-class=PCL3-Class1 +family-class=PyramidPlus tech-subclass=NoAutoDuplex tech-type=2 usb-pid=b911 @@ -25506,7 +25506,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.6 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=8711 @@ -25758,7 +25758,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.1 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=9a11 @@ -25852,7 +25852,7 @@ support-subtype=391a support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=2811 @@ -26046,7 +26046,7 @@ support-subtype=359e support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=2a11 @@ -26140,7 +26140,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=2b11 @@ -26255,7 +26255,7 @@ support-subtype=34c9 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=No1200dpiNoSensor tech-type=2 usb-pid=0 @@ -26304,7 +26304,7 @@ support-subtype=0 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2911 @@ -26501,7 +26501,7 @@ support-subtype=3496 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=0 @@ -26565,7 +26565,7 @@ support-subtype=33b7 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=No1200dpiNoSensor tech-type=2 usb-pid=0 @@ -26630,7 +26630,7 @@ support-subtype=3812 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP,Postscript -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=No1200dpiNoSensor tech-type=2 usb-pid=0 @@ -26735,7 +26735,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP,Postscript -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=No1200dpiNoSensor tech-type=2 usb-pid=0 @@ -26785,7 +26785,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=3511 @@ -27358,7 +27358,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4911 @@ -27412,7 +27412,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=3611 @@ -27499,7 +27499,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.10 tech-class=ViperMinusVIP -family-class=PCL3-Class1B +family-class=ViperMinusVIP tech-subclass=Normal tech-type=2 usb-pid=7611 @@ -28077,7 +28077,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2504 @@ -28129,7 +28129,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=3711 @@ -28211,7 +28211,7 @@ support-subtype=39f2 support-type=2 support-ver=3.12.6 tech-class=PyramidPlus -family-class=PCL3-Class1 +family-class=PyramidPlus tech-subclass=NoAutoDuplex tech-type=2 usb-pid=ac11 @@ -28288,7 +28288,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.10 tech-class=PyramidPlus -family-class=PCL3-Class1 +family-class=PyramidPlus tech-subclass=NoAutoDuplex tech-type=2 usb-pid=be11 @@ -28341,7 +28341,7 @@ support-subtype=430e support-type=2 support-ver=3.13.8 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=K10 tech-type=2 usb-pid=c211 @@ -28543,7 +28543,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4e11 @@ -28725,7 +28725,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4511 @@ -29114,7 +29114,7 @@ support-subtype=430e support-type=2 support-ver=3.13.11 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=K10 tech-type=2 usb-pid=c911 @@ -29155,7 +29155,7 @@ support-subtype=430e support-type=2 support-ver=3.13.10 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=K10 tech-type=2 usb-pid=ca11 @@ -29333,7 +29333,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4611 @@ -30063,7 +30063,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=9511 @@ -30497,7 +30497,7 @@ support-subtype=39f2 support-type=2 support-ver=3.10.9 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=9311 @@ -30628,7 +30628,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.7 tech-class=Pyramid -family-class=PCL3-Class1 +family-class=Pyramid tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=a011 @@ -30802,7 +30802,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.10 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=Normal tech-type=2 usb-pid=a211 @@ -30951,7 +30951,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5611 @@ -31137,7 +31137,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5011 @@ -31369,7 +31369,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5111 @@ -31647,7 +31647,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5211 @@ -32456,7 +32456,7 @@ support-subtype=39f2 support-type=2 support-ver=3.12.9 tech-class=PyramidPlus -family-class=PCL3-Class1 +family-class=PyramidPlus tech-subclass=NoAutoDuplex tech-type=2 usb-pid=ad11 @@ -32537,7 +32537,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.6 tech-class=Copperhead12 -family-class=PCL3-Class1 +family-class=Copperhead12 tech-subclass=Normal tech-type=2 usb-pid=b011 @@ -32711,7 +32711,7 @@ support-subtype=447b support-type=2 support-ver=3.13.8 tech-class=MimasTDR -family-class=PCL3-Class1A +family-class=MimasTDR tech-subclass=Normal tech-type=2 usb-pid=c711 @@ -33078,7 +33078,7 @@ support-subtype=430e support-type=2 support-ver=3.13.5 tech-class=Kapan -family-class=PCL3-Class1 +family-class=Kapan tech-subclass=Duplex tech-type=1 usb-pid=6812 @@ -33121,7 +33121,7 @@ support-subtype=430e support-type=2 support-ver=3.13.5 tech-class=Kapan -family-class=PCL3-Class1 +family-class=Kapan tech-subclass=Duplex tech-type=1 usb-pid=6d12 @@ -34844,7 +34844,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5711 @@ -35394,7 +35394,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2504 @@ -35557,7 +35557,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5c11 @@ -36103,7 +36103,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.4 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6711 @@ -36401,7 +36401,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.10 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6611 @@ -36510,7 +36510,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6c11 @@ -36586,7 +36586,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.4 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=9d11 @@ -36671,7 +36671,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.6 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=7711 @@ -36742,7 +36742,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.2 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=4712 @@ -36818,7 +36818,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.10 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=8c11 @@ -36888,7 +36888,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.6 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=5712 @@ -37069,7 +37069,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2a12 @@ -37174,7 +37174,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6b11 @@ -37269,7 +37269,7 @@ support-subtype=447b support-type=2 support-ver=3.13.6 tech-class=MimasTDR -family-class=PCL3-Class1A +family-class=MimasTDR tech-subclass=Normal tech-type=2 usb-pid=c511 @@ -37340,7 +37340,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.2 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=4712 @@ -37450,7 +37450,7 @@ support-subtype=3b72 support-type=2 support-ver=3.10.6 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Trim tech-type=2 usb-pid=2e12 @@ -37491,7 +37491,7 @@ support-subtype=430d support-type=2 support-ver=3.13.9 tech-class=MimasTDR -family-class=PCL3-Class1A +family-class=MimasTDR tech-subclass=Normal tech-type=2 usb-pid=c411 @@ -38105,7 +38105,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.6 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=7411 @@ -38297,7 +38297,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.6 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=Trim tech-type=2 usb-pid=5812 @@ -38374,7 +38374,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.6 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=Trim tech-type=2 usb-pid=6512 @@ -38451,7 +38451,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.6 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=Trim tech-type=2 usb-pid=6612 @@ -38528,7 +38528,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.6 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=Trim tech-type=2 usb-pid=6412 @@ -38573,7 +38573,7 @@ support-subtype=430e support-type=2 support-ver=3.13.9 tech-class=MimasTDR -family-class=PCL3-Class1A +family-class=MimasTDR tech-subclass=Normal tech-type=2 usb-pid=c611 @@ -38616,7 +38616,7 @@ support-subtype=430e support-type=2 support-ver=3.14.3 tech-class=MimasTDR -family-class=PCL3-Class1A +family-class=MimasTDR tech-subclass=Normal tech-type=2 usb-pid=c811 @@ -38748,7 +38748,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2b12 @@ -38819,7 +38819,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2c12 @@ -38904,7 +38904,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.8 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=7511 @@ -39406,7 +39406,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c802 @@ -39545,7 +39545,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5811 @@ -39648,7 +39648,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=0 @@ -39753,7 +39753,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c402 @@ -39897,7 +39897,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5d11 @@ -40353,7 +40353,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoCDDVD,NoAutoDuplex,NoMaxDPI tech-type=2 usb-pid=7111 @@ -40411,7 +40411,7 @@ support-subtype=219b2b support-type=2 support-ver=1.7.2 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=NoFullBleed tech-type=2 usb-pid=1f12 @@ -40499,7 +40499,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6811 @@ -40561,7 +40561,7 @@ support-subtype=219b2b support-type=2 support-ver=1.7.2 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=NoFullBleed tech-type=2 usb-pid=2012 @@ -40701,7 +40701,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8604 @@ -40818,7 +40818,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6d11 @@ -41124,7 +41124,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.8 tech-class=ViperPlusVIP -family-class=PCL3-Class1B +family-class=ViperPlusVIP tech-subclass=Normal tech-type=2 usb-pid=8211 @@ -41212,7 +41212,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.7 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=7211 @@ -41300,7 +41300,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.10 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=Normal tech-type=2 usb-pid=a111 @@ -41388,7 +41388,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.12 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=AutoDuplex tech-type=2 usb-pid=b411 @@ -41532,7 +41532,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.6 tech-class=Copperhead12 -family-class=PCL3-Class1 +family-class=Copperhead12 tech-subclass=Normal tech-type=2 usb-pid=b111 @@ -41608,7 +41608,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.6 tech-class=Copperhead12 -family-class=PCL3-Class1 +family-class=Copperhead12 tech-subclass=Normal tech-type=2 usb-pid=b611 @@ -41654,7 +41654,7 @@ support-subtype=447b support-type=2 support-ver=3.13.7 tech-class=MimasTDR -family-class=PCL3-Class1A +family-class=MimasTDR tech-subclass=Normal tech-type=2 usb-pid=c311 @@ -41767,7 +41767,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ55xx -family-class=PCL3-Class1B +family-class=DJ55xx tech-subclass=Normal tech-type=2 usb-pid=6004 @@ -41816,7 +41816,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ55xx -family-class=PCL3-Class1B +family-class=DJ55xx tech-subclass=Normal tech-type=2 usb-pid=6004 @@ -41865,7 +41865,7 @@ support-subtype=357e support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6004 @@ -41973,7 +41973,7 @@ support-subtype=0 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=0 @@ -42016,7 +42016,7 @@ support-subtype=41a4 support-type=2 support-ver=3.14.10 tech-class=CopperheadIPH -family-class=PCL3-Class1B +family-class=CopperheadIPH tech-subclass=Normal tech-type=1 usb-pid=cc11 @@ -42057,7 +42057,7 @@ support-subtype=41a4 support-type=2 support-ver=3.14.10 tech-class=CopperheadIPH -family-class=PCL3-Class1A +family-class=CopperheadIPH tech-subclass=Normal tech-type=1 usb-pid=cc11 @@ -42109,7 +42109,7 @@ support-subtype=3d4d support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6104 @@ -42158,7 +42158,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=0 @@ -42254,7 +42254,7 @@ support-subtype=219b2b support-type=2 support-ver=1.7.2 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5b11 @@ -42371,7 +42371,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8104 @@ -42414,7 +42414,7 @@ support-subtype=449e support-type=2 support-ver=3.14.10 tech-class=CopperheadIPH -family-class=PCL3-Class1B +family-class=CopperheadIPH tech-subclass=Normal tech-type=2 usb-pid=cd11 @@ -42463,7 +42463,7 @@ support-subtype=0 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=a004 @@ -42566,7 +42566,7 @@ support-subtype=3b04 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=a004 @@ -42705,7 +42705,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8704 @@ -42820,7 +42820,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.6 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoCDDVD tech-type=2 usb-pid=4312 @@ -42935,7 +42935,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.6 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoAutoDuplex,NoCDDVD tech-type=2 usb-pid=4212 @@ -43292,7 +43292,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5911 @@ -43380,7 +43380,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.4 tech-class=Saipan -family-class=PCL3-Class1 +family-class=Saipan tech-subclass=Normal tech-type=2 usb-pid=5e12 @@ -43592,7 +43592,7 @@ support-subtype=3b04 support-type=2 support-ver=1.6.7 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c502 @@ -43644,7 +43644,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2d11 @@ -43690,7 +43690,7 @@ support-subtype=0 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3404 @@ -43736,7 +43736,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3404 @@ -43782,7 +43782,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=3404 @@ -43831,7 +43831,7 @@ support-subtype=37f1 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2d11 @@ -43951,7 +43951,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4b11 @@ -44177,7 +44177,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6a11 @@ -44217,7 +44217,7 @@ support-subtype=447b support-type=2 support-ver=3.14.10 tech-class=CopperheadXLP -family-class=PCL3-Class1A +family-class=CopperheadXLP tech-subclass=Normal tech-type=2 usb-pid=7312 @@ -44338,7 +44338,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoAutoDuplex,NoCDDVD,NoMaxDPI tech-type=2 usb-pid=7011 @@ -44472,7 +44472,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.11 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5311 @@ -44564,7 +44564,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.4 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=3312 @@ -44680,7 +44680,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.4 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoCDDVD,NoAutoDuplex tech-type=2 usb-pid=4412 @@ -44795,7 +44795,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Python10 -family-class=PCL3-Class1B +family-class=Python10 tech-subclass=NoAutoTray tech-type=2 usb-pid=5412 @@ -44910,7 +44910,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.1 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoCDDVD,NoAutoDuplex tech-type=2 usb-pid=5512 @@ -45026,7 +45026,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.4 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoCDDVD tech-type=2 usb-pid=4512 @@ -45171,7 +45171,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8204 @@ -45259,7 +45259,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.10 tech-class=Copperhead -family-class=PCL3-Class1 +family-class=Copperhead tech-subclass=AutoDuplex tech-type=2 usb-pid=a511 @@ -45348,7 +45348,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.9 tech-class=Copperhead12 -family-class=PCL3-Class1 +family-class=Copperhead12 tech-subclass=Advanced tech-type=2 usb-pid=af11 @@ -45436,7 +45436,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.9 tech-class=Copperhead12 -family-class=PCL3-Class1 +family-class=Copperhead12 tech-subclass=Advanced tech-type=2 usb-pid=ba11 @@ -45635,7 +45635,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8504 @@ -45687,7 +45687,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.4 tech-class=Saipan -family-class=PCL3-Class1 +family-class=Saipan tech-subclass=Normal tech-type=2 usb-pid=5d12 @@ -45739,7 +45739,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.4 tech-class=Saipan -family-class=PCL3-Class1 +family-class=Saipan tech-subclass=AutoDuplex tech-type=2 usb-pid=5c12 @@ -45947,7 +45947,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8404 @@ -45991,7 +45991,7 @@ support-subtype=447b support-type=2 support-ver=3.14.10 tech-class=CopperheadXLP -family-class=PCL3-Class1A +family-class=CopperheadXLP tech-subclass=Normal tech-type=2 usb-pid=7412 @@ -46032,7 +46032,7 @@ support-subtype=447b support-type=2 support-ver=3.14.10 tech-class=CopperheadXLP -family-class=PCL3-Class1A +family-class=CopperheadXLP tech-subclass=Normal tech-type=2 usb-pid=7212 @@ -46170,7 +46170,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.8 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8904 @@ -46312,7 +46312,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.8 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=8804 @@ -46429,7 +46429,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.8 tech-class=OJ7000 -family-class=PCL3-Class1B +family-class=OJ7000 tech-subclass=LargeFormatA3 tech-type=2 usb-pid=4612 @@ -46494,7 +46494,7 @@ support-subtype=3752 support-type=2 support-ver=0.9.5 tech-class=DJ9xxVIP -family-class=PCL3-Class1B +family-class=DJ9xxVIP tech-subclass=Normal tech-type=2 usb-pid=2611 @@ -46631,7 +46631,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5a11 @@ -46849,7 +46849,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=LargeFormatSuperB tech-type=2 usb-pid=2612 @@ -46983,7 +46983,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.8 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c602 @@ -47035,7 +47035,7 @@ support-subtype=219b2b support-type=2 support-ver=3.13.2 tech-class=Saipan -family-class=PCL3-Class1 +family-class=Saipan tech-subclass=Advanced tech-type=2 usb-pid=6012 @@ -47169,7 +47169,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6911 @@ -47221,7 +47221,7 @@ support-subtype=385a support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=b002 @@ -47363,7 +47363,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4111 @@ -47556,7 +47556,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=6511 @@ -47608,7 +47608,7 @@ support-subtype=385a support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=b002 @@ -47746,7 +47746,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4211 @@ -47805,7 +47805,7 @@ support-subtype=3b90 support-type=2 support-ver=1.7.2 tech-class=OJProKx50 -family-class=PCL3-Class1B +family-class=OJProKx50 tech-subclass=NoFullBleed tech-type=2 usb-pid=2512 @@ -47939,7 +47939,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.6 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c702 @@ -47988,7 +47988,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=2002 @@ -48127,7 +48127,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=4311 @@ -48180,7 +48180,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=b802 @@ -48312,7 +48312,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=5e11 @@ -48370,7 +48370,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.4 tech-class=OJProKx50 -family-class=PCL3-Class1B +family-class=OJProKx50 tech-subclass=NoFullBleed tech-type=2 usb-pid=3412 @@ -48432,7 +48432,7 @@ support-subtype=219b2b support-type=2 support-ver=1.7.2 tech-class=OJProKx50 -family-class=PCL3-Class1B +family-class=OJProKx50 tech-subclass=NoFullBleed tech-type=2 usb-pid=2112 @@ -48484,7 +48484,7 @@ support-subtype=39a5 support-type=2 support-ver=3.10.9 tech-class=OJ7000 -family-class=PCL3-Class1B +family-class=OJ7000 tech-subclass=LargeFormatA3,SmallMargins tech-type=2 usb-pid=4812 @@ -48599,7 +48599,7 @@ support-subtype=3da3 support-type=2 support-ver=2.8.10 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=NoAutoDuplex,NoCDDVD,NoMaxDPI tech-type=2 usb-pid=6f11 @@ -48714,7 +48714,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.10 tech-class=Python11 -family-class=PCL3-Class1B +family-class=Python11 tech-subclass=Normal tech-type=2 usb-pid=a611 @@ -48830,7 +48830,7 @@ support-subtype=219b2b support-type=2 support-ver=3.12.9 tech-class=Python11 -family-class=PCL3-Class1B +family-class=Python11 tech-subclass=Advanced tech-type=2 usb-pid=bc11 @@ -48881,7 +48881,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=3e02 @@ -48942,7 +48942,7 @@ support-subtype=219b2b support-type=2 support-ver=1.7.2 tech-class=OJProKx50 -family-class=PCL3-Class1B +family-class=OJProKx50 tech-subclass=NoFullBleed tech-type=2 usb-pid=2212 @@ -48995,7 +48995,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=b202 @@ -49048,7 +49048,7 @@ support-subtype=219b2b support-type=2 support-ver=3.13.7 tech-class=Saipan -family-class=PCL3-Class1 +family-class=Saipan tech-subclass=Advanced tech-type=2 usb-pid=6e12 @@ -49089,7 +49089,7 @@ support-subtype=449e support-type=2 support-ver=3.14.10 tech-class=CopperheadIPH -family-class=PCL3-Class1B +family-class=CopperheadIPH tech-subclass=Normal tech-type=2 usb-pid=dc11 @@ -49150,7 +49150,7 @@ support-subtype=219b2b support-type=2 support-ver=1.7.2 tech-class=OJProKx50 -family-class=PCL3-Class1B +family-class=OJProKx50 tech-subclass=NoFullBleed tech-type=2 usb-pid=2312 @@ -49209,7 +49209,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=b402 @@ -49350,7 +49350,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c002 @@ -49405,7 +49405,7 @@ support-subtype=3b04 support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=b602 @@ -49491,7 +49491,7 @@ support-subtype=41a4 support-type=2 support-ver=3.14.5 tech-class=CopperheadIPH -family-class=PCL3-Class1B +family-class=CopperheadIPH tech-subclass=Normal tech-type=2 usb-pid=d011 @@ -49598,7 +49598,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.2 tech-class=Corbett -family-class=Undefined +family-class=Corbett tech-subclass=Normal tech-type=2 usb-pid=3612 @@ -49740,7 +49740,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c102 @@ -49780,7 +49780,7 @@ support-subtype=449e support-type=2 support-ver=3.14.10 tech-class=CopperheadIPH -family-class=PCL3-Class1B +family-class=CopperheadIPH tech-subclass=Normal tech-type=2 usb-pid=DE11 @@ -49955,7 +49955,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.10 tech-class=Ampere -family-class=PCL3-Class1 +family-class=Ampere tech-subclass=Normal tech-type=2 usb-pid=5b12 @@ -50088,7 +50088,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.9 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=NoEvenDuplex tech-type=2 usb-pid=6411 @@ -50228,7 +50228,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=ba02 @@ -50551,7 +50551,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=c202 @@ -50654,7 +50654,7 @@ support-subtype=219b2b support-type=2 support-ver=1.6.9 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=LargeFormatA3,NoAutoDuplex tech-type=2 usb-pid=be02 @@ -50795,7 +50795,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=Normal tech-type=2 usb-pid=bb02 @@ -50847,7 +50847,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.2 tech-class=Corbett -family-class=Undefined +family-class=Corbett tech-subclass=Normal tech-type=2 usb-pid=3812 @@ -50899,7 +50899,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.2 tech-class=Corbett -family-class=Undefined +family-class=Corbett tech-subclass=Normal tech-type=2 usb-pid=4012 @@ -50951,7 +50951,7 @@ support-subtype=219b2b support-type=2 support-ver=3.9.2 tech-class=Corbett -family-class=Undefined +family-class=Corbett tech-subclass=Normal tech-type=2 usb-pid=3912 @@ -51068,7 +51068,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.10 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=LargeFormatA3,NoAutoDuplex tech-type=2 usb-pid=d102 @@ -51122,7 +51122,7 @@ support-subtype=219b2b support-type=2 support-ver=3.10.9 tech-class=Corbett -family-class=Undefined +family-class=Corbett tech-subclass=Normal tech-type=2 usb-pid=5312 @@ -51310,7 +51310,7 @@ support-subtype=219b2b support-type=2 support-ver=2.7.10 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=LargeFormatSuperB,NoFullBleed tech-type=2 usb-pid=2712 @@ -51365,7 +51365,7 @@ support-subtype=219b2b support-type=2 support-ver=3.11.10 tech-class=Ampere -family-class=PCL3-Class1 +family-class=Ampere tech-subclass=Normal tech-type=2 usb-pid=5912 @@ -51406,7 +51406,7 @@ support-subtype=219b2b support-type=2 support-ver=3.14.4 tech-class=Ampere -family-class=PCL3-Class1 +family-class=Ampere tech-subclass=Normal tech-type=2 usb-pid=7112 @@ -51446,7 +51446,7 @@ support-subtype=219b2b support-type=2 support-ver=3.14.4 tech-class=Ampere -family-class=PCL3-Class1 +family-class=Ampere tech-subclass=Normal tech-type=2 usb-pid=7012 @@ -51485,7 +51485,7 @@ support-subtype=219b2b support-type=2 support-ver=3.14.4 tech-class=Ampere -family-class=PCL3-Class1 +family-class=Ampere tech-subclass=Normal tech-type=2 usb-pid=6f12 @@ -51524,7 +51524,7 @@ support-subtype=219b2b support-type=2 support-ver=3.14.6 tech-class=Ampere -family-class=PCL3-Class1 +family-class=Ampere tech-subclass=Normal tech-type=2 usb-pid=7712 @@ -51564,7 +51564,7 @@ support-subtype=219b2b support-type=2 support-ver=3.14.6 tech-class=Ampere -family-class=PCL3-Class1 +family-class=Ampere tech-subclass=Normal tech-type=2 usb-pid=7612 @@ -51728,7 +51728,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=LargeFormatSuperB,NoAutoTray tech-type=2 usb-pid=bc02 @@ -51804,7 +51804,7 @@ support-subtype=219b2b support-type=2 support-ver=2.8.4 tech-class=Python -family-class=PCL3-Class1B +family-class=Python tech-subclass=LargeFormatA3,NoAutoDuplex,Advanced tech-type=2 usb-pid=d002 @@ -52520,7 +52520,7 @@ support-subtype=219b2b support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=LargeFormatSuperB tech-type=2 usb-pid=b12 @@ -52663,7 +52663,7 @@ support-subtype=3a9d support-type=2 support-ver=0.9.5 tech-class=DJGenericVIP -family-class=PCL3-Class1B +family-class=DJGenericVIP tech-subclass=LargeFormatSuperB tech-type=2 usb-pid=1212 @@ -53176,7 +53176,7 @@ support-subtype=447b support-type=2 support-ver=3.15.6 tech-class=Pyramid15 -family-class=PCL3-Class1A +family-class=Pyramid15 tech-subclass=Normal tech-type=2 usb-pid=e311 @@ -53223,7 +53223,7 @@ support-subtype=219b2b support-type=2 support-ver=3.15.6 tech-class=PyramidRefresh15 -family-class=PCL3-Class1A +family-class=PyramidRefresh15 tech-subclass=Normal tech-type=2 usb-pid=e111 @@ -53268,7 +53268,7 @@ support-subtype=219b2b support-type=2 support-ver=3.15.7 tech-class=PyramidRefresh15 -family-class=PCL3-Class1A +family-class=PyramidRefresh15 tech-subclass=Normal tech-type=2 usb-pid=df11 @@ -53310,7 +53310,7 @@ support-subtype=447b support-type=2 support-ver=3.15.7 tech-class=Pyramid15 -family-class=PCL3-Class1A +family-class=Pyramid15 tech-subclass=Normal tech-type=2 usb-pid=e511 @@ -53352,7 +53352,7 @@ support-subtype=447b support-type=2 support-ver=3.15.7 tech-class=Pyramid15 -family-class=PCL3-Class1A +family-class=Pyramid15 tech-subclass=Normal tech-type=2 usb-pid=e611 @@ -53391,7 +53391,7 @@ support-subtype=219b2b support-type=2 support-ver=3.15.7 tech-class=Saipan15B -family-class=PCL3-Class1 +family-class=Saipan15B tech-subclass=Normal tech-type=2 usb-pid=6e12 @@ -53436,7 +53436,7 @@ support-subtype=447b support-type=2 support-ver=3.15.9 tech-class=Mimas15 -family-class=PCL3-Class1A +family-class=Mimas15 tech-subclass=Normal tech-type=2 usb-pid=d911 @@ -53478,7 +53478,7 @@ support-subtype=447b support-type=2 support-ver=3.15.9 tech-class=Mimas15 -family-class=PCL3-Class1A +family-class=Mimas15 tech-subclass=Normal tech-type=2 usb-pid=d711 @@ -53524,7 +53524,7 @@ support-subtype=41a4 support-type=2 support-ver=3.15.9 tech-class=CopperheadIPH15 -family-class=PCL3-Class1A +family-class=CopperheadIPH15 tech-subclass=Normal tech-type=2 usb-pid=ce11 @@ -53566,7 +53566,7 @@ support-subtype=447b support-type=2 support-ver=3.15.9 tech-class=Mimas15 -family-class=PCL3-Class1A +family-class=Mimas15 tech-subclass=Normal tech-type=2 usb-pid=e811 @@ -53651,7 +53651,7 @@ support-subtype=447b support-type=2 support-ver=3.15.11 tech-class=Mimas15 -family-class=PCL3-Class1A +family-class=Mimas15 tech-subclass=Normal tech-type=2 usb-pid=d711 @@ -53692,7 +53692,7 @@ support-subtype=447b support-type=2 support-ver=3.15.11 tech-class=Pyramid15 -family-class=PCL3-Class1A +family-class=Pyramid15 tech-subclass=Normal tech-type=2 usb-pid=e211 @@ -53733,7 +53733,7 @@ support-subtype=41a4 support-type=2 support-ver=3.15.11 tech-class=CopperheadIPH -family-class=PCL3-Class1B +family-class=CopperheadIPH tech-subclass=Normal tech-type=1 usb-pid=db11 @@ -53775,7 +53775,7 @@ support-subtype=447b support-type=2 support-ver=3.15.11 tech-class=Mimas15 -family-class=PCL3-Class1A +family-class=Mimas15 tech-subclass=Normal tech-type=2 usb-pid=da11 @@ -53817,7 +53817,7 @@ support-subtype=447b support-type=2 support-ver=3.15.11 tech-class=Mimas15 -family-class=PCL3-Class1A +family-class=Mimas15 tech-subclass=Normal tech-type=2 usb-pid=d811 @@ -54660,7 +54660,7 @@ support-subtype=41a4 support-type=2 support-ver=3.15.11 tech-class=CopperheadIPH15 -family-class=PCL3-Class1A +family-class=CopperheadIPH15 tech-subclass=Normal tech-type=2 usb-pid=ce11 @@ -55418,7 +55418,7 @@ support-subtype=447b support-type=2 support-ver=3.16.3 tech-class=Pyramid15 -family-class=PCL3-Class1A +family-class=Pyramid15 tech-subclass=Normal tech-type=2 usb-pid=ed11 @@ -55458,14 +55458,13 @@ support-subtype=447b support-type=2 support-ver=3.16.3 tech-class=Pyramid15 -family-class=PCL3-Class1A +family-class=Pyramid15 tech-subclass=Normal tech-type=2 usb-pid=ee11 usb-vid=3f0 wifi-config=3 - [officejet_200_mobile_series] align-type=0 clean-type=0 @@ -55499,7 +55498,7 @@ support-subtype=447b support-type=2 support-ver=3.16.5 tech-class=Gemstone -family-class=PCL3-Class1A +family-class=Gemstone tech-subclass=Normal tech-type=4 usb-pid=e711 @@ -55564,7 +55563,7 @@ support-subtype=48c3 support-type=2 support-ver=3.16.5 tech-class=SPDOfficejetProAsize -family-class=PCL3-Class1A +family-class=SPDOfficejetProAsize tech-subclass=Normal tech-type=4 usb-pid=7A12 @@ -55697,7 +55696,7 @@ support-subtype=48c3 support-type=2 support-ver=3.16.5 tech-class=SPDOfficejetProAsize -family-class=PCL3-Class1A +family-class=SPDOfficejetProAsize tech-subclass=Normal tech-type=4 usb-pid=7b12 @@ -56230,7 +56229,7 @@ support-subtype=447b support-type=2 support-ver=3.16.7 tech-class=Pyramid15 -family-class=PCL3-Class1A +family-class=Pyramid15 tech-subclass=Normal tech-type=2 usb-pid=f511 @@ -56274,7 +56273,7 @@ support-subtype=41a4 support-type=2 support-ver=3.17.9 tech-class=CopperheadIPH17 -family-class=PCL3-Class2 +family-class=CopperheadIPH17 tech-subclass=Normal tech-type=2 usb-pid=1254 @@ -56319,7 +56318,7 @@ support-subtype=41a4 support-type=2 support-ver=3.17.9 tech-class=CopperheadIPH17 -family-class=PCL3-Class2 +family-class=CopperheadIPH17 tech-subclass=Normal tech-type=2 usb-pid=1154 @@ -56362,7 +56361,7 @@ support-subtype=41a4 support-type=2 support-ver=3.17.9 tech-class=CopperheadIPH17 -family-class=PCL3-Class2 +family-class=CopperheadIPH17 tech-subclass=Normal tech-type=2 usb-pid=1054 @@ -56407,7 +56406,7 @@ support-subtype=41a4 support-type=2 support-ver=3.16.8 tech-class=Gemstone -family-class=PCL3-Class1A +family-class=Gemstone tech-subclass=Normal tech-type=2 usb-pid=E911 @@ -56448,7 +56447,7 @@ support-subtype=41a4 support-type=2 support-ver=3.16.8 tech-class=CopperheadXLP -family-class=PCL3-Class1A +family-class=CopperheadXLP tech-subclass=Normal tech-type=2 usb-pid=0d54 @@ -56490,7 +56489,7 @@ support-subtype=41a4 support-type=2 support-ver=3.16.8 tech-class=CopperheadXLP -family-class=PCL3-Class1A +family-class=CopperheadXLP tech-subclass=Normal tech-type=2 usb-pid=0C54 @@ -56536,7 +56535,7 @@ support-subtype=219b2b support-type=2 support-ver=3.16.8 tech-class=CLE -family-class=Undefined +family-class=CLE tech-subclass=Normal tech-type=2 usb-pid=03F0 @@ -56576,7 +56575,7 @@ support-subtype=219b2b support-type=2 support-ver=3.16.9 tech-class=CopperheadXLP -family-class=PCL3-Class1A +family-class=CopperheadXLP tech-subclass=Normal tech-type=2 usb-pid=0E54 @@ -56814,7 +56813,7 @@ support-subtype=48c3 support-type=2 support-ver=3.16.9 tech-class=SPDOfficejetProAsize -family-class=PCL3-Class1A +family-class=SPDOfficejetProAsize tech-subclass=Normal tech-type=4 usb-pid=0954 @@ -56949,7 +56948,7 @@ support-subtype=2dc7 support-type=2 support-ver=3.16.10 tech-class=SPDOfficejetProBsize -family-class=PCL3-Class1A +family-class=SPDOfficejetProBsize tech-subclass=Normal tech-type=2 usb-pid=0154 @@ -56989,7 +56988,7 @@ support-subtype=219b2b support-type=2 support-ver=3.14.10 tech-class=CopperheadXLP -family-class=PCL3-Class1A +family-class=CopperheadXLP tech-subclass=Normal tech-type=2 usb-pid=0F54 @@ -57246,7 +57245,7 @@ support-subtype=48c3 support-type=2 support-ver=3.17.9 tech-class=SPDOfficejetProBsize -family-class=PCL3-Class1A +family-class=SPDOfficejetProBsize tech-subclass=Normal tech-type=4 usb-pid=1654 @@ -57286,7 +57285,7 @@ support-subtype=48c3 support-type=2 support-ver=3.17.9 tech-class=SPDOfficejetProBsize -family-class=PCL3-Class1A +family-class=SPDOfficejetProBsize tech-subclass=Normal tech-type=4 usb-pid=1754 @@ -57329,7 +57328,7 @@ support-subtype=48c3 support-type=2 support-ver=3.17.9 tech-class=Mimas17 -family-class=PCL3-Class1A +family-class=Mimas17 tech-subclass=Normal tech-type=2 usb-pid=0853 @@ -57372,7 +57371,7 @@ support-subtype=48c3 support-type=2 support-ver=3.17.9 tech-class=Mimas17 -family-class=PCL3-Class1A +family-class=Mimas17 tech-subclass=Normal tech-type=2 usb-pid=0954 @@ -57412,7 +57411,7 @@ support-subtype=48c3 support-type=2 support-ver=3.17.9 tech-class=Mimas17 -family-class=PCL3-Class1A +family-class=Mimas17 tech-subclass=Normal tech-type=2 usb-pid=0a54 @@ -57606,7 +57605,7 @@ support-subtype=48c3 support-type=2 support-ver=3.16.12 tech-class=Mimas17 -family-class=PCL3-Class1A +family-class=Mimas17 tech-subclass=Normal tech-type=2 usb-pid=0b53 @@ -57888,7 +57887,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e87640-50-60.ppd +ppd-name=hp-laserjet_mfp_e87640-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -57942,7 +57941,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e87640-50-60.ppd +ppd-name=hp-laserjet_mfp_e87640-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -58218,7 +58217,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e82540-50-60.ppd +ppd-name=hp-laserjet_mfp_e82540-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -58261,7 +58260,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e82540-50-60.ppd +ppd-name=hp-laserjet_mfp_e82540-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -58305,7 +58304,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e82540-50-60.ppd +ppd-name=hp-laserjet_mfp_e82540-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -58348,7 +58347,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e82540-50-60.ppd +ppd-name=hp-laserjet_mfp_e82540-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -58392,7 +58391,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e82540-50-60.ppd +ppd-name=hp-laserjet_mfp_e82540-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -58435,7 +58434,7 @@ pcard-type=0 plugin=0 plugin-reason=0 power-settings=0 -ppd-name=hp-laserjet_mfp_e82540-50-60.ppd +ppd-name=hp-laserjet_mfp_e82540-50-60-ps.ppd family-ppd=hp-postscript-inkjet.ppd pq-diag-type=0 r-type=0 @@ -60350,7 +60349,7 @@ support-subtype=219b2b support-type=2 support-ver=3.17.7 tech-class=CLE -family-class=Undefined +family-class=CLE tech-subclass=Normal tech-type=2 usb-pid=0753 @@ -60399,7 +60398,7 @@ support-subtype=219b2b support-type=2 support-ver=3.17.7 tech-class=PyramidRefresh17 -family-class=PCL3-Class2 +family-class=PyramidRefresh17 tech-subclass=Normal tech-type=2 usb-pid=0053 @@ -60568,7 +60567,7 @@ support-subtype=2518 support-type=2 support-ver=3.17.9 tech-class=CLE17 -family-class=Undefined +family-class=CLE17 tech-subclass=Normal tech-type=2 usb-pid=0e53 @@ -62347,7 +62346,7 @@ support-subtype=219b2b support-type=2 support-ver=3.18.11 tech-class=Gemstone -family-class=PCL3-Class1A +family-class=Gemstone tech-subclass=Normal tech-type=2 usb-pid=0000 @@ -62510,7 +62509,7 @@ support-subtype=219b2b support-type=2 support-ver=3.18.7 tech-class=P15_CISS -family-class=PCL3-Class1A +family-class=P15_CISS tech-subclass=Normal tech-type=2 usb-pid=f53 @@ -62550,7 +62549,7 @@ support-subtype=219b2b support-type=2 support-ver=3.18.7 tech-class=P15_CISS -family-class=PCL3-Class1A +family-class=P15_CISS tech-subclass=Normal tech-type=2 usb-pid=1253 @@ -62590,7 +62589,7 @@ support-subtype=219b2b support-type=2 support-ver=3.18.7 tech-class=P15_CISS -family-class=PCL3-Class1A +family-class=P15_CISS tech-subclass=Normal tech-type=2 usb-pid=1053 @@ -62630,7 +62629,7 @@ support-subtype=219b2b support-type=2 support-ver=3.18.7 tech-class=P15_CISS -family-class=PCL3-Class1A +family-class=P15_CISS tech-subclass=Normal tech-type=2 usb-pid=1353 @@ -62670,7 +62669,7 @@ support-subtype=219b2b support-type=2 support-ver=3.18.7 tech-class=P15_CISS -family-class=PCL3-Class1A +family-class=P15_CISS tech-subclass=Normal tech-type=2 usb-pid=1453 @@ -63369,9 +63368,9 @@ status-type=10 support-released=True support-subtype=219b2b support-type=2 -support-ver=3.19.1 -tech-class=SPDMainstreamCoreConsumerA -family-class=undefined +support-ver=3.19.3 +tech-class=SPDOfficejetProAsize +family-class=SPDOfficejetProAsize tech-subclass=Normal tech-type=2 usb-pid=03f0 @@ -63409,9 +63408,9 @@ status-type=10 support-released=True support-subtype=219b2b support-type=2 -support-ver=3.19.1 -tech-class=SPDMainstreamCoreConsumerA -family-class=undefined +support-ver=3.19.3 +tech-class=SPDOfficejetProAsize +family-class=SPDOfficejetProAsize tech-subclass=Normal tech-type=2 usb-pid=03f0 @@ -63449,16 +63448,1993 @@ status-type=10 support-released=True support-subtype=219b2b support-type=2 -support-ver=3.19.1 -tech-class=SPDMainstreamCoreConsumerA -family-class=undefined +support-ver=3.19.3 +tech-class=SPDOfficejetProAsize +family-class=SPDOfficejetProAsize tech-subclass=Normal tech-type=2 usb-pid=03f0 usb-vid=2554 wifi-config=3 +[hp_officejet_pro_8030_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet Pro 8030 All-in-One Printer series +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=SPDOfficejetProAsize +family-class=SPDOfficejetProAsize +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=2654 +wifi-config=3 + +[hp_officejet_8020_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet 8020 All-in-One Printer series +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=SPDOfficejetProAsize +family-class=SPDOfficejetProAsize +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=2854 +wifi-config=3 + +[hp_officejet_pro_8020_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet Pro 8020 All-in-One Printer series +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=SPDOfficejetProAsize +family-class=SPDOfficejetProAsize +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=2754 +wifi-config=3 + +[hp_officejet_8010_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP OfficeJet 8010 All-in-One Printer series +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=SPDOfficejetProAsize +family-class=SPDOfficejetProAsize +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=2954 +wifi-config=3 + + +[hp_pagewide_xl_4100ps] +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=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP PageWide XL 4100 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-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.03 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + +[hp_pagewide_xl_4100ps_mfp] +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=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP PageWide XL 4100 MFP +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-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.03 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + + + +[hp_pagewide_xl_4600ps] +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=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP PageWide XL 4600 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-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.03 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + +[hp_pagewide_xl_4600ps_mfp] +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=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP PageWide XL 4600PS MFP +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-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.03 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + + +[hp_color_laserjet_mfp_e77422] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed MFP E77422a +model2=HP Color LaserJet Managed MFP E77422dv +model3=HP Color LaserJet Managed MFP E77422dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_mfp_e77422-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=W9102MC +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=W9103MC +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=W9101MC +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=W9100MC +r0-agent4-type=6 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=2d89 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-vid=03F0 +usb-pid=ee2a +wifi-config=0 + + +[hp_color_laserjet_mfp_e77428] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed MFP E77428dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_mfp_e77428-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=W9102MC +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=W9103MC +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=W9101MC +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=W9100MC +r0-agent4-type=6 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=2d89 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-vid=03F0 +usb-pid=ee2a +wifi-config=0 + + +[hp_laserjet_mfp_e72425] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet MFP E72425a +model2=HP LaserJet MFP E72425dv +model3=HP LaserJet MFP E72425dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_mfp_e72425-ps.ppd +family-ppd=hp-postscript-laserjet-pro.ppd +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=0 +support-released=True +support-subtype=2d89 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=ef2a +usb-vid=03f0 +wifi-config=0 + + +[hp_laserjet_mfp_e72430] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet MFP E72430dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_mfp_e72430-ps.ppd +family-ppd=hp-postscript-laserjet-pro.ppd +pq-diag-type=0 +r-type=0 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=0 +support-released=True +support-subtype=2d89 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=ef2a +usb-vid=03f0 +wifi-config=0 + +[smart_tank_plus_650_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Smart Tank Plus 650 +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=P15_CISS +family-class=P15_CISS +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=1c54 +wifi-config=3 + +[smart_tank_610_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=7 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Smart Tank 610 +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=P15_CISS +family-class=P15_CISS +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=1b54 +wifi-config=3 + +[smart_tank_plus_550_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Smart Tank Plus 550 +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-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=P15_CISS +family-class=P15_CISS +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=1a54 +wifi-config=3 + +[smart_tank_510_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Smart Tank 510 +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-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=P15_CISS +family-class=P15_CISS +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=1954 +wifi-config=3 + + +[hp_laserjet_mfp_e62655] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Managed MFP E62655dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_e62655-e62675-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF281X +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=e32a +usb-vid=03F0 +wifi-config=0 + +[hp_laserjet_mfp_e62665] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Managed MFP E62665hs +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_e62655-e62675-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF281X +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=e32a +usb-vid=03F0 +wifi-config=0 + +[hp_laserjet_flow_mfp_e62665] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Managed Flow MFP E62665h +model2=HP LaserJet Managed Flow MFP E62665z +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_e62655-e62675-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF281X +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=e32a +usb-vid=03F0 +wifi-config=0 + +[hp_laserjet_flow_mfp_e62675] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_Color_LaserJet_4730mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Managed Flow MFP E62675z +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_e62655-e62675-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF281X +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=430e +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=e32a +usb-vid=03F0 +wifi-config=0 + +[hp_laserjet_e60155] +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 Managed E60155dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_e60155-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF237A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=e02a +usb-vid=03f0 +wifi-config=0 + +[hp_laserjet_e60165] +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 Managed E60165dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_e60165-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF237A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=e02a +usb-vid=03f0 +wifi-config=0 + +[hp_laserjet_e60175] +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 Managed E60175dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-laserjet_e60175-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF237A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=e02a +usb-vid=03f0 +wifi-config=0 + +[hp_color_laserjet_mfp_e67650] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed MFP E67650dh +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_e67650_e67660-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF472X +r0-agent1-type=6 +r0-agent2-kind=4 +r0-agent2-sku=CF473X +r0-agent2-type=5 +r0-agent3-kind=4 +r0-agent3-sku=CF471X +r0-agent3-type=4 +r0-agent4-kind=4 +r0-agent4-sku=CF470X +r0-agent4-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=2d89 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=e22a +usb-vid=03F0 +wifi-config=0 + +[hp_color_laserjet_flow_e67660] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed Flow MFP E67660z +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_e67650_e67660-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF472X +r0-agent1-type=6 +r0-agent2-kind=4 +r0-agent2-sku=CF473X +r0-agent2-type=5 +r0-agent3-kind=4 +r0-agent3-sku=CF471X +r0-agent3-type=4 +r0-agent4-kind=4 +r0-agent4-sku=CF470X +r0-agent4-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=2d89 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=e22a +usb-vid=03F0 +wifi-config=0 + +[hp_color_laserjet_e65150] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed E65150dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_e65150_e65160-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF460A/CF460X/CF460Y +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF461A/CF461X/CF461Y +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF463A/CF463X/CF463Y +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF462A/CF462X/CF462Y +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=e12a +usb-vid=03f0 +wifi-config=0 + +[hp_color_laserjet_e65160] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed E65160dn +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +ppd-name=hp-color_laserjet_e65150_e65160-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CF460A/CF460X/CF460Y +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF461A/CF461X/CF461Y +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF463A/CF463X/CF463Y +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CF462A/CF462X/CF462Y +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.19.3 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=e12a +usb-vid=03f0 +wifi-config=0 + +[hp_neverstop_laser_mfp_120x] +align-type=15 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Neverstop Laser MFP 1200a +model2=HP Neverstop Laser MFP 1200w +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=104A/W1104A +r0-agent1-type=1 +scan-src=1 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.19.3 +tech-class=Hbpl1 +family-class=PCLM_MONO +tech-subclass=Mono +tech-type=3 +usb-pid=f42a +usb-vid=03F0 +wifi-config=3 + +[hp_neverstop_laser_100x] +align-type=15 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Neverstop Laser 1000a +model2=HP Neverstop Laser 1000w +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=104A/W1104A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=2 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.19.3 +tech-class=Hbpl1 +family-class=PCLM_MONO +tech-subclass=Mono +tech-type=2 +usb-pid=f32a +usb-vid=03F0 +wifi-config=3 +[hp_laser_ns_1020] +align-type=15 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laser NS 1020 +model2=HP Laser NS 1020w +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=104A/W1104A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=2 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.19.3 +tech-class=Hbpl1 +family-class=PCLM_MONO +tech-subclass=Mono +tech-type=2 +usb-pid=f02a +usb-vid=03F0 +wifi-config=3 + +[hp_laser_ns_mfp_1005] +align-type=15 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Laser NS MFP 1005 +model2=HP Laser NS MFP 1005w +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=104A/W1104A +r0-agent1-type=1 +scan-src=1 +scan-type=1 +status-battery-check=0 +status-dynamic-counters=0 +status-type=2 +support-released=True +support-subtype=48c3 +support-type=2 +support-ver=3.19.3 +tech-class=Hbpl1 +family-class=PCLM_MONO +tech-subclass=Mono +tech-type=2 +usb-pid=f12a +usb-vid=03F0 +wifi-config=3 + +[smart_tank_500_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Smart Tank 500 series +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-src=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.4 +tech-class=P15_CISS +family-class=P15_CISS +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=2B54 +wifi-config=0 + +[smart_tank_530_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Smart Tank 530 series +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.4 +tech-class=P15_CISS +family-class=P15_CISS +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=2A54 +wifi-config=3 + +[smart_tank_plus_570_series] +align-type=15 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=1 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Smart Tank Plus 570 series +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-src=3 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.4 +tech-class=P15_CISS +family-class=P15_CISS +tech-subclass=Normal +tech-type=2 +usb-pid=03f0 +usb-vid=2D54 +wifi-config=3 + +[hp_laserjet_m507] +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_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise M507n +model2=HP LaserJet Enterprise M507dn +model3=HP LaserJet Enterprise M507x +model4=HP LaserJet Enterprise M507dng +monitor-type=0 +ppd-name=hp-laserjet_m507-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=CF289A +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=ca2a +usb-vid=03f0 +wifi-config=2 + +[hp_laserjet_e50145] +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_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP Laserjet Managed E50145dn +model2=HP Laserjet Managed E50145x +monitor-type=0 +ppd-name=hp-laserjet_e50145-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=CF289YC +r0-agent1-type=1 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=d22a +usb-vid=03f0 +wifi-config=2 + +[hp_laserjet_mfp_m528] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise MFP M528dn +model2=HP LaserJet Enterprise MFP M528f +monitor-type=0 +ppd-name=hp-laserjet_flow_mfp_m528-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=CF289A +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=cc2a +usb-vid=03f0 +wifi-config=2 + +[hp_laserjet_flow_mfp_m528] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet Enterprise Flow MFP M528c +model2=HP LaserJet Enterprise Flow MFP M528z +monitor-type=0 +ppd-name=hp-laserjet_flow_mfp_m528-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=CF289A +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=cc2a +usb-vid=03f0 +wifi-config=2 + +[hp_laserjet_mfp_e52645] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet Managed MFP E52645dn +monitor-type=0 +ppd-name=hp-laserjet_flow_mfp_e52645-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=CF289YC +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=d32a +usb-vid=03f0 +wifi-config=2 + +[hp_laserjet_flow_mfp_e52645] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_1012.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP LaserJet Managed Flow MFP E52645c +monitor-type=0 +ppd-name=hp-laserjet_flow_mfp_e52645-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=CF289YC +r0-agent1-type=1 +scan-src=3 +scan-type=9 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=3 +usb-pid=d32a +usb-vid=03f0 +wifi-config=2 + +[hp_color_laserjet_m751] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Enterprise M751n +model2=HP Color LaserJet Enterprise M751dn +monitor-type=0 +ppd-name=hp-color_laserjet_m751-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=W2002X/658X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=W2003X/658X +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=W2001X/658X +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=W2000X/658X +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=9d2a +usb-vid=03f0 +wifi-config=2 + +[hp_color_laserjet_e75245] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=1 +linefeed-cal-type=0 +model1=HP Color LaserJet Managed E75245dn +monitor-type=0 +ppd-name=hp-color_laserjet_e75245-ps.ppd +family-ppd=hp-postscript-laserjet.ppd +panel-check-type=1 +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=W2002X/658X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=W2003X/658X +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=W2001X/658X +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=W2000X/658X +r0-agent4-type=6 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=12 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=4 +usb-pid=9e2a +usb-vid=03f0 +wifi-config=2 + +[hp_pagewide_xl_3900ps_mfp] +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=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP PageWide XL 3900PS MFP +monitor-type=0 +ppd-name=hp-pagewide_xl_3900ps_mfp-ps.ppd +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + +[hp_designjet_xl_3600_ps_mfp] +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=4 +job-storage=0 +linefeed-cal-type=0 +model1=HP DesignJet XL 3600 PS MFP +monitor-type=0 +ppd-name=hp-color_designjet_xl_3600-ps.ppd +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-src=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.19.5 +tech-class=Postscript +family-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 # align-type # ---------- diff --git a/fax/ppd/HP-Fax-hpcups.ppd.gz b/fax/ppd/HP-Fax-hpcups.ppd.gz Binary files differindex f68dd434c..084240857 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 c009b3219..dfcb737ef 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 3eba011e9..7a330eb1e 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 92c630733..28531343d 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 419195e79..b676995a5 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 94630e30b..7a5da010a 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 d865daef5..117c1a096 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 ff685b209..9e95580c9 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 b8814e9ea..f6da71e5f 100644 --- a/foomatic_drv.inc +++ b/foomatic_drv.inc @@ -23,6 +23,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_830c-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_k80-hpijs.ppd.gz \ ppd/hpijs/hp-business_inkjet_1100-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_610_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_4670_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_815c-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp3505-pcl3-hpijs.ppd.gz \ @@ -136,6 +137,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_3320-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_b010_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_9300-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_plus_550_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1100-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_5200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz \ @@ -162,6 +164,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-officejet_7500_e910-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m101-m106-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_7200_series-hpijs.ppd.gz \ + ppd/hpijs/hp-laser_ns_mfp_1005-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_2510_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-dj450-hpijs.ppd.gz \ @@ -227,6 +230,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3822-hpijs.ppd.gz \ + ppd/hpijs/hp-laser_ns_1020-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4515-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1568-hpijs.ppd.gz \ ppd/hpijs/hp-psc_760-hpijs.ppd.gz \ @@ -240,6 +244,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_812c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_p4015x-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_m9059_mfp-pcl3-hpijs.ppd.gz \ + ppd/hpijs/hp-neverstop_laser_100x-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_5500-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_6520_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5570_series-hpijs.ppd.gz \ @@ -291,6 +296,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_p4015tn-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_5652-hpijs.ppd.gz \ ppd/hpijs/hp-envy_5660_series-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_510_series-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c7200_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz \ ppd/hpijs/hp-psc_950xi-hpijs.ppd.gz \ @@ -467,6 +473,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-mopier_240-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_656c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_500_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_2130_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_3900-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_930c-hpijs.ppd.gz \ @@ -500,6 +507,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-laserjet_4000_series-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_series_630-hpijs.ppd.gz \ ppd/hpijs/hp-envy_4520_series-hpijs.ppd.gz \ + ppd/hpijs/hp-neverstop_laser_mfp_120x-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_9040-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_d2500_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_professional_p1107-hpijs.ppd.gz \ @@ -560,6 +568,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-deskjet_882c-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_1150-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_l7400-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_plus_570_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_1600cm-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cm2320_mfp-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_990c-hpijs.ppd.gz \ @@ -647,6 +656,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-psc_2200_series-hpijs.ppd.gz \ ppd/hpijs/hp-color_laserjet_cp4005-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3390-pcl3-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_plus_650_series-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_843c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4500_series-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_7110_series-hpijs.ppd.gz \ @@ -717,6 +727,7 @@ foomatic_ppd_printers = \ ppd/hpijs/hp-photosmart_7550-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_3020-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-officejet_pro_8620-hpijs.ppd.gz \ + ppd/hpijs/hp-smart_tank_530_series-hpijs.ppd.gz \ ppd/hpijs/hp-laserjet_cm1412fn-pcl3-hpijs.ppd.gz \ ppd/hpijs/hp-deskjet_610c-hpijs.ppd.gz \ ppd/hpijs/hp-photosmart_c4400_series-hpijs.ppd.gz \ @@ -793,9 +804,12 @@ foomatic_ps_printers = \ prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz \ prnt/ps/hp-laserjet_3030-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320_mfp-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_m751-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500_series-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz \ prnt/ps/hp-laserjet_9055mfp-ps.ppd.gz \ prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60175-ps.ppd.gz \ prnt/ps/hp-laserjet_4350-ps.ppd.gz \ prnt/ps/hp-laserjet_3300_3310_3320-ps.ppd.gz \ prnt/ps/hp-laserjet_100_color_mfp_m175-ps.ppd.gz \ @@ -809,9 +823,11 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4100_series-ps.ppd.gz \ prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz \ prnt/ps/hp-designjet_t7200-ps.ppd.gz \ prnt/ps/hp-designjet_4520mfp-ps.ppd.gz \ prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz \ + prnt/ps/hp-laserjet_m507-ps.ppd.gz \ prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz \ prnt/ps/hp-laserjet_2410-ps.ppd.gz \ prnt/ps/hp-designjet_t1120ps_24in-ps.ppd.gz \ @@ -820,10 +836,12 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_5100_series-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4005-ps.ppd.gz \ prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz \ prnt/ps/hp-laserjet_1220-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_24in-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60165-ps.ppd.gz \ prnt/ps/hp-designjet_t7100ps_monochrome-ps.ppd.gz \ prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm1312_mfp-ps.ppd.gz \ @@ -868,11 +886,13 @@ foomatic_ps_printers = \ prnt/ps/hp-designjet_4500ps.ppd.gz \ prnt/ps/hp-pagewide_352_printer-ps.ppd.gz \ prnt/ps/hp-laserjet_4240-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz \ prnt/ps/hp-laserjet_5si_mopier-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz \ prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2840-ps.ppd.gz \ prnt/ps/hp-cm8050_mfp_with_edgeline-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2250-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz \ prnt/ps/hp-laserjet_m1522nf_mfp-ps.ppd.gz \ @@ -913,12 +933,14 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_3000-ps.ppd.gz \ prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cp4020_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_e50145-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2300-ps.ppd.gz \ prnt/ps/hp-officejet_color_mfp_x585.ppd.gz \ prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz \ prnt/ps/hp-laserjet_3052-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2605-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz \ prnt/ps/hp-laserjet_p2055_series-ps.ppd.gz \ prnt/ps/hp-officejet_pro_8732-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz \ @@ -929,6 +951,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_4700-ps.ppd.gz \ prnt/ps/hp-laserjet_4si-ps.ppd.gz \ prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz \ prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz \ @@ -974,6 +997,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_4mp-ps.ppd.gz \ prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz \ + prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz \ prnt/ps/hp-laserjet_cp1520_series-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz \ @@ -1007,6 +1031,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_m651-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz \ + prnt/ps/hp-laserjet_e60155-ps.ppd.gz \ prnt/ps/hp-laserjet_1200-ps.ppd.gz \ prnt/ps/hp-laserjet_p3005-ps.ppd.gz \ prnt/ps/hp-laserjet_9040-ps.ppd.gz \ @@ -1027,8 +1052,10 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3700n-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_p3010_series-ps.ppd.gz \ prnt/ps/hp-laserjet_2100-ps.ppd.gz \ + prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz \ prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz \ prnt/ps/hp-color_laserjet_3700-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2500-ps.ppd.gz \ @@ -1051,6 +1078,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz \ prnt/ps/hp-laserjet_8100_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_5000_series-ps.ppd.gz \ + prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz \ prnt/ps/hp-laserjet_p3004-ps.ppd.gz \ prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz \ @@ -1062,6 +1090,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_4250-ps.ppd.gz \ prnt/ps/hp-business_inkjet_2280-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm6030_mfp-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz \ prnt/ps/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_2820-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz \ @@ -1070,6 +1099,7 @@ foomatic_ps_printers = \ prnt/ps/hp-laserjet_m9059_mfp-ps.ppd.gz \ prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz \ prnt/ps/hp-designjet_z6200_42in_photo-ps.ppd.gz \ + prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz \ prnt/ps/hp-laserjet_1320n-ps.ppd.gz \ prnt/ps/hp-designjet_z6100ps_42in_photo-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz \ @@ -1092,6 +1122,7 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_cp2025n-ps.ppd.gz \ prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz \ prnt/ps/hp-laserjet_3020-ps.ppd.gz \ + prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz \ prnt/ps/hp-officejet_color_x555-ps.ppd.gz \ prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz \ @@ -1106,10 +1137,12 @@ foomatic_ps_printers = \ prnt/ps/hp-color_laserjet_m553-ps.ppd.gz \ prnt/ps/hp-laserjet_5200l-ps.ppd.gz \ prnt/ps/hp-mopier_240-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz \ prnt/ps/hp-laserjet_9050_mfp-ps.ppd.gz \ prnt/ps/hp-color_laserjet_m750-ps.ppd.gz \ prnt/ps/hp-designjet_t1100ps_44in-ps.ppd.gz \ prnt/ps/hp-laserjet_1200n-ps.ppd.gz \ + prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz \ prnt/ps/hp-laserjet_3390-ps.ppd.gz \ prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz \ prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz \ diff --git a/hplipclassdriver.spec b/hplipclassdriver.spec index bb7e07bc0..821551eea 100644 --- a/hplipclassdriver.spec +++ b/hplipclassdriver.spec @@ -1,5 +1,5 @@ Name: hplipclassdriver -Version: 3.18.12 +Version: 3.19.5 Release: 0 License: (c) 2004-2009 Copyright HP Development Company, LP Packager: HPLIP @@ -32,15 +32,57 @@ HPLIPFULL provides support for print, scan, fax and toolbox. %attr(0644,root,root) "/usr/share/ppd/HP/hp-LJ-Class4A.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-LJ-Class5.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-LJ-Class6.ppd.gz" -%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class1.ppd.gz" -%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class1A.ppd.gz" -%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class1B.ppd.gz" -%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class2.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-DJ9xxVIP.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-CLE.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-CLE17.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Ampere.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Copperhead.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Copperhead12.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-CopperheadIPH.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-CopperheadIPH15.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-CopperheadIPH17.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Corbett.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-CopperheadXLP.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-DJGenericVIP.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-DJ55xx.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Kapan.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Gemstone.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Mimas.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Mimas15.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Mimas17.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-MimasTDR.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-P15_CISS.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-OJProKx50.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-OJ7000.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-PSP100.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Pyramid.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Pyramid15.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-PSP470.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-PyramidPlus.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-PyramidRefresh17.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-PyramidRefresh15.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Python.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Python10.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-SPDOfficejetProBsize.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-SPDOfficejetProAsize.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Python11.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Stabler.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Saipan.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-Saipan15B.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-ViperPlusVIP.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-ViperMinusVIP.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-StingrayOJ.ppd.gz" +#%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class1.ppd.gz" +#%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class1A.ppd.gz" +#%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class1B.ppd.gz" +#%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class2.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class3.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class3A.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL3-Class3B.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-PCL4-Class1.ppd.gz" -%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCLM.ppd.gz" +#%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCLM.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCLM_COLOR.ppd.gz" +%attr(0644,root,root) "/usr/share/ppd/HP/hp-PCLM_MONO.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-postscript-inkjet.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-postscript-laserjet-pro.ppd.gz" %attr(0644,root,root) "/usr/share/ppd/HP/hp-postscript-laserjet.ppd.gz" diff --git a/installer/core_install.py b/installer/core_install.py index 4d2862d83..7d9495e05 100644 --- a/installer/core_install.py +++ b/installer/core_install.py @@ -1145,11 +1145,13 @@ class CoreInstall(object): return False def check_dbus(self): - log.debug( - "Checking for dbus running and header files present (dbus-devel)...") - return check_ps(['dbus-daemon']) and \ - len(locate_file_contains("dbus-message.h", - '/usr/include', 'dbus_message_new_signal')) + log.debug("Checking for dbus running and header files present (dbus-devel)...") + if (self.distro_name.lower()=='fedora') and (self.distro_version>='30'): + return True + else: + return check_ps(['dbus-daemon']) and \ + len(locate_file_contains("dbus-message.h", + '/usr/include', 'dbus_message_new_signal')) def check_cups_devel(self): return check_file('cups.h') and bool(utils.which('lpr')) diff --git a/installer/distros.dat b/installer/distros.dat index 9f7bb471b..6def098d6 100644 --- a/installer/distros.dat +++ b/installer/distros.dat @@ -123,9 +123,9 @@ package_mgrs=yast,yast2,opensuse-updater,zypper,package-manager package_mgr_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses $packages_to_install"
pre_depend_cmd=
post_depend_cmd=
-scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks remove python-numpy",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install opencv-python",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image"
+scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks remove python-numpy",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install opencv-python",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
#su -c "pip2 install --upgrade setuptools"
-scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install opencv-python",su -c "pip3 install setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image"
+scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install opencv-python",su -c "pip3 install setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
#su -c "pip3 install --upgrade setuptools",
hplip_remove_cmd=su -c "zypper --non-interactive rm hplip"
su_sudo=su
@@ -767,8 +767,8 @@ ui_toolkit=qt4 native_cups=1
pre_depend_cmd=su -c "zypper refresh"
post_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --force --auto-agree-with-licenses cups-filters-ghostscript",su -c "service cups restart"
-#scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python2-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install --upgrade setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install opencv-python",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image"
-#scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install setuptools",su -c "pip3 install --upgrade setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image"
+#scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python2-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install --upgrade setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install opencv-python",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
+#scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install setuptools",su -c "pip3 install --upgrade setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
[suse:42.3:cups]
packages=cups,cups-client
@@ -920,9 +920,9 @@ ui_toolkit=qt4 native_cups=1
pre_depend_cmd=su -c "zypper refresh"
post_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --force --auto-agree-with-licenses cups-filters-ghostscript",su -c "service cups restart"
-scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks remove python-numpy",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install opencv-python",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image",su -c "pip2 install reportlab==3.4.0"
+scanjet_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks remove python-numpy",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python-pip",su -c "pip2 install --upgrade pip",su -c "pip2 install setuptools",su -c "pip2 install opencv-python",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses libzbar-devel",su -c "pip2 install zbar",su -c "pip2 install PyPDF2",su -c "pip2 install imutils",su -c "pip2 install tesserocr",su -c "pip2 install pypdfocr",su -c "pip2 install --ignore-installed decorator",su -c "pip2 install scikit-image",su -c "pip2 install reportlab==3.4.0",su -c "pip2 install scipy"
#su -c "pip2 install --upgrade setuptools"
-scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install opencv-python",su -c "pip3 install setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image",su -c "pip3 install reportlab==3.4.0"
+scanjet_py3_depend_cmd=su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses python3-pip",su -c "pip3 install --upgrade pip",su -c "pip3 install opencv-python",su -c "pip3 install setuptools",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses leptonica-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-devel",su -c "zypper --non-interactive --no-gpg-checks in --auto-agree-with-licenses tesseract-ocr-traineddata-*",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install tesserocr",su -c "pip3 install ocrmypdf",su -c "pip3 install --ignore-installed decorator",su -c "pip3 install scikit-image",su -c "pip3 install reportlab==3.4.0",su -c "pip3 install scipy"
[suse:15.0:cups]
packages=cups,cups-client
@@ -1250,7 +1250,7 @@ ui_toolkit=qt3 # ****************************************
[fedora]
index=5
-versions=17,18,19,20,21,22,23,24,25,26,27,28,29
+versions=17,18,19,20,21,22,23,24,25,26,27,28,29,30
display_name=Fedora
alt_names=Fedora Core
display=1
@@ -1259,9 +1259,9 @@ package_mgrs=yum,rpm,up2date package_mgr_cmd=su -c "yum -y -d 10 -e 1 install $packages_to_install"
pre_depend_cmd=su -c "yum clean all",su -c "yum check-update"
post_depend_cmd=
-#scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python2-pip",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip2 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "pip2 install zbar",su -c "pip2 install opencv-python",su -c "pip2 install pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image"
-scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python-pip",su -c "pip install opencv-python",su -c "pip install pypdf2",su -c "pip install imutils",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "dnf update gcc",su -c "dnf -y -d 10 -e 1 install zbar-*",su -c "dnf -y -d 10 -e 1 install ImageMagick*",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install tesseract-osd",,su -c "pip install pypdfocr",su -c "pip install scikit-image"
-scanjet_py3_depend_cmd=su -c "dnf -y -d 10 -e 1 install python3-pip",su -c "pip3 install opencv-python",su -c "pip3 install pypdf2",su -c "pip3 install imutils",su -c "dnf -y -d 10 -e 1 install ImageMagick*",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip3 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install tesseract-osd",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image"
+#scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python2-pip",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip2 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "pip2 install zbar",su -c "pip2 install opencv-python",su -c "pip2 install pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
+scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python-pip",su -c "pip install opencv-python",su -c "pip install pypdf2",su -c "pip install imutils",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "dnf update gcc",su -c "dnf -y -d 10 -e 1 install zbar-*",su -c "dnf -y -d 10 -e 1 install ImageMagick*",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install tesseract-osd",,su -c "pip install pypdfocr",su -c "pip install scikit-image",su -c "pip install scipy"
+scanjet_py3_depend_cmd=su -c "dnf -y -d 10 -e 1 install python3-pip",su -c "pip3 install opencv-python",su -c "pip3 install pypdf2",su -c "pip3 install imutils",su -c "dnf -y -d 10 -e 1 install ImageMagick*",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip3 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install tesseract-osd",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
#hplip_remove_cmd=su -c "dnf -y -d 10 -e 1 remove hplip"
hplip_remove_cmd=su -c "yum -y -d 10 -e 1 remove hplip"
su_sudo=su
@@ -1751,9 +1751,9 @@ native_cups=1 open_mdns_port=/bin/bash ./init-iptables-firewall
package_mgr_cmd=su -c "dnf -y -d 10 -e 1 install $packages_to_install"
pre_depend_cmd=su -c "dnf check-update"
-#scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python2-pip",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip2 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "pip2 install zbar",su -c "pip2 install opencv-python",su -c "pip2 install pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image"
+#scanjet_depend_cmd=su -c "dnf -y -d 10 -e 1 install python2-pip",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip2 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "dnf -y -d 10 -e 1 install zbar-devel",su -c "pip2 install zbar",su -c "pip2 install opencv-python",su -c "pip2 install pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
#scanjet_py3_depend_cmd=su -c "dnf -y -d 10 -e 1 install python3-pip",su -c "dnf -y -d 10 -e 1 install leptonica",su -c "dnf -y -d 10 -e 1 install leptonica-devel",su -c "dnf -y -d 10 -e 1 install tesseract",su -c "dnf -y -d 10 -e 1 install tesseract-devel",su -c "pip3 install tesserocr",su -c "dnf -y -d 10 -e 1 install tesseract-langpack-*",su -c "pip3 install opencv-python",su -c "pip3 install pypdf2",su -c "pip3 install imutils", su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image"
-hplip_remove_cmd=su -c "dnf -y -d 10 -e 1 remove hplip"
+hplip_remove_cmd=su -c "dnf -y -d 10 -e 1 remove hplip",su -c "pip3 install scipy"
[fedora:27:cups]
packages=cups
@@ -1899,8 +1899,8 @@ native_cups=1 open_mdns_port=/bin/bash ./init-iptables-firewall
package_mgr_cmd= sudo dnf -y -d 10 -e 1 install $packages_to_install
pre_depend_cmd=sudo dnf check-update
-scanjet_depend_cmd=sudo dnf -y -d 10 -e 1 install python-pip,sudo pip install opencv-python,sudo pip install pypdf2,sudo pip install imutils,sudo dnf -y -d 10 -e 1 install zbar-devel,sudo dnf update gcc,sudo dnf -y -d 10 -e 1 install zbar-*,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd, sudo pip install pypdfocr,sudo pip install scikit-image
-scanjet_py3_depend_cmd=sudo dnf -y -d 10 -e 1 install python3-pip,sudo pip3 install opencv-python,sudo pip3 install pypdf2,sudo pip3 install imutils,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip3 install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image
+scanjet_depend_cmd=sudo dnf -y -d 10 -e 1 install python-pip,sudo pip install opencv-python,sudo pip install pypdf2,sudo pip install imutils,sudo dnf -y -d 10 -e 1 install zbar-devel,sudo dnf update gcc,sudo dnf -y -d 10 -e 1 install zbar-*,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd, sudo pip install pypdfocr,sudo pip install scikit-image,sudo pip install scipy
+scanjet_py3_depend_cmd=sudo dnf -y -d 10 -e 1 install python3-pip,sudo pip3 install opencv-python,sudo pip3 install pypdf2,sudo pip3 install imutils,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip3 install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
hplip_remove_cmd=sudo dnf -y -d 10 -e 1 remove hplip
[fedora:28:cups]
@@ -2046,8 +2046,8 @@ native_cups=1 open_mdns_port=/bin/bash ./init-iptables-firewall
package_mgr_cmd= sudo dnf -y -d 10 -e 1 install $packages_to_install
pre_depend_cmd=sudo dnf check-update
-scanjet_depend_cmd=sudo dnf -y -d 10 -e 1 install python-pip,sudo pip install opencv-python,sudo pip install pypdf2,sudo pip install imutils,sudo dnf -y -d 10 -e 1 install zbar-devel,sudo dnf update gcc,sudo dnf -y -d 10 -e 1 install zbar-*,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo dnf -y -d 10 -e 1 install qpdf,sudo pip install pypdfocr,sudo pip install scikit-image
-scanjet_py3_depend_cmd=sudo dnf -y -d 10 -e 1 install python3-pip,sudo pip3 install opencv-python,sudo pip3 install pypdf2,sudo pip3 install imutils,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip3 install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo dnf -y -d 10 -e 1 install qpdf,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image
+scanjet_depend_cmd=sudo dnf -y -d 10 -e 1 install python-pip,sudo pip install opencv-python,sudo pip install pypdf2,sudo pip install imutils,sudo dnf -y -d 10 -e 1 install zbar-devel,sudo dnf update gcc,sudo dnf -y -d 10 -e 1 install zbar-*,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo dnf -y -d 10 -e 1 install qpdf,sudo pip install pypdfocr,sudo pip install scikit-image,sudo pip install scipy
+scanjet_py3_depend_cmd=sudo dnf -y -d 10 -e 1 install python3-pip,sudo pip3 install opencv-python,sudo pip3 install pypdf2,sudo pip3 install imutils,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip3 install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo dnf -y -d 10 -e 1 install qpdf,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
hplip_remove_cmd=sudo dnf -y -d 10 -e 1 remove hplip
[fedora:29:cups]
@@ -2170,6 +2170,153 @@ packages=automake # ****************************************
+[fedora:30]
+code_name=
+supported=1
+scan_supported=1
+fax_supported=1
+pcard_supported=0
+network_supported=1
+parallel_supported=0
+usb_supported=1
+packaged_version=3.19.1
+release_date=30/10/2018
+notes=To complete the install in Fedora you must quit the installer at the printer setup stage, log out, log back in, and run hp-setup.
+ppd_install=drv
+udev_mode_fix=1
+ppd_dir=/usr/share/cups/model/HP
+fix_ppd_symlink=0
+drv_dir=/usr/share/cups/drv/HP
+ui_toolkit=qt4
+policykit=0
+native_cups=1
+open_mdns_port=/bin/bash ./init-iptables-firewall
+package_mgr_cmd= sudo dnf -y -d 10 -e 1 install $packages_to_install
+pre_depend_cmd=sudo dnf check-update
+scanjet_depend_cmd=sudo dnf -y -d 10 -e 1 install python-pip,sudo pip install opencv-python,sudo pip install pypdf2,sudo pip install imutils,sudo dnf -y -d 10 -e 1 install zbar-devel,sudo dnf update gcc,sudo dnf -y -d 10 -e 1 install zbar-*,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo dnf -y -d 10 -e 1 install qpdf,sudo pip install pypdfocr,sudo pip install scikit-image,sudo pip install scipy
+scanjet_py3_depend_cmd=sudo dnf -y -d 10 -e 1 install python3-pip,sudo pip3 install opencv-python,sudo pip3 install pypdf2,sudo pip3 install imutils,sudo dnf -y -d 10 -e 1 install leptonica,sudo dnf -y -d 10 -e 1 install leptonica-devel,sudo dnf -y -d 10 -e 1 install tesseract,sudo dnf -y -d 10 -e 1 install tesseract-devel,sudo pip3 install tesserocr,sudo dnf -y -d 10 -e 1 install tesseract-langpack-*,sudo dnf -y -d 10 -e 1 install tesseract-osd,sudo dnf -y -d 10 -e 1 install qpdf,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
+hplip_remove_cmd=sudo dnf -y -d 10 -e 1 remove hplip
+
+[fedora:30:cups]
+packages=cups
+
+[fedora:30:cups-devel]
+packages=cups-devel
+
+[fedora:30:gcc]
+packages=gcc-c++
+
+[fedora:30:gs]
+packages=ghostscript
+
+[fedora:30:libcrypto]
+packages=openssl-devel
+
+[fedora:30:libjpeg]
+packages=libjpeg-devel
+
+[fedora:30:libnetsnmp-devel]
+packages=net-snmp-devel
+
+[fedora:30:libpthread]
+packages=glibc-headers
+
+[fedora:30:libtool]
+packages=libtool,rpm-build
+
+[fedora:30:libusb]
+packages=libusb1-devel
+
+[fedora:30:make]
+packages=make
+
+[fedora:30:pil]
+packages=python-imaging
+
+[fedora:30:ppdev]
+packages=
+commands=sudo /sbin/modprobe ppdev
+
+[fedora:30:pyqt]
+packages=PyQt
+
+[fedora:30:python-devel]
+packages=python-devel
+
+[fedora:30:pyqt4]
+packages=PyQt4
+
+[fedora:30:pyqt4-dbus]
+packages=dbus-python
+
+[fedora:30:python2X]
+packages=python
+
+[fedora:30:reportlab]
+packages=python-reportlab
+
+[fedora:30:sane]
+packages=sane-backends
+
+[fedora:30:sane-devel]
+packages=sane-backends-devel
+
+[fedora:30:scanimage]
+packages=sane-frontends
+
+[fedora:30:xsane]
+packages=xsane
+
+[fedora:30:python-dbus]
+packages=dbus-python,pygobject2
+
+[fedora:30:dbus]
+packages=dbus-devel
+
+[fedora:30:cups-image]
+packages=cups-devel
+
+[fedora:30:python-notify]
+packages=notify-python
+
+[fedora:30:policykit]
+packages=polkit,polkit-gnome
+
+[fedora:30:network]
+packages=wget
+
+[fedora:30:avahi-utils]
+packages=avahi-tools
+
+[fedora:30:python3X]
+packages=python3
+
+[fedora:30:python3-notify2]
+packages=PKG_FROM_PIP:notify2
+
+[fedora:30:python3-pyqt4]
+packages=python3-PyQt4
+
+[fedora:30:python3-dbus]
+packages=python3-dbus,python3-gobject
+
+[fedora:30:python3-xml]
+packages=python3-lxml
+
+[fedora:30:python3-devel]
+packages=python3-devel
+
+[fedora:30:python3-pil]
+packages=python3-pillow
+
+[fedora:30:python3-reportlab]
+packages=python3-reportlab
+
+[fedora:30:automake]
+packages=automake
+
+# ****************************************
+
[linspire]
index=15
versions=5.0
@@ -2212,7 +2359,7 @@ ui_toolkit=qt3 # ****************************************
[rhel]
index=7
-versions=5.0,6.0,7.0,7.1,7.2,7.3
+versions=5.0,6.0,7.0,7.1,7.2,7.3,7.6
display_name=Red Hat Enterprise Linux
alt_names=red hat enterprise linux
display=1
@@ -2496,6 +2643,12 @@ release_date=03/11/2016 same_as_version=6.0
# ****************************************
+[rhel:7.6]
+packaged_version=3.19.3
+release_date=31/11/2018
+same_as_version=6.0
+
+# ****************************************
[slackware]
index=8
versions=9.0,9.1,10.0,10.1,10.2,11,12,12.1
@@ -3624,7 +3777,7 @@ packages=epm # ****************************************
[ubuntu]
index=12
-versions=10.04,11.10,12.04,12.10,13.04,13.10,14.04,14.10,15.04,15.10,16.04,16.10,17.04,17.10,18.04,18.10
+versions=10.04,11.10,12.04,12.10,13.04,13.10,14.04,14.10,15.04,15.10,16.04,16.10,17.04,17.10,18.04,18.10,19.04
display_name=Ubuntu
alt_names=kubuntu,edubuntu,xubuntu
display=1
@@ -3633,9 +3786,9 @@ package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater package_mgr_cmd=sudo apt-get install --assume-yes $packages_to_install
pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo apt-get update
post_depend_cmd=
-scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image
+scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
#sudo apt-get install --assume-yes tesseract-ocr-all
-scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
hplip_remove_cmd=sudo apt-get remove --assume-yes hplip hpijs hplip-cups hplip-data libhpmud0 foomatic-db-hpijs
#sudo apt-get install --assume-yes tesseract-ocr-all,
su_sudo=sudo
@@ -4696,9 +4849,9 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4
native_cups=1
acl_rules=1
-scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip install tesserocr,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip install imutils,sudo -H pip install pypdfocr,sudo -H pip install scikit-image
+scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip install tesserocr,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip install imutils,sudo -H pip install pypdfocr,sudo -H pip install scikit-image,sudo -H pip install scipy
#sudo apt-get install --assume-yes tesseract-ocr-all,
-#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
libdir_path=/usr/lib
[ubuntu:16.04:cups]
@@ -5190,8 +5343,8 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4
native_cups=1
acl_rules=1
-#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
libdir_path=/usr/lib
[ubuntu:17.10:cups]
@@ -5355,8 +5508,8 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4
native_cups=1
acl_rules=1
-#scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+#scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
libdir_path=/usr/lib
@@ -5518,8 +5671,8 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4
native_cups=1
acl_rules=1
-#scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+#scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
libdir_path=/usr/lib
@@ -5667,9 +5820,177 @@ packages=epm # ****************************************
+[ubuntu:19.04]
+code_name=Cosmic Cuttlefish
+supported=1
+scan_supported=1
+fax_supported=1
+pcard_supported=1
+network_supported=1
+parallel_supported=1
+usb_supported=1
+packaged_version=3.18.11
+release_date=18/10/2018
+notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive.
+ppd_install=drv
+udev_mode_fix=1
+ppd_dir=/usr/share/ppd/HP
+fix_ppd_symlink=0
+drv_dir=/usr/share/cups/drv/HP
+ui_toolkit=qt4
+native_cups=1
+acl_rules=1
+#scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip2 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo -H pip2 install opencv-python,sudo -H pip2 install PyPDF2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
+
+libdir_path=/usr/lib
+
+[ubuntu:19.04:cups]
+packages=libcups2
+
+[ubuntu:19.04:cups-devel]
+packages=libcups2-dev,cups-bsd,cups-client
+
+[ubuntu:19.04:gcc]
+packages=build-essential
+
+[ubuntu:19.04:gs]
+packages=ghostscript
+
+[ubuntu:19.04:libcrypto]
+packages=openssl
+
+[ubuntu:19.04:libjpeg]
+packages=libjpeg-dev
+
+[ubuntu:19.04:libatk-adaptor]
+packages=libatk-adaptor
+
+[ubuntu:19.04:libgail-common]
+packages=libgail-common
+
+[ubuntu:19.04:libnetsnmp-devel]
+packages=libsnmp-dev,snmp-mibs-downloader
+
+[ubuntu:19.04:libpthread]
+packages=build-essential
+
+[ubuntu:19.04:libtool]
+packages=libtool,libtool-bin
+
+[ubuntu:19.04:libusb]
+packages=libusb-1.0.0-dev,libusb-0.1-4
+
+[ubuntu:19.04:make]
+packages=build-essential
+
+[ubuntu:19.04:ppdev]
+packages=
+commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules
+
+[ubuntu:19.04:pyqt]
+packages=gtk2-engines-pixbuf,python-qt4
+
+[ubuntu:19.04:python-devel]
+packages=python-dev
+
+[ubuntu:19.04:pyqt4]
+packages=gtk2-engines-pixbuf,python-qt4
+
+[ubuntu:19.04:pyqt4-dbus]
+packages=python-qt4-dbus
+
+[ubuntu:19.04:pyqt5]
+packages=gtk2-engines-pixbuf,python-pyqt5
+
+[ubuntu:19.04:pyqt5-dbus]
+packages=python-dbus.mainloop.pyqt5
+
+#[ubuntu:19.04:python23]
+#packages=python
+
+[ubuntu:19.04:python2X]
+packages=python
+
+[ubuntu:19.04:reportlab]
+packages=python-reportlab
+
+[ubuntu:19.04:sane]
+packages=libsane
+
+[ubuntu:19.04:sane-devel]
+packages=libsane-dev
+
+[ubuntu:19.04:scanimage]
+packages=sane-utils
+
+[ubuntu:19.04:xsane]
+packages=gtk2-engines-pixbuf,xsane
+
+[ubuntu:19.04:python-dbus]
+packages=python-dbus,python-gobject
+
+[ubuntu:19.04:dbus]
+packages=libdbus-1-dev
+
+[ubuntu:19.04:cups-image]
+packages=libcupsimage2-dev
+
+[ubuntu:19.04:cups-ddk]
+packages=cups
+
+[ubuntu:19.04:policykit]
+packages=policykit-1,policykit-1-gnome
+
+[ubuntu:19.04:python-notify]
+packages=python-notify
+
+[ubuntu:19.04:network]
+packages=wget
+
+[ubuntu:19.04:avahi-utils]
+packages=avahi-utils
+
+[ubuntu:19.04:python3-notify2]
+packages=python3-notify2
+
+[ubuntu:19.04:python3-pyqt4-dbus]
+packages=python3-dbus.mainloop.qt
+
+[ubuntu:19.04:python3-pyqt4]
+packages=python3-pyqt4,gtk2-engines-pixbuf
+
+[ubuntu:19.04:python3-pyqt5-dbus]
+packages=python3-dbus.mainloop.pyqt5
+
+[ubuntu:19.04:python3-pyqt5]
+packages=python3-pyqt5,gtk2-engines-pixbuf
+
+[ubuntu:19.04:python3-dbus]
+packages=python3-dbus,python3-gi
+
+[ubuntu:19.04:python3-xml]
+packages=python3-lxml
+
+[ubuntu:19.04:python3-devel]
+packages=python3-dev
+
+[ubuntu:19.04:python3-pil]
+packages=python3-pil
+
+[ubuntu:19.04:python3-reportlab]
+packages=python3-reportlab
+
+[ubuntu:19.04:automake]
+packages=automake1.11
+
+[ubuntu:19.04:epm]
+packages=epm
+
+# ****************************************
[debian]
index=2
-versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,9.1,9.2,9.3,9.4,9.5,9.6
+versions=6.0,6.0.1,6.0.2,6.0.3,6.0.4,6.0.5,6.0.6,6.0.7,6.0.8,6.0.9,6.0.10,7.0,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8
display_name=Debian
alt_names=
display=1
@@ -5679,10 +6000,10 @@ package_mgr_cmd=su -c "apt-get install --force-yes -y $packages_to_install" pre_depend_cmd=su -c "dpkg --configure -a",su -c "apt-get install -f",su -c "apt-get update"
post_depend_cmd=
#su -c "apt-get install --force-yes -y python-qt4",su -c "apt-get install --force-yes -y python-qt4-dbus",
-scanjet_depend_cmd=su -c "apt-get install --force-yes -y python-pip",su -c "pip install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip install tesserocr",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip install imutils",su -c "pip install pypdfocr",su -c "pip install scikit-image"
+scanjet_depend_cmd=su -c "apt-get install --force-yes -y python-pip",su -c "pip install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip install tesserocr",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip install imutils",su -c "pip install pypdfocr",su -c "pip install scikit-image",su -c "pip install scipy"
#su -c "apt-get install --force-yes -y tesseract-ocr-all",
#su -c "apt-get install --force-yes -y python3-pyqt4",su -c "apt-get install --force-yes -y gtk2-engines-pixbuf",su -c "apt-get install --force-yes -y python3-dbus.mainloop.qt",
-scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils,su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image"
+scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils,su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
#su -c "apt-get install --force-yes -y tesseract-ocr-all",
hplip_remove_cmd=su -c "apt-get remove --yes hplip hpijs hplip-data"
su_sudo=su
@@ -7086,9 +7407,9 @@ code_name=Stretch packaged_version=3.18.4
release_date=10/3/2018
#su -c "apt-get install --force-yes -y python-qt4",su -c "apt-get install --force-yes -y python-qt4-dbus",
-#scanjet_depend_cmd=su -c "apt-get install --force-yes -y python2-pip",su -c "pip2 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip2 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image"
+#scanjet_depend_cmd=su -c "apt-get install --force-yes -y python2-pip",su -c "pip2 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip2 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
#su -c "apt-get install --force-yes -y python3-pyqt4",su -c "apt-get install --force-yes -y gtk2-engines-pixbuf",su -c "apt-get install --force-yes -y python3-dbus.mainloop.qt",
-#scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image"
+#scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
same_as_version=9.1
# ****************************************
@@ -7098,9 +7419,9 @@ code_name=Stretch packaged_version=3.18.9
release_date=10/3/2018
#su -c "apt-get install --force-yes -y python-qt4",su -c "apt-get install --force-yes -y python-qt4-dbus",
-#scanjet_depend_cmd=su -c "apt-get install --force-yes -y python2-pip",su -c "pip2 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip2 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image"
+#scanjet_depend_cmd=su -c "apt-get install --force-yes -y python2-pip",su -c "pip2 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip2 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
#su -c "apt-get install --force-yes -y python3-pyqt4",su -c "apt-get install --force-yes -y gtk2-engines-pixbuf",su -c "apt-get install --force-yes -y python3-dbus.mainloop.qt",
-#scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image"
+#scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
same_as_version=9.1
# ****************************************
@@ -7110,9 +7431,25 @@ code_name=Stretch packaged_version=3.18.4
release_date=10/11/2018
#su -c "apt-get install --force-yes -y python-qt4",su -c "apt-get install --force-yes -y python-qt4-dbus",
-#scanjet_depend_cmd=su -c "apt-get install --force-yes -y python2-pip",su -c "pip2 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip2 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image"
+#scanjet_depend_cmd=su -c "apt-get install --force-yes -y python2-pip",su -c "pip2 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip2 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "apt-get install --force-yes -y libzbar-dev",su -c "apt-get install --force-yes -y python-zbar",su -c "apt-get install --force-yes -y python-opencv",su -c "apt-get install --force-yes -y python-pypdf2",su -c "pip2 install imutils",su -c "pip2 install pypdfocr",su -c "pip2 install scikit-image",su -c "pip2 install scipy"
#su -c "apt-get install --force-yes -y python3-pyqt4",su -c "apt-get install --force-yes -y gtk2-engines-pixbuf",su -c "apt-get install --force-yes -y python3-dbus.mainloop.qt",
-#scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image"
+#scanjet_py3_depend_cmd=su -c "apt-get install --force-yes -y python3-pip",su -c "pip3 install --upgrade pip",su -c "apt-get install --force-yes -y libleptonica-dev",su -c "apt-get install --force-yes -y tesseract-ocr",su -c "apt-get install --force-yes -y libtesseract-dev",su -c "pip3 install tesserocr",su -c "apt-get install --force-yes -y tesseract-ocr-all",su -c "pip3 install opencv-python",su -c "pip3 install PyPDF2",su -c "pip3 install imutils",su -c "pip3 install ocrmypdf",su -c "pip3 install scikit-image",su -c "pip3 install scipy"
+same_as_version=9.1
+
+# ****************************************
+
+[debian:9.7]
+code_name=Stretch
+packaged_version=3.19.3
+release_date=23/1/2019
+same_as_version=9.1
+
+# ****************************************
+
+[debian:9.8]
+code_name=Stretch
+packaged_version=3.19.5
+release_date=16/2/2019
same_as_version=9.1
# ****************************************
@@ -9217,7 +9554,7 @@ packages=epm # ****************************************
[linuxmint]
index=22
-versions=13,14,15,16,17,17.1,17.2,17.3,18,18.1,18.2,18.3,19
+versions=13,14,15,16,17,17.1,17.2,17.3,18,18.1,18.2,18.3,19,19.1
display_name=Linux Mint
alt_names=mint, mint linux
display=1
@@ -9226,8 +9563,8 @@ package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater package_mgr_cmd=sudo apt-get install --assume-yes $packages_to_install
pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo apt-get update
post_depend_cmd=
-scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip install --upgrade pip,sudo -H pip install setuptools,sudo pip install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick* ,sudo -H pip install pypdfocr,sudo -H pip install scikit-image
-scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick*,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+scanjet_depend_cmd=sudo apt-get install --assume-yes python-pip,sudo pip install --upgrade pip,sudo -H pip install setuptools,sudo pip install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick* ,sudo -H pip install pypdfocr,sudo -H pip install scikit-image,sudo -H pip install scipy
+scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-eng,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo apt-get install --assume-yes imagemagick*,sudo apt-get install --assume-yes graphicsmagick*,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
hplip_remove_cmd=sudo aptitude remove --assume-yes hplip hpijs
su_sudo=sudo
ppd_install=ppd
@@ -10351,8 +10688,8 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4
native_cups=1
acl_rules=1
-#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
libdir_path=/usr/lib/x86_64-linux-gnu
@@ -10506,8 +10843,8 @@ drv_dir=/usr/share/cups/drv/HP ui_toolkit=qt4
native_cups=1
acl_rules=1
-#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image
+#scanjet_depend_cmd=sudo apt-get install --assume-yes python2-pip,sudo pip2 install --upgrade pip,sudo -H pip2 install setuptools,sudo pip2 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip2 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo apt-get install --assume-yes libzbar-dev,sudo apt-get install --assume-yes python-zbar,sudo apt-get install --assume-yes python-opencv,sudo apt-get install --assume-yes python-pypdf2,sudo -H pip2 install imutils,sudo -H pip2 install pypdfocr,sudo -H pip2 install scikit-image,sudo -H pip2 install scipy
+#scanjet_py3_depend_cmd=sudo apt-get install --assume-yes python3-pip,sudo pip3 install --upgrade pip,sudo -H pip3 install setuptools,sudo pip3 install --upgrade setuptools,sudo apt-get install --assume-yes libleptonica-dev,sudo apt-get install --assume-yes tesseract-ocr,sudo apt-get install --assume-yes libtesseract-dev,sudo -H pip3 install tesserocr,sudo apt-get install --assume-yes tesseract-ocr-all,sudo -H pip3 install opencv-python,sudo -H pip3 install PyPDF2,sudo -H pip3 install imutils,sudo -H pip3 install ocrmypdf,sudo -H pip3 install scikit-image,sudo -H pip3 install scipy
libdir_path=/usr/lib/x86_64-linux-gnu
@@ -10641,6 +10978,15 @@ packages=epm # ****************************************
+[linuxmint:19.1]
+code_name=Tessa
+packaged_version=3.19.3
+release_date=19/12/18
+same_as_version=19
+
+
+# ****************************************
+
[linpus]
index=25
@@ -11460,8 +11806,8 @@ package_mgrs=pacman,yaourt #package_mgr_cmd=sudo pacman -S --force --noconfirm $packages_to_install
pre_depend_cmd=sudo pacman -Sy
post_depend_cmd=
-#scanjet_depend_cmd=sudo pacman -Sy --force --noconfirm python2-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pacman -Sy --force --noconfirm zbar,sudo pip2 install pypdfocr,sudo pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo pacman -Sy --force --noconfirm llvm,sudo pacman -Sy --force --noconfirm llvm-libs,sudo pacman -Sy --force --noconfirm python-pip,sudo easy_install pip==18.0,sudo pip install Pillow,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image
+#scanjet_depend_cmd=sudo pacman -Sy --force --noconfirm python2-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pacman -Sy --force --noconfirm zbar,sudo pip2 install pypdfocr,sudo pip2 install scikit-image,sudo pip2 install scipy
+#scanjet_py3_depend_cmd=sudo pacman -Sy --force --noconfirm llvm,sudo pacman -Sy --force --noconfirm llvm-libs,sudo pacman -Sy --force --noconfirm python-pip,sudo easy_install pip==18.0,sudo pip install Pillow,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
hplip_remove_cmd=sudo pacman -Rs --noconfirm hplip
su_sudo=
ppd_install=ppd
@@ -11494,10 +11840,10 @@ ui_toolkit=qt5 native_cups=1
acl_rules=1
package_mgr_cmd=sudo pacman -S --force --noconfirm $packages_to_install
-#scanjet_depend_cmd=sudo pacman -Sy --force --noconfirm python2-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-*,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pip2 install pypdfocr,sudo pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo pacman -Sy --force --noconfirm python3-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-*,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image
-scanjet_depend_cmd=sudo pacman -Sy --force --noconfirm python2-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pacman -Sy --force --noconfirm zbar,sudo pip2 install pypdfocr,sudo pip2 install scikit-image
-scanjet_py3_depend_cmd=sudo pacman -Sy --force --noconfirm llvm,sudo pacman -Sy --force --noconfirm llvm-libs,sudo pacman -Sy --force --noconfirm python-pip,sudo easy_install pip==18.0,sudo pip install Pillow,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image
+#scanjet_depend_cmd=sudo pacman -Sy --force --noconfirm python2-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-*,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pip2 install pypdfocr,sudo pip2 install scikit-image,sudo pip2 install scipy
+#scanjet_py3_depend_cmd=sudo pacman -Sy --force --noconfirm python3-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-*,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
+scanjet_depend_cmd=sudo pacman -Sy --force --noconfirm python2-pip,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pacman -Sy --force --noconfirm zbar,sudo pip2 install pypdfocr,sudo pip2 install scikit-image,sudo pip2 install scipy
+scanjet_py3_depend_cmd=sudo pacman -Sy --force --noconfirm llvm,sudo pacman -Sy --force --noconfirm llvm-libs,sudo pacman -Sy --force --noconfirm python-pip,sudo easy_install pip==18.0,sudo pip install Pillow,sudo pacman -Sy --force --noconfirm tesseract,sudo pacman -Sy --force --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --force --noconfirm tesseract-data-eng,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
libdir_path=/usr/lib
[manjarolinux:17.1.4:cups]
@@ -11675,10 +12021,10 @@ ui_toolkit=qt5 native_cups=1
acl_rules=1
package_mgr_cmd=sudo pacman -S --noconfirm $packages_to_install
-#scanjet_depend_cmd=sudo pacman -Sy --noconfirm python2-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-*,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pip2 install pypdfocr,sudo pip2 install scikit-image
-#scanjet_py3_depend_cmd=sudo pacman -Sy --noconfirm python3-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-*,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image
-scanjet_depend_cmd=sudo pacman -Sy --noconfirm python2-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-eng,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pacman -Sy --noconfirm zbar,sudo pip2 install pypdfocr,sudo pip2 install scikit-image
-scanjet_py3_depend_cmd=sudo pacman -Sy --noconfirm llvm,sudo pacman -Sy --noconfirm llvm-libs,sudo pacman -Sy --noconfirm python-pip,sudo easy_install pip==18.0,sudo pip install Pillow,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-eng,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image
+#scanjet_depend_cmd=sudo pacman -Sy --noconfirm python2-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-*,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pip2 install pypdfocr,sudo pip2 install scikit-image,sudo pip2 install scipy
+#scanjet_py3_depend_cmd=sudo pacman -Sy --noconfirm python3-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-*,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
+scanjet_depend_cmd=sudo pacman -Sy --noconfirm python2-pip,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip2 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-eng,sudo pip2 install opencv-python,sudo pip2 install PyPDF2,sudo pip2 install imutils,sudo pacman -Sy --noconfirm zbar,sudo pip2 install pypdfocr,sudo pip2 install scikit-image,sudo pip2 install scipy
+scanjet_py3_depend_cmd=sudo pacman -Sy --noconfirm llvm,sudo pacman -Sy --noconfirm llvm-libs,sudo pacman -Sy --noconfirm python-pip,sudo easy_install pip==18.0,sudo pip install Pillow,sudo pacman -Sy --noconfirm tesseract,sudo pacman -Sy --noconfirm leptonica,sudo pip3 install tesserocr,sudo pacman -Sy --noconfirm tesseract-data-eng,sudo pip3 install opencv-python,sudo pip3 install PyPDF2,sudo pip3 install imutils,sudo pip3 install ocrmypdf,sudo pip3 install scikit-image,sudo pip3 install scipy
libdir_path=/usr/lib
[manjarolinux:18.0:cups]
diff --git a/installer/text_install.py b/installer/text_install.py index 33fb383e1..533829826 100755 --- a/installer/text_install.py +++ b/installer/text_install.py @@ -1267,6 +1267,13 @@ def start(language, auto=True, test_depends=False, if os_utils.execute(cmd1) != 0: log.warning("Missing ghost script dependency,installation may fail") + if core.distro_name.lower() == 'fedora' and core.distro_version >= '30': + cmd_fedora = 'sudo dnf -y -d 10 -e 1 install dbus-devel' + status, output = utils.run(cmd_fedora, core.passwordObj) + if status != 0: + log.error("Install command failed with error code %d" % status) + sys.exit(1) + # # DEPENDENCIES RE-CHECK # diff --git a/locatedriver b/locatedriver Binary files differdeleted file mode 100755 index b8c9d3c8f..000000000 --- a/locatedriver +++ /dev/null diff --git a/ppd/classppd/hpcups/hp-Ampere.ppd.gz b/ppd/classppd/hpcups/hp-Ampere.ppd.gz Binary files differnew file mode 100644 index 000000000..86d08a4e6 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Ampere.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CLE.ppd.gz b/ppd/classppd/hpcups/hp-CLE.ppd.gz Binary files differnew file mode 100644 index 000000000..c6838068a --- /dev/null +++ b/ppd/classppd/hpcups/hp-CLE.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CLE17.ppd.gz b/ppd/classppd/hpcups/hp-CLE17.ppd.gz Binary files differnew file mode 100644 index 000000000..89f2ba618 --- /dev/null +++ b/ppd/classppd/hpcups/hp-CLE17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Copperhead.ppd.gz b/ppd/classppd/hpcups/hp-Copperhead.ppd.gz Binary files differnew file mode 100644 index 000000000..18e791784 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Copperhead.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz b/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz Binary files differnew file mode 100644 index 000000000..51974387c --- /dev/null +++ b/ppd/classppd/hpcups/hp-Copperhead12.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz Binary files differnew file mode 100644 index 000000000..a13395bd3 --- /dev/null +++ b/ppd/classppd/hpcups/hp-CopperheadIPH.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz Binary files differnew file mode 100644 index 000000000..a240debe7 --- /dev/null +++ b/ppd/classppd/hpcups/hp-CopperheadIPH15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz Binary files differnew file mode 100644 index 000000000..9d4658a22 --- /dev/null +++ b/ppd/classppd/hpcups/hp-CopperheadIPH17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz b/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz Binary files differnew file mode 100644 index 000000000..5c4266349 --- /dev/null +++ b/ppd/classppd/hpcups/hp-CopperheadXLP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Corbett.ppd.gz b/ppd/classppd/hpcups/hp-Corbett.ppd.gz Binary files differnew file mode 100644 index 000000000..453a45bf9 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Corbett.ppd.gz diff --git a/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz b/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz Binary files differnew file mode 100644 index 000000000..2dd4b65b6 --- /dev/null +++ b/ppd/classppd/hpcups/hp-DJ55xx.ppd.gz diff --git a/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz b/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz Binary files differnew file mode 100644 index 000000000..fb6e8b726 --- /dev/null +++ b/ppd/classppd/hpcups/hp-DJ9xxVIP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz b/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz Binary files differnew file mode 100644 index 000000000..05ded56c3 --- /dev/null +++ b/ppd/classppd/hpcups/hp-DJGenericVIP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Gemstone.ppd.gz b/ppd/classppd/hpcups/hp-Gemstone.ppd.gz Binary files differnew file mode 100644 index 000000000..5b156ce5a --- /dev/null +++ b/ppd/classppd/hpcups/hp-Gemstone.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Kapan.ppd.gz b/ppd/classppd/hpcups/hp-Kapan.ppd.gz Binary files differnew file mode 100644 index 000000000..ca369d46c --- /dev/null +++ b/ppd/classppd/hpcups/hp-Kapan.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz Binary files differindex 728072857..5f2b3fa5b 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class1.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz Binary files differindex 17b400c22..d2f5c0dcb 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class2.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz Binary files differindex 232a0b3e6..b851740cf 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class3.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz Binary files differindex 71e0cc848..7fcf3f2de 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class4.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz Binary files differindex 2363ff79d..e3886cb16 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz Binary files differindex 963c2dace..76031ad5f 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class5.ppd.gz diff --git a/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz b/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz Binary files differindex ea34e226f..eb3aca5d6 100644 --- a/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz +++ b/ppd/classppd/hpcups/hp-LJ-Class6.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Mimas.ppd.gz b/ppd/classppd/hpcups/hp-Mimas.ppd.gz Binary files differnew file mode 100644 index 000000000..8b8b3c632 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Mimas.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Mimas15.ppd.gz b/ppd/classppd/hpcups/hp-Mimas15.ppd.gz Binary files differnew file mode 100644 index 000000000..71d524644 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Mimas15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Mimas17.ppd.gz b/ppd/classppd/hpcups/hp-Mimas17.ppd.gz Binary files differnew file mode 100644 index 000000000..675c86f52 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Mimas17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz b/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz Binary files differnew file mode 100644 index 000000000..296eafd62 --- /dev/null +++ b/ppd/classppd/hpcups/hp-MimasTDR.ppd.gz diff --git a/ppd/classppd/hpcups/hp-OJ7000.ppd.gz b/ppd/classppd/hpcups/hp-OJ7000.ppd.gz Binary files differnew file mode 100644 index 000000000..148168195 --- /dev/null +++ b/ppd/classppd/hpcups/hp-OJ7000.ppd.gz diff --git a/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz b/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz Binary files differnew file mode 100644 index 000000000..990112fdf --- /dev/null +++ b/ppd/classppd/hpcups/hp-OJProKx50.ppd.gz diff --git a/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz b/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz Binary files differnew file mode 100644 index 000000000..061dde384 --- /dev/null +++ b/ppd/classppd/hpcups/hp-P15_CISS.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL3-Class1.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class1.ppd.gz Binary files differdeleted file mode 100644 index f1a8b5b26..000000000 --- a/ppd/classppd/hpcups/hp-PCL3-Class1.ppd.gz +++ /dev/null diff --git a/ppd/classppd/hpcups/hp-PCL3-Class1A.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class1A.ppd.gz Binary files differdeleted file mode 100644 index 5b404a736..000000000 --- a/ppd/classppd/hpcups/hp-PCL3-Class1A.ppd.gz +++ /dev/null diff --git a/ppd/classppd/hpcups/hp-PCL3-Class1B.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class1B.ppd.gz Binary files differdeleted file mode 100644 index 429508867..000000000 --- a/ppd/classppd/hpcups/hp-PCL3-Class1B.ppd.gz +++ /dev/null diff --git a/ppd/classppd/hpcups/hp-PCL3-Class2.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class2.ppd.gz Binary files differdeleted file mode 100644 index 383ff6bc9..000000000 --- a/ppd/classppd/hpcups/hp-PCL3-Class2.ppd.gz +++ /dev/null diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz Binary files differindex f75a3011b..dae652b9a 100644 --- a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz Binary files differindex 8da297bb7..3bc2aa1e0 100644 --- a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz Binary files differindex 0f36d4686..63f1c6383 100644 --- a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz Binary files differindex e9b932326..bf97bf959 100644 --- a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz b/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz Binary files differindex 44526241a..10b0c034e 100644 --- a/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCLM_COLOR.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz b/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz Binary files differindex 35b026142..e1c55f7da 100644 --- a/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz +++ b/ppd/classppd/hpcups/hp-PCLM_MONO.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PSP100.ppd.gz b/ppd/classppd/hpcups/hp-PSP100.ppd.gz Binary files differnew file mode 100644 index 000000000..30571ad1c --- /dev/null +++ b/ppd/classppd/hpcups/hp-PSP100.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PSP470.ppd.gz b/ppd/classppd/hpcups/hp-PSP470.ppd.gz Binary files differnew file mode 100644 index 000000000..8e7d55fe3 --- /dev/null +++ b/ppd/classppd/hpcups/hp-PSP470.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Pyramid.ppd.gz b/ppd/classppd/hpcups/hp-Pyramid.ppd.gz Binary files differnew file mode 100644 index 000000000..0c88f38b0 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Pyramid.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz b/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz Binary files differnew file mode 100644 index 000000000..9587efb3f --- /dev/null +++ b/ppd/classppd/hpcups/hp-Pyramid15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz b/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz Binary files differnew file mode 100644 index 000000000..eeb744f01 --- /dev/null +++ b/ppd/classppd/hpcups/hp-PyramidPlus.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz b/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz Binary files differnew file mode 100644 index 000000000..f84670dff --- /dev/null +++ b/ppd/classppd/hpcups/hp-PyramidRefresh15.ppd.gz diff --git a/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz b/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz Binary files differnew file mode 100644 index 000000000..9b1f7de50 --- /dev/null +++ b/ppd/classppd/hpcups/hp-PyramidRefresh17.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Python.ppd.gz b/ppd/classppd/hpcups/hp-Python.ppd.gz Binary files differnew file mode 100644 index 000000000..e7ea1309b --- /dev/null +++ b/ppd/classppd/hpcups/hp-Python.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Python10.ppd.gz b/ppd/classppd/hpcups/hp-Python10.ppd.gz Binary files differnew file mode 100644 index 000000000..33d07be2a --- /dev/null +++ b/ppd/classppd/hpcups/hp-Python10.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Python11.ppd.gz b/ppd/classppd/hpcups/hp-Python11.ppd.gz Binary files differnew file mode 100644 index 000000000..e96ac7f29 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Python11.ppd.gz diff --git a/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz b/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz Binary files differnew file mode 100644 index 000000000..869996fa4 --- /dev/null +++ b/ppd/classppd/hpcups/hp-SPDOfficejetProAsize.ppd.gz diff --git a/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz b/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz Binary files differnew file mode 100644 index 000000000..9d8c39cec --- /dev/null +++ b/ppd/classppd/hpcups/hp-SPDOfficejetProBsize.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Saipan.ppd.gz b/ppd/classppd/hpcups/hp-Saipan.ppd.gz Binary files differnew file mode 100644 index 000000000..2744fa136 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Saipan.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz b/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz Binary files differnew file mode 100644 index 000000000..278281251 --- /dev/null +++ b/ppd/classppd/hpcups/hp-Saipan15B.ppd.gz diff --git a/ppd/classppd/hpcups/hp-Stabler.ppd.gz b/ppd/classppd/hpcups/hp-Stabler.ppd.gz Binary files differnew file mode 100644 index 000000000..dd093d40b --- /dev/null +++ b/ppd/classppd/hpcups/hp-Stabler.ppd.gz diff --git a/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz b/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz Binary files differnew file mode 100644 index 000000000..a332f21bf --- /dev/null +++ b/ppd/classppd/hpcups/hp-StingrayOJ.ppd.gz diff --git a/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz b/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz Binary files differnew file mode 100644 index 000000000..51d296181 --- /dev/null +++ b/ppd/classppd/hpcups/hp-ViperMinusVIP.ppd.gz diff --git a/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz b/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz Binary files differnew file mode 100644 index 000000000..0d9352493 --- /dev/null +++ b/ppd/classppd/hpcups/hp-ViperPlusVIP.ppd.gz diff --git a/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz b/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz Binary files differindex 48a1918f9..84bef94dc 100644 --- a/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz +++ b/ppd/classppd/ps/hp-postscript-inkjet.ppd.gz diff --git a/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz b/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz Binary files differindex d96305fef..31efb93a1 100644 --- a/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz +++ b/ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz diff --git a/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz b/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz Binary files differindex eb3a23518..3292a309d 100644 --- a/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz +++ b/ppd/classppd/ps/hp-postscript-laserjet.ppd.gz diff --git a/ppd/hpcups/apollo-2100.ppd.gz b/ppd/hpcups/apollo-2100.ppd.gz Binary files differindex 3efce88a3..0dc4a8dc3 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 559d4bdd0..c9f86a9b8 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 f8dfa75cf..caad91322 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 1ac528479..353439868 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 07e48b0af..87095ec74 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 e5e6561db..c71ebd382 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 a22f312ec..87d055eb3 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 7ffbbe8dc..b67c8079a 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 e782c66d2..668998530 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 8976d474b..0a52dc33b 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 ab68edf96..dd5c7760e 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 c6e36acf3..35511daa4 100644 --- a/ppd/hpcups/hp-915.ppd.gz +++ b/ppd/hpcups/hp-915.ppd.gz diff --git a/ppd/hpcups/hp-amp.ppd.gz b/ppd/hpcups/hp-amp.ppd.gz Binary files differindex d4518869e..ea94bcd58 100644 --- a/ppd/hpcups/hp-amp.ppd.gz +++ b/ppd/hpcups/hp-amp.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 4c23f939a..403da8367 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 e865c3bcb..c2407ab67 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 261b47d70..0cb21baaa 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 e34aba1ce..efc56b94f 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 ee77902fe..0f36ade71 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 38e86bd25..bdaad2335 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 29e28d41c..2cc35609a 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 659dbdc4d..8e24cf1ea 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 8c1096859..82f2dbf38 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 9228d7ed0..4c4f249b5 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 1b33d8aac..d43c6490d 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_printer_cp1700.ppd.gz b/ppd/hpcups/hp-color_inkjet_printer_cp1700.ppd.gz Binary files differindex bdc171622..c885f656f 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 31d219972..6687e1c41 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_series.ppd.gz b/ppd/hpcups/hp-color_laserjet_2500_series.ppd.gz Binary files differindex 1f7a7a69b..3b7399b14 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 f436ef1ca..20414da0a 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 5ccda3ca6..d6a69e07f 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 482ed1e47..96545cd1b 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 598b7cd8e..fff4d705b 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 0646abe5a..e66c210d9 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 7f6d462cc..71f9a77cd 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 a75ae81ca..d2eae9366 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 b966f7845..11f3a48fe 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 87d22fcf7..66a1fb929 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 04d7e9029..62590c0c1 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 491abad9c..c3a65fd2e 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 d366e6534..9b7e87fe1 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 6ff6b5e6e..03a5acd2c 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_4610-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_4610-pcl3.ppd.gz Binary files differindex f02f08c6b..542b2c3ae 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 1521cfdc4..d965435fd 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 2c2c33a5b..4ec9cd1ec 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 9658ac02a..d47ebe860 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 d185afa31..19970c40a 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 ae790ca79..174579af2 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 72db4e565..ac44922d9 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 7b0e5c118..a283f0f28 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 38ff22b11..96cf380df 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 35c53a08e..a932fb669 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 359c789e9..9f429b3a6 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_cm1312_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz Binary files differindex 1fb8ff3ce..6e5c05652 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 1f5d4e55b..bb297819d 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 c4b76e550..a2fc5454b 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 84a1e9f08..295394780 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 45ee7799c..4f21b59de 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 1de5cfb6e..e5c84636a 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 550bd70c8..fede62a6a 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 2ad8820ee..c3f9b3e1b 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 6dc24a5ce..e321ed488 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 b7c72d484..57302c247 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 33520a96b..3f2a2499d 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 829e82ad6..33407677b 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 0ca3ca47b..000911b5e 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_cp1217.ppd.gz b/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz Binary files differindex 26d631171..2a90b2b46 100644 --- a/ppd/hpcups/hp-color_laserjet_cp1217.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_cp1217.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 568820caf..2a6279ace 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 efa649711..ee4e7002c 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 0763d7cc5..e03f4d0a3 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 dd93445f2..7bc229dc6 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 b25bd7a28..7bf888006 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 d5c66418d..19dae7349 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 7473d9ebf..33408120a 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 d5a2f7dc0..511fd2f71 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 ded99abd7..24ea24702 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 07dfdfb65..f2122187f 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 83a56a0fc..d31aeb161 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 569df8a40..d86aa9621 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 6f4cb33bd..d7438a1b5 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 b16f05a25..73f9d2ac6 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 04169281e..7ef0d3fe1 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 7b575c6b6..e044ed9a2 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 2d77798d2..81d4cd9b1 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-color_laserjet_pro_mfp_m176n.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz Binary files differindex 06a9b05be..eb7436964 100644 --- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m176n.ppd.gz diff --git a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz Binary files differindex e88e97e5f..f23ab8103 100644 --- a/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz +++ b/ppd/hpcups/hp-color_laserjet_pro_mfp_m177fw.ppd.gz diff --git a/ppd/hpcups/hp-cp1160.ppd.gz b/ppd/hpcups/hp-cp1160.ppd.gz Binary files differindex 56a30bf66..c0351be27 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 2361d0fe6..dada98d48 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_1010_series.ppd.gz b/ppd/hpcups/hp-deskjet_1010_series.ppd.gz Binary files differindex ec1289e5b..02707e0ac 100644 --- a/ppd/hpcups/hp-deskjet_1010_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1010_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 c544e2471..67efe9121 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 1d1940c0b..bcfbbd98b 100644 --- a/ppd/hpcups/hp-deskjet_1100.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1100.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1110_series.ppd.gz b/ppd/hpcups/hp-deskjet_1110_series.ppd.gz Binary files differindex 3e571eb98..598649af4 100644 --- a/ppd/hpcups/hp-deskjet_1110_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1110_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1120.ppd.gz b/ppd/hpcups/hp-deskjet_1120.ppd.gz Binary files differindex ac8dba5e6..3ff59abe8 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 94ba51db6..1b959a4ee 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 ef2f4577f..cab077637 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 8a5ba4635..1b3df1bda 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 72277c194..a4f43244b 100644 --- a/ppd/hpcups/hp-deskjet_1280.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1280.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz Binary files differindex 9c9115113..6d37f5fc7 100644 --- a/ppd/hpcups/hp-deskjet_1510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_1510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_1600c.ppd.gz b/ppd/hpcups/hp-deskjet_1600c.ppd.gz Binary files differindex 6374f6489..f9810fb02 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 22f08b55a..d5c923e96 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 9b4d6acbc..9a1cab8a0 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 92a3db698..5100e9ce5 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_2020_series.ppd.gz b/ppd/hpcups/hp-deskjet_2020_series.ppd.gz Binary files differindex 4ea992bb1..fffdb48d3 100644 --- a/ppd/hpcups/hp-deskjet_2020_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2020_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 e89235e0a..a7c9f3f84 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_2130_series.ppd.gz b/ppd/hpcups/hp-deskjet_2130_series.ppd.gz Binary files differindex 222e655a3..2eed66e1c 100644 --- a/ppd/hpcups/hp-deskjet_2130_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2130_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2200_series.ppd.gz b/ppd/hpcups/hp-deskjet_2200_series.ppd.gz Binary files differindex ffb1f667b..1f2e64ed0 100644 --- a/ppd/hpcups/hp-deskjet_2200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz Binary files differindex 00e2348a9..f22d63bff 100644 --- a/ppd/hpcups/hp-deskjet_2510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz Binary files differindex 8270fbc31..aff5fdb2f 100644 --- a/ppd/hpcups/hp-deskjet_2520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz Binary files differindex 2017b241d..763885c57 100644 --- a/ppd/hpcups/hp-deskjet_2540_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2540_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2600_series.ppd.gz b/ppd/hpcups/hp-deskjet_2600_series.ppd.gz Binary files differindex 25b0f8200..e64da87b2 100644 --- a/ppd/hpcups/hp-deskjet_2600_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2600_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz b/ppd/hpcups/hp-deskjet_2640_series.ppd.gz Binary files differindex f22da7622..1c02b227a 100644 --- a/ppd/hpcups/hp-deskjet_2640_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_2640_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 e8812d7ba..c63c89c09 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 120aa78f4..369c8e030 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 9cfec7305..f5ea3b4b2 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 bec8a3aca..68b7aaec5 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 aab930149..d78da884d 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 115293979..ada527267 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 809a4e57b..01801f326 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 f7eac0522..ae683e1fe 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 29f2fb9c3..64e2eae45 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 915c765f4..acfbde326 100644 --- a/ppd/hpcups/hp-deskjet_3500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz Binary files differindex 5153232da..4b00bc124 100644 --- a/ppd/hpcups/hp-deskjet_3510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz Binary files differindex a5df04e65..5427b9b45 100644 --- a/ppd/hpcups/hp-deskjet_3520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz Binary files differindex 35cdbcc10..2702d1bdc 100644 --- a/ppd/hpcups/hp-deskjet_3540_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3540_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3550.ppd.gz b/ppd/hpcups/hp-deskjet_3550.ppd.gz Binary files differindex 2be4eabdf..2e20fa858 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 38ba5de4e..5dedc564c 100644 --- a/ppd/hpcups/hp-deskjet_3600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3630_series.ppd.gz b/ppd/hpcups/hp-deskjet_3630_series.ppd.gz Binary files differindex b951e1cc5..983db8eb4 100644 --- a/ppd/hpcups/hp-deskjet_3630_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3630_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3650.ppd.gz b/ppd/hpcups/hp-deskjet_3650.ppd.gz Binary files differindex 791afc307..6bace0cfb 100644 --- a/ppd/hpcups/hp-deskjet_3650.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3650.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3700_series.ppd.gz b/ppd/hpcups/hp-deskjet_3700_series.ppd.gz Binary files differindex a144c457c..da7172922 100644 --- a/ppd/hpcups/hp-deskjet_3700_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3700_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3740.ppd.gz b/ppd/hpcups/hp-deskjet_3740.ppd.gz Binary files differindex 75b90b523..37d2d31fe 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 7f5f49f20..0f064e3e6 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 e95884f5b..ddf837f3c 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 c2f19ed16..a1d1cd1a1 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 ef914be50..a148fa677 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 a6d8cf100..01b2b1dc6 100644 --- a/ppd/hpcups/hp-deskjet_3822.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3822.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3830_series.ppd.gz b/ppd/hpcups/hp-deskjet_3830_series.ppd.gz Binary files differindex 11db30422..315b9823c 100644 --- a/ppd/hpcups/hp-deskjet_3830_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_3830_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_3840.ppd.gz b/ppd/hpcups/hp-deskjet_3840.ppd.gz Binary files differindex 3f5dcc167..a0c3c2038 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 eeab08d19..bed0bece2 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 4babecbfc..eddcf462b 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 a39415618..fdd1c29d9 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 5c075da68..fcf21affa 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 0ea5ddedb..2a2840002 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 e87316af7..322625580 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 a64d883d0..1fdf2228c 100644 --- a/ppd/hpcups/hp-deskjet_400l.ppd.gz +++ b/ppd/hpcups/hp-deskjet_400l.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz Binary files differindex 7a5ed6343..02e0434ee 100644 --- a/ppd/hpcups/hp-deskjet_4510_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4510_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4530_series.ppd.gz b/ppd/hpcups/hp-deskjet_4530_series.ppd.gz Binary files differindex 337609e18..0a8708dbb 100644 --- a/ppd/hpcups/hp-deskjet_4530_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4530_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_460.ppd.gz b/ppd/hpcups/hp-deskjet_460.ppd.gz Binary files differindex 36e1de1ac..ad42c3ec1 100644 --- a/ppd/hpcups/hp-deskjet_460.ppd.gz +++ b/ppd/hpcups/hp-deskjet_460.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz Binary files differindex b3df0dc6d..17711065d 100644 --- a/ppd/hpcups/hp-deskjet_4610_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4610_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz Binary files differindex 4f4d82c79..9add18e7b 100644 --- a/ppd/hpcups/hp-deskjet_4620_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4620_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4640_series.ppd.gz b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz Binary files differindex cee61b2a7..cfbe66a8e 100644 --- a/ppd/hpcups/hp-deskjet_4640_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4670_series.ppd.gz b/ppd/hpcups/hp-deskjet_4670_series.ppd.gz Binary files differindex d3dcda1de..6828a5df3 100644 --- a/ppd/hpcups/hp-deskjet_4670_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4670_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_4720_series.ppd.gz b/ppd/hpcups/hp-deskjet_4720_series.ppd.gz Binary files differindex 5eab60720..2b8fba6cf 100644 --- a/ppd/hpcups/hp-deskjet_4720_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_4720_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500.ppd.gz b/ppd/hpcups/hp-deskjet_500.ppd.gz Binary files differindex 6cb9384c2..b86eb55ec 100644 --- a/ppd/hpcups/hp-deskjet_500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5000_series.ppd.gz b/ppd/hpcups/hp-deskjet_5000_series.ppd.gz Binary files differindex 5984573d2..83ec323bc 100644 --- a/ppd/hpcups/hp-deskjet_5000_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5000_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_500c.ppd.gz b/ppd/hpcups/hp-deskjet_500c.ppd.gz Binary files differindex 62822000a..a963e6ab1 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 90a820d82..73ac75e9b 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 8e8f6927c..2f7a7c237 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 d4d99af49..99f92ce29 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 86797d7c6..03cb3b0fb 100644 --- a/ppd/hpcups/hp-deskjet_520.ppd.gz +++ b/ppd/hpcups/hp-deskjet_520.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5200_series.ppd.gz b/ppd/hpcups/hp-deskjet_5200_series.ppd.gz Binary files differindex 53944afd7..ef78fcf68 100644 --- a/ppd/hpcups/hp-deskjet_5200_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5200_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_540.ppd.gz b/ppd/hpcups/hp-deskjet_540.ppd.gz Binary files differindex af46bd637..9bb21eb21 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 05563dc85..973ca67d6 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 6693f2dd1..6089fb2d8 100644 --- a/ppd/hpcups/hp-deskjet_550c.ppd.gz +++ b/ppd/hpcups/hp-deskjet_550c.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz Binary files differindex 9acb3db85..026ac4d7b 100644 --- a/ppd/hpcups/hp-deskjet_5520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5550.ppd.gz b/ppd/hpcups/hp-deskjet_5550.ppd.gz Binary files differindex cb44999ff..b68a7b998 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 214efe228..97ad7a895 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 16e5befc9..3ce860b26 100644 --- a/ppd/hpcups/hp-deskjet_5552.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5552.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5570_series.ppd.gz b/ppd/hpcups/hp-deskjet_5570_series.ppd.gz Binary files differindex 0b74f080c..0a027ebe3 100644 --- a/ppd/hpcups/hp-deskjet_5570_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5570_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5600.ppd.gz b/ppd/hpcups/hp-deskjet_5600.ppd.gz Binary files differindex 19dae578f..9dbaac039 100644 --- a/ppd/hpcups/hp-deskjet_5600.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5600.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5640_series.ppd.gz b/ppd/hpcups/hp-deskjet_5640_series.ppd.gz Binary files differindex c8147d1df..6d35df806 100644 --- a/ppd/hpcups/hp-deskjet_5640_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5640_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5650.ppd.gz b/ppd/hpcups/hp-deskjet_5650.ppd.gz Binary files differindex fae1ab060..685fbd2b5 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 8952e72d2..49445f26e 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 b27b3629a..8f2d519b5 100644 --- a/ppd/hpcups/hp-deskjet_5700.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5700.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5730_series.ppd.gz b/ppd/hpcups/hp-deskjet_5730_series.ppd.gz Binary files differindex 6497d6ad8..276e6444f 100644 --- a/ppd/hpcups/hp-deskjet_5730_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5730_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5800.ppd.gz b/ppd/hpcups/hp-deskjet_5800.ppd.gz Binary files differindex a3a5baf48..b32b989c1 100644 --- a/ppd/hpcups/hp-deskjet_5800.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5800.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5810_series.ppd.gz b/ppd/hpcups/hp-deskjet_5810_series.ppd.gz Binary files differindex 8530ef4ff..2ed04796b 100644 --- a/ppd/hpcups/hp-deskjet_5810_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5810_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5820_series.ppd.gz b/ppd/hpcups/hp-deskjet_5820_series.ppd.gz Binary files differindex 96c92c022..a83bc29ac 100644 --- a/ppd/hpcups/hp-deskjet_5820_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_5820_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_5850.ppd.gz b/ppd/hpcups/hp-deskjet_5850.ppd.gz Binary files differindex e72dd96c9..de4d1806f 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 5f1ca3607..804203eab 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 211ddc790..f91e9906f 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 487b99470..dee24d0c2 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 eacbadbb8..e1ef913bb 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 5016d1edc..03ae9e305 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 1d7273aef..82ab3b987 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 7a9fc256d..d0b12d325 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 433ab0dad..4962ccf69 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 41330f3c7..e927054fe 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 f4d1db673..f028620a5 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 f7eaf7e3d..d997518de 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 49b4e71c0..7070073cd 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 c517c0667..588792841 100644 --- a/ppd/hpcups/hp-deskjet_6500.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6500.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz Binary files differindex 3cceb4adc..151aaf295 100644 --- a/ppd/hpcups/hp-deskjet_6520_series.ppd.gz +++ b/ppd/hpcups/hp-deskjet_6520_series.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_656c.ppd.gz b/ppd/hpcups/hp-deskjet_656c.ppd.gz Binary files differindex 54c92341b..553110059 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 34e12d458..c8c1620aa 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 745f0a10d..cc6e519c9 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 3df44271b..11b3cf6c1 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 8d9532d0f..dfae7df08 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 5558db5c8..13b480abb 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 d5c677a97..82d988bbd 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 37efab3f4..daaa57e83 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 571176a1c..12f405aee 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 a2f5e9002..f515186fa 100644 --- a/ppd/hpcups/hp-deskjet_682.ppd.gz +++ b/ppd/hpcups/hp-deskjet_682.ppd.gz diff --git a/ppd/hpcups/hp-deskjet_690c.ppd.gz b/ppd/hpcups/hp-deskjet_690c.ppd.gz Binary files differindex 3fa06ad79..deb90b760 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 872939e30..0f8c8c403 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 537e9d4f8..e20edf807 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 fcc061f7c..d80dfdad7 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 01ca46798..96379c056 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 bf2fe7631..ff0b855e2 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 86dfa5999..00ae5cbde 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 1e18506de..00a3dc0e7 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 96bb92f70..8e13a3ae0 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 2830e2a0c..bb33f325f 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 88c50f221..c31ebd4d6 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 ca6f6a8bb..855643825 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 a6afab077..cdb38b991 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 7af3a2023..893e74b34 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 10f704050..4d87cccaf 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 eac388256..7e296cdd3 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 64c492825..35f4f2c56 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 41e781666..001f3cf18 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 8c62d16bf..0ea959dcb 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 3bbdd5c5d..3bbf6fcb9 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 a91b59330..45d474843 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 8dad416db..64e72df0d 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 40dceef3d..d82069909 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 369463b06..10da8c64a 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 3d41dc16e..b5dfa6c26 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 a921e7c85..6ef7f3489 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 aa45471f5..e4d7e7db1 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 b7c7d92c8..abb76abc8 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 4ef00acec..1aa0d1a26 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 34d521365..d4a3ed612 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 938caea55..144e33dd2 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 2b57a9f2f..cbe1e9cc5 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 243a6efd7..e55ac2b87 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 c04302bf8..b43717ca0 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 f2b73b2d0..63b89fb2e 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 587f2b290..d65b8b55f 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 5aa9c7c15..3c32e267b 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 af574176d..ea46210e2 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 f0c3dc4f9..2fa35cec8 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 fb5c23af7..620400f6f 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 ade195c23..718b92466 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 59746775b..86a438731 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 beb94705d..c31797331 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 c8ab5a0e7..ce81df315 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 559885441..8f4e7d9a8 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 79dee248f..b7e3255d7 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 c923052bf..2548225fa 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 940f44258..d99757545 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 c7024cbd4..b39f7d63e 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 72894fb32..c08d062b4 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 ff3b89309..9c1e51614 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 2d82e35e3..351424aea 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 9c9f37174..7652013c7 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 925854f9a..d4728a990 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 471a8005c..43a7c67a8 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 8ab2eb0c0..4a3091702 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 7e84b3794..5e031fc09 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 48cbb12d1..e1e2cc7ba 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 32699ea52..30e6bef3c 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 d03762c0b..9bdbefbbf 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 e4c391640..31f0e1467 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 62612c87e..7b8dcbf00 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 d64433de2..bd4919e39 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 2d2fc07a6..bcda2db08 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 45d37d0b0..f78915555 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 26d9661d7..178fd3488 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 23504e4e1..5caa5fab1 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 a37607ca4..ad08d038c 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 7fda37996..e2ca12d6e 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_f4400_series.ppd.gz b/ppd/hpcups/hp-deskjet_f4400_series.ppd.gz Binary files differindex 03688bbd4..394608116 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 a48e4d09d..e30db94c1 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 0645b85e2..6c6b927c8 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 7224b7c0b..4f2a608b5 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 5ae8791cc..757681c0d 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 34a833e31..45d257561 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 dad79ea93..86f3c6a27 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 7b44e6a1a..25dd9f3e1 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 7c18a58df..0f4c0f0c5 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 20ff722f5..a123cf624 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 592c4be24..8ba9d2a39 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-envy_120_series.ppd.gz b/ppd/hpcups/hp-envy_120_series.ppd.gz Binary files differindex 85b102fcc..e87fe5414 100644 --- a/ppd/hpcups/hp-envy_120_series.ppd.gz +++ b/ppd/hpcups/hp-envy_120_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_4500_series.ppd.gz b/ppd/hpcups/hp-envy_4500_series.ppd.gz Binary files differindex e8383ea96..3230c1eb1 100644 --- a/ppd/hpcups/hp-envy_4500_series.ppd.gz +++ b/ppd/hpcups/hp-envy_4500_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_4510_series.ppd.gz b/ppd/hpcups/hp-envy_4510_series.ppd.gz Binary files differindex 65cb5be7c..367a15bee 100644 --- a/ppd/hpcups/hp-envy_4510_series.ppd.gz +++ b/ppd/hpcups/hp-envy_4510_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_4520_series.ppd.gz b/ppd/hpcups/hp-envy_4520_series.ppd.gz Binary files differindex a11978c46..b9d1d7fd3 100644 --- a/ppd/hpcups/hp-envy_4520_series.ppd.gz +++ b/ppd/hpcups/hp-envy_4520_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5000_series.ppd.gz b/ppd/hpcups/hp-envy_5000_series.ppd.gz Binary files differindex b0f84d4da..b5a2cfb22 100644 --- a/ppd/hpcups/hp-envy_5000_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5000_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5530_series.ppd.gz b/ppd/hpcups/hp-envy_5530_series.ppd.gz Binary files differindex d39a6a09e..f470853ee 100644 --- a/ppd/hpcups/hp-envy_5530_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5530_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5540_series.ppd.gz b/ppd/hpcups/hp-envy_5540_series.ppd.gz Binary files differindex a3e5203e7..c709bedb1 100644 --- a/ppd/hpcups/hp-envy_5540_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5540_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5640_series.ppd.gz b/ppd/hpcups/hp-envy_5640_series.ppd.gz Binary files differindex 0a7f7d95e..6eced06ad 100644 --- a/ppd/hpcups/hp-envy_5640_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5640_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_5660_series.ppd.gz b/ppd/hpcups/hp-envy_5660_series.ppd.gz Binary files differindex cc9a0ad3e..2c641b8aa 100644 --- a/ppd/hpcups/hp-envy_5660_series.ppd.gz +++ b/ppd/hpcups/hp-envy_5660_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_7640_series.ppd.gz b/ppd/hpcups/hp-envy_7640_series.ppd.gz Binary files differindex 15de7f5c2..d4823efaa 100644 --- a/ppd/hpcups/hp-envy_7640_series.ppd.gz +++ b/ppd/hpcups/hp-envy_7640_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_8000_series.ppd.gz b/ppd/hpcups/hp-envy_8000_series.ppd.gz Binary files differindex f28eda055..0bdd0a283 100644 --- a/ppd/hpcups/hp-envy_8000_series.ppd.gz +++ b/ppd/hpcups/hp-envy_8000_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz b/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz Binary files differindex 948e97985..c5bbd28d2 100644 --- a/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz +++ b/ppd/hpcups/hp-envy_photo_6200_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz b/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz Binary files differindex 640a17fdc..6c663b9f9 100644 --- a/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz +++ b/ppd/hpcups/hp-envy_photo_7100_series.ppd.gz diff --git a/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz b/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz Binary files differindex 87ec6e518..cd5bd0f9d 100644 --- a/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz +++ b/ppd/hpcups/hp-envy_photo_7800_series.ppd.gz diff --git a/ppd/hpcups/hp-ink_tank_110_series.ppd.gz b/ppd/hpcups/hp-ink_tank_110_series.ppd.gz Binary files differindex d87ec4574..0466dc627 100644 --- a/ppd/hpcups/hp-ink_tank_110_series.ppd.gz +++ b/ppd/hpcups/hp-ink_tank_110_series.ppd.gz diff --git a/ppd/hpcups/hp-ink_tank_310_series.ppd.gz b/ppd/hpcups/hp-ink_tank_310_series.ppd.gz Binary files differindex 70ca67ff4..07bffe0dd 100644 --- a/ppd/hpcups/hp-ink_tank_310_series.ppd.gz +++ b/ppd/hpcups/hp-ink_tank_310_series.ppd.gz diff --git a/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz b/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz Binary files differindex 77fc7ccbc..576b2b8ea 100644 --- a/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz +++ b/ppd/hpcups/hp-ink_tank_wireless_410_series.ppd.gz diff --git a/ppd/hpcups/hp-laser_ns_1020.ppd.gz b/ppd/hpcups/hp-laser_ns_1020.ppd.gz Binary files differnew file mode 100644 index 000000000..4ea7c0be5 --- /dev/null +++ b/ppd/hpcups/hp-laser_ns_1020.ppd.gz diff --git a/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz b/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz Binary files differnew file mode 100644 index 000000000..795c27686 --- /dev/null +++ b/ppd/hpcups/hp-laser_ns_mfp_1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_1000.ppd.gz b/ppd/hpcups/hp-laserjet_1000.ppd.gz Binary files differindex ae8f340c7..384eea148 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 4812d2ff4..23c1920ea 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 dfc2244ee..d6dfe8e3b 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 a64667644..04bc4fc48 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 372bf447d..8ea428ab8 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 f2e8bd6d7..84a8c26d8 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 a60c50223..2c92a96ef 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 9cc79299e..cb9c0e9a6 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_1022n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022n-pcl3.ppd.gz Binary files differindex f5b7bcd87..7b6accfb4 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_1022nw-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_1022nw-pcl3.ppd.gz Binary files differindex 63fe5d48c..c524aa543 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_1100.ppd.gz b/ppd/hpcups/hp-laserjet_1100.ppd.gz Binary files differindex 116fd83e5..ec4ebd1e7 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 d2963f939..cdbca0ef3 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 955893051..cbd95c165 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 59a549f6d..8e7d65115 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_series.ppd.gz b/ppd/hpcups/hp-laserjet_1160_series.ppd.gz Binary files differindex 807e26f1a..9ecbe1298 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 fd256f03c..75e84dc75 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 65320efb0..4bd4305dd 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 6f7d75f7d..3af4ccc11 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 4f1e85def..a76fece8d 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 a99ad9a0d..d59d40752 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 e84451f73..8fd4ce909 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 315719674..ffea4ca87 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 f404cd50e..c37b9e21d 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 93ea4b993..3bae13334 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 7e4f8ca59..e88e3ee4e 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 50848890f..ed28546db 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 ef42b729a..0f0bcdc3e 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_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_2100_series-pcl3.ppd.gz Binary files differindex 06ee529de..4ac8be140 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_series.ppd.gz b/ppd/hpcups/hp-laserjet_2200_series.ppd.gz Binary files differindex 5f0649a1f..461d9a59d 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_series.ppd.gz b/ppd/hpcups/hp-laserjet_2300_series.ppd.gz Binary files differindex 6d938514c..2116991a8 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 997e0ee06..70f526d8d 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 f3e8277bb..469e83e52 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 459cb3fe8..ba44f8531 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 2587190c2..669651ce2 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 8289134ae..8c72e4b38 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 a8ec3c89c..666f306a8 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 c0461bc7a..74130f2ad 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 0e045e9f1..a3bb78fdb 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 336a3a4ff..367b96f69 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 273719399..7f29beafb 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 225311b68..7ad3a1d92 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 89a85ffda..1cbfc84ad 100644 --- a/ppd/hpcups/hp-laserjet_3200.ppd.gz +++ b/ppd/hpcups/hp-laserjet_3200.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 97712a9e6..036a617fe 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 7a406304b..6bd47d299 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 d9102f703..6ec14ada7 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 717c1f436..41414007a 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 099d585a3..91077b783 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 37d5d7f6e..1bc223c93 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 60ed71e98..166a501ef 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 3c021a08c..db8cfcec2 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 244d29af4..eb2e03770 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 f31f40d04..5be716e10 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 1369e21a4..03bc21cc7 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 ded0358ec..7d8a40fb6 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 ddc03bfbc..172c1859c 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 de96c624c..4a7555fe9 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 afdc6d419..1b697d6a8 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 2041b0ed0..65788f102 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 f79447703..b5dfccea8 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 f6d27a304..8dee249ce 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 6374a0391..96e87ac70 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 2bd075a5f..6b3138700 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 4514b4a75..6e9343312 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 0d65aad19..73ccabccf 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_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_5000_series-pcl3.ppd.gz Binary files differindex fc40a0593..d73881784 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 5ad9c9fa1..8a4acbad0 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 01ae74471..23beada80 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 3169d39ab..9d2f1650a 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 b581a6cf9..9ab408034 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 5dd3a1c71..d7ae28b63 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 9ddc9ac22..02bb5c277 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 fc31dc929..d75ac7804 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 b9ce00702..2a896b0da 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 1938ff52d..42d0da497 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 49af2996a..7262fa8b9 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 0785dfd9e..7e5de4bdb 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 471617f70..992c2fef3 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_series-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_8000_series-pcl3.ppd.gz Binary files differindex f4d6a84c5..f53f485d8 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 b5f49eb9a..4b98f44f8 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 831f6ca09..50a2647cd 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 b7c63af13..27a67f519 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 ea1e43ef3..54b2dc824 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 409d0f4a8..27e229426 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 46365a4a4..f30b0f0c1 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 0c24de6a6..b38c977d8 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 51332499e..f514c5a28 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 3d22c16c4..56f261c27 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 6a94df7bc..1b0d3a5cf 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 4c0ba1a36..b3241996f 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 8b6e8b554..bb3ac1093 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 413aa483e..2babfc406 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 582eae421..94c6c4cc0 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 47e79b8fa..6d5c50f24 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 227bddec8..ef6017e60 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 84c6c57ea..a64817b6e 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 d59aeedbd..af0e0d215 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 0d222dbcc..3a3e01138 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 41e43161e..db5a4f5f8 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_cp1025.ppd.gz b/ppd/hpcups/hp-laserjet_cp1025.ppd.gz Binary files differindex 02acd5630..67c2bd99f 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 b2fe808a2..d9e5482bc 100644 --- a/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m1005.ppd.gz b/ppd/hpcups/hp-laserjet_m1005.ppd.gz Binary files differindex abaf0e1b8..4461b8dbf 100644 --- a/ppd/hpcups/hp-laserjet_m1005.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m1005.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz b/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz Binary files differindex 0864c7108..7ec9035ef 100644 --- a/ppd/hpcups/hp-laserjet_m101-m106.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m101-m106.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 50d943ec6..00d88013e 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 265255b72..4fc59bc2e 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 648a95731..455226fa4 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_m14-m17.ppd.gz b/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz Binary files differindex fe45bb788..8f8c52a57 100644 --- a/ppd/hpcups/hp-laserjet_m14-m17.ppd.gz +++ b/ppd/hpcups/hp-laserjet_m14-m17.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 e83fe6311..662d71f78 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_m1537dnf_mfp-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz Binary files differindex 245ad61bd..ebc731469 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 686f7d970..e7c135c54 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 3869c3907..352e764fe 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 ec0c3c069..808e33bf5 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 a27f04783..4ba385aed 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 2a333e3fa..b4d4bbaa4 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 a7f99d080..4d618d9bf 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 d2a8a6d3d..7280ba8c4 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 0c4313e1f..0221597ec 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 efe1dc990..dfc96cb07 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 a7a7d3c32..ef14bfc78 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 c2eb3a367..76368d721 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 6e24a38a5..ee3ca450d 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 40135f618..d4134dd3c 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_mfp_m129-m134.ppd.gz b/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz Binary files differindex 1c18a9239..82f191b81 100644 --- a/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz +++ b/ppd/hpcups/hp-laserjet_mfp_m129-m134.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz b/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz Binary files differindex b0b858a01..2c4e90319 100644 --- a/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz +++ b/ppd/hpcups/hp-laserjet_mfp_m28-m31.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_p1005.ppd.gz b/ppd/hpcups/hp-laserjet_p1005.ppd.gz Binary files differindex 0d4050141..37f1779d5 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 bd8e3479c..cc62e40e3 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 f48f06981..c5fbd9cda 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 9b2f74e0b..7c2d37d6d 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 95f1e4fd3..6932ae100 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 178094dac..ac12662f8 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-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p1505n-zxs.ppd.gz Binary files differindex b7cc72bff..4f56fef86 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-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014-zxs.ppd.gz Binary files differindex 65fbe34b3..e0fca40a0 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-zxs.ppd.gz b/ppd/hpcups/hp-laserjet_p2014n-zxs.ppd.gz Binary files differindex 73afade8a..f600c58d7 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 dbef3c6fc..16ee25c6a 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 3275b0217..050821419 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 bd2a35d72..7f8e86586 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 d2dfa7e1f..f305787d7 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 921841de3..dc7426c16 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 e3edf4f35..3461aa16b 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_p2035n-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2035n-pcl3.ppd.gz Binary files differindex 2b693503c..d928254e0 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_p2055-pcl3.ppd.gz b/ppd/hpcups/hp-laserjet_p2055-pcl3.ppd.gz Binary files differindex 9e6daa8e5..5a0659290 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 136fa18bd..ce41d7916 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 4f2361197..fe6a613a0 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 2555790f0..d6d0a2ee8 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 d0a42e0e0..720ce45e3 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 83e4089a0..3a5557372 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 1dcc07c78..ebb0ecbfa 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 286348b41..86e189243 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 3816a0682..8b8fe88b2 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 86f7994b4..f5def7b40 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 7eee59a2a..7d35e63c6 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 36bbeb0ea..0d3da6ea1 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 3efa1a148..fe9c2c458 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 49b41b6e7..174460218 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 200b93576..a7da4db34 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 d7cd20b31..c0c4a35e2 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 d15dc9458..88127bd5d 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 b976c978f..f262d98f2 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 ba6736b44..fbc7a4467 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 fc4edcd26..ca951995b 100644 --- a/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz +++ b/ppd/hpcups/hp-laserjet_p4515xm.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz Binary files differindex 951d264f0..2935387f2 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz Binary files differindex 93dbd3a6f..5929e602a 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125nr.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz Binary files differindex 2c2861773..4bf91adda 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz Binary files differindex cc12b7b7a..134561f94 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125r.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz Binary files differindex 8b8f25ea3..cbe74abb3 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125rnw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz Binary files differindex 4c77a5475..d282a4cb9 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m125s.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz Binary files differindex 86f61847e..0e65e3c75 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz Binary files differindex fb2a25890..0401ef94b 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m126nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz Binary files differindex 2d13b3a17..38c899e24 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz Binary files differindex 9470c4c9f..c471c17b4 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz Binary files differindex 77591b2ff..b472b869a 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fs.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz Binary files differindex 062097b98..fd04b0ad0 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m127fw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz Binary files differindex 8e100e981..6a4856e7c 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz Binary files differindex ea3aad628..d06235c11 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz Binary files differindex 03a79eaf3..93fda43b7 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m128fw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz Binary files differindex 476bd4d8b..5ab01f2be 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m25a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz Binary files differindex fe5cb4122..b9f1c7f3c 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m25nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz Binary files differindex f18771522..621acbb8e 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m26a.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz Binary files differindex e881f90d9..4a5b4e362 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m26nw.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz Binary files differindex a2fe08bbd..95aebd3f2 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m27c.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz b/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz Binary files differindex 44f6d08b7..f129cbe6e 100644 --- a/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.ppd.gz +++ b/ppd/hpcups/hp-laserjet_pro_mfp_m27cnw.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 efd0c1fed..e1308d99f 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 744cc269f..a6de85534 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_m1137_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz Binary files differindex 70bf0c956..4e8095a6b 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1137_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz Binary files differindex 3ee158952..b4c910d40 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1138_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz Binary files differindex 480c0b0af..644e68f48 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1139_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1139_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 6123d6b97..716128430 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 7f36838ca..794783e5c 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 120de955b..e8734adc2 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 965b79115..b65dbb76c 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 3ee922d78..473d351c8 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_m1218nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz Binary files differindex acc624ad4..194d4a7e1 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1218nfg_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz Binary files differindex af7639081..37c599e39 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1218nfs_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1218nfs_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 0415e7167..b589b34f1 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_m1219nfg_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz Binary files differindex 4683eb7c4..b4eee1673 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nfg_mfp.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz b/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz Binary files differindex 8bd65810f..a0bff77be 100644 --- a/ppd/hpcups/hp-laserjet_professional_m1219nfs_mfp.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_m1219nfs_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 0bce3d5fa..9f8aad142 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_p1106.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz Binary files differindex 73c7b7087..3232c3216 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1106.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz Binary files differindex 1ae1935fd..8de0c2d4f 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1106w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz Binary files differindex 460b5c44f..4200a449d 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1107.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz Binary files differindex 1c579def0..cc4102ead 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1107w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz Binary files differindex 4a61f8796..2277a52e0 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1108.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz Binary files differindex bf0c4e508..5fc9dbe76 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1108w.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz Binary files differindex 61be8dffd..1d9186f09 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1109.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz Binary files differindex 26ad1fb2f..20334d970 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1109w.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1109w.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 06a295617..1d09d260d 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_p1567.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz Binary files differindex 37435da7a..090bf4e58 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1567.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz Binary files differindex 31a95daab..b15d8dc2c 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1568.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz Binary files differindex 5a2d0c67e..ed96a9a52 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1569.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1569.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 8a0473481..015415e31 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_p1607dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz Binary files differindex ed77459c1..cdc356701 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz Binary files differindex 8b5a5cd99..096006a2c 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz diff --git a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz b/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz Binary files differindex 7f23ff639..1cea835a5 100644 --- a/ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz +++ b/ppd/hpcups/hp-laserjet_professional_p1609dn.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 a6d042cb0..18c2d6e5d 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 22457cff4..4d7010667 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 24bde8dd9..050de7263 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-neverstop_laser_100x.ppd.gz b/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz Binary files differnew file mode 100644 index 000000000..b15b49faa --- /dev/null +++ b/ppd/hpcups/hp-neverstop_laser_100x.ppd.gz diff --git a/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz b/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz Binary files differnew file mode 100644 index 000000000..5afb310a4 --- /dev/null +++ b/ppd/hpcups/hp-neverstop_laser_mfp_120x.ppd.gz diff --git a/ppd/hpcups/hp-officejet.ppd.gz b/ppd/hpcups/hp-officejet.ppd.gz Binary files differindex 5ad3fca17..faa5e2d00 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 5ecdcb02a..35b0c468c 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_150_mobile_l511.ppd.gz b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz Binary files differindex e1f00136c..b64fe8ffc 100644 --- a/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz +++ b/ppd/hpcups/hp-officejet_150_mobile_l511.ppd.gz diff --git a/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz b/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz Binary files differindex 973fa8309..8d45935d6 100644 --- a/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_200_mobile_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz b/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz Binary files differindex 33eb27c55..e617f496c 100644 --- a/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_250_mobile_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_2620_series.ppd.gz b/ppd/hpcups/hp-officejet_2620_series.ppd.gz Binary files differindex 3e80c44d0..86575b1bc 100644 --- a/ppd/hpcups/hp-officejet_2620_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_2620_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_3830_series.ppd.gz b/ppd/hpcups/hp-officejet_3830_series.ppd.gz Binary files differindex b67f51d06..329098783 100644 --- a/ppd/hpcups/hp-officejet_3830_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_3830_series.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 33971732d..840be68bd 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 032d7c154..a26977549 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 d968732e6..fad071895 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 fd3c2c698..59a25b299 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 2d6c7dadc..7d1664d7b 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 d4fd3f29c..954b6ffa8 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 393202ad4..237dc7fe5 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 0f254b78f..561745248 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 5663965e9..c7546bd48 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 0d6e89d33..ee3a978f9 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 35b14d7be..3191e9f8a 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 dda749bce..92864cb9c 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_4610_series.ppd.gz b/ppd/hpcups/hp-officejet_4610_series.ppd.gz Binary files differindex d9f5cb73f..b7a048e33 100644 --- a/ppd/hpcups/hp-officejet_4610_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4610_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4620_series.ppd.gz b/ppd/hpcups/hp-officejet_4620_series.ppd.gz Binary files differindex d6f125ffb..f4cae0d41 100644 --- a/ppd/hpcups/hp-officejet_4620_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4620_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4630_series.ppd.gz b/ppd/hpcups/hp-officejet_4630_series.ppd.gz Binary files differindex 09d0be04d..59b4e929e 100644 --- a/ppd/hpcups/hp-officejet_4630_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4630_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_4650_series.ppd.gz b/ppd/hpcups/hp-officejet_4650_series.ppd.gz Binary files differindex 3b640965d..701243df0 100644 --- a/ppd/hpcups/hp-officejet_4650_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_4650_series.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 cc218d901..9e463f77e 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_5200_series.ppd.gz b/ppd/hpcups/hp-officejet_5200_series.ppd.gz Binary files differindex 519b4f47e..56bf5c5b5 100644 --- a/ppd/hpcups/hp-officejet_5200_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5200_series.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 770946868..6e3a08fd2 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 285690df5..bb8b01f52 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_5740_series.ppd.gz b/ppd/hpcups/hp-officejet_5740_series.ppd.gz Binary files differindex 401459199..be6a361c6 100644 --- a/ppd/hpcups/hp-officejet_5740_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_5740_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 4bdb07f9f..e540d7b81 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 5904ac02b..dabf952b7 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.ppd.gz b/ppd/hpcups/hp-officejet_6100.ppd.gz Binary files differindex 489861104..a8e9a0a9e 100644 --- a/ppd/hpcups/hp-officejet_6100.ppd.gz +++ b/ppd/hpcups/hp-officejet_6100.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 52c6f4362..432762ee1 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 4a45fa12a..02c58c528 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 d322de3c5..04fc3cd36 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 b1cc4fdba..abf7abb40 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 6636b98b1..bfc5c96f6 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 bd02c916b..8e6b02fc2 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 ee73edb23..3d0716ff5 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 097215d39..26164196f 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_6600.ppd.gz b/ppd/hpcups/hp-officejet_6600.ppd.gz Binary files differindex a650ca7e2..cec771c16 100644 --- a/ppd/hpcups/hp-officejet_6600.ppd.gz +++ b/ppd/hpcups/hp-officejet_6600.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6700.ppd.gz b/ppd/hpcups/hp-officejet_6700.ppd.gz Binary files differindex 103732b2f..7d193a76b 100644 --- a/ppd/hpcups/hp-officejet_6700.ppd.gz +++ b/ppd/hpcups/hp-officejet_6700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6800.ppd.gz b/ppd/hpcups/hp-officejet_6800.ppd.gz Binary files differindex f9c37310f..a780fffe7 100644 --- a/ppd/hpcups/hp-officejet_6800.ppd.gz +++ b/ppd/hpcups/hp-officejet_6800.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6950.ppd.gz b/ppd/hpcups/hp-officejet_6950.ppd.gz Binary files differindex 19226c84b..6bdcad39f 100644 --- a/ppd/hpcups/hp-officejet_6950.ppd.gz +++ b/ppd/hpcups/hp-officejet_6950.ppd.gz diff --git a/ppd/hpcups/hp-officejet_6960.ppd.gz b/ppd/hpcups/hp-officejet_6960.ppd.gz Binary files differindex cc89f0cbc..678678d63 100644 --- a/ppd/hpcups/hp-officejet_6960.ppd.gz +++ b/ppd/hpcups/hp-officejet_6960.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 4d7b415ec..140395b6b 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 d7fc3cf28..8533d24a6 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_7110_series.ppd.gz b/ppd/hpcups/hp-officejet_7110_series.ppd.gz Binary files differindex ef125f500..61c874ee9 100644 --- a/ppd/hpcups/hp-officejet_7110_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7110_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 6a839da41..3e35a8643 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 b78aa8846..a24d9c503 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 51b1f935f..b37ca15ac 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 1a0f4ac59..d052f8afa 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_7510_series.ppd.gz b/ppd/hpcups/hp-officejet_7510_series.ppd.gz Binary files differindex bb16cf6c0..6d14a2427 100644 --- a/ppd/hpcups/hp-officejet_7510_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7510_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_7610_series.ppd.gz b/ppd/hpcups/hp-officejet_7610_series.ppd.gz Binary files differindex 4d18a5169..ea895c18b 100644 --- a/ppd/hpcups/hp-officejet_7610_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_7610_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8010_series.ppd.gz b/ppd/hpcups/hp-officejet_8010_series.ppd.gz Binary files differnew file mode 100644 index 000000000..b718854b8 --- /dev/null +++ b/ppd/hpcups/hp-officejet_8010_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8020_series.ppd.gz b/ppd/hpcups/hp-officejet_8020_series.ppd.gz Binary files differnew file mode 100644 index 000000000..dcbbbddf4 --- /dev/null +++ b/ppd/hpcups/hp-officejet_8020_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8040_series.ppd.gz b/ppd/hpcups/hp-officejet_8040_series.ppd.gz Binary files differindex 0e75228d7..2de8b95be 100644 --- a/ppd/hpcups/hp-officejet_8040_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_8040_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_8700.ppd.gz b/ppd/hpcups/hp-officejet_8700.ppd.gz Binary files differindex ac49d2c8d..8e6428462 100644 --- a/ppd/hpcups/hp-officejet_8700.ppd.gz +++ b/ppd/hpcups/hp-officejet_8700.ppd.gz diff --git a/ppd/hpcups/hp-officejet_9010_series.ppd.gz b/ppd/hpcups/hp-officejet_9010_series.ppd.gz Binary files differindex 707df0571..0f6803bff 100644 --- a/ppd/hpcups/hp-officejet_9010_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_9010_series.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 3b1bd533d..0196eabb8 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 5d7839439..e73e5f691 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 ed1511d28..3de424144 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 1c6ecef64..5914442ec 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 edc1982e1..43e8c81ef 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 5373116a9..83b420076 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 e383c3165..b1300216a 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 d30d6a0b9..53bd84706 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 b37a0d31c..cf9fea1b4 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 e253ed28f..824f79392 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 7b5977756..4b171f056 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 86dc76e16..786c897ec 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 57121c9a5..e8cc24714 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 dc241341e..0f537348b 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 45ba11d33..1f1c671dd 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 229099934..b929be7b6 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 8d938e69b..f9d2a7472 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 538dfab33..23c977c53 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 c19f46b85..91a568e48 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 394c6d0d6..65c55e535 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 e3f4e50a6..3acb4d068 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 e3ba5e186..23c8a7283 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 e265bd238..32e0f28f0 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 5833c75fc..f03bbbaa6 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_3610.ppd.gz b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz Binary files differindex 264a0b67e..24cb01c80 100644 --- a/ppd/hpcups/hp-officejet_pro_3610.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_3610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz Binary files differindex eac653335..b85a96c90 100644 --- a/ppd/hpcups/hp-officejet_pro_3620.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_3620.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6230.ppd.gz b/ppd/hpcups/hp-officejet_pro_6230.ppd.gz Binary files differindex 65ba5eedd..e019f4f49 100644 --- a/ppd/hpcups/hp-officejet_pro_6230.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6230.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6830.ppd.gz b/ppd/hpcups/hp-officejet_pro_6830.ppd.gz Binary files differindex 0bb705768..086df0aab 100644 --- a/ppd/hpcups/hp-officejet_pro_6830.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6830.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6960.ppd.gz b/ppd/hpcups/hp-officejet_pro_6960.ppd.gz Binary files differindex e19c2b2da..cded57995 100644 --- a/ppd/hpcups/hp-officejet_pro_6960.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6960.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_6970.ppd.gz b/ppd/hpcups/hp-officejet_pro_6970.ppd.gz Binary files differindex 47b6d412e..a9db4fa4c 100644 --- a/ppd/hpcups/hp-officejet_pro_6970.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_6970.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz Binary files differindex 4397a3835..14ad3befc 100644 --- a/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_7720_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz Binary files differindex 04d92005f..caf513bf7 100644 --- a/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_7730_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz Binary files differindex 46c6939cb..4ac79be1e 100644 --- a/ppd/hpcups/hp-officejet_pro_7740_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_7740_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 b6759e8fe..34dacb431 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_8020_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz Binary files differnew file mode 100644 index 000000000..6d3c13744 --- /dev/null +++ b/ppd/hpcups/hp-officejet_pro_8020_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_8030_series.ppd.gz Binary files differnew file mode 100644 index 000000000..0288a3f9e --- /dev/null +++ b/ppd/hpcups/hp-officejet_pro_8030_series.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 497a7a623..b20ab8313 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 009024bfb..4b95b4dfc 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 1b1eebd54..a5421c850 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 0b8b878b5..ab8778cc5 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 2908d0077..ca7d44a1d 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 b4baf5a03..fe80a6e9f 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_8610.ppd.gz b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz Binary files differindex 3fafece8f..faebe56da 100644 --- a/ppd/hpcups/hp-officejet_pro_8610.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8610.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8620.ppd.gz b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz Binary files differindex e11120620..2044eb6ab 100644 --- a/ppd/hpcups/hp-officejet_pro_8620.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8620.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8630.ppd.gz b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz Binary files differindex a5efc7502..c32087770 100644 --- a/ppd/hpcups/hp-officejet_pro_8630.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8630.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8640.ppd.gz b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz Binary files differindex dc944b77f..9dcbb6c45 100644 --- a/ppd/hpcups/hp-officejet_pro_8640.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8640.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8660.ppd.gz b/ppd/hpcups/hp-officejet_pro_8660.ppd.gz Binary files differindex 0b1861b82..ca69bb155 100644 --- a/ppd/hpcups/hp-officejet_pro_8660.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8660.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8710.ppd.gz b/ppd/hpcups/hp-officejet_pro_8710.ppd.gz Binary files differindex 8b10ef470..bec80ea28 100644 --- a/ppd/hpcups/hp-officejet_pro_8710.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8710.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_8720.ppd.gz b/ppd/hpcups/hp-officejet_pro_8720.ppd.gz Binary files differindex 1db2b362f..34f62a251 100644 --- a/ppd/hpcups/hp-officejet_pro_8720.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_8720.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz Binary files differindex 8cf6c844b..c2ea32088 100644 --- a/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_9010_series.ppd.gz diff --git a/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz b/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz Binary files differindex 16e90457e..12aa06d40 100644 --- a/ppd/hpcups/hp-officejet_pro_9020_series.ppd.gz +++ b/ppd/hpcups/hp-officejet_pro_9020_series.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 2f4d1e927..312f3fe1c 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 e60777d3c..e9791a42a 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 538017eee..c31e2b026 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 2416dfc45..a19ea821c 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 0713571ba..68163a44a 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 c77469bb1..b781a13c7 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 40f3db880..1c8169575 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 f2157b991..6cf3f5cf5 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 bca477d06..baf93f1b2 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 c0b117975..b61c24755 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 d76d0584c..364af1185 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 2eacf55be..41d76f4ce 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 25fdbd01c..07780eb89 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 d75820a57..9baead16d 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 10f7bcee5..8c1ea6db2 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 17936f506..ed77e31fa 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 173c37bbf..a6cd05afe 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 ae0c88977..b9081ee6b 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 31fbfb391..f881053bb 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 4de37681d..b2cfc2468 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 0dc620c2d..7572bf3bb 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 9c0519061..6ce525dbb 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_520.ppd.gz b/ppd/hpcups/hp-officejet_series_520.ppd.gz Binary files differindex 56a26708d..b8b7af1a3 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 88b840685..5a6230028 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 0c5c9fd4b..d808c201f 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 66b0bf912..a85c44586 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 fe2f97321..589d2f50f 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 c2fe83a55..d8282c3de 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 05ba9afe3..dc1b9736d 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 03334e83e..1006b7b7f 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 0a499e607..6d5c9037d 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 11e92cd43..b37b98242 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 03e9e7c0a..5ad4c2057 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 c30c3c1aa..da50d97a9 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 fe0718ad4..6b65040db 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 098a918e3..ba895d1c3 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 e0bf00a57..f6c43f690 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 eca6d1ead..dd07710a9 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 bcc12ab17..85e229dac 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 46bc80501..4104cf630 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 e1b857352..d44dc1212 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 7989a279f..f1d025911 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 a0b9c3ddb..88b0d222b 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 9e57e671f..e6ebdb273 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 8c54ebc36..8f63a6aac 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 2a58adef6..64b417c8d 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 d76ecd82d..987218eee 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 9f6b16c2d..d35f9dd23 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 5d698cd58..00849410f 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 47d67c261..5252042fb 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 663455587..3ae38a20e 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 d9f963a94..7cdac7fc5 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 089b9c24d..38b674f5b 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 6642ac5be..c8c29fd53 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 9e44d2c27..fbdcd1bc8 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 ebf69cb5b..454e59bb0 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 c47736454..79f8c8668 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 d72595627..53d24437d 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 47cf70d89..05fb174ea 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 a903c3921..0c6be517f 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 differindex 5215e220e..65d0888b6 100644 --- a/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5510d_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz b/ppd/hpcups/hp-photosmart_5520_series.ppd.gz Binary files differindex 187fcfeb7..275fd38e9 100644 --- a/ppd/hpcups/hp-photosmart_5520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_5520_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 1ed92c1c2..18ffee136 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_6520_series.ppd.gz b/ppd/hpcups/hp-photosmart_6520_series.ppd.gz Binary files differindex 23179b05e..12f22c6b9 100644 --- a/ppd/hpcups/hp-photosmart_6520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_6520_series.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 c6949a33a..48c3f6270 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 86f540fd1..d3e5bf067 100644 --- a/ppd/hpcups/hp-photosmart_7345.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7345.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 54fd23b60..5b11efd4b 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 aa0f617a6..e10f6f7cf 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_7520_series.ppd.gz b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz Binary files differindex dad4e1201..2bcb51e9e 100644 --- a/ppd/hpcups/hp-photosmart_7520_series.ppd.gz +++ b/ppd/hpcups/hp-photosmart_7520_series.ppd.gz diff --git a/ppd/hpcups/hp-photosmart_7550.ppd.gz b/ppd/hpcups/hp-photosmart_7550.ppd.gz Binary files differindex 079ed6c6d..e8166d59c 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 e521dc174..e516410a7 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 978f3cb36..02e3f964a 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 a00c69e47..67cdf27be 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 3817a2bf5..979d6db08 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 b928834c7..42b548fbb 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 bcc4a053c..a90b9a46e 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 99a142a67..9c0c07e3b 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 d6a65eafe..15afcf27a 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 c6ffab01e..c1cb49ade 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 0fbf2c494..c31a4c212 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 b4ce68c47..b52765582 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 a54941bd2..0c2ba8221 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 a9f6952b2..a2c161dfa 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 c02cb10eb..dd0c62a84 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 14e9b8a8c..2e146bf64 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 640ec109f..015766b10 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 4cb310d7d..36ed21f76 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 4b76134cb..51a98acc2 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 6ddcfe3f6..f340c1563 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 e20562611..62adec636 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 850317d53..40b047830 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 b09d0eb61..8394f196a 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 14454f291..7ed4ee9de 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_series.ppd.gz b/ppd/hpcups/hp-photosmart_b109a_series.ppd.gz Binary files differindex 7d017295f..9f58597a7 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 829f7af89..12114ba1d 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 b43a09f76..b5779f3ae 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 1c4c9a556..a9ecb5262 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 01da24200..5f261a430 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 b253d709f..c41e96138 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 7e90511df..358b9a83c 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 44b9073a0..8c43367e1 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 d03e23ba9..3518e510e 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 13fc52e54..af242aea5 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 9e56a138e..b7c598640 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 f6d28403b..1d748d6b8 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 25f259756..df1fcd172 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 6752676b8..3f12c89ee 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 da7aa1365..c42637fcd 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 6e767345a..5eaa736f1 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 49d561600..4a3023f2a 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 4f3435812..667a31a5a 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 c96706ec6..31c300c70 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 d3e11159c..fea55f60e 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 268645d25..83c8cf39c 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 083e9eaf6..2f6e91e1a 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 550973e27..cc58ae35c 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 905a6534b..2597871a3 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 652ff5bb8..15705312b 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 a5176728e..cf7021de8 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 685ede078..18d0a89b9 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 ab1cb8d53..412195c11 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 44f3fe8e5..d3af9c411 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 975551ec3..49fdcd49e 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 46ecdda6a..5a2d91763 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 36c326183..a82af63b3 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 8ee64ac2c..f7302e7c5 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 7bcbc532d..d0a3eb509 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 3908ae4f3..efee8c135 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 194f60a57..d09322be8 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 7f33ee070..a232f2297 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 1ad4aca31..f4255327b 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 74c3ca891..2827dab8c 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 eae79b516..22248d1f3 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 1c1b52217..e7dcfb08c 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 31672ed36..f2fc70d32 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 69a4f3741..a94558b28 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 41939002c..82b83c46e 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 44aa2c07c..952ec974a 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 8420d737e..d30ec0c42 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 32e544b7c..413c5cc60 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 09178f5ac..e4873a231 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 08290108e..ed7fb037f 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 333f7f84f..d208ce60c 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 0eb2af6f9..19ac9b432 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 053351ae7..ad4ca97a5 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 340870e15..a471b4ea6 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 ce0630223..47b157fc2 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 b5cfeb60c..61b021647 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 4fe01133f..ee9cfeeec 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 98371caac..d360b8032 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 ac1172dce..370f1e63f 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 4344d256b..4e59601a9 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 9bc90ae11..ca652f39d 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 25567b07b..ec0d41bd8 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 17f8d31ff..13c4273dc 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 ed3222403..a6196edaf 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 890412adf..80a816d20 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 9e2d58b7f..88dfa6ed7 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 e7ad959fc..e77b219e5 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 0af91a8b1..73ee5c3a1 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 e1bf916f2..8f993acc2 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 093d34966..81b9caa56 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 08130704c..3f0c45043 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 74a8e0789..270d622e3 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 dad205f14..e637f3cf9 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 094755858..197f76501 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 d623839d0..ea2d48405 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 4d79b6ee6..05ddd2f17 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 b04e8da64..97563c49b 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 159b41bb4..86d217dce 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 2df6919cf..8bf92c53b 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 35e06692d..1c0e6c4eb 100644 --- a/ppd/hpcups/hp-psc_950xi.ppd.gz +++ b/ppd/hpcups/hp-psc_950xi.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_350_series.ppd.gz b/ppd/hpcups/hp-smart_tank_350_series.ppd.gz Binary files differindex 581bc1104..cbda9310a 100644 --- a/ppd/hpcups/hp-smart_tank_350_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_350_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_500_series.ppd.gz b/ppd/hpcups/hp-smart_tank_500_series.ppd.gz Binary files differnew file mode 100644 index 000000000..ed2765375 --- /dev/null +++ b/ppd/hpcups/hp-smart_tank_500_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_510_series.ppd.gz b/ppd/hpcups/hp-smart_tank_510_series.ppd.gz Binary files differnew file mode 100644 index 000000000..0043c8cbb --- /dev/null +++ b/ppd/hpcups/hp-smart_tank_510_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_530_series.ppd.gz b/ppd/hpcups/hp-smart_tank_530_series.ppd.gz Binary files differnew file mode 100644 index 000000000..d41891ac9 --- /dev/null +++ b/ppd/hpcups/hp-smart_tank_530_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_610_series.ppd.gz b/ppd/hpcups/hp-smart_tank_610_series.ppd.gz Binary files differnew file mode 100644 index 000000000..bcb45894a --- /dev/null +++ b/ppd/hpcups/hp-smart_tank_610_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz Binary files differnew file mode 100644 index 000000000..9bb92cf75 --- /dev/null +++ b/ppd/hpcups/hp-smart_tank_plus_550_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz Binary files differnew file mode 100644 index 000000000..cfdd65791 --- /dev/null +++ b/ppd/hpcups/hp-smart_tank_plus_570_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz b/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz Binary files differnew file mode 100644 index 000000000..3236b7444 --- /dev/null +++ b/ppd/hpcups/hp-smart_tank_plus_650_series.ppd.gz diff --git a/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz b/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz Binary files differindex fcb4d84c1..c790d45dd 100644 --- a/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz +++ b/ppd/hpcups/hp-smart_tank_wireless_450_series.ppd.gz diff --git a/ppd/hpcups/hp-tango.ppd.gz b/ppd/hpcups/hp-tango.ppd.gz Binary files differindex cd77fa6bd..8d9167e5c 100644 --- a/ppd/hpcups/hp-tango.ppd.gz +++ b/ppd/hpcups/hp-tango.ppd.gz diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in index 159e63e1f..3cd6f550d 100644 --- a/prnt/drv/hpcups.drv.in +++ b/prnt/drv/hpcups.drv.in @@ -5148,258 +5148,6 @@ Manufacturer "HP" }// End CopperheadXLP - -//////// SPDMainstreamCoreConsumerA -{ - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - Attribute "hpPrinterPlatform" "" "Weber" - Attribute "HPSPDClass" "" 1 - - Group "General/General" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</cupsMediaType 0>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</cupsMediaType 5>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</cupsMediaType 2>>setpagedevice" - Choice "BrochureGlosy/HP Glossy Brochure or Professional Paper" "<</cupsMediaType 8>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</cupsMediaType 5>>setpagedevice" - Choice "Coated/Other matte inkjet Paper" "<</cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</cupsMediaType 8>>setpagedevice" - Choice "HPTrifoldBrochureGlossy/HP Tri-fold Brochure Glossy 150g" "<</MediaType(HPTrifoldBrochureGlossy)>>setpagedevice" - Choice "PlainLight/Plain Paper,Light/Recycled" "<</MediaType(PlainLight)/cupsMediaType 1>>setpagedevice" - - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Upper/Main Tray" "<</MediaPosition 1>>setpagedevice" - - //Constraints - //MediaType & OutputMode - UIConstraints "*MediaType FastGlossy *OutputMode FastDraft" - UIConstraints "*MediaType Glossy *OutputMode FastDraft" - UIConstraints "*MediaType CoatedBrochure *OutputMode FastDraft" - UIConstraints "*MediaType CoatedMatte *OutputMode FastDraft" - UIConstraints "*MediaType Coated *OutputMode FastDraft" - UIConstraints "*MediaType BrochureGlosy *OutputMode FastDraft" - UIConstraints "*MediaType Brochure *OutputMode FastDraft" - - //PaperSizes & MediaTypes - UIConstraints "*PageSize A6.FB *MediaType Plain" - UIConstraints "*PageSize Photo3x5.FB *MediaType Plain" - UIConstraints "*PageSize Photo4x6.FB *MediaType Plain" - UIConstraints "*PageSize Photo2L.FB *MediaType Plain" - UIConstraints "*PageSize Photo3x5 *MediaType Plain" - UIConstraints "*PageSize Photo4x6 *MediaType Plain" - UIConstraints "*PageSize Photo2L *MediaType Plain" - UIConstraints "*PageSize Photo5x7 *MediaType Plain" - UIConstraints "*PageSize Photo8x10 *MediaType Plain" - - UIConstraints "*PageSize A5 *MediaType FastGlossy" - UIConstraints "*PageSize JB5 *MediaType FastGlossy" - UIConstraints "*PageSize B5 *MediaType FastGlossy" - UIConstraints "*PageSize Executive *MediaType FastGlossy" - UIConstraints "*PageSize A4 *MediaType FastGlossy" - UIConstraints "*PageSize Letter *MediaType FastGlossy" - UIConstraints "*PageSize Legal *MediaType FastGlossy" - UIConstraints "*PageSize CardA4 *MediaType FastGlossy" - UIConstraints "*PageSize CardLetter *MediaType FastGlossy" - UIConstraints "*PageSize Card3x5 *MediaType FastGlossy" - UIConstraints "*PageSize Card4x6 *MediaType FastGlossy" - UIConstraints "*PageSize Card5x8 *MediaType FastGlossy" - UIConstraints "*PageSize 8.5x13 *MediaType FastGlossy" - UIConstraints "*PageSize Statement *MediaType FastGlossy" - - UIConstraints "*PageSize EnvChou4 *MediaType FastGlossy" - UIConstraints "*PageSize EnvA2 *MediaType FastGlossy" - UIConstraints "*PageSize EnvC6 *MediaType FastGlossy" - UIConstraints "*PageSize EnvChou3 *MediaType FastGlossy" - UIConstraints "*PageSize EnvMonarch *MediaType FastGlossy" - UIConstraints "*PageSize Env10 *MediaType FastGlossy" - UIConstraints "*PageSize EnvDL *MediaType FastGlossy" - UIConstraints "*PageSize EnvC5 *MediaType FastGlossy" - UIConstraints "*PageSize Env6 *MediaType FastGlossy" - - UIConstraints "*PageSize A5 *MediaType Glossy" - UIConstraints "*PageSize JB5 *MediaType Glossy" - UIConstraints "*PageSize B5 *MediaType Glossy" - UIConstraints "*PageSize Executive *MediaType Glossy" - UIConstraints "*PageSize A4 *MediaType Glossy" - UIConstraints "*PageSize Letter *MediaType Glossy" - UIConstraints "*PageSize Legal *MediaType Glossy" - UIConstraints "*PageSize CardA4 *MediaType Glossy" - UIConstraints "*PageSize CardLetter *MediaType Glossy" - UIConstraints "*PageSize Card3x5 *MediaType Glossy" - UIConstraints "*PageSize Card4x6 *MediaType Glossy" - UIConstraints "*PageSize Card5x8 *MediaType Glossy" - UIConstraints "*PageSize 8.5x13 *MediaType Glossy" - UIConstraints "*PageSize Statement *MediaType Glossy" - - UIConstraints "*PageSize EnvChou4 *MediaType Glossy" - UIConstraints "*PageSize EnvA2 *MediaType Glossy" - UIConstraints "*PageSize EnvC6 *MediaType Glossy" - UIConstraints "*PageSize EnvChou3 *MediaType Glossy" - UIConstraints "*PageSize EnvMonarch *MediaType Glossy" - UIConstraints "*PageSize Env10 *MediaType Glossy" - UIConstraints "*PageSize EnvDL *MediaType Glossy" - UIConstraints "*PageSize EnvC5 *MediaType Glossy" - UIConstraints "*PageSize Env6 *MediaType Glossy" - - // 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 8.4 8.4 8.4 8.4 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Card4x6/Index Card 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize [288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "4x5in/4x5in" 288 360 8.4 8.4 8.4 8.4 "<</cupsInteger0 30002/PageSize [288 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 30002/PageSize[288 360]/ImagingBBox null>>setpagedevice" - CustomMedia "4x6in/4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize [288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "4x12in/4x12in" 288 720 8.4 8.4 8.4 8.4 "<</cupsInteger0 30000/PageSize [288 720]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 30000/PageSize[288 720]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo3.5x5/Photo 3.5x5in" 252 360 5.76 33.84 5.76 8.64 "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - - CustomMedia "L/L 89x127mm" 252 360 9 9 9 9 "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - - CustomMedia "Photo3x5/Photo 3x5in" 216 360 8.4 8.4 8.4 8.4 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo3x5.FB/Borderless Photo 3x5in" 216 360 0 0 0 0 "<</cupsInteger0 78/cupsReal0 0/cupsReal1 0/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/cupsReal0 0/cupsReal1 0/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6.FB/Borderless Photo 4x6in" 288 432 0 0 0 0 "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 8.4 8.4 8.4 8.4 "<</cupsInteger0 24/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - CustomMedia "A6.FB/A6 Borderless 105x148mm" 297.36 419.76 0 0 0 0 "<</cupsInteger0 24/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/cupsReal0 0/cupsReal1 0/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 8.4 8.4 8.4 8.4 "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice" - CustomMedia "Card5x8.FB/Borderless Index Card 5x8in" 360 576 0 0 0 0 "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 75/cupsReal0 0/cupsReal1 0/PageSize[360 576]/ImagingBBox null>>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 8.4 8.4 8.4 8.4 "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 200x148mm" 566.64 419.76 8.4 8.4 8.4 8.4 "<</cupsInteger0 72/PageSize[566.64 419.76]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 72/PageSize[566.64 419.76]/ImagingBBox null>>setpagedevice" - - // Standard - - CustomMedia "Postcard/Postcard" 283 420 8.4 8.4 8.4 8.4 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo2L/Photo 2L 127x178mm" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 126/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 126/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - CustomMedia "8.5x13/8.5x13in" 612 936 8.4 8.4 8.4 8.4 "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 8.4 8.4 8.4 8.4 "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 8.4 8.4 8.4 8.4 "<</cupsInteger0 45/PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice" - CustomMedia "JB5.FB/JB5 Borderless 182x257mm" 516.24 728.64 0 0 0 0 "<</cupsInteger0 45/PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/cupsReal0 0/cupsReal1 0/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 8.4 8.4 8.4 8.4 "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice" - *CustomMedia "Letter/Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Statement/Statement 5.5x8.5in" 396 612 8.4 8.4 8.4 8.4 "<</cupsInteger0 15/PageSize[396 612]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 15/PageSize[396 612]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "CardA4/Index Card A4 210x297mm" 595.44 841.68 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 8.4 8.4 8.4 8.4 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo2L.FB/Photo 2L Borderless 127x178mm" 360 504 0 0 0 0 "<</cupsInteger0 126/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 126/cupsReal0 0/cupsReal1 0/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo8x10/Photo 8x10in" 576 720 8.4 8.4 8.4 8.4 "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - CustomMedia "Tabloid/Tabloid " 792 1224 8.4 8.4 8.4 8.4 "<</cupsInteger0 6/PageSize[792 1224]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 6/PageSize[792 1224]/ImagingBBox null>>setpagedevice" - CustomMedia "8x10/8x10in" 576 720 9 36 9 9 "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - - - - // Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 8.4 8.4 8.4 8.4 "<</cupsInteger0 109/PageSize[314.64 414]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 414]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.28 459.36 8.4 8.4 8.4 8.4 "<</cupsInteger0 92/PageSize[323.28 459.36]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.28 459.36]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.76 623.52 8.4 8.4 8.4 8.4 "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297 684 8.4 8.4 8.4 8.4 "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.36 649.44 8.4 8.4 8.4 8.4 "<</cupsInteger0 91/PageSize[459.36 649.44]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.36 649.44]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666 9 41 9 9 "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 9 9 "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 18.00 36.00 18.00 9.00 "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice" - CustomMedia "Envelope_No_6_75/Envelope No 6_75" 260.88 468 8.4 8.4 8.4 8.4 "<</cupsInteger0 83/PageSize [260.88 468]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 83/PageSize[260.88 468]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18.00 36.00 18.00 9.00 "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 1x4in to legal - HWMargins 8.4 8.4 8.4 8.4 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - - } - - // <%SPDMainstreamCoreConsumerA:Normal%> - { - ModelName "HP Officejet 9010 Series" - Attribute "NickName" "" "HP Officejet 9010 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 9010 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet 9010 series;DES:hp officejet 9010 series;" - PCFileName "hp-officejet_9010_series.ppd" - Attribute "Product" "" "(HP Officejet All-in-one 9010)" - } - { - ModelName "HP Officejet Pro 9010 Series" - Attribute "NickName" "" "HP Officejet Pro 9010 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP OJ Pro 9010 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 9010 series;DES:hp officejet pro 9010 series;" - PCFileName "hp-officejet_pro_9010_series.ppd" - Attribute "Product" "" "(HP Officejet Pro All-in-one 9010)" - } - { - ModelName "HP Officejet Pro 9020 Series" - Attribute "NickName" "" "HP Officejet Pro 9020 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP OJ Pro 9020 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 9020 series;DES:hp officejet pro 9020 series;" - PCFileName "hp-officejet_pro_9020_series.ppd" - Attribute "Product" "" "(HP Officejet Pro All-in-one 9020)" - } - -}// End SPDMainstreamCoreConsumerA - //////// Copperhead12 { @@ -7416,515 +7164,6 @@ Manufacturer "HP" } // End Saipan -//////// PCL3-Class1 -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1 - -//////// PCL3-Class1A -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - Attribute "HPSPDClass" "" 1 - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6.FB/Borderless Photo 4x6in" 288 432 0 0 0 0 "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo5x7.FB/Photo Borderless 5x7in" 360 504 0 0 0 0 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.FB/Letter Borderless 8.5x11in" 612 792 0 0 0 0 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.FB/A4 Borderless 210x297mm" 595.296 841.896 0 0 0 0 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 8.4 8.4 8.4 8.4 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1A%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1A - - - - -//////// PCL3-Class1B -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1B%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1B - -//////// PCL3-Class2 -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - Attribute "HPSPDClass" "" 1 - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6.FB/Borderless Photo 4x6in" 288 432 0 0 0 0 "<</cupsInteger0 74/cupsReal0 .098/cupsReal1 .098/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo5x7.FB/Photo Borderless 5x7in" 360 504 0 0 0 0 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.FB/Letter Borderless 8.5x11in" 612 792 0 0 0 0 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.FB/A4 Borderless 210x297mm" 595.44 841.68 0 0 0 0 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 8.4 8.4 8.4 8.4 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.76 623.52 8.4 8.4 8.4 8.4 "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class2%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class2 - //////// PCL3-Class3 { Attribute "cupsEvenDuplex" "" "True" @@ -8347,12 +7586,12 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 Option "ColorModel/Output Mode" PickOne AnySetup 10.0 //*Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" *Choice "RGB/4-Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 0>>setpagedevice" - //Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" + Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - //Print In Grayscale : TODO:-handle in Hbpl1 code - //Option "Gray/Print in Grayscale" Boolean AnySetup 10.0 - //*Choice "False/Off" "<</cupsInteger3 0>>setpagedevice" - //Choice "True/On" "<</cupsInteger3 1>>setpagedevice" + // Print In Grayscale : TODO:-handle in Hbpl1 code + Option "Gray/Print in Grayscale" Boolean AnySetup 10.0 + *Choice "False/Off" "<</cupsInteger3 0>>setpagedevice" + Choice "True/On" "<</cupsInteger3 1>>setpagedevice" //cupsCompression values map to QUALITY_MODE from global_types.h Option "OutputMode/Print Quality" PickOne AnySetup 10.0 @@ -14782,6 +14021,62 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 Attribute "Product" "" "(HP Smart Tank 350)" } { + ModelName "HP Smart Tank 500 Series" + Attribute "NickName" "" "HP Smart Tank 500 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Smart Tank 500 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 500 series;DES:smart tank 500 series;" + PCFileName "hp-smart_tank_500_series.ppd" + Attribute "Product" "" "(HP Smart Tank 500 Series)" + } + { + ModelName "HP Smart Tank 510 Series" + Attribute "NickName" "" "HP Smart Tank 510 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Smart Tank 510 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 510 series;DES:smart tank 510 series;" + PCFileName "hp-smart_tank_510_series.ppd" + Attribute "Product" "" "(HP Smart Tank 510)" + } + { + ModelName "HP Smart Tank 530 Series" + Attribute "NickName" "" "HP Smart Tank 530 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Smart Tank 530 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 530 series;DES:smart tank 530 series;" + PCFileName "hp-smart_tank_530_series.ppd" + Attribute "Product" "" "(HP Smart Tank 530 Series)" + } + { + ModelName "HP Smart Tank 610 Series" + Attribute "NickName" "" "HP Smart Tank 610 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Smart Tank 610 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 610 series;DES:smart tank 610 series;" + PCFileName "hp-smart_tank_610_series.ppd" + Attribute "Product" "" "(HP Smart Tank 610)" + } + { + ModelName "HP Smart Tank Plus 550 Series" + Attribute "NickName" "" "HP Smart Tank Plus 550 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Smart TK Plus 550 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank plus 550 series;DES:smart tank plus 550 series;" + PCFileName "hp-smart_tank_plus_550_series.ppd" + Attribute "Product" "" "(HP Smart Tank Plus 550)" + } + { + ModelName "HP Smart Tank Plus 570 Series" + Attribute "NickName" "" "HP Smart Tank Plus 570 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Smart TK Plus 570 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank plus 570 series;DES:smart tank plus 570 series;" + PCFileName "hp-smart_tank_plus_570_series.ppd" + Attribute "Product" "" "(HP Smart Tank Plus 570 Series)" + } + { + ModelName "HP Smart Tank Plus 650 Series" + Attribute "NickName" "" "HP Smart Tank Plus 650 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Smart TK Plus 650 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank plus 650 series;DES:smart tank plus 650 series;" + PCFileName "hp-smart_tank_plus_650_series.ppd" + Attribute "Product" "" "(HP Smart Tank Plus 650)" + } + { ModelName "HP Smart Tank Wireless 450 Series" Attribute "NickName" "" "HP Smart Tank Wireless 450 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Smart TK WL 450 Series hpijs" @@ -16090,6 +15385,22 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 // <%SPDOfficejetProAsize:Normal%> { + ModelName "HP Officejet 8010 Series" + Attribute "NickName" "" "HP Officejet 8010 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 8010 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet 8010 series;DES:hp officejet 8010 series;" + PCFileName "hp-officejet_8010_series.ppd" + Attribute "Product" "" "(HP Officejet 8010 All-in-one Printer Series)" + } + { + ModelName "HP Officejet 8020 Series" + Attribute "NickName" "" "HP Officejet 8020 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 8020 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet 8020 series;DES:hp officejet 8020 series;" + PCFileName "hp-officejet_8020_series.ppd" + Attribute "Product" "" "(HP Officejet 8020 All-in-one Printer Series)" + } + { ModelName "HP Officejet 8700" Attribute "NickName" "" "HP Officejet 8700, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 8700 hpijs" @@ -16098,6 +15409,30 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 Attribute "Product" "" "(HP Officejet 8702 All-in-one)" } { + ModelName "HP Officejet 9010 Series" + Attribute "NickName" "" "HP Officejet 9010 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 9010 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet 9010 series;DES:hp officejet 9010 series;" + PCFileName "hp-officejet_9010_series.ppd" + Attribute "Product" "" "(HP Officejet All-in-one 9010)" + } + { + ModelName "HP Officejet Pro 8020 Series" + Attribute "NickName" "" "HP Officejet Pro 8020 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP OJ Pro 8020 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8020 series;DES:hp officejet pro 8020 series;" + PCFileName "hp-officejet_pro_8020_series.ppd" + Attribute "Product" "" "(HP Officejet Pro 8020 All-in-one Printer Series)" + } + { + ModelName "HP Officejet Pro 8030 Series" + Attribute "NickName" "" "HP Officejet Pro 8030 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP OJ Pro 8030 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8030 series;DES:hp officejet pro 8030 series;" + PCFileName "hp-officejet_pro_8030_series.ppd" + Attribute "Product" "" "(HP Officejet Pro 8030 All-in-one Printer Series)" + } + { ModelName "HP Officejet Pro 8710" Attribute "NickName" "" "HP Officejet Pro 8710, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 8710 hpijs" @@ -16115,6 +15450,22 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 Attribute "Product" "" "(HP Officejet Pro 8720 All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 8725 All-in-one Printer)" } + { + ModelName "HP Officejet Pro 9010 Series" + Attribute "NickName" "" "HP Officejet Pro 9010 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP OJ Pro 9010 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 9010 series;DES:hp officejet pro 9010 series;" + PCFileName "hp-officejet_pro_9010_series.ppd" + Attribute "Product" "" "(HP Officejet Pro All-in-one 9010)" + } + { + ModelName "HP Officejet Pro 9020 Series" + Attribute "NickName" "" "HP Officejet Pro 9020 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP OJ Pro 9020 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 9020 series;DES:hp officejet pro 9020 series;" + PCFileName "hp-officejet_pro_9020_series.ppd" + Attribute "Product" "" "(HP Officejet Pro All-in-one 9020)" + } }// End SPDOfficejetProAsize @@ -23449,6 +22800,24 @@ Group "RLT/HP Real Life Technologies" // <%Hbpl1:Mono%> { + ModelName "HP Laser Ns 1020" + Attribute "NickName" "" "HP Laser Ns 1020, hpcups $Version" + Attribute "ShortNickName" "" "HP Laser Ns 1020 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laser ns 1020;DES:hp laser ns 1020;" + PCFileName "hp-laser_ns_1020.ppd" + Attribute "Product" "" "(HP Laser Ns 1020)" + Attribute "Product" "" "(HP Laser Ns 1020w)" + } + { + ModelName "HP Laser Ns MFP 1005" + Attribute "NickName" "" "HP Laser Ns MFP 1005, hpcups $Version" + Attribute "ShortNickName" "" "HP Laser Ns MFP 1005 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laser ns mfp 1005;DES:hp laser ns mfp 1005;" + PCFileName "hp-laser_ns_mfp_1005.ppd" + Attribute "Product" "" "(HP Laser Ns MFP 1005)" + Attribute "Product" "" "(HP Laser Ns MFP 1005w)" + } + { ModelName "HP LaserJet m101-m106" Attribute "NickName" "" "HP LaserJet m101-m106, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m101-m106 hpijs" @@ -23673,6 +23042,24 @@ Group "RLT/HP Real Life Technologies" PCFileName "hp-laserjet_pro_mfp_m27cnw.ppd" Attribute "Product" "" "(HP LaserJet Pro MFP m27cnw)" } + { + ModelName "HP Neverstop Laser 100x" + Attribute "NickName" "" "HP Neverstop Laser 100x, hpcups $Version" + Attribute "ShortNickName" "" "HP Neverstop Laser 100x hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp neverstop laser 100x;DES:hp neverstop laser 100x;" + PCFileName "hp-neverstop_laser_100x.ppd" + Attribute "Product" "" "(HP Neverstop Laser 1000a)" + Attribute "Product" "" "(HP Neverstop Laser 1000w)" + } + { + ModelName "HP Neverstop Laser MFP 120x" + Attribute "NickName" "" "HP Neverstop Laser MFP 120x, hpcups $Version" + Attribute "ShortNickName" "" "HP Neverstop Laser MFP 120x hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp neverstop laser mfp 120x;DES:hp neverstop laser mfp 120x;" + PCFileName "hp-neverstop_laser_mfp_120x.ppd" + Attribute "Product" "" "(HP Neverstop Laser MFP 1200a)" + Attribute "Product" "" "(HP Neverstop Laser MFP 1200w)" + } } { diff --git a/prnt/drv/hpcups.drv.in.template b/prnt/drv/hpcups.drv.in.template index 0770e438d..5895d95a3 100644 --- a/prnt/drv/hpcups.drv.in.template +++ b/prnt/drv/hpcups.drv.in.template @@ -3077,234 +3077,6 @@ Manufacturer "HP" }// End CopperheadXLP - -//////// SPDMainstreamCoreConsumerA -{ - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - Attribute "hpPrinterPlatform" "" "Weber" - Attribute "HPSPDClass" "" 1 - - Group "General/General" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</cupsMediaType 0>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</cupsMediaType 5>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</cupsMediaType 2>>setpagedevice" - Choice "BrochureGlosy/HP Glossy Brochure or Professional Paper" "<</cupsMediaType 8>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</cupsMediaType 5>>setpagedevice" - Choice "Coated/Other matte inkjet Paper" "<</cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</cupsMediaType 8>>setpagedevice" - Choice "HPTrifoldBrochureGlossy/HP Tri-fold Brochure Glossy 150g" "<</MediaType(HPTrifoldBrochureGlossy)>>setpagedevice" - Choice "PlainLight/Plain Paper,Light/Recycled" "<</MediaType(PlainLight)/cupsMediaType 1>>setpagedevice" - - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Upper/Main Tray" "<</MediaPosition 1>>setpagedevice" - - //Constraints - //MediaType & OutputMode - UIConstraints "*MediaType FastGlossy *OutputMode FastDraft" - UIConstraints "*MediaType Glossy *OutputMode FastDraft" - UIConstraints "*MediaType CoatedBrochure *OutputMode FastDraft" - UIConstraints "*MediaType CoatedMatte *OutputMode FastDraft" - UIConstraints "*MediaType Coated *OutputMode FastDraft" - UIConstraints "*MediaType BrochureGlosy *OutputMode FastDraft" - UIConstraints "*MediaType Brochure *OutputMode FastDraft" - - //PaperSizes & MediaTypes - UIConstraints "*PageSize A6.FB *MediaType Plain" - UIConstraints "*PageSize Photo3x5.FB *MediaType Plain" - UIConstraints "*PageSize Photo4x6.FB *MediaType Plain" - UIConstraints "*PageSize Photo2L.FB *MediaType Plain" - UIConstraints "*PageSize Photo3x5 *MediaType Plain" - UIConstraints "*PageSize Photo4x6 *MediaType Plain" - UIConstraints "*PageSize Photo2L *MediaType Plain" - UIConstraints "*PageSize Photo5x7 *MediaType Plain" - UIConstraints "*PageSize Photo8x10 *MediaType Plain" - - UIConstraints "*PageSize A5 *MediaType FastGlossy" - UIConstraints "*PageSize JB5 *MediaType FastGlossy" - UIConstraints "*PageSize B5 *MediaType FastGlossy" - UIConstraints "*PageSize Executive *MediaType FastGlossy" - UIConstraints "*PageSize A4 *MediaType FastGlossy" - UIConstraints "*PageSize Letter *MediaType FastGlossy" - UIConstraints "*PageSize Legal *MediaType FastGlossy" - UIConstraints "*PageSize CardA4 *MediaType FastGlossy" - UIConstraints "*PageSize CardLetter *MediaType FastGlossy" - UIConstraints "*PageSize Card3x5 *MediaType FastGlossy" - UIConstraints "*PageSize Card4x6 *MediaType FastGlossy" - UIConstraints "*PageSize Card5x8 *MediaType FastGlossy" - UIConstraints "*PageSize 8.5x13 *MediaType FastGlossy" - UIConstraints "*PageSize Statement *MediaType FastGlossy" - - UIConstraints "*PageSize EnvChou4 *MediaType FastGlossy" - UIConstraints "*PageSize EnvA2 *MediaType FastGlossy" - UIConstraints "*PageSize EnvC6 *MediaType FastGlossy" - UIConstraints "*PageSize EnvChou3 *MediaType FastGlossy" - UIConstraints "*PageSize EnvMonarch *MediaType FastGlossy" - UIConstraints "*PageSize Env10 *MediaType FastGlossy" - UIConstraints "*PageSize EnvDL *MediaType FastGlossy" - UIConstraints "*PageSize EnvC5 *MediaType FastGlossy" - UIConstraints "*PageSize Env6 *MediaType FastGlossy" - - UIConstraints "*PageSize A5 *MediaType Glossy" - UIConstraints "*PageSize JB5 *MediaType Glossy" - UIConstraints "*PageSize B5 *MediaType Glossy" - UIConstraints "*PageSize Executive *MediaType Glossy" - UIConstraints "*PageSize A4 *MediaType Glossy" - UIConstraints "*PageSize Letter *MediaType Glossy" - UIConstraints "*PageSize Legal *MediaType Glossy" - UIConstraints "*PageSize CardA4 *MediaType Glossy" - UIConstraints "*PageSize CardLetter *MediaType Glossy" - UIConstraints "*PageSize Card3x5 *MediaType Glossy" - UIConstraints "*PageSize Card4x6 *MediaType Glossy" - UIConstraints "*PageSize Card5x8 *MediaType Glossy" - UIConstraints "*PageSize 8.5x13 *MediaType Glossy" - UIConstraints "*PageSize Statement *MediaType Glossy" - - UIConstraints "*PageSize EnvChou4 *MediaType Glossy" - UIConstraints "*PageSize EnvA2 *MediaType Glossy" - UIConstraints "*PageSize EnvC6 *MediaType Glossy" - UIConstraints "*PageSize EnvChou3 *MediaType Glossy" - UIConstraints "*PageSize EnvMonarch *MediaType Glossy" - UIConstraints "*PageSize Env10 *MediaType Glossy" - UIConstraints "*PageSize EnvDL *MediaType Glossy" - UIConstraints "*PageSize EnvC5 *MediaType Glossy" - UIConstraints "*PageSize Env6 *MediaType Glossy" - - // 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 8.4 8.4 8.4 8.4 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Card4x6/Index Card 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize [288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "4x5in/4x5in" 288 360 8.4 8.4 8.4 8.4 "<</cupsInteger0 30002/PageSize [288 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 30002/PageSize[288 360]/ImagingBBox null>>setpagedevice" - CustomMedia "4x6in/4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize [288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "4x12in/4x12in" 288 720 8.4 8.4 8.4 8.4 "<</cupsInteger0 30000/PageSize [288 720]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 30000/PageSize[288 720]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo3.5x5/Photo 3.5x5in" 252 360 5.76 33.84 5.76 8.64 "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - - CustomMedia "L/L 89x127mm" 252 360 9 9 9 9 "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 121/PageSize[252 360]/ImagingBBox null>>setpagedevice" - - CustomMedia "Photo3x5/Photo 3x5in" 216 360 8.4 8.4 8.4 8.4 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo3x5.FB/Borderless Photo 3x5in" 216 360 0 0 0 0 "<</cupsInteger0 78/cupsReal0 0/cupsReal1 0/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/cupsReal0 0/cupsReal1 0/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6.FB/Borderless Photo 4x6in" 288 432 0 0 0 0 "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 8.4 8.4 8.4 8.4 "<</cupsInteger0 24/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - CustomMedia "A6.FB/A6 Borderless 105x148mm" 297.36 419.76 0 0 0 0 "<</cupsInteger0 24/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/cupsReal0 0/cupsReal1 0/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice" - - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 8.4 8.4 8.4 8.4 "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice" - CustomMedia "Card5x8.FB/Borderless Index Card 5x8in" 360 576 0 0 0 0 "<</cupsInteger0 75/PageSize[360 576]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 75/cupsReal0 0/cupsReal1 0/PageSize[360 576]/ImagingBBox null>>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 8.4 8.4 8.4 8.4 "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 25/PageSize[419.76 595.44]/ImagingBBox null>>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 200x148mm" 566.64 419.76 8.4 8.4 8.4 8.4 "<</cupsInteger0 72/PageSize[566.64 419.76]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 72/PageSize[566.64 419.76]/ImagingBBox null>>setpagedevice" - - // Standard - - CustomMedia "Postcard/Postcard" 283 420 8.4 8.4 8.4 8.4 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo2L/Photo 2L 127x178mm" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 126/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 126/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - CustomMedia "8.5x13/8.5x13in" 612 936 8.4 8.4 8.4 8.4 "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 8.4 8.4 8.4 8.4 "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 8.4 8.4 8.4 8.4 "<</cupsInteger0 45/PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice" - CustomMedia "JB5.FB/JB5 Borderless 182x257mm" 516.24 728.64 0 0 0 0 "<</cupsInteger0 45/PageSize[516.24 728.64]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/cupsReal0 0/cupsReal1 0/PageSize [516.24 728.64]/ImagingBBox null>>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 8.4 8.4 8.4 8.4 "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 1/PageSize[522 756]/ImagingBBox null>>setpagedevice" - *CustomMedia "Letter/Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Statement/Statement 5.5x8.5in" 396 612 8.4 8.4 8.4 8.4 "<</cupsInteger0 15/PageSize[396 612]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 15/PageSize[396 612]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "CardA4/Index Card A4 210x297mm" 595.44 841.68 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 8.4 8.4 8.4 8.4 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo2L.FB/Photo 2L Borderless 127x178mm" 360 504 0 0 0 0 "<</cupsInteger0 126/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 126/cupsReal0 0/cupsReal1 0/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo8x10/Photo 8x10in" 576 720 8.4 8.4 8.4 8.4 "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - CustomMedia "Tabloid/Tabloid " 792 1224 8.4 8.4 8.4 8.4 "<</cupsInteger0 6/PageSize[792 1224]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 6/PageSize[792 1224]/ImagingBBox null>>setpagedevice" - CustomMedia "8x10/8x10in" 576 720 9 36 9 9 "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[576 720]/ImagingBBox null>>setpagedevice" - - - - // Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 8.4 8.4 8.4 8.4 "<</cupsInteger0 109/PageSize[314.64 414]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 414]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.28 459.36 8.4 8.4 8.4 8.4 "<</cupsInteger0 92/PageSize[323.28 459.36]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.28 459.36]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.76 623.52 8.4 8.4 8.4 8.4 "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297 684 8.4 8.4 8.4 8.4 "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.36 649.44 8.4 8.4 8.4 8.4 "<</cupsInteger0 91/PageSize[459.36 649.44]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.36 649.44]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666 9 41 9 9 "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[339.84 666]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 9 9 "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 111/PageSize[254.88 581.04]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 18.00 36.00 18.00 9.00 "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279 540]/ImagingBBox null>>setpagedevice" - CustomMedia "Envelope_No_6_75/Envelope No 6_75" 260.88 468 8.4 8.4 8.4 8.4 "<</cupsInteger0 83/PageSize [260.88 468]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 83/PageSize[260.88 468]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18.00 36.00 18.00 9.00 "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 100/PageSize[499 709]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 1x4in to legal - HWMargins 8.4 8.4 8.4 8.4 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - - } - - // <%SPDMainstreamCoreConsumerA:Normal%> - -}// End SPDMainstreamCoreConsumerA - //////// Copperhead12 { @@ -5057,515 +4829,6 @@ Manufacturer "HP" } // End Saipan -//////// PCL3-Class1 -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1 - -//////// PCL3-Class1A -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - Attribute "HPSPDClass" "" 1 - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6.FB/Borderless Photo 4x6in" 288 432 0 0 0 0 "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo5x7.FB/Photo Borderless 5x7in" 360 504 0 0 0 0 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.FB/Letter Borderless 8.5x11in" 612 792 0 0 0 0 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.FB/A4 Borderless 210x297mm" 595.296 841.896 0 0 0 0 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 8.4 8.4 8.4 8.4 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1A%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1A - - - - -//////// PCL3-Class1B -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1B%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1B - -//////// PCL3-Class2 -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - Attribute "HPSPDClass" "" 1 - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 8.4 8.4 8.4 8.4 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6.FB/Borderless Photo 4x6in" 288 432 0 0 0 0 "<</cupsInteger0 74/cupsReal0 .098/cupsReal1 .098/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/cupsReal0 0/cupsReal1 0/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 8.4 8.4 8.4 8.4 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo5x7.FB/Photo Borderless 5x7in" 360 504 0 0 0 0 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 8.4 8.4 8.4 8.4 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.FB/Letter Borderless 8.5x11in" 612 792 0 0 0 0 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 8.4 8.4 8.4 8.4 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.FB/A4 Borderless 210x297mm" 595.44 841.68 0 0 0 0 "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 8.4 8.4 8.4 8.4 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.76 623.52 8.4 8.4 8.4 8.4 "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.76 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class2%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class2 - //////// PCL3-Class3 { Attribute "cupsEvenDuplex" "" "True" @@ -5988,12 +5251,12 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 Option "ColorModel/Output Mode" PickOne AnySetup 10.0 //*Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" *Choice "RGB/4-Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowCount 3/cupsRowStep 0>>setpagedevice" - //Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" + Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - //Print In Grayscale : TODO:-handle in Hbpl1 code - //Option "Gray/Print in Grayscale" Boolean AnySetup 10.0 - //*Choice "False/Off" "<</cupsInteger3 0>>setpagedevice" - //Choice "True/On" "<</cupsInteger3 1>>setpagedevice" + // Print In Grayscale : TODO:-handle in Hbpl1 code + Option "Gray/Print in Grayscale" Boolean AnySetup 10.0 + *Choice "False/Off" "<</cupsInteger3 0>>setpagedevice" + Choice "True/On" "<</cupsInteger3 1>>setpagedevice" //cupsCompression values map to QUALITY_MODE from global_types.h Option "OutputMode/Print Quality" PickOne AnySetup 10.0 diff --git a/prnt/drv/hpijs.drv.in b/prnt/drv/hpijs.drv.in index f645985fc..293763ffc 100644 --- a/prnt/drv/hpijs.drv.in +++ b/prnt/drv/hpijs.drv.in @@ -12225,6 +12225,24 @@ Transparency" // <%Hbpl1:Mono%> { + ModelName "HP Laser Ns 1020 hpijs" + Attribute "NickName" "" "HP Laser Ns 1020 hpijs, $Version" + Attribute "ShortNickName" "" "HP Laser Ns 1020 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laser ns 1020;DES:hp laser ns 1020;" + PCFileName "hp-laser_ns_1020-hpijs.ppd" + Attribute "Product" "" "(HP Laser Ns 1020)" + Attribute "Product" "" "(HP Laser Ns 1020w)" + } + { + ModelName "HP Laser Ns MFP 1005 hpijs" + Attribute "NickName" "" "HP Laser Ns MFP 1005 hpijs, $Version" + Attribute "ShortNickName" "" "HP Laser Ns MFP 1005 hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laser ns mfp 1005;DES:hp laser ns mfp 1005;" + PCFileName "hp-laser_ns_mfp_1005-hpijs.ppd" + Attribute "Product" "" "(HP Laser Ns MFP 1005)" + Attribute "Product" "" "(HP Laser Ns MFP 1005w)" + } + { ModelName "HP LaserJet m101-m106 hpijs" Attribute "NickName" "" "HP LaserJet m101-m106 hpijs, $Version" Attribute "ShortNickName" "" "HP LaserJet m101-m106 hpijs" @@ -12449,6 +12467,24 @@ Transparency" PCFileName "hp-laserjet_pro_mfp_m27cnw-hpijs.ppd" Attribute "Product" "" "(HP LaserJet Pro MFP m27cnw)" } + { + ModelName "HP Neverstop Laser 100x hpijs" + Attribute "NickName" "" "HP Neverstop Laser 100x hpijs, $Version" + Attribute "ShortNickName" "" "HP Neverstop Laser 100x hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp neverstop laser 100x;DES:hp neverstop laser 100x;" + PCFileName "hp-neverstop_laser_100x-hpijs.ppd" + Attribute "Product" "" "(HP Neverstop Laser 1000a)" + Attribute "Product" "" "(HP Neverstop Laser 1000w)" + } + { + ModelName "HP Neverstop Laser MFP 120x hpijs" + Attribute "NickName" "" "HP Neverstop Laser MFP 120x hpijs, $Version" + Attribute "ShortNickName" "" "hp_neverstop_laser_mfp_120x" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp neverstop laser mfp 120x;DES:hp neverstop laser mfp 120x;" + PCFileName "hp-neverstop_laser_mfp_120x-hpijs.ppd" + Attribute "Product" "" "(HP Neverstop Laser MFP 1200a)" + Attribute "Product" "" "(HP Neverstop Laser MFP 1200w)" + } // <%Hbpl1:Color%> { ModelName "HP Color LaserJet Pro MFP m176n hpijs" @@ -13733,270 +13769,6 @@ lity:PenSet=2,Quality:FullBleed=1" } // end CopperheadXLP -//////// SPDMainstreamCoreConsumerA -{ - Attribute "DefaultResolution" "" "600dpi" - - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 9 - VariablePaperSize Yes - MinSize 1in 4in - MaxSize 936 1368 - Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& -EVICEHEIGHTPOINTS=0" - - Attribute "FoomaticIDs" "" "HP-DeskJet_5650 hpijs" - Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& -USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C -dIjsUseOutputFD%Z -sOutputFi&& -le=- -" - Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" - Attribute "FoomaticRIPOptionSetting" "Model=HP-DeskJet_5650" " -sDeviceManufacture&& -r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5600"" - Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300FastDraftCol&& -orCMYK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300FastDra&& -ftGrayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& -aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& -eK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFu&& -llBleed" - Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine C" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" - Attribute "FoomaticRIPOptionSetting" "InputSlot=PhotoTray" ",PS:MediaPosition=6" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Upper" ",PS:MediaPosition=1" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Lower" ",PS:MediaPosition=4" - Attribute "FoomaticRIPOptionSetting" "InputSlot=CDDVDTray" ",PS:MediaPosition=14" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Envelope" ",PS:MediaPosition=3" - Attribute "FoomaticRIPOptionSetting" "InputSlot=LargeCapacity" ",PS:MediaPosition=&& -5" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" - Attribute "FoomaticRIPOptionSetting" "InputSlot=MPTray" ",PS:MediaPosition=8" - Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" - Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& -dDEVICEHEIGHTPOINTS=792" - Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& -ICEHEIGHTPOINTS=842" - Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& -DEVICEHEIGHTPOINTS=432" - Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& - -dDEVICEHEIGHTPOINTS=504" - Attribute "FoomaticRIPOptionSetting" "PageSize=PhotoTearOff" " -dDEVICEWIDTHPOINTS&& -=288 -dDEVICEHEIGHTPOINTS=432" - Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& -VICEHEIGHTPOINTS=360" - Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& -VICEHEIGHTPOINTS=576" - Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& -ICEHEIGHTPOINTS=595" - Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& -ICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=A6TearOff" " -dDEVICEWIDTHPOINTS=29&& -7 -dDEVICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& -DEVICEHEIGHTPOINTS=729" - Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD80" " -dDEVICEWIDTHPOINTS=237 && --dDEVICEHEIGHTPOINTS=237" - Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD120" " -dDEVICEWIDTHPOINTS=360&& - -dDEVICEHEIGHTPOINTS=360" - Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& -DEVICEHEIGHTPOINTS=684" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& -DEVICEHEIGHTPOINTS=649" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& -DEVICEHEIGHTPOINTS=459" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& -DEVICEHEIGHTPOINTS=624" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& - -dDEVICEHEIGHTPOINTS=709" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& -79 -dDEVICEHEIGHTPOINTS=540" - Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& -2 -dDEVICEHEIGHTPOINTS=756" - Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& -EVICEHEIGHTPOINTS=936" - Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& -dDEVICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& -DEVICEHEIGHTPOINTS=1008" - Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& -dDEVICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& - -dDEVICEHEIGHTPOINTS=774" - Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& - -dDEVICEHEIGHTPOINTS=935" - /////////// Large format paper support - Attribute "FoomaticRIPOptionSetting" "PageSize=B4JIS" " -dDEVICEWIDTHPOINTS=729 -d&& -DEVICEHEIGHTPOINTS=1033" - Attribute "FoomaticRIPOptionSetting" "PageSize=Ledger" " -dDEVICEWIDTHPOINTS=792 -&& -dDEVICEHEIGHTPOINTS=1224" - Attribute "FoomaticRIPOptionSetting" "PageSize=SuperB" " -dDEVICEWIDTHPOINTS=936 -&& -dDEVICEHEIGHTPOINTS=1368" - Attribute "FoomaticRIPOptionSetting" "PageSize=w774h1116" " -dDEVICEWIDTHPOINTS=77&& -4 -dDEVICEHEIGHTPOINTS=1116" - Attribute "FoomaticRIPOptionSetting" "PageSize=A3" " -dDEVICEWIDTHPOINTS=842 -dDEV&& -ICEHEIGHTPOINTS=1190" - Attribute "FoomaticRIPOption" "DryTime" "enum CmdLine B" - Attribute "FoomaticRIPOptionSetting" "DryTime=Zero" "" - Attribute "FoomaticRIPOptionSetting" "DryTime=Five" ",DryTime=5" - Attribute "FoomaticRIPOptionSetting" "DryTime=Ten" ",DryTime=10" - Attribute "FoomaticRIPOptionSetting" "DryTime=Fifteen" ",DryTime=15" - Attribute "FoomaticRIPOptionSetting" "DryTime=Twenty" ",DryTime=20" - Attribute "FoomaticRIPOptionSetting" "DryTime=TwentyFive" ",DryTime=25" - Attribute "FoomaticRIPOptionSetting" "DryTime=Thirty" ",DryTime=30" - Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" - Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYK" " -r300 -sIjsParams=Qu&& -ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& -=2" - Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYKFullBleed" " -r300 -sIjs&& -Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& -ty:PenSet=2,Quality:FullBleed=1" - Attribute "FoomaticRIPOptionSetting" "Quality=300DraftColorCMYK" " -r300 -sIjsPara&& -ms=Quality:Quality=1,Quality:ColorMode=2,Quality:MediaType=0,Quality:P&& -enSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=300DraftGrayscaleK" " -r300 -sIjs&& -Params=Quality:Quality=1,Quality:ColorMode=0,Quality:MediaType=0,Quali&& -ty:PenSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftColorCMYK" " -r300 -sIjs&& -Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& -ty:PenSet=2,Quality:SpeedMech=1" - Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftGrayscaleK" " -r300 -&& -sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& -uality:PenSet=2,Quality:SpeedMech=1" - Attribute "FoomaticRIPOptionSetting" "Quality=300GrayscaleK" " -r300 -sIjsParam&& -s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& -nSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYK" " -r600 -sIjsParams=Qu&& -ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& -=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYKFullBleed" " -r600 -sIjs&& -Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& -ty:PenSet=2,Quality:FullBleed=1" - Attribute "FoomaticRIPOptionSetting" "Quality=600GrayscaleK" " -r600 -sIjsParam&& -s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& -nSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYK" " -r600 -sIjsParams=&& -Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Quality:PenS&& -et=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYKFullBleed" " -r600 -sI&& -jsParams=Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Qua&& -lity:PenSet=2,Quality:FullBleed=1" - Group "General/General" - Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 - Choice "Draft/Draft (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" - Choice "Draft.Gray/Draft Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" - *Choice "Normal/Normal (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" - Choice "Normal.Gray/Normal Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal.Gray" - Choice "High/High Quality (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High" - Choice "High.Gray/High Quality Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High.Gray" - Choice "Photo/Photo (on photo paper)" "%% FoomaticRIPOptionSetting: PrintoutMode=Photo" - Option "InputSlot/Media Source" PickOne AnySetup 100.0 - *Choice "Default/Printer default" "%% FoomaticRIPOptionSetting: InputSlot=Default" - Choice "PhotoTray/Photo Tray" "%% FoomaticRIPOptionSetting: InputSlot=PhotoTray" - Choice "Upper/Upper Tray" "%% FoomaticRIPOptionSetting: InputSlot=Upper" - Choice "Lower/Lower Tray" "%% FoomaticRIPOptionSetting: InputSlot=Lower" - Choice "CDDVDTray/CD or DVD Tray" "%% FoomaticRIPOptionSetting: InputSlot=CDDVDTray" - Choice "Envelope/Envelope Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Envelope" - Choice "LargeCapacity/Large Capacity Tray" "%% FoomaticRIPOptionSetting: InputSlot=LargeCapacity" - Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" - Choice "MPTray/Multi Purpose Tray" "%% FoomaticRIPOptionSetting: InputSlot=MPTray" - Option "DryTime/Additional Dry Time" PickOne AnySetup 120.0 - *Choice "Zero/Printer Default" "%% FoomaticRIPOptionSetting: DryTime=Zero" - Choice "Five/5 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Five" - Choice "Ten/10 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Ten" - Choice "Fifteen/15 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Fifteen" - Choice "Twenty/20 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Twenty" - Choice "TwentyFive/25 Seconds" "%% FoomaticRIPOptionSetting: DryTime=TwentyFive" - Choice "Thirty/30 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Thirty" - Group "PrintoutMode/Printout Mode" - Option "Quality/Resolution, Quality, Ink Type, Media Type" PickOne AnySetup 100.0 - *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" - Choice "300ColorCMYK/300 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYK" - Choice "300ColorCMYKFullBleed/300 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYKFullBleed" - Choice "300DraftColorCMYK/300 dpi, Draft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftColorCMYK" - Choice "300DraftGrayscaleK/300 dpi, Draft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftGrayscaleK" - Choice "300FastDraftColorCMYK/300 dpi, FastDraft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftColorCMYK" - Choice "300FastDraftGrayscaleK/300 dpi, FastDraft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleK" - Choice "300GrayscaleK/300 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300GrayscaleK" - Choice "600ColorCMYK/600 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYK" - Choice "600ColorCMYKFullBleed/600 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYKFullBleed" - Choice "600GrayscaleK/600 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=600GrayscaleK" - Choice "600PhotoCMYK/600 dpi, Photo, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYK" - Choice "600PhotoCMYKFullBleed/600 dpi, Photo, Full Bleed, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYKFullBleed" - *CustomMedia "Letter/Letter" 612.00 792.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" - CustomMedia "A4/A4" 595.00 842.00 9.72 36.00 9.72 9.00 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" - CustomMedia "Photo/Photo or 4x6 inch index card" 288.00 432.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" - CustomMedia "Photo5x7/Photo or 5x7 inch index card" 360.00 504.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" - CustomMedia "PhotoTearOff/Photo with tear-off tab" 288.00 432.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" - CustomMedia "3x5/3x5 inch index card" 216.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" - CustomMedia "5x8/5x8 inch index card" 360.00 576.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" - CustomMedia "A5/A5" 420.00 595.00 9.00 36.00 9.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" - CustomMedia "A6/A6" 297.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" - CustomMedia "A6TearOff/A6 with tear-off tab" 297.00 420.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" - CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" - CustomMedia "CDDVD80/CD or DVD 80 mm" 237.00 237.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" - CustomMedia "CDDVD120/CD or DVD 120 mm" 360.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" - CustomMedia "Env10/Envelope #10" 297.00 684.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" - CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" - CustomMedia "EnvC6/Envelope C6" 323.00 459.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" - CustomMedia "EnvDL/Envelope DL" 312.00 624.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" - CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" - CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" - CustomMedia "Executive/Executive" 522.00 756.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" - CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" - CustomMedia "Hagaki/Hagaki" 283.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" - CustomMedia "Legal/Legal" 612.00 1008.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" - CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" - CustomMedia "w558h774/16K" 558.00 774.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" - CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" - - // <%Mimas17:Normal%> - { - ModelName "HP Deskjet 5000 Series hpijs" - Attribute "NickName" "" "HP Deskjet 5000 Series hpijs, $Version" - Attribute "ShortNickName" "" "HP Deskjet 5000 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 5000 series;DES:deskjet 5000 series;" - PCFileName "hp-deskjet_5000_series-hpijs.ppd" - Attribute "Product" "" "(HP Deskjet Ink Advantage 5075 All-in-one)" - } - { - ModelName "HP Deskjet 5200 Series hpijs" - Attribute "NickName" "" "HP Deskjet 5200 Series hpijs, $Version" - Attribute "ShortNickName" "" "HP Deskjet 5200 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 5200 series;DES:deskjet 5200 series;" - PCFileName "hp-deskjet_5200_series-hpijs.ppd" - Attribute "Product" "" "(HP Deskjet Ink Advantage 5275 All-in-one)" - } - { - ModelName "HP Envy 5000 Series hpijs" - Attribute "NickName" "" "HP Envy 5000 Series hpijs, $Version" - Attribute "ShortNickName" "" "HP Envy 5000 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:envy 5000 series;DES:envy 5000 series;" - PCFileName "hp-envy_5000_series-hpijs.ppd" - Attribute "Product" "" "(HP Envy 5000 All-in-one)" - Attribute "Product" "" "(HP Envy 5020 All-in-one)" - Attribute "Product" "" "(HP Envy 5032 All-in-one)" - Attribute "Product" "" "(HP Envy 5030 All-in-one)" - } - { - ModelName "HP Officejet 5200 Series hpijs" - Attribute "NickName" "" "HP Officejet 5200 Series hpijs, $Version" - Attribute "ShortNickName" "" "HP Officejet 5200 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5200 series;DES:officejet 5200 series;" - PCFileName "hp-officejet_5200_series-hpijs.ppd" - Attribute "Product" "" "(HP Officejet 5200 All-in-one)" - Attribute "Product" "" "(HP Officejet 5220 All-in-one)" - Attribute "Product" "" "(HP Officejet 5230 All-in-one)" - Attribute "Product" "" "(HP Officejet 5232 All-in-one)" - } - -}// End SPDMainstreamCoreConsumerA - - ////////// CLE { Attribute "DefaultResolution" "" "1200dpi" @@ -15929,6 +15701,62 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Smart Tank 350)" } { + ModelName "HP Smart Tank 500 Series hpijs" + Attribute "NickName" "" "HP Smart Tank 500 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Smart Tank 500 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 500 series;DES:smart tank 500 series;" + PCFileName "hp-smart_tank_500_series-hpijs.ppd" + Attribute "Product" "" "(HP Smart Tank 500 Series)" + } + { + ModelName "HP Smart Tank 510 Series hpijs" + Attribute "NickName" "" "HP Smart Tank 510 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Smart Tank 510 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 510 series;DES:smart tank 510 series;" + PCFileName "hp-smart_tank_510_series-hpijs.ppd" + Attribute "Product" "" "(HP Smart Tank 510)" + } + { + ModelName "HP Smart Tank 530 Series hpijs" + Attribute "NickName" "" "HP Smart Tank 530 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Smart Tank 530 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 530 series;DES:smart tank 530 series;" + PCFileName "hp-smart_tank_530_series-hpijs.ppd" + Attribute "Product" "" "(HP Smart Tank 530 Series)" + } + { + ModelName "HP Smart Tank 610 Series hpijs" + Attribute "NickName" "" "HP Smart Tank 610 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Smart Tank 610 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank 610 series;DES:smart tank 610 series;" + PCFileName "hp-smart_tank_610_series-hpijs.ppd" + Attribute "Product" "" "(HP Smart Tank 610)" + } + { + ModelName "HP Smart Tank Plus 550 Series hpijs" + Attribute "NickName" "" "HP Smart Tank Plus 550 Series hpijs, $Version" + Attribute "ShortNickName" "" "smart_tank_plus_550_series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank plus 550 series;DES:smart tank plus 550 series;" + PCFileName "hp-smart_tank_plus_550_series-hpijs.ppd" + Attribute "Product" "" "(HP Smart Tank Plus 550)" + } + { + ModelName "HP Smart Tank Plus 570 Series hpijs" + Attribute "NickName" "" "HP Smart Tank Plus 570 Series hpijs, $Version" + Attribute "ShortNickName" "" "smart_tank_plus_570_series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank plus 570 series;DES:smart tank plus 570 series;" + PCFileName "hp-smart_tank_plus_570_series-hpijs.ppd" + Attribute "Product" "" "(HP Smart Tank Plus 570 Series)" + } + { + ModelName "HP Smart Tank Plus 650 Series hpijs" + Attribute "NickName" "" "HP Smart Tank Plus 650 Series hpijs, $Version" + Attribute "ShortNickName" "" "smart_tank_plus_650_series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:smart tank plus 650 series;DES:smart tank plus 650 series;" + PCFileName "hp-smart_tank_plus_650_series-hpijs.ppd" + Attribute "Product" "" "(HP Smart Tank Plus 650)" + } + { ModelName "HP Smart Tank Wireless 450 Series hpijs" Attribute "NickName" "" "HP Smart Tank Wireless 450 Series hpijs, $Version" Attribute "ShortNickName" "" "HP Smart TK WL 450 Series hpijs" @@ -16194,6 +16022,22 @@ lity:PenSet=2,Quality:FullBleed=1" // <%SPDOfficejetProAsize:Normal%> { + ModelName "HP Officejet 8010 Series hpijs" + Attribute "NickName" "" "HP Officejet 8010 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet 8010 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet 8010 series;DES:hp officejet 8010 series;" + PCFileName "hp-officejet_8010_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet 8010 All-in-one Printer Series)" + } + { + ModelName "HP Officejet 8020 Series hpijs" + Attribute "NickName" "" "HP Officejet 8020 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet 8020 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet 8020 series;DES:hp officejet 8020 series;" + PCFileName "hp-officejet_8020_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet 8020 All-in-one Printer Series)" + } + { ModelName "HP Officejet 8700 hpijs" Attribute "NickName" "" "HP Officejet 8700 hpijs, $Version" Attribute "ShortNickName" "" "HP Officejet 8700 hpijs" @@ -16202,6 +16046,30 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Officejet 8702 All-in-one)" } { + ModelName "HP Officejet 9010 Series hpijs" + Attribute "NickName" "" "HP Officejet 9010 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP Officejet 9010 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet 9010 series;DES:hp officejet 9010 series;" + PCFileName "hp-officejet_9010_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet All-in-one 9010)" + } + { + ModelName "HP Officejet Pro 8020 Series hpijs" + Attribute "NickName" "" "HP Officejet Pro 8020 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP OJ Pro 8020 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8020 series;DES:hp officejet pro 8020 series;" + PCFileName "hp-officejet_pro_8020_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro 8020 All-in-one Printer Series)" + } + { + ModelName "HP Officejet Pro 8030 Series hpijs" + Attribute "NickName" "" "HP Officejet Pro 8030 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP OJ Pro 8030 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 8030 series;DES:hp officejet pro 8030 series;" + PCFileName "hp-officejet_pro_8030_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro 8030 All-in-one Printer Series)" + } + { ModelName "HP Officejet Pro 8710 hpijs" Attribute "NickName" "" "HP Officejet Pro 8710 hpijs, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 8710 hpijs" @@ -16219,6 +16087,22 @@ lity:PenSet=2,Quality:FullBleed=1" Attribute "Product" "" "(HP Officejet Pro 8720 All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 8725 All-in-one Printer)" } + { + ModelName "HP Officejet Pro 9010 Series hpijs" + Attribute "NickName" "" "HP Officejet Pro 9010 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP OJ Pro 9010 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 9010 series;DES:hp officejet pro 9010 series;" + PCFileName "hp-officejet_pro_9010_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro All-in-one 9010)" + } + { + ModelName "HP Officejet Pro 9020 Series hpijs" + Attribute "NickName" "" "HP Officejet Pro 9020 Series hpijs, $Version" + Attribute "ShortNickName" "" "HP OJ Pro 9020 Series hpijs" + Attribute "1284DeviceID" "" "MFG:HP;MDL:hp officejet pro 9020 series;DES:hp officejet pro 9020 series;" + PCFileName "hp-officejet_pro_9020_series-hpijs.ppd" + Attribute "Product" "" "(HP Officejet Pro All-in-one 9020)" + } } { @@ -16560,496 +16444,6 @@ lity:PenSet=2,Quality:FullBleed=1" } } // end Saipan -//////// PCL3-Class1 -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1 - -//////// PCL3-Class1A -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1A%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1A - - - - -//////// PCL3-Class1B -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1B%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1B - -//////// PCL3-Class2 -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "497" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class2%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class2 //////// PCL3-Class3 { @@ -17193,7 +16587,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 MinSize 3in 5in MaxSize 8.5in 14in - // <%PCL3-Class2%> + // <%PCL3-Class3%> } // End Supported media sizes with full bleed. } // End PCL3-Class3 diff --git a/prnt/drv/hpijs.drv.in.template b/prnt/drv/hpijs.drv.in.template index 0fa633ba9..3ae87af0f 100644 --- a/prnt/drv/hpijs.drv.in.template +++ b/prnt/drv/hpijs.drv.in.template @@ -7384,232 +7384,6 @@ lity:PenSet=2,Quality:FullBleed=1" } // end CopperheadXLP -//////// SPDMainstreamCoreConsumerA -{ - Attribute "DefaultResolution" "" "600dpi" - - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 9 - VariablePaperSize Yes - MinSize 1in 4in - MaxSize 936 1368 - Attribute "FoomaticRIPOptionSetting" "PageSize=Custom" " -dDEVICEWIDTHPOINTS=0 -dD&& -EVICEHEIGHTPOINTS=0" - - Attribute "FoomaticIDs" "" "HP-DeskJet_5650 hpijs" - Attribute "FoomaticRIPCommandLine" "" "gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPA&& -USE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C -dIjsUseOutputFD%Z -sOutputFi&& -le=- -" - Attribute "FoomaticRIPOption" "Model" "enum CmdLine A 100" - Attribute "FoomaticRIPOptionSetting" "Model=HP-DeskJet_5650" " -sDeviceManufacture&& -r="HEWLETT-PACKARD" -sDeviceModel="deskjet 5600"" - Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300FastDraftCol&& -orCMYK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300FastDra&& -ftGrayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& -aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& -eK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFu&& -llBleed" - Attribute "FoomaticRIPOption" "InputSlot" "enum CmdLine C" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Default" ",PS:MediaPosition=7" - Attribute "FoomaticRIPOptionSetting" "InputSlot=PhotoTray" ",PS:MediaPosition=6" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Upper" ",PS:MediaPosition=1" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Lower" ",PS:MediaPosition=4" - Attribute "FoomaticRIPOptionSetting" "InputSlot=CDDVDTray" ",PS:MediaPosition=14" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Envelope" ",PS:MediaPosition=3" - Attribute "FoomaticRIPOptionSetting" "InputSlot=LargeCapacity" ",PS:MediaPosition=&& -5" - Attribute "FoomaticRIPOptionSetting" "InputSlot=Manual" ",PS:MediaPosition=2" - Attribute "FoomaticRIPOptionSetting" "InputSlot=MPTray" ",PS:MediaPosition=8" - Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" - Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& -dDEVICEHEIGHTPOINTS=792" - Attribute "FoomaticRIPOptionSetting" "PageSize=A4" " -dDEVICEWIDTHPOINTS=595 -dDEV&& -ICEHEIGHTPOINTS=842" - Attribute "FoomaticRIPOptionSetting" "PageSize=Photo" " -dDEVICEWIDTHPOINTS=288 -d&& -DEVICEHEIGHTPOINTS=432" - Attribute "FoomaticRIPOptionSetting" "PageSize=Photo5x7" " -dDEVICEWIDTHPOINTS=360&& - -dDEVICEHEIGHTPOINTS=504" - Attribute "FoomaticRIPOptionSetting" "PageSize=PhotoTearOff" " -dDEVICEWIDTHPOINTS&& -=288 -dDEVICEHEIGHTPOINTS=432" - Attribute "FoomaticRIPOptionSetting" "PageSize=3x5" " -dDEVICEWIDTHPOINTS=216 -dDE&& -VICEHEIGHTPOINTS=360" - Attribute "FoomaticRIPOptionSetting" "PageSize=5x8" " -dDEVICEWIDTHPOINTS=360 -dDE&& -VICEHEIGHTPOINTS=576" - Attribute "FoomaticRIPOptionSetting" "PageSize=A5" " -dDEVICEWIDTHPOINTS=420 -dDEV&& -ICEHEIGHTPOINTS=595" - Attribute "FoomaticRIPOptionSetting" "PageSize=A6" " -dDEVICEWIDTHPOINTS=297 -dDEV&& -ICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=A6TearOff" " -dDEVICEWIDTHPOINTS=29&& -7 -dDEVICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=B5JIS" " -dDEVICEWIDTHPOINTS=516 -d&& -DEVICEHEIGHTPOINTS=729" - Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD80" " -dDEVICEWIDTHPOINTS=237 && --dDEVICEHEIGHTPOINTS=237" - Attribute "FoomaticRIPOptionSetting" "PageSize=CDDVD120" " -dDEVICEWIDTHPOINTS=360&& - -dDEVICEHEIGHTPOINTS=360" - Attribute "FoomaticRIPOptionSetting" "PageSize=Env10" " -dDEVICEWIDTHPOINTS=297 -d&& -DEVICEHEIGHTPOINTS=684" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC5" " -dDEVICEWIDTHPOINTS=459 -d&& -DEVICEHEIGHTPOINTS=649" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvC6" " -dDEVICEWIDTHPOINTS=323 -d&& -DEVICEHEIGHTPOINTS=459" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvDL" " -dDEVICEWIDTHPOINTS=312 -d&& -DEVICEHEIGHTPOINTS=624" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvISOB5" " -dDEVICEWIDTHPOINTS=499&& - -dDEVICEHEIGHTPOINTS=709" - Attribute "FoomaticRIPOptionSetting" "PageSize=EnvMonarch" " -dDEVICEWIDTHPOINTS=2&& -79 -dDEVICEHEIGHTPOINTS=540" - Attribute "FoomaticRIPOptionSetting" "PageSize=Executive" " -dDEVICEWIDTHPOINTS=52&& -2 -dDEVICEHEIGHTPOINTS=756" - Attribute "FoomaticRIPOptionSetting" "PageSize=FLSA" " -dDEVICEWIDTHPOINTS=612 -dD&& -EVICEHEIGHTPOINTS=936" - Attribute "FoomaticRIPOptionSetting" "PageSize=Hagaki" " -dDEVICEWIDTHPOINTS=283 -&& -dDEVICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=Legal" " -dDEVICEWIDTHPOINTS=612 -d&& -DEVICEHEIGHTPOINTS=1008" - Attribute "FoomaticRIPOptionSetting" "PageSize=Oufuku" " -dDEVICEWIDTHPOINTS=567 -&& -dDEVICEHEIGHTPOINTS=420" - Attribute "FoomaticRIPOptionSetting" "PageSize=w558h774" " -dDEVICEWIDTHPOINTS=558&& - -dDEVICEHEIGHTPOINTS=774" - Attribute "FoomaticRIPOptionSetting" "PageSize=w612h935" " -dDEVICEWIDTHPOINTS=612&& - -dDEVICEHEIGHTPOINTS=935" - /////////// Large format paper support - Attribute "FoomaticRIPOptionSetting" "PageSize=B4JIS" " -dDEVICEWIDTHPOINTS=729 -d&& -DEVICEHEIGHTPOINTS=1033" - Attribute "FoomaticRIPOptionSetting" "PageSize=Ledger" " -dDEVICEWIDTHPOINTS=792 -&& -dDEVICEHEIGHTPOINTS=1224" - Attribute "FoomaticRIPOptionSetting" "PageSize=SuperB" " -dDEVICEWIDTHPOINTS=936 -&& -dDEVICEHEIGHTPOINTS=1368" - Attribute "FoomaticRIPOptionSetting" "PageSize=w774h1116" " -dDEVICEWIDTHPOINTS=77&& -4 -dDEVICEHEIGHTPOINTS=1116" - Attribute "FoomaticRIPOptionSetting" "PageSize=A3" " -dDEVICEWIDTHPOINTS=842 -dDEV&& -ICEHEIGHTPOINTS=1190" - Attribute "FoomaticRIPOption" "DryTime" "enum CmdLine B" - Attribute "FoomaticRIPOptionSetting" "DryTime=Zero" "" - Attribute "FoomaticRIPOptionSetting" "DryTime=Five" ",DryTime=5" - Attribute "FoomaticRIPOptionSetting" "DryTime=Ten" ",DryTime=10" - Attribute "FoomaticRIPOptionSetting" "DryTime=Fifteen" ",DryTime=15" - Attribute "FoomaticRIPOptionSetting" "DryTime=Twenty" ",DryTime=20" - Attribute "FoomaticRIPOptionSetting" "DryTime=TwentyFive" ",DryTime=25" - Attribute "FoomaticRIPOptionSetting" "DryTime=Thirty" ",DryTime=30" - Attribute "FoomaticRIPOption" "Quality" "enum CmdLine B" - Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYK" " -r300 -sIjsParams=Qu&& -ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& -=2" - Attribute "FoomaticRIPOptionSetting" "Quality=300ColorCMYKFullBleed" " -r300 -sIjs&& -Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& -ty:PenSet=2,Quality:FullBleed=1" - Attribute "FoomaticRIPOptionSetting" "Quality=300DraftColorCMYK" " -r300 -sIjsPara&& -ms=Quality:Quality=1,Quality:ColorMode=2,Quality:MediaType=0,Quality:P&& -enSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=300DraftGrayscaleK" " -r300 -sIjs&& -Params=Quality:Quality=1,Quality:ColorMode=0,Quality:MediaType=0,Quali&& -ty:PenSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftColorCMYK" " -r300 -sIjs&& -Params=Quality:Quality=4,Quality:ColorMode=2,Quality:MediaType=0,Quali&& -ty:PenSet=2,Quality:SpeedMech=1" - Attribute "FoomaticRIPOptionSetting" "Quality=300FastDraftGrayscaleK" " -r300 -&& -sIjsParams=Quality:Quality=4,Quality:ColorMode=0,Quality:MediaType=0,Q&& -uality:PenSet=2,Quality:SpeedMech=1" - Attribute "FoomaticRIPOptionSetting" "Quality=300GrayscaleK" " -r300 -sIjsParam&& -s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& -nSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYK" " -r600 -sIjsParams=Qu&& -ality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quality:PenSet&& -=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600ColorCMYKFullBleed" " -r600 -sIjs&& -Params=Quality:Quality=0,Quality:ColorMode=2,Quality:MediaType=0,Quali&& -ty:PenSet=2,Quality:FullBleed=1" - Attribute "FoomaticRIPOptionSetting" "Quality=600GrayscaleK" " -r600 -sIjsParam&& -s=Quality:Quality=0,Quality:ColorMode=0,Quality:MediaType=0,Quality:Pe&& -nSet=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYK" " -r600 -sIjsParams=&& -Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Quality:PenS&& -et=2" - Attribute "FoomaticRIPOptionSetting" "Quality=600PhotoCMYKFullBleed" " -r600 -sI&& -jsParams=Quality:Quality=2,Quality:ColorMode=2,Quality:MediaType=2,Qua&& -lity:PenSet=2,Quality:FullBleed=1" - Group "General/General" - Option "PrintoutMode/Printout Mode" PickOne AnySetup 10.0 - Choice "Draft/Draft (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft" - Choice "Draft.Gray/Draft Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Draft.Gray" - *Choice "Normal/Normal (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal" - Choice "Normal.Gray/Normal Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=Normal.Gray" - Choice "High/High Quality (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High" - Choice "High.Gray/High Quality Grayscale (auto-detect paper type)" "%% FoomaticRIPOptionSetting: PrintoutMode=High.Gray" - Choice "Photo/Photo (on photo paper)" "%% FoomaticRIPOptionSetting: PrintoutMode=Photo" - Option "InputSlot/Media Source" PickOne AnySetup 100.0 - *Choice "Default/Printer default" "%% FoomaticRIPOptionSetting: InputSlot=Default" - Choice "PhotoTray/Photo Tray" "%% FoomaticRIPOptionSetting: InputSlot=PhotoTray" - Choice "Upper/Upper Tray" "%% FoomaticRIPOptionSetting: InputSlot=Upper" - Choice "Lower/Lower Tray" "%% FoomaticRIPOptionSetting: InputSlot=Lower" - Choice "CDDVDTray/CD or DVD Tray" "%% FoomaticRIPOptionSetting: InputSlot=CDDVDTray" - Choice "Envelope/Envelope Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Envelope" - Choice "LargeCapacity/Large Capacity Tray" "%% FoomaticRIPOptionSetting: InputSlot=LargeCapacity" - Choice "Manual/Manual Feeder" "%% FoomaticRIPOptionSetting: InputSlot=Manual" - Choice "MPTray/Multi Purpose Tray" "%% FoomaticRIPOptionSetting: InputSlot=MPTray" - Option "DryTime/Additional Dry Time" PickOne AnySetup 120.0 - *Choice "Zero/Printer Default" "%% FoomaticRIPOptionSetting: DryTime=Zero" - Choice "Five/5 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Five" - Choice "Ten/10 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Ten" - Choice "Fifteen/15 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Fifteen" - Choice "Twenty/20 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Twenty" - Choice "TwentyFive/25 Seconds" "%% FoomaticRIPOptionSetting: DryTime=TwentyFive" - Choice "Thirty/30 Seconds" "%% FoomaticRIPOptionSetting: DryTime=Thirty" - Group "PrintoutMode/Printout Mode" - Option "Quality/Resolution, Quality, Ink Type, Media Type" PickOne AnySetup 100.0 - *Choice "FromPrintoutMode/Controlled by 'Printout Mode'" "%% FoomaticRIPOptionSetting: Quality=@PrintoutMode" - Choice "300ColorCMYK/300 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYK" - Choice "300ColorCMYKFullBleed/300 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300ColorCMYKFullBleed" - Choice "300DraftColorCMYK/300 dpi, Draft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftColorCMYK" - Choice "300DraftGrayscaleK/300 dpi, Draft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300DraftGrayscaleK" - Choice "300FastDraftColorCMYK/300 dpi, FastDraft, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftColorCMYK" - Choice "300FastDraftGrayscaleK/300 dpi, FastDraft, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300FastDraftGrayscaleK" - Choice "300GrayscaleK/300 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=300GrayscaleK" - Choice "600ColorCMYK/600 dpi, Color, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYK" - Choice "600ColorCMYKFullBleed/600 dpi, Color, Full Bleed, Black + Color Cartr." "%% FoomaticRIPOptionSetting: Quality=600ColorCMYKFullBleed" - Choice "600GrayscaleK/600 dpi, Grayscale, Black Cartr." "%% FoomaticRIPOptionSetting: Quality=600GrayscaleK" - Choice "600PhotoCMYK/600 dpi, Photo, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYK" - Choice "600PhotoCMYKFullBleed/600 dpi, Photo, Full Bleed, Black + Color Cartr., Photo Paper" "%% FoomaticRIPOptionSetting: Quality=600PhotoCMYKFullBleed" - *CustomMedia "Letter/Letter" 612.00 792.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Letter" "%% FoomaticRIPOptionSetting: PageSize=Letter" - CustomMedia "A4/A4" 595.00 842.00 9.72 36.00 9.72 9.00 "%% FoomaticRIPOptionSetting: PageSize=A4" "%% FoomaticRIPOptionSetting: PageSize=A4" - CustomMedia "Photo/Photo or 4x6 inch index card" 288.00 432.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo" "%% FoomaticRIPOptionSetting: PageSize=Photo" - CustomMedia "Photo5x7/Photo or 5x7 inch index card" 360.00 504.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" "%% FoomaticRIPOptionSetting: PageSize=Photo5x7" - CustomMedia "PhotoTearOff/Photo with tear-off tab" 288.00 432.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" "%% FoomaticRIPOptionSetting: PageSize=PhotoTearOff" - CustomMedia "3x5/3x5 inch index card" 216.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=3x5" "%% FoomaticRIPOptionSetting: PageSize=3x5" - CustomMedia "5x8/5x8 inch index card" 360.00 576.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=5x8" "%% FoomaticRIPOptionSetting: PageSize=5x8" - CustomMedia "A5/A5" 420.00 595.00 9.00 36.00 9.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=A5" "%% FoomaticRIPOptionSetting: PageSize=A5" - CustomMedia "A6/A6" 297.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6" "%% FoomaticRIPOptionSetting: PageSize=A6" - CustomMedia "A6TearOff/A6 with tear-off tab" 297.00 420.00 0.00 0.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" "%% FoomaticRIPOptionSetting: PageSize=A6TearOff" - CustomMedia "B5JIS/B5 (JIS)" 516.00 729.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=B5JIS" "%% FoomaticRIPOptionSetting: PageSize=B5JIS" - CustomMedia "CDDVD80/CD or DVD 80 mm" 237.00 237.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" "%% FoomaticRIPOptionSetting: PageSize=CDDVD80" - CustomMedia "CDDVD120/CD or DVD 120 mm" 360.00 360.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" "%% FoomaticRIPOptionSetting: PageSize=CDDVD120" - CustomMedia "Env10/Envelope #10" 297.00 684.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Env10" "%% FoomaticRIPOptionSetting: PageSize=Env10" - CustomMedia "EnvC5/Envelope C5" 459.00 649.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC5" "%% FoomaticRIPOptionSetting: PageSize=EnvC5" - CustomMedia "EnvC6/Envelope C6" 323.00 459.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvC6" "%% FoomaticRIPOptionSetting: PageSize=EnvC6" - CustomMedia "EnvDL/Envelope DL" 312.00 624.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvDL" "%% FoomaticRIPOptionSetting: PageSize=EnvDL" - CustomMedia "EnvISOB5/Envelope B5" 499.00 709.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" "%% FoomaticRIPOptionSetting: PageSize=EnvISOB5" - CustomMedia "EnvMonarch/Envelope Monarch" 279.00 540.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" - CustomMedia "Executive/Executive" 522.00 756.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Executive" "%% FoomaticRIPOptionSetting: PageSize=Executive" - CustomMedia "FLSA/American Foolscap" 612.00 936.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=FLSA" "%% FoomaticRIPOptionSetting: PageSize=FLSA" - CustomMedia "Hagaki/Hagaki" 283.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Hagaki" "%% FoomaticRIPOptionSetting: PageSize=Hagaki" - CustomMedia "Legal/Legal" 612.00 1008.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=Legal" "%% FoomaticRIPOptionSetting: PageSize=Legal" - CustomMedia "Oufuku/Oufuku-Hagaki" 567.00 420.00 0.00 36.00 0.00 0.00 "%% FoomaticRIPOptionSetting: PageSize=Oufuku" "%% FoomaticRIPOptionSetting: PageSize=Oufuku" - CustomMedia "w558h774/16K" 558.00 774.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w558h774" "%% FoomaticRIPOptionSetting: PageSize=w558h774" - CustomMedia "w612h935/Executive (JIS)" 612.00 935.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=w612h935" "%% FoomaticRIPOptionSetting: PageSize=w612h935" - - // <%Mimas17:Normal%> - -}// End SPDMainstreamCoreConsumerA - - ////////// CLE { Attribute "DefaultResolution" "" "1200dpi" @@ -9754,496 +9528,6 @@ lity:PenSet=2,Quality:FullBleed=1" // <%Saipan15B:Normal%> } // end Saipan -//////// PCL3-Class1 -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 73/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1 - -//////// PCL3-Class1A -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 7/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 101/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1A%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1A - - - - -//////// PCL3-Class1B -{ - Attribute "cupsEvenDuplex" "" "False" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "117" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy1/Other photo inkjet papers" "<</MediaType/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "Coated1/HP Matte Presentation Paper" "<</MediaType/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - Choice "CDDVDMedia/CD or DVD Media" "<</MediaType(CDDVDMedia)/cupsMediaType 7>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - Choice "Draft/Draft" "<</OutputType(-2)/HWResolution[300 300]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 72/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 65/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class1B%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class1B - -//////// PCL3-Class2 -{ - Attribute "cupsEvenDuplex" "" "True" - Attribute "cupsBackSide" "" "Rotated" - Attribute "cupsFlipDuplex" "" "True" - Attribute "hpPrinterLanguage" "" "pcl3gui2" - Attribute "HPMechOffset" "" "497" - - Group "General/General" - - Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice" - *Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice" - - // MediaPosition values map to MediaSource enumeration in global_types.h - Option "InputSlot/Media Source" PickOne AnySetup 10.0 - *Choice "Auto/Auto-Select" "<</MediaPosition 7>>setpagedevice" - Choice "MainTray/Main Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Photo/Photo Tray" "<</MediaPosition 1>>setpagedevice" - Choice "Upper/Tray 1" "<</MediaPosition 1>>setpagedevice" - Choice "Lower/Tray 2" "<</MediaPosition 4>>setpagedevice" - - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - *Choice "RGB/Color" "<</cupsColorSpace 17/cupsBitsPerColor 8/cupsRowStep 0>>setpagedevice" - Choice "CMYGray/High Quality Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1>>setpagedevice" - Choice "KGray/Black Only Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2>>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 - *Choice "Plain/Plain Paper" "<</MediaType(Plain)/cupsMediaType 0>>setpagedevice" - Choice "ThickPlain/Thick plain paper" "<</MediaType(ThickPlain)/cupsMediaType 0>>setpagedevice" - Choice "PlainThick/Plain Papaer, Thick" "<</MediaType(PlainThick)/cupsMediaType 0>>setpagedevice" - Choice "PlainPaperLight/Plain Paper Light Recycled" "<</MediaType(PlainPaperLight)/cupsMediaType 1>>setpagedevice" - Choice "Glossy/HP Photo Papers" "<</MediaType(Glossy)/cupsMediaType 5>>setpagedevice" - Choice "FastGlossy/Other photo inkjet papers" "<</MediaType(FastGlossy)/cupsMediaType 5>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</MediaType(Photo)/cupsMediaType 5>>setpagedevice" - Choice "TransperancyFilm/Transperancy Film" "<</MediaType(TransperancyFilm)/cupsMediaType 4>>setpagedevice" - Choice "CoatedBrochure/HP Matte Brochure or Professional Paper" "<</MediaType(CoatedBrochure)/cupsMediaType 2>>setpagedevice" - Choice "Brochure/Other glossy inkjet Paper" "<</MediaType(Brochure)/cupsMediaType 8>>setpagedevice" - Choice "Coated/Other matte inkjet papers Paper" "<</MediaType(Coated)/cupsMediaType 2>>setpagedevice" - Choice "CoatedMatte/HP Matte Presentation Paper" "<</MediaType(CoatedMatte)/cupsMediaType 2>>setpagedevice" - Choice "HagakiGlossy/Photo hagaki" "<</MediaType(HagakiGlossy)/cupsMediaType 5>>setpagedevice" - Choice "BrochureGlosy/HP Glosy Brochure or Professional Paper" "<</MediaType(BrochureGlosy)/cupsMediaType 8>>setpagedevice" - Choice "BrochureHagaki/Inkjet hagaki" "<</MediaType(BrochureHagaki)/cupsMediaType 8>>setpagedevice" - Choice "Recycled/Plain Paper Light or Recycled" "<</MediaType(Recycled)/cupsMediaType 1>>setpagedevice" - - // cupsCompression values map to QUALITY_MODE from global_types.h - Option "OutputMode/Print Quality" PickOne AnySetup 10.0 - *Choice "Normal/Normal" "<</OutputType(0)/HWResolution[600 600]>>setpagedevice" - Choice "FastDraft/Fast Draft" "<</OutputType(-1)/HWResolution[300 300]>>setpagedevice" - Choice "Best/Best" "<</OutputType(1)/HWResolution[600 600]>>setpagedevice" - Choice "Photo/High-Resolution Photo" "<</OutputType(2)/HWResolution[1200 200]>>setpagedevice" - - // Duplexer is optional... - Installable "OptionDuplex/Duplexer Installed" - -// 4x6 or smaller - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9.36 9.36 9.36 9.36 "<</cupsInteger0 78/PageSize [216 360]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 78/PageSize[216 360]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo10x15/Photo 10x15cm" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 283.464 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283.464 419.544]/ImagingBBox null>>setpagedevice" - CustomMedia "Photo4x6/Photo 4x6in" 288 432 9.36 9.36 9.36 9.36 "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 74/PageSize[288 432]/ImagingBBox null>>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.648 419.544 9.36 9.36 9.36 9.36 "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 24/PageSize[297.648 419.544]/ImagingBBox null>>setpagedevice" - -// 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9.36 9.36 9.36 9.36 "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 122/PageSize[360 504]/ImagingBBox null>>setpagedevice" - -// Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 792 9.36 7.92 9.36 17.28 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - CustomMedia "CardLetter/Index Card Letter 8.5x11in" 612 792 9.36 9.36 9.36 9.36 "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 2/PageSize[612 792]/ImagingBBox null>>setpagedevice" -CustomMedia "A3/A3 297x420mm" 841.68 1190.88 14.184 45.36 14.184 45.36 "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 27/PageSize[841.68 1190.88]/ImagingBBox null>>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.296 841.896 9.36 9.36 9.36 9.36 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595.296 841.896 9.36 7.92 9.36 17.28 "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 26/PageSize[595.296 841.896]/ImagingBBox null>>setpagedevice" -CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 45/PageSize[498.96 708.48]/ImagingBBox null>>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9.36 9.36 9.36 9.36 "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice" - CustomMedia "Postcard/Postcard" 283 420 12 12 12 12 "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 71/PageSize[283 420]/ImagingBBox null>>setpagedevice" - -// Envelope - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 413.856 9.36 46.8 9.36 9.36 "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 109/PageSize[314.64 413.856]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC6/C6 Envelope 114x162mm" 323.136 459.216 9.36 46.8 9.36 9.36 "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 92/PageSize[323.136 459.216]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279.36 540 9.36 46.8 9.36 9.36 "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 80/PageSize[279.36 540]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvDL/DL Envelope 110x220mm" 311.832 623.52 9.36 46.8 9.36 9.36 "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 90/PageSize[311.832 623.52]/ImagingBBox null>>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.125x9.5in" 297.36 684 9.36 46.8 9.36 9.36 "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 81/PageSize[297.36 684]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 340.128 666.144 9.36 46.8 9.36 9.36 "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 110/PageSize[340.128 666.144]/ImagingBBox null>>setpagedevice" - CustomMedia "EnvC5/C5 Envelope 162x229mm" 459.216 649.152 9.36 46.8 9.36 9.36 "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - "<</cupsInteger0 91/PageSize[459.216 649.152]/ImagingBBox null>>setpagedevice" - - { - // Custom page sizes from 3x4in to Legal - HWMargins 9.36 9.36 9.36 9.36 - VariablePaperSize Yes - MinSize 3in 5in - MaxSize 8.5in 14in - - // <%PCL3-Class2%> - } // End Supported media sizes with full bleed. - -} // End PCL3-Class2 //////// PCL3-Class3 { @@ -10387,7 +9671,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708.48 19.08 14 19.08 14 "<</cupsInteger0 4 MinSize 3in 5in MaxSize 8.5in 14in - // <%PCL3-Class2%> + // <%PCL3-Class3%> } // End Supported media sizes with full bleed. } // End PCL3-Class3 diff --git a/prnt/hpps/hppsfilter.c b/prnt/hpps/hppsfilter.c index 5879a70c7..02c1c35af 100644 --- a/prnt/hpps/hppsfilter.c +++ b/prnt/hpps/hppsfilter.c @@ -39,6 +39,13 @@ static int g_savepsfile = 0; /* final ps outfile file handle */ static FILE *g_fp_outdbgps = NULL; +/* temp booklet ps outfile file handle */ +static FILE *ptempbooklet_file = NULL; +static char temp_filename[FILE_NAME_SIZE] = {0}; +static char booklet_filename[FILE_NAME_SIZE] = {0}; +static char Nup_filename[FILE_NAME_SIZE] = {0}; +extern void PS_Booklet(char *tempfile, char *bookletfile, char *nupfile,int order, int nup, char* pagesize, int bookletMaker); + /* get log level from the cups config file */ static void get_LogLevel () { @@ -91,6 +98,26 @@ static int hpwrite (void *pBuffer, size_t size) return ndata_written; } +static void open_tempbookletfile(char *mode) +{ + ptempbooklet_file= fopen(temp_filename, mode); + if(ptempbooklet_file == NULL) + { + fprintf(stderr, "ERROR: Unable to open temp file %s\n", temp_filename); + return 1; + } + chmod(temp_filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + +} + +static int Dump_tempbookletfile (void *pBuffer, size_t size) +{ + int ndata_written = 0; + + ndata_written = fwrite (pBuffer, 1, size, ptempbooklet_file); + + return ndata_written; +} /* This function would check what are the PJL attributes available in PPD. @@ -812,6 +839,7 @@ static void WriteHPPJLTRUEBLACK(int num_options, cups_option_t *options) int main (int argc, char **argv) { cups_file_t *fp_input = NULL; /* input file: stdin or physical file */ + cups_file_t *fp_bookletinput = NULL; /* input file: booklet file */ cups_option_t *options = NULL; char line[LINE_SIZE] = {0}, job_id[MAX_BUFFER] = {0}, @@ -821,7 +849,12 @@ int main (int argc, char **argv) input_slot[MAX_BUFFER] = {0}; unsigned int count = 0; char *ppd_values = NULL; - + int order = 1;// default value + int nup = 2;// default value + char newline[64] = {0}; // where we will put a copy of the input options string + char *subString = NULL; // pagesize value from input + int booklet_enabled=0;// default for testing + int bookletMaker=0; get_LogLevel(); setbuf (stderr, NULL); @@ -864,6 +897,27 @@ int main (int argc, char **argv) ppd_values = GetPPDValues(); if((strstr(argv[5], "HPPinPrnt")) != NULL && (strstr(argv[5], "noHPPinPrnt"))== NULL) WriteSecurePrinting(ppd_values[0], num_options, options); + if( ((strstr(argv[5], "HPBookletFilter")) != NULL) && ((strstr(argv[5], "fitplot")) != NULL) && ((strstr(argv[5], "Duplex=DuplexTumble")) != NULL) && ((strstr(argv[5], "number-up=1")) != NULL) ) + { + booklet_enabled = 1; + order = 1; + if((subString = strstr(argv[5], "HPBookletPageSize")) != NULL) + { + strncpy(newline, subString,64); + subString = strtok(newline,"="); // find the first double quote + subString = strtok(NULL," "); // find the second double quote + } + else + subString = "letter"; + } + else + booklet_enabled = 0; + + if( ((strstr(argv[5], "FoldStitch")) != NULL)) + { + bookletMaker=1; + } + if(ppd_values[1] == 1) WriteJobAccounting(argv, num_options, options); if(ppd_values[2] == 1) @@ -889,8 +943,57 @@ int main (int argc, char **argv) hpwrite("@PJL ENTER LANGUAGE=POSTSCRIPT\x0a", strlen("@PJL ENTER LANGUAGE=POSTSCRIPT\x0a")); } unsigned int numBytes = 0; - while ( (numBytes = cupsFileGetLine(fp_input, line, sizeof(line))) > 0) - hpwrite (line, numBytes); + + /* Perform the below when booklet option is enabled */ + if(booklet_enabled) + { + /* 1. dump the contents of the input file into temp file */ + sprintf(booklet_filename, "/tmp/%s.ps","booklet"); + sprintf(temp_filename, "/tmp/%s.ps","temp"); + sprintf(Nup_filename, "/tmp/%s.ps","NUP"); + open_tempbookletfile("w"); + while( (numBytes = cupsFileGetLine(fp_input, line, sizeof(line))) > 0) + Dump_tempbookletfile (line, numBytes); + fclose(ptempbooklet_file); + + /* 2. Perform the booklet operation on the PS file */ + PS_Booklet(temp_filename,booklet_filename,Nup_filename,order,nup,subString,bookletMaker); + + /* 3. Dump the modified file into the output. */ + numBytes = 0; + if ((fp_bookletinput = cupsFileOpen(Nup_filename, "r")) == NULL) + { + fprintf(stderr, "ERROR: Unable to open Nup_filename print file \"%s\"", Nup_filename); + return 1; + } + while ( (numBytes = cupsFileGetLine(fp_bookletinput, line, sizeof(line))) > 0) + hpwrite (line, numBytes); + cupsFileClose (fp_bookletinput); + + /* 4. Unlink function to remove the temp temporary files created */ + if( (unlink(booklet_filename)) == -1) + { + fprintf(stderr, "ERROR: Unable to remove temporary files in /tmp dir \"%s\" ",booklet_filename); + return 1; + } + if( (unlink(temp_filename)) == -1) + { + fprintf(stderr, "ERROR: Unable to remove temporary files in /tmp dir \"%s\" ",temp_filename); + return 1; + } + if( (unlink(Nup_filename)) == -1) + { + fprintf(stderr, "ERROR: Unable to remove temporary files in /tmp dir \"%s\" ",Nup_filename); + return 1; + } + booklet_enabled = 0; + bookletMaker=0; + } + else + { + while ( (numBytes = cupsFileGetLine(fp_input, line, sizeof(line))) > 0) + hpwrite (line, numBytes); + } /* WRITING END OF JOB */ hpwrite("\x1b%-12345X@PJL EOJ\x0a\x1b%-12345X", strlen("\x1b%-12345X@PJL EOJ\x0a\x1b%-12345X")); diff --git a/prnt/hpps/patchlev.h b/prnt/hpps/patchlev.h new file mode 100644 index 000000000..8f957dcf4 --- /dev/null +++ b/prnt/hpps/patchlev.h @@ -0,0 +1,6 @@ +/* + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + */ +#define RELEASE 1 +#define PATCHLEVEL 17 diff --git a/prnt/hpps/psbooklet.c b/prnt/hpps/psbooklet.c new file mode 100644 index 000000000..3d10bfbd8 --- /dev/null +++ b/prnt/hpps/psbooklet.c @@ -0,0 +1,420 @@ +/* psbooklet.c + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + * + * rearrange pages in conforming PS file for printing in signatures + * + * Usage: + * psbook [-q] [-s<signature>] [infile [outfile]] + */ +#include <stdio.h> +#include <stdlib.h> +#include "psutil.h" +#include "psspec.h" +#include "pserror.h" +#include "patchlev.h" +#include "hppsfilter.h" + + +#define MIN(x,y) ((x) > (y) ? (y) : (x)) +#define MAX(x,y) ((x) > (y) ? (x) : (y)) + +/* Global variables */ +char *program; +int pages; +int verbose; +char pagelabel[BUFSIZ]; +int pageno; +FILE *infile = NULL; +FILE *outfile= NULL; + +/* Structure of a node for boklet page order list*/ +struct node { + int data[4]; // Data + struct node *next; // Address +}*head; +struct node *newNode=NULL; +struct node *temp=NULL; +int *data=NULL; + +/* Function prototypes */ +void createPageList(int maxpages, int *data, int bookletMaker); +void PageListcopy(); +void freeList(struct node* head); +void PS_Booklet(char *tempfile, char *bookletfile, char *nupfile,int order, int nup, char* pagesize, int bookletMaker); +void PS_Booklet_Order_Wrapper(char *inputfile, char *outputfile, int order, int bookletMaker); +void PS_Nup_Wrapper(char *inputfile, char *outputfile, char *papersize, int nupnumber); + +/* return next larger exact divisor of number, or 0 if none. There is probably + * a much more efficient method of doing this, but the numbers involved are + * small, so it's not a big loss. */ +static int nextdiv(int n, int m) +{ + while (++n <= m) { + if (m%n == 0) + return (n); + } + return (0); +} + + +void PS_Booklet(char *tempfile, char *bookletfile, char *nupfile,int order, int nup, char* pagesize, int bookletMaker) +{ + + // 1. Perform the PS booklwet order + PS_Booklet_Order_Wrapper(tempfile,bookletfile,order, bookletMaker); + // 2. Perform the PS Nup and Duplex + PS_Nup_Wrapper(bookletfile,nupfile,pagesize,nup); +} + +void createPageList(int maxpages, int *data, int bookletMaker) +{ + int i=0; + int j=0; + int k=0; + int n = maxpages/4; + struct node *tpnode; + head = (struct node *)malloc(sizeof(struct node)); + + /*If unable to allocate memory for head node*/ + if(head == NULL) + { + message(FATAL, "\nUnable to allocate memory for head node.\n"); + } + else + { + /* Input data of node from the user */ + for(k=0;k<4;k++) + { + head->data[k] = data[j]; // Link data field with data + j= j+1; + } + head->next = NULL; // Link address field to NULL + + temp = head; + + /*Create n-1 nodes and adds to linked list*/ + for(i=2; i<=n; i++) + { + temp=head; + newNode = (struct node *)malloc(sizeof(struct node)); + + /* If memory is not allocated for newNode */ + if(newNode == NULL) + { + message(FATAL, "\nUnable to allocate memory for new node.\n"); + break; + } + else + { + for(k=0;k<4;k++) + { + newNode->data[k] = data[j]; // Link data field with data + j= j+1; + } + if(bookletMaker){ + newNode->next = head; // Link address field of newNode at the start + head = newNode; + } + else{ + while(temp->next !=NULL) + temp= temp->next; + + newNode->next = NULL; // Link address field of newNode at the end + temp->next = newNode; + } + + } + + } + + } +} + + +void PageListcopy() +{ + struct node *tempnode; + int i=0; + + /* If the list is empty i.e. head = NULL */ + if(head == NULL) + { + message(FATAL, "\nHead of the List is empty.\n"); + } + else + { + tempnode = head; + + while(tempnode != NULL) + { + for(i=0;i<4;i++) + { + if (tempnode->data[i] < pages) + { + writepage(tempnode->data[i]); + } + else + { + writeemptypage(); + } + } + tempnode = tempnode->next; // Move to next node + } + } +} + +void freeList(struct node* head) +{ + struct node* tmp; + + while (head != NULL) + { + tmp = head; + head = head->next; + free(tmp); + } + newNode=NULL; + temp=NULL; + +} + + +void PS_Booklet_Order_Wrapper(char *inputfile, char *outputfile, int order, int bookletMaker) +{ + int signature = 0; + int currentpg = 0; + int maxpage = 0; + int index=0; + + if ((infile = fopen(inputfile, "r")) == NULL) + { + message(FATAL, "can't open input file %s\n", infile); + } + + if ((outfile = fopen(outputfile, "w")) == NULL) + { + message(FATAL, "can't open output file %s\n", outfile); + } + + if ((infile=seekable(infile))==NULL) + { + message(FATAL, "can't seek input\n"); + } + + scanpages(); + + if (!signature) + signature = maxpage = pages+(4-pages%4)%4; + else + maxpage = pages+(signature-pages%signature)%signature; + + /* rearrange pages */ + writeheader(maxpage); + writeprolog(); + writesetup(); + + data = (int *)malloc(sizeof(int) * maxpage); + if(data == NULL) + { + message(FATAL, "\ncan't create dynamic memory for booklet page ordering\n"); + } + for (currentpg = 0; currentpg < maxpage; currentpg++) { + int actualpg = currentpg - currentpg%signature; + switch(currentpg%4) { + case 0: + case 3: + actualpg += signature-1-(currentpg%signature)/2; + break; + case 1: + case 2: + actualpg += (currentpg%signature)/2; + break; + } + + data[index++]=actualpg; + } + + createPageList(maxpage, data, bookletMaker); + PageListcopy(); + + free(data); + freeList(head); + + writetrailer(); + fclose(infile); + fclose(outfile); +} + +void PS_Nup_Wrapper(char *inputfile, char *outputfile, char *papersize, int nupnumber) +{ + int horiz, vert, rotate, column, flip, leftright, topbottom; + int nup = 1; + double draw = 0; /* draw page borders */ + double xscale, yscale, scale; /* page scale */ + double uscale = 0; /* user supplied scale */ + double ppwid, pphgt; /* paper dimensions */ + double margin, border; /* paper & page margins */ + double vshift, hshift; /* page centring shifts */ + double iwidth, iheight ; /* input paper size */ + double tolerance = 100000; /* layout tolerance */ + Paper *paper; + + margin = border = vshift = hshift = column = flip = 0; + leftright = topbottom = 1; + iwidth = iheight = -1 ; + verbose = 1; + + if ((infile = fopen(inputfile, "r")) == NULL) + { + message(FATAL, "can't open input file %s\n", infile); + } + + if ((outfile = fopen(outputfile, "w")) == NULL) + { + message(FATAL, "can't open output file %s\n", outfile); + } + + if ((infile=seekable(infile))==NULL) + { + message(FATAL, "can't seek input\n"); + } + + if ((paper = findpaper(papersize)) != (Paper *)0 ) + { + width = (double)PaperWidth(paper); + height = (double)PaperHeight(paper); + } + + nup= nupnumber; + margin = 10; + /* subtract paper margins from height & width */ + ppwid = width - margin*2; + pphgt = height - margin*2; + + if (ppwid <= 0 || pphgt <= 0) + message(FATAL, "paper margins are too large\n"); + + /* set default values of input height & width */ + if ( iwidth > 0 ) + width = iwidth ; + if ( iheight > 0 ) + height = iheight ; + + /* Finding the best layout is an optimisation problem. We try all of the + * combinations of width*height in both normal and rotated form, and + * minimise the wasted space. */ + { + double best = tolerance; + int hor; + for (hor = 1; hor; hor = nextdiv(hor, nup)) { + int ver = nup/hor; + /* try normal orientation first */ + double scl = MIN(pphgt/(height*ver), ppwid/(width*hor)); + double optim = (ppwid-scl*width*hor)*(ppwid-scl*width*hor) + + (pphgt-scl*height*ver)*(pphgt-scl*height*ver); + if (optim < best) { + best = optim; + /* recalculate scale to allow for internal borders */ + yscale = MIN((pphgt-2*border*ver)/(height*ver), + (ppwid-2*border*hor)/(width*hor)); + xscale = yscale; + hshift = (ppwid/hor - width*xscale)/2; + vshift = (pphgt/ver - height*yscale)/2; + horiz = hor; vert = ver; + rotate = flip; + } + /* try rotated orientation */ + scl = MIN(pphgt/(width*hor), ppwid/(height*ver)); + optim = (pphgt-scl*width*hor)*(pphgt-scl*width*hor) + + (ppwid-scl*height*ver)*(ppwid-scl*height*ver); + if (optim < best) { + best = optim; + /* recalculate scale to allow for internal borders */ + + yscale = MIN((pphgt-2*border*hor)/(width*hor), + (ppwid-2*border*ver)/(height*ver)); + xscale = yscale; + hshift = (ppwid/ver - height*yscale)/2; + vshift = (pphgt/hor - width*xscale)/2; + horiz = ver; vert = hor; + rotate = !flip; + } + } + + /* fail if nothing better than worst tolerance was found */ + if (best == tolerance) + message(FATAL, "can't find acceptable layout for %d-up\n", nup); + } + + if (flip) { /* swap width & height for clipping */ + double tmp = width; + width = height; + height = tmp; + } + + if (rotate) { /* rotate leftright and topbottom orders */ + int tmp = topbottom; + topbottom = !leftright; + leftright = tmp; + column = !column; + } + + /* now construct specification list and run page rearrangement procedure */ + { + int page = 0; + PageSpec *specs, *tail; + + tail = specs = newspec(); + + while (page < nup) { + int up, across; /* page index */ + + if (column) { + if (leftright) /* left to right */ + across = page/vert; + else /* right to left */ + across = horiz-1-page/vert; + if (topbottom) /* top to bottom */ + up = vert-1-page%vert; + else /* bottom to top */ + up = page%vert; + } else { + if (leftright) /* left to right */ + across = page%horiz; + else /* right to left */ + across = horiz-1-page%horiz; + if (topbottom) /* top to bottom */ + up = vert-1-page/horiz; + else /* bottom to top */ + up = page/horiz; + } + if (rotate) { + tail->xoff = margin + (across+1)*ppwid/horiz - hshift; + tail->rotate = 90; + tail->flags |= ROTATE; + } else { + tail->xoff = margin + across*ppwid/horiz + hshift; + } + tail->pageno = page; + if (uscale > 0) + tail->scale = uscale; + else + tail->xscale = xscale; + tail->yscale = yscale; + tail->flags |= SCALE; + tail->yoff = margin + up*pphgt/vert + vshift; + tail->flags |= OFFSET; + if (++page < nup) { + tail->flags |= ADD_NEXT; + tail->next = newspec(); + tail = tail->next; + } + } + + pstops(nup, 1, 0, specs, draw); /* do page rearrangement */ + } + fclose(infile); + fclose(outfile); +} + diff --git a/prnt/hpps/pserror.c b/prnt/hpps/pserror.c new file mode 100644 index 000000000..114d7e1b5 --- /dev/null +++ b/prnt/hpps/pserror.c @@ -0,0 +1,122 @@ +/* pserror.c + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + * + * Warnings and errors for PS programs + */ + +extern char *program ; /* Defined by main program, giving program name */ + +#include "psutil.h" +#include "pserror.h" +#include "patchlev.h" + +#include <string.h> + +/* Message functions; there is a single are varargs functions for messages, + warnings, and errors sent to stderr. If called with the flags MESSAGE_EXIT + set, the routine does not return */ + +#define MAX_MESSAGE 256 /* maximum formatted message length */ +#define MAX_FORMAT 16 /* maximum format length */ +#define MAX_COLUMN 78 /* maximum column to print upto */ + +void message(int flags, char *format, ...) +{ + va_list args ; + static column = 0 ; /* current screen column for message wrap */ + char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */ + char *bufptr = msgbuf ; /* message buffer pointer */ + + if ( (flags & MESSAGE_NL) && column != 0 ) { /* new line if not already */ + putc('\n', stderr) ; + column = 0 ; + } + + if ( flags & MESSAGE_PROGRAM ) { + strcpy(bufptr, program) ; + bufptr += strlen(program) ; + *bufptr++ = ':' ; + *bufptr++ = ' ' ; + } + + va_start(args, format) ; + if ( format != NULL ) { + char c ; + while ( (c = *format++) != '\0' ) { + if (c == '%') { + int done, longform, index ; + char fmtbuf[MAX_FORMAT] ; + longform = index = 0 ; + fmtbuf[index++] = c ; + do { + done = 1 ; + fmtbuf[index++] = c = *format++ ; + fmtbuf[index] = '\0' ; + switch (c) { + case '%': + *bufptr++ = '%' ; + case '\0': + break ; + case 'e': case 'E': case 'f': case 'g': case 'G': + { + double d = va_arg(args, double) ; + sprintf(bufptr, fmtbuf, d) ; + bufptr += strlen(bufptr) ; + } + break ; + case 'c': case 'd': case 'i': case 'o': + case 'p': case 'u': case 'x': case 'X': + if ( longform ) { + long l = va_arg(args, long) ; + sprintf(bufptr, fmtbuf, l) ; + } else { + int i = va_arg(args, int) ; + sprintf(bufptr, fmtbuf, i) ; + } + bufptr += strlen(bufptr) ; + break ; + case 's': + { + char *s = va_arg(args, char *) ; + sprintf(bufptr, fmtbuf, s) ; + bufptr += strlen(bufptr) ; + } + break ; + case 'l': + longform = 1 ; + /* FALLTHRU */ + default: + done = 0 ; + } + } while ( !done ) ; + } else if ( c == '\n' ) { /* write out message so far and reset column */ + int len = bufptr - msgbuf ; /* length of current message */ + *bufptr++ = '\n' ; + *bufptr = '\0' ; + if ( column + len > MAX_COLUMN && column > 0 ) { + putc('\n', stderr) ; + column = 0 ; + } + fputs(bufptr = msgbuf, stderr) ; + column = 0 ; + } else + *bufptr++ = c ; + } + *bufptr = '\0' ; + { + int len = bufptr - msgbuf ; /* length of current message */ + if ( column + len > MAX_COLUMN && column > 0 ) { + putc('\n', stderr) ; + column = 0 ; + } + fputs(msgbuf, stderr) ; + column += len ; + } + fflush(stderr) ; + } + va_end(args) ; + + if ( flags & MESSAGE_EXIT ) /* don't return to program */ + exit(1) ; +} diff --git a/prnt/hpps/pserror.h b/prnt/hpps/pserror.h new file mode 100644 index 000000000..21eee15aa --- /dev/null +++ b/prnt/hpps/pserror.h @@ -0,0 +1,20 @@ +/* pserror.h + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + * + * Header file for external functions in pserror.c + */ + +#include <stdarg.h> + +/* message flags */ +#define MESSAGE_NL 1 /* Newline before message if necessary */ +#define MESSAGE_PROGRAM 2 /* announce program name */ +#define MESSAGE_EXIT 4 /* do not return */ + +/* message types */ +#define FATAL (MESSAGE_EXIT|MESSAGE_PROGRAM|MESSAGE_NL) +#define WARN (MESSAGE_NL|MESSAGE_PROGRAM) +#define LOG 0 + +extern void message(int flags, char *format, ...) ; diff --git a/prnt/hpps/psspec.c b/prnt/hpps/psspec.c new file mode 100644 index 000000000..f75f19fb9 --- /dev/null +++ b/prnt/hpps/psspec.c @@ -0,0 +1,247 @@ +/* psspec.c + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + * + * page spec routines for page rearrangement + */ + +#include "psutil.h" +#include "psspec.h" +#include "pserror.h" +#include "patchlev.h" + +#include <string.h> + +double width = -1; +double height = -1; + +/* create a new page spec */ +PageSpec *newspec(void) +{ + PageSpec *temp = (PageSpec *)malloc(sizeof(PageSpec)); + if (temp == NULL) + message(FATAL, "out of memory\n"); + temp->reversed = temp->pageno = temp->flags = temp->rotate = 0; + temp->scale = 1; + temp->xoff = temp->yoff = 0; + temp->next = NULL; + return (temp); +} + +/* dimension parsing routines */ +int parseint(char **sp, void (*errorfn)(void)) +{ + char *s = *sp; + int num = atoi(s); + + while (isdigit(*s)) + s++; + if (*sp == s) (*errorfn)() ; + *sp = s; + return (num); +} + +double parsedouble(char **sp, void (*errorfn)(void)) +{ + char *s = *sp; + double num = atof(s); + + while (isdigit(*s) || *s == '-' || *s == '.') + s++; + if (*sp == s) (*errorfn)() ; + *sp = s; + return (num); +} + +double parsedimen(char **sp, void (*errorfn)(void)) +{ + double num = parsedouble(sp, errorfn); + char *s = *sp; + + if (strncmp(s, "pt", 2) == 0) { + s += 2; + } else if (strncmp(s, "in", 2) == 0) { + num *= 72; + s += 2; + } else if (strncmp(s, "cm", 2) == 0) { + num *= 28.346456692913385211; + s += 2; + } else if (strncmp(s, "mm", 2) == 0) { + num *= 2.8346456692913385211; + s += 2; + } else if (*s == 'w') { + if (width < 0) + message(FATAL, "width not initialised\n"); + num *= width; + s++; + } else if (*s == 'h') { + if (height < 0) + message(FATAL, "height not initialised\n"); + num *= height; + s++; + } + *sp = s; + return (num); +} + +double singledimen(char *str, void (*errorfn)(void), void (*usagefn)(void)) +{ + double num = parsedimen(&str, errorfn); + if (*str) (*usagefn)(); + return (num); +} + +static char *prologue[] = { /* PStoPS procset */ +#ifndef SHOWPAGE_LOAD + "userdict begin", + "[/showpage/erasepage/copypage]{dup where{pop dup load", /* prevent */ + " type/operatortype eq{1 array cvx dup 0 3 index cvx put", /* binding */ + " bind def}{pop}ifelse}{pop}ifelse}forall", /* in prolog */ +#else + "userdict begin", + "[/showpage/copypage/erasepage]{dup 10 string cvs dup", + " length 6 add string dup 0 (PStoPS) putinterval dup", + " 6 4 -1 roll putinterval 2 copy cvn dup where", + " {pop pop pop}{exch load def}ifelse cvx cvn 1 array cvx", + " dup 0 4 -1 roll put def}forall", +#endif + "[/letter/legal/executivepage/a4/a4small/b5/com10envelope", /* nullify */ + " /monarchenvelope/c5envelope/dlenvelope/lettersmall/note", /* paper */ + " /folio/quarto/a5]{dup where{dup wcheck{exch{}put}", /* operators */ + " {pop{}def}ifelse}{pop}ifelse}forall", + "/PStoPSmatrix matrix currentmatrix def", + "/PStoPSxform matrix def/PStoPSclip{clippath}def", + "/defaultmatrix{PStoPSmatrix exch PStoPSxform exch concatmatrix}bind def", + "/initmatrix{matrix defaultmatrix setmatrix}bind def", + "/initclip[{matrix currentmatrix PStoPSmatrix setmatrix", + " [{currentpoint}stopped{$error/newerror false put{newpath}}", + " {/newpath cvx 3 1 roll/moveto cvx 4 array astore cvx}ifelse]", + " {[/newpath cvx{/moveto cvx}{/lineto cvx}", + " {/curveto cvx}{/closepath cvx}pathforall]cvx exch pop}", + " stopped{$error/errorname get/invalidaccess eq{cleartomark", + " $error/newerror false put cvx exec}{stop}ifelse}if}bind aload pop", + " /initclip dup load dup type dup/operatortype eq{pop exch pop}", + " {dup/arraytype eq exch/packedarraytype eq or", + " {dup xcheck{exch pop aload pop}{pop cvx}ifelse}", + " {pop cvx}ifelse}ifelse", + " {newpath PStoPSclip clip newpath exec setmatrix} bind aload pop]cvx def", + "/initgraphics{initmatrix newpath initclip 1 setlinewidth", + " 0 setlinecap 0 setlinejoin []0 setdash 0 setgray", + " 10 setmiterlimit}bind def", + "end", + NULL + }; + +void pstops(int modulo, int pps, int nobind, PageSpec *specs, double draw) +{ + int thispg, maxpage; + int pageindex = 0; + char **pro; + + scanpages(); + + maxpage = ((pages+modulo-1)/modulo)*modulo; + + /* rearrange pages: doesn't cope properly with loaded definitions */ + writeheader((maxpage/modulo)*pps); +#ifndef SHOWPAGE_LOAD + writestring("%%BeginProcSet: PStoPS"); +#else + writestring("%%BeginProcSet: PStoPS-spload"); +#endif + if (nobind) + writestring("-nobind"); + writestring(" 1 15\n"); + for (pro = prologue; *pro; pro++) { + writestring(*pro); + writestring("\n"); + } + if (nobind) /* desperation measures */ + writestring("/bind{}def\n"); + writestring("%%EndProcSet\n"); + /* save transformation from original to current matrix */ + if (writepartprolog()) { + writestring("userdict/PStoPSxform PStoPSmatrix matrix currentmatrix\n"); + writestring(" matrix invertmatrix matrix concatmatrix\n"); + writestring(" matrix invertmatrix put\n"); + } + writesetup(); + for (thispg = 0; thispg < maxpage; thispg += modulo) { + int add_last = 0; + PageSpec *ps; + for (ps = specs; ps != NULL; ps = ps->next) { + int actualpg; + int add_next = ((ps->flags & ADD_NEXT) != 0); + if (ps->reversed) + actualpg = maxpage-thispg-modulo+ps->pageno; + else + actualpg = thispg+ps->pageno; + if (actualpg < pages) + seekpage(actualpg); + if (!add_last) { /* page label contains original pages */ + PageSpec *np = ps; + char *eob = pagelabel; + char sep = '('; + do { + *eob++ = sep; + if (np->reversed) + sprintf(eob, "%d", maxpage-thispg-modulo+np->pageno); + else + sprintf(eob, "%d", thispg+np->pageno); + eob = eob + strlen(eob); + sep = ','; + } while ((np->flags & ADD_NEXT) && (np = np->next)); + strcpy(eob, ")"); + writepageheader(pagelabel, ++pageindex); + } + writestring("userdict/PStoPSsaved save put\n"); + if (ps->flags & GSAVE) { + char buffer[BUFSIZ]; + writestring("PStoPSmatrix setmatrix\n"); + if (ps->flags & OFFSET) { + sprintf(buffer, "%f %f translate\n", ps->xoff, ps->yoff); + writestring(buffer); + } + if (ps->flags & ROTATE) { + sprintf(buffer, "%d rotate\n", ps->rotate); + writestring(buffer); + } + if (ps->flags & SCALE) { + sprintf(buffer, "%f %f scale\n", ps->xscale, ps->yscale); + writestring(buffer); + } + writestring("userdict/PStoPSmatrix matrix currentmatrix put\n"); + if (width > 0 && height > 0) { + char buffer[BUFSIZ]; + writestring("userdict/PStoPSclip{0 0 moveto\n"); + sprintf(buffer, " %f 0 rlineto 0 %f rlineto -%f 0 rlineto\n", + width, height, width); + writestring(buffer); + writestring(" closepath}put initclip\n"); + if (draw > 0) { + sprintf(buffer, "gsave clippath 0 setgray %f setlinewidth stroke grestore\n", draw); + writestring(buffer); + } + } + } + if (add_next) { +#ifndef SHOWPAGE_LOAD + writestring("/showpage{}def/copypage{}def/erasepage{}def\n"); +#else + writestring("/PStoPSshowpage{}store/PStoPScopypage{}store/PStoPSerasepage{}store\n"); +#endif + } + if (actualpg < pages) { + writepagesetup(); + writestring("PStoPSxform concat\n"); + writepagebody(actualpg); + } else { + writestring("PStoPSxform concat\n"); + writestring("showpage\n"); + } + writestring("PStoPSsaved restore\n"); + add_last = add_next; + } + } + writetrailer(); +} diff --git a/prnt/hpps/psspec.h b/prnt/hpps/psspec.h new file mode 100644 index 000000000..c46618b76 --- /dev/null +++ b/prnt/hpps/psspec.h @@ -0,0 +1,30 @@ +/* psspec.h + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + * + * routines for page rearrangement specs + */ + +/* pagespec flags */ +#define ADD_NEXT (0x01) +#define ROTATE (0x02) +#define SCALE (0x04) +#define OFFSET (0x08) +#define GSAVE (ROTATE|SCALE|OFFSET) + +typedef struct pagespec { + int reversed, pageno, flags, rotate; + double xoff, yoff, scale, xscale, yscale; + struct pagespec *next; +} PageSpec ; + +extern double width, height; + +extern PageSpec *newspec(void); +extern int parseint(char **sp, void (*errorfn)(void)); +extern double parsedouble(char **sp, void (*errorfn)(void)); +extern double parsedimen(char **sp, void (*errorfn)(void)); +extern double singledimen(char *str, void (*errorfn)(void), + void (*usagefn)(void)); +extern void pstops(int modulo, int pps, int nobind, PageSpec *specs, + double draw); diff --git a/prnt/hpps/psutil.c b/prnt/hpps/psutil.c new file mode 100644 index 000000000..7282dc275 --- /dev/null +++ b/prnt/hpps/psutil.c @@ -0,0 +1,346 @@ +/* psutil.c + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + * + * utilities for PS programs + */ + +/* + * AJCD 6/4/93 + * Changed to using ftell() and fseek() only (no length calculations) + * Hunter Goatley 31-MAY-1993 23:33 + * Fixed VMS support. + * Hunter Goatley 2-MAR-1993 14:41 + * Added VMS support. + */ +#include "psutil.h" +#include "pserror.h" +#include "patchlev.h" + +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> + +#define iscomment(x,y) (strncmp(x,y,strlen(y)) == 0) + +extern char *program ; +extern int pages; +extern int verbose; +extern FILE *infile; +extern FILE *outfile; +extern char pagelabel[BUFSIZ]; +extern int pageno; + +static char buffer[BUFSIZ]; +static long bytes = 0; +static long pagescmt = 0; +static long headerpos = 0; +static long endsetup = 0; +static long beginprocset = 0; /* start of pstops procset */ +static long endprocset = 0; +static int outputpage = 0; +static int maxpages = 100; +static long *pageptr; + +/* list of paper sizes supported */ +static Paper papersizes[] = { + { "a3", 842, 1191 }, /* 29.7cm * 42cm */ + { "a4", 595, 842 }, /* 21cm * 29.7cm */ + { "a5", 421, 595 }, /* 14.85cm * 21cm */ + { "b5", 516, 729 }, /* 18.2cm * 25.72cm */ + { "A3", 842, 1191 }, /* 29.7cm * 42cm */ + { "A4", 595, 842 }, /* 21cm * 29.7cm */ + { "A5", 421, 595 }, /* 14.85cm * 21cm */ + { "B5", 516, 729 }, /* 18.2cm * 25.72cm */ + { "letter", 612, 792 }, /* 8.5in * 11in */ + { "legal", 612, 1008 }, /* 8.5in * 14in */ + { "ledger", 1224, 792 }, /* 17in * 11in */ + { "tabloid", 792, 1224 }, /* 11in * 17in */ + { "statement", 396, 612 }, /* 5.5in * 8.5in */ + { "executive", 540, 720 }, /* 7.6in * 10in */ + { "folio", 612, 936 }, /* 8.5in * 13in */ + { "quarto", 610, 780 }, /* 8.5in * 10.83in */ + { "10x14", 720, 1008 }, /* 10in * 14in */ + { NULL, 0, 0 } +}; + +/* return pointer to paper size struct or NULL */ +Paper* findpaper(char *name) +{ + Paper *pp; + for (pp = papersizes; PaperName(pp); pp++) { + if (strcmp(PaperName(pp), name) == 0) { +fprintf (stderr, "RAM:: PaperName= %s , PaperWidth=%d PaperHeight= %d\n",PaperName(pp),PaperWidth(pp),PaperHeight(pp)); + return pp; + } + } + + return (Paper *)NULL; +} + +/* Make a file seekable, using temporary files if necessary */ +FILE *seekable(FILE *fp) +{ +#ifndef MSDOS + FILE *ft; + long r, w ; +#endif + char *p; + char buffer[BUFSIZ] ; +#if defined(WINNT) + struct _stat fs ; +#else + long fpos; +#endif + +#if defined(WINNT) + if (_fstat(fileno(fp), &fs) == 0 && (fs.st_mode&_S_IFREG) != 0) + return (fp); +#else + if ((fpos = ftell(fp)) >= 0) + if (!fseek(fp, 0L, SEEK_END) && !fseek(fp, fpos, SEEK_SET)) + return (fp); +#endif + +#if defined(MSDOS) + message(FATAL, "input is not seekable\n"); + return (NULL) ; +#else + if ((ft = tmpfile()) == NULL) + return (NULL); + + while ((r = fread(p = buffer, sizeof(char), BUFSIZ, fp)) > 0) { + do { + if ((w = fwrite(p, sizeof(char), r, ft)) == 0) + return (NULL) ; + p += w ; + r -= w ; + } while (r > 0) ; + } + + if (!feof(fp)) + return (NULL) ; + + /* discard the input file, and rewind the temporary */ + (void) fclose(fp); + if (fseek(ft, 0L, SEEK_SET) != 0) + return (NULL) ; + + return (ft); +#endif +} + + +/* copy input file from current position upto new position to output file */ +static int fcopy(long upto) +{ + long here = ftell(infile); + while (here < upto) { + if ((fgets(buffer, BUFSIZ, infile) == NULL) || + (fputs(buffer, outfile) == EOF)) + return(0); + here = ftell(infile); + bytes += strlen(buffer); + } + return (1); +} + +/* build array of pointers to start/end of pages */ +void scanpages(void) +{ + register char *comment = buffer+2; + register int nesting = 0; + register long int record; + + if ((pageptr = (long *)malloc(sizeof(long)*maxpages)) == NULL) + message(FATAL, "out of memory\n"); + pages = 0; + fseek(infile, 0L, SEEK_SET); + while (record = ftell(infile), fgets(buffer, BUFSIZ, infile) != NULL) + if (*buffer == '%') { + if (buffer[1] == '%') { + if (nesting == 0 && iscomment(comment, "Page:")) { + if (pages >= maxpages-1) { + maxpages *= 2; + if ((pageptr = (long *)realloc((char *)pageptr, + sizeof(long)*maxpages)) == NULL) + message(FATAL, "out of memory\n"); + } + pageptr[pages++] = record; + } else if (headerpos == 0 && iscomment(comment, "Pages:")) + pagescmt = record; + else if (headerpos == 0 && iscomment(comment, "EndComments")) + headerpos = ftell(infile); + else if (iscomment(comment, "BeginDocument") || + iscomment(comment, "BeginBinary") || + iscomment(comment, "BeginFile")) + nesting++; + else if (iscomment(comment, "EndDocument") || + iscomment(comment, "EndBinary") || + iscomment(comment, "EndFile")) + nesting--; + else if (nesting == 0 && iscomment(comment, "EndSetup")) + endsetup = record; + else if (nesting == 0 && iscomment(comment, "BeginProlog")) + headerpos = ftell(infile); + else if (nesting == 0 && + iscomment(comment, "BeginProcSet: PStoPS")) + beginprocset = record; + else if (beginprocset && !endprocset && + iscomment(comment, "EndProcSet")) + endprocset = ftell(infile); + else if (nesting == 0 && (iscomment(comment, "Trailer") || + iscomment(comment, "EOF"))) { + fseek(infile, record, SEEK_SET); + break; + } + } else if (headerpos == 0 && buffer[1] != '!') + headerpos = record; + } else if (headerpos == 0) + headerpos = record; + pageptr[pages] = ftell(infile); + if (endsetup == 0 || endsetup > pageptr[0]) + endsetup = pageptr[0]; +} + +/* seek a particular page */ +void seekpage(int p) +{ + fseek(infile, pageptr[p], SEEK_SET); + if (fgets(buffer, BUFSIZ, infile) != NULL && + iscomment(buffer, "%%Page:")) { + char *start, *end; + for (start = buffer+7; isspace(*start); start++); + if (*start == '(') { + int paren = 1; + for (end = start+1; paren > 0; end++) + switch (*end) { + case '\0': + message(FATAL, "Bad page label while seeking page %d\n", p); + case '(': + paren++; + break; + case ')': + paren--; + break; + } + } else + for (end = start; !isspace(*end); end++); + strncpy(pagelabel, start, end-start); + pagelabel[end-start] = '\0'; + pageno = atoi(end); + } else + message(FATAL, "I/O error seeking page %d\n", p); +} + +/* Output routines. These all update the global variable bytes with the number + * of bytes written */ +void writestring(char *s) +{ + fputs(s, outfile); + bytes += strlen(s); +} + +/* write page comment */ +void writepageheader(char *label, int page) +{ + if (verbose) + message(LOG, "[%d] ", page); + sprintf(buffer, "%%%%Page: %s %d\n", label, ++outputpage); + writestring(buffer); +} + +/* search for page setup */ +void writepagesetup(void) +{ + char buffer[BUFSIZ]; + if (beginprocset) { + for (;;) { + if (fgets(buffer, BUFSIZ, infile) == NULL) + message(FATAL, "I/O error reading page setup %d\n", outputpage); + if (!strncmp(buffer, "PStoPSxform", 11)) + break; + if (fputs(buffer, outfile) == EOF) + message(FATAL, "I/O error writing page setup %d\n", outputpage); + bytes += strlen(buffer); + } + } +} + +/* write the body of a page */ +void writepagebody(int p) +{ + if (!fcopy(pageptr[p+1])) + message(FATAL, "I/O error writing page %d\n", outputpage); +} + +/* write a whole page */ +void writepage(int p) +{ + seekpage(p); + writepageheader(pagelabel, p+1); + writepagebody(p); +} + +/* write from start of file to end of header comments */ +void writeheader(int p) +{ + fseek(infile, 0L, SEEK_SET); + if (pagescmt) { + if (!fcopy(pagescmt) || fgets(buffer, BUFSIZ, infile) == NULL) + message(FATAL, "I/O error in header\n"); + sprintf(buffer, "%%%%Pages: %d 0\n", p); + writestring(buffer); + } + if (!fcopy(headerpos)) + message(FATAL, "I/O error in header\n"); +} + +/* write prologue to end of setup section excluding PStoPS procset */ +int writepartprolog(void) +{ + if (beginprocset && !fcopy(beginprocset)) + message(FATAL, "I/O error in prologue\n"); + if (endprocset) + fseek(infile, endprocset, SEEK_SET); + writeprolog(); + return !beginprocset; +} + +/* write prologue up to end of setup section */ +void writeprolog(void) +{ + if (!fcopy(endsetup)) + message(FATAL, "I/O error in prologue\n"); +} + +/* write from end of setup to start of pages */ +void writesetup(void) +{ + if (!fcopy(pageptr[0])) + message(FATAL, "I/O error in prologue\n"); +} + +/* write trailer */ +void writetrailer(void) +{ + fseek(infile, pageptr[pages], SEEK_SET); + while (fgets(buffer, BUFSIZ, infile) != NULL) { + writestring(buffer); + } + if (verbose) + message(LOG, "Wrote %d pages, %ld bytes\n", outputpage, bytes); +} + +/* write a page with nothing on it */ +void writeemptypage(void) +{ + if (verbose) + message(LOG, "[*] "); + sprintf(buffer, "%%%%Page: * %d\n", ++outputpage); + writestring(buffer); + if (beginprocset) + writestring("PStoPSxform concat\n"); + writestring("showpage\n"); +} + diff --git a/prnt/hpps/psutil.h b/prnt/hpps/psutil.h new file mode 100644 index 000000000..deed93ac8 --- /dev/null +++ b/prnt/hpps/psutil.h @@ -0,0 +1,52 @@ +/* psutil.h + * Copyright (C) Angus J. C. Duggan 1991-1995 + * See file LICENSE for details. + * + * utilities for PS programs + */ + +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> + +#include "config.h" + +/* types for describing document; this is a step towards version 2 */ +typedef long Fileptr ; + +/* paper size structure; configurability and proper paper resources will have + to wait until version 2 */ +typedef struct papersize { + char *name; /* name of paper size */ + int width, height; /* width, height in points */ +} Paper ; +#define PaperName(p) ((p)->name) +#define PaperWidth(p) ((p)->width) +#define PaperHeight(p) ((p)->height) + +/* Definitions for functions found in psutil.c */ +extern Paper *findpaper(char *name); +extern FILE *seekable(FILE *fp); +extern void writepage(int p); +extern void seekpage(int p); +extern void writepageheader(char *label, int p); +extern void writepagesetup(void); +extern void writepagebody(int p); +extern void writeheader(int p); +extern int writepartprolog(void); +extern void writeprolog(void); +extern void writesetup(void); +extern void writetrailer(void); +extern void writeemptypage(void); +extern void scanpages(void); +extern void writestring(char *s); + +/* These variables are imported from the client program (e.g. psbook, psnup, + etc.) */ +extern char *program ; +extern int pages; +extern int verbose; +extern FILE *infile; +extern FILE *outfile; +extern char pagelabel[BUFSIZ]; +extern int pageno; diff --git a/prnt/plugins/hbpl1-arm32.so b/prnt/plugins/hbpl1-arm32.so Binary files differdeleted file mode 100755 index fa1709c26..000000000 --- a/prnt/plugins/hbpl1-arm32.so +++ /dev/null diff --git a/prnt/plugins/hbpl1-arm64.so b/prnt/plugins/hbpl1-arm64.so Binary files differdeleted file mode 100755 index fdcb1380a..000000000 --- a/prnt/plugins/hbpl1-arm64.so +++ /dev/null diff --git a/prnt/plugins/hbpl1-x86_32.so b/prnt/plugins/hbpl1-x86_32.so Binary files differdeleted file mode 100755 index 60c652f6f..000000000 --- a/prnt/plugins/hbpl1-x86_32.so +++ /dev/null diff --git a/prnt/plugins/hbpl1-x86_64.so b/prnt/plugins/hbpl1-x86_64.so Binary files differdeleted file mode 100755 index d7374a72b..000000000 --- a/prnt/plugins/hbpl1-x86_64.so +++ /dev/null diff --git a/prnt/plugins/lj-arm32.so b/prnt/plugins/lj-arm32.so Binary files differdeleted file mode 100755 index 99a0eeee4..000000000 --- a/prnt/plugins/lj-arm32.so +++ /dev/null diff --git a/prnt/plugins/lj-arm64.so b/prnt/plugins/lj-arm64.so Binary files differdeleted file mode 100755 index d7332a626..000000000 --- a/prnt/plugins/lj-arm64.so +++ /dev/null diff --git a/prnt/plugins/lj-x86_32.so b/prnt/plugins/lj-x86_32.so Binary files differdeleted file mode 100644 index 4faa04647..000000000 --- a/prnt/plugins/lj-x86_32.so +++ /dev/null diff --git a/prnt/plugins/lj-x86_64.so b/prnt/plugins/lj-x86_64.so Binary files differdeleted file mode 100644 index 94b1f0b9f..000000000 --- a/prnt/plugins/lj-x86_64.so +++ /dev/null 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 a83d7198d..3496acbe3 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 9af5f60ad..b5d292306 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 c043a0228..0dabfe445 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 fc676c6a2..caa1e0c88 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 e2379bdd1..b84bc6790 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 59a00e907..67d29e3c6 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 f6461b761..d11e88254 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 3ea861671..c8834dd27 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_designjet_xl_3600-ps.ppd.gz b/prnt/ps/hp-color_designjet_xl_3600-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..44090790d --- /dev/null +++ b/prnt/ps/hp-color_designjet_xl_3600-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 cf6cc95bf..122234dd1 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 1b96f5fac..53ba2116e 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 35cbb22d2..1e0e20e0d 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 5711f6870..ad12be560 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 88c58417e..0106247db 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 59283806c..aaecc9c4d 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 d05b15a6a..5b321148c 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 e6382c2a0..651c67261 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 28669deaf..58dcafbfe 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 f73d800d2..dd3381a71 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 15f7a9101..44594f263 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 908ffcf00..13161e642 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 739984aa2..396cfc982 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 519b780d4..02b96cac3 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 0f49d5014..180a12221 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 0136d55c0..c18b3f258 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 31532cb31..3c3755d16 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 0751499af..ff5d2d729 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 0e204f726..429c8871c 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 632cd1d90..04ce560e4 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 f1cda90fe..a73dcef35 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 25ef440b0..2f4bb902e 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 e87c0152c..73ae93074 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 2c53f1f19..51199374d 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 e935503a0..501a6ace3 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 c05d8e531..423cd0238 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 0b4e6a66d..6e75b8215 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 078fe126f..0095e122d 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 12557f6f1..9c073a515 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 fa5088eb3..c502d3961 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 0d32ebbbb..5351c69a7 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 e38121616..00c2752ec 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_E65150_E65160-ps.ppd.gz b/prnt/ps/hp-color_laserjet_E65150_E65160-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..aa40b81e3 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_E65150_E65160-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 93d2758f5..e8077772e 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 84b0b68d5..e9999c8bf 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 d0d461117..4dd6823a8 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 9a04bdbab..8a8d52f4d 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 fe1cc2df2..3c6399642 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 044cfa7ce..59adb6bae 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 7a2c6d119..bbb20c501 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 046ab8230..766efe84d 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 c48f6a339..bb8ad216e 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 5ecd09cf4..55f74cacf 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 b64d347af..44447c9c7 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 0de7059d7..eb872966f 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 1d986a33b..184d7facd 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 7cc99c2ce..de424daf0 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 1c63813de..11837c82a 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 33994f3a1..6f0736705 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 05ddbd67d..5d4653360 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 dd0033e62..10d1b022d 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 d3c6936c7..35ea5d1d2 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 63f1bb411..5c2ebdef7 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 df5a18e39..4330a82da 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 7d50b1627..433160a5a 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 721c2373c..af9a131a6 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 2e70b1d18..34d68afe1 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 1dd759081..cbdd1716a 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 de11abd40..0cee644a2 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 908d32f72..bffec0583 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 112a6a89f..7c4e2ae94 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 2d22d1dff..b6a00ee3b 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 26bfb9fde..7fdaebf86 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 bfca5e92e..8fbd6fc91 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-color_laserjet_e65050_e65060-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz Binary files differindex 96997f4b0..76463ee6f 100644 --- a/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_e65050_e65060-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz Binary files differindex fd96d37df..de8663fea 100644 --- a/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_e67550_e67560-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..bcbf53744 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_e67650_e67660-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz b/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..e7ef272fa --- /dev/null +++ b/prnt/ps/hp-color_laserjet_e75245-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz Binary files differindex af3df33de..79487772d 100644 --- a/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz Binary files differindex efffd4a34..8c5593ae4 100644 --- a/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz Binary files differindex c8172bfb3..d3e976018 100644 --- a/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m153-m154-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz Binary files differindex ed72f497c..0fc98c3ac 100644 --- a/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m253-m254-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz Binary files differindex a45b57126..c4acd343e 100644 --- a/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m452-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz Binary files differindex 59a8ad3bf..cf018ca60 100644 --- a/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m452d-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz Binary files differindex a3345b201..62db42695 100644 --- a/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m552-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz Binary files differindex b46ca9134..966c22e69 100644 --- a/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m553-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz Binary files differindex 9556d4dd6..c22093394 100644 --- a/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m651-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz Binary files differindex 7076428cd..1ca240c64 100644 --- a/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m652_m653-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz Binary files differindex 434fa8214..bd890bd03 100644 --- a/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m750-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..c54341d6a --- /dev/null +++ b/prnt/ps/hp-color_laserjet_m751-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz Binary files differindex 706226f99..9f907cb51 100644 --- a/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_m855-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..82e204285 --- /dev/null +++ b/prnt/ps/hp-color_laserjet_mfp_e77422-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..125b47aed --- /dev/null +++ b/prnt/ps/hp-color_laserjet_mfp_e77428-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz Binary files differindex 8d3674630..b7e0565f4 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz Binary files differindex aa8307c8e..2b46d545b 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m274-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz Binary files differindex 223bca6a5..a6cd5c7c3 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz Binary files differindex 3668819da..310cbd338 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m577-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz Binary files differindex 1f04aedf6..0f789a709 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m680-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz b/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz Binary files differindex a1d087d45..292de1c3b 100644 --- a/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz Binary files differindex c902786f5..4158fa520 100644 --- a/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_m252-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz Binary files differindex 6ddbeb42d..04ceddcdb 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz Binary files differindex 40cb09471..84bbc7a53 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz Binary files differindex 2d7c64aff..005011f82 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz Binary files differindex 58539759b..1315b5bf8 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz diff --git a/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz b/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz Binary files differindex 0d5d3d95d..0c8f4f34d 100644 --- a/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz +++ b/prnt/ps/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_4000ps.ppd.gz b/prnt/ps/hp-designjet_4000ps.ppd.gz Binary files differindex 378db2ed2..21b969f7f 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 ec421401e..43a061a82 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 d503ac31a..cf918aa74 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 f16fe8c05..ba4e2849d 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 835db4fc9..b75715d26 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 fb0a5757e..f2174584a 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_Z6_24in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz Binary files differindex 2b57e1ec5..72b3d7cae 100644 --- a/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z6_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz Binary files differindex ce93d1c25..3ec2cc0ff 100644 --- a/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z6_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz Binary files differindex 87e9362f6..48b010055 100644 --- a/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z6dr_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz Binary files differindex cd391f63e..7010701a3 100644 --- a/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z9_24in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz Binary files differindex 50ed115e6..bb810ab2f 100644 --- a/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z9_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz b/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz Binary files differindex 7eac2ca65..3e1e97c2a 100644 --- a/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_Z9dr_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_d5800-ps.ppd.gz b/prnt/ps/hp-designjet_d5800-ps.ppd.gz Binary files differindex d99f68fa6..6da5a1418 100644 --- a/prnt/ps/hp-designjet_d5800-ps.ppd.gz +++ b/prnt/ps/hp-designjet_d5800-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 e25358ad5..11240637e 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 f070bcf66..254cc5f78 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 a7867210a..beb73edbf 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 51410b410..15f05ce84 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 c7165aae7..d31a8fe3a 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 5ab50e67c..9ad69c010 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_t1500-postscript.ppd.gz b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz Binary files differindex e3928bc2e..af43e02c2 100644 --- a/prnt/ps/hp-designjet_t1500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t1500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz Binary files differindex 08ca7acbe..7b5dd910b 100644 --- a/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1700_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz Binary files differindex c171b3ed7..1c2ef9757 100644 --- a/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1700dr_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz Binary files differindex 12857f184..86d3715c6 100644 --- a/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1708_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz Binary files differindex d892c43f2..4898c2a63 100644 --- a/prnt/ps/hp-designjet_t1708dr_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t1708dr_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 4bec556b0..68dab7952 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_t2500-postscript.ppd.gz b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz Binary files differindex 1736ee80d..090bf3fb5 100644 --- a/prnt/ps/hp-designjet_t2500-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t2500-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_t3500-ps.ppd.gz b/prnt/ps/hp-designjet_t3500-ps.ppd.gz Binary files differindex e172d73e0..03eacca3f 100644 --- a/prnt/ps/hp-designjet_t3500-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t3500-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 0bf95f77f..deefb95dc 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 b294e20da..4f28c871f 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_t7200-ps.ppd.gz b/prnt/ps/hp-designjet_t7200-ps.ppd.gz Binary files differindex 8e88a3043..24e37fa29 100644 --- a/prnt/ps/hp-designjet_t7200-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t7200-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 2026922de..30cf636f9 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 2fc20bdb8..35753d3d6 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 42d8ab0a4..cc1c69c56 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 795885ac3..d7897e1eb 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_t795ps_44in-ps.ppd.gz b/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz Binary files differindex b6982148d..0474aaa0b 100644 --- a/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_t795ps_44in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_t920-postscript.ppd.gz b/prnt/ps/hp-designjet_t920-postscript.ppd.gz Binary files differindex 11df67646..90d133ceb 100644 --- a/prnt/ps/hp-designjet_t920-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_t920-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz Binary files differindex bf17b7f71..5da4b349e 100644 --- a/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z2600_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz Binary files differindex 4338f7697..3bc6f5e97 100644 --- a/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z5200_postscript-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz Binary files differindex 66755630f..ec28328ce 100644 --- a/prnt/ps/hp-designjet_z5400-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z5400-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz b/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz Binary files differindex 7ab745377..fbc0fb558 100644 --- a/prnt/ps/hp-designjet_z5600_postscript-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z5600_postscript-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 36a8f6b2e..7b0b3b89b 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 3a6c0adf9..e6c607b60 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 334e34db7..5ed4f1590 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 0e77303c0..bfdf570b8 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-designjet_z6600-postscript.ppd.gz b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz Binary files differindex da8131d91..a6a2a7704 100644 --- a/prnt/ps/hp-designjet_z6600-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z6600-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz b/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz Binary files differindex 35f52c642..7311a4c3c 100644 --- a/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6610ps_60in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz Binary files differindex 424357b8c..88b957640 100644 --- a/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz +++ b/prnt/ps/hp-designjet_z6800_photo-postscript.ppd.gz diff --git a/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz b/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz Binary files differindex 704221c86..bf7189575 100644 --- a/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz diff --git a/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz b/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz Binary files differindex f81376247..a85572541 100644 --- a/prnt/ps/hp-designjet_z6810ps_60in-ps.ppd.gz +++ b/prnt/ps/hp-designjet_z6810ps_60in-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 e83b19a03..791cd0aba 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 638e1c215..efc25bf83 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 9bf3009af..6ed203a62 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 fceea82b4..ad1c7071c 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 20fae3ec4..85d9d2eee 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 a0b99c65d..1d921ef17 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 9faea73a6..1d73c107f 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 e1cb385be..37d61047d 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 4a25e445a..5a5297b76 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 2ddc532ad..5af93076a 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 265602772..8349d3712 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 4b6d2808a..433123edc 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 b2fee6cb2..cc5439743 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_color_m251-ps.ppd.gz b/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz Binary files differindex 1bdc2c26d..1f86291ab 100644 --- a/prnt/ps/hp-laserjet_200_color_m251-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_color_m251-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 differindex 7a0466e89..89dbf7289 100644 --- a/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_colormfp_m275-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz b/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz Binary files differindex 83bb29ee8..0c649d918 100644 --- a/prnt/ps/hp-laserjet_200_colormfp_m276-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_200_colormfp_m276-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 4cbcf1a59..2399fafee 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 40077d953..8cde40c12 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 0a6072634..d14eb945b 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 52fb5f1cd..1aaee8706 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 b93879a64..ed2d9e3a9 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 2e4db2393..17937a205 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 66446136b..199787f46 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 a39079648..e3259ebf5 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 9a0ab4258..e8cf6ea42 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 6030f8882..f1ecc6b1b 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 5d86cf356..3b6f7ac47 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 56a4190dd..4f699a068 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 569584f31..5de6ba324 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 12a6c3761..203be06e9 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 9e14a06c5..eee504866 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 7d3b2dae8..6918506a6 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 004c4a0fc..59121e00b 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 959ce5860..4d51796a8 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 55801bc2e..7574d3c06 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 f83162d27..b99d989da 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_400_m401-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz Binary files differindex cdd74bb19..468ce8bef 100644 --- a/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_m401-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz Binary files differindex 9eb2055a6..dfe3a7b64 100644 --- a/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_m401dne-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz b/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz Binary files differindex cf81d2dd6..73db303fe 100644 --- a/prnt/ps/hp-laserjet_400_mfp_m425-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_400_mfp_m425-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 9dcdf22f2..7eef37ab3 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 2aad8878d..96a4ff4d5 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 ec8299736..f7c1f5ebd 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 50e342189..3961be95f 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 90e87bed4..35e7e8c40 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 3fdc72ab3..8828c06e6 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 379891a91..108fa3cbb 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 7bcb6168d..f578c6f33 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 8fbd3628e..e42dcd7c6 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 702180760..b45c35619 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 4abce034d..b68e56ac2 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 144781496..bfee9df1e 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 1f7c1110f..1cd2bd337 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 785132004..e91470bc6 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 bca7f041c..e8a675de4 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 8a613a201..424e92cd4 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 246ee2d4f..d106c5c3d 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_500_color_mfp_m570-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz Binary files differindex 44cc54db5..559ff68af 100644 --- a/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_mfp_m570-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz Binary files differindex b358c2824..80954761c 100644 --- a/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_color_mfp_m575-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz Binary files differindex 71e366ddd..e117ea5eb 100644 --- a/prnt/ps/hp-laserjet_500_mfp_m525-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_500_mfp_m525-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 4e1a64a45..fd9aa2837 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 da8676660..73d5cbf99 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 36140ca83..25fecd450 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 b7ec000a1..0681eb98a 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 763a03393..c2e2bcbf6 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 f3af75083..bae77a68e 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 f9972089b..5eb467c63 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 380f3fbc0..e7d90c981 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 differindex 24f1a7e8e..13f2b6d71 100644 --- a/prnt/ps/hp-laserjet_600_m601_m602_m603-ps.ppd.gz +++ 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 d4092bbcd..623835b4e 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 84b568f15..fe193ae5e 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_700_color_mfp_m775-ps.ppd.gz b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz Binary files differindex 267608ffd..49e90e232 100644 --- a/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_700_color_mfp_m775-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz b/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz Binary files differindex a283b34d8..0179a138a 100644 --- a/prnt/ps/hp-laserjet_700_m712-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_700_m712-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 68de2c919..b0077ab83 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 7a62d39e2..283995887 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 07c3576dd..52de040a4 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 0d742e061..593e0e480 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 d60a31182..5cebe67a4 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 e6f88b108..9f3fea263 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 546e81e05..622c379cb 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 8f05662a7..67433767f 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 532e28e38..ebc063e19 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 90ad017ab..b64bb8aea 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 8a18bc710..3ff03849f 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 251413d89..306634094 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 74c6e8e11..6412366ca 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 adb2ad309..13ef32af2 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_color_flow_mfp_m575-ps.ppd.gz b/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz Binary files differindex 0fab3054e..52873c847 100644 --- a/prnt/ps/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_color_flow_mfp_m575-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 1e3fb32a2..9d0f36d3d 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_e50145-ps.ppd.gz b/prnt/ps/hp-laserjet_e50145-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..f2b6e8ca8 --- /dev/null +++ b/prnt/ps/hp-laserjet_e50145-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz b/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz Binary files differindex 9de9240ad..3a47de648 100644 --- a/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e60055-e60075-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60155-ps.ppd.gz b/prnt/ps/hp-laserjet_e60155-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..fd2daae6a --- /dev/null +++ b/prnt/ps/hp-laserjet_e60155-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60165-ps.ppd.gz b/prnt/ps/hp-laserjet_e60165-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..a1e5f556d --- /dev/null +++ b/prnt/ps/hp-laserjet_e60165-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e60175-ps.ppd.gz b/prnt/ps/hp-laserjet_e60175-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..e40f69e64 --- /dev/null +++ b/prnt/ps/hp-laserjet_e60175-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz b/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz Binary files differindex 52b265bc2..540407e48 100644 --- a/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_e62555-e62575-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz b/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..4ec2ec7dd --- /dev/null +++ b/prnt/ps/hp-laserjet_e62655-e62675-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..f75241310 --- /dev/null +++ b/prnt/ps/hp-laserjet_flow_mfp_e52645-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz Binary files differindex 6d3e98d7f..b2a4e72d6 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m525-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..374facdd3 --- /dev/null +++ b/prnt/ps/hp-laserjet_flow_mfp_m528-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz Binary files differindex fd490e061..a0584d606 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m630-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz b/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz Binary files differindex 557a34e6b..a0dbbc185 100644 --- a/prnt/ps/hp-laserjet_flow_mfp_m830-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_flow_mfp_m830-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 d19e08e9c..b059e4015 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 03f5333ce..e47dbd888 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 358ecc3d4..746d084ab 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 caae95005..c890886e5 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 d4849866a..baf91e9b4 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 379babf24..230f22f4e 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 92271d128..4a9b0089a 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 81f5cb8b9..ff1c32235 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 159326a89..519f92b76 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 e1c136875..2f05a1ea9 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 0e6197e8b..c05557dcd 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 7015dfbcb..630479c46 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_m506-ps.ppd.gz b/prnt/ps/hp-laserjet_m506-ps.ppd.gz Binary files differindex 04a506e9e..b4fa07ecf 100644 --- a/prnt/ps/hp-laserjet_m506-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m506-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m507-ps.ppd.gz b/prnt/ps/hp-laserjet_m507-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..3f9ff61f5 --- /dev/null +++ b/prnt/ps/hp-laserjet_m507-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz b/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz Binary files differindex 3cc5f2f42..0da3eb511 100644 --- a/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m604_m605_m606-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz b/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz Binary files differindex ff43d3d28..6adffee35 100644 --- a/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m607_m608_m609-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_m806-ps.ppd.gz b/prnt/ps/hp-laserjet_m806-ps.ppd.gz Binary files differindex 8af13d766..d0e36bc4e 100644 --- a/prnt/ps/hp-laserjet_m806-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_m806-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 2012d58bd..782423533 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 7452bebc3..cc3e1f186 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 75a2d6492..211bd9b36 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_mfp_e72425-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..a840e46b7 --- /dev/null +++ b/prnt/ps/hp-laserjet_mfp_e72425-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..b6cef6feb --- /dev/null +++ b/prnt/ps/hp-laserjet_mfp_e72430-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz Binary files differindex f5e2fd1ed..094af24b1 100644 --- a/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz Binary files differindex ff5f9b329..55a8d55a3 100644 --- a/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e77822-25-30-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz Binary files differindex beea4e7a1..54e180ecb 100644 --- a/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz Binary files differindex bbca1f664..26a730fe9 100644 --- a/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz Binary files differindex 4db48c458..99481d62c 100644 --- a/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m426_m427-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz Binary files differindex af77cf591..18c5f4df5 100644 --- a/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m521-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz Binary files differindex 71bb770b6..131408be5 100644 --- a/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m527-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz Binary files differindex 5e23174af..bba8b61c7 100644 --- a/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m630-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz Binary files differindex 0048f9759..47fed9c02 100644 --- a/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m631_m632_m633-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz b/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz Binary files differindex f3abb8e95..7a477c441 100644 --- a/prnt/ps/hp-laserjet_mfp_m725-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_mfp_m725-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 dfc57f7fb..5abf12677 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 fe0945b96..b8da5a40c 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 c9084471d..5ff3cf846 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 26316fea5..a15ef64d1 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 781aa438f..04fb39add 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 7967306fb..c98e988f8 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-laserjet_pro_m118-m119-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz Binary files differindex abc899ce0..e8fdfaf84 100644 --- a/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m118-m119-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz Binary files differindex b94fbf5b7..4ab868a62 100644 --- a/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m148-m149-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz Binary files differindex 1c2767638..c6d6f6ccb 100644 --- a/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m148f-m149f-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz Binary files differindex 08731db92..5423ed3ac 100644 --- a/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m201_m202-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz Binary files differindex 68d47888b..826b2e941 100644 --- a/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m203_m206-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz Binary files differindex bb4f0c960..bbf640ae5 100644 --- a/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m402_m403-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz Binary files differindex 70077d244..3473d0c4e 100644 --- a/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m402_m403d-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz Binary files differindex 4cd0b9c4f..3f9910867 100644 --- a/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m501dn-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz Binary files differindex 018172afa..be8ecae95 100644 --- a/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m501n-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz Binary files differindex 317d0d8b9..9b02f5b8b 100644 --- a/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m701-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz Binary files differindex a01cb5180..46418b63d 100644 --- a/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_m706-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz Binary files differindex 5c20429bb..795047fd2 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz Binary files differindex 5a703480a..25956e970 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m227-m231-ps.ppd.gz diff --git a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz Binary files differindex 8c6c4401b..b310fa007 100644 --- a/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz +++ b/prnt/ps/hp-laserjet_pro_mfp_m435-ps.ppd.gz diff --git a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz Binary files differindex c5f740520..50a28181a 100644 --- a/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz +++ b/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz diff --git a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz Binary files differindex 21e4be053..5494ff67f 100644 --- a/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz +++ b/prnt/ps/hp-lj_300_400_color_mfp_m375_m475-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 ee13c225e..ba3179973 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 e50a06799..e0afa6790 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_color_mfp_x585.ppd.gz b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz Binary files differindex 873a36973..49d8367d4 100644 --- a/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz +++ b/prnt/ps/hp-officejet_color_mfp_x585.ppd.gz diff --git a/prnt/ps/hp-officejet_color_x555-ps.ppd.gz b/prnt/ps/hp-officejet_color_x555-ps.ppd.gz Binary files differindex 10fb43a5b..58e8fd578 100644 --- a/prnt/ps/hp-officejet_color_x555-ps.ppd.gz +++ b/prnt/ps/hp-officejet_color_x555-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz Binary files differindex e91fe291d..d584b6b24 100644 --- a/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_251dw_printer-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz Binary files differindex aeff513d5..1cf31c110 100644 --- a/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_276dw_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz Binary files differindex d41f7ff2c..c23f0af93 100644 --- a/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_451_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz Binary files differindex 3a55c8b90..1d5a99d15 100644 --- a/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_476_576_series-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz b/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz Binary files differindex 4727ff208..990e3cae0 100644 --- a/prnt/ps/hp-officejet_pro_551_series-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_551_series-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 05cc4f366..5f18f878e 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/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz Binary files differindex e13b5d12d..3c5b57328 100644 --- a/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8210-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz Binary files differindex 8e54f8dd1..b9225a08f 100644 --- a/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8730-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz Binary files differindex e0c5f1156..9fd554752 100644 --- a/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8732-ps.ppd.gz diff --git a/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz b/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz Binary files differindex 10861e2b8..42b6915f4 100644 --- a/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz +++ b/prnt/ps/hp-officejet_pro_8740-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz Binary files differindex a8cbba917..342aa1d48 100644 --- a/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_352_printer-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz Binary files differindex 189483b90..cfa57ea90 100644 --- a/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_377_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz b/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz Binary files differindex fb82c1b7b..8ee1b6335 100644 --- a/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_P77440_P77940-60-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_556-ps.ppd.gz b/prnt/ps/hp-pagewide_color_556-ps.ppd.gz Binary files differindex 2c30cdd14..f2926ec92 100644 --- a/prnt/ps/hp-pagewide_color_556-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_556-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_755-ps.ppd.gz b/prnt/ps/hp-pagewide_color_755-ps.ppd.gz Binary files differindex db511ffa5..f28d564a6 100644 --- a/prnt/ps/hp-pagewide_color_755-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_755-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_765-ps.ppd.gz b/prnt/ps/hp-pagewide_color_765-ps.ppd.gz Binary files differindex 84a02edde..eaff9668a 100644 --- a/prnt/ps/hp-pagewide_color_765-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_765-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz b/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz Binary files differindex 9e97fafd3..88ed16030 100644 --- a/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_P75250-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz Binary files differindex 2b491c21f..ed61e5616 100644 --- a/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_e55650-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz Binary files differindex 81ed652a8..f071265a3 100644 --- a/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_e75160-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz b/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz Binary files differindex f2d024dde..ca2f692a4 100644 --- a/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_e77650-e77660-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz b/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz Binary files differindex e8ef1a6ee..35648c9ae 100644 --- a/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_flow_mfp_586-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz Binary files differindex a35a55882..85b2bd2ab 100644 --- a/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_586-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz Binary files differindex aa7c6a172..cca523209 100644 --- a/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_774-779-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz Binary files differindex 2b4281e6d..a24e9a3e3 100644 --- a/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_780-785-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz b/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz Binary files differindex d4e96c1e1..56ef63a05 100644 --- a/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_color_mfp_e58650-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz b/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz Binary files differindex a2caa196c..1b4f731f1 100644 --- a/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_mfp_p57750-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz b/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz Binary files differindex f590cd82b..1ae1eb041 100644 --- a/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_mfp_p77740-60zs-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_p55250-ps.ppd.gz b/prnt/ps/hp-pagewide_p55250-ps.ppd.gz Binary files differindex 0d6e9a613..1073a0b3c 100644 --- a/prnt/ps/hp-pagewide_p55250-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_p55250-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz b/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz Binary files differindex c8b6359b3..b239ed684 100644 --- a/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_p75050-60-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz Binary files differindex a2e6565ad..6cd11a88f 100644 --- a/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_452_printer-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz Binary files differindex 901561a9e..173e97c18 100644 --- a/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_477_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz Binary files differindex 891458c33..928b30528 100644 --- a/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_552_printer-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz Binary files differindex f6c71f4f8..185c54b55 100644 --- a/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_577_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz Binary files differindex 13170daf3..dad59109b 100644 --- a/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_750-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz b/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz Binary files differindex 5aefa1c3f..ab15cd575 100644 --- a/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_pro_mfp_772-777-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..e39adf557 --- /dev/null +++ b/prnt/ps/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz Binary files differindex fa6313e61..46380e782 100644 --- a/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz Binary files differindex ca513349d..b94f8f354 100644 --- a/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..f2a83cbac --- /dev/null +++ b/prnt/ps/hp-pagewide_xl_4100ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..c3e0eddcb --- /dev/null +++ b/prnt/ps/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz Binary files differindex 56263ccc0..7950b4fe4 100644 --- a/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4500ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz Binary files differindex a6c8e3460..1c22e4fee 100644 --- a/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..f02c1c06a --- /dev/null +++ b/prnt/ps/hp-pagewide_xl_4600ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz Binary files differnew file mode 100644 index 000000000..d868334c2 --- /dev/null +++ b/prnt/ps/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz Binary files differindex 779f3da06..9b2c7b9ba 100644 --- a/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz Binary files differindex 334eff42a..9028ba277 100644 --- a/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz Binary files differindex 36d36d97b..e456a5691 100644 --- a/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz Binary files differindex 5c1fe8a03..f9062bf63 100644 --- a/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5100ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz Binary files differindex 61f30a709..58d421f77 100644 --- a/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz Binary files differindex 194455d33..bc8e93248 100644 --- a/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz Binary files differindex 3fac23d34..08d24d863 100644 --- a/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_6000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz Binary files differindex 26e7e9b27..ec0101ad8 100644 --- a/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz Binary files differindex 843885baf..cb1c9251a 100644 --- a/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_8000ps-ps.ppd.gz diff --git a/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz b/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz Binary files differindex 3cf6ae6d6..feb4d4d08 100644 --- a/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz +++ b/prnt/ps/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz diff --git a/prnt/ps/hp-postscript-inkjet.ppd.gz b/prnt/ps/hp-postscript-inkjet.ppd.gz Binary files differindex 48a1918f9..84bef94dc 100644 --- a/prnt/ps/hp-postscript-inkjet.ppd.gz +++ b/prnt/ps/hp-postscript-inkjet.ppd.gz diff --git a/prnt/ps/hp-postscript-laserjet-pro.ppd.gz b/prnt/ps/hp-postscript-laserjet-pro.ppd.gz Binary files differindex d96305fef..31efb93a1 100644 --- a/prnt/ps/hp-postscript-laserjet-pro.ppd.gz +++ b/prnt/ps/hp-postscript-laserjet-pro.ppd.gz diff --git a/prnt/ps/hp-postscript-laserjet.ppd.gz b/prnt/ps/hp-postscript-laserjet.ppd.gz Binary files differindex eb3a23518..3292a309d 100644 --- a/prnt/ps/hp-postscript-laserjet.ppd.gz +++ b/prnt/ps/hp-postscript-laserjet.ppd.gz @@ -1042,7 +1042,6 @@ try: elif len(source_option) == 3 and ('ADF-SinglePage' in source_option) and ('ADF-MultiPage-Simplex' in source_option) and ('ADF-MultiPage-Duplex' in source_option): log.debug("Device has only ADF support") adf = True - if adf: try: if ('ADF' not in source_option) and ('ADF-SinglePage' not in source_option) and ('ADF-MultiPage-Simplex' not in source_option) and ('ADF-MultiPage-Duplex' not in source_option) and ('ADF Simplex' not in source_option) and ('ADF Duplex' not in source_option): @@ -1084,7 +1083,12 @@ try: device.setOption("batch-scan", False) except scanext.error: log.debug("Error setting source or batch-scan option (this is probably OK).") - + if multipick: + MPICK = 1 + device.setOption("multi-pick", int(MPICK)) + else: + MPICK = 0 + device.setOption("multi-pick", int(MPICK)) tlx = device.getOptionObj('tl-x').limitAndSet(tlx) tly = device.getOptionObj('tl-y').limitAndSet(tly) @@ -1499,10 +1503,10 @@ try: if adf: im = imageprocessing.deskew(im) else: - im = imageprocessing.autocrop(im) + #im = imageprocessing.autocrop(im) im = imageprocessing.deskew(im) - if mixed_feed: - im = imageprocessing.mixedfeed(im) + #if mixed_feed: + #im = imageprocessing.mixedfeed(im) if auto_crop and (isBlankPage == False): im = imageprocessing.autocrop(im) if auto_orient: @@ -1602,7 +1606,10 @@ try: if (document_merge and duplex and save_file == 'pdf') or (imageprocessing.check_pypdf2() != None): temp_output = utils.createSequencedFilename("hpscan", '.png', output_path) else: - temp_output = utils.createSequencedFilename("hpscan", ext, output_path) + if mixed_feed: + temp_output = utils.createSequencedFilename("hpscan",ext, output_path) + else: + temp_output = utils.createSequencedFilename("hpscan",'.png', output_path) adf_page_files.append(temp_output) #print "entered flatbed save" '''pyPlatform = platform.python_version() @@ -1718,17 +1725,23 @@ try: output = utils.createSequencedFilename("hpscanMerge", ext,output_path) else: output = utils.createSequencedFilename("hpscan", ext,output_path)''' - if len(adf_page_files) > 1: + if len(adf_page_files) > 0: #print "adf page files greater than 1" if merge_ADF_Flatbed == True: output = utils.createSequencedFilename("hpscanMerge", ext,output_path) else: output = utils.createSequencedFilename("hpscandoc", ext,output_path) - try: - output = imageprocessing.generatePdfFile(adf_page_files,output) - except ImportError: - try: + try: + if mixed_feed: + output = imageprocessing.generatePdfFile(adf_page_files,output) + else: output = imageprocessing.generatePdfFile_canvas(adf_page_files,output,orient_list,brx,bry,tlx,tly,output_path) + except: + try: + if mixed_feed: + output = imageprocessing.generatePdfFile_canvas(adf_page_files,output,orient_list,brx,bry,tlx,tly,output_path) + else: + output = imageprocessing.generatePdfFile(adf_page_files,output) except ImportError as error: if error.message.split(' ')[-1] == 'PIL': log.error("PDF output requires PIL.") @@ -1788,9 +1801,10 @@ try: log.info("Saving to file %s" % output) c.save() - log.info("Viewing PDF file in %s" % pdf_viewer) - cmd = "%s %s &" % (pdf_viewer, output) - os_utils.execute(cmd) + if uiscan == True: + log.info("Viewing PDF file in %s" % pdf_viewer) + cmd = "%s %s &" % (pdf_viewer, output) + os_utils.execute(cmd) sys.exit(0) if resize != 100: diff --git a/scan/sane/common.h b/scan/sane/common.h index 0f67542df..cdddd94dc 100644 --- a/scan/sane/common.h +++ b/scan/sane/common.h @@ -109,6 +109,10 @@ /* To prevent "2252" asserts on OfficeJet 600 series: */ #define SAFER_JPEG_COMPRESSION_FACTOR 10 + +#define MULTIPICK_DISABLE 0 +#define MULTIPICK_ENABLE 1 + #define BEND_GET_SHORT(s) (((s)[0]<<8)|((s)[1])) #define BEND_GET_LONG(s) (((s)[0]<<24)|((s)[1]<<16)|((s)[2]<<8)|((s)[3])) #define BEND_SET_SHORT(s,x) ((s)[0]=((x)>>8)&0xFF,(s)[1]=(x)&0xFF) diff --git a/scan/sane/escl.c b/scan/sane/escl.c index a3188e846..98a9caae3 100644 --- a/scan/sane/escl.c +++ b/scan/sane/escl.c @@ -329,6 +329,22 @@ static int init_options(struct escl_session *ps) ps->option[ESCL_OPTION_GROUP_ADVANCED].type = SANE_TYPE_GROUP; ps->option[ESCL_OPTION_GROUP_ADVANCED].cap = SANE_CAP_ADVANCED; + + ps->option[ESCL_OPTION_MULTIPICK].name = "multi-pick"; + ps->option[ESCL_OPTION_MULTIPICK].title = SANE_TITLE_MULTIPICK; + ps->option[ESCL_OPTION_MULTIPICK].desc = SANE_DESC_MULTIPICK; + ps->option[ESCL_OPTION_MULTIPICK].type = SANE_TYPE_INT; + ps->option[ESCL_OPTION_MULTIPICK].unit = SANE_UNIT_NONE; + ps->option[ESCL_OPTION_MULTIPICK].size = sizeof(SANE_Int); + ps->option[ESCL_OPTION_MULTIPICK].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED; + ps->option[ESCL_OPTION_MULTIPICK].constraint_type = SANE_CONSTRAINT_RANGE; + ps->option[ESCL_OPTION_MULTIPICK].constraint.range = &ps->multipickRange; + ps->multipickRange.min = MULTIPICK_DISABLE; + ps->multipickRange.max = MULTIPICK_ENABLE; + ps->multipickRange.quant = 0; + + + ps->option[ESCL_OPTION_COMPRESSION].name = STR_NAME_COMPRESSION; ps->option[ESCL_OPTION_COMPRESSION].title = STR_TITLE_COMPRESSION; ps->option[ESCL_OPTION_COMPRESSION].desc = STR_DESC_COMPRESSION; @@ -461,6 +477,10 @@ SANE_Status __attribute__ ((visibility ("hidden"))) escl_open(SANE_String_Const escl_control_option(session, ESCL_OPTION_TL_Y, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ escl_control_option(session, ESCL_OPTION_BR_X, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ escl_control_option(session, ESCL_OPTION_BR_Y, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + + /* Set multi-pick support */ + escl_control_option(session, ESCL_OPTION_MULTIPICK, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */ + *handle = (SANE_Handle *)session; @@ -498,6 +518,7 @@ SANE_Status escl_control_option(SANE_Handle handle, SANE_Int option, SANE_Action SANE_Int *int_value = value, mset_result=0; int i, stat=SANE_STATUS_INVAL; int found = 0; + switch(option) { @@ -786,6 +807,28 @@ SANE_Status escl_control_option(SANE_Handle handle, SANE_Int option, SANE_Action stat = SANE_STATUS_GOOD; } break; + + case ESCL_OPTION_MULTIPICK: + if (action == SANE_ACTION_GET_VALUE) + { + *int_value = ps->currentmultipick; + stat = SANE_STATUS_GOOD; + } + else if (action == SANE_ACTION_SET_VALUE) + { + if (*int_value >= MULTIPICK_DISABLE && *int_value <= MULTIPICK_ENABLE) + { + ps->currentmultipick = *int_value; + stat = SANE_STATUS_GOOD; + break; + } + } + else + { /* Set default. */ + ps->currentmultipick = MULTIPICK_DISABLE; + stat = SANE_STATUS_GOOD; + } + break; default: break; } diff --git a/scan/sane/escli.h b/scan/sane/escli.h index a06d7154e..13513881b 100644 --- a/scan/sane/escli.h +++ b/scan/sane/escli.h @@ -65,8 +65,9 @@ enum ESCL_OPTION_NUMBER ESCL_OPTION_TL_Y, ESCL_OPTION_BR_X, ESCL_OPTION_BR_Y, + ESCL_OPTION_MULTIPICK, ESCL_OPTION_PAGES_TO_SCAN, - ESCL_OPTION_MAX + ESCL_OPTION_MAX, }; # define MAX_LIST_SIZE 32 @@ -147,6 +148,10 @@ struct escl_session SANE_Range jpegQualityRange; SANE_Int currentJpegQuality; + //MULTIPICK + SANE_Range multipickRange; + SANE_Int currentmultipick; + SANE_Range tlxRange, tlyRange, brxRange, bryRange; SANE_Fixed currentTlx, currentTly, currentBrx, currentBry; SANE_Fixed effectiveTlx, effectiveTly, effectiveBrx, effectiveBry; diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index c69794ba2..1ba8acf2d 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -82,6 +82,9 @@ :model "HP Color LaserJet Managed Flow MFP e67560z" :status :good +:model "HP Color LaserJet Managed Flow MFP e67660z" +:status :good + :model "HP Color LaserJet Managed Flow MFP e77822z" :status :good @@ -97,6 +100,21 @@ :model "HP Color LaserJet Managed Flow MFP e87660z" :status :good +:model "HP Color LaserJet Managed MFP e67650dh" +:status :good + +:model "HP Color LaserJet Managed MFP e77422a" +:status :good + +:model "HP Color LaserJet Managed MFP e77422dn" +:status :good + +:model "HP Color LaserJet Managed MFP e77422dv" +:status :good + +:model "HP Color LaserJet Managed MFP e77428dn" +:status :good + :model "HP Color LaserJet Managed MFP e77822dn" :status :good @@ -1108,6 +1126,12 @@ :model "HP Ink Tank Wireless 410" :status :good +:model "HP Laser Ns MFP 1005" +:status :good + +:model "HP Laser Ns MFP 1005w" +:status :good + :model "HP LaserJet 100 Color MFP m175" :status :good @@ -1330,12 +1354,24 @@ :model "HP LaserJet 9065 Multifunction Printer" :status :good +:model "HP LaserJet Enterprise Flow MFP m528c" +:status :good + +:model "HP LaserJet Enterprise Flow MFP m528z" +:status :good + :model "HP LaserJet Enterprise Flow MFP m630h" :status :good :model "HP LaserJet Enterprise Flow MFP m630z" :status :good +:model "HP LaserJet Enterprise MFP m528dn" +:status :good + +:model "HP LaserJet Enterprise MFP m528f" +:status :good + :model "HP LaserJet Enterprise MFP m630dn" :status :good @@ -1426,6 +1462,18 @@ :model "HP LaserJet m5039 Multifunction Printer" :status :good +:model "HP LaserJet Managed Flow MFP e52645c" +:status :good + +:model "HP LaserJet Managed Flow MFP e62665h" +:status :good + +:model "HP LaserJet Managed Flow MFP e62665z" +:status :good + +:model "HP LaserJet Managed Flow MFP e62675z" +:status :good + :model "HP LaserJet Managed Flow MFP e72525z" :status :good @@ -1444,6 +1492,15 @@ :model "HP LaserJet Managed Flow MFP e82560z" :status :good +:model "HP LaserJet Managed MFP e52645dn" +:status :good + +:model "HP LaserJet Managed MFP e62655dn" +:status :good + +:model "HP LaserJet Managed MFP e62665hs" +:status :good + :model "HP LaserJet Managed MFP e72525dn" :status :good @@ -1471,6 +1528,18 @@ :model "HP LaserJet Managed MFP e82560du" :status :good +:model "HP LaserJet MFP e72425a" +:status :good + +:model "HP LaserJet MFP e72425dn" +:status :good + +:model "HP LaserJet MFP e72425dv" +:status :good + +:model "HP LaserJet MFP e72430dn" +:status :good + :model "HP LaserJet Pro 200 Color MFP m276n" :status :good @@ -1735,6 +1804,12 @@ :model "HP LaserJet Ultra MFP m230sdn" :status :good +:model "HP Neverstop Laser MFP 1200a" +:status :good + +:model "HP Neverstop Laser MFP 1200w" +:status :good + :model "HP Officejet 150 Mobile All-in-one" :status :good @@ -2257,6 +2332,12 @@ :model "HP Officejet 7612 Wide Format E-all-in-one Printer" :status :good +:model "HP Officejet 8010 All-in-one Printer Series" +:status :good + +:model "HP Officejet 8020 All-in-one Printer Series" +:status :good + :model "HP Officejet 8040 E-all-in-one" :status :good @@ -2518,6 +2599,12 @@ :model "HP Officejet Pro 7740 Wide Format All-in-one" :status :good +:model "HP Officejet Pro 8020 All-in-one Printer Series" +:status :good + +:model "HP Officejet Pro 8030 All-in-one Printer Series" +:status :good + :model "HP Officejet Pro 8500 All-in-one Printer - a909a" :status :good @@ -3826,6 +3913,27 @@ :model "HP Smart Tank 350" :status :good +:model "HP Smart Tank 500 Series" +:status :good + +:model "HP Smart Tank 510" +:status :good + +:model "HP Smart Tank 530 Series" +:status :good + +:model "HP Smart Tank 610" +:status :good + +:model "HP Smart Tank Plus 550" +:status :good + +:model "HP Smart Tank Plus 570 Series" +:status :good + +:model "HP Smart Tank Plus 650" +:status :good + :model "HP Smart Tank Wireless 450" :status :good diff --git a/scan/sane/saneopts.h b/scan/sane/saneopts.h index 7f99303f1..fcc460f8b 100755 --- a/scan/sane/saneopts.h +++ b/scan/sane/saneopts.h @@ -131,6 +131,10 @@ #define SANE_NAME_SELECT_LAMP_DENSITY "select-lamp-density" #define SANE_NAME_LAMP_OFF_AT_EXIT "lamp-off-at-exit" +#define SANE_NAME_MULTIPICK "multi-pick" +#define SANE_TITLE_MULTIPICK SANE_I18N("Multi pick") +#define SANE_DESC_MULTIPICK SANE_I18N("Select multipick option for ESCL protocal based devices") + #define SANE_TITLE_NUM_OPTIONS SANE_I18N("Number of options") #define SANE_TITLE_PREVIEW SANE_I18N("Preview") #define SANE_TITLE_GRAY_PREVIEW SANE_I18N("Force monochrome preview") diff --git a/ui4/printsettingstoolbox.py b/ui4/printsettingstoolbox.py index 4deb5d2bc..a2ec20c7b 100644 --- a/ui4/printsettingstoolbox.py +++ b/ui4/printsettingstoolbox.py @@ -236,6 +236,21 @@ class PrintSettingsToolbox(QToolBox): cups.resetOptions() cups.openPPD(self.cur_printer) + current_options = dict(cups.getOptions()) + # Handling booklet options + if 'HPBookletFilter' in current_options: + if 'HPBookletPageSize' in current_options: + booklet_pagesize = current_options.get('HPBookletPageSize') + else: + booklet_pagesize = 'letter' + # NEED TO sET THE OPTIONS DICTIONARY + self.setPrinterOption('fitplot', 'true') + self.setPrinterOption('Duplex', 'DuplexTumble') + self.setPrinterOption('PageSize', booklet_pagesize) + self.setPrinterOption('number-up', '1') + cups.closePPD() + + cups.openPPD(self.cur_printer) if self.ppd_type == 1 and self.pin_count == 0: self.setPrinterOption("HPDigit", "1111") current_options = dict(cups.getOptions()) diff --git a/ui4/scandialog.py b/ui4/scandialog.py index f9c9728af..bb5e22714 100644 --- a/ui4/scandialog.py +++ b/ui4/scandialog.py @@ -640,17 +640,26 @@ class Ui_HpScan(object): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem(_fromUtf8("")) self.comboBox_Flatbed.addItem(_fromUtf8("")) - if device == '5000' or device == '3000' or device == '7000' or device == '2000': + if device == '5000' or device == '3000' or device == '7000' or device == '2000': + if device == '2000': + self.multi_pick_pri = False + self.multi_pick.setEnabled(False) self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) self.comboBox_Flatbed.setCurrentIndex(1) elif device == '7500' or device == '9120' or device == '8500' or device == '3500' or device == '4500' or device == '2500': + if device == '2500': + self.multi_pick_pri = False + self.multi_pick.setEnabled(False) self.comboBox_Flatbed.addItem(_fromUtf8("")) self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Flatbed", None)) self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setCurrentIndex(1) - if device == '5000' or device == '7500' or device == '9120' or device == '8500' or device == '3500' or device == '4500' or device == '3000' or device == '7000' or device == '2500': + if device == '5000' or device == '7500' or device == '9120' or device == '8500' or device == '3500' or device == '4500' or device == '3000' or device == '7000' or device == '2000' or device == '2500': + if device == '2500' or device == '2000': + self.multi_pick_pri = False + self.multi_pick.setEnabled(False) self.source = str(self.comboBox_Flatbed.currentText()).lower() self.comboBox_Flatbed.currentIndexChanged.connect(self.comboBox_SourceSelected) @@ -1201,8 +1210,20 @@ class Ui_HpScan(object): #name = re.search(r'_5000_', self.device_uri) #if name: if re.search(r'_5000_', self.device_uri) or re.search(r'_7000_s3', self.device_uri) or re.search(r'_3000_s3', self.device_uri) or re.search(r'hp2000S1', self.device_uri): - self.comboBox_Flatbed.setCurrentIndex(0) - else: + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "Duplex", None)) + self.comboBox_Flatbed.setCurrentIndex(1) + elif (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Flatbed", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setCurrentIndex(2) self.comboBox_Flatbed.setEnabled(False) self.source = str(self.comboBox_Flatbed.currentText()).lower() @@ -1224,7 +1245,22 @@ class Ui_HpScan(object): if self.color_dropout_pri == True: self.color_dropout.setEnabled(True) self.comboBox_Flatbed.setEnabled(True) - self.comboBox_Flatbed.setCurrentIndex(1) + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Flatbed", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "Duplex", None)) + self.comboBox_Flatbed.setCurrentIndex(1) + elif (re.search(r'_5000_', self.device_uri)) or (re.search(r'_7000_s3', self.device_uri)) or (re.search(r'_3000_s3', self.device_uri)) or (re.search(r'hp2000S1', self.device_uri)): + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.addItem(_fromUtf8("")) + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "Duplex", None)) + self.comboBox_Flatbed.setCurrentIndex(0) self.source = str(self.comboBox_Flatbed.currentText()).lower() def Document_merge_adf_flatbed(self): @@ -1560,6 +1596,11 @@ class SetupDialog(): ui.punchhole_removal.setEnabled(False) ui.punchhole_removal_pri = False + scanjet_flag=imageprocessing.check_scipy() + if scanjet_flag is not None: + ui.deskew_image.setEnabled(False) + ui.deskew_image_pri = False + scanjet_flag=imageprocessing.check_tesserocr_imutils() if scanjet_flag is not None: ui.auto_orient.setEnabled(False) diff --git a/ui5/printsettingstoolbox.py b/ui5/printsettingstoolbox.py index c43159e3a..ef2f2cd91 100644 --- a/ui5/printsettingstoolbox.py +++ b/ui5/printsettingstoolbox.py @@ -218,6 +218,22 @@ class PrintSettingsToolbox(QToolBox): cups.resetOptions() cups.openPPD(self.cur_printer) + + current_options = dict(cups.getOptions()) + # Handling booklet options + if 'HPBookletFilter' in current_options: + if 'HPBookletPageSize' in current_options: + booklet_pagesize = current_options.get('HPBookletPageSize') + else: + booklet_pagesize = 'letter' + # NEED TO sET THE OPTIONS DICTIONARY + self.setPrinterOption('fitplot', 'true') + self.setPrinterOption('Duplex', 'DuplexTumble') + self.setPrinterOption('PageSize', booklet_pagesize) + self.setPrinterOption('number-up', '1') + cups.closePPD() + + cups.openPPD(self.cur_printer) if self.ppd_type == 1 and self.pin_count == 0: self.setPrinterOption("HPDigit", "1111") current_options = dict(cups.getOptions()) diff --git a/ui5/scandialog.py b/ui5/scandialog.py index 56d94bf85..5d7e7d27f 100644 --- a/ui5/scandialog.py +++ b/ui5/scandialog.py @@ -627,17 +627,26 @@ class Ui_HpScan(object): self.comboBox_Flatbed.clear() self.comboBox_Flatbed.addItem("") self.comboBox_Flatbed.addItem("") - if device == '5000' or device == '3000' or device == '7000' or device == '2000': + if device == '5000' or device == '3000' or device == '7000' or device == '2000': + if device == '2000': + self.multi_pick_pri = False + self.multi_pick.setEnabled(False) self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) self.comboBox_Flatbed.setCurrentIndex(1) elif device == '7500' or device == '9120' or device == '8500' or device == '3500' or device == '4500' or device == '2500': + if device == '2500': + self.multi_pick_pri = False + self.multi_pick.setEnabled(False) self.comboBox_Flatbed.addItem("") self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Flatbed", None)) self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setCurrentIndex(1) if device == '5000' or device == '7500' or device == '9120' or device == '8500' or device == '3500' or device == '4500' or device == '3000' or device == '7000' or device == '2000' or device == '2500': + if device == '2500' or device == '2000': + self.multi_pick_pri = False + self.multi_pick.setEnabled(False) self.source = str(self.comboBox_Flatbed.currentText()).lower() self.comboBox_Flatbed.currentIndexChanged.connect(self.comboBox_SourceSelected) @@ -1188,8 +1197,20 @@ class Ui_HpScan(object): #name = re.search(r'_5000_', self.device_uri) #if name: if re.search(r'_5000_', self.device_uri) or re.search(r'_7000_s3', self.device_uri) or re.search(r'_3000_s3', self.device_uri) or (re.search(r'hp2000S1', self.device_uri)): - self.comboBox_Flatbed.setCurrentIndex(0) - else: + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "Duplex", None)) + self.comboBox_Flatbed.setCurrentIndex(1) + elif (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Flatbed", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "Duplex", None)) self.comboBox_Flatbed.setCurrentIndex(2) self.comboBox_Flatbed.setEnabled(False) self.source = str(self.comboBox_Flatbed.currentText()).lower() @@ -1211,7 +1232,22 @@ class Ui_HpScan(object): if self.color_dropout_pri == True: self.color_dropout.setEnabled(True) self.comboBox_Flatbed.setEnabled(True) - self.comboBox_Flatbed.setCurrentIndex(1) + if (re.search(r'_7500', self.device_uri)) or (re.search(r'_N9120', self.device_uri)) or (re.search(r'_8500fn2', self.device_uri)) or (re.search(r'_3500_f1', self.device_uri)) or (re.search(r'_4500_fn1', self.device_uri)) or (re.search(r'2500', self.device_uri)): + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "Flatbed", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(2, _translate("HpScan", "Duplex", None)) + self.comboBox_Flatbed.setCurrentIndex(1) + elif (re.search(r'_5000_', self.device_uri)) or (re.search(r'_7000_s3', self.device_uri)) or (re.search(r'_3000_s3', self.device_uri)) or (re.search(r'hp2000S1', self.device_uri)): + self.comboBox_Flatbed.clear() + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.addItem("") + self.comboBox_Flatbed.setItemText(0, _translate("HpScan", "ADF", None)) + self.comboBox_Flatbed.setItemText(1, _translate("HpScan", "Duplex", None)) + self.comboBox_Flatbed.setCurrentIndex(0) self.source = str(self.comboBox_Flatbed.currentText()).lower() def Document_merge_adf_flatbed(self): @@ -1546,6 +1582,11 @@ class SetupDialog(): ui.punchhole_removal.setEnabled(False) ui.punchhole_removal_pri = False + scanjet_flag=imageprocessing.check_scipy() + if scanjet_flag is not None: + ui.deskew_image.setEnabled(False) + ui.deskew_image_pri = False + scanjet_flag=imageprocessing.check_tesserocr_imutils() if scanjet_flag is not None: ui.auto_orient.setEnabled(False) diff --git a/ui5/wifisetupdialog.py b/ui5/wifisetupdialog.py index e0c7aee9a..32b420c59 100644 --- a/ui5/wifisetupdialog.py +++ b/ui5/wifisetupdialog.py @@ -570,7 +570,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog): try: self.ip,_,addressmode, subnetmask, gateway, pridns, sec_dns= self.wifiObj.getIPConfiguration(self.dev, self.adapterName) if self.ip == "0.0.0.0": - self.ip, subnetmask, gateway, pri_dns, sec_dns, addressmode = self.wifiobj.getwifiotherdetails(self.dev,self.adapterName) + self.ip, subnetmask, gateway, pri_dns, sec_dns, addressmode = self.wifiObj.getwifiotherdetails(self.dev,self.adapterName) vsa_codes = self.wifiObj.getVSACodes(self.dev, self.adapterName) ss_max, ss_min, ss_val, ss_dbm = self.wifiObj.getSignalStrength(self.dev, self.adapterName,self.network, self.adaptor_id) self.hn = self.wifiObj.getHostname(self.dev) @@ -22,7 +22,9 @@ except ImportError as e: -mod = module.Module(__mod__, __title__, __version__, __doc__, None, (INTERACTIVE_MODE,)) +#mod = module.Module(__mod__, __title__, __version__, __doc__, None, (INTERACTIVE_MODE,)) +mod = module.Module(__mod__, __title__, __version__, __doc__, None, (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5)) +mod.setUsage(module.USAGE_FLAG_NONE, extra_options=None, see_also_list = ['hp-scan']) |