diff --git a/.cvsignore b/.cvsignore index efb4cf1..e41da99 100644 --- a/.cvsignore +++ b/.cvsignore @@ -30,3 +30,4 @@ hplip-2.8.12.tar.gz hplip-3.9.2.tar.gz hplip-3.9.6b.tar.gz hplip-3.9.8.tar.gz +hplip-3.9.10.tar.gz diff --git a/hplip-3.9.10.tar.gz.asc b/hplip-3.9.10.tar.gz.asc new file mode 100644 index 0000000..2ac3caa --- /dev/null +++ b/hplip-3.9.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkrwszkACgkQhA7anpATwAUMowCdErRsdPydLdQ+AbMUnXmFK/9F +IVEAoIDD5umpZ61yzDBUPfnvAALZUBfI +=GQ71 +-----END PGP SIGNATURE----- diff --git a/hplip-clear-previous-state-reasons.patch b/hplip-clear-previous-state-reasons.patch deleted file mode 100644 index ed2b4ec..0000000 --- a/hplip-clear-previous-state-reasons.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons 2009-08-04 22:35:33.000000000 +0100 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-08-24 09:55:28.941900902 +0100 -@@ -570,6 +570,14 @@ static int loop_test(HPMUD_DEVICE dd, HP - { - int status, stat; - const char *pstate, *old_state=NULL; -+ static int first_time = 1; -+ -+ if (first_time) -+ { -+ first_time = 0; -+ old_state = ("media-empty-error,media-jam-error," -+ "cover-open-error,toner-empty-error,other"); -+ } - - while (1) - { -@@ -768,6 +776,10 @@ int main(int argc, char *argv[]) - pthread_cond_init(&pa.done_cond, NULL); - pthread_create(&pa.tid, NULL, (void *(*)(void*))pjl_read_thread, (void *)&pa); - } -+ -+ /* Clear any errors left over from a previous run. */ -+ loop_test (hd, cd, &pa, argv[0], printer, argv[2], argv[1], -+ argv[3]); - } - - stat = hpmud_write_channel(hd, cd, buf+total, size, EXCEPTION_TIMEOUT, &n); diff --git a/hplip-device-reconnected.patch b/hplip-device-reconnected.patch index ccb7fa9..40c5bf8 100644 --- a/hplip-device-reconnected.patch +++ b/hplip-device-reconnected.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c.device-reconnected 2009-09-29 16:02:14.717467334 +0100 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-09-29 16:02:20.019342096 +0100 -@@ -638,6 +638,7 @@ int main(int argc, char *argv[]) +diff -up hplip-3.9.10/prnt/backend/hp.c.device-reconnected hplip-3.9.10/prnt/backend/hp.c +--- hplip-3.9.10/prnt/backend/hp.c.device-reconnected 2009-11-03 21:45:10.000000000 +0000 ++++ hplip-3.9.10/prnt/backend/hp.c 2009-11-04 16:25:30.719129509 +0000 +@@ -645,6 +645,7 @@ int main(int argc, char *argv[]) HPMUD_DEVICE hd=-1; HPMUD_CHANNEL cd=-1; int n, total=0, retry=0, size, pages; @@ -9,22 +9,23 @@ diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backe enum HPMUD_RESULT stat; char *printer = getenv("PRINTER"); -@@ -789,10 +790,23 @@ int main(int argc, char *argv[]) - /* IO error, get printer status. */ - if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3])) +@@ -809,11 +810,24 @@ int main(int argc, char *argv[]) + { + exit_stat = BACKEND_STOP; /* stop queue */ goto bugout; ++ } + -+ if (++consecutive_failures == 5) -+ { -+ /* hpmud_write_channel has failed several times in -+ * succession but the Device ID-based status says -+ * the printer is happy. Time to face the fact that -+ * the device has probably reconnected, and our USB -+ * channel is invalidated. */ ++ if (++consecutive_failures == 5) ++ { ++ /* hpmud_write_channel has failed several times in ++ * succession but the Device ID-based status says ++ * the printer is happy. Time to face the fact that ++ * the device has probably reconnected, and our USB ++ * channel is invalidated. */ + -+ BUG("ERROR: device reconnected?"); -+ goto bugout; -+ } ++ BUG("ERROR: device reconnected?"); ++ goto bugout; + } } else { diff --git a/hplip-hpcups-reorder.patch b/hplip-hpcups-reorder.patch deleted file mode 100644 index 6738051..0000000 --- a/hplip-hpcups-reorder.patch +++ /dev/null @@ -1,1674 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.hpcups-reorder 2009-08-04 22:42:07.000000000 +0100 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-12 23:17:41.192332302 +0100 -@@ -210,10 +210,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -226,10 +232,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -244,16 +256,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -265,35 +289,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" - { - // Custom page sizes from 1x4in to Legal - HWMargins 18 36 18 36 -@@ -754,8 +749,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -763,12 +762,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -893,10 +886,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -909,10 +908,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -927,16 +932,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -948,35 +965,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" - { - - // Custom page sizes from 1x4in to Legal -@@ -1010,8 +998,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -1019,12 +1011,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -1142,10 +1128,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -1158,10 +1150,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -1176,16 +1174,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -1197,41 +1207,15 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -1239,12 +1223,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -1366,10 +1344,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -1382,10 +1366,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -1400,16 +1390,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -1421,36 +1423,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - { - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 -@@ -1659,8 +1631,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 18 36 18 9 "<>setpagedevice" -@@ -1668,12 +1644,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -1784,10 +1754,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -1800,10 +1776,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -1818,16 +1800,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -1839,36 +1833,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -2017,10 +1981,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -2033,10 +2003,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -2051,56 +2027,38 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<>setpagedevice" -- "<>setpagedevice" // custom -- CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard - CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 18 27 18 36 "<>setpagedevice" -- "<>setpagedevice" -+ CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "16k/16k 7.75x10.75in" 558 774 18 36 18 9 "<>setpagedevice" -+ "<>setpagedevice" // custom -+ CustomMedia "EnvC5/C5 Envelope 162x229mm" 459 649 18 41 18 9 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" -+ "<>setpagedevice" - - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" -@@ -2259,12 +2217,26 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -2273,12 +2245,24 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -2293,16 +2277,34 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -2314,62 +2316,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -3702,8 +3648,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<>setpagedevice" -@@ -3711,12 +3661,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -3902,12 +3846,26 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -3916,12 +3874,24 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -3936,16 +3906,34 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -3957,62 +3945,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -4039,8 +3971,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<>setpagedevice" -@@ -4048,12 +3984,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 18 36 18 36 - VariablePaperSize Yes -@@ -4178,12 +4108,26 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -4192,12 +4136,24 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -4212,16 +4168,34 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -4233,62 +4207,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -4419,10 +4337,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -4435,10 +4359,16 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -4453,16 +4383,28 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 9 9 9 9 "<>setpagedevice" -@@ -4474,36 +4416,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Duplex 4x6 -- CustomMedia "Card4x6Duplex/Index Card AutoDuplex 4x6in" 288 423 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiDuplex/Hagaki AutoDuplex 100x148mm" 284 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex 5x7 -- CustomMedia "Card5x8Duplex/Index Card AutoDuplex 5x8in" 360 567 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuDuplex/Oufuku-Hagaki AutoDuplex 148x200mm" 420 558 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- --// Duplex Standard -- CustomMedia "LetterDuplex/Letter AutoDuplex 8.5x11in" 612 783 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "LegalDuplex/Legal AutoDuplex 8.5x14in)" 612 999 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5Duplex/A5 AutoDuplex 148x210mm" 420 586 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B5Duplex/B5 AutoDuplex 176x250mm" 499 699 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5Duplex/JB5 AutoDuplex 182x257mm" 516 720 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "ExecutiveDuplex/Executive AutoDuplex 7.25x10.5in" 522 747 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // CDDVD - CustomMedia "CDDVD80/CD DVD 80mm" 238 238 4 4 4 4 "<>setpagedevice" - "<>setpagedevice" -@@ -4655,8 +4567,12 @@ Manufacturer "HP" - // Large - CustomMedia "A3/A3 297x420mm" 842 1190 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "B4/B4 257x364mm" 729 1033 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Ledger/Ledger 17x11in" 1224 792 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "SuperB/SuperB 13x19in" 936 1368 9 36 9 9 "<>setpagedevice" -@@ -4664,12 +4580,6 @@ Manufacturer "HP" - CustomMedia "8k/8k 10.75x15.5in" 774 1116 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" // custom - --// Duplex Large -- CustomMedia "A3Duplex/A3 AutoDuplex 297x420mm" 842 1181 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "B4Duplex/B4 AutoDuplex 257x364mm" 729 1024 9 27 9 36 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to SuperB - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5176,10 +5086,14 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -5229,12 +5143,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 18 41 18 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 (three sided) -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5576,12 +5484,20 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -5590,12 +5506,18 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -5610,14 +5532,20 @@ Manufacturer "HP" - // Standard - *CustomMedia "Letter/Letter 8.5x11in" 612 792 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "B5/B5 176x250mm" 498.96 708.48 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "JB5/JB5 182x257mm" 516.24 728.64 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Executive/Executive 7.25x10.5in" 522 756 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "FLSA/American Foolscap 8.5x13in" 612 936 18 36 18 9 "<>setpagedevice" -@@ -5631,32 +5559,6 @@ Manufacturer "HP" - CustomMedia "EnvB5/B5 Envelope 176x250mm" 499 709 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed Standard -- CustomMedia "LetterFB/Letter Borderless 8.5x11in" 622 802 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "JB5FB/JB5 Borderless 182x257mm" 526 739 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to Legal - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5790,10 +5692,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -5801,14 +5709,6 @@ Manufacturer "HP" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to A6 - HWMargins 9 36 9 36 - VariablePaperSize Yes -@@ -5919,10 +5819,16 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" -@@ -5930,14 +5836,6 @@ Manufacturer "HP" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- *CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to A6 - HWMargins 9 9 9 9 - VariablePaperSize Yes -@@ -6125,12 +6023,20 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -6139,12 +6045,18 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -6156,24 +6068,6 @@ Manufacturer "HP" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- *CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to 5x7 - HWMargins 9 9 9 9 - VariablePaperSize Yes -@@ -6295,12 +6189,20 @@ Manufacturer "HP" - // 4x6 or smaller - CustomMedia "Photo/Photo 4x6in" 288 432 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card3x5/Index Card 3x5in" 216 360 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "EnvChou4/#4 Japanese Envelope 90x205mm" 254.88 581.04 9 41 8 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvMonarch/Monarch Envelope 3.875x7.5in" 279 540 9 41 9 9 "<>setpagedevice" -@@ -6309,12 +6211,18 @@ Manufacturer "HP" - // 5x7 - CustomMedia "Photo5x7/Photo 5x7in" 360 504 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "A5/A5 148x210mm" 419.76 595.44 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Card5x8/Index Card 5x8in" 360 576 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Oufuku/Oufuku-Hagaki 148x200mm" 420 558 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -+ CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -+ "<>setpagedevice" - CustomMedia "Env10/#10 Envelope 4.12x9.5in" 297 684 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "EnvA2/A2 Envelope 4.37x5.75in" 314.64 414 9 42 9 9 "<>setpagedevice" -@@ -6326,24 +6234,6 @@ Manufacturer "HP" - CustomMedia "EnvChou3/#3 Japanese Envelope 120x235mm" 339.84 666 9 41 9 9 "<>setpagedevice" - "<>setpagedevice" - --// Full Bleed 4x6 -- CustomMedia "PhotoFB/Photo Borderless 4x6 in" 298 442 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "HagakiFB/Hagaki Borderless 100x148mm" 294 430 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- --// Full Bleed 5x7 -- CustomMedia "Photo5x7FB/Photo Borderless 5x7in" 370 514 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "OufukuFB/Oufuku-Hagaki Borderless 148x200mm" 430 577 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "A5FB/A5 Borderless 148x210mm" 430 605 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- CustomMedia "Card3x5FB/Index Card Borderless 3x5in" 262 370 0 0 0 0 "<>setpagedevice" -- "<>setpagedevice" -- - // Custom page sizes from 1x4in to 5x7 - HWMargins 9 9 9 9 - VariablePaperSize Yes -@@ -7753,7 +7643,7 @@ Manufacturer "HP" - // cupsRowCount values map to PEN_TYPE + 1 from global_types.h - Option "ColorModel/Output Mode" PickOne AnySetup 10.0 - Choice "Gray/Grayscale" "<>setpagedevice" -- *Choice "RGB/Color" "<>setpagedevice" -+ *Choice "RGB/Color" "<>setpagedevice" - - // cupsMediaType values map to MEDIATYPE from global_types.h - Option "MediaType/Media Type" PickOne AnySetup 10.0 -@@ -10288,7 +10178,7 @@ Manufacturer "HP" - { - Group "General/General" - -- Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-steup:" "" -+ Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" "" - - Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0 - Choice "DuplexNoTumble/Long Edge (Standard)" "<>setpagedevice" diff --git a/hplip-non-scripts.patch b/hplip-non-scripts.patch deleted file mode 100644 index bbc2bc3..0000000 --- a/hplip-non-scripts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am ---- hplip-3.9.8/Makefile.am.non-scripts 2009-08-04 22:37:39.000000000 +0100 -+++ hplip-3.9.8/Makefile.am 2009-08-28 10:58:04.488778060 +0100 -@@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin - # base - basedir = $(hplipdir)/base - --dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \ -+dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \ - base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \ - base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \ - base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \ diff --git a/hplip-parenths.patch b/hplip-parenths.patch deleted file mode 100644 index 172bbe0..0000000 --- a/hplip-parenths.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths 2009-08-24 17:20:34.608890337 +0100 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-24 17:22:04.606015304 +0100 -@@ -214,7 +214,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -260,7 +260,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -890,7 +890,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -936,7 +936,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1132,7 +1132,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1178,7 +1178,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1348,7 +1348,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1394,7 +1394,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1758,7 +1758,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1804,7 +1804,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -1985,7 +1985,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -2031,7 +2031,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<>setpagedevice" - "<>setpagedevice" -@@ -2225,7 +2225,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -2285,7 +2285,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -3852,7 +3852,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -3912,7 +3912,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -4114,7 +4114,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -4174,7 +4174,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<>setpagedevice" - "<>setpagedevice" -@@ -4341,7 +4341,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -@@ -4387,7 +4387,7 @@ Manufacturer "HP" - "<>setpagedevice" - CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" -- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<>setpagedevice" -+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" - "<>setpagedevice" - CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<>setpagedevice" - "<>setpagedevice" diff --git a/hplip-plugin-error.patch b/hplip-plugin-error.patch deleted file mode 100644 index ec4c541..0000000 --- a/hplip-plugin-error.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c~ 2009-10-28 17:03:27.435140391 +0000 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-10-28 17:12:15.709140073 +0000 -@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP - if (first_time) - { - first_time = 0; -- old_state = ("media-empty-error,media-jam-error," -+ old_state = ("media-empty-error,media-jam-error,hplip.plugin-error," - "cover-open-error,toner-empty-error,other"); - } - -diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp ---- hplip-3.9.8/prnt/hpijs/hpcups.cpp~ 2009-10-28 17:03:27.390139541 +0000 -+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-10-28 17:11:18.980140742 +0000 -@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv) - SendDbusMessage (device_uri, printer, - EVENT_PRINT_FAILED_MISSING_PLUGIN, - argv[2], atoi (argv[1]), argv[3]); -+ fputs ("STATE: +hplip.plugin-error\n", stderr); - BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err); - return 1; - } diff --git a/hplip-requirespageregion.patch b/hplip-requirespageregion.patch deleted file mode 100644 index be4da63..0000000 --- a/hplip-requirespageregion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion hplip-3.9.8/prnt/drv/hpcups.drv.in ---- hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion 2009-08-28 08:59:11.086208461 +0100 -+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-28 09:35:30.095904252 +0100 -@@ -111,6 +111,8 @@ Throughput 1 - Filter "application/vnd.cups-raster 0 hpcups" - //Filter "application/vnd.cups-command 0 commandtohpijs" - -+Attribute "RequiresPageRegion" "All" "True" -+ - { - // Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"... - Manufacturer "HP" diff --git a/hplip-state-reasons-newline.patch b/hplip-state-reasons-newline.patch deleted file mode 100644 index ed7163f..0000000 --- a/hplip-state-reasons-newline.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.state-reasons-newline hplip-3.9.8/prnt/backend/hp.c -diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline hplip-3.9.8/prnt/hpijs/hpcups.cpp ---- hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline 2009-08-24 10:40:32.407070376 +0100 -+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-08-24 11:04:14.374016107 +0100 -@@ -315,7 +315,7 @@ int HPCups::initContext (char **argv) - m_pSys->pPC->constructor_error != PLUGIN_LIBRARY_MISSING && - m_pSys->DisplayStatus != DISPLAY_PRINTING_CANCELED) - { -- BUG("PrintContext creation failed, error = %d", m_pSys->pPC->constructor_error); -+ BUG("PrintContext creation failed, error = %d\n", m_pSys->pPC->constructor_error); - return 1; - } - -@@ -347,11 +347,11 @@ int HPCups::initContext (char **argv) - case WARN_LOW_INK_YELLOW: - case WARN_LOW_INK_MULTIPLE_PENS: - { -- BUG ("STATE: +marker-supply-low-warning\n"); -+ fputs ("STATE: +marker-supply-low-warning\n", stderr); - break; - } - default: -- BUG ("STATE: -marker-supply-low-warning\n"); -+ fputs ("STATE: -marker-supply-low-warning\n", stderr); - } - } - -@@ -678,7 +678,7 @@ void CancelPrintJob (int sig) - int main (int argc, char **argv) - { - int iRet = hpCups.ProcessJob (argc, argv); -- BUG("hpcups: returning status %d from main", iRet); -+ BUG("hpcups: returning status %d from main\n", iRet); - return iRet; - } - diff --git a/hplip.spec b/hplip.spec index 8c2a682..1a75afa 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.9.8 -Release: 21%{?dist} +Version: 3.9.10 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,18 +13,11 @@ Conflicts: selinux-policy < 3.0.3-3 Url: http://hplip.sourceforge.net/ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz -Patch1: hplip-hpcups-reorder.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch -Patch5: hplip-clear-previous-state-reasons.patch -Patch6: hplip-state-reasons-newline.patch -Patch7: hplip-parenths.patch -Patch8: hplip-non-scripts.patch -Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch -Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-hpcups-plugin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,7 +42,6 @@ BuildRequires: libusb-devel BuildRequires: openssl-devel BuildRequires: sane-backends-devel BuildRequires: dbus-devel -BuildRequires: automake, autoconf, libtool %description The Hewlett-Packard Linux Imaging and Printing Project provides @@ -116,9 +108,6 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q -# Upstream patch to fix paper size order and LJColor device class color space. -%patch1 -p1 -b .hpcups-reorder - # Fix compilation. %patch2 -p1 -b .strstr-const @@ -128,31 +117,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Make sure to avoid handwritten asm. %patch4 -p1 -b .no-asm -# Clear previous state reasons in the hp backend (bug #501338). -%patch5 -p1 -b .clear-previous-state-reasons - -# Don't hide state reason changes by missing out newlines in stderr. -%patch6 -p1 -b .state-reasons-newline - -# Fixed typos in page sizes (bug #515469). -%patch7 -p1 -b .parenths - -# Don't install base/*.py with executable bit set. -%patch8 -p1 -b .non-scripts - -# Set RequiresPageRegion in hpcups PPDs (bug #518756). -%patch9 -p1 -b .requirespageregion - # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected -# Set a printer-state-reason when there's a missing required plugin -# (bug #531330). -%patch13 -p1 -b .plugin-error - # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -161,9 +131,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %patch15 -p1 -b .hpcups-plugin %build -aclocal -automake --foreign --add-missing --copy -autoconf %configure \ --enable-scan-build --enable-gui-build --enable-fax-build \ --disable-foomatic-rip-hplip-install --enable-pp-build \ @@ -363,6 +330,11 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Wed Nov 4 2009 Tim Waugh 3.9.10-1 +- 3.9.10. No longer need clear-previous-state-reasons, + hpcups-reorder, non-scripts, parenths, plugin-error, + requirespageregion or state-reasons-newline patches. + * Mon Nov 2 2009 Tim Waugh 3.9.8-21 - Added 'requires proprietary plugin' to appropriate model names (bug #513283). diff --git a/sources b/sources index e478641..273a455 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb1cf49c5f062993b78fc2768f531ed8 hplip-3.9.8.tar.gz +de2c5e83794efdde10fca8379d2402a3 hplip-3.9.10.tar.gz