Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / conf / mime.convs.in

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 108e507b264ff85ebdb76bb23137af4e5e6511df..9e6796ad4888a5564469a13fcf75040f6491fa83 100644 (file)
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -7,7 +7,7 @@
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -38,65 +38,55 @@
 # PostScript filters
 #
 
-application/pdf                application/postscript  33      pdftops
-application/postscript application/vnd.cups-postscript 66      pstops
-application/vnd.hp-HPGL        application/postscript  66      hpgltops
-application/x-cshell   application/postscript  33      texttops
-application/x-csource  application/postscript  33      texttops
-application/x-perl     application/postscript  33      texttops
-application/x-shell    application/postscript  33      texttops
-text/plain             application/postscript  33      texttops
-text/html              application/postscript  33      texttops
-image/gif              application/vnd.cups-postscript 66      imagetops
-image/png              application/vnd.cups-postscript 66      imagetops
-image/jpeg             application/vnd.cups-postscript 66      imagetops
-image/tiff             application/vnd.cups-postscript 66      imagetops
-image/x-bitmap         application/vnd.cups-postscript 66      imagetops
-image/x-photocd                application/vnd.cups-postscript 66      imagetops
-image/x-portable-anymap        application/vnd.cups-postscript 66      imagetops
-image/x-portable-bitmap        application/vnd.cups-postscript 66      imagetops
-image/x-portable-graymap application/vnd.cups-postscript       66      imagetops
-image/x-portable-pixmap        application/vnd.cups-postscript 66      imagetops
-image/x-sgi-rgb                application/vnd.cups-postscript 66      imagetops
-image/x-xbitmap                application/vnd.cups-postscript 66      imagetops
-image/x-xpixmap                application/vnd.cups-postscript 66      imagetops
-#image/x-xwindowdump   application/vnd.cups-postscript 66      imagetops
-image/x-sun-raster     application/vnd.cups-postscript 66      imagetops
-
-
-########################################################################
-#
-# Form filter...
-#
-# This filter does not currently exist, but the file format is defined
-# in the IDD and registered with the IANA for future use...
-#
-
-#application/vnd.cups-form application/vnd.cups-postscript 33 formtops
+application/pdf                        application/vnd.cups-postscript 66      pdftops
+application/postscript         application/vnd.cups-postscript 66      pstops
+application/x-cshell           application/postscript          33      texttops
+application/x-csource          application/postscript          33      texttops
+application/x-perl             application/postscript          33      texttops
+application/x-shell            application/postscript          33      texttops
+text/plain                     application/postscript          33      texttops
+text/css                       application/postscript          33      texttops
+text/html                      application/postscript          33      texttops
+image/gif                      application/vnd.cups-postscript 66      imagetops
+image/png                      application/vnd.cups-postscript 66      imagetops
+image/jpeg                     application/vnd.cups-postscript 66      imagetops
+image/tiff                     application/vnd.cups-postscript 66      imagetops
+image/x-bitmap                 application/vnd.cups-postscript 66      imagetops
+image/x-photocd                        application/vnd.cups-postscript 66      imagetops
+image/x-portable-anymap                application/vnd.cups-postscript 66      imagetops
+image/x-portable-bitmap                application/vnd.cups-postscript 66      imagetops
+image/x-portable-graymap       application/vnd.cups-postscript 66      imagetops
+image/x-portable-pixmap                application/vnd.cups-postscript 66      imagetops
+image/x-sgi-rgb                        application/vnd.cups-postscript 66      imagetops
+image/x-xbitmap                        application/vnd.cups-postscript 66      imagetops
+image/x-xpixmap                        application/vnd.cups-postscript 66      imagetops
+#image/x-xwindowdump           application/vnd.cups-postscript 66      imagetops
+image/x-sun-raster             application/vnd.cups-postscript 66      imagetops
+application/vnd.cups-banner    application/postscript          33      bannertops
 
 ########################################################################
 #
 # Raster filters...
 #
 
-image/gif              application/vnd.cups-raster     100     imagetoraster
-image/png              application/vnd.cups-raster     100     imagetoraster
-image/jpeg             application/vnd.cups-raster     100     imagetoraster
-image/tiff             application/vnd.cups-raster     100     imagetoraster
-image/x-bitmap         application/vnd.cups-raster     100     imagetoraster
-image/x-photocd                application/vnd.cups-raster     100     imagetoraster
-image/x-portable-anymap        application/vnd.cups-raster     100     imagetoraster
-image/x-portable-bitmap        application/vnd.cups-raster     100     imagetoraster
-image/x-portable-graymap application/vnd.cups-raster   100     imagetoraster
-image/x-portable-pixmap        application/vnd.cups-raster     100     imagetoraster
-image/x-sgi-rgb                application/vnd.cups-raster     100     imagetoraster
-image/x-xbitmap                application/vnd.cups-raster     100     imagetoraster
-image/x-xpixmap                application/vnd.cups-raster     100     imagetoraster
-#image/x-xwindowdump   application/vnd.cups-raster     100     imagetoraster
-image/x-sun-raster     application/vnd.cups-raster     100     imagetoraster
+image/gif                      application/vnd.cups-raster     100     imagetoraster
+image/png                      application/vnd.cups-raster     100     imagetoraster
+image/jpeg                     application/vnd.cups-raster     100     imagetoraster
+image/tiff                     application/vnd.cups-raster     100     imagetoraster
+image/x-bitmap                 application/vnd.cups-raster     100     imagetoraster
+image/x-photocd                        application/vnd.cups-raster     100     imagetoraster
+image/x-portable-anymap                application/vnd.cups-raster     100     imagetoraster
+image/x-portable-bitmap                application/vnd.cups-raster     100     imagetoraster
+image/x-portable-graymap       application/vnd.cups-raster     100     imagetoraster
+image/x-portable-pixmap                application/vnd.cups-raster     100     imagetoraster
+image/x-sgi-rgb                        application/vnd.cups-raster     100     imagetoraster
+image/x-xbitmap                        application/vnd.cups-raster     100     imagetoraster
+image/x-xpixmap                        application/vnd.cups-raster     100     imagetoraster
+#image/x-xwindowdump           application/vnd.cups-raster     100     imagetoraster
+image/x-sun-raster             application/vnd.cups-raster     100     imagetoraster
 
-# pstoraster is now part of ESP Ghostscript...
-#application/vnd.cups-postscript       application/vnd.cups-raster     100     pstoraster
+# pstoraster is part of GPL Ghostscript...
+application/vnd.cups-postscript        application/vnd.cups-raster     100     pstoraster
 
 ########################################################################
 #
@@ -109,5 +99,5 @@ image/x-sun-raster   application/vnd.cups-raster     100     imagetoraster
 @DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw        0       -
 
 #
-# End of "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $".
 #