merge more little/big endian entries

diff --git a/magic/Magdir/cups b/magic/Magdir/cups
index 4b6049ce8213ec89edbcb944e6ae6c523cd3be17..b2bb19974e7c944528e217f5dd613c32a0803884 100644 (file)
--- a/magic/Magdir/cups
+++ b/magic/Magdir/cups
@@ -1,55 +1,12 @@
 
 #------------------------------------------------------------------------------
-# $File: dyadic,v 1.5 2010/09/20 18:55:20 rrt Exp $
+# $File: cups,v 1.1 2011/11/10 18:59:54 christos Exp $
 # Cups: file(1) magic for the cups raster file format
 # From: Laurent Martelli <martellilaurent@gmail.com>
 # http://www.cups.org/documentation.php/spec-raster.html
 #
 
-# Cups Raster image format, Big Endian
-0      string          RaS             
-!:mime application/vnd.cups-raster
->3     string          t               Cups Raster version 1, Big Endian
->3     string          2               Cups Raster version 2, Big Endian
->3     string          3               Cups Raster version 3, Big Endian
->280   belong          x               \b, %d
->284   belong          x               \bx%d dpi
->376   belong          x               \b, %dx
->380   belong          x               \b%d pixels
->388   belong          x               %d bits/color
->392   belong          x               %d bits/pixel
->400   belong          0               ColorOrder=Chunky
->400   belong          1               ColorOrder=Banded
->400   belong          2               ColorOrder=Planar
->404   belong          0               ColorSpace=gray
->404   belong          1               ColorSpace=RGB
->404   belong          2               ColorSpace=RGBA
->404   belong          3               ColorSpace=black
->404   belong          4               ColorSpace=CMY
->404   belong          5               ColorSpace=YMC
->404   belong          6               ColorSpace=CMYK
->404   belong          7               ColorSpace=YMCK
->404   belong          8               ColorSpace=KCMY
->404   belong          9               ColorSpace=KCMYcm
->404   belong          10              ColorSpace=GMCK
->404   belong          11              ColorSpace=GMCS
->404   belong          12              ColorSpace=WHITE
->404   belong          13              ColorSpace=GOLD
->404   belong          14              ColorSpace=SILVER
->404   belong          15              ColorSpace=CIE XYZ
->404   belong          16              ColorSpace=CIE Lab
->404   belong          17              ColorSpace=RGBW
->404   belong          18              ColorSpace=sGray
->404   belong          19              ColorSpace=sRGB
->404   belong          20              ColorSpace=AdobeRGB
-
-
-# Cups Raster image format, Little Endian
-1      string          SaR             
->0     string          t               Cups Raster version 1, Little Endian
->0     string          2               Cups Raster version 2, Little Endian
->0     string          3               Cups Raster version 3, Little Endian
-!:mime application/vnd.cups-raster
+0      name            cups-be
 >280   lelong          x               \b, %d
 >284   lelong          x               \bx%d dpi
 >376   lelong          x               \b, %dx
@@ -80,3 +37,20 @@
 >404   lelong          18              ColorSpace=sGray
 >404   lelong          19              ColorSpace=sRGB
 >404   lelong          20              ColorSpace=AdobeRGB
+
+# Cups Raster image format, Big Endian
+0      string          RaS             
+>3     string          t               Cups Raster version 1, Big Endian
+>3     string          2               Cups Raster version 2, Big Endian
+>3     string          3               Cups Raster version 3, Big Endian
+!:mime application/vnd.cups-raster
+>0     use             ^cups-be
+
+
+# Cups Raster image format, Little Endian
+1      string          SaR             
+>0     string          t               Cups Raster version 1, Little Endian
+>0     string          2               Cups Raster version 2, Little Endian
+>0     string          3               Cups Raster version 3, Little Endian
+!:mime application/vnd.cups-raster
+>0     use             \^cups-be