summaryrefslogtreecommitdiff
path: root/db/source
diff options
context:
space:
mode:
Diffstat (limited to 'db/source')
-rw-r--r--db/source/PPD/Gestetner/PS/Gestetner-MP_6002_PS.ppd73
-rw-r--r--db/source/PPD/Gestetner/PS/Gestetner-MP_7502_PS.ppd73
-rw-r--r--db/source/PPD/Gestetner/PS/Gestetner-MP_9002_PS.ppd73
-rw-r--r--db/source/PPD/Gestetner/PXL/Gestetner-MP_6002_PXL.ppd19
-rw-r--r--db/source/PPD/Gestetner/PXL/Gestetner-MP_7502_PXL.ppd19
-rw-r--r--db/source/PPD/Gestetner/PXL/Gestetner-MP_9002_PXL.ppd19
-rw-r--r--db/source/PPD/Infotec/PS/Infotec-MP_6002_PS.ppd73
-rw-r--r--db/source/PPD/Infotec/PS/Infotec-MP_7502_PS.ppd73
-rw-r--r--db/source/PPD/Infotec/PS/Infotec-MP_9002_PS.ppd73
-rw-r--r--db/source/PPD/Infotec/PXL/Infotec-MP_6002_PXL.ppd19
-rw-r--r--db/source/PPD/Infotec/PXL/Infotec-MP_7502_PXL.ppd19
-rw-r--r--db/source/PPD/Infotec/PXL/Infotec-MP_9002_PXL.ppd19
-rw-r--r--db/source/PPD/Lanier/PS/Lanier-MP_6002_PS.ppd73
-rw-r--r--db/source/PPD/Lanier/PS/Lanier-MP_7502_PS.ppd73
-rw-r--r--db/source/PPD/Lanier/PS/Lanier-MP_9002_PS.ppd73
-rw-r--r--db/source/PPD/Lanier/PXL/Lanier-MP_6002_PXL.ppd19
-rw-r--r--db/source/PPD/Lanier/PXL/Lanier-MP_7502_PXL.ppd19
-rw-r--r--db/source/PPD/Lanier/PXL/Lanier-MP_9002_PXL.ppd19
-rw-r--r--db/source/PPD/NRG/PS/NRG-MP_6002_PS.ppd73
-rw-r--r--db/source/PPD/NRG/PS/NRG-MP_7502_PS.ppd73
-rw-r--r--db/source/PPD/NRG/PS/NRG-MP_9002_PS.ppd73
-rw-r--r--db/source/PPD/NRG/PXL/NRG-MP_6002_PXL.ppd19
-rw-r--r--db/source/PPD/NRG/PXL/NRG-MP_7502_PXL.ppd19
-rw-r--r--db/source/PPD/NRG/PXL/NRG-MP_9002_PXL.ppd19
-rw-r--r--db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6002_PS.ppd73
-rw-r--r--db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7502_PS.ppd73
-rw-r--r--db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9002_PS.ppd73
-rw-r--r--db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6002_PXL.ppd19
-rw-r--r--db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7502_PXL.ppd19
-rw-r--r--db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9002_PXL.ppd19
-rw-r--r--db/source/PPD/Savin/PS/Savin-MP_6002_PS.ppd73
-rw-r--r--db/source/PPD/Savin/PS/Savin-MP_7502_PS.ppd73
-rw-r--r--db/source/PPD/Savin/PS/Savin-MP_9002_PS.ppd73
-rw-r--r--db/source/PPD/Savin/PXL/Savin-MP_6002_PXL.ppd19
-rw-r--r--db/source/PPD/Savin/PXL/Savin-MP_7502_PXL.ppd19
-rw-r--r--db/source/PPD/Savin/PXL/Savin-MP_9002_PXL.ppd19
36 files changed, 900 insertions, 756 deletions
diff --git a/db/source/PPD/Gestetner/PS/Gestetner-MP_6002_PS.ppd b/db/source/PPD/Gestetner/PS/Gestetner-MP_6002_PS.ppd
index 2b2d528f..39b2e55a 100644
--- a/db/source/PPD/Gestetner/PS/Gestetner-MP_6002_PS.ppd
+++ b/db/source/PPD/Gestetner/PS/Gestetner-MP_6002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Gestetner MP 6002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: bbad5d84
+*% java.util.zip.CRC32: 5082309a
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:Gestetner;MDL:MP 6002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf "%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D"%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Gestetner/PS/Gestetner-MP_7502_PS.ppd b/db/source/PPD/Gestetner/PS/Gestetner-MP_7502_PS.ppd
index e954dc6a..138ef516 100644
--- a/db/source/PPD/Gestetner/PS/Gestetner-MP_7502_PS.ppd
+++ b/db/source/PPD/Gestetner/PS/Gestetner-MP_7502_PS.ppd
@@ -4,9 +4,9 @@
*% for "Gestetner MP 7502 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: cc604b00
+*% java.util.zip.CRC32: dbc6ae3d
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:Gestetner;MDL:MP 7502;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Gestetner/PS/Gestetner-MP_9002_PS.ppd b/db/source/PPD/Gestetner/PS/Gestetner-MP_9002_PS.ppd
index 1feff8dd..663ded1f 100644
--- a/db/source/PPD/Gestetner/PS/Gestetner-MP_9002_PS.ppd
+++ b/db/source/PPD/Gestetner/PS/Gestetner-MP_9002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Gestetner MP 9002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: c6d037a1
+*% java.util.zip.CRC32: 4491d87c
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:Gestetner;MDL:MP 9002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Gestetner/PXL/Gestetner-MP_6002_PXL.ppd b/db/source/PPD/Gestetner/PXL/Gestetner-MP_6002_PXL.ppd
index 5b5e1471..a3d6ec2e 100644
--- a/db/source/PPD/Gestetner/PXL/Gestetner-MP_6002_PXL.ppd
+++ b/db/source/PPD/Gestetner/PXL/Gestetner-MP_6002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Gestetner MP 6002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 11a1562d
+*% java.util.zip.CRC32: 5e02f945
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Gestetner/PXL/Gestetner-MP_7502_PXL.ppd b/db/source/PPD/Gestetner/PXL/Gestetner-MP_7502_PXL.ppd
index 97d3517e..5cd3d424 100644
--- a/db/source/PPD/Gestetner/PXL/Gestetner-MP_7502_PXL.ppd
+++ b/db/source/PPD/Gestetner/PXL/Gestetner-MP_7502_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Gestetner MP 7502 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: a8618842
+*% java.util.zip.CRC32: 7ab218bc
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Gestetner/PXL/Gestetner-MP_9002_PXL.ppd b/db/source/PPD/Gestetner/PXL/Gestetner-MP_9002_PXL.ppd
index 5ed6c3ce..f034c598 100644
--- a/db/source/PPD/Gestetner/PXL/Gestetner-MP_9002_PXL.ppd
+++ b/db/source/PPD/Gestetner/PXL/Gestetner-MP_9002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Gestetner MP 9002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 29cf3f45
+*% java.util.zip.CRC32: 62d5ed89
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Infotec/PS/Infotec-MP_6002_PS.ppd b/db/source/PPD/Infotec/PS/Infotec-MP_6002_PS.ppd
index 93f0567a..f09df61e 100644
--- a/db/source/PPD/Infotec/PS/Infotec-MP_6002_PS.ppd
+++ b/db/source/PPD/Infotec/PS/Infotec-MP_6002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Infotec MP 6002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: fecf5de4
+*% java.util.zip.CRC32: aa653d1
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:infotec;MDL:MP 6002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Infotec/PS/Infotec-MP_7502_PS.ppd b/db/source/PPD/Infotec/PS/Infotec-MP_7502_PS.ppd
index 9a363cf8..62c9f78b 100644
--- a/db/source/PPD/Infotec/PS/Infotec-MP_7502_PS.ppd
+++ b/db/source/PPD/Infotec/PS/Infotec-MP_7502_PS.ppd
@@ -4,9 +4,9 @@
*% for "Infotec MP 7502 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 6c70b527
+*% java.util.zip.CRC32: 5226d7e8
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:infotec;MDL:MP 7502;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Infotec/PS/Infotec-MP_9002_PS.ppd b/db/source/PPD/Infotec/PS/Infotec-MP_9002_PS.ppd
index 1e6143af..86f10973 100644
--- a/db/source/PPD/Infotec/PS/Infotec-MP_9002_PS.ppd
+++ b/db/source/PPD/Infotec/PS/Infotec-MP_9002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Infotec MP 9002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 330760e5
+*% java.util.zip.CRC32: eb5726e4
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:infotec;MDL:MP 9002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Infotec/PXL/Infotec-MP_6002_PXL.ppd b/db/source/PPD/Infotec/PXL/Infotec-MP_6002_PXL.ppd
index de6f99b3..82688d16 100644
--- a/db/source/PPD/Infotec/PXL/Infotec-MP_6002_PXL.ppd
+++ b/db/source/PPD/Infotec/PXL/Infotec-MP_6002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Infotec MP 6002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 45fe7518
+*% java.util.zip.CRC32: 34782d0b
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Infotec/PXL/Infotec-MP_7502_PXL.ppd b/db/source/PPD/Infotec/PXL/Infotec-MP_7502_PXL.ppd
index ee792384..74df4e58 100644
--- a/db/source/PPD/Infotec/PXL/Infotec-MP_7502_PXL.ppd
+++ b/db/source/PPD/Infotec/PXL/Infotec-MP_7502_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Infotec MP 7502 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 47e3517a
+*% java.util.zip.CRC32: 5bf72826
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Infotec/PXL/Infotec-MP_9002_PXL.ppd b/db/source/PPD/Infotec/PXL/Infotec-MP_9002_PXL.ppd
index 5dcd46fc..72372e3f 100644
--- a/db/source/PPD/Infotec/PXL/Infotec-MP_9002_PXL.ppd
+++ b/db/source/PPD/Infotec/PXL/Infotec-MP_9002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Infotec MP 9002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 1f2f41e
+*% java.util.zip.CRC32: 90f015d9
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Lanier/PS/Lanier-MP_6002_PS.ppd b/db/source/PPD/Lanier/PS/Lanier-MP_6002_PS.ppd
index fa2f9abe..1d2499b7 100644
--- a/db/source/PPD/Lanier/PS/Lanier-MP_6002_PS.ppd
+++ b/db/source/PPD/Lanier/PS/Lanier-MP_6002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Lanier MP 6002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 9fec4d11
+*% java.util.zip.CRC32: 15f4a971
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:LANIER;MDL:MP 6002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Lanier/PS/Lanier-MP_7502_PS.ppd b/db/source/PPD/Lanier/PS/Lanier-MP_7502_PS.ppd
index 95c7f17c..c57ac054 100644
--- a/db/source/PPD/Lanier/PS/Lanier-MP_7502_PS.ppd
+++ b/db/source/PPD/Lanier/PS/Lanier-MP_7502_PS.ppd
@@ -4,9 +4,9 @@
*% for "Lanier MP 7502 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 7e0fc6f3
+*% java.util.zip.CRC32: d0da108c
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:LANIER;MDL:MP 7502;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Lanier/PS/Lanier-MP_9002_PS.ppd b/db/source/PPD/Lanier/PS/Lanier-MP_9002_PS.ppd
index 4b7d69c7..41616836 100644
--- a/db/source/PPD/Lanier/PS/Lanier-MP_9002_PS.ppd
+++ b/db/source/PPD/Lanier/PS/Lanier-MP_9002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Lanier MP 9002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 998611be
+*% java.util.zip.CRC32: e793cf50
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:LANIER;MDL:MP 9002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Lanier/PXL/Lanier-MP_6002_PXL.ppd b/db/source/PPD/Lanier/PXL/Lanier-MP_6002_PXL.ppd
index 725a075b..6614ab70 100644
--- a/db/source/PPD/Lanier/PXL/Lanier-MP_6002_PXL.ppd
+++ b/db/source/PPD/Lanier/PXL/Lanier-MP_6002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Lanier MP 6002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 6fff4421
+*% java.util.zip.CRC32: 65502124
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Lanier/PXL/Lanier-MP_7502_PXL.ppd b/db/source/PPD/Lanier/PXL/Lanier-MP_7502_PXL.ppd
index 798b2cb9..8271ac2a 100644
--- a/db/source/PPD/Lanier/PXL/Lanier-MP_7502_PXL.ppd
+++ b/db/source/PPD/Lanier/PXL/Lanier-MP_7502_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Lanier MP 7502 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: b97d5721
+*% java.util.zip.CRC32: a4acbb23
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Lanier/PXL/Lanier-MP_9002_PXL.ppd b/db/source/PPD/Lanier/PXL/Lanier-MP_9002_PXL.ppd
index e8099158..332614f1 100644
--- a/db/source/PPD/Lanier/PXL/Lanier-MP_9002_PXL.ppd
+++ b/db/source/PPD/Lanier/PXL/Lanier-MP_9002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Lanier MP 9002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: dfc12ce1
+*% java.util.zip.CRC32: 9f9261b
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/NRG/PS/NRG-MP_6002_PS.ppd b/db/source/PPD/NRG/PS/NRG-MP_6002_PS.ppd
index 75d0cc20..57c81964 100644
--- a/db/source/PPD/NRG/PS/NRG-MP_6002_PS.ppd
+++ b/db/source/PPD/NRG/PS/NRG-MP_6002_PS.ppd
@@ -4,9 +4,9 @@
*% for "NRG MP 6002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: b66cdd47
+*% java.util.zip.CRC32: 4a624b7f
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:NRG;MDL:MP 6002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/NRG/PS/NRG-MP_7502_PS.ppd b/db/source/PPD/NRG/PS/NRG-MP_7502_PS.ppd
index a9b20aff..ce2cd156 100644
--- a/db/source/PPD/NRG/PS/NRG-MP_7502_PS.ppd
+++ b/db/source/PPD/NRG/PS/NRG-MP_7502_PS.ppd
@@ -4,9 +4,9 @@
*% for "NRG MP 7502 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: a0ff6eda
+*% java.util.zip.CRC32: c540c549
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:NRG;MDL:MP 7502;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/NRG/PS/NRG-MP_9002_PS.ppd b/db/source/PPD/NRG/PS/NRG-MP_9002_PS.ppd
index 6e7518b6..443e4e30 100644
--- a/db/source/PPD/NRG/PS/NRG-MP_9002_PS.ppd
+++ b/db/source/PPD/NRG/PS/NRG-MP_9002_PS.ppd
@@ -4,9 +4,9 @@
*% for "NRG MP 9002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 4d7c3f70
+*% java.util.zip.CRC32: c122d44c
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:NRG;MDL:MP 9002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/NRG/PXL/NRG-MP_6002_PXL.ppd b/db/source/PPD/NRG/PXL/NRG-MP_6002_PXL.ppd
index 1ed7f7cf..2784ed2d 100644
--- a/db/source/PPD/NRG/PXL/NRG-MP_6002_PXL.ppd
+++ b/db/source/PPD/NRG/PXL/NRG-MP_6002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "NRG MP 6002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 5264263a
+*% java.util.zip.CRC32: f2bece0e
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/NRG/PXL/NRG-MP_7502_PXL.ppd b/db/source/PPD/NRG/PXL/NRG-MP_7502_PXL.ppd
index b5398ee9..16e66ae9 100644
--- a/db/source/PPD/NRG/PXL/NRG-MP_7502_PXL.ppd
+++ b/db/source/PPD/NRG/PXL/NRG-MP_7502_PXL.ppd
@@ -4,9 +4,9 @@
*% for "NRG MP 7502 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 78977a31
+*% java.util.zip.CRC32: 8ef32f1b
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/NRG/PXL/NRG-MP_9002_PXL.ppd b/db/source/PPD/NRG/PXL/NRG-MP_9002_PXL.ppd
index 33a7622e..6807c04a 100644
--- a/db/source/PPD/NRG/PXL/NRG-MP_9002_PXL.ppd
+++ b/db/source/PPD/NRG/PXL/NRG-MP_9002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "NRG MP 9002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 4785c4eb
+*% java.util.zip.CRC32: a18cf1d1
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6002_PS.ppd b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6002_PS.ppd
index 202813da..c2bd9ee7 100644
--- a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6002_PS.ppd
+++ b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_6002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Ricoh Aficio MP 6002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: db142453
+*% java.util.zip.CRC32: b5a2bc9
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:RICOH;MDL:Aficio MP 6002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7502_PS.ppd b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7502_PS.ppd
index 46ec076a..b4593bb1 100644
--- a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7502_PS.ppd
+++ b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7502_PS.ppd
@@ -4,9 +4,9 @@
*% for "Ricoh Aficio MP 7502 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: c7d35cb8
+*% java.util.zip.CRC32: 41c242b4
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:RICOH;MDL:Aficio MP 7502;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9002_PS.ppd b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9002_PS.ppd
index 7c54dfe8..6419dc4c 100644
--- a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9002_PS.ppd
+++ b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Ricoh Aficio MP 9002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 7d5603a4
+*% java.util.zip.CRC32: 9abf0834
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:RICOH;MDL:Aficio MP 9002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6002_PXL.ppd b/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6002_PXL.ppd
index 7471c13c..fb4f06be 100644
--- a/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6002_PXL.ppd
+++ b/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_6002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Ricoh Aficio MP 6002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 4125d1be
+*% java.util.zip.CRC32: 405f0959
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7502_PXL.ppd b/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7502_PXL.ppd
index 7229ffba..d2c1b9df 100644
--- a/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7502_PXL.ppd
+++ b/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7502_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Ricoh Aficio MP 7502 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: c1d29b2b
+*% java.util.zip.CRC32: f6e1d7b0
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9002_PXL.ppd b/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9002_PXL.ppd
index a1cb5353..fabf8efe 100644
--- a/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9002_PXL.ppd
+++ b/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Ricoh Aficio MP 9002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 995c44b1
+*% java.util.zip.CRC32: 10055227
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Savin/PS/Savin-MP_6002_PS.ppd b/db/source/PPD/Savin/PS/Savin-MP_6002_PS.ppd
index a8c018d1..e1389e15 100644
--- a/db/source/PPD/Savin/PS/Savin-MP_6002_PS.ppd
+++ b/db/source/PPD/Savin/PS/Savin-MP_6002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Savin MP 6002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: d67e7188
+*% java.util.zip.CRC32: 92756d76
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:SAVIN;MDL:MP 6002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Savin/PS/Savin-MP_7502_PS.ppd b/db/source/PPD/Savin/PS/Savin-MP_7502_PS.ppd
index 74cf79f9..569912a0 100644
--- a/db/source/PPD/Savin/PS/Savin-MP_7502_PS.ppd
+++ b/db/source/PPD/Savin/PS/Savin-MP_7502_PS.ppd
@@ -4,9 +4,9 @@
*% for "Savin MP 7502 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: b942e8fa
+*% java.util.zip.CRC32: 22f31171
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:SAVIN;MDL:MP 7502;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Savin/PS/Savin-MP_9002_PS.ppd b/db/source/PPD/Savin/PS/Savin-MP_9002_PS.ppd
index 1fc9184d..eab24d45 100644
--- a/db/source/PPD/Savin/PS/Savin-MP_9002_PS.ppd
+++ b/db/source/PPD/Savin/PS/Savin-MP_9002_PS.ppd
@@ -4,9 +4,9 @@
*% for "Savin MP 9002 PS"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: bf96ae2a
+*% java.util.zip.CRC32: d5a2545c
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -46,12 +46,14 @@
*1284DeviceID: "MFG:SAVIN;MDL:MP 9002;CMD:POSTSCRIPT;"
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0
-%%%%Title: (&title40;)
+%%%%Title: (&title;)
%%
%%\n%A%B%C%D&quot;%%%%; cat;"
*End
-*FoomaticRIPUserEntityMaxLength: 8
*%========== Basic Device Capabilities ==========
@@ -1913,7 +1915,6 @@ userdict /RPS_BPdict get begin\n&&
*%========== Job Log ==========
-*FoomaticRIPUserEntityMaxLength: 8
*OpenGroup: JobLog/Job Log
*OpenUI *JobType/JobType: PickOne
*FoomaticRIPOption JobType: enum CmdLine A
@@ -1921,67 +1922,73 @@ userdict /RPS_BPdict get begin\n&&
*DefaultJobType: Normal
*JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
*FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 0\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
*FoomaticRIPOptionSetting JobType=SamplePrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 2\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/lppswd where{pop}{/lppswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 1\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password lppswd\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
*End
*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
*FoomaticRIPOptionSetting JobType=DocServer: "mark\n&&
-(&user8;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
+/usrcode where{pop}{/usrcode()def}ifelse\n&&
+/dspswd where{pop}{/dspswd()def}ifelse\n&&
+(&user;) usrcode (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
cleartomark\n&&
mark {\n&&
<<\n&&
/JobType 4\n&&
/JobInfo <<\n&&
- /UserID (&user8;)\n&&
+ /UserID (&user;)\n&&
/Time (20`date +%y%m%d%R | sed 's/://'`)\n&&
/Password dspswd\n&&
- /JobID (&title20;)\n&&
- /HostLoginName (&user20;)\n&&
- /HostName (&host63;)\n&&
+ /JobID (&title;)\n&&
+ /HostLoginName (&user;)\n&&
+ /HostName (&host;)\n&&
>>\n&&
>> /RDeviceProcSet /ProcSet findresource /SetJobType get exec\n&&
}stopped cleartomark\n"
@@ -1989,7 +1996,7 @@ mark {\n&&
*CloseUI: *JobType
*OpenUI *LockedPrintPassword/Locked Print Password (4-8 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: passcode CmdLine A
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
*FoomaticRIPOptionMaxLength LockedPrintPassword:8
*FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
*OrderDependency: 100 AnySetup *LockedPrintPassword
@@ -2002,13 +2009,13 @@ mark {\n&&
*CloseUI: *LockedPrintPassword
*CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomLockedPrintPassword True
+*ParamCustomLockedPrintPassword Password: 1 password 4 8
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
*OpenUI *DocServerPassword/Document Server Password (4-8 digits): PickOne
-*FoomaticRIPOption DocServerPassword: passcode CmdLine A
+*FoomaticRIPOption DocServerPassword: password CmdLine A
*FoomaticRIPOptionMaxLength DocServerPassword:8
*FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 100 AnySetup *DocServerPassword
+*OrderDependency: 102 AnySetup *DocServerPassword
*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)"
*DefaultDocServerPassword: None
*DocServerPassword None/None: "/dspswd()def\n"
@@ -2018,13 +2025,13 @@ mark {\n&&
*CloseUI: *DocServerPassword
*CustomDocServerPassword True/Custom Document Server Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 8
-*NonUIOrderDependency: 100 AnySetup *CustomDocServerPassword True
+*ParamCustomDocServerPassword Password: 1 password 4 8
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
-*FoomaticRIPOption UserCode: passcode CmdLine A
+*FoomaticRIPOption UserCode: password CmdLine A
*FoomaticRIPOptionMaxLength UserCode:8
*FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 100 AnySetup *UserCode
+*OrderDependency: 104 AnySetup *UserCode
*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
*DefaultUserCode: None
*UserCode None/None: "/usrcode()def\n"
@@ -2034,8 +2041,8 @@ mark {\n&&
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: ""
-*ParamCustomUserCode UserCode: 1 passcode 1 8
-*NonUIOrderDependency: 100 AnySetup *CustomUserCode True
+*ParamCustomUserCode UserCode: 1 password 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
*CloseGroup: JobLog/Job Log
*%========== Font ==========
diff --git a/db/source/PPD/Savin/PXL/Savin-MP_6002_PXL.ppd b/db/source/PPD/Savin/PXL/Savin-MP_6002_PXL.ppd
index 96860d1c..06f36bd0 100644
--- a/db/source/PPD/Savin/PXL/Savin-MP_6002_PXL.ppd
+++ b/db/source/PPD/Savin/PXL/Savin-MP_6002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Savin MP 6002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: b7f3309a
+*% java.util.zip.CRC32: eaadb0b7
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Savin/PXL/Savin-MP_7502_PXL.ppd b/db/source/PPD/Savin/PXL/Savin-MP_7502_PXL.ppd
index cd129e81..ec886125 100644
--- a/db/source/PPD/Savin/PXL/Savin-MP_7502_PXL.ppd
+++ b/db/source/PPD/Savin/PXL/Savin-MP_7502_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Savin MP 7502 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 9c5e057e
+*% java.util.zip.CRC32: b6c1c0d8
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log
diff --git a/db/source/PPD/Savin/PXL/Savin-MP_9002_PXL.ppd b/db/source/PPD/Savin/PXL/Savin-MP_9002_PXL.ppd
index dcf266cc..d09ac0b1 100644
--- a/db/source/PPD/Savin/PXL/Savin-MP_9002_PXL.ppd
+++ b/db/source/PPD/Savin/PXL/Savin-MP_9002_PXL.ppd
@@ -4,9 +4,9 @@
*% for "Savin MP 9002 PXL"
*%
*% CreationDate: 2011/03/16
-*% Modified: 2012/08/21
+*% Modified: 2012/09/14
*%
-*% java.util.zip.CRC32: 739d39b6
+*% java.util.zip.CRC32: 6f93364f
*%
*% COPYRIGHT (C) 2011-2012 RICOH COMPANY, LTD.
*%
@@ -51,12 +51,13 @@
*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+*FoomaticRIPUserEntityMaxLength: 8
+*FoomaticRIPHostEntityMaxLength: 63
+*FoomaticRIPTitleEntityMaxLength: 40
*FoomaticRIPCommandLine: "(printf &apos;\033%%-12345X@PJL SET COPIES=&copies;\n&apos;%G|perl -p -e &quot;s/\x26copies\x3b/1/&quot;);
(gs -q -dBATCH -dPARANOIDSAFER -dNOPAUSE -dNOINTERPOLATE %B%A%C %D%E | perl -p -e &quot;s/^\x1b\x25-12345X//&quot; | perl -p -e &quot;s/\xc1\x01\x00\xf8\x31\x44/\x44/g&quot;);"
*End
-*FoomaticRIPUserEntityMaxLength: 8
-
*%========== Basic Device Capabilities ==========
*LanguageLevel: "3"
@@ -496,9 +497,9 @@
*DefaultRIBannerPagePrint: False
*RIBannerPagePrint False/Off: ""
*RIBannerPagePrint True/On: "%% FoomaticRIPOptionSetting: RIBannerPagePrint=True"
-*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user40;&quot;
-@PJL SET HOSTNAME=&quot;&host40;&quot;
-@PJL SET JOBNAME=&quot;&title40;&quot;
+*FoomaticRIPOptionSetting RIBannerPagePrint=True: "SET HOSTLOGINNAME=&quot;&user;&quot;
+@PJL SET HOSTNAME=&quot;&host;&quot;
+@PJL SET JOBNAME=&quot;&title;&quot;
@PJL SET BANNERPAGEPRINT=BEFOREJOB"
*End
*CloseUI: *RIBannerPagePrint
@@ -694,7 +695,7 @@
*FoomaticRIPOptionSetting Password=4003: "SET JOBPASSWORD2=&quot;4003&quot;"
*CloseUI: *Password
*CustomPassword True/Custom Password: "@PJL SET JOBPASSWORD2=&quot;\1&quot;<0A>"
-*ParamCustomPassword Password: 1 passcode 4 8
+*ParamCustomPassword Password: 1 password 4 8
*OpenUI *UserCode/User Code (up to 8 digits): PickOne
*FoomaticRIPOption UserCode: string JCL A
@@ -712,7 +713,7 @@
*FoomaticRIPOptionSetting UserCode=1003: "SET USERCODE=&quot;1003&quot;"
*CloseUI: *UserCode
*CustomUserCode True/Custom UserCode: "@PJL SET USERCODE=&quot;\1&quot;<0A>"
-*ParamCustomUserCode UserCode: 1 passcode 1 8
+*ParamCustomUserCode UserCode: 1 password 1 8
*CloseGroup: JobLog/Job Log