Imported Upstream version 20160603

1 files changed, 57 insertions, 76 deletions

diff --git a/db/source/PPD/Savin/PS/Savin-C2524_PS.ppd b/db/source/PPD/Savin/PS/Savin-C2524_PS.ppd
index 358d8e24..61e50e81 100644
--- a/db/source/PPD/Savin/PS/Savin-C2524_PS.ppd
+++ b/db/source/PPD/Savin/PS/Savin-C2524_PS.ppd
@@ -4,9 +4,9 @@
 *%    for "Savin C2524 PS"
 *%
 *%    CreationDate: 2001/08/08
-*%    Modified:     2011/01/05
+*%    Modified:     2016/04/22
 *%
-*%    COPYRIGHT (C) 2001-2011 RICOH COMPANY, LTD.
+*%    COPYRIGHT (C) 2001-2016 RICOH COMPANY, LTD.
 *%    
 *%    Permission is hereby granted, free of charge, to any person obtaining
 *%    a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
 *%    [this is the MIT open source license -- please see www.opensource.org]
 *%
 
-*FileVersion: "1.2"
+*FileVersion: "1.3"
 *FormatVersion: "4.3"
 *LanguageEncoding: ISOLatin1
 *LanguageVersion: English
@@ -1432,112 +1432,93 @@
 *OpenGroup: JobLog/Job Log
 
 *OpenUI *JobType/JobType: PickOne
-*FoomaticRIPOption JobType: enum CmdLine B
-*OrderDependency: 255 AnySetup *JobType
+*FoomaticRIPOption JobType: enum CmdLine A
+*OrderDependency: 110 AnySetup *JobType
 *DefaultJobType: Normal
 *JobType Normal/Normal: "%% FoomaticRIPOptionSetting: JobType=Normal"
 *FoomaticRIPOptionSetting JobType=Normal: "mark\n&&
-() () (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"
 *End
 *JobType SamplePrint/Sample Print: "%% FoomaticRIPOptionSetting: JobType=SamplePrint"
 *FoomaticRIPOptionSetting JobType=SamplePrint: "mark\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&&
 (&user;) (20`date +%y%m%d%R | sed 's/://'`) {proofprint} stopped\n&&
 cleartomark\n"
 *End
-*JobType LockedPrint/Locked Print: ""
-*JobType DocServer/Document Server: ""
+*JobType LockedPrint/Locked Print: "%% FoomaticRIPOptionSetting: JobType=LockedPrint"
+*FoomaticRIPOptionSetting JobType=LockedPrint: "mark\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&&
+(&user;) (20`date +%y%m%d%R | sed 's/://'`) lppswd {secureprint} stopped\n&&
+cleartomark\n"
+*End
+*JobType DocServer/Document Server: "%% FoomaticRIPOptionSetting: JobType=DocServer"
+*FoomaticRIPOptionSetting JobType=DocServer: "mark\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&&
+(&user;) (20`date +%y%m%d%R | sed 's/://'`) dspswd (&title;) {storedprint} stopped\n&&
+cleartomark\n"
+*End
 *CloseUI: *JobType
 
 *OpenUI *LockedPrintPassword/Locked Print Password (4 digits): PickOne
-*FoomaticRIPOption LockedPrintPassword: password CmdLine C
+*FoomaticRIPOption LockedPrintPassword: password CmdLine A
 *FoomaticRIPOptionMaxLength LockedPrintPassword:4
 *FoomaticRIPOptionAllowedChars LockedPrintPassword: "0-9"
-*OrderDependency: 255 AnySetup *LockedPrintPassword
-*FoomaticRIPOptionPrototype LockedPrintPassword: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (%s) {secureprint} stopped\n&&
-cleartomark\n"
-*End
+*OrderDependency: 100 AnySetup *LockedPrintPassword
+*FoomaticRIPOptionPrototype LockedPrintPassword: "/lppswd(%s)def\n"
 *DefaultLockedPrintPassword: None
-*LockedPrintPassword None/None: ""
-*LockedPrintPassword 4001/4001: "%% FoomaticRIPOptionSetting: LockedPrintPassword=4001"
-*FoomaticRIPOptionSetting LockedPrintPassword=4001: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (4001) {secureprint} stopped\n&&
-cleartomark\n"
-*End
-*LockedPrintPassword 4002/4002: "%% FoomaticRIPOptionSetting: LockedPrintPassword=4002"
-*FoomaticRIPOptionSetting LockedPrintPassword=4002: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (4002) {secureprint} stopped\n&&
-cleartomark\n"
-*End
-*LockedPrintPassword 4003/4003: "%% FoomaticRIPOptionSetting: LockedPrintPassword=4003"
-*FoomaticRIPOptionSetting LockedPrintPassword=4003: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (4003) {secureprint} stopped\n&&
-cleartomark\n"
-*End
+*LockedPrintPassword None/None: "/lppswd()def\n"
+*LockedPrintPassword 4001/4001: "/lppswd(4001)def\n"
+*LockedPrintPassword 4002/4002: "/lppswd(4002)def\n"
+*LockedPrintPassword 4003/4003: "/lppswd(4003)def\n"
 *CloseUI: *LockedPrintPassword
 *CustomLockedPrintPassword True/Custom Password: ""
-*ParamCustomLockedPrintPassword Password: 1 passcode 4 4
+*ParamCustomLockedPrintPassword Password: 1 password 4 4
+*NonUIOrderDependency: 101 AnySetup *CustomLockedPrintPassword True
 
 *OpenUI *DocServerPassword/Document Server Password (4 digits): PickOne
-*FoomaticRIPOption DocServerPassword: password CmdLine D
+*FoomaticRIPOption DocServerPassword: password CmdLine A
 *FoomaticRIPOptionMaxLength DocServerPassword:4
 *FoomaticRIPOptionAllowedChars DocServerPassword: "0-9"
-*OrderDependency: 255 AnySetup *DocServerPassword
-*FoomaticRIPOptionPrototype DocServerPassword: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (%s) (&title;) {storedprint} stopped\n&&
-cleartomark\n"
-*End
+*OrderDependency: 102 AnySetup *DocServerPassword
+*FoomaticRIPOptionPrototype DocServerPassword: "/dspswd(%s)def\n"
 *DefaultDocServerPassword: None
-*DocServerPassword None/None: ""
-*DocServerPassword 3001/3001: "%% FoomaticRIPOptionSetting: DocServerPassword=3001"
-*FoomaticRIPOptionSetting DocServerPassword=3001: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (3001) (&title;) {storedprint} stopped\n&&
-cleartomark\n"
-*End
-*DocServerPassword 3002/3002: "%% FoomaticRIPOptionSetting: DocServerPassword=3002"
-*FoomaticRIPOptionSetting DocServerPassword=3002: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (3002) (&title;) {storedprint} stopped\n&&
-cleartomark\n"
-*End
-*DocServerPassword 3003/3003: "%% FoomaticRIPOptionSetting: DocServerPassword=3003"
-*FoomaticRIPOptionSetting DocServerPassword=3003: "mark\n&&
-(&user;) (20`date +%y%m%d%R | sed 's/://'`) (3003) (&title;) {storedprint} stopped\n&&
-cleartomark\n"
-*End
+*DocServerPassword None/None: "/dspswd()def\n"
+*DocServerPassword 3001/3001: "/dspswd(3001)def\n"
+*DocServerPassword 3002/3002: "/dspswd(3002)def\n"
+*DocServerPassword 3003/3003: "/dspswd(3003)def\n"
 *CloseUI: *DocServerPassword
-*CustomDocServerPassword True/Custom Password: ""
-*ParamCustomDocServerPassword Password: 1 passcode 4 4
+*CustomDocServerPassword True/Custom Document Server Password: ""
+*ParamCustomDocServerPassword Password: 1 password 4 4
+*NonUIOrderDependency: 103 AnySetup *CustomDocServerPassword True
 
 *OpenUI *UserCode/User Code (up to 8 digits): PickOne
 *FoomaticRIPOption UserCode: string CmdLine A
 *FoomaticRIPOptionMaxLength UserCode:8
 *FoomaticRIPOptionAllowedChars UserCode: "0-9"
-*OrderDependency: 255 AnySetup *UserCode
-*FoomaticRIPOptionPrototype UserCode: "mark\n&&
-() (%s) (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
-cleartomark\n"
-*End
+*OrderDependency: 104 AnySetup *UserCode
+*FoomaticRIPOptionPrototype UserCode: "/usrcode(%s)def\n"
 *DefaultUserCode: None
-*UserCode None/None: ""
-*UserCode 1001/1001: "%% FoomaticRIPOptionSetting: UserCode=1001"
-*FoomaticRIPOptionSetting UserCode=1001: "mark\n&&
-() (1001) (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
-cleartomark\n"
-*End
-*UserCode 1002/1002: "%% FoomaticRIPOptionSetting: UserCode=1002"
-*FoomaticRIPOptionSetting UserCode=1002: "mark\n&&
-() (1002) (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
-cleartomark\n"
-*End
-*UserCode 1003/1003: "%% FoomaticRIPOptionSetting: UserCode=1003"
-*FoomaticRIPOptionSetting UserCode=1003: "mark\n&&
-() (1003) (20`date +%y%m%d%R | sed 's/://'`) {setuserinfo} stopped\n&&
-cleartomark\n"
-*End
+*UserCode None/None: "/usrcode()def\n"
+*UserCode 1001/1001: "/usrcode(1001)def\n"
+*UserCode 1002/1002: "/usrcode(1002)def\n"
+*UserCode 1003/1003: "/usrcode(1003)def\n"
 *CloseUI: *UserCode
 *CustomUserCode True/Custom UserCode: ""
 *ParamCustomUserCode UserCode: 1 passcode 1 8
+*NonUIOrderDependency: 105 AnySetup *CustomUserCode True
 
 *CloseGroup: JobLog/Job Log