Imported Upstream version 20110127

1 files changed, 114 insertions, 112 deletions

diff --git a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_2232C_PS.ppd b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_2232C_PS.ppd
index bfd14a86..2b5f00b9 100644
--- a/db/source/PPD/Ricoh/PS/Ricoh-Aficio_2232C_PS.ppd
+++ b/db/source/PPD/Ricoh/PS/Ricoh-Aficio_2232C_PS.ppd
@@ -4,9 +4,9 @@
 *%    for "Ricoh Aficio 2232C PS"
 *%
 *%    CreationDate: 2002/07/10
-*%    Modified:     2010/09/14
+*%    Modified:     2011/01/05
 *%
-*%    COPYRIGHT (C) 2002-2010 RICOH COMPANY, LTD.
+*%    COPYRIGHT (C) 2002-2011 RICOH COMPANY, LTD.
 *%    
 *%    Permission is hereby granted, free of charge, to any person obtaining
 *%    a copy of this software and associated documentation files (the
@@ -99,12 +99,12 @@
 *End
 *CloseUI: *Option1
 
-*OpenUI *Option30/Finisher: PickOne
-*DefaultOption30: None
-*Option30 None/Not Installed: ""
-*Option30 Fin2250/2 Tray Finisher: ""
-*Option30 FinKINU/Booklet Finisher: ""
-*?Option30: "
+*OpenUI *Option_30/Finisher: PickOne
+*DefaultOption_30: None
+*Option_30 None/Not Installed: ""
+*Option_30 Fin2250/2 Tray Finisher: ""
+*Option_30 FinKINU/Booklet Finisher: ""
+*?Option_30: "
    save
 mark
 (None)
@@ -133,13 +133,13 @@ restore
 "
 *End
 
-*CloseUI: *Option30
+*CloseUI: *Option_30
 
-*OpenUI *Option50/Left Tray 1 and 2: PickOne
-*DefaultOption50: False
-*Option50 False/Not Installed: ""
-*Option50 True/Installed: ""
-*?Option50: "
+*OpenUI *Option_50/Left Tray 1 and 2: PickOne
+*DefaultOption_50: False
+*Option_50 False/Not Installed: ""
+*Option_50 True/Installed: ""
+*?Option_50: "
    save
 mark
 (False)
@@ -161,15 +161,15 @@ cleartomark
   restore
 "
 *End
-*CloseUI: *Option50
+*CloseUI: *Option_50
 
 *CloseGroup: InstallableOptions
 
 *%========== Left Tray 1 and 2 / Finisher
-*UIConstraints: *Option50 True *Option30 Fin2250
-*UIConstraints: *Option50 True *Option30 FinKINU
-*UIConstraints: *Option30 Fin2250 *Option50 True
-*UIConstraints: *Option30 FinKINU *Option50 True
+*UIConstraints: *Option_50 True *Option_30 Fin2250
+*UIConstraints: *Option_50 True *Option_30 FinKINU
+*UIConstraints: *Option_30 Fin2250 *Option_50 True
+*UIConstraints: *Option_30 FinKINU *Option_50 True
 
 *%========== Option Tray / InputSlot
 *UIConstraints: *Option1 None *InputSlot 3Tray
@@ -180,68 +180,68 @@ cleartomark
 *UIConstraints: *InputSlot 4Tray *Option1 1Cassette
 
 *%========== Finisher / Staple
-*UIConstraints: *Option30 None *StapleLocation UpperLeft
-*UIConstraints: *Option30 None *StapleLocation UpperRight
-*UIConstraints: *Option30 None *StapleLocation LowerLeft
-*UIConstraints: *Option30 None *StapleLocation LowerRight
-*UIConstraints: *Option30 None *StapleLocation LeftW
-*UIConstraints: *Option30 None *StapleLocation RightW
-*UIConstraints: *Option30 None *StapleLocation UpperW
-*UIConstraints: *Option30 None *StapleLocation LowerW
-*UIConstraints: *StapleLocation UpperLeft *Option30 None
-*UIConstraints: *StapleLocation UpperRight *Option30 None
-*UIConstraints: *StapleLocation LowerLeft *Option30 None
-*UIConstraints: *StapleLocation LowerRight *Option30 None
-*UIConstraints: *StapleLocation LeftW *Option30 None
-*UIConstraints: *StapleLocation RightW *Option30 None
-*UIConstraints: *StapleLocation UpperW *Option30 None
-*UIConstraints: *StapleLocation LowerW *Option30 None
+*UIConstraints: *Option_30 None *StapleLocation UpperLeft
+*UIConstraints: *Option_30 None *StapleLocation UpperRight
+*UIConstraints: *Option_30 None *StapleLocation LowerLeft
+*UIConstraints: *Option_30 None *StapleLocation LowerRight
+*UIConstraints: *Option_30 None *StapleLocation LeftW
+*UIConstraints: *Option_30 None *StapleLocation RightW
+*UIConstraints: *Option_30 None *StapleLocation UpperW
+*UIConstraints: *Option_30 None *StapleLocation LowerW
+*UIConstraints: *StapleLocation UpperLeft *Option_30 None
+*UIConstraints: *StapleLocation UpperRight *Option_30 None
+*UIConstraints: *StapleLocation LowerLeft *Option_30 None
+*UIConstraints: *StapleLocation LowerRight *Option_30 None
+*UIConstraints: *StapleLocation LeftW *Option_30 None
+*UIConstraints: *StapleLocation RightW *Option_30 None
+*UIConstraints: *StapleLocation UpperW *Option_30 None
+*UIConstraints: *StapleLocation LowerW *Option_30 None
 
 *%========== Finisher / Punch
-*UIConstraints: *Option30 None *RIPunch Left2
-*UIConstraints: *Option30 None *RIPunch Left3
-*UIConstraints: *Option30 None *RIPunch Left4
-*UIConstraints: *Option30 None *RIPunch Right2
-*UIConstraints: *Option30 None *RIPunch Right3
-*UIConstraints: *Option30 None *RIPunch Right4
-*UIConstraints: *Option30 None *RIPunch Upper2
-*UIConstraints: *Option30 None *RIPunch Upper3
-*UIConstraints: *Option30 None *RIPunch Upper4
-*UIConstraints: *Option30 None *RIPunch Lower2
-*UIConstraints: *Option30 None *RIPunch Lower3
-*UIConstraints: *Option30 None *RIPunch Lower4
-*UIConstraints: *RIPunch Left2 *Option30 None
-*UIConstraints: *RIPunch Left3 *Option30 None
-*UIConstraints: *RIPunch Left4 *Option30 None
-*UIConstraints: *RIPunch Right2 *Option30 None
-*UIConstraints: *RIPunch Right3 *Option30 None
-*UIConstraints: *RIPunch Right4 *Option30 None
-*UIConstraints: *RIPunch Upper2 *Option30 None
-*UIConstraints: *RIPunch Upper3 *Option30 None
-*UIConstraints: *RIPunch Upper4 *Option30 None
-*UIConstraints: *RIPunch Lower2 *Option30 None
-*UIConstraints: *RIPunch Lower3 *Option30 None
-*UIConstraints: *RIPunch Lower4 *Option30 None
+*UIConstraints: *Option_30 None *RIPunch Left2
+*UIConstraints: *Option_30 None *RIPunch Left3
+*UIConstraints: *Option_30 None *RIPunch Left4
+*UIConstraints: *Option_30 None *RIPunch Right2
+*UIConstraints: *Option_30 None *RIPunch Right3
+*UIConstraints: *Option_30 None *RIPunch Right4
+*UIConstraints: *Option_30 None *RIPunch Upper2
+*UIConstraints: *Option_30 None *RIPunch Upper3
+*UIConstraints: *Option_30 None *RIPunch Upper4
+*UIConstraints: *Option_30 None *RIPunch Lower2
+*UIConstraints: *Option_30 None *RIPunch Lower3
+*UIConstraints: *Option_30 None *RIPunch Lower4
+*UIConstraints: *RIPunch Left2 *Option_30 None
+*UIConstraints: *RIPunch Left3 *Option_30 None
+*UIConstraints: *RIPunch Left4 *Option_30 None
+*UIConstraints: *RIPunch Right2 *Option_30 None
+*UIConstraints: *RIPunch Right3 *Option_30 None
+*UIConstraints: *RIPunch Right4 *Option_30 None
+*UIConstraints: *RIPunch Upper2 *Option_30 None
+*UIConstraints: *RIPunch Upper3 *Option_30 None
+*UIConstraints: *RIPunch Upper4 *Option_30 None
+*UIConstraints: *RIPunch Lower2 *Option_30 None
+*UIConstraints: *RIPunch Lower3 *Option_30 None
+*UIConstraints: *RIPunch Lower4 *Option_30 None
 
 *%========== Finisher / OutputBin
-*UIConstraints: *Option30 None *OutputBin Fin2250Upper
-*UIConstraints: *Option30 None *OutputBin Fin2250Lower
-*UIConstraints: *Option30 None *OutputBin FinKINUShift
-*UIConstraints: *Option30 Fin2250 *OutputBin FinKINUShift
-*UIConstraints: *Option30 FinKINU *OutputBin Fin2250Upper
-*UIConstraints: *Option30 FinKINU *OutputBin Fin2250Lower
-*UIConstraints: *OutputBin Fin2250Upper *Option30 None
-*UIConstraints: *OutputBin Fin2250Lower *Option30 None
-*UIConstraints: *OutputBin FinKINUShift *Option30 None
-*UIConstraints: *OutputBin FinKINUShift *Option30 Fin2250
-*UIConstraints: *OutputBin Fin2250Upper *Option30 FinKINU
-*UIConstraints: *OutputBin Fin2250Lower *Option30 FinKINU
+*UIConstraints: *Option_30 None *OutputBin Fin2250Upper
+*UIConstraints: *Option_30 None *OutputBin Fin2250Lower
+*UIConstraints: *Option_30 None *OutputBin FinKINUShift
+*UIConstraints: *Option_30 Fin2250 *OutputBin FinKINUShift
+*UIConstraints: *Option_30 FinKINU *OutputBin Fin2250Upper
+*UIConstraints: *Option_30 FinKINU *OutputBin Fin2250Lower
+*UIConstraints: *OutputBin Fin2250Upper *Option_30 None
+*UIConstraints: *OutputBin Fin2250Lower *Option_30 None
+*UIConstraints: *OutputBin FinKINUShift *Option_30 None
+*UIConstraints: *OutputBin FinKINUShift *Option_30 Fin2250
+*UIConstraints: *OutputBin Fin2250Upper *Option_30 FinKINU
+*UIConstraints: *OutputBin Fin2250Lower *Option_30 FinKINU
 
 *%========== Left Tray 1 and 2 / OutputBin
-*UIConstraints: *Option50 False *OutputBin CFBin1
-*UIConstraints: *Option50 False *OutputBin CFBin2
-*UIConstraints: *OutputBin CFBin1 *Option50 False
-*UIConstraints: *OutputBin CFBin2 *Option50 False
+*UIConstraints: *Option_50 False *OutputBin CFBin1
+*UIConstraints: *Option_50 False *OutputBin CFBin2
+*UIConstraints: *OutputBin CFBin1 *Option_50 False
+*UIConstraints: *OutputBin CFBin2 *Option_50 False
 
 *%========== MediaType / InputSlot
 *UIConstraints: *MediaType OHP *InputSlot 1Tray
@@ -286,10 +286,10 @@ cleartomark
 *UIConstraints: *PageSize 12x18 *InputSlot 2Tray
 *UIConstraints: *PageSize 12x18 *InputSlot 3Tray
 *UIConstraints: *PageSize 12x18 *InputSlot 4Tray
-*UIConstraints: *PageSize HalfLetter *InputSlot 1Tray
-*UIConstraints: *PageSize HalfLetter *InputSlot 2Tray
-*UIConstraints: *PageSize HalfLetter *InputSlot 3Tray
-*UIConstraints: *PageSize HalfLetter *InputSlot 4Tray
+*UIConstraints: *PageSize Statement *InputSlot 1Tray
+*UIConstraints: *PageSize Statement *InputSlot 2Tray
+*UIConstraints: *PageSize Statement *InputSlot 3Tray
+*UIConstraints: *PageSize Statement *InputSlot 4Tray
 *UIConstraints: *PageSize Env10 *InputSlot 1Tray
 *UIConstraints: *PageSize Env10 *InputSlot 2Tray
 *UIConstraints: *PageSize Env10 *InputSlot 3Tray
@@ -318,10 +318,10 @@ cleartomark
 *UIConstraints: *InputSlot 2Tray *PageSize 12x18
 *UIConstraints: *InputSlot 3Tray *PageSize 12x18
 *UIConstraints: *InputSlot 4Tray *PageSize 12x18
-*UIConstraints: *InputSlot 1Tray *PageSize HalfLetter
-*UIConstraints: *InputSlot 2Tray *PageSize HalfLetter
-*UIConstraints: *InputSlot 3Tray *PageSize HalfLetter
-*UIConstraints: *InputSlot 4Tray *PageSize HalfLetter
+*UIConstraints: *InputSlot 1Tray *PageSize Statement
+*UIConstraints: *InputSlot 2Tray *PageSize Statement
+*UIConstraints: *InputSlot 3Tray *PageSize Statement
+*UIConstraints: *InputSlot 4Tray *PageSize Statement
 *UIConstraints: *InputSlot 1Tray *PageSize Env10
 *UIConstraints: *InputSlot 2Tray *PageSize Env10
 *UIConstraints: *InputSlot 3Tray *PageSize Env10
@@ -351,10 +351,10 @@ cleartomark
 *UIConstraints: *PageRegion 12x18 *InputSlot 2Tray
 *UIConstraints: *PageRegion 12x18 *InputSlot 3Tray
 *UIConstraints: *PageRegion 12x18 *InputSlot 4Tray
-*UIConstraints: *PageRegion HalfLetter *InputSlot 1Tray
-*UIConstraints: *PageRegion HalfLetter *InputSlot 2Tray
-*UIConstraints: *PageRegion HalfLetter *InputSlot 3Tray
-*UIConstraints: *PageRegion HalfLetter *InputSlot 4Tray
+*UIConstraints: *PageRegion Statement *InputSlot 1Tray
+*UIConstraints: *PageRegion Statement *InputSlot 2Tray
+*UIConstraints: *PageRegion Statement *InputSlot 3Tray
+*UIConstraints: *PageRegion Statement *InputSlot 4Tray
 *UIConstraints: *PageRegion Env10 *InputSlot 1Tray
 *UIConstraints: *PageRegion Env10 *InputSlot 2Tray
 *UIConstraints: *PageRegion Env10 *InputSlot 3Tray
@@ -383,10 +383,10 @@ cleartomark
 *UIConstraints: *InputSlot 2Tray *PageRegion 12x18
 *UIConstraints: *InputSlot 3Tray *PageRegion 12x18
 *UIConstraints: *InputSlot 4Tray *PageRegion 12x18
-*UIConstraints: *InputSlot 1Tray *PageRegion HalfLetter
-*UIConstraints: *InputSlot 2Tray *PageRegion HalfLetter
-*UIConstraints: *InputSlot 3Tray *PageRegion HalfLetter
-*UIConstraints: *InputSlot 4Tray *PageRegion HalfLetter
+*UIConstraints: *InputSlot 1Tray *PageRegion Statement
+*UIConstraints: *InputSlot 2Tray *PageRegion Statement
+*UIConstraints: *InputSlot 3Tray *PageRegion Statement
+*UIConstraints: *InputSlot 4Tray *PageRegion Statement
 *UIConstraints: *InputSlot 1Tray *PageRegion Env10
 *UIConstraints: *InputSlot 2Tray *PageRegion Env10
 *UIConstraints: *InputSlot 3Tray *PageRegion Env10
@@ -413,7 +413,7 @@ cleartomark
 *UIConstraints: *PageSize B4 *InputSlot 1Tray
 *UIConstraints: *PageSize B5 *InputSlot 1Tray
 *UIConstraints: *PageSize Legal *InputSlot 1Tray
-*UIConstraints: *PageSize 11x17 *InputSlot 1Tray
+*UIConstraints: *PageSize Tabloid *InputSlot 1Tray
 *UIConstraints: *PageSize Executive *InputSlot 1Tray
 *UIConstraints: *PageSize F *InputSlot 1Tray
 *UIConstraints: *PageSize Folio *InputSlot 1Tray
@@ -425,7 +425,7 @@ cleartomark
 *UIConstraints: *InputSlot 1Tray *PageSize B4
 *UIConstraints: *InputSlot 1Tray *PageSize B5
 *UIConstraints: *InputSlot 1Tray *PageSize Legal
-*UIConstraints: *InputSlot 1Tray *PageSize 11x17
+*UIConstraints: *InputSlot 1Tray *PageSize Tabloid
 *UIConstraints: *InputSlot 1Tray *PageSize Executive
 *UIConstraints: *InputSlot 1Tray *PageSize F
 *UIConstraints: *InputSlot 1Tray *PageSize Folio
@@ -438,7 +438,7 @@ cleartomark
 *UIConstraints: *PageRegion B4 *InputSlot 1Tray
 *UIConstraints: *PageRegion B5 *InputSlot 1Tray
 *UIConstraints: *PageRegion Legal *InputSlot 1Tray
-*UIConstraints: *PageRegion 11x17 *InputSlot 1Tray
+*UIConstraints: *PageRegion Tabloid *InputSlot 1Tray
 *UIConstraints: *PageRegion Executive *InputSlot 1Tray
 *UIConstraints: *PageRegion F *InputSlot 1Tray
 *UIConstraints: *PageRegion Folio *InputSlot 1Tray
@@ -450,7 +450,7 @@ cleartomark
 *UIConstraints: *InputSlot 1Tray *PageRegion B4
 *UIConstraints: *InputSlot 1Tray *PageRegion B5
 *UIConstraints: *InputSlot 1Tray *PageRegion Legal
-*UIConstraints: *InputSlot 1Tray *PageRegion 11x17
+*UIConstraints: *InputSlot 1Tray *PageRegion Tabloid
 *UIConstraints: *InputSlot 1Tray *PageRegion Executive
 *UIConstraints: *InputSlot 1Tray *PageRegion F
 *UIConstraints: *InputSlot 1Tray *PageRegion Folio
@@ -461,8 +461,8 @@ cleartomark
 *%========== PageSize / Duplex
 *UIConstraints: *PageSize A6 *Duplex DuplexTumble
 *UIConstraints: *PageSize A6 *Duplex DuplexNoTumble
-*UIConstraints: *PageSize HalfLetter *Duplex DuplexTumble
-*UIConstraints: *PageSize HalfLetter *Duplex DuplexNoTumble
+*UIConstraints: *PageSize Statement *Duplex DuplexTumble
+*UIConstraints: *PageSize Statement *Duplex DuplexNoTumble
 *UIConstraints: *PageSize Env10 *Duplex DuplexTumble
 *UIConstraints: *PageSize Env10 *Duplex DuplexNoTumble
 *UIConstraints: *PageSize EnvMonarch *Duplex DuplexTumble
@@ -477,8 +477,8 @@ cleartomark
 *UIConstraints: *PageSize 12x18 *Duplex DuplexNoTumble
 *UIConstraints: *Duplex DuplexTumble *PageSize A6
 *UIConstraints: *Duplex DuplexNoTumble *PageSize A6
-*UIConstraints: *Duplex DuplexTumble *PageSize HalfLetter
-*UIConstraints: *Duplex DuplexNoTumble *PageSize HalfLetter
+*UIConstraints: *Duplex DuplexTumble *PageSize Statement
+*UIConstraints: *Duplex DuplexNoTumble *PageSize Statement
 *UIConstraints: *Duplex DuplexTumble *PageSize Env10
 *UIConstraints: *Duplex DuplexNoTumble *PageSize Env10
 *UIConstraints: *Duplex DuplexTumble *PageSize EnvMonarch
@@ -494,8 +494,8 @@ cleartomark
 
 *UIConstraints: *PageRegion A6 *Duplex DuplexTumble
 *UIConstraints: *PageRegion A6 *Duplex DuplexNoTumble
-*UIConstraints: *PageRegion HalfLetter *Duplex DuplexTumble
-*UIConstraints: *PageRegion HalfLetter *Duplex DuplexNoTumble
+*UIConstraints: *PageRegion Statement *Duplex DuplexTumble
+*UIConstraints: *PageRegion Statement *Duplex DuplexNoTumble
 *UIConstraints: *PageRegion Env10 *Duplex DuplexTumble
 *UIConstraints: *PageRegion Env10 *Duplex DuplexNoTumble
 *UIConstraints: *PageRegion EnvMonarch *Duplex DuplexTumble
@@ -510,8 +510,8 @@ cleartomark
 *UIConstraints: *PageRegion 12x18 *Duplex DuplexNoTumble
 *UIConstraints: *Duplex DuplexTumble *PageRegion A6
 *UIConstraints: *Duplex DuplexNoTumble *PageRegion A6
-*UIConstraints: *Duplex DuplexTumble *PageRegion HalfLetter
-*UIConstraints: *Duplex DuplexNoTumble *PageRegion HalfLetter
+*UIConstraints: *Duplex DuplexTumble *PageRegion Statement
+*UIConstraints: *Duplex DuplexNoTumble *PageRegion Statement
 *UIConstraints: *Duplex DuplexTumble *PageRegion Env10
 *UIConstraints: *Duplex DuplexNoTumble *PageRegion Env10
 *UIConstraints: *Duplex DuplexTumble *PageRegion EnvMonarch
@@ -791,10 +791,10 @@ cleartomark
 *PageSize Letter/Letter: "<< 
   /PageSize [612 792] /ImagingBBox null >> setpagedevice"
 *End
-*PageSize HalfLetter/5.5x8.5:"<< 
+*PageSize Statement/5.5x8.5:"<< 
   /PageSize [396 612] /ImagingBBox null >> setpagedevice"
 *End
-*PageSize 11x17/11x17: "<< 
+*PageSize Tabloid/11x17: "<< 
   /PageSize [792 1224] /ImagingBBox null >> setpagedevice"
 *End
 *PageSize 12x18/12x18: "<< 
@@ -895,10 +895,10 @@ cleartomark
 *PageRegion Letter/Letter: "<< 
   /PageSize [612 792] /ImagingBBox null >> setpagedevice"
 *End
-*PageRegion HalfLetter/5.5x8.5: "<< 
+*PageRegion Statement/5.5x8.5: "<< 
   /PageSize [396 612] /ImagingBBox null >> setpagedevice"
 *End
-*PageRegion 11x17/11x17: "<< 
+*PageRegion Tabloid/11x17: "<< 
   /PageSize [792 1224] /ImagingBBox null >> setpagedevice"
 *End
 *PageRegion 12x18/12x18: "<< 
@@ -950,8 +950,8 @@ cleartomark
 *ImageableArea B5/B5 (JIS): "12 12 504 717"
 *ImageableArea Legal/Legal: "12 12 600 996"
 *ImageableArea Letter/Letter: "12 12 600 780"
-*ImageableArea HalfLetter/5.5x8.5: "12 12 384 600"
-*ImageableArea 11x17/11x17: "12 12 780 1212"
+*ImageableArea Statement/5.5x8.5: "12 12 384 600"
+*ImageableArea Tabloid/11x17: "12 12 780 1212"
 *ImageableArea 12x18/12x18: "12 12 852 1284"
 *ImageableArea Executive/Executive: "12 12 510 744"
 *ImageableArea F/8x13: "12 12 564 924"
@@ -983,8 +983,8 @@ cleartomark
 *PaperDimension B5/B5 (JIS): "516 729"
 *PaperDimension Legal/Legal: "612 1008"
 *PaperDimension Letter/Letter: "612 792"
-*PaperDimension HalfLetter/5.5x8.5: "396 612"
-*PaperDimension 11x17/11x17: "792 1224"
+*PaperDimension Statement/5.5x8.5: "396 612"
+*PaperDimension Tabloid/11x17: "792 1224"
 *PaperDimension 12x18/12x18: "864 1296"
 *PaperDimension Executive/Executive: "522 756"
 *PaperDimension F/8x13: "576 936"
@@ -1771,9 +1771,11 @@ cleartomark
 *cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip"
 
 *FoomaticRIPCommandLine: "printf &quot;%%!PS-Adobe-3.0\n%%%% %%&&
-%%\n%B%C%D%A&quot;%%%%; cat;"
+%%\n%A%B%C%D&quot;%%%%; cat;"
 *End
 
+*FoomaticRIPUserEntityMaxLength: 8
+
 *OpenGroup: JobLog/Job Log
 
 *OpenUI *JobType/JobType: PickOne