diff options
52 files changed, 766 insertions, 142 deletions
@@ -1,3 +1,20 @@ +2013-08-13 Rick Richardson <rick.richardson@comcast.net> + * printer-profile: add Samsung clp-365. + +2013-08-06 Rick Richardson <rick.richardson@comcast.net> + * New Printer: Fuji Xerox DocuPrint P205 + * foo2hbpl2: Bpp = ResX / ResY + +2013-07-31 Rick Richardson <rick.richardson@comcast.net> + * foo2zjs-pstops: Fix for FreeBSD + +2013-06-18 Rick Richardson <rick.richardson@comcast.net> + * Fix typo's in manual pages. + +2013-05-27 Rick Richardson <rick.richardson@comcast.net> + * foomatic-db/printer/Samsung-CLX-3185.xml: fix typo + + "Please move "FileDevice Yes" on line 139 of /etc/cups/cupsd.conf 2013-03-21 Rick Richardson <rick.richardson@comcast.net> * Makefile: change cups target /etc/cups/cups-files.conf if it exists. "Please move "FileDevice Yes" on line 139 of /etc/cups/cupsd.conf @@ -11,7 +28,7 @@ * printer-profile: add dell 1355. * foo2hbpl2: merge in changes from Peter Korf <peter@niendo.de> * hbpldecode: swap yellow and cyan - * New Printers: Fuji Xerox DocuPrint CP205 + * New Printers: Fuji Xerox DocuPrint CM205 * hbpldecode: implement -d option 2013-03-02 Rick Richardson <rick.richardson@comcast.net> diff --git a/INSTALL.osx b/INSTALL.osx index 612a340..42f05ff 100644 --- a/INSTALL.osx +++ b/INSTALL.osx @@ -71,9 +71,9 @@ by Rick Richardson 07/31/11 and install the Foomatic-RIP (foomatic-RIP and foomatic-gswrapper): $ wget http://www.openprinting.org/download/foomatic/foomatic-filters-4.0.12.tar.gz - $ tar zxvf foomatic-filters-4.0.5.tar.gz + $ tar zxvf foomatic-filters-4.0.12.tar.gz $ cd foomatic-filters-4.0.5 - $ CPPFLAGS="-I/opt/local/include" LDFLAGS="-L/opt/local/lib" ./configure --prefix=/usr + $ CPPFLAGS="-I/opt/local/include" LDFLAGS="-L/opt/local/lib" ./configure --prefix=/usr --disable-dbus $ make $ sudo make install @@ -1403,6 +1403,7 @@ ppd: *CLP*|*CLX*|*6110*) driver=foo2qpdl;; \ *6015*|*1355*) driver=foo2hbpl2;; \ *CM205*) driver=foo2hbpl2;; \ + *P205*) driver=foo2hbpl2;; \ *) driver=foo2zjs;; \ esac; \ echo $$driver - $$printer; \ @@ -1446,6 +1447,7 @@ man-osx-hotplug: -e "s@\$${URLQPDL}@$(URLQPDL)@" \ -e "s@\$${URLSLX}@$(URLSLX)@" \ -e "s@\$${URLHC}@$(URLHC)@" \ + -e "s@\$${URLHBPL}@$(URLHBPL)@" \ -e "s/\$${MODpage}/$$MODpage/" \ -e "s/\$${MODver}/$$MODver/" chmod -w $*.1 diff --git a/PPD/Dell-1355.ppd b/PPD/Dell-1355.ppd index cc5907d..5483718 100644 --- a/PPD/Dell-1355.ppd +++ b/PPD/Dell-1355.ppd @@ -102,6 +102,9 @@ *FoomaticRIPOptionSetting ColorMode=Monochrome: " " *CloseUI: *ColorMode +*FoomaticRIPOption Resolution: enum CmdLine A 130 +*FoomaticRIPOptionSetting Resolution=1200x600dpi: "-r1200x600 " + *OpenUI *PageSize/Page Size: PickOne *FoomaticRIPOption PageSize: enum CmdLine A *OrderDependency: 135 AnySetup *PageSize diff --git a/PPD/Fuji_Xerox-DocuPrint_CM205.ppd b/PPD/Fuji_Xerox-DocuPrint_CM205.ppd index 2a01566..4e6b08f 100644 --- a/PPD/Fuji_Xerox-DocuPrint_CM205.ppd +++ b/PPD/Fuji_Xerox-DocuPrint_CM205.ppd @@ -102,6 +102,9 @@ *FoomaticRIPOptionSetting ColorMode=Monochrome: " " *CloseUI: *ColorMode +*FoomaticRIPOption Resolution: enum CmdLine A 130 +*FoomaticRIPOptionSetting Resolution=1200x600dpi: "-r1200x600 " + *OpenUI *PageSize/Page Size: PickOne *FoomaticRIPOption PageSize: enum CmdLine A *OrderDependency: 135 AnySetup *PageSize diff --git a/PPD/Fuji_Xerox-DocuPrint_P205.ppd b/PPD/Fuji_Xerox-DocuPrint_P205.ppd new file mode 100644 index 0000000..fe5ff99 --- /dev/null +++ b/PPD/Fuji_Xerox-DocuPrint_P205.ppd @@ -0,0 +1,422 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Fuji_Xerox-DocuPrint_P205-foo2hbpl2.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "FOO2HBPL.PPD" +*Manufacturer: "Fuji Xerox" +*Product: "(DocuPrint P205)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Fuji Xerox DocuPrint P205" +*ShortNickName: "Fuji Xerox D.Pr. P205 foo2hbpl2" +*NickName: "Fuji Xerox DocuPrint P205 Foomatic/foo2hbpl2 (recommended)" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "DRV:Dfoo2hbpl2,R1,M0,TF;" + +*driverName foo2hbpl2/foo2hbpl2: "" +*driverType F/Filter: "" +*driverUrl: "http://foo2hbpl.rkkda.com/" +*driverObsolete: False + + + + +*HWMargins: 9 12.00 9 12 +*VariablePaperSize: True +*MaxMediaWidth: 100000 +*MaxMediaHeight: 100000 +*NonUIOrderDependency: 135 AnySetup *CustomPageSize +*CustomPageSize True: "pop pop pop pop pop +%% FoomaticRIPOptionSetting: PageSize=Custom" +*End +*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " +*ParamCustomPageSize Width: 1 points 36 100000 +*ParamCustomPageSize Height: 2 points 36 100000 +*ParamCustomPageSize Orientation: 3 int 0 0 +*ParamCustomPageSize WidthOffset: 4 points 0 0 +*ParamCustomPageSize HeightOffset: 5 points 0 0 + +*FoomaticIDs: Fuji_Xerox-DocuPrint_P205 foo2hbpl2 +*FoomaticRIPCommandLine: "foo2hbpl2-wrapper %A" + +*OpenGroup: General/General + +*OpenUI *Quality/Printing Quality: PickOne +*FoomaticRIPOption Quality: enum CmdLine A +*OrderDependency: 110 AnySetup *Quality +*DefaultQuality: normal +*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" +*FoomaticRIPOptionSetting Quality=draft: " -t " +*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" +*FoomaticRIPOptionSetting Quality=normal: " " +*CloseUI: *Quality + +*FoomaticRIPOption ColorMode: enum CmdLine A 120 +*FoomaticRIPOptionSetting ColorMode=Monochrome: " " + +*OpenUI *Resolution/Resolution: PickOne +*FoomaticRIPOption Resolution: enum CmdLine A +*OrderDependency: 130 AnySetup *Resolution +*DefaultResolution: 600x600dpi +*Resolution 600x600dpi/600x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=600x600dpi" +*FoomaticRIPOptionSetting Resolution=600x600dpi: "-r600x600 " +*Resolution 1200x1200dpi/1200x1200 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x1200dpi" +*FoomaticRIPOptionSetting Resolution=1200x1200dpi: "-r1200x1200 " +*CloseUI: *Resolution + +*OpenUI *PageSize/Page Size: PickOne +*FoomaticRIPOption PageSize: enum CmdLine A +*OrderDependency: 135 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" +*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " +*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" +*FoomaticRIPOptionSetting PageSize=A4: "-p1 " +*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" +*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " +*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" +*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " +*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" +*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " +*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" +*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " +*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" +*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " +*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" +*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " +*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" +*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " +*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" +*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " +*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" +*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 135 AnySetup *PageRegion +*DefaultPageRegion: ev/foo2hbpl2-PageSize-0 +*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" +*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" +*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" +*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" +*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" +*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" +*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" +*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" +*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" +*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" +*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" +*CloseUI: *PageRegion + +*DefaultImageableArea: ev/foo2hbpl2-PageSize-0 +*ImageableArea Letter/Letter: "9 12.00 603 780.00" +*ImageableArea A4/A4: "9 12.00 586 830.00" +*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" +*ImageableArea Env10/Env #10: "9 12.00 288 672.00" +*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" +*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" +*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" +*ImageableArea Executive/Executive: "9 12.00 513 744.00" +*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" +*ImageableArea Folio/Folio: "9 12.00 603 924.00" +*ImageableArea Legal/Legal: "9 12.00 603 996.00" + +*DefaultPaperDimension: ev/foo2hbpl2-PageSize-0 +*PaperDimension Letter/Letter: "612 792" +*PaperDimension A4/A4: "595 842" +*PaperDimension B5jis/B5 (JIS): "518 727" +*PaperDimension Env10/Env #10: "297 684" +*PaperDimension EnvC5/Env C5: "459 649" +*PaperDimension EnvDL/Env DL: "311 623" +*PaperDimension EnvMonarch/Env Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" +*PaperDimension Folio/Folio: "612 936" +*PaperDimension Legal/Legal: "612 1008" + +*OpenUI *MediaType/Media Type: PickOne +*FoomaticRIPOption MediaType: enum CmdLine A +*OrderDependency: 150 AnySetup *MediaType +*DefaultMediaType: plain +*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" +*FoomaticRIPOptionSetting MediaType=plain: "-m1 " +*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" +*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " +*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" +*FoomaticRIPOptionSetting MediaType=bond: "-m2 " +*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" +*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " +*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" +*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " +*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" +*FoomaticRIPOptionSetting MediaType=labels: "-m5 " +*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" +*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " +*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" +*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " +*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" +*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " +*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" +*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " +*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" +*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " +*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" +*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " +*CloseUI: *MediaType + +*OpenUI *Copies/Copies: PickOne +*FoomaticRIPOption Copies: int CmdLine A +*FoomaticRIPOptionPrototype Copies: "-n%s " +*FoomaticRIPOptionRange Copies: 1 100 +*OrderDependency: 220 AnySetup *Copies +*DefaultCopies: 1 +*FoomaticRIPDefaultCopies: 1 +*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" +*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" +*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" +*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" +*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" +*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" +*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" +*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" +*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" +*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" +*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" +*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" +*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" +*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" +*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" +*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" +*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" +*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" +*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" +*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" +*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" +*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" +*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" +*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" +*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" +*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" +*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" +*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" +*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" +*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" +*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" +*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" +*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" +*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" +*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" +*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" +*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" +*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" +*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" +*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" +*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" +*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" +*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" +*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" +*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" +*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" +*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" +*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" +*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" +*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" +*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" +*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" +*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" +*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" +*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" +*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" +*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" +*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" +*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" +*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" +*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" +*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" +*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" +*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" +*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" +*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" +*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" +*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" +*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" +*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" +*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" +*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" +*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" +*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" +*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" +*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" +*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" +*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" +*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" +*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" +*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" +*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" +*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" +*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" +*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" +*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" +*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" +*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" +*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" +*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" +*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" +*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" +*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" +*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" +*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" +*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" +*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" +*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" +*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" +*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" +*CloseUI: *Copies + +*CloseGroup: General + +*OpenGroup: Adjustment/Adjustment + +*OpenUI *halftone/Halftone Algorithm: PickOne +*FoomaticRIPOption halftone: enum CmdLine A +*OrderDependency: 110 AnySetup *halftone +*Defaulthalftone: default +*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" +*FoomaticRIPOptionSetting halftone=default: " " +*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" +*FoomaticRIPOptionSetting halftone=as: " -qas " +*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" +*FoomaticRIPOptionSetting halftone=standard: " -q1 " +*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" +*FoomaticRIPOptionSetting halftone=wts: " -qwts " +*CloseUI: *halftone + +*CloseGroup: Adjustment + +*OpenGroup: Miscellaneous/Miscellaneous + +*OpenUI *NupOrient/N-up Orientation: PickOne +*FoomaticRIPOption NupOrient: enum CmdLine A +*OrderDependency: 200 AnySetup *NupOrient +*DefaultNupOrient: port +*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" +*FoomaticRIPOptionSetting NupOrient=land: "-ol " +*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" +*FoomaticRIPOptionSetting NupOrient=port: " " +*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" +*FoomaticRIPOptionSetting NupOrient=sea: "-os " +*CloseUI: *NupOrient + +*OpenUI *NupPages/N-up Printing: PickOne +*FoomaticRIPOption NupPages: enum CmdLine A +*OrderDependency: 200 AnySetup *NupPages +*DefaultNupPages: 1up +*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" +*FoomaticRIPOptionSetting NupPages=1up: " " +*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" +*FoomaticRIPOptionSetting NupPages=2up: "-2 " +*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" +*FoomaticRIPOptionSetting NupPages=3up: "-3 " +*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" +*FoomaticRIPOptionSetting NupPages=4up: "-4 " +*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" +*FoomaticRIPOptionSetting NupPages=6up: "-6 " +*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" +*FoomaticRIPOptionSetting NupPages=8up: "-8 " +*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" +*FoomaticRIPOptionSetting NupPages=10up: "-10 " +*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" +*FoomaticRIPOptionSetting NupPages=12up: "-12 " +*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" +*FoomaticRIPOptionSetting NupPages=14up: "-14 " +*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" +*FoomaticRIPOptionSetting NupPages=15up: "-15 " +*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" +*FoomaticRIPOptionSetting NupPages=16up: "-16 " +*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" +*FoomaticRIPOptionSetting NupPages=18up: "-18 " +*CloseUI: *NupPages + +*CloseGroup: Miscellaneous + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff --git a/PPD/Samsung-CLX-3185.ppd b/PPD/Samsung-CLX-3185.ppd index 1d2e45d..6493433 100644 --- a/PPD/Samsung-CLX-3185.ppd +++ b/PPD/Samsung-CLX-3185.ppd @@ -77,7 +77,7 @@ *ParamCustomPageSize WidthOffset: 4 points 0 0 *ParamCustomPageSize HeightOffset: 5 points 0 0 -*FoomaticIDs: Samsung-CLP-325 foo2qpdl +*FoomaticIDs: Samsung-CLX-3185 foo2qpdl *FoomaticRIPCommandLine: "foo2qpdl-wrapper %A" *OpenGroup: General/General diff --git a/PPD/Xerox-WorkCentre_6015.ppd b/PPD/Xerox-WorkCentre_6015.ppd index 13b92e4..355aec5 100644 --- a/PPD/Xerox-WorkCentre_6015.ppd +++ b/PPD/Xerox-WorkCentre_6015.ppd @@ -102,6 +102,9 @@ *FoomaticRIPOptionSetting ColorMode=Monochrome: " " *CloseUI: *ColorMode +*FoomaticRIPOption Resolution: enum CmdLine A 130 +*FoomaticRIPOptionSetting Resolution=1200x600dpi: "-r1200x600 " + *OpenUI *PageSize/Page Size: PickOne *FoomaticRIPOption PageSize: enum CmdLine A *OrderDependency: 135 AnySetup *PageSize diff --git a/arm2hpdl.1in b/arm2hpdl.1in index 918784f..213d21b 100644 --- a/arm2hpdl.1in +++ b/arm2hpdl.1in @@ -38,7 +38,7 @@ $ arm2hpdl sihp1005.img > sihp1005.dl Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2hbpl2-wrapper.1in b/foo2hbpl2-wrapper.1in index e7f7e00..92a8a1d 100644 --- a/foo2hbpl2-wrapper.1in +++ b/foo2hbpl2-wrapper.1in @@ -233,7 +233,7 @@ foo2hbpl2-wrapper -c testpage.ps > testpage.prn Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2hbpl2-wrapper.in b/foo2hbpl2-wrapper.in index f29bc1a..8edc246 100755 --- a/foo2hbpl2-wrapper.in +++ b/foo2hbpl2-wrapper.in @@ -18,7 +18,7 @@ #* #* Authors: Rick Richardson <rick.richardson@comcast.net> -VERSION='$Id: foo2hbpl2-wrapper.in,v 1.3 2013/03/03 17:05:03 rick Exp $' +VERSION='$Id: foo2hbpl2-wrapper.in,v 1.4 2013/08/06 23:22:25 rick Exp $' # # Printer Notes: @@ -327,9 +327,9 @@ esac # Validate Resolution # case "$RES" in -#600x600) ;; +600x600) ;; 1200x600) ;; -#1200x1200) ;; +1200x1200) ;; #2400x600) ;; *) error "Illegal resolution $RES";; esac diff --git a/foo2hbpl2.1in b/foo2hbpl2.1in index 248255d..e35e9d9 100644 --- a/foo2hbpl2.1in +++ b/foo2hbpl2.1in @@ -197,7 +197,7 @@ Rick Richardson <rick.richardson@comcast.net> Peter Korf <peter@niendo.de> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2hbpl2.c b/foo2hbpl2.c index 2b1ba83..c30ac32 100644 --- a/foo2hbpl2.c +++ b/foo2hbpl2.c @@ -50,7 +50,7 @@ yourself. */ -static char Version[] = "$Id: foo2hbpl2.c,v 1.26 2013/03/07 14:05:34 rick Exp $"; +static char Version[] = "$Id: foo2hbpl2.c,v 1.27 2013/08/07 00:37:12 rick Exp $"; #include <stdio.h> #include <stdlib.h> @@ -1537,7 +1537,7 @@ main(int argc, char *argv[]) if (getenv("DEVICE_URI")) IsCUPS = 1; - Bpp = ResX / 600; + Bpp = ResX / ResY; // ResX = 600; if (SaveToner) { diff --git a/foo2hiperc-wrapper.1in b/foo2hiperc-wrapper.1in index e4ccc6e..1be13cd 100644 --- a/foo2hiperc-wrapper.1in +++ b/foo2hiperc-wrapper.1in @@ -205,7 +205,7 @@ foo2hiperc-wrapper -c testpage.ps > testpage.hc Rick Richardson <rick.richardson@comcast.net> .br ${URLHC}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2hiperc.1in b/foo2hiperc.1in index 6a57b4c..b99c3a2 100644 --- a/foo2hiperc.1in +++ b/foo2hiperc.1in @@ -173,7 +173,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.com> .br ${URLHC}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline @@ -198,7 +198,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.net> .br ${URLHP}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2hp2600-wrapper.1in b/foo2hp2600-wrapper.1in index 74e6abe..a71617d 100644 --- a/foo2hp2600-wrapper.1in +++ b/foo2hp2600-wrapper.1in @@ -235,7 +235,7 @@ foo2hp2600-wrapper -c testpage.ps > testpage.zc Rick Richardson <rick.richardson@comcast.net> .br ${URLHP}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2lava-wrapper.1in b/foo2lava-wrapper.1in index 357232a..f02d899 100644 --- a/foo2lava-wrapper.1in +++ b/foo2lava-wrapper.1in @@ -229,7 +229,7 @@ foo2lava-wrapper -c testpage.ps > testpage.zc Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2lava.1in b/foo2lava.1in index 0a13260..2328ae5 100644 --- a/foo2lava.1in +++ b/foo2lava.1in @@ -187,7 +187,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.com> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2oak-wrapper.1in b/foo2oak-wrapper.1in index e62f1cc..435dae3 100644 --- a/foo2oak-wrapper.1in +++ b/foo2oak-wrapper.1in @@ -221,7 +221,7 @@ foo2oak-wrapper -c testpage.ps > testpage.oak Rick Richardson <rick.richardson@comcast.net> .br ${URLOAK}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2oak.1in b/foo2oak.1in index 2130b57..1a1c863 100644 --- a/foo2oak.1in +++ b/foo2oak.1in @@ -194,7 +194,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.net> .br ${URLOAK}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2qpdl-wrapper.1in b/foo2qpdl-wrapper.1in index ab8899b..4a7bcd2 100644 --- a/foo2qpdl-wrapper.1in +++ b/foo2qpdl-wrapper.1in @@ -226,7 +226,7 @@ foo2qpdl-wrapper -c testpage.ps > testpage.zc Rick Richardson <rick.richardson@comcast.net> .br ${URLQPDL}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2qpdl.1in b/foo2qpdl.1in index 0142fd4..3aafa1d 100644 --- a/foo2qpdl.1in +++ b/foo2qpdl.1in @@ -193,7 +193,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.com> .br ${URLQPDL}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2slx-wrapper.1in b/foo2slx-wrapper.1in index bff113d..966ec6f 100644 --- a/foo2slx-wrapper.1in +++ b/foo2slx-wrapper.1in @@ -190,7 +190,7 @@ foo2slx-wrapper -c testpage.ps > testpage.zc Rick Richardson <rick.richardson@comcast.net> .br ${URLSLX}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2slx.1in b/foo2slx.1in index a441c17..5a431e0 100644 --- a/foo2slx.1in +++ b/foo2slx.1in @@ -157,7 +157,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.net> .br ${URLSLX}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2xqx-wrapper.1in b/foo2xqx-wrapper.1in index c1fcf41..9d22732 100644 --- a/foo2xqx-wrapper.1in +++ b/foo2xqx-wrapper.1in @@ -162,7 +162,7 @@ lpr -P raw testpage.xqx Rick Richardson <rick.richardson@comcast.net> .br ${URLXQX}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2xqx.1in b/foo2xqx.1in index 64545a8..8f94e66 100644 --- a/foo2xqx.1in +++ b/foo2xqx.1in @@ -161,7 +161,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.net> .br ${URLXQX}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2zjs-pstops.1in b/foo2zjs-pstops.1in index be4d5fa..568ac88 100644 --- a/foo2zjs-pstops.1in +++ b/foo2zjs-pstops.1in @@ -48,7 +48,7 @@ Set Debug level [0]. Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2zjs-pstops.sh b/foo2zjs-pstops.sh index c4cf3cb..d35a34f 100755 --- a/foo2zjs-pstops.sh +++ b/foo2zjs-pstops.sh @@ -1,6 +1,6 @@ #!/bin/sh -VERSION='$Id: foo2zjs-pstops.sh,v 1.20 2012/02/23 21:19:46 rick Exp $' +VERSION='$Id: foo2zjs-pstops.sh,v 1.21 2013/07/31 17:41:47 rick Exp $' PROGNAME="$0" @@ -47,8 +47,9 @@ debug() { # Use gsed instead of sed on Mac OSX # case `uname -s` in -Darwin) sed=gsed;; -*) sed=sed;; +Darwin) sed=gsed;; +FreeBSD) sed=gsed;; +*) sed=sed;; esac # diff --git a/foo2zjs-wrapper.1in b/foo2zjs-wrapper.1in index 113f903..1648bf7 100644 --- a/foo2zjs-wrapper.1in +++ b/foo2zjs-wrapper.1in @@ -266,7 +266,7 @@ foo2zjs-wrapper -c testpage.ps > testpage.zc Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foo2zjs.1in b/foo2zjs.1in index a02b634..a26113c 100644 --- a/foo2zjs.1in +++ b/foo2zjs.1in @@ -228,7 +228,7 @@ gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/foomatic-db/driver/foo2hbpl2.xml b/foomatic-db/driver/foo2hbpl2.xml index e773485..8019eb1 100644 --- a/foomatic-db/driver/foo2hbpl2.xml +++ b/foomatic-db/driver/foo2hbpl2.xml @@ -7,13 +7,15 @@ </execution> <comments> <en> - This is a driver developed for the Dell 1355 and the - Xerox WorkCentre 6015 Multifunction Printer (printer only). + This is a driver developed for the Dell 1355, Xerox WorkCentre + 6015 Multifunction Printer (printer only), Fuji Xerox Docuprint + CM205 (printer only), and the Fuji Xerox DocuPrint P205. </en> </comments> <printers> <printer><id>printer/Dell-1355</id></printer> <printer><id>printer/Xerox-WorkCentre_6015</id></printer> <printer><id>printer/Fuji_Xerox-DocuPrint_CM205</id></printer> + <printer><id>printer/Fuji_Xerox-DocuPrint_P205</id></printer> </printers> </driver> diff --git a/foomatic-db/opt/foo2hbpl2-ColorMode.xml b/foomatic-db/opt/foo2hbpl2-ColorMode.xml index 4cfefcb..35e60ab 100644 --- a/foomatic-db/opt/foo2hbpl2-ColorMode.xml +++ b/foomatic-db/opt/foo2hbpl2-ColorMode.xml @@ -33,6 +33,11 @@ </en></comments> <ev_shortname> <en>Color</en> </ev_shortname> <ev_driverval>-c</ev_driverval> + <constraints> + <constraint sense="false"> + <make>Fuji Xerox</make> <model>DocuPrint P205</model> + </constraint> + </constraints> </enum_val> </enum_vals> </option> diff --git a/foomatic-db/opt/foo2hbpl2-ICM.xml b/foomatic-db/opt/foo2hbpl2-ICM.xml index eac7a01..e64ab82 100644 --- a/foomatic-db/opt/foo2hbpl2-ICM.xml +++ b/foomatic-db/opt/foo2hbpl2-ICM.xml @@ -38,6 +38,9 @@ <driver>foo2hbpl2</driver> <arg_defval>ev/foo2qpdl-ICM-none</arg_defval> </constraint> + <constraint sense="false"> + <make>Fuji Xerox</make> <model>DocuPrint P205</model> + </constraint> </constraints> <enum_vals> <enum_val id="ev/foo2hbpl2-ICM-none"> diff --git a/foomatic-db/opt/foo2hbpl2-Resolution.xml b/foomatic-db/opt/foo2hbpl2-Resolution.xml new file mode 100644 index 0000000..8dc1d75 --- /dev/null +++ b/foomatic-db/opt/foo2hbpl2-Resolution.xml @@ -0,0 +1,69 @@ +<option type="enum" id="opt/foo2hbpl2-Resolution"> + <!-- A multilingual <comments> block can appear here, too; + it should be treated as documentation for the user. --> + <arg_longname> <en>Resolution</en> </arg_longname> + <arg_shortname> <en>Resolution</en> </arg_shortname> + <arg_execution> + <arg_group>General</arg_group> + <arg_order>130</arg_order> + <arg_spot>A</arg_spot> + <arg_required /> + <arg_substitution /> + <arg_proto>-r%s </arg_proto> + </arg_execution> + <constraints> + <constraint sense="true"> + <driver>foo2hbpl2</driver> + <arg_defval>ev/foo2hbpl2-Resolution-1200x600</arg_defval> + </constraint> + <constraint sense="true"> + <make>Fuji Xerox</make> <model>DocuPrint P205</model> + <driver>foo2hbpl2</driver> + <arg_defval>ev/foo2hbpl2-Resolution-600x600</arg_defval> + </constraint> + </constraints> + <enum_vals> + <enum_val id="ev/foo2hbpl2-Resolution-600x600"> + <ev_longname> <en>600x600 dpi</en> </ev_longname> + <!-- A multilingual <comments> block can appear here, too; + it should be treated as documentation for the user. --> + <ev_shortname> <en>600x600dpi</en> </ev_shortname> + <ev_driverval>600x600</ev_driverval> + <constraints> + <constraint sense="false"> + <driver>foo2hbpl2</driver> + </constraint> + <constraint sense="true"> + <make>Fuji Xerox</make> <model>DocuPrint P205</model> + </constraint> + </constraints> + </enum_val> + <enum_val id="ev/foo2hbpl2-Resolution-1200x600"> + <ev_longname> <en>1200x600 dpi</en> </ev_longname> + <!-- A multilingual <comments> block can appear here, too; + it should be treated as documentation for the user. --> + <ev_shortname> <en>1200x600dpi</en> </ev_shortname> + <ev_driverval>1200x600</ev_driverval> + <constraints> + <constraint sense="false"> + <make>Fuji Xerox</make> <model>DocuPrint P205</model> + </constraint> + </constraints> + </enum_val> + <enum_val id="ev/foo2hbpl2-Resolution-1200x1200"> + <ev_longname> <en>1200x1200 dpi</en> </ev_longname> + <!-- A multilingual <comments> block can appear here, too; + it should be treated as documentation for the user. --> + <ev_shortname> <en>1200x1200dpi</en> </ev_shortname> + <ev_driverval>1200x1200</ev_driverval> + <constraints> + <constraint sense="false"> + <driver>foo2hbpl2</driver> + </constraint> + <constraint sense="true"> + <make>Fuji Xerox</make> <model>DocuPrint P205</model> + </constraint> + </constraints> + </enum_val> + </enum_vals> +</option> diff --git a/foomatic-db/printer/Fuji_Xerox-DocuPrint_P205.xml b/foomatic-db/printer/Fuji_Xerox-DocuPrint_P205.xml new file mode 100644 index 0000000..4296a03 --- /dev/null +++ b/foomatic-db/printer/Fuji_Xerox-DocuPrint_P205.xml @@ -0,0 +1,71 @@ +<printer id="printer/Fuji_Xerox-DocuPrint_P205"> + <make>Fuji Xerox</make> + <model>DocuPrint P205</model> + <mechanism> + <laser/> + <color/> + <resolution> + <dpi> + <x>1200</x> + <y>1200</y> + </dpi> + </resolution> + <margins> + <general> + <unit>mm</unit> + <top>4.23164</top> + <bottom>4.23164</bottom> + <left>3.175</left> + <right>3.175</right> + </general> + </margins> +<!-- + <consumables> + <comments> <en> + Toner Cyan (1000 prints) - $45 + Toner Magenta (1000 prints) - $45 + Toner Yellow (1000 prints) - $45 + Toner Black (2000 prints) - $54 + Waste Toner (5000 prints) - $10 + Drum Kit (20000 prints) - $159 + </en> </comments> + <partno>106R01271</partno> + <partno>106R01272</partno> + <partno>106R01273</partno> + <partno>106R01274</partno> + <partno>108R00722</partno> + <partno>108R00744</partno> + </consumables> +--> + </mechanism> + <url>http://www.fujixeroxprinters.com.au/en/products/blackwhiteprinters/docuprintp205b.aspx</url> + <lang> + <proprietary/> + <!--no pjl--><!--No "text"?--> + </lang> + <autodetect> +<!-- + <parallel> + <ieee1284>MFG:Xerox;CMD:SPLC;MDL:Phaser 6110;CLS:PRINTER;STATUS:BUSY;</ieee1284> + <manufacturer>Xerox</manufacturer> + <model>Phaser 6110</model> + <commandset>SPLC</commandset> + </parallel> +--> + <snmp> + <description>Fuji Xerox DocuPrint P205</description> + </snmp> + </autodetect> + <functionality>C</functionality> + <driver>foo2hbpl2</driver> + <!--not "unverified"--><!--no "contrib_url"--> + <comments> <en> + + The Fuji Xerox DocuPrint P205b (USB) + is a monochrome printer with a 2013 street price of $100. + + These printers are supported by the foo2hbpl2 open software printer + driver. + + </en> </comments> +</printer> diff --git a/foomatic-db/printer/Samsung-CLX-3185.xml b/foomatic-db/printer/Samsung-CLX-3185.xml index 30ac379..2c05545 100644 --- a/foomatic-db/printer/Samsung-CLX-3185.xml +++ b/foomatic-db/printer/Samsung-CLX-3185.xml @@ -1,4 +1,4 @@ -<printer id="printer/Samsung-CLP-325"> +<printer id="printer/Samsung-CLX-3185"> <make>Samsung</make> <model>CLX-3185</model> <mechanism> diff --git a/gipddecode.1in b/gipddecode.1in index 9a743fd..26e4e37 100644 --- a/gipddecode.1in +++ b/gipddecode.1in @@ -95,14 +95,14 @@ Total Size = 75843 (0x12843) .SH FILES .BR /usr/bin/gipddecode -'/" .SH SEE ALSO -'/" .BR foo2gipd-wrapper (1), -'/" .BR foo2gipd (1) +'\" .SH SEE ALSO +'\" .BR foo2gipd-wrapper (1), +'\" .BR foo2gipd (1) .SH "AUTHOR" Rick Richardson <rick.richardson@comcast.net> -'/" .br -'/" ${URLHC}/ -'/" -'/" -'/" +'\" .br +'\" ${URLHC}/ +'\" +'\" +'\" .em pdf_outline diff --git a/hbpldecode.1in b/hbpldecode.1in index 52fee8a..b4c2783 100644 --- a/hbpldecode.1in +++ b/hbpldecode.1in @@ -13,17 +13,21 @@ hbpldecode \- Decode a HBPL stream into human readable form. .SH DESCRIPTION .B hbpldecode decodes a HBPL stream into human readable form. +HBPL is Host Based Printer Language. +.P +There are two versions of HBPL in existence. .P -There are two versions of HBPL in existence. One is an HBPL -stream with Huffman RLE data. This data is used by the Dell 1250c, -Epson AcuLaser C1700, Fuji-Xerox cp105b, and similiar printers. +Version one is an HBPL stream with Huffman RLE data. +This data is used by the Dell 1250c, +Dell C1660w, Epson AcuLaser C1700, Fuji-Xerox cp105b, and similiar printers. +These printers are unsupported. .P Version two is an HBPL stream with JBIG encoded data. This data is used by the Xerox WorkCentre 6015, Fuji Xerox DocuPrint CM205, and the Dell 1355c. +These printers are supported by foo2hbpl2-wrapper et al. .P Both versions can be decoded by hbpldecode. -HBPL is Host Based Printer Language. .SH COMMAND LINE OPTIONS These are the options that can appear on the command line. @@ -190,16 +194,16 @@ $ hbpldecode -h 6015c-color.prn .SH FILES .BR /usr/bin/hbpldecode -'/" .SH SEE ALSO -'/" .BR foo2hbpl-wrapper (1), -'/" .BR foo2hbpl (1) +.SH SEE ALSO +.BR foo2hbpl2-wrapper (1), +.BR foo2hbpl2 (1) .SH "AUTHOR" Rick Richardson <rick.richardson@comcast.net> .br Peter Korf <peter@niendo.de> -'/" .br -'/" ${URLHC}/ -'/" -'/" -'/" +.br +${URLHBPL}/ +'\" +'\" +'\" .em pdf_outline diff --git a/hbpldecode.c b/hbpldecode.c index 8500e03..099d996 100644 --- a/hbpldecode.c +++ b/hbpldecode.c @@ -1,5 +1,5 @@ /* - * $Id: hbpldecode.c,v 1.46 2013/03/03 23:00:19 rick Exp $ + * $Id: hbpldecode.c,v 1.47 2013/06/26 21:01:29 rick Exp $ */ /*b @@ -81,15 +81,19 @@ usage(void) "Usage:\n" " hbpldecode [options] < hbpl-file\n" "\n" -" Decode a HBPL stream into human readable form.\n" +" Decode a HBPL stream into human readable form. HBPL is\n" +" Host Based Printer Language.\n" "\n" -" There are two versions of HBPL in existence. One is an HBPL\n" -" stream with Huffman RLE data. This data is used by the Dell 1250c,\n" -" Epson AcuLaser C1700, Fuji-Xerox cp105b, and similiar printers.\n" +" There are two versions of HBPL in existence.\n" +"\n" +" Version one is an HBPL stream with Huffman RLE data. This data is\n" +" used by the Dell 1250c, Dell C1660w, Epson AcuLaser C1700, Fuji-Xerox\n" +" cp105b, and similiar printers. These printers are unsupported.\n" "\n" " Version two is an HBPL stream with JBIG encoded data. This data\n" " is used by the Xerox WorkCentre 6015, Fuji Xerox Docuprint CM205\n" -" and the Dell 1355c.\n" +" and the Dell 1355c. These printers are supported by foo2hbpl2-wrapper\n" +" et al.\n" "\n" " Both versions can be decoded by hbpldecode.\n" "\n" diff --git a/hipercdecode.1in b/hipercdecode.1in index f98b2fb..6b2a0f8 100644 --- a/hipercdecode.1in +++ b/hipercdecode.1in @@ -163,7 +163,7 @@ $ foo2hiperc-wrapper testpage.ps | hipercdecode -h Rick Richardson <rick.richardson@comcast.net> .br ${URLHC}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/lavadecode.1in b/lavadecode.1in index 2998fa3..7b5dfe9 100644 --- a/lavadecode.1in +++ b/lavadecode.1in @@ -96,7 +96,7 @@ $ lavadecode -h < testpage.prn Rick Richardson <rick.richardson@comcast.net> .br ${URLLAVA}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/oakdecode.1in b/oakdecode.1in index 571a8f6..f71b9a5 100644 --- a/oakdecode.1in +++ b/oakdecode.1in @@ -92,7 +92,7 @@ $ oakdecode < testpage.oak Rick Richardson <rick.richardson@comcast.net> .br ${URLOAK}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/opldecode.1in b/opldecode.1in index 3d88b57..e155a4e 100644 --- a/opldecode.1in +++ b/opldecode.1in @@ -115,7 +115,7 @@ $ foo2lava-wrapper -z1 testpage.ps | opldecode -h Rick Richardson <rick.richardson@comcast.net> .br ${URLLAVA}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/printer-profile.1in b/printer-profile.1in index 512c287..0f52054 100644 --- a/printer-profile.1in +++ b/printer-profile.1in @@ -15,14 +15,18 @@ printer-profile \- Profile using X-Rite ColorMunki and Argyll CMS prints a test chart, uses the ColorMunki instrument to scan it in, then computes an ICM profile using the Argyll Color Management System. - Manuf is "sam". Model is "clp-300" or "clp-315". - Manuf is "hp". Model is "2600" or "cp1215". - Manuf is "km". Model is "2300" or "2530". - Manuf is "dell". Model is "1355". +Manuf is "sam". Model is "clp-300", "clp-315", "clp-325" or "clp-365". +.br +Manuf is "hp". Model is "2600" or "cp1215". +.br +Manuf is "km". Model is "2300" or "2530". +.br +Manuf is "dell". Model is "1355". +.br - "rgb" is the usual setting. "patches" is a multiple 196 per page. +"rgb" is the usual setting. "patches" is a multiple 196 per page. - Edit the script for additional models. +Edit the script for additional models. .SH OPTIONS -b 1|2 Bits per pixel (1) @@ -44,7 +48,7 @@ $ printer-profile sam 315 rgb 196 gs 8.64 and before has problems with 32-bit machines and color profile data. Don't use! -You need Argyll_V1.2.0 or later. +You need Argyll_V1.5.1 or later. .SH FILES .BR /usr/bin/printer-profile, .BR /usr/share/foo2*/icm/testing.icm @@ -53,12 +57,12 @@ firefox http://www.xritephoto.com/html/colormunkisplash.htm .br firefox http://www.argyllcms.com/ .br -firefox http://www.argyllcms.com/Argyll_V1.5.0_src.zip +firefox http://www.argyllcms.com/Argyll_V1.5.1_src.zip .SH "AUTHOR" Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/printer-profile.sh b/printer-profile.sh index b108394..7f89149 100755 --- a/printer-profile.sh +++ b/printer-profile.sh @@ -14,7 +14,7 @@ DESCRIPTION Prints a test chart, uses the ColorMunki instrument to scan it in, then computes an ICM profile using the Argyll Color Management System. - Manuf is "sam". Model is "clp-300" or "clp-315". + Manuf is "sam". Model is "clp-300", "clp-315", "clp-325" or "clp-365". Manuf is "hp". Model is "2600" or "cp1215" or "cp1025". Manuf is "km". Model is "1600" or "2300" or "2530". Manuf is "dell". Model is "1355". @@ -38,7 +38,7 @@ BUGS gs 8.64 and before has problems with 32-bit machines and color profile data. Don't use! - You need Argyll_V1.3.2 or later in $ARGYLL_BIN. + You need Argyll_V1.5.1 or later in $ARGYLL_BIN. SEE ALSO http://www.xritephoto.com/html/colormunkisplash.htm @@ -89,6 +89,7 @@ ARGYLL_VER=1.3.3 ARGYLL_VER=1.3.4 ARGYLL_VER=1.3.5 ARGYLL_VER=1.5.0 +ARGYLL_VER=1.5.1 ARGYLL_ROOT=$HOME/src/Argyll_V${ARGYLL_VER} ARGYLL_REF=$ARGYLL_ROOT/ref ARGYLL_BIN=$ARGYLL_ROOT/bin @@ -193,10 +194,14 @@ sam*) WRAPPER="foo2qpdl-wrapper $RES_r -z0 -c -C10 -Gnone.icm" OUT="nc 192.168.1.11 9100 < xxx.prn" ;; - *315*) + *315*|*325*) WRAPPER="foo2qpdl-wrapper $RES_r -z2 -c -C10 -Gnone.icm" OUT="root cp xxx.prn /dev/usb/lp1" ;; + *365*) + WRAPPER="foo2qpdl-wrapper $RES_r -z3 -c -C10 -Gnone.icm" + OUT="root cp xxx.prn /dev/usb/lp1" + ;; *) usage ;; diff --git a/qpdldecode.1in b/qpdldecode.1in index ebdfefe..be393a7 100644 --- a/qpdldecode.1in +++ b/qpdldecode.1in @@ -126,7 +126,7 @@ Decode an QPDL stream file created by foo2qpdl. Rick Richardson <rick.richardson@comcast.net> .br ${URLQPDL}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/regress.txt b/regress.txt index 0ca8e5e..3cec560 100644 --- a/regress.txt +++ b/regress.txt @@ -2,6 +2,7 @@ eafcf2ab43e8ecea78d1663491629869 testpage.zm 7.05 i386 57e9101eb2b95db9ce519d108d06c2ec testpage.zm 8.60 x86_64 3365dcef45a03b3686c00da0f5f711c3 testpage.zm 8.61 i386 +b0fe6c289308ebc086328c2944ce915c testpage.zm 9.07 x86_64 f19 # 94b77586bab210ad54eaf7b652817a4c testpage.zc10 7.05 @@ -11,6 +12,7 @@ e39c15277195366b9404c104640f275d testpage.zc10 8.61 4d8fd851ce9b51c7b3d20e319c451874 testpage.zc10 8.61 ubuntu e2b8cd9191afe74bf684e7655f48f372 testpage.zc10 8.71 bcf8f73383eebb4da0d6a0fd03732c90 testpage.zc10 8.71 f16 +23546ba41a46973bc70664030a65cb6c testpage.zc10 9.07 x86_64 f19 # 29788ba74874c9be35ab1f8bcc5719b6 testpage.zc1 7.05 @@ -37,6 +39,7 @@ fb9defdcba1e5259f33e339f7f17e41e testpage.zc3 8.61 ubuntu f30e09990c7c2ad460074fb38c3a1720 lj1000.zm 8.60amd 89bb9a6748b9010d763e47ed5923460c lj1000.zm 8.61 46d4a9157a2282a64a9b37e361b0059c lj1000.zm 8.62amd +98bda2da23dfd94c40f96ef7be1533b3 lj1000.zm 9.07 x86_64 f19 # afed329ee495b7575b908680a2512c30 lj1020.zm 7.05 @@ -45,12 +48,14 @@ b9c2e0cb9db463a219ec6decff4800f0 lj1020.zm 8.61 41c692fa8af353ae36c7cc607b50440a lj1020.zm 8.62amd d8f28750c1dacc2066eee1e0a050e60c lj1020.zm 8.71 518482229bed6d3cb23f66b7f7f9a685 lj1020.zm 8.71 f16 +59c71a09255fe1d84e22c372d4d6704a lj1020.zm 9.07 x86_64 f19 # b4ccadb72f1b386b1caabeed85c269dd lj2600.zm1 7.05 282e09f3981560801842cc2b1c9bff0c lj2600.zm1 8.60amd 4551ad72c645ad165ea614f7cdd5b666 lj2600.zm1 8.61 a768fc2854434276dd8a274896af5d4f lj2600.zm1 8.62amd +70b31b8f35702091da0673fb29a3d7c5 lj2600.zm1 9.07 x86_64 f19 # 500ee54205b85d18407b56cfea5cbb02 lj2600.zc1 7.05 @@ -60,3 +65,4 @@ ddcdc6e87de6560bfc4e6053509ad575 lj2600.zc1 8.62amd 312ddcb33b16698866eb4aa5f2b595fd lj2600.zc1 8.61 ubuntu 3b0fa7c37af9c3069e285f5fc81b62a3 lj2600.zc1 8.71 45ae0df794f2ada19fa63f7ca8edc5ac lj2600.zc1 8.71 f16 +80c09c01f555bc4fa9a27099d0a2ecfe lj2600.zc1 9.07 x86_64 f19 diff --git a/slxdecode.1in b/slxdecode.1in index 831ba07..ce1c289 100644 --- a/slxdecode.1in +++ b/slxdecode.1in @@ -103,7 +103,7 @@ SLT_END_DOC, 0 items Rick Richardson <rick.richardson@comcast.net> .br ${URLSLX}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/usb_printerid.1in b/usb_printerid.1in index e812e57..0454ef6 100644 --- a/usb_printerid.1in +++ b/usb_printerid.1in @@ -44,7 +44,7 @@ DES:HP LaserJet 1020;FWVER:20050309; Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/xqxdecode.1in b/xqxdecode.1in index 41dc3e2..60e2e4e 100644 --- a/xqxdecode.1in +++ b/xqxdecode.1in @@ -105,7 +105,7 @@ Total size: 110 bytes Rick Richardson <rick.richardson@comcast.net> .br ${URLXQX}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline diff --git a/zjsdecode.1in b/zjsdecode.1in index 88fe65b..72fef47 100644 --- a/zjsdecode.1in +++ b/zjsdecode.1in @@ -99,7 +99,7 @@ ZJT_END_DOC, 0 items Rick Richardson <rick.richardson@comcast.net> .br ${URLZJS}/ -'/" -'/" -'/" +'\" +'\" +'\" .em pdf_outline |