Imported Upstream version 25c

17 files changed, 712 insertions, 71 deletions

diff --git a/KodakESP_13.drv b/KodakESP_14.drv
index c7cb85d..17940af 100644
--- a/KodakESP_13.drv
+++ b/KodakESP_14.drv
@@ -55,8 +55,8 @@ Version "1.4"
 
     option "Resolution" PickOne AnySetup 20
 //Resolution colorspace bits-per-color row-count row-feed row-step name
-    Choice 300x1200dpi/300x1200 "<</HWResolution[300 1200]/cupsBitsPerColor 8/>>setpagedevice"
-    *Choice 600x1200dpi/600x1200 "<</HWResolution[600 1200]/cupsBitsPerColor 8/>>setpagedevice"
+    Choice 300x1200dpi/300x1200 "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+    *Choice 600x1200dpi/600x1200 "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
 
 
 //res/media dens gamma 3x3matrix 
@@ -94,12 +94,44 @@ Version "1.4"
 
     Attribute "marker-colors" "" "black magenta"
 
+    option "ColorModel" PickOne AnySetup 10
 //ColorModel name colorspace colororder compression
 
-    ColorModel RGB/Color rgb chunky 0
+    *ColorModel RGB/Color rgb chunky 0
     ColorModel Gray/BlackAndWhite k chunky 0
 
- // Kodak ESP 3xxx Series non-dithered/dithered without duplex
+
+//List of model names for reference
+
+//"KODAK ESP 9200 Series AiO"
+//"KODAK ESP 7200 Series AiO"
+//"KODAK ESP Office 6100 Series AiO"
+//"KODAK ESP Office 4100 Series AiO"
+//"KODAK ESP 5200 Series AiO"
+//"KODAK ESP 3200 Series AiO"
+//"KODAK ESP 9 AiO"
+//"KODAK ESP 7 AiO"
+//"KODAK ESP 5 AiO"
+//"KODAK ESP-3 AiO"
+//"KODAK 5100 AiO"
+//"KODAK 5300 AiO"
+//"KODAK 5500 AiO"
+
+ // Kodak ESP 9 duplex
+  {
+    ModelName "Kodak ESP 9 AiO"
+    Attribute NickName "" "Kodak ESP 9" //The NickName is used in ubuntu to make the printer database
+    Attribute Product "" "(Kodak ESP 9 AiO)"
+    Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 9 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+    FileName "Kodak_ESP_9.ppd"
+    PCFileName "KESP9.ppd"
+    ModelNumber 9
+    Duplex rotated
+    InputSlot 0 MainTray
+    InputSlot 1 PhotoTray
+  }
+
+ // Kodak ESP 3xxx Series without duplex
   {
     ModelName "Kodak ESP 3200 Series AiO"
     Attribute NickName "" "Kodak ESP 3200" //The NickName is used in ubuntu to make the printer database
@@ -110,7 +142,7 @@ Version "1.4"
     ModelNumber 3250
   }
 
- // Kodak ESP 5xxx Series non-dithered/dithered without duplex
+ // Kodak ESP 52xx Series without duplex
   {
     ModelName "Kodak ESP 5200 Series AiO"
     Attribute NickName "" "Kodak ESP 5200" //The NickName is used in ubuntu to make the printer database
@@ -121,26 +153,55 @@ Version "1.4"
     ModelNumber 5250
   }
 
-  // Kodak ESP 55xx Series non-dithered/dithered with duplex
+  // Kodak ESP 51xx Series optional duplex
+  {
+    ModelName "Kodak 5100 AiO"
+    Attribute NickName "" "Kodak 5100 AiO" //The NickName is used in ubuntu to make the printer database
+    Attribute Product "" "(Kodak 5100 AiO)"
+    Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK 5100 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+    FileName "Kodak_ESP_51xx_Series.ppd"
+    PCFileName "KESP51xx.ppd"
+    ModelNumber 5100
+    Duplex rotated
+    InputSlot 0 MainTray
+    InputSlot 1 PhotoTray
+  }
+
+  // Kodak ESP 53xx Series optional duplex
   {
-    ModelName "Kodak ESP 5500 Series AiO"
-    Attribute NickName "" "Kodak ESP 5500" //The NickName is used in ubuntu to make the printer database
-    Attribute Product "" "(Kodak ESP 5500 Series AiO)"
-    Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 5500 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+    ModelName "Kodak 5300 AiO"
+    Attribute NickName "" "Kodak 5300 AiO" //The NickName is used in ubuntu to make the printer database
+    Attribute Product "" "(Kodak 5300 AiO)"
+    Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK 5300 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+    FileName "Kodak_ESP_53xx_Series.ppd"
+    PCFileName "KESP53xx.ppd"
+    ModelNumber 5300
+    Duplex rotated
+    InputSlot 0 MainTray
+    InputSlot 1 PhotoTray
+  }
+  // Kodak ESP 55xx Series with duplex
+  {
+    ModelName "Kodak 5500 AiO"
+    Attribute NickName "" "Kodak 5500 AiO" //The NickName is used in ubuntu to make the printer database
+    Attribute Product "" "(Kodak 5500 AiO)"
+    Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK 5500 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
     FileName "Kodak_ESP_55xx_Series.ppd"
     PCFileName "KESP55xx.ppd"
     ModelNumber 5500
 //    Duplex normal //reported that back side was upside down on 5500
 //    Duplex flip //reported that back side was mirror image on 5500
     Duplex rotated
+    InputSlot 0 MainTray
+    InputSlot 1 PhotoTray
   }
 
-  // Kodak ESP 61xx Series non-dithered/dithered with duplex
+  // Kodak ESP 61xx Series with duplex
   {
-    ModelName "Kodak ESP 6100 Series AiO"
-    Attribute NickName "" "Kodak ESP 6100" //The NickName is used in ubuntu to make the printer database
-    Attribute Product "" "(Kodak ESP 6100 Series AiO)"
-    Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP 6100 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+    ModelName "Kodak ESP Office 6100 Series AiO"
+    Attribute NickName "" "Kodak ESP Office 6100" //The NickName is used in ubuntu to make the printer database
+    Attribute Product "" "(Kodak ESP Office 6100 Series AiO)"
+    Attribute 1284DeviceID "" "MFG:Eastman Kodak Company;MDL:KODAK ESP Office 6100 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
     FileName "Kodak_ESP_61xx_Series.ppd"
     PCFileName "KESP61xx.ppd"
     ModelNumber 6150
diff --git a/Makefile b/Makefile
index b349023..48dfaed 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@
 # Makefile for c2esp20 has some redundant stuff deleted, ppd file names are echoed, c2espC added
 # Makefile for c2esp21 has forceppd added
 # Makefile for c2esp25 has minor changes. (*.in files are deleted from the doc directory)
+# Makefile for c2esp25c runs ppdc at install stage if it is installed
 
 LANG=C
 UNAME := $(shell uname)
@@ -27,6 +28,8 @@ PREFIX=/usr/local
 PREFIX=/usr
 PREFIX=$(DESTDIR)/usr
 
+PPDCFOUND=0
+
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
 FILTERBIN=$(PREFIX)/lib/cups/filter
@@ -150,7 +153,6 @@ all-test:
 	    exit 1; \
 	fi
 
-	
 	# ... OK!
 	#
 
@@ -204,7 +206,11 @@ install-test:
 	#
 	# Installation Dependencies...
 	#
-	# none as yet
+# new in c2esp25c
+	@if test -f /usr/bin/ppdc; then \
+	    echo "ppdc is available"; \
+	fi
+
 	# ... OK!
 	#
     
@@ -239,11 +245,32 @@ PPD=$(DESTDIR)/usr/share/ppd
 VARPPD=/var/lp/ppd
 install-ppd:
 	#
+	# Generate PPD files using ppdc tool of currently installed CUPS version
+	# run ppdc if it is present
+	@if test -f /usr/bin/ppdc; then \
+	    echo "ppdc is available so running it"; \
+		mkdir -p ppd; \
+		ppdc KodakESP_14.drv; \
+		ppdc KodakESP_C_05.drv; \
+	fi
+
+	#
+	# work around a bug in CUPS ppdc 1.4.x for "8x10" format by post-editing PPD files
+	#
+	for i in ppd/*.ppd ; do \
+	    mv $$i $$i.orig ; \
+	    sed '1,$$s/8 x 10"/8x10/g' $$i.orig > $$i ; \
+	done
+	rm ppd/*.orig
+
+	#
 	# Install PPD files for CUPS
 	#
 	$(INSTALL) -d -m 755 $(PPDDIR)
+	rm -f $(PPDDIR)/*.ppd
 	    cd ppd; \
-	    for ppdfile in *.ppd; do echo $$ppdfile; \
+	    for ppdfile in *.ppd; do \
+	        echo $$ppdfile; \
 	    $(INSTALL) -c -m 644 $$ppdfile $(PPDDIR); \
 	    done;
 
@@ -303,11 +330,12 @@ uninstall:
 #
 # Clean
 #
-clean:
+clean: install-test
 	-rm -f $(PROGS) $(BINPROGS) $(SHELLS) $(FILTERS) $(DEVPROGS)
 	-rm -f *.o
 	-rm -f *~
-	-rm -f ppd/*~
+# Do not remove ppds, so that users without ppdc can install them
+#	-rm -f ppd/*
 	-rm -f *.tar.gz
 #	-rm -f $(MANPAGES) manual.pdf
 
@@ -322,12 +350,3 @@ myopldecode.o: jbig.h
 command2esp.o: c2espcommon.h
 c2espcommon.o: c2espcommon.h
 
-#
-#	PPD files
-#
-ppd: KodakESP_13.drv KodakESP_C_05.drv
-	#
-	# Generate PPD files using local tools
-	#
-	ppdc KodakESP_13.drv
-	ppdc KodakESP_C_05.drv
diff --git a/README b/README
index 017b515..27f20d2 100644
--- a/README
+++ b/README
@@ -5,10 +5,19 @@ Readme file for Kodak ESP series and Hero series cups driver.
 
 VERSION NOTES
 
+Version 2.5c
+	- As 2.5b but with patch from awl29 applied and some other mods. The problems with AIO 5100 5300 5500 seem to actually have been problems with cups caused by errors in the ppd files. Now these errors are fixed, so we expect to no longer have these problems. Reports of testing would be helpful.
+
+Version 2.5b
+	- As 2.5a but the DEBUGFILES and TESTING option system tidied up. Set these options in c2espcommon.h
+	- Added a test of the raster header. If the resolution values are not sensible, no data will be sent to the printer. THIS SHOULD MAKE TESTING THE AIO 5100 5300 5500 SAFER.
+
 Version 2.5a
+	- IT SEEMS THAT THIS VERSION MAY NOT WORK WITH THE AIO 5100 5300 5500 PRINTERS
 	- As 2.5 but the data chunk size limit was reinstated.
 
 Version 2.5
+	- IT SEEMS THAT THIS VERSION MAY NOT WORK WITH THE AIO 5100 5300 5500 PRINTERS
 	- The c2esp filter for the ESP series has been significantly rewritten to enable some ppd attributes like cupsInkLimit and cupsBlackGeneration.
 	- The grey ink is now used. This makes grey areas properly grey (less green than they used to be).
 	- Because of the grey ink and cupsInkLimit, ink cartridges should last longer.
diff --git a/README.in b/README.in
index 017b515..27f20d2 100644
--- a/README.in
+++ b/README.in
@@ -5,10 +5,19 @@ Readme file for Kodak ESP series and Hero series cups driver.
 
 VERSION NOTES
 
+Version 2.5c
+	- As 2.5b but with patch from awl29 applied and some other mods. The problems with AIO 5100 5300 5500 seem to actually have been problems with cups caused by errors in the ppd files. Now these errors are fixed, so we expect to no longer have these problems. Reports of testing would be helpful.
+
+Version 2.5b
+	- As 2.5a but the DEBUGFILES and TESTING option system tidied up. Set these options in c2espcommon.h
+	- Added a test of the raster header. If the resolution values are not sensible, no data will be sent to the printer. THIS SHOULD MAKE TESTING THE AIO 5100 5300 5500 SAFER.
+
 Version 2.5a
+	- IT SEEMS THAT THIS VERSION MAY NOT WORK WITH THE AIO 5100 5300 5500 PRINTERS
 	- As 2.5 but the data chunk size limit was reinstated.
 
 Version 2.5
+	- IT SEEMS THAT THIS VERSION MAY NOT WORK WITH THE AIO 5100 5300 5500 PRINTERS
 	- The c2esp filter for the ESP series has been significantly rewritten to enable some ppd attributes like cupsInkLimit and cupsBlackGeneration.
 	- The grey ink is now used. This makes grey areas properly grey (less green than they used to be).
 	- Because of the grey ink and cupsInkLimit, ink cartridges should last longer.
diff --git a/c2esp.c b/c2esp.c
index 1f1c107..a233d47 100644
--- a/c2esp.c
+++ b/c2esp.c
@@ -3,7 +3,7 @@
  *   Kodak ESP 5xxx (OPL?) Control Language filter for the  Common UNIX
  *   Printing System (CUPS)
  *
- *  copyright Paul Newall May 2010 - July 2012. VERSION 2.5a (c2esp25a) 
+ *  copyright Paul Newall May 2010 - July 2012. VERSION 2.5b (c2esp25b) 
  *  patch by user awl29 applied to fix problems with non bi-directional printers, smb shared
  *  data chunk size limit applied
  *
@@ -17,6 +17,7 @@ the JBIG library by Markus Kuhn
 The ESP printers can print in black and white mode or in colour.
 With resolutions 300 or 600 dpi.
 
+If you want to compile with the DEBUGFILES or TESTING options, they should be set in c2espcommon.h
 */
 
 #define MAXJBIGDATACHUNK 65511 /* some printers can't handle more than 65K at a time */
@@ -35,7 +36,7 @@ With resolutions 300 or 600 dpi.
 /*
  * Constants...
  */
-char	*Version = "c2esp25a";
+char	*Version = "c2esp25b";
 int StripeHeightMax = 1280; //the max height of a stripe. (Windows 300x1200 files have 1920)
 const float	default_lut2[2] = {0.0, 1.0}; // for colour 1 bit
 const float	default_lut3[3] = {0.0, 0.5, 1.0}; // for colour 2 bit or for black and grey will be separated to 2 x 1 bit
@@ -946,6 +947,10 @@ main(int  argc,	char *argv[])		/* I - Number of command-line arguments, Command-
                 DoBack = 0;
         }
 
+#if TESTING == 1
+	DoBack = 0; //If testing never ask for replies
+#endif
+
 #if DEBUGFILES == 1
 	SetupLogging("c2esp",DoBack,LogFileName);
 #else
@@ -955,6 +960,7 @@ main(int  argc,	char *argv[])		/* I - Number of command-line arguments, Command-
   	setbuf(stderr, NULL);
       	fprintf(stderr, ("DEBUG:  ================ %s ====================================\n"),Version); 
 	DoLogString("Starting %s\n",Version);
+        DoLog("Compiled with DEBUGFILES = %d, TESTING = %d\n", DEBUGFILES, TESTING);
         
         DoLog("Number of command line parameters: %d\n", argc, 0);
         for (argi = 0; argi < argc; argi++) DoLogString("  param: '%s'\n", argv[argi]);
@@ -986,7 +992,7 @@ main(int  argc,	char *argv[])		/* I - Number of command-line arguments, Command-
   * Set up the colour separation system
   * 
   */
-      	DoLog("opening ppd\n",0,0); 
+      	DoLogString("opening ppd %s\n",getenv("PPD")); 
   	ppd = ppdOpenFile(getenv("PPD"));
 	if(ppd)
 	{
@@ -1032,6 +1038,14 @@ main(int  argc,	char *argv[])		/* I - Number of command-line arguments, Command-
 	if(cupsRasterReadHeader2(ras, &header) == 1)
 	{
 		DoLog("First page Header read after %d sec\n", time(NULL)-StartTime,0);
+
+/* Check header for validity */
+		if(HeaderInvalid(&header) == 1) 
+		{
+			Canceled = 1;
+ 		}
+		else
+		{
 		if(header.HWResolution[0] == 300) OutBitsPerPixel = 1; 
 		else OutBitsPerPixel = 2;
 
@@ -1039,6 +1053,7 @@ main(int  argc,	char *argv[])		/* I - Number of command-line arguments, Command-
 
 		SetupPrinter(&header);
 		DoLog("Printer should be ready now\n",0,0);
+		}
   /* 
   * Process pages as needed...
   */
diff --git a/c2espC.c b/c2espC.c
index 35fd654..8f40656 100644
--- a/c2espC.c
+++ b/c2espC.c
@@ -17,15 +17,16 @@ This filter is based loosely on c2esp
 
 #define MAXDATACHUNK 65511 /* it seems windows smb printer can't handle more than 65K at a time? maybe others too */
 
-#define DEBUGFILES 0 /* DEBUGFILES 1 creates files in /tmp to help debug 
+// debugfiles and testing are defined in c2espcommon.h because they are used in c2espcommon.c
+/* #define DEBUGFILES 0  DEBUGFILES 1 creates files in /tmp to help debug 
 Currently a large number of files:
 KodakPrintLog = text file showing progress of the filter
 RasForComp.pbm or ppm = the raster read from cups raster view with image viewer.
 KodakUncompressed = The binary page data before compression.
 KodakCompPage = The zlib compressed page data
 KodakPrintFile = The data that is sent to the printer
-*/
-#define TESTING 0 /* TESTING 1 suppresses the output to the printer. Used in development. */
+
+#define TESTING 0 TESTING 1 suppresses the output to the printer. Used in development. */
 
 #include <cups/raster.h>
 #include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants
@@ -356,6 +357,7 @@ main(int  argc,	char *argv[])		/* I - Number of command-line arguments, Command-
   	setbuf(stderr, NULL);
 	fprintf(stderr, ("DEBUG:  ================= %s ===================================\n"),Version); 
 	DoLogString("Starting %s\n",Version);
+        DoLog("Compiled with DEBUGFILES = %d, TESTING = %d\n", DEBUGFILES, TESTING);
         
 	DoLog("Number of command line parameters: %d\n", argc, 0);
 	int argi;
diff --git a/c2espcommon.c b/c2espcommon.c
index 0962855..4b23062 100644
--- a/c2espcommon.c
+++ b/c2espcommon.c
@@ -388,4 +388,16 @@ DisplayHeader(cups_page_header2_t *header)
   DoLog("cupsCompression = %d\n", header->cupsCompression,0);
 }
 
+int 
+HeaderInvalid(cups_page_header2_t *header)
+{
+/* checks the header has sensible values and returns 1 if they are not sensible */
+
+	if(header->HWResolution[0] != 300 && header->HWResolution[0] != 600) 
+	{
+		DoLog("Header error:  x resolution %d\n",header->HWResolution[0],0);
+		return 1;
+	}
+	return 0;
+}
 
diff --git a/c2espcommon.h b/c2espcommon.h
index 923700c..64b697b 100644
--- a/c2espcommon.h
+++ b/c2espcommon.h
@@ -66,3 +66,7 @@ void DisplayHeader(cups_page_header2_t *header);
   * Show page device dictionary in stderr and LogFile
   */
 
+int HeaderInvalid(cups_page_header2_t *header);
+/* checks the header has sensible values and returns 1 if they are not sensible */
+
+
diff --git a/ppd/Kodak_ESP_32xx_Series.ppd b/ppd/Kodak_ESP_32xx_Series.ppd
index 8ee6ebc..3514693 100644
--- a/ppd/Kodak_ESP_32xx_Series.ppd
+++ b/ppd/Kodak_ESP_32xx_Series.ppd
@@ -106,10 +106,10 @@
 *OpenUI *Resolution/Resolution: PickOne
 *OrderDependency: 20 AnySetup *Resolution
 *DefaultResolution: 600x1200dpi
-*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8/>>setpagedevice"
-*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8/>>setpagedevice"
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
 *CloseUI: *Resolution
-*OpenUI *ColorModel/Color Mode: PickOne
+*OpenUI *ColorModel/ColorModel: PickOne
 *OrderDependency: 10 AnySetup *ColorModel
 *DefaultColorModel: RGB
 *ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
@@ -151,4 +151,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of KESP32xx.ppd, 07766 bytes.
+*% End of KESP32xx.ppd, 07764 bytes.
diff --git a/ppd/Kodak_ESP_51xx_Series.ppd b/ppd/Kodak_ESP_51xx_Series.ppd
new file mode 100644
index 0000000..d929383
--- /dev/null
+++ b/ppd/Kodak_ESP_51xx_Series.ppd
@@ -0,0 +1,168 @@
+*PPD-Adobe: "4.3"
+*%%%% PPD file for Kodak 5100 AiO with CUPS.
+*%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
+*% Copyright 2011-2012 by Paul Newall
+*FormatVersion: "4.3"
+*FileVersion: "1.4"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PCFileName: "KESP51xx.ppd"
+*Product: "(Kodak 5100 AiO)"
+*Manufacturer: "Kodak"
+*ModelName: "Kodak 5100 AiO"
+*ShortNickName: "Kodak 5100 AiO"
+*NickName: "Kodak 5100 AiO"
+*PSVersion: "(3010.000) 0"
+*LanguageLevel: "3"
+*ColorDevice: True
+*DefaultColorSpace: CMYK
+*FileSystem: False
+*Throughput: "8"
+*LandscapeOrientation: Plus90
+*TTRasterizer: Type42
+*% Driver-defined attributes...
+*cupsSNMPSupplies: False
+*cupsCommands: "Clean PrintSelfTestPage PrintAlignmentPage ReportLevels"
+*cupsInkChannels: "4"
+*cupsInkLimit: "2.0"
+*cupsBlackGeneration: "0.0 0.0"
+*marker-colors: "black magenta"
+*1284DeviceID: "MFG:Eastman Kodak Company;MDL:KODAK 5100 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+*cupsBackSide: "Rotated"
+*cupsVersion: 1.4
+*cupsModelNumber: 5100
+*cupsManualCopies: True
+*cupsFilter: "application/vnd.cups-raster 50 /usr/lib/cups/filter/c2esp"
+*cupsFilter: "application/vnd.cups-command 50 /usr/lib/cups/filter/command2esp"
+*cupsColorProfile 300x1200dpi/-: "1 1 1 0 0 -0.10000000149 1 0 0 -0.300000011921 1"
+*cupsColorProfile 600x1200dpi/-: "1 1.399999976158 1 -0.10000000149 0 -0.10000000149 1 0 0 -0.40000000596 1"
+*cupsLanguages: "en"
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageSize A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageSize A6/A6: "<</PageSize[297 420]/ImagingBBox null>>setpagedevice"
+*PageSize 8x10/8 x 10: "<</PageSize[576 720]/ImagingBBox null>>setpagedevice"
+*PageSize Photo4x6/Photo: "<</PageSize[288 432]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize DL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/Envelope #10 : "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageRegion A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageRegion A6/A6: "<</PageSize[297 420]/ImagingBBox null>>setpagedevice"
+*PageRegion 8x10/8 x 10: "<</PageSize[576 720]/ImagingBBox null>>setpagedevice"
+*PageRegion Photo4x6/Photo: "<</PageSize[288 432]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion DL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+*DefaultImageableArea: A4
+*ImageableArea Executive/Executive: "3 3 519 753"
+*ImageableArea Letter/US Letter: "3 3 609 789"
+*ImageableArea Legal/US Legal: "3 3 609 1005"
+*ImageableArea A4/A4: "3 3 592 839"
+*ImageableArea A5/A5: "3 3 417 592"
+*ImageableArea A6/A6: "3 3 294 417"
+*ImageableArea 8x10/8 x 10: "3 3 573 717"
+*ImageableArea Photo4x6/Photo: "3 3 285 429"
+*ImageableArea EnvISOB5/Envelope B5: "3 3 496 706"
+*ImageableArea EnvC5/Envelope C5: "3 3 456 646"
+*ImageableArea DL/Envelope DL: "3 3 309 621"
+*ImageableArea Env10/Envelope #10 : "3 3 294 681"
+*DefaultPaperDimension: A4
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension Letter/US Letter: "612 792"
+*PaperDimension Legal/US Legal: "612 1008"
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension A6/A6: "297 420"
+*PaperDimension 8x10/8 x 10: "576 720"
+*PaperDimension Photo4x6/Photo: "288 432"
+*PaperDimension EnvISOB5/Envelope B5: "499 709"
+*PaperDimension EnvC5/Envelope C5: "459 649"
+*PaperDimension DL/Envelope DL: "312 624"
+*PaperDimension Env10/Envelope #10 : "297 684"
+*MaxMediaWidth: "1080"
+*MaxMediaHeight: "86400"
+*HWMargins: 3 3 3 3
+*CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice"
+*ParamCustomPageSize Width: 1 points 36 1080
+*ParamCustomPageSize Height: 2 points 36 86400
+*ParamCustomPageSize WidthOffset: 3 points 0 0
+*ParamCustomPageSize HeightOffset: 4 points 0 0
+*ParamCustomPageSize Orientation: 5 int 0 0
+*OpenUI *Resolution/Resolution: PickOne
+*OrderDependency: 20 AnySetup *Resolution
+*DefaultResolution: 600x1200dpi
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
+*CloseUI: *Resolution
+*OpenUI *ColorModel/ColorModel: PickOne
+*OrderDependency: 10 AnySetup *ColorModel
+*DefaultColorModel: RGB
+*ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
+*ColorModel Gray/BlackAndWhite: "<</cupsColorSpace 3/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
+*CloseUI: *ColorModel
+*OpenUI *Duplex/2-Sided Printing: PickOne
+*OrderDependency: 10 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/Off (1-Sided): "<</Duplex false>>setpagedevice"
+*Duplex DuplexNoTumble/Long-Edge (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
+*Duplex DuplexTumble/Short-Edge (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
+*CloseUI: *Duplex
+*OpenUI *InputSlot/Media Source: PickOne
+*OrderDependency: 10 AnySetup *InputSlot
+*DefaultInputSlot: MainTray
+*InputSlot MainTray/MainTray: "<</MediaPosition 0>>setpagedevice"
+*InputSlot PhotoTray/PhotoTray: "<</MediaPosition 1>>setpagedevice"
+*CloseUI: *InputSlot
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(1.05)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(1.05)" Standard ROM
+*Font AvantGarde-Demi: Standard "(1.05)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(1.05)" Standard ROM
+*Font Bookman-Demi: Standard "(1.05)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(1.05)" Standard ROM
+*Font Bookman-Light: Standard "(1.05)" Standard ROM
+*Font Bookman-LightItalic: Standard "(1.05)" Standard ROM
+*Font Courier: Standard "(1.05)" Standard ROM
+*Font Courier-Bold: Standard "(1.05)" Standard ROM
+*Font Courier-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Courier-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica: Standard "(1.05)" Standard ROM
+*Font Helvetica-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Oblique: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(1.05)" Standard ROM
+*Font Palatino-Bold: Standard "(1.05)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Palatino-Italic: Standard "(1.05)" Standard ROM
+*Font Palatino-Roman: Standard "(1.05)" Standard ROM
+*Font Symbol: Special "(001.005)" Special ROM
+*Font Times-Bold: Standard "(1.05)" Standard ROM
+*Font Times-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Times-Italic: Standard "(1.05)" Standard ROM
+*Font Times-Roman: Standard "(1.05)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
+*Font ZapfDingbats: Special "(001.005)" Special ROM
+*% End of KESP51xx.ppd, 08358 bytes.
diff --git a/ppd/Kodak_ESP_52xx_Series.ppd b/ppd/Kodak_ESP_52xx_Series.ppd
index 7aa544f..091d9c0 100644
--- a/ppd/Kodak_ESP_52xx_Series.ppd
+++ b/ppd/Kodak_ESP_52xx_Series.ppd
@@ -106,10 +106,10 @@
 *OpenUI *Resolution/Resolution: PickOne
 *OrderDependency: 20 AnySetup *Resolution
 *DefaultResolution: 600x1200dpi
-*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8/>>setpagedevice"
-*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8/>>setpagedevice"
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
 *CloseUI: *Resolution
-*OpenUI *ColorModel/Color Mode: PickOne
+*OpenUI *ColorModel/ColorModel: PickOne
 *OrderDependency: 10 AnySetup *ColorModel
 *DefaultColorModel: RGB
 *ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
@@ -151,4 +151,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of KESP52xx.ppd, 07766 bytes.
+*% End of KESP52xx.ppd, 07764 bytes.
diff --git a/ppd/Kodak_ESP_53xx_Series.ppd b/ppd/Kodak_ESP_53xx_Series.ppd
new file mode 100644
index 0000000..ecbc166
--- /dev/null
+++ b/ppd/Kodak_ESP_53xx_Series.ppd
@@ -0,0 +1,168 @@
+*PPD-Adobe: "4.3"
+*%%%% PPD file for Kodak 5300 AiO with CUPS.
+*%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
+*% Copyright 2011-2012 by Paul Newall
+*FormatVersion: "4.3"
+*FileVersion: "1.4"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PCFileName: "KESP53xx.ppd"
+*Product: "(Kodak 5300 AiO)"
+*Manufacturer: "Kodak"
+*ModelName: "Kodak 5300 AiO"
+*ShortNickName: "Kodak 5300 AiO"
+*NickName: "Kodak 5300 AiO"
+*PSVersion: "(3010.000) 0"
+*LanguageLevel: "3"
+*ColorDevice: True
+*DefaultColorSpace: CMYK
+*FileSystem: False
+*Throughput: "8"
+*LandscapeOrientation: Plus90
+*TTRasterizer: Type42
+*% Driver-defined attributes...
+*cupsSNMPSupplies: False
+*cupsCommands: "Clean PrintSelfTestPage PrintAlignmentPage ReportLevels"
+*cupsInkChannels: "4"
+*cupsInkLimit: "2.0"
+*cupsBlackGeneration: "0.0 0.0"
+*marker-colors: "black magenta"
+*1284DeviceID: "MFG:Eastman Kodak Company;MDL:KODAK 5300 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+*cupsBackSide: "Rotated"
+*cupsVersion: 1.4
+*cupsModelNumber: 5300
+*cupsManualCopies: True
+*cupsFilter: "application/vnd.cups-raster 50 /usr/lib/cups/filter/c2esp"
+*cupsFilter: "application/vnd.cups-command 50 /usr/lib/cups/filter/command2esp"
+*cupsColorProfile 300x1200dpi/-: "1 1 1 0 0 -0.10000000149 1 0 0 -0.300000011921 1"
+*cupsColorProfile 600x1200dpi/-: "1 1.399999976158 1 -0.10000000149 0 -0.10000000149 1 0 0 -0.40000000596 1"
+*cupsLanguages: "en"
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageSize A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageSize A6/A6: "<</PageSize[297 420]/ImagingBBox null>>setpagedevice"
+*PageSize 8x10/8 x 10: "<</PageSize[576 720]/ImagingBBox null>>setpagedevice"
+*PageSize Photo4x6/Photo: "<</PageSize[288 432]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize DL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/Envelope #10 : "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageRegion A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageRegion A6/A6: "<</PageSize[297 420]/ImagingBBox null>>setpagedevice"
+*PageRegion 8x10/8 x 10: "<</PageSize[576 720]/ImagingBBox null>>setpagedevice"
+*PageRegion Photo4x6/Photo: "<</PageSize[288 432]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion DL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+*DefaultImageableArea: A4
+*ImageableArea Executive/Executive: "3 3 519 753"
+*ImageableArea Letter/US Letter: "3 3 609 789"
+*ImageableArea Legal/US Legal: "3 3 609 1005"
+*ImageableArea A4/A4: "3 3 592 839"
+*ImageableArea A5/A5: "3 3 417 592"
+*ImageableArea A6/A6: "3 3 294 417"
+*ImageableArea 8x10/8 x 10: "3 3 573 717"
+*ImageableArea Photo4x6/Photo: "3 3 285 429"
+*ImageableArea EnvISOB5/Envelope B5: "3 3 496 706"
+*ImageableArea EnvC5/Envelope C5: "3 3 456 646"
+*ImageableArea DL/Envelope DL: "3 3 309 621"
+*ImageableArea Env10/Envelope #10 : "3 3 294 681"
+*DefaultPaperDimension: A4
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension Letter/US Letter: "612 792"
+*PaperDimension Legal/US Legal: "612 1008"
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension A6/A6: "297 420"
+*PaperDimension 8x10/8 x 10: "576 720"
+*PaperDimension Photo4x6/Photo: "288 432"
+*PaperDimension EnvISOB5/Envelope B5: "499 709"
+*PaperDimension EnvC5/Envelope C5: "459 649"
+*PaperDimension DL/Envelope DL: "312 624"
+*PaperDimension Env10/Envelope #10 : "297 684"
+*MaxMediaWidth: "1080"
+*MaxMediaHeight: "86400"
+*HWMargins: 3 3 3 3
+*CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice"
+*ParamCustomPageSize Width: 1 points 36 1080
+*ParamCustomPageSize Height: 2 points 36 86400
+*ParamCustomPageSize WidthOffset: 3 points 0 0
+*ParamCustomPageSize HeightOffset: 4 points 0 0
+*ParamCustomPageSize Orientation: 5 int 0 0
+*OpenUI *Resolution/Resolution: PickOne
+*OrderDependency: 20 AnySetup *Resolution
+*DefaultResolution: 600x1200dpi
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
+*CloseUI: *Resolution
+*OpenUI *ColorModel/ColorModel: PickOne
+*OrderDependency: 10 AnySetup *ColorModel
+*DefaultColorModel: RGB
+*ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
+*ColorModel Gray/BlackAndWhite: "<</cupsColorSpace 3/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
+*CloseUI: *ColorModel
+*OpenUI *Duplex/2-Sided Printing: PickOne
+*OrderDependency: 10 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/Off (1-Sided): "<</Duplex false>>setpagedevice"
+*Duplex DuplexNoTumble/Long-Edge (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
+*Duplex DuplexTumble/Short-Edge (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
+*CloseUI: *Duplex
+*OpenUI *InputSlot/Media Source: PickOne
+*OrderDependency: 10 AnySetup *InputSlot
+*DefaultInputSlot: MainTray
+*InputSlot MainTray/MainTray: "<</MediaPosition 0>>setpagedevice"
+*InputSlot PhotoTray/PhotoTray: "<</MediaPosition 1>>setpagedevice"
+*CloseUI: *InputSlot
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(1.05)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(1.05)" Standard ROM
+*Font AvantGarde-Demi: Standard "(1.05)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(1.05)" Standard ROM
+*Font Bookman-Demi: Standard "(1.05)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(1.05)" Standard ROM
+*Font Bookman-Light: Standard "(1.05)" Standard ROM
+*Font Bookman-LightItalic: Standard "(1.05)" Standard ROM
+*Font Courier: Standard "(1.05)" Standard ROM
+*Font Courier-Bold: Standard "(1.05)" Standard ROM
+*Font Courier-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Courier-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica: Standard "(1.05)" Standard ROM
+*Font Helvetica-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Oblique: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(1.05)" Standard ROM
+*Font Palatino-Bold: Standard "(1.05)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Palatino-Italic: Standard "(1.05)" Standard ROM
+*Font Palatino-Roman: Standard "(1.05)" Standard ROM
+*Font Symbol: Special "(001.005)" Special ROM
+*Font Times-Bold: Standard "(1.05)" Standard ROM
+*Font Times-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Times-Italic: Standard "(1.05)" Standard ROM
+*Font Times-Roman: Standard "(1.05)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
+*Font ZapfDingbats: Special "(001.005)" Special ROM
+*% End of KESP53xx.ppd, 08358 bytes.
diff --git a/ppd/Kodak_ESP_55xx_Series.ppd b/ppd/Kodak_ESP_55xx_Series.ppd
index 1d3f30a..02168a5 100644
--- a/ppd/Kodak_ESP_55xx_Series.ppd
+++ b/ppd/Kodak_ESP_55xx_Series.ppd
@@ -1,5 +1,5 @@
 *PPD-Adobe: "4.3"
-*%%%% PPD file for Kodak ESP 5500 Series AiO with CUPS.
+*%%%% PPD file for Kodak 5500 AiO with CUPS.
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% Copyright 2011-2012 by Paul Newall
 *FormatVersion: "4.3"
@@ -7,11 +7,11 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "KESP55xx.ppd"
-*Product: "(Kodak ESP 5500 Series AiO)"
+*Product: "(Kodak 5500 AiO)"
 *Manufacturer: "Kodak"
-*ModelName: "Kodak ESP 5500 Series AiO"
-*ShortNickName: "Kodak ESP 5500 Series AiO"
-*NickName: "Kodak ESP 5500"
+*ModelName: "Kodak 5500 AiO"
+*ShortNickName: "Kodak 5500 AiO"
+*NickName: "Kodak 5500 AiO"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
@@ -27,7 +27,7 @@
 *cupsInkLimit: "2.0"
 *cupsBlackGeneration: "0.0 0.0"
 *marker-colors: "black magenta"
-*1284DeviceID: "MFG:Eastman Kodak Company;MDL:KODAK ESP 5500 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+*1284DeviceID: "MFG:Eastman Kodak Company;MDL:KODAK 5500 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
 *cupsBackSide: "Rotated"
 *cupsVersion: 1.4
 *cupsModelNumber: 5500
@@ -107,10 +107,10 @@
 *OpenUI *Resolution/Resolution: PickOne
 *OrderDependency: 20 AnySetup *Resolution
 *DefaultResolution: 600x1200dpi
-*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8/>>setpagedevice"
-*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8/>>setpagedevice"
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
 *CloseUI: *Resolution
-*OpenUI *ColorModel/Color Mode: PickOne
+*OpenUI *ColorModel/ColorModel: PickOne
 *OrderDependency: 10 AnySetup *ColorModel
 *DefaultColorModel: RGB
 *ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
@@ -123,6 +123,12 @@
 *Duplex DuplexNoTumble/Long-Edge (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
 *Duplex DuplexTumble/Short-Edge (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
 *CloseUI: *Duplex
+*OpenUI *InputSlot/Media Source: PickOne
+*OrderDependency: 10 AnySetup *InputSlot
+*DefaultInputSlot: MainTray
+*InputSlot MainTray/MainTray: "<</MediaPosition 0>>setpagedevice"
+*InputSlot PhotoTray/PhotoTray: "<</MediaPosition 1>>setpagedevice"
+*CloseUI: *InputSlot
 *DefaultFont: Courier
 *Font AvantGarde-Book: Standard "(1.05)" Standard ROM
 *Font AvantGarde-BookOblique: Standard "(1.05)" Standard ROM
@@ -159,4 +165,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of KESP55xx.ppd, 08150 bytes.
+*% End of KESP55xx.ppd, 08358 bytes.
diff --git a/ppd/Kodak_ESP_61xx_Series.ppd b/ppd/Kodak_ESP_61xx_Series.ppd
index 32e0964..737abaa 100644
--- a/ppd/Kodak_ESP_61xx_Series.ppd
+++ b/ppd/Kodak_ESP_61xx_Series.ppd
@@ -1,5 +1,5 @@
 *PPD-Adobe: "4.3"
-*%%%% PPD file for Kodak ESP 6100 Series AiO with CUPS.
+*%%%% PPD file for Kodak ESP Office 6100 Series AiO with CUPS.
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% Copyright 2011-2012 by Paul Newall
 *FormatVersion: "4.3"
@@ -7,11 +7,11 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "KESP61xx.ppd"
-*Product: "(Kodak ESP 6100 Series AiO)"
+*Product: "(Kodak ESP Office 6100 Series AiO)"
 *Manufacturer: "Kodak"
-*ModelName: "Kodak ESP 6100 Series AiO"
-*ShortNickName: "Kodak ESP 6100 Series AiO"
-*NickName: "Kodak ESP 6100"
+*ModelName: "Kodak ESP Office 6100 Series AiO"
+*ShortNickName: "Kodak ESP Office 6100 Series AiO"
+*NickName: "Kodak ESP Office 6100"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
@@ -27,7 +27,7 @@
 *cupsInkLimit: "2.0"
 *cupsBlackGeneration: "0.0 0.0"
 *marker-colors: "black magenta"
-*1284DeviceID: "MFG:Eastman Kodak Company;MDL:KODAK ESP 6100 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+*1284DeviceID: "MFG:Eastman Kodak Company;MDL:KODAK ESP Office 6100 Series AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
 *cupsBackSide: "Rotated"
 *cupsVersion: 1.4
 *cupsModelNumber: 6150
@@ -107,10 +107,10 @@
 *OpenUI *Resolution/Resolution: PickOne
 *OrderDependency: 20 AnySetup *Resolution
 *DefaultResolution: 600x1200dpi
-*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8/>>setpagedevice"
-*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8/>>setpagedevice"
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
 *CloseUI: *Resolution
-*OpenUI *ColorModel/Color Mode: PickOne
+*OpenUI *ColorModel/ColorModel: PickOne
 *OrderDependency: 10 AnySetup *ColorModel
 *DefaultColorModel: RGB
 *ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
@@ -159,4 +159,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of KESP61xx.ppd, 08150 bytes.
+*% End of KESP61xx.ppd, 08190 bytes.
diff --git a/ppd/Kodak_ESP_72xx_Series.ppd b/ppd/Kodak_ESP_72xx_Series.ppd
index cd1e172..7f781e9 100644
--- a/ppd/Kodak_ESP_72xx_Series.ppd
+++ b/ppd/Kodak_ESP_72xx_Series.ppd
@@ -107,10 +107,10 @@
 *OpenUI *Resolution/Resolution: PickOne
 *OrderDependency: 20 AnySetup *Resolution
 *DefaultResolution: 600x1200dpi
-*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8/>>setpagedevice"
-*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8/>>setpagedevice"
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
 *CloseUI: *Resolution
-*OpenUI *ColorModel/Color Mode: PickOne
+*OpenUI *ColorModel/ColorModel: PickOne
 *OrderDependency: 10 AnySetup *ColorModel
 *DefaultColorModel: RGB
 *ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
@@ -165,4 +165,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of KESP72xx.ppd, 08415 bytes.
+*% End of KESP72xx.ppd, 08413 bytes.
diff --git a/ppd/Kodak_ESP_9.ppd b/ppd/Kodak_ESP_9.ppd
new file mode 100644
index 0000000..68451bc
--- /dev/null
+++ b/ppd/Kodak_ESP_9.ppd
@@ -0,0 +1,168 @@
+*PPD-Adobe: "4.3"
+*%%%% PPD file for Kodak ESP 9 AiO with CUPS.
+*%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
+*% Copyright 2011-2012 by Paul Newall
+*FormatVersion: "4.3"
+*FileVersion: "1.4"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PCFileName: "KESP9.ppd"
+*Product: "(Kodak ESP 9 AiO)"
+*Manufacturer: "Kodak"
+*ModelName: "Kodak ESP 9 AiO"
+*ShortNickName: "Kodak ESP 9 AiO"
+*NickName: "Kodak ESP 9"
+*PSVersion: "(3010.000) 0"
+*LanguageLevel: "3"
+*ColorDevice: True
+*DefaultColorSpace: CMYK
+*FileSystem: False
+*Throughput: "8"
+*LandscapeOrientation: Plus90
+*TTRasterizer: Type42
+*% Driver-defined attributes...
+*cupsSNMPSupplies: False
+*cupsCommands: "Clean PrintSelfTestPage PrintAlignmentPage ReportLevels"
+*cupsInkChannels: "4"
+*cupsInkLimit: "2.0"
+*cupsBlackGeneration: "0.0 0.0"
+*marker-colors: "black magenta"
+*1284DeviceID: "MFG:Eastman Kodak Company;MDL:KODAK ESP 9 AiO;CMD:OPL V1.00;CLS:PRINTER;DES:AIO;VER:1.00;"
+*cupsBackSide: "Rotated"
+*cupsVersion: 1.4
+*cupsModelNumber: 9
+*cupsManualCopies: True
+*cupsFilter: "application/vnd.cups-raster 50 /usr/lib/cups/filter/c2esp"
+*cupsFilter: "application/vnd.cups-command 50 /usr/lib/cups/filter/command2esp"
+*cupsColorProfile 300x1200dpi/-: "1 1 1 0 0 -0.10000000149 1 0 0 -0.300000011921 1"
+*cupsColorProfile 600x1200dpi/-: "1 1.399999976158 1 -0.10000000149 0 -0.10000000149 1 0 0 -0.40000000596 1"
+*cupsLanguages: "en"
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageSize A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageSize A6/A6: "<</PageSize[297 420]/ImagingBBox null>>setpagedevice"
+*PageSize 8x10/8 x 10: "<</PageSize[576 720]/ImagingBBox null>>setpagedevice"
+*PageSize Photo4x6/Photo: "<</PageSize[288 432]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize DL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/Envelope #10 : "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageRegion A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice"
+*PageRegion A6/A6: "<</PageSize[297 420]/ImagingBBox null>>setpagedevice"
+*PageRegion 8x10/8 x 10: "<</PageSize[576 720]/ImagingBBox null>>setpagedevice"
+*PageRegion Photo4x6/Photo: "<</PageSize[288 432]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion DL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+*DefaultImageableArea: A4
+*ImageableArea Executive/Executive: "3 3 519 753"
+*ImageableArea Letter/US Letter: "3 3 609 789"
+*ImageableArea Legal/US Legal: "3 3 609 1005"
+*ImageableArea A4/A4: "3 3 592 839"
+*ImageableArea A5/A5: "3 3 417 592"
+*ImageableArea A6/A6: "3 3 294 417"
+*ImageableArea 8x10/8 x 10: "3 3 573 717"
+*ImageableArea Photo4x6/Photo: "3 3 285 429"
+*ImageableArea EnvISOB5/Envelope B5: "3 3 496 706"
+*ImageableArea EnvC5/Envelope C5: "3 3 456 646"
+*ImageableArea DL/Envelope DL: "3 3 309 621"
+*ImageableArea Env10/Envelope #10 : "3 3 294 681"
+*DefaultPaperDimension: A4
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension Letter/US Letter: "612 792"
+*PaperDimension Legal/US Legal: "612 1008"
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension A6/A6: "297 420"
+*PaperDimension 8x10/8 x 10: "576 720"
+*PaperDimension Photo4x6/Photo: "288 432"
+*PaperDimension EnvISOB5/Envelope B5: "499 709"
+*PaperDimension EnvC5/Envelope C5: "459 649"
+*PaperDimension DL/Envelope DL: "312 624"
+*PaperDimension Env10/Envelope #10 : "297 684"
+*MaxMediaWidth: "1080"
+*MaxMediaHeight: "86400"
+*HWMargins: 3 3 3 3
+*CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice"
+*ParamCustomPageSize Width: 1 points 36 1080
+*ParamCustomPageSize Height: 2 points 36 86400
+*ParamCustomPageSize WidthOffset: 3 points 0 0
+*ParamCustomPageSize HeightOffset: 4 points 0 0
+*ParamCustomPageSize Orientation: 5 int 0 0
+*OpenUI *Resolution/Resolution: PickOne
+*OrderDependency: 20 AnySetup *Resolution
+*DefaultResolution: 600x1200dpi
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
+*CloseUI: *Resolution
+*OpenUI *ColorModel/ColorModel: PickOne
+*OrderDependency: 10 AnySetup *ColorModel
+*DefaultColorModel: RGB
+*ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
+*ColorModel Gray/BlackAndWhite: "<</cupsColorSpace 3/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
+*CloseUI: *ColorModel
+*OpenUI *Duplex/2-Sided Printing: PickOne
+*OrderDependency: 10 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/Off (1-Sided): "<</Duplex false>>setpagedevice"
+*Duplex DuplexNoTumble/Long-Edge (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
+*Duplex DuplexTumble/Short-Edge (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
+*CloseUI: *Duplex
+*OpenUI *InputSlot/Media Source: PickOne
+*OrderDependency: 10 AnySetup *InputSlot
+*DefaultInputSlot: MainTray
+*InputSlot MainTray/MainTray: "<</MediaPosition 0>>setpagedevice"
+*InputSlot PhotoTray/PhotoTray: "<</MediaPosition 1>>setpagedevice"
+*CloseUI: *InputSlot
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(1.05)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(1.05)" Standard ROM
+*Font AvantGarde-Demi: Standard "(1.05)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(1.05)" Standard ROM
+*Font Bookman-Demi: Standard "(1.05)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(1.05)" Standard ROM
+*Font Bookman-Light: Standard "(1.05)" Standard ROM
+*Font Bookman-LightItalic: Standard "(1.05)" Standard ROM
+*Font Courier: Standard "(1.05)" Standard ROM
+*Font Courier-Bold: Standard "(1.05)" Standard ROM
+*Font Courier-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Courier-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica: Standard "(1.05)" Standard ROM
+*Font Helvetica-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(1.05)" Standard ROM
+*Font Helvetica-Oblique: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(1.05)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(1.05)" Standard ROM
+*Font Palatino-Bold: Standard "(1.05)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Palatino-Italic: Standard "(1.05)" Standard ROM
+*Font Palatino-Roman: Standard "(1.05)" Standard ROM
+*Font Symbol: Special "(001.005)" Special ROM
+*Font Times-Bold: Standard "(1.05)" Standard ROM
+*Font Times-BoldItalic: Standard "(1.05)" Standard ROM
+*Font Times-Italic: Standard "(1.05)" Standard ROM
+*Font Times-Roman: Standard "(1.05)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
+*Font ZapfDingbats: Special "(001.005)" Special ROM
+*% End of KESP9.ppd, 08351 bytes.
diff --git a/ppd/Kodak_ESP_92xx_Series.ppd b/ppd/Kodak_ESP_92xx_Series.ppd
index f857ea4..3741e1b 100644
--- a/ppd/Kodak_ESP_92xx_Series.ppd
+++ b/ppd/Kodak_ESP_92xx_Series.ppd
@@ -107,10 +107,10 @@
 *OpenUI *Resolution/Resolution: PickOne
 *OrderDependency: 20 AnySetup *Resolution
 *DefaultResolution: 600x1200dpi
-*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8/>>setpagedevice"
-*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8/>>setpagedevice"
+*Resolution 300x1200dpi/300x1200: "<</HWResolution[300 1200]/cupsBitsPerColor 8>>setpagedevice"
+*Resolution 600x1200dpi/600x1200: "<</HWResolution[600 1200]/cupsBitsPerColor 8>>setpagedevice"
 *CloseUI: *Resolution
-*OpenUI *ColorModel/Color Mode: PickOne
+*OpenUI *ColorModel/ColorModel: PickOne
 *OrderDependency: 10 AnySetup *ColorModel
 *DefaultColorModel: RGB
 *ColorModel RGB/Color: "<</cupsColorSpace 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
@@ -165,4 +165,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of KESP92xx.ppd, 08415 bytes.
+*% End of KESP92xx.ppd, 08413 bytes.