Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@279 a1ca3aef-8c08-0410-bb20-df032aa958be

28 files changed, 1621 insertions, 544 deletions

diff --git a/filter/Dependencies b/filter/Dependencies
index 867919f09..7e7b6a9b1 100644
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -1,447 +1,393 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-hpgl-attr.o: hpgl-attr.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-config.o: hpgl-config.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-main.o: hpgl-main.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-prolog.o: hpgl-prolog.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-char.o: hpgl-char.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-input.o: hpgl-input.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-polygon.o: hpgl-polygon.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-vector.o: hpgl-vector.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-image-bmp.o: image-bmp.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-colorspace.o: image-colorspace.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-gif.o: image-gif.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-jpeg.o: image-jpeg.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-photocd.o: image-photocd.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-pix.o: image-pix.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-png.o: image-png.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-pnm.o: image-pnm.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-sgi.o: image-sgi.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h image-sgi.h
-image-sgilib.o: image-sgilib.c image-sgi.h
-image-sun.o: image-sun.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-tiff.o: image-tiff.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-zoom.o: image-zoom.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image.o: image.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-interpret.o: interpret.c ../cups/string.h ../config.h image-private.h \
-  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/debug.h
-raster.o: raster.c raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
-form-main.o: form-main.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-form-ps.o: form-ps.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-form-tree.o: form-tree.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-gziptoany.o: gziptoany.c ../cups/string.h ../config.h
-imagetops.o: imagetops.c common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h image.h raster.h
-imagetoraster.o: imagetoraster.c common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstops.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h \
-  ../cups/file.h ../cups/array.h
-rasterbench.o: rasterbench.c raster.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h
-rastertoepson.o: rastertoepson.c ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/ppd.h ../cups/string.h \
-  ../config.h raster.h
-rastertohp.o: rastertohp.c ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/string.h ../config.h raster.h
-rastertolabel.o: rastertolabel.c ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/string.h ../config.h raster.h
-testimage.o: testimage.c image.h raster.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h
-testraster.o: testraster.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-textcommon.o: textcommon.c textcommon.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-texttops.o: texttops.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-hpgl-attr.32.o: hpgl-attr.c  hpgl-attr.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-config.32.o: hpgl-config.c  hpgl-config.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-main.32.o: hpgl-main.c  hpgl-main.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-prolog.32.o: hpgl-prolog.c  hpgl-prolog.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-char.32.o: hpgl-char.c  hpgl-char.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-input.32.o: hpgl-input.c  hpgl-input.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-polygon.32.o: hpgl-polygon.c  hpgl-polygon.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-vector.32.o: hpgl-vector.c  hpgl-vector.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-image-bmp.32.o: image-bmp.c  image-bmp.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-colorspace.32.o: image-colorspace.c  image-colorspace.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-gif.32.o: image-gif.c  image-gif.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-jpeg.32.o: image-jpeg.c  image-jpeg.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-photocd.32.o: image-photocd.c  image-photocd.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-pix.32.o: image-pix.c  image-pix.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-png.32.o: image-png.c  image-png.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-pnm.32.o: image-pnm.c  image-pnm.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-sgi.32.o: image-sgi.c  image-sgi.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h image-sgi.h
-image-sgilib.32.o: image-sgilib.c  image-sgilib.c image-sgi.h
-image-sun.32.o: image-sun.c  image-sun.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-tiff.32.o: image-tiff.c  image-tiff.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-zoom.32.o: image-zoom.c  image-zoom.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image.32.o: image.c  image.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-interpret.32.o: interpret.c  interpret.c ../cups/string.h ../config.h image-private.h \
-  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/debug.h
-raster.32.o: raster.c  raster.c raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
-form-main.32.o: form-main.c  form-main.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-form-ps.32.o: form-ps.c  form-ps.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-form-tree.32.o: form-tree.c  form-tree.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-gziptoany.32.o: gziptoany.c  gziptoany.c ../cups/string.h ../config.h
-imagetops.32.o: imagetops.c  imagetops.c common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h image.h raster.h
-imagetoraster.32.o: imagetoraster.c  imagetoraster.c common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.32.o: common.c  common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstops.32.o: pstops.c  pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h \
-  ../cups/file.h ../cups/array.h
-rasterbench.32.o: rasterbench.c  rasterbench.c raster.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h
-rastertoepson.32.o: rastertoepson.c  rastertoepson.c ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/ppd.h ../cups/string.h \
-  ../config.h raster.h
-rastertohp.32.o: rastertohp.c  rastertohp.c ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/string.h ../config.h raster.h
-rastertolabel.32.o: rastertolabel.c  rastertolabel.c ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/string.h ../config.h raster.h
-testimage.32.o: testimage.c  testimage.c image.h raster.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h
-testraster.32.o: testraster.c  testraster.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-textcommon.32.o: textcommon.c  textcommon.c textcommon.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-texttops.32.o: texttops.c  texttops.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-hpgl-attr.64.o: hpgl-attr.c  hpgl-attr.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-config.64.o: hpgl-config.c  hpgl-config.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-main.64.o: hpgl-main.c  hpgl-main.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-prolog.64.o: hpgl-prolog.c  hpgl-prolog.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-char.64.o: hpgl-char.c  hpgl-char.c hpgltops.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-hpgl-input.64.o: hpgl-input.c  hpgl-input.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-polygon.64.o: hpgl-polygon.c  hpgl-polygon.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-hpgl-vector.64.o: hpgl-vector.c  hpgl-vector.c hpgltops.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-image-bmp.64.o: image-bmp.c  image-bmp.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-colorspace.64.o: image-colorspace.c  image-colorspace.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-gif.64.o: image-gif.c  image-gif.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-jpeg.64.o: image-jpeg.c  image-jpeg.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-photocd.64.o: image-photocd.c  image-photocd.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-pix.64.o: image-pix.c  image-pix.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-png.64.o: image-png.c  image-png.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-pnm.64.o: image-pnm.c  image-pnm.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-sgi.64.o: image-sgi.c  image-sgi.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h image-sgi.h
-image-sgilib.64.o: image-sgilib.c  image-sgilib.c image-sgi.h
-image-sun.64.o: image-sun.c  image-sun.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-tiff.64.o: image-tiff.c  image-tiff.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image-zoom.64.o: image-zoom.c  image-zoom.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-image.64.o: image.c  image.c image-private.h image.h raster.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-interpret.64.o: interpret.c  interpret.c ../cups/string.h ../config.h image-private.h \
-  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/debug.h
-raster.64.o: raster.c  raster.c raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
-form-main.64.o: form-main.c  form-main.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-form-ps.64.o: form-ps.c  form-ps.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-form-tree.64.o: form-tree.c  form-tree.c form.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
-gziptoany.64.o: gziptoany.c  gziptoany.c ../cups/string.h ../config.h
-imagetops.64.o: imagetops.c  imagetops.c common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h image.h raster.h
-imagetoraster.64.o: imagetoraster.c  imagetoraster.c common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.64.o: common.c  common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstops.64.o: pstops.c  pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h \
-  ../cups/file.h ../cups/array.h
-rasterbench.64.o: rasterbench.c  rasterbench.c raster.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h
-rastertoepson.64.o: rastertoepson.c  rastertoepson.c ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/ppd.h ../cups/string.h \
-  ../config.h raster.h
-rastertohp.64.o: rastertohp.c  rastertohp.c ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/string.h ../config.h raster.h
-rastertolabel.64.o: rastertolabel.c  rastertolabel.c ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/string.h ../config.h raster.h
-testimage.64.o: testimage.c  testimage.c image.h raster.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h
-testraster.64.o: testraster.c  testraster.c image-private.h image.h raster.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/string.h ../config.h
-textcommon.64.o: textcommon.c  textcommon.c textcommon.h common.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/language.h \
-  ../cups/string.h ../config.h
-texttops.64.o: texttops.c  texttops.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/language.h ../cups/string.h \
-  ../config.h
+# DO NOT DELETE
+
+hpgl-attr.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-attr.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-attr.o: ../cups/language.h ../cups/string.h ../config.h
+hpgl-config.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-config.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-config.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-config.o: ../config.h
+hpgl-main.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-main.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-main.o: ../cups/language.h ../cups/string.h ../config.h
+hpgl-prolog.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-prolog.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-prolog.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-prolog.o: ../config.h
+hpgl-char.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-char.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-char.o: ../cups/language.h ../cups/string.h ../config.h
+hpgl-input.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-input.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-input.o: ../cups/language.h ../cups/string.h ../config.h
+hpgl-polygon.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-polygon.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-polygon.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-polygon.o: ../config.h
+hpgl-vector.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-vector.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-vector.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-vector.o: ../config.h
+image-bmp.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-bmp.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-bmp.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-colorspace.o: image-private.h image.h raster.h ../cups/cups.h
+image-colorspace.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+image-colorspace.o: ../cups/array.h ../cups/file.h ../cups/language.h
+image-colorspace.o: ../cups/debug.h ../cups/string.h ../config.h
+image-gif.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-gif.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-gif.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-jpeg.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-jpeg.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-jpeg.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-photocd.o: image-private.h image.h raster.h ../cups/cups.h
+image-photocd.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+image-photocd.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+image-photocd.o: ../cups/string.h ../config.h
+image-pix.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-pix.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pix.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-png.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-png.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-png.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-pnm.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-pnm.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pnm.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-sgi.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sgi.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.o: image-sgi.h
+image-sgilib.o: image-sgi.h
+image-sun.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-sun.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sun.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-tiff.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-tiff.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-tiff.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-zoom.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-zoom.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-zoom.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+error.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+error.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+error.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+interpret.o: ../cups/string.h ../config.h image-private.h image.h raster.h
+interpret.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+interpret.o: ../cups/array.h ../cups/file.h ../cups/language.h
+interpret.o: ../cups/debug.h
+raster.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+raster.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+raster.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+form-main.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-main.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-main.o: ../cups/language.h ../cups/string.h ../config.h
+form-ps.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-ps.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-ps.o: ../cups/language.h ../cups/string.h ../config.h
+form-tree.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-tree.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-tree.o: ../cups/language.h ../cups/string.h ../config.h
+gziptoany.o: ../cups/string.h ../config.h
+imagetops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+imagetops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.o: ../cups/language.h ../cups/string.h ../config.h image.h raster.h
+imagetoraster.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+imagetoraster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.o: ../cups/language.h ../cups/language.h ../cups/string.h
+imagetoraster.o: ../config.h image-private.h image.h raster.h ../cups/debug.h
+common.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+common.o: ../cups/array.h ../cups/file.h ../cups/language.h
+common.o: ../cups/language.h ../cups/string.h ../config.h
+pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+pstops.o: ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.o: ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
+pstops.o: ../cups/array.h
+rasterbench.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rasterbench.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
+rasterbench.o: ../cups/language.h
+rastertoepson.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertoepson.o: ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.o: ../cups/ppd.h ../cups/string.h ../config.h raster.h
+rastertohp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertohp.o: ../cups/array.h ../cups/file.h ../cups/language.h
+rastertohp.o: ../cups/string.h ../config.h raster.h
+rastertolabel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertolabel.o: ../cups/array.h ../cups/file.h ../cups/language.h
+rastertolabel.o: ../cups/string.h ../config.h raster.h
+testimage.o: image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testimage.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testraster.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+testraster.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testraster.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+textcommon.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h
+textcommon.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+textcommon.o: ../cups/language.h ../cups/language.h ../cups/string.h
+textcommon.o: ../config.h
+texttops.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+texttops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.o: ../cups/language.h ../cups/string.h ../config.h
+# DO NOT DELETE
+
+hpgl-attr.32.o: hpgl-attr.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-attr.32.o: hpgl-attr.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-attr.32.o: hpgl-attr.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-config.32.o: hpgl-config.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-config.32.o: hpgl-config.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-config.32.o: hpgl-config.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-config.32.o: hpgl-config.c  ../config.h
+hpgl-main.32.o: hpgl-main.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-main.32.o: hpgl-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-main.32.o: hpgl-main.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-prolog.32.o: hpgl-prolog.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-prolog.32.o: hpgl-prolog.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-prolog.32.o: hpgl-prolog.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-prolog.32.o: hpgl-prolog.c  ../config.h
+hpgl-char.32.o: hpgl-char.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-char.32.o: hpgl-char.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-char.32.o: hpgl-char.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-input.32.o: hpgl-input.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-input.32.o: hpgl-input.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-input.32.o: hpgl-input.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-polygon.32.o: hpgl-polygon.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-polygon.32.o: hpgl-polygon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-polygon.32.o: hpgl-polygon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-polygon.32.o: hpgl-polygon.c  ../config.h
+hpgl-vector.32.o: hpgl-vector.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-vector.32.o: hpgl-vector.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-vector.32.o: hpgl-vector.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-vector.32.o: hpgl-vector.c  ../config.h
+image-bmp.32.o: image-bmp.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-bmp.32.o: image-bmp.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-bmp.32.o: image-bmp.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-colorspace.32.o: image-colorspace.c  image-private.h image.h raster.h ../cups/cups.h
+image-colorspace.32.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+image-colorspace.32.o: image-colorspace.c  ../cups/array.h ../cups/file.h ../cups/language.h
+image-colorspace.32.o: image-colorspace.c  ../cups/debug.h ../cups/string.h ../config.h
+image-gif.32.o: image-gif.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-gif.32.o: image-gif.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-gif.32.o: image-gif.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-jpeg.32.o: image-jpeg.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-jpeg.32.o: image-jpeg.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-jpeg.32.o: image-jpeg.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-photocd.32.o: image-photocd.c  image-private.h image.h raster.h ../cups/cups.h
+image-photocd.32.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+image-photocd.32.o: image-photocd.c  ../cups/file.h ../cups/language.h ../cups/debug.h
+image-photocd.32.o: image-photocd.c  ../cups/string.h ../config.h
+image-pix.32.o: image-pix.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-pix.32.o: image-pix.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pix.32.o: image-pix.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-png.32.o: image-png.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-png.32.o: image-png.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-png.32.o: image-png.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-pnm.32.o: image-pnm.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-pnm.32.o: image-pnm.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pnm.32.o: image-pnm.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.32.o: image-sgi.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-sgi.32.o: image-sgi.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sgi.32.o: image-sgi.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.32.o: image-sgi.c  image-sgi.h
+image-sgilib.32.o: image-sgilib.c  image-sgi.h
+image-sun.32.o: image-sun.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-sun.32.o: image-sun.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sun.32.o: image-sun.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-tiff.32.o: image-tiff.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-tiff.32.o: image-tiff.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-tiff.32.o: image-tiff.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-zoom.32.o: image-zoom.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-zoom.32.o: image-zoom.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-zoom.32.o: image-zoom.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image.32.o: image.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image.32.o: image.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image.32.o: image.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+error.32.o: error.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+error.32.o: error.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+error.32.o: error.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+interpret.32.o: interpret.c  ../cups/string.h ../config.h image-private.h image.h raster.h
+interpret.32.o: interpret.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+interpret.32.o: interpret.c  ../cups/array.h ../cups/file.h ../cups/language.h
+interpret.32.o: interpret.c  ../cups/debug.h
+raster.32.o: raster.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+raster.32.o: raster.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+raster.32.o: raster.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+form-main.32.o: form-main.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-main.32.o: form-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-main.32.o: form-main.c  ../cups/language.h ../cups/string.h ../config.h
+form-ps.32.o: form-ps.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-ps.32.o: form-ps.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-ps.32.o: form-ps.c  ../cups/language.h ../cups/string.h ../config.h
+form-tree.32.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-tree.32.o: form-tree.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-tree.32.o: form-tree.c  ../cups/language.h ../cups/string.h ../config.h
+gziptoany.32.o: gziptoany.c  ../cups/string.h ../config.h
+imagetops.32.o: imagetops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+imagetops.32.o: imagetops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.32.o: imagetops.c  ../cups/language.h ../cups/string.h ../config.h image.h raster.h
+imagetoraster.32.o: imagetoraster.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+imagetoraster.32.o: imagetoraster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.32.o: imagetoraster.c  ../cups/language.h ../cups/language.h ../cups/string.h
+imagetoraster.32.o: imagetoraster.c  ../config.h image-private.h image.h raster.h ../cups/debug.h
+common.32.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+common.32.o: common.c  ../cups/array.h ../cups/file.h ../cups/language.h
+common.32.o: common.c  ../cups/language.h ../cups/string.h ../config.h
+pstops.32.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+pstops.32.o: pstops.c  ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.32.o: pstops.c  ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
+pstops.32.o: pstops.c  ../cups/array.h
+rasterbench.32.o: rasterbench.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rasterbench.32.o: rasterbench.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
+rasterbench.32.o: rasterbench.c  ../cups/language.h
+rastertoepson.32.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertoepson.32.o: rastertoepson.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.32.o: rastertoepson.c  ../cups/ppd.h ../cups/string.h ../config.h raster.h
+rastertohp.32.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertohp.32.o: rastertohp.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertohp.32.o: rastertohp.c  ../cups/string.h ../config.h raster.h
+rastertolabel.32.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertolabel.32.o: rastertolabel.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertolabel.32.o: rastertolabel.c  ../cups/string.h ../config.h raster.h
+testimage.32.o: testimage.c  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testimage.32.o: testimage.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testraster.32.o: testraster.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+testraster.32.o: testraster.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testraster.32.o: testraster.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+textcommon.32.o: textcommon.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h
+textcommon.32.o: textcommon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+textcommon.32.o: textcommon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+textcommon.32.o: textcommon.c  ../config.h
+texttops.32.o: texttops.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+texttops.32.o: texttops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.32.o: texttops.c  ../cups/language.h ../cups/string.h ../config.h
+# DO NOT DELETE
+
+hpgl-attr.64.o: hpgl-attr.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-attr.64.o: hpgl-attr.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-attr.64.o: hpgl-attr.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-config.64.o: hpgl-config.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-config.64.o: hpgl-config.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-config.64.o: hpgl-config.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-config.64.o: hpgl-config.c  ../config.h
+hpgl-main.64.o: hpgl-main.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-main.64.o: hpgl-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-main.64.o: hpgl-main.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-prolog.64.o: hpgl-prolog.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-prolog.64.o: hpgl-prolog.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-prolog.64.o: hpgl-prolog.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-prolog.64.o: hpgl-prolog.c  ../config.h
+hpgl-char.64.o: hpgl-char.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-char.64.o: hpgl-char.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-char.64.o: hpgl-char.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-input.64.o: hpgl-input.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+hpgl-input.64.o: hpgl-input.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-input.64.o: hpgl-input.c  ../cups/language.h ../cups/string.h ../config.h
+hpgl-polygon.64.o: hpgl-polygon.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-polygon.64.o: hpgl-polygon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-polygon.64.o: hpgl-polygon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-polygon.64.o: hpgl-polygon.c  ../config.h
+hpgl-vector.64.o: hpgl-vector.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
+hpgl-vector.64.o: hpgl-vector.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-vector.64.o: hpgl-vector.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-vector.64.o: hpgl-vector.c  ../config.h
+image-bmp.64.o: image-bmp.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-bmp.64.o: image-bmp.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-bmp.64.o: image-bmp.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-colorspace.64.o: image-colorspace.c  image-private.h image.h raster.h ../cups/cups.h
+image-colorspace.64.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+image-colorspace.64.o: image-colorspace.c  ../cups/array.h ../cups/file.h ../cups/language.h
+image-colorspace.64.o: image-colorspace.c  ../cups/debug.h ../cups/string.h ../config.h
+image-gif.64.o: image-gif.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-gif.64.o: image-gif.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-gif.64.o: image-gif.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-jpeg.64.o: image-jpeg.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-jpeg.64.o: image-jpeg.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-jpeg.64.o: image-jpeg.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-photocd.64.o: image-photocd.c  image-private.h image.h raster.h ../cups/cups.h
+image-photocd.64.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+image-photocd.64.o: image-photocd.c  ../cups/file.h ../cups/language.h ../cups/debug.h
+image-photocd.64.o: image-photocd.c  ../cups/string.h ../config.h
+image-pix.64.o: image-pix.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-pix.64.o: image-pix.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pix.64.o: image-pix.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-png.64.o: image-png.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-png.64.o: image-png.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-png.64.o: image-png.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-pnm.64.o: image-pnm.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-pnm.64.o: image-pnm.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pnm.64.o: image-pnm.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.64.o: image-sgi.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-sgi.64.o: image-sgi.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sgi.64.o: image-sgi.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.64.o: image-sgi.c  image-sgi.h
+image-sgilib.64.o: image-sgilib.c  image-sgi.h
+image-sun.64.o: image-sun.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-sun.64.o: image-sun.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sun.64.o: image-sun.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-tiff.64.o: image-tiff.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-tiff.64.o: image-tiff.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-tiff.64.o: image-tiff.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-zoom.64.o: image-zoom.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image-zoom.64.o: image-zoom.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-zoom.64.o: image-zoom.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image.64.o: image.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+image.64.o: image.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image.64.o: image.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+error.64.o: error.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+error.64.o: error.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+error.64.o: error.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+interpret.64.o: interpret.c  ../cups/string.h ../config.h image-private.h image.h raster.h
+interpret.64.o: interpret.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+interpret.64.o: interpret.c  ../cups/array.h ../cups/file.h ../cups/language.h
+interpret.64.o: interpret.c  ../cups/debug.h
+raster.64.o: raster.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+raster.64.o: raster.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+raster.64.o: raster.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+form-main.64.o: form-main.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-main.64.o: form-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-main.64.o: form-main.c  ../cups/language.h ../cups/string.h ../config.h
+form-ps.64.o: form-ps.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-ps.64.o: form-ps.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-ps.64.o: form-ps.c  ../cups/language.h ../cups/string.h ../config.h
+form-tree.64.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+form-tree.64.o: form-tree.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-tree.64.o: form-tree.c  ../cups/language.h ../cups/string.h ../config.h
+gziptoany.64.o: gziptoany.c  ../cups/string.h ../config.h
+imagetops.64.o: imagetops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+imagetops.64.o: imagetops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.64.o: imagetops.c  ../cups/language.h ../cups/string.h ../config.h image.h raster.h
+imagetoraster.64.o: imagetoraster.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+imagetoraster.64.o: imagetoraster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.64.o: imagetoraster.c  ../cups/language.h ../cups/language.h ../cups/string.h
+imagetoraster.64.o: imagetoraster.c  ../config.h image-private.h image.h raster.h ../cups/debug.h
+common.64.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+common.64.o: common.c  ../cups/array.h ../cups/file.h ../cups/language.h
+common.64.o: common.c  ../cups/language.h ../cups/string.h ../config.h
+pstops.64.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+pstops.64.o: pstops.c  ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.64.o: pstops.c  ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
+pstops.64.o: pstops.c  ../cups/array.h
+rasterbench.64.o: rasterbench.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rasterbench.64.o: rasterbench.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
+rasterbench.64.o: rasterbench.c  ../cups/language.h
+rastertoepson.64.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertoepson.64.o: rastertoepson.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.64.o: rastertoepson.c  ../cups/ppd.h ../cups/string.h ../config.h raster.h
+rastertohp.64.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertohp.64.o: rastertohp.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertohp.64.o: rastertohp.c  ../cups/string.h ../config.h raster.h
+rastertolabel.64.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertolabel.64.o: rastertolabel.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertolabel.64.o: rastertolabel.c  ../cups/string.h ../config.h raster.h
+testimage.64.o: testimage.c  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testimage.64.o: testimage.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testraster.64.o: testraster.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
+testraster.64.o: testraster.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testraster.64.o: testraster.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+textcommon.64.o: textcommon.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h
+textcommon.64.o: textcommon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+textcommon.64.o: textcommon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+textcommon.64.o: textcommon.c  ../config.h
+texttops.64.o: texttops.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+texttops.64.o: texttops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.64.o: texttops.c  ../cups/language.h ../cups/string.h ../config.h
diff --git a/filter/Makefile b/filter/Makefile
index ae7b7322f..f657bd185 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6158 2006-12-17 01:44:21Z mike $"
+# "$Id: Makefile 6315 2007-03-03 00:12:26Z mike $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -43,7 +43,7 @@ HPGLOBJS =	hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \
 IMAGEOBJS =	image-bmp.o image-colorspace.o image-gif.o image-jpeg.o \
 		image-photocd.o image-pix.o image-png.o image-pnm.o \
 		image-sgi.o image-sgilib.o image-sun.o image-tiff.o \
-		image-zoom.o image.o interpret.o raster.o
+		image-zoom.o image.o error.o interpret.o raster.o
 IMAGE32OBJS =	$(IMAGEOBJS:.o=.32.o)
 IMAGE64OBJS =	$(IMAGEOBJS:.o=.64.o)
 FORMOBJS =	form-attr.o form-main.o form-ps.o form-text.o form-tree.o
@@ -243,7 +243,7 @@ libcupsimage.2.dylib:	$(IMAGEOBJS)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 2.2.0 \
+		-current_version 2.3.0 \
 		-compatibility_version 2.0.0 \
 		$(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS) -lm
 	$(RM) libcupsimage.dylib
@@ -270,7 +270,7 @@ libcupsimage.la:       $(IMAGEOBJS)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
 		-L../cups $(LINKCUPS) \
-		-rpath $(LIBDIR) -version-info 2:2
+		-rpath $(LIBDIR) -version-info 2:3
 
 
 #
@@ -359,16 +359,16 @@ rastertohp:	rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 testraster:	testraster.o ../cups/libcups.a libcupsimage.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ testraster.o libcupsimage.a ../cups/libcups.a \
-		$(IMGLIBS) $(DSOLIBS) $(LIBS)
+		$(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) $(SSLLIBS) $(LIBGSSAPI)
 
 
 #
 # rasterbench
 #
 
-rasterbench:	rasterbench.o raster.o
+rasterbench:	rasterbench.o libcupsimage.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ rasterbench.o raster.o
+	$(CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS)
 
 
 #
@@ -389,5 +389,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6158 2006-12-17 01:44:21Z mike $".
+# End of "$Id: Makefile 6315 2007-03-03 00:12:26Z mike $".
 #
diff --git a/filter/common.c b/filter/common.c
index c60e0a517..5ec13118c 100644
--- a/filter/common.c
+++ b/filter/common.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: common.c 6003 2006-10-02 16:26:04Z mike $"
+ * "$Id: common.c 5997 2006-10-02 15:33:05Z mike $"
  *
  *   Common filter routines for the Common UNIX Printing System (CUPS).
  *
@@ -540,5 +540,5 @@ WriteTextComment(const char *name,	/* I - Comment name ("Title", etc.) */
 
 
 /*
- * End of "$Id: common.c 6003 2006-10-02 16:26:04Z mike $".
+ * End of "$Id: common.c 5997 2006-10-02 15:33:05Z mike $".
  */
diff --git a/filter/common.h b/filter/common.h
index 4ccf6b3a4..9e8bb5925 100644
--- a/filter/common.h
+++ b/filter/common.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: common.h 6003 2006-10-02 16:26:04Z mike $"
+ * "$Id: common.h 5997 2006-10-02 15:33:05Z mike $"
  *
  *   Common filter definitions for the Common UNIX Printing System (CUPS).
  *
@@ -89,5 +89,5 @@ extern void	WriteTextComment(const char *name, const char *value);
 
 
 /*
- * End of "$Id: common.h 6003 2006-10-02 16:26:04Z mike $".
+ * End of "$Id: common.h 5997 2006-10-02 15:33:05Z mike $".
  */
diff --git a/filter/error.c b/filter/error.c
new file mode 100644
index 000000000..6d68a6edb
--- /dev/null
+++ b/filter/error.c
@@ -0,0 +1,297 @@
+/*
+ * "$Id: error.c 6274 2007-02-13 21:05:28Z mike $"
+ *
+ *   Raster error handling for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   _cupsRasterAddError()   - Add an error message to the error buffer.
+ *   _cupsRasterClearError() - Clear the error buffer.
+ *   cupsRasterErrorString() - Return the last error from a raster function.
+ *   get_error_buffer()      - Return a pointer to thread local storage.
+ *   raster_init()           - Initialize error buffer once.
+ *   raster_destructor()     - Free memory allocated by get_error_buffer().
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image-private.h"
+#include <stdarg.h>
+
+
+/*
+ * Local structures...
+ */
+
+typedef struct _cups_raster_error_s	/**** Error buffer structure ****/
+{
+  char	*start,				/* Start of buffer */
+	*current,			/* Current position in buffer */
+	*end;				/* End of buffer */
+} _cups_raster_error_t;
+
+
+/*
+ * Local functions...
+ */
+
+static _cups_raster_error_t	*get_error_buffer(void);
+
+
+/*
+ * '_cupsRasterAddError()' - Add an error message to the error buffer.
+ */
+
+void
+_cupsRasterAddError(const char *f,	/* I - Printf-style error message */
+                    ...)		/* I - Additional arguments as needed */
+{
+  _cups_raster_error_t	*buf = get_error_buffer();
+					/* Error buffer */
+  va_list	ap;			/* Pointer to additional arguments */
+  char		s[2048];		/* Message string */
+  size_t	bytes;			/* Bytes in message string */
+
+
+  va_start(ap, f);
+  bytes = vsnprintf(s, sizeof(s), f, ap);
+  va_end(ap);
+
+  if (bytes <= 0)
+    return;
+
+  bytes ++;
+
+  if (bytes >= sizeof(s))
+    return;
+
+  if (bytes > (buf->end - buf->current))
+  {
+   /*
+    * Allocate more memory...
+    */
+
+    char	*temp;			/* New buffer */
+    size_t	size;			/* Size of buffer */
+
+
+    size = buf->end - buf->start + 2 * bytes + 1024;
+
+    if (buf->start)
+      temp = realloc(buf->start, size);
+    else
+      temp = malloc(size);
+
+    if (!temp)
+      return;
+
+   /*
+    * Update pointers...
+    */
+
+    buf->end     = temp + size;
+    buf->current = temp + (buf->current - buf->start);
+    buf->start   = temp;
+  }
+
+ /*
+  * Append the message to the end of the current string...
+  */
+
+  memcpy(buf->current, s, bytes);
+  buf->current += bytes - 1;
+}
+
+
+/*
+ * '_cupsRasterClearError()' - Clear the error buffer.
+ */
+
+void
+_cupsRasterClearError(void)
+{
+  _cups_raster_error_t	*buf = get_error_buffer();
+					/* Error buffer */
+
+
+  buf->current = buf->start;
+
+  if (buf->start)
+    *(buf->start) = '\0';
+}
+
+
+/*
+ * 'cupsRasterErrorString()' - Return the last error from a raster function.
+ *
+ * If there are no recent errors, NULL is returned.
+ *
+ * @since CUPS 1.3@
+ */
+
+const char *				/* O - Last error */
+cupsRasterErrorString(void)
+{
+  _cups_raster_error_t	*buf = get_error_buffer();
+					/* Error buffer */
+
+
+  if (buf->current == buf->start)
+    return (NULL);
+  else
+    return (buf->start);
+}
+
+
+#ifdef HAVE_PTHREAD_H
+/*
+ * Implement per-thread globals...
+ */
+
+#  include <pthread.h>
+
+
+/*
+ * Local globals...
+ */
+
+static pthread_key_t	raster_key = -1;
+					/* Thread local storage key */
+static pthread_once_t	raster_key_once = PTHREAD_ONCE_INIT;
+					/* One-time initialization object */
+
+
+/*
+ * Local functions...
+ */
+
+static void	raster_init(void);
+static void	raster_destructor(void *value);
+
+
+/*
+ * 'get_error_buffer()' - Return a pointer to thread local storage.
+ */
+
+_cups_raster_error_t *			/* O - Pointer to error buffer */
+get_error_buffer(void)
+{
+  _cups_raster_error_t *buf;		/* Pointer to error buffer */
+
+
+ /* 
+  * Initialize the global data exactly once...
+  */
+
+  DEBUG_printf(("get_error_buffer(): raster_key_once=%d\n",
+                raster_key_once));
+
+  pthread_once(&raster_key_once, raster_init);
+
+ /*
+  * See if we have allocated the data yet...
+  */
+
+  if ((buf = (_cups_raster_error_t *)pthread_getspecific(raster_key))
+          == NULL)
+  {
+    DEBUG_puts("get_error_buffer: allocating memory for thread...");
+
+   /*
+    * No, allocate memory as set the pointer for the key...
+    */
+
+    buf = calloc(1, sizeof(_cups_raster_error_t));
+    pthread_setspecific(raster_key, buf);
+
+    DEBUG_printf(("    buf=%p\n", buf));
+  }
+
+ /*
+  * Return the pointer to the data...
+  */
+
+  return (buf);
+}
+
+
+/*
+ * 'raster_init()' - Initialize error buffer once.
+ */
+
+static void
+raster_init(void)
+{
+  pthread_key_create(&raster_key, raster_destructor);
+
+  DEBUG_printf(("raster_init(): raster_key=%x(%u)\n", raster_key,
+                raster_key));
+}
+
+
+/*
+ * 'raster_destructor()' - Free memory allocated by get_error_buffer().
+ */
+
+static void
+raster_destructor(void *value)		/* I - Data to free */
+{
+  _cups_raster_error_t *buf = (_cups_raster_error_t *)value;
+					/* Error buffer */
+
+
+  DEBUG_printf(("raster_destructor(value=%p)\n", value));
+
+  if (buf->start)
+    free(buf->start);
+
+  free(value);
+}
+
+
+#else
+/*
+ * Implement static globals...
+ */
+
+/*
+ * 'get_error_buffer()' - Return a pointer to thread local storage.
+ */
+
+_cups_raster_error_t *			/* O - Pointer to error buffer */
+get_error_buffer(void)
+{
+  static _cups_raster_error_t buf = { 0, 0, 0 };
+					/* Error buffer */
+
+
+  return (&buf);
+}
+#endif /* HAVE_PTHREAD_H */
+
+
+/*
+ * End of "$Id: error.c 6274 2007-02-13 21:05:28Z mike $".
+ */
diff --git a/filter/hpgl-prolog.c b/filter/hpgl-prolog.c
index bfd079f87..20b1a1d01 100644
--- a/filter/hpgl-prolog.c
+++ b/filter/hpgl-prolog.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-prolog.c 6003 2006-10-02 16:26:04Z mike $"
+ * "$Id: hpgl-prolog.c 5997 2006-10-02 15:33:05Z mike $"
  *
  *   HP-GL/2 prolog routines for for the Common UNIX Printing System (CUPS).
  *
@@ -373,5 +373,5 @@ Outputf(const char *format,	/* I - Printf-style string */
 
 
 /*
- * End of "$Id: hpgl-prolog.c 6003 2006-10-02 16:26:04Z mike $".
+ * End of "$Id: hpgl-prolog.c 5997 2006-10-02 15:33:05Z mike $".
  */
diff --git a/filter/image-bmp.c b/filter/image-bmp.c
index dab979a65..1dc524763 100644
--- a/filter/image-bmp.c
+++ b/filter/image-bmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-bmp.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-bmp.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   BMP image routines for the Common UNIX Printing System (CUPS).
  *
@@ -535,5 +535,5 @@ read_long(FILE *fp)               /* I - File to read from */
 
 
 /*
- * End of "$Id: image-bmp.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-bmp.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/image-colorspace.c b/filter/image-colorspace.c
index 2cb4ced01..cc442944e 100644
--- a/filter/image-colorspace.c
+++ b/filter/image-colorspace.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $"
+ * "$Id: image-colorspace.c 5520 2006-05-12 16:37:36Z mike $"
  *
  *   Colorspace conversions for the Common UNIX Printing System (CUPS).
  *
@@ -1573,5 +1573,5 @@ zshear(float mat[3][3],			/* I - Matrix */
 
 
 /*
- * End of "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $".
+ * End of "$Id: image-colorspace.c 5520 2006-05-12 16:37:36Z mike $".
  */
diff --git a/filter/image-gif.c b/filter/image-gif.c
index b56dd0c88..09784a60e 100644
--- a/filter/image-gif.c
+++ b/filter/image-gif.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-gif.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-gif.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   GIF image routines for the Common UNIX Printing System (CUPS).
  *
@@ -695,5 +695,5 @@ gif_read_lzw(FILE *fp,			/* I - File to read from */
 
 
 /*
- * End of "$Id: image-gif.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-gif.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/image-jpeg.c b/filter/image-jpeg.c
index 7db80ae1f..5a07a7bbd 100644
--- a/filter/image-jpeg.c
+++ b/filter/image-jpeg.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-jpeg.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-jpeg.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   JPEG image routines for the Common UNIX Printing System (CUPS).
  *
@@ -320,5 +320,5 @@ _cupsImageReadJPEG(
 
 
 /*
- * End of "$Id: image-jpeg.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-jpeg.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/image-photocd.c b/filter/image-photocd.c
index 195f0da39..00171ecc1 100644
--- a/filter/image-photocd.c
+++ b/filter/image-photocd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-photocd.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-photocd.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   PhotoCD routines for the Common UNIX Printing System (CUPS).
  *
@@ -313,5 +313,5 @@ _cupsImageReadPhotoCD(
 
 
 /*
- * End of "$Id: image-photocd.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-photocd.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/image-pix.c b/filter/image-pix.c
index 64e595623..ac471669d 100644
--- a/filter/image-pix.c
+++ b/filter/image-pix.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-pix.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-pix.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   Alias PIX image routines for the Common UNIX Printing System (CUPS).
  *
@@ -232,5 +232,5 @@ read_short(FILE *fp)			/* I - File to read from */
 
 
 /*
- * End of "$Id: image-pix.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-pix.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/image-png.c b/filter/image-png.c
index 97cbfc13f..3b4469bc9 100644
--- a/filter/image-png.c
+++ b/filter/image-png.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-png.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-png.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   PNG image routines for the Common UNIX Printing System (CUPS).
  *
@@ -280,5 +280,5 @@ _cupsImageReadPNG(
 
 
 /*
- * End of "$Id: image-png.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-png.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/image-pnm.c b/filter/image-pnm.c
index b418f68e3..12c294c1c 100644
--- a/filter/image-pnm.c
+++ b/filter/image-pnm.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-pnm.c 6149 2006-12-06 20:25:42Z mike $"
+ * "$Id: image-pnm.c 6146 2006-12-06 20:19:52Z mike $"
  *
  *   Portable Any Map file routines for the Common UNIX Printing System (CUPS).
  *
@@ -301,5 +301,5 @@ _cupsImageReadPNM(
 
 
 /*
- * End of "$Id: image-pnm.c 6149 2006-12-06 20:25:42Z mike $".
+ * End of "$Id: image-pnm.c 6146 2006-12-06 20:19:52Z mike $".
  */
diff --git a/filter/image-private.h b/filter/image-private.h
index f84ace850..c91b1834c 100644
--- a/filter/image-private.h
+++ b/filter/image-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-private.h 6158 2006-12-17 01:44:21Z mike $"
+ * "$Id: image-private.h 6274 2007-02-13 21:05:28Z mike $"
  *
  *   Private image library definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -217,10 +217,11 @@ extern cups_izoom_t	*_cupsImageZoomNew(cups_image_t *img, int xc0, int yc0,
 extern int		_cupsRasterExecPS(cups_page_header2_t *h,
 			                  int *preferred_bits,
 			                  const char *code);
-
+extern void		_cupsRasterAddError(const char *f, ...);
+extern void		_cupsRasterClearError(void);
 
 #endif /* !_CUPS_IMAGE_PRIVATE_H_ */
 
 /*
- * End of "$Id: image-private.h 6158 2006-12-17 01:44:21Z mike $".
+ * End of "$Id: image-private.h 6274 2007-02-13 21:05:28Z mike $".
  */
diff --git a/filter/image-sgi.c b/filter/image-sgi.c
index 234868512..288af2618 100644
--- a/filter/image-sgi.c
+++ b/filter/image-sgi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-sgi.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-sgi.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   SGI image file routines for the Common UNIX Printing System (CUPS).
  *
@@ -279,5 +279,5 @@ _cupsImageReadSGI(
 
 
 /*
- * End of "$Id: image-sgi.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-sgi.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/image-sun.c b/filter/image-sun.c
index bcc354a8f..c8ee70278 100644
--- a/filter/image-sun.c
+++ b/filter/image-sun.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-sun.c 6149 2006-12-06 20:25:42Z mike $"
+ * "$Id: image-sun.c 6147 2006-12-06 20:21:46Z mike $"
  *
  *   Sun Raster image file routines for the Common UNIX Printing System (CUPS).
  *
@@ -389,5 +389,5 @@ read_unsigned(FILE *fp)			/* I - File to read from */
 
 
 /*
- * End of "$Id: image-sun.c 6149 2006-12-06 20:25:42Z mike $".
+ * End of "$Id: image-sun.c 6147 2006-12-06 20:21:46Z mike $".
  */
diff --git a/filter/image-tiff.c b/filter/image-tiff.c
index 223324bbf..184cf9621 100644
--- a/filter/image-tiff.c
+++ b/filter/image-tiff.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-tiff.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id: image-tiff.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   TIFF file routines for the Common UNIX Printing System (CUPS).
  *
@@ -1720,5 +1720,5 @@ _cupsImageReadTIFF(
 
 
 /*
- * End of "$Id: image-tiff.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id: image-tiff.c 5508 2006-05-11 11:41:16Z mike $".
  */
diff --git a/filter/imagetops.c b/filter/imagetops.c
index 666a91453..ed8761064 100644
--- a/filter/imagetops.c
+++ b/filter/imagetops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: imagetops.c 6003 2006-10-02 16:26:04Z mike $"
+ * "$Id: imagetops.c 5997 2006-10-02 15:33:05Z mike $"
  *
  *   Image file to PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -1063,5 +1063,5 @@ ps_ascii85(cups_ib_t *data,		/* I - Data to print */
 
 
 /*
- * End of "$Id: imagetops.c 6003 2006-10-02 16:26:04Z mike $".
+ * End of "$Id: imagetops.c 5997 2006-10-02 15:33:05Z mike $".
  */
diff --git a/filter/imagetoraster.c b/filter/imagetoraster.c
index 32bc9a7c7..db9298231 100644
--- a/filter/imagetoraster.c
+++ b/filter/imagetoraster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: imagetoraster.c 5522 2006-05-15 05:02:15Z mike $"
+ * "$Id: imagetoraster.c 5523 2006-05-15 05:02:43Z mike $"
  *
  *   Image file to raster filter for the Common UNIX Printing System (CUPS).
  *
@@ -4310,5 +4310,5 @@ raster_cb(
 
 
 /*
- * End of "$Id: imagetoraster.c 5522 2006-05-15 05:02:15Z mike $".
+ * End of "$Id: imagetoraster.c 5523 2006-05-15 05:02:43Z mike $".
  */
diff --git a/filter/interpret.c b/filter/interpret.c
index 6f9c9f855..f3c092d92 100644
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: interpret.c 6282 2007-02-14 16:33:54Z mike $"
+ * "$Id: interpret.c 6281 2007-02-14 16:32:42Z mike $"
  *
  *   PPD command interpreter for the Common UNIX Printing System (CUPS).
  *
@@ -31,6 +31,9 @@
  *   cleartomark_stack()      - Clear to the last mark ([) on the stack.
  *   copy_stack()             - Copy the top N stack objects.
  *   delete_stack()           - Free memory used by a stack.
+ *   error_object()           - Add an object's value to the current error
+ *                              message.
+ *   error_stack()            - Add a stack to the current error message.
  *   index_stack()            - Copy the Nth value on the stack.
  *   new_stack()              - Create a new stack.
  *   pop_stock()              - Pop the top object off the stack.
@@ -107,6 +110,8 @@ typedef struct
 static int		cleartomark_stack(_cups_ps_stack_t *st);
 static int		copy_stack(_cups_ps_stack_t *st, int count);
 static void		delete_stack(_cups_ps_stack_t *st);
+static void		error_object(_cups_ps_obj_t *obj);
+static void		error_stack(_cups_ps_stack_t *st, const char *title);
 static _cups_ps_obj_t	*index_stack(_cups_ps_stack_t *st, int n);
 static _cups_ps_stack_t	*new_stack(void);
 static _cups_ps_obj_t	*pop_stack(_cups_ps_stack_t *st);
@@ -167,8 +172,13 @@ cupsRasterInterpretPPD(
   * Range check input...
   */
 
+  _cupsRasterClearError();
+
   if (!h)
+  {
+    _cupsRasterAddError("Page header cannot be NULL!\n");
     return (-1);
+  }
 
  /*
   * Reset the page header to the defaults...
@@ -304,7 +314,10 @@ cupsRasterInterpretPPD(
   */
 
   if (func && (*func)(h, preferred_bits))
+  {
+    _cupsRasterAddError("Page header callback returned error.\n");
     return (-1);
+  }
 
  /*
   * Check parameters...
@@ -317,7 +330,10 @@ cupsRasterInterpretPPD(
        h->cupsBitsPerColor != 16) ||
       h->cupsBorderlessScalingFactor < 0.5 ||
       h->cupsBorderlessScalingFactor > 2.0)
+  {
+    _cupsRasterAddError("Page header uses unsupported values.\n");
     return (-1);
+  }
 
  /*
   * Compute the bitmap parameters...
@@ -431,10 +447,14 @@ _cupsRasterExecPS(
   */
 
   if ((codecopy = strdup(code)) == NULL)
+  {
+    _cupsRasterAddError("Unable to duplicate code string.\n");
     return (-1);
+  }
 
   if ((st = new_stack()) == NULL)
   {
+    _cupsRasterAddError("Unable to create stack.\n");
     free(codecopy);
     return (-1);
   }
@@ -462,7 +482,8 @@ _cupsRasterExecPS(
       case CUPS_PS_CLEARTOMARK :
           pop_stack(st);
 
-	  cleartomark_stack(st);
+	  if (cleartomark_stack(st))
+	    _cupsRasterAddError("cleartomark: Stack underflow!\n");
 
 #ifdef DEBUG
           fputs("    dup: ", stdout);
@@ -554,6 +575,7 @@ _cupsRasterExecPS(
 	  break;
 
       case CUPS_PS_OTHER :
+          _cupsRasterAddError("Unknown operator \"%s\"!\n", obj->value.other);
           DEBUG_printf(("    Unknown operator \"%s\"!\n", obj->value.other));
           break;
     }
@@ -570,6 +592,8 @@ _cupsRasterExecPS(
 
   if (st->num_objs > 0)
   {
+    error_stack(st, "Stack not empty:");
+
 #ifdef DEBUG
     fputs("    Stack not empty:", stdout);
     DEBUG_stack(st);
@@ -653,6 +677,122 @@ delete_stack(_cups_ps_stack_t *st)	/* I - Stack */
 
 
 /*
+ * 'error_object()' - Add an object's value to the current error message.
+ */
+
+static void
+error_object(_cups_ps_obj_t *obj)	/* I - Object to add */
+{
+  switch (obj->type)
+  {
+    case CUPS_PS_NAME :
+	_cupsRasterAddError(" /%s", obj->value.name);
+	break;
+
+    case CUPS_PS_NUMBER :
+	_cupsRasterAddError(" %g", obj->value.number);
+	break;
+
+    case CUPS_PS_STRING :
+	_cupsRasterAddError(" (%s)", obj->value.string);
+	break;
+
+    case CUPS_PS_BOOLEAN :
+	if (obj->value.boolean)
+	  _cupsRasterAddError(" true");
+	else
+	  _cupsRasterAddError(" false");
+	break;
+
+    case CUPS_PS_NULL :
+	_cupsRasterAddError(" null");
+	break;
+
+    case CUPS_PS_START_ARRAY :
+	_cupsRasterAddError(" [");
+	break;
+
+    case CUPS_PS_END_ARRAY :
+	_cupsRasterAddError(" ]");
+	break;
+
+    case CUPS_PS_START_DICT :
+	_cupsRasterAddError(" <<");
+	break;
+
+    case CUPS_PS_END_DICT :
+	_cupsRasterAddError(" >>");
+	break;
+
+    case CUPS_PS_START_PROC :
+	_cupsRasterAddError(" {");
+	break;
+
+    case CUPS_PS_END_PROC :
+	_cupsRasterAddError(" }");
+	break;
+
+    case CUPS_PS_COPY :
+	_cupsRasterAddError(" --copy--");
+        break;
+
+    case CUPS_PS_CLEARTOMARK :
+	_cupsRasterAddError(" --cleartomark--");
+        break;
+
+    case CUPS_PS_DUP :
+	_cupsRasterAddError(" --dup--");
+        break;
+
+    case CUPS_PS_INDEX :
+	_cupsRasterAddError(" --index--");
+        break;
+
+    case CUPS_PS_POP :
+	_cupsRasterAddError(" --pop--");
+        break;
+
+    case CUPS_PS_ROLL :
+	_cupsRasterAddError(" --roll--");
+        break;
+
+    case CUPS_PS_SETPAGEDEVICE :
+	_cupsRasterAddError(" --setpagedevice--");
+        break;
+
+    case CUPS_PS_STOPPED :
+	_cupsRasterAddError(" --stopped--");
+        break;
+
+    case CUPS_PS_OTHER :
+	_cupsRasterAddError(" --%s--", obj->value.other);
+	break;
+  }
+}
+
+
+/*
+ * 'error_stack()' - Add a stack to the current error message...
+ */
+
+static void
+error_stack(_cups_ps_stack_t *st,	/* I - Stack */
+            const char       *title)	/* I - Title string */
+{
+  int			c;		/* Looping var */
+  _cups_ps_obj_t	*obj;		/* Current object on stack */
+
+
+  _cupsRasterAddError(title);
+
+  for (obj = st->objs, c = st->num_objs; c > 0; c --, obj ++)
+    error_object(obj);
+
+  _cupsRasterAddError("\n");
+}
+
+
+/*
  * 'index_stack()' - Copy the Nth value on the stack.
  */
 
@@ -1500,5 +1640,5 @@ DEBUG_stack(_cups_ps_stack_t *st)	/* I - Stack */
 
 
 /*
- * End of "$Id: interpret.c 6282 2007-02-14 16:33:54Z mike $".
+ * End of "$Id: interpret.c 6281 2007-02-14 16:32:42Z mike $".
  */
diff --git a/filter/pstops.c b/filter/pstops.c
index f81fcdda3..c7ee6fcaf 100644
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c 6247 2007-02-07 20:54:37Z mike $"
+ * "$Id: pstops.c 6320 2007-03-08 13:36:56Z mike $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -937,14 +937,21 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
         ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);
 
 	puts("%!PS-Adobe-3.0");
-	
-        pageinfo = (pstops_page_t *)cupsArrayFirst(doc->pages);
-	copy_bytes(doc->temp, 0, pageinfo->offset);
 
 	number = 0;
       }
 
      /*
+      * Copy the prolog as needed...
+      */
+
+      if (!number)
+      {
+        pageinfo = (pstops_page_t *)cupsArrayFirst(doc->pages);
+	copy_bytes(doc->temp, 0, pageinfo->offset);
+      }
+
+     /*
       * Then copy all of the pages...
       */
 
@@ -3281,5 +3288,5 @@ write_labels(pstops_doc_t *doc,		/* I - Document information */
 
 
 /*
- * End of "$Id: pstops.c 6247 2007-02-07 20:54:37Z mike $".
+ * End of "$Id: pstops.c 6320 2007-03-08 13:36:56Z mike $".
  */
diff --git a/filter/raster.c b/filter/raster.c
index 1118e7e1e..32155073b 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.c 6061 2006-10-23 00:26:52Z mike $"
+ * "$Id: raster.c 6274 2007-02-13 21:05:28Z mike $"
  *
  *   Raster file routines for the Common UNIX Printing System (CUPS).
  *
@@ -43,6 +43,7 @@
  *   cups_raster_read_header() - Read a raster page header.
  *   cups_raster_update()      - Update the raster header and row count for the
  *                               current page.
+ *   cups_raster_write()       - Write a row of raster data...
  *   cups_read()               - Read bytes from a file.
  *   cups_swap()               - Swap bytes in raster data...
  *   cups_write()              - Write bytes to a file.
@@ -52,7 +53,7 @@
  * Include necessary headers...
  */
 
-#include "raster.h"
+#include "image-private.h"
 #include <cups/debug.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -98,6 +99,7 @@ static unsigned	cups_raster_read_header(cups_raster_t *r);
 static int	cups_raster_read(cups_raster_t *r, unsigned char *buf,
 		                 int bytes);
 static void	cups_raster_update(cups_raster_t *r);
+static int	cups_raster_write(cups_raster_t *r, const unsigned char *pixels);
 static int	cups_read(int fd, unsigned char *buf, int bytes);
 static void	cups_swap(unsigned char *buf, int bytes);
 static int	cups_write(int fd, const unsigned char *buf, int bytes);
@@ -134,11 +136,17 @@ cupsRasterOpen(int         fd,		/* I - File descriptor */
   cups_raster_t	*r;			/* New stream */
 
 
+  _cupsRasterClearError();
+
   if ((r = calloc(sizeof(cups_raster_t), 1)) == NULL)
+  {
+    _cupsRasterAddError("Unable to allocate memory for raster stream: %s\n",
+                        strerror(errno));
     return (NULL);
+  }
 
   r->fd   = fd;
-  r->mode = mode;
+  r->mode = mode == CUPS_RASTER_WRITE_COMPRESSED ? CUPS_RASTER_WRITE : mode;
 
   if (mode == CUPS_RASTER_READ)
   {
@@ -148,6 +156,8 @@ cupsRasterOpen(int         fd,		/* I - File descriptor */
 
     if (!cups_read(r->fd, (unsigned char *)&(r->sync), sizeof(r->sync)))
     {
+      _cupsRasterAddError("Unable to read header from raster stream: %s\n",
+                          strerror(errno));
       free(r);
       return (NULL);
     }
@@ -159,6 +169,7 @@ cupsRasterOpen(int         fd,		/* I - File descriptor */
         r->sync != CUPS_RASTER_SYNCv2 &&
         r->sync != CUPS_RASTER_REVSYNCv2)
     {
+      _cupsRasterAddError("Unknown raster format %08x!\n", r->sync);
       free(r);
       return (NULL);
     }
@@ -178,11 +189,19 @@ cupsRasterOpen(int         fd,		/* I - File descriptor */
     * Open for write - put sync word...
     */
 
-    r->sync = CUPS_RASTER_SYNC;
+    if (mode == CUPS_RASTER_WRITE_COMPRESSED)
+    {
+      r->compressed = 1;
+      r->sync       = CUPS_RASTER_SYNCv2;
+    }
+    else
+      r->sync = CUPS_RASTER_SYNC;
 
     if (cups_write(r->fd, (unsigned char *)&(r->sync), sizeof(r->sync))
             < sizeof(r->sync))
     {
+      _cupsRasterAddError("Unable to write raster stream header: %s\n",
+                          strerror(errno));
       free(r);
       return (NULL);
     }
@@ -524,6 +543,10 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
                       unsigned char *p,	/* I - Bytes to write */
 		      unsigned      len)/* I - Number of bytes to write */
 {
+  int		bytes;			/* Bytes read */
+  unsigned	remaining;		/* Bytes remaining */
+
+
 #ifdef DEBUG
   fprintf(stderr, "cupsRasterWritePixels(r=%p, p=%p, len=%u), remaining=%u\n",
           r, p, len, r->remaining);
@@ -532,13 +555,113 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
   if (r == NULL || r->mode != CUPS_RASTER_WRITE || r->remaining == 0)
     return (0);
 
+  if (!r->compressed)
+  {
+   /*
+    * Without compression, just write the raster data raw...
+    */
+
+    r->remaining -= len / r->header.cupsBytesPerLine;
+
+    return (cups_write(r->fd, p, len));
+  }
+
  /*
-  * No write compression, just write the raster data raw...
+  * Otherwise, compress each line...
   */
 
-  r->remaining -= len / r->header.cupsBytesPerLine;
+  for (remaining = len; remaining > 0; remaining -= bytes, p += bytes)
+  {
+   /*
+    * Figure out the number of remaining bytes on the current line...
+    */
+
+    if ((bytes = remaining) > (r->pend - r->pcurrent))
+      bytes = r->pend - r->pcurrent;
+
+    if (r->count > 0)
+    {
+     /*
+      * Check to see if this line is the same as the previous line...
+      */
+
+      if (memcmp(p, r->pcurrent, bytes))
+      {
+        if (!cups_raster_write(r, r->pixels))
+	  return (0);
+
+	r->count = 0;
+      }
+      else
+      {
+       /*
+        * Mark more bytes as the same...
+	*/
+
+        r->pcurrent += bytes;
+
+	if (r->pcurrent >= r->pend)
+	{
+	 /*
+          * Increase the repeat count...
+	  */
+
+	  r->count ++;
+	  r->pcurrent = r->pixels;
+
+	 /*
+          * Flush out this line if it is the last one...
+	  */
+
+	  r->remaining --;
+
+	  if (r->remaining == 0)
+	    return (cups_raster_write(r, r->pixels));
+	  else if (r->count == 256)
+	  {
+	    if (cups_raster_write(r, r->pixels) == 0)
+	      return (0);
 
-  return (cups_write(r->fd, p, len));
+	    r->count = 0;
+	  }
+	}
+
+	continue;
+      }
+    }
+
+    if (r->count == 0)
+    {
+     /*
+      * Copy the raster data to the buffer...
+      */
+
+      memcpy(r->pcurrent, p, bytes);
+
+      r->pcurrent += bytes;
+
+      if (r->pcurrent >= r->pend)
+      {
+       /*
+        * Increase the repeat count...
+	*/
+
+	r->count ++;
+	r->pcurrent = r->pixels;
+
+       /*
+        * Flush out this line if it is the last one...
+	*/
+
+	r->remaining --;
+
+	if (r->remaining == 0)
+	  return (cups_raster_write(r, r->pixels));
+      }
+    }
+  }
+
+  return (len);
 }
 
 
@@ -840,6 +963,120 @@ cups_raster_update(cups_raster_t *r)	/* I - Raster stream */
 
 
 /*
+ * 'cups_raster_write()' - Write a row of compressed raster data...
+ */
+
+static int				/* O - Number of bytes written */
+cups_raster_write(
+    cups_raster_t       *r,		/* I - Raster stream */
+    const unsigned char *pixels)	/* I - Pixel data to write */
+{
+  const unsigned char	*start,		/* Start of sequence */
+			*ptr,		/* Current pointer in sequence */
+			*pend,		/* End of raster buffer */
+			*plast;		/* Pointer to last pixel */
+  unsigned char		*wptr;		/* Pointer into write buffer */
+  int			bpp,		/* Bytes per pixel */
+			count,		/* Count */
+			maxrun;		/* Maximum run of 128 * bpp */
+
+
+#ifdef DEBUG
+  fprintf(stderr, "cups_raster_write(r=%p, pixels=%p)\n", r, pixels);
+#endif /* DEBUG */
+
+ /*
+  * Allocate a write buffer as needed...
+  */
+
+  count = r->header.cupsBytesPerLine * 2;
+  if (count > r->bufsize)
+  {
+    if (r->buffer)
+      wptr = realloc(r->buffer, count);
+    else
+      wptr = malloc(count);
+
+    if (!wptr)
+      return (-1);
+
+    r->buffer  = wptr;
+    r->bufsize = count;
+  }
+
+ /*
+  * Write the row repeat count...
+  */
+
+  bpp     = r->bpp;
+  pend    = pixels + r->header.cupsBytesPerLine;
+  plast   = pend - bpp;
+  wptr    = r->buffer;
+  *wptr++ = r->count - 1;
+  maxrun  = 128 * bpp;
+
+ /*
+  * Write using a modified TIFF "packbits" compression...
+  */
+
+  for (ptr = pixels; ptr < pend;)
+  {
+    start = ptr;
+    ptr += bpp;
+
+    if (ptr == pend)
+    {
+     /*
+      * Encode a single pixel at the end...
+      */
+
+      *wptr++ = 0;
+      for (count = bpp; count > 0; count --)
+        *wptr++ = *start++;
+    }
+    else if (!memcmp(start, ptr, bpp))
+    {
+     /*
+      * Encode a sequence of repeating pixels...
+      */
+
+      for (count = 2; count < 128 && ptr < plast; count ++, ptr += bpp)
+        if (memcmp(ptr, ptr + bpp, bpp))
+	  break;
+
+      *wptr++ = count - 1;
+      for (count = bpp; count > 0; count --)
+        *wptr++ = *ptr++;
+    }
+    else
+    {
+     /*
+      * Encode a sequence of non-repeating pixels...
+      */
+
+      for (count = 1; count < 127 && ptr < plast; count ++, ptr += bpp)
+        if (!memcmp(ptr, ptr + bpp, bpp))
+	  break;
+
+      if (ptr >= plast && count < 128)
+      {
+        count ++;
+	ptr += bpp;
+      }
+ 
+      *wptr++ = 257 - count;
+
+      count *= bpp;
+      memcpy(wptr, start, count);
+      wptr += count;
+    }
+  }
+
+  return (cups_write(r->fd, r->buffer, wptr - r->buffer));
+}
+
+
+/*
  * 'cups_read()' - Read bytes from a file.
  */
 
@@ -928,5 +1165,5 @@ cups_write(int                 fd,	/* I - File descriptor */
 
 
 /*
- * End of "$Id: raster.c 6061 2006-10-23 00:26:52Z mike $".
+ * End of "$Id: raster.c 6274 2007-02-13 21:05:28Z mike $".
  */
diff --git a/filter/raster.h b/filter/raster.h
index 27e276a15..e76bf46c2 100644
--- a/filter/raster.h
+++ b/filter/raster.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.h 6158 2006-12-17 01:44:21Z mike $"
+ * "$Id: raster.h 6274 2007-02-13 21:05:28Z mike $"
  *
  *   Raster file definitions for the Common UNIX Printing System (CUPS).
  *
@@ -159,7 +159,8 @@ typedef enum cups_jog_e			/**** Jog attribute values ****/
 typedef enum cups_mode_e		/**** Raster modes ****/
 {
   CUPS_RASTER_READ = 0,			/* Open stream for reading */
-  CUPS_RASTER_WRITE = 1			/* Open stream for writing */
+  CUPS_RASTER_WRITE = 1,		/* Open stream for writing */
+  CUPS_RASTER_WRITE_COMPRESSED = 2	/* Open stream for compressed writing @since CUPS 1.3@ */
 } cups_mode_t;
 
 typedef enum cups_order_e		/**** cupsColorOrder attribute values ****/
@@ -331,6 +332,9 @@ extern unsigned		cupsRasterReadHeader2(cups_raster_t *r,
 extern unsigned		cupsRasterWriteHeader2(cups_raster_t *r,
 			                       cups_page_header2_t *h);
 
+/**** New in CUPS 1.3 ****/
+extern const char	*cupsRasterErrorString(void);
+
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
@@ -338,5 +342,5 @@ extern unsigned		cupsRasterWriteHeader2(cups_raster_t *r,
 #endif /* !_CUPS_RASTER_H_ */
 
 /*
- * End of "$Id: raster.h 6158 2006-12-17 01:44:21Z mike $".
+ * End of "$Id: raster.h 6274 2007-02-13 21:05:28Z mike $".
  */
diff --git a/filter/rasterbench.c b/filter/rasterbench.c
index b26836b4e..f954f63e0 100644
--- a/filter/rasterbench.c
+++ b/filter/rasterbench.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rasterbench.c 5671 2006-06-16 11:17:39Z mike $"
+ * "$Id: rasterbench.c 5667 2006-06-16 10:21:49Z mike $"
  *
  *   Raster benchmark program for the Common UNIX Printing System (CUPS).
  *
@@ -351,5 +351,5 @@ write_test(int fd)			/* I - File descriptor to write to */
 
 
 /*
- * End of "$Id: rasterbench.c 5671 2006-06-16 11:17:39Z mike $".
+ * End of "$Id: rasterbench.c 5667 2006-06-16 10:21:49Z mike $".
  */
diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index bc4ca7c97..015447224 100644
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertolabel.c 6236 2007-02-05 21:04:04Z mike $"
+ * "$Id: rastertolabel.c 6235 2007-02-05 21:03:49Z mike $"
  *
  *   Label printer filter for the Common UNIX Printing System (CUPS).
  *
@@ -30,6 +30,7 @@
  *   EndPage()      - Finish a page of graphics.
  *   CancelJob()    - Cancel the current job...
  *   OutputLine()   - Output a line of graphics.
+ *   PCLCompress()  - Output a PCL (mode 3) compressed line.
  *   ZPLCompress()  - Output a run-length compression sequence.
  *   main()         - Main entry and processing of driver.
  */
@@ -48,16 +49,20 @@
 
 
 /*
- * This driver filter currently supports Dymo and Zebra label printers.
+ * This driver filter currently supports Dymo, Intellitech, and Zebra
+ * label printers.
  *
  * The Dymo portion of the driver has been tested with the 300, 330,
- * and 330 Turbo label printers; it may also work with older models.
+ * and 330 Turbo label printers; it may also work with other models.
  * The Dymo printers support printing at 136, 203, and 300 DPI.
  *
- * The Zebra portion of the driver has been tested with the LP-2844Z label
- * printer; it may also work with other models.  The driver supports EPL
- * line mode, EPL page mode, ZPL, and CPCL as defined in Zebra's on-line
- * developer documentation.
+ * The Intellitech portion of the driver has been tested with the
+ * Intellibar 408, 412, and 808 and supports their PCL variant.
+ *
+ * The Zebra portion of the driver has been tested with the LP-2844,
+ * LP-2844Z, QL-320, and QL-420 label printers; it may also work with
+ * other models.  The driver supports EPL line mode, EPL page mode,
+ * ZPL, and CPCL as defined in Zebra's on-line developer documentation.
  */
 
 /*
@@ -71,6 +76,8 @@
 #define ZEBRA_ZPL	0x12		/* Zebra ZPL-based printers */
 #define ZEBRA_CPCL	0x13		/* Zebra CPCL-based printers */
 
+#define INTELLITECH_PCL	0x20		/* Intellitech PCL-based printers */
+
 
 /*
  * Globals...
@@ -95,6 +102,7 @@ void	StartPage(ppd_file_t *ppd, cups_page_header_t *header);
 void	EndPage(ppd_file_t *ppd, cups_page_header_t *header);
 void	CancelJob(int sig);
 void	OutputLine(ppd_file_t *ppd, cups_page_header_t *header, int y);
+void	PCLCompress(unsigned char *line, int length);
 void	ZPLCompress(char repeat_char, int repeat_count);
 
 
@@ -147,6 +155,15 @@ Setup(ppd_file_t *ppd)			/* I - PPD file */
 
     case ZEBRA_CPCL :
         break;
+
+    case INTELLITECH_PCL :
+       /*
+	* Send a PCL reset sequence.
+	*/
+
+	putchar(0x1b);
+	putchar('E');
+        break;
   }
 }
 
@@ -213,6 +230,9 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
   fprintf(stderr, "DEBUG: cupsColorOrder = %d\n", header->cupsColorOrder);
   fprintf(stderr, "DEBUG: cupsColorSpace = %d\n", header->cupsColorSpace);
   fprintf(stderr, "DEBUG: cupsCompression = %d\n", header->cupsCompression);
+  fprintf(stderr, "DEBUG: cupsRowCount = %d\n", header->cupsRowCount);
+  fprintf(stderr, "DEBUG: cupsRowFeed = %d\n", header->cupsRowFeed);
+  fprintf(stderr, "DEBUG: cupsRowStep = %d\n", header->cupsRowStep);
 
  /*
   * Register a signal handler to eject the current page if the
@@ -355,6 +375,120 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
 	printf("PAGE-WIDTH %d\r\n", header->cupsWidth);
 	printf("PAGE-HEIGHT %d\r\n", header->cupsWidth);
         break;
+
+    case INTELLITECH_PCL :
+       /*
+        * Set the media size...
+	*/
+
+	printf("\033&l6D\033&k12H");	/* Set 6 LPI, 10 CPI */
+	printf("\033&l0O");		/* Set portrait orientation */
+
+	switch (header->PageSize[1])
+	{
+	  case 540 : /* Monarch Envelope */
+              printf("\033&l80A");	/* Set page size */
+	      break;
+
+	  case 624 : /* DL Envelope */
+              printf("\033&l90A");	/* Set page size */
+	      break;
+
+	  case 649 : /* C5 Envelope */
+              printf("\033&l91A");	/* Set page size */
+	      break;
+
+	  case 684 : /* COM-10 Envelope */
+              printf("\033&l81A");	/* Set page size */
+	      break;
+
+	  case 756 : /* Executive */
+              printf("\033&l1A");	/* Set page size */
+	      break;
+
+	  case 792 : /* Letter */
+              printf("\033&l2A");	/* Set page size */
+	      break;
+
+	  case 842 : /* A4 */
+              printf("\033&l26A");	/* Set page size */
+	      break;
+
+	  case 1008 : /* Legal */
+              printf("\033&l3A");	/* Set page size */
+	      break;
+
+          default : /* Custom size */
+	      printf("\033!f%dZ", header->PageSize[1] * 300 / 72);
+	      break;
+	}
+
+	printf("\033&l%dP",		/* Set page length */
+               header->PageSize[1] / 12);
+	printf("\033&l0E");		/* Set top margin to 0 */
+        printf("\033&l%dX", header->NumCopies);
+					/* Set number copies */
+        printf("\033&l0L");		/* Turn off perforation skip */
+
+       /*
+        * Print settings...
+	*/
+
+	if (Page == 1)
+	{
+          if (header->cupsRowFeed)	/* inPrintRate */
+	    printf("\033!p%dS", header->cupsRowFeed);
+
+          if (header->cupsCompression != ~0)
+	  				/* inPrintDensity */
+	    printf("\033&d%dA", 30 * header->cupsCompression / 100 - 15);
+
+	  if ((choice = ppdFindMarkedChoice(ppd, "inPrintMode")) != NULL)
+	  {
+	    if (!strcmp(choice->choice, "Standard"))
+	      fputs("\033!p0M", stdout);
+	    else if (!strcmp(choice->choice, "Tear"))
+	    {
+	      fputs("\033!p1M", stdout);
+
+              if (header->cupsRowCount)	/* inTearInterval */
+		printf("\033!n%dT", header->cupsRowCount);
+            }
+	    else
+	    {
+	      fputs("\033!p2M", stdout);
+
+              if (header->cupsRowStep)	/* inCutInterval */
+		printf("\033!n%dC", header->cupsRowStep);
+            }
+	  }
+        }
+
+       /*
+	* Setup graphics...
+	*/
+
+	printf("\033*t%dR", header->HWResolution[0]);
+					/* Set resolution */
+
+	printf("\033*r%dS", header->cupsWidth);
+					/* Set width */
+	printf("\033*r%dT", header->cupsHeight);
+					/* Set height */
+
+	printf("\033&a0H");		/* Set horizontal position */
+	printf("\033&a0V");		/* Set vertical position */
+        printf("\033*r1A");		/* Start graphics */
+        printf("\033*b3M");		/* Set compression */
+
+       /*
+        * Allocate compression buffers...
+	*/
+
+	CompBuffer = malloc(2 * header->cupsBytesPerLine + 1);
+	LastBuffer = malloc(header->cupsBytesPerLine);
+	LastSet    = 0;
+        break;
   }
 
  /*
@@ -596,6 +730,11 @@ EndPage(ppd_file_t *ppd,		/* I - PPD file */
 
 	puts("PRINT\r");
 	break;
+
+    case INTELLITECH_PCL :
+        printf("\033*rB");		/* End GFX */
+        printf("\014");			/* Eject current page */
+        break;
   }
 
   fflush(stdout);
@@ -799,7 +938,160 @@ OutputLine(ppd_file_t         *ppd,	/* I - PPD file */
 	  fflush(stdout);
 	}
 	break;
+
+    case INTELLITECH_PCL :
+	if (Buffer[0] ||
+            memcmp(Buffer, Buffer + 1, header->cupsBytesPerLine - 1))
+        {
+	  if (Feed)
+	  {
+	    printf("\033*b%dY", Feed);
+	    Feed    = 0;
+	    LastSet = 0;
+	  }
+
+          PCLCompress(Buffer, header->cupsBytesPerLine);
+	}
+	else
+	  Feed ++;
+        break;
+  }
+}
+
+
+/*
+ * 'PCLCompress()' - Output a PCL (mode 3) compressed line.
+ */
+
+void
+PCLCompress(unsigned char *line,	/* I - Line to compress */
+            int           length)	/* I - Length of line */
+{
+  unsigned char	*line_ptr,		/* Current byte pointer */
+        	*line_end,		/* End-of-line byte pointer */
+        	*comp_ptr,		/* Pointer into compression buffer */
+        	*start,			/* Start of compression sequence */
+		*seed;			/* Seed buffer pointer */
+  int           count,			/* Count of bytes for output */
+		offset;			/* Offset of bytes for output */
+
+
+ /*
+  * Do delta-row compression...
+  */
+
+  line_ptr = line;
+  line_end = line + length;
+
+  comp_ptr = CompBuffer;
+  seed     = LastBuffer;
+
+  while (line_ptr < line_end)
+  {
+   /*
+    * Find the next non-matching sequence...
+    */
+
+    start = line_ptr;
+
+    if (!LastSet)
+    {
+     /*
+      * The seed buffer is invalid, so do the next 8 bytes, max...
+      */
+
+      offset = 0;
+
+      if ((count = line_end - line_ptr) > 8)
+	count = 8;
+
+      line_ptr += count;
+    }
+    else
+    {
+     /*
+      * The seed buffer is valid, so compare against it...
+      */
+
+      while (*line_ptr == *seed &&
+             line_ptr < line_end)
+      {
+        line_ptr ++;
+        seed ++;
+      }
+
+      if (line_ptr == line_end)
+        break;
+
+      offset = line_ptr - start;
+
+     /*
+      * Find up to 8 non-matching bytes...
+      */
+
+      start = line_ptr;
+      count = 0;
+      while (*line_ptr != *seed &&
+             line_ptr < line_end &&
+             count < 8)
+      {
+        line_ptr ++;
+        seed ++;
+        count ++;
+      }
+    }
+
+   /*
+    * Place mode 3 compression data in the buffer; see HP manuals
+    * for details...
+    */
+
+    if (offset >= 31)
+    {
+     /*
+      * Output multi-byte offset...
+      */
+
+      *comp_ptr++ = ((count - 1) << 5) | 31;
+
+      offset -= 31;
+      while (offset >= 255)
+      {
+        *comp_ptr++ = 255;
+        offset    -= 255;
+      }
+
+      *comp_ptr++ = offset;
+    }
+    else
+    {
+     /*
+      * Output single-byte offset...
+      */
+
+      *comp_ptr++ = ((count - 1) << 5) | offset;
+    }
+
+    memcpy(comp_ptr, start, count);
+    comp_ptr += count;
   }
+
+  line_ptr = CompBuffer;
+  line_end = comp_ptr;
+
+ /*
+  * Set the length of the data and write it...
+  */
+
+  printf("\033*b%dW", comp_ptr - CompBuffer);
+  fwrite(CompBuffer, comp_ptr - CompBuffer, 1, stdout);
+
+ /*
+  * Save this line as a "seed" buffer for the next...
+  */
+
+  memcpy(LastBuffer, line, length);
+  LastSet = 1;
 }
 
 
@@ -1014,5 +1306,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertolabel.c 6236 2007-02-05 21:04:04Z mike $".
+ * End of "$Id: rastertolabel.c 6235 2007-02-05 21:03:49Z mike $".
  */
diff --git a/filter/testraster.c b/filter/testraster.c
index dd1c76ae8..f6d9db8a4 100644
--- a/filter/testraster.c
+++ b/filter/testraster.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: testraster.c 6158 2006-12-17 01:44:21Z mike $"
+ * "$Id: testraster.c 6331 2007-03-12 16:07:31Z mike $"
  *
  *   Raster test program routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2005 by Easy Software Products.
+ *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -49,7 +49,13 @@
  * Test PS commands and header...
  */
 
-static const char *test_code =
+static const char *dsc_code =
+"[{\n"
+"%%BeginFeature: *PageSize Tabloid\n"
+"<</PageSize[792 1224]>>setpagedevice\n"
+"%%EndFeature\n"
+"} stopped cleartomark\n";
+static const char *setpagedevice_code =
 "<<"
 "/MediaClass(Media Class)"
 "/MediaColor((Media Color))"
@@ -138,7 +144,7 @@ static const char *test_code =
 "/cupsPreferredBitsPerColor 17"
 ">> setpagedevice";
 
-static cups_page_header2_t test_header =
+static cups_page_header2_t setpagedevice_header =
 {
   "Media Class",			/* MediaClass */
   "(Media Color)",			/* MediaColor */
@@ -199,6 +205,10 @@ static cups_page_header2_t test_header =
  * Local functions...
  */
 
+static int	do_ppd_tests(const char *filename, int num_options,
+		             cups_option_t *options);
+static int	do_ps_tests(void);
+static int	do_raster_tests(void);
 static void	print_changes(cups_page_header2_t *header,
 		              cups_page_header2_t *expected);
 
@@ -208,19 +218,121 @@ static void	print_changes(cups_page_header2_t *header,
  */
 
 int					/* O - Exit status */
-main(void)
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
 {
-  int			page, x, y;	/* Looping vars */
-  FILE			*fp;		/* Raster file */
-  cups_raster_t		*r;		/* Raster stream */
-  cups_page_header2_t	header,		/* Page header */
-			expected;	/* Expected page header */
-  unsigned char		data[2048];	/* Raster data */
-  int			preferred_bits;	/* Preferred bits */
-  int			errors;		/* Number of errors */
+  int		errors;			/* Number of errors */
+
+
+  if (argc == 1)
+  {
+    errors = do_ps_tests();
+    errors += do_raster_tests();
+  }
+  else
+  {
+    int			i;		/* Looping var */
+    int			num_options;	/* Number of options */
+    cups_option_t	*options;	/* Options */
+
+
+    for (errors = 0, num_options = 0, options = NULL, i = 1; i < argc; i ++)
+    {
+      if (argv[i][0] == '-')
+      {
+        if (argv[i][1] == 'o')
+        {
+          if (argv[i][2])
+            num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
+          else
+          {
+            i ++;
+            if (i < argc)
+              num_options = cupsParseOptions(argv[i], num_options, &options);
+            else
+            {
+              puts("Usage: testraster [-o name=value ...] [filename.ppd ...]");
+              return (1);
+            }
+          }
+        }
+        else
+        {
+          puts("Usage: testraster [-o name=value ...] [filename.ppd ...]");
+          return (1);
+        }
+      }
+      else
+        errors += do_ppd_tests(argv[i], num_options, options);
+    }
+
+    cupsFreeOptions(num_options, options);
+  }
+
+  return (errors);
+}
+
+
+/*
+ * 'do_ppd_tests()' - Test the default option commands in a PPD file.
+ */
+
+static int				/* O - Number of errors */
+do_ppd_tests(const char    *filename,	/* I - PPD file */
+             int           num_options,	/* I - Number of options */
+             cups_option_t *options)	/* I - Options */
+{
+  ppd_file_t		*ppd;		/* PPD file data */
+  cups_page_header2_t	header;		/* Page header */
+
+
+  printf("\"%s\": ", filename);
+  fflush(stdout);
+
+  if ((ppd = ppdOpenFile(filename)) == NULL)
+  {
+    ppd_status_t	status;		/* Status from PPD loader */
+    int			line;		/* Line number containing error */
+
+
+    status = ppdLastError(&line);
+
+    puts("FAIL (bad PPD file)");
+    printf("    %s on line %d\n", ppdErrorString(status), line);
+
+    return (1);
+  }
+
+  ppdMarkDefaults(ppd);
+  cupsMarkOptions(ppd, num_options, options);
 
+  if (cupsRasterInterpretPPD(&header, ppd, 0, NULL, NULL))
+  {
+    puts("FAIL (error from function)");
+    puts(cupsRasterErrorString());
+
+    return (1);
+  }
+  else
+  {
+    puts("PASS");
+
+    return (0);
+  }
+}
+
+
+/*
+ * 'do_ps_tests()' - Test standard PostScript commands.
+ */
+
+static int
+do_ps_tests(void)
+{
+  cups_page_header2_t	header;		/* Page header */
+  int			preferred_bits;	/* Preferred bits */
+  int			errors = 0;	/* Number of errors */
 
-  errors = 0;
 
  /*
   * Test PS exec code...
@@ -233,12 +345,14 @@ main(void)
   header.Collate = CUPS_TRUE;
   preferred_bits = 0;
 
-  if (_cupsRasterExecPS(&header, &preferred_bits, test_code))
+  if (_cupsRasterExecPS(&header, &preferred_bits, setpagedevice_code))
   {
     puts("FAIL (error from function)");
+    puts(cupsRasterErrorString());
     errors ++;
   }
-  else if (preferred_bits != 17 || memcmp(&header, &test_header, sizeof(header)))
+  else if (preferred_bits != 17 ||
+           memcmp(&header, &setpagedevice_header, sizeof(header)))
   {
     puts("FAIL (bad header)");
 
@@ -246,7 +360,7 @@ main(void)
       printf("    cupsPreferredBitsPerColor %d, expected 17\n",
              preferred_bits);
 
-    print_changes(&test_header, &header);
+    print_changes(&setpagedevice_header, &header);
     errors ++;
   }
   else
@@ -262,6 +376,7 @@ main(void)
 			"setpagedevice\n"))
   {
     puts("FAIL (error from function)");
+    puts(cupsRasterErrorString());
     errors ++;
   }
   else if (header.PageSize[0] != 792 || header.PageSize[1] != 612)
@@ -284,6 +399,7 @@ main(void)
 			"pop pop pop"))
   {
     puts("FAIL (error from function)");
+    puts(cupsRasterErrorString());
     errors ++;
   }
   else
@@ -310,6 +426,24 @@ main(void)
       puts("PASS");
   }
 
+  fputs("_cupsRasterExecPS(\"%%Begin/EndFeature code\"): ", stdout);
+  fflush(stdout);
+
+  if (_cupsRasterExecPS(&header, &preferred_bits, dsc_code))
+  {
+    puts("FAIL (error from function)");
+    puts(cupsRasterErrorString());
+    errors ++;
+  }
+  else if (header.PageSize[0] != 792 || header.PageSize[1] != 1224)
+  {
+    printf("FAIL (bad PageSize [%d %d], expected [792 1224])\n",
+           header.PageSize[0], header.PageSize[1]);
+    errors ++;
+  }
+  else
+    puts("PASS");
+
 #if 0
   fputs("_cupsRasterExecPS(\"\"): ", stdout);
   fflush(stdout);
@@ -397,6 +531,26 @@ main(void)
     puts("PASS");
 #endif /* 0 */
 
+  return (errors);
+}
+
+
+/*
+ * 'do_raster_tests()' - Test reading and writing of raster data.
+ */
+
+static int				/* O - Number of errors */
+do_raster_tests(void)
+{
+  int			page, x, y;	/* Looping vars */
+  FILE			*fp;		/* Raster file */
+  cups_raster_t		*r;		/* Raster stream */
+  cups_page_header2_t	header,		/* Page header */
+			expected;	/* Expected page header */
+  unsigned char		data[2048];	/* Raster data */
+  int			errors = 0;	/* Number of errors */
+
+
  /*
   * Test writing...
   */
@@ -690,11 +844,10 @@ main(void)
   cupsRasterClose(r);
   fclose(fp);
 
-  return (errors > 0);
+  return (errors);
 }
 
 
-
 /*
  * 'print_changes()' - Print differences in the page header.
  */
@@ -935,5 +1088,5 @@ print_changes(
 
 
 /*
- * End of "$Id: testraster.c 6158 2006-12-17 01:44:21Z mike $".
+ * End of "$Id: testraster.c 6331 2007-03-12 16:07:31Z mike $".
  */
diff --git a/filter/texttops.c b/filter/texttops.c
index 80c58014d..33fc4116b 100644
--- a/filter/texttops.c
+++ b/filter/texttops.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: texttops.c 6003 2006-10-02 16:26:04Z mike $"
+ * "$Id: texttops.c 6288 2007-02-19 12:59:55Z mike $"
  *
  *   Text to PostScript filter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2005 by Easy Software Products.
+ *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -812,7 +812,7 @@ WriteProlog(const char *title,		/* I - Title of job */
 
     puts("% Reencode base fonts");
 
-    for (i = 1 + PrettyPrint; i >= 0; i --)
+    for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
       for (j = 0; j < NumFonts; j ++)
       {
 	printf("/%s findfont\n", Fonts[j][i]);
@@ -831,7 +831,7 @@ WriteProlog(const char *title,		/* I - Title of job */
 
     puts("% Create composite fonts...");
 
-    for (i = 1 + PrettyPrint; i >= 0; i --)
+    for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
     {
       puts("8 dict begin");
       puts("/FontType 0 def/FontMatrix[1.0 0 0 1.0 0 0]def/FMapType 2 def/Encoding[");
@@ -1307,5 +1307,5 @@ write_text(const char *s)	/* I - String to write */
 
 
 /*
- * End of "$Id: texttops.c 6003 2006-10-02 16:26:04Z mike $".
+ * End of "$Id: texttops.c 6288 2007-02-19 12:59:55Z mike $".
  */