Merge changes from CUPS 1.4svn-r7696.

[thirdparty/cups.git] / conf / mime.types

diff --git a/conf/mime.types b/conf/mime.types
index 5747b4d8d7c4005582cff3323eb556a557fa238a..83a079a77972071c3ff509e74f127415b4a1182f 100644 (file)
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,25 +1,20 @@
 #
-# "$Id: mime.types 177 2006-06-21 00:20:03Z jlovell $"
+# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2005 by Easy Software Products.
+#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
+#   VERSIONS OF CUPS.  Instead, create a "local.types" file that
+#   reflects your local configuration changes.
 #
-#   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
+#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products.
 #
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. 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
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 ########################################################################
@@ -38,6 +33,8 @@
 #   extension                          Pattern match on "*.extension"
 #   ascii(offset,length)               True if bytes are valid printable ASCII
 #                                      (CR, NL, TAB, BS, 32-126)
+#   priority(number)                    Sets priority of type (0=lowest,
+#                                       100=default, 200=highest)
 #   printable(offset,length)           True if bytes are printable 8-bit chars
 #                                      (CR, NL, TAB, BS, 32-126, 128-254)
 #   string(offset,"string")            True if bytes are identical to string
@@ -74,20 +71,20 @@
 application/pdf                        pdf string(0,%PDF)
 application/postscript         ai eps ps string(0,%!) string(0,<04>%!) \
                                contains(0,128,<1B>%-12345X) + \
-                               (contains(0,1024,"LANGUAGE=POSTSCRIPT") \
-                                contains(0,1024,"LANGUAGE = Postscript") \
-                                contains(0,1024,"LANGUAGE = PostScript") \
-                                contains(0,1024,"LANGUAGE = POSTSCRIPT") \
-                                (contains(0,1024,<0a>%!) + \
-                                 !contains(0,1024,"ENTER LANGUAGE")))
-application/vnd.hp-HPGL                hpgl string(0,<1B>&)\
+                               (contains(0,4096,"LANGUAGE=POSTSCRIPT") \
+                                contains(0,4096,"LANGUAGE = Postscript") \
+                                contains(0,4096,"LANGUAGE = PostScript") \
+                                contains(0,4096,"LANGUAGE = POSTSCRIPT") \
+                                (contains(0,4096,<0a>%!) + \
+                                 !contains(0,4096,"ENTER LANGUAGE")))
+application/vnd.hp-HPGL                hpgl \
                                string(0,<1B>E<1B>%0B) \
                                string(0,<1B>%-1B) string(0,<201B>)\
                                string(0,BP;) string(0,IN;) string(0,DF;) \
                                string(0,BPINPS;) \
                                (contains(0,128,<1B>%-12345X) + \
-                                (contains(0,1024,"LANGUAGE=HPGL") \
-                                 contains(0,1024,"LANGUAGE = HPGL")))
+                                (contains(0,4096,"LANGUAGE=HPGL") \
+                                 contains(0,4096,"LANGUAGE = HPGL")))
 
 ########################################################################
 #
@@ -101,7 +98,7 @@ image/jpeg                   jpeg jpg jpe string(0,<FFD8FF>) &&\
                                 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
                                 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
                                 char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
-image/tiff                     tiff tif string(0,MM) string(0,II)
+image/tiff                     tiff tif string(0,MM<002A>) string(0,II<2A00>)
 image/x-photocd                        pcd string(2048,PCD_IPI)
 image/x-portable-anymap                pnm
 image/x-portable-bitmap                pbm string(0,P1) string(0,P4)
@@ -140,6 +137,15 @@ text/html                  html htm printable(0,1024) +\
 text/plain                     txt printable(0,1024)
 text/css                       css
 
+
+########################################################################
+#
+# RSS feed type...
+#
+
+application/rss+xml            rss
+
+
 ########################################################################
 #
 # CUPS-specific types...
@@ -154,8 +160,8 @@ application/vnd.cups-raster string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw       (string(0,<1B>E) + !string(2,<1B>%0B)) \
                                string(0,<1B>@) \
                                (contains(0,128,<1B>%-12345X) + \
-                                (contains(0,1024,"LANGUAGE=PCL") \
-                                 contains(0,1024,"LANGUAGE = PCL")))
+                                (contains(0,4096,"LANGUAGE=PCL") \
+                                 contains(0,4096,"LANGUAGE = PCL")))
 
 ########################################################################
 #
@@ -167,5 +173,5 @@ application/vnd.cups-raw    (string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream
 
 #
-# End of "$Id: mime.types 177 2006-06-21 00:20:03Z jlovell $".
+# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $".
 #