put chi in wordprocessors, more iff magic

diff --git a/magic/Magdir/chi b/magic/Magdir/chi
deleted file mode 100644 (file)
index ee450f5..0000000
--- a/magic/Magdir/chi
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#------------------------------------------------------------------------------
-# chi:  file(1) magic for ChiWriter files
-#
-0       string          \\1cw\          ChiWriter file
->5      string          >\0             version %s
-0       string          \\1cw           ChiWriter file

diff --git a/magic/Magdir/iff b/magic/Magdir/iff
index 677a7a07736930087b99744d690a24f074abf77e..3c88f9039c1f54a6bd595abde5ce7a7aabeb0b98 100644 (file)
--- a/magic/Magdir/iff
+++ b/magic/Magdir/iff
@@ -26,10 +26,17 @@
 >>22   beshort         x               %d
 >8     string          RGBN            \b, RGBN 12-bit RGB image
 >8     string          RGB8            \b, RGB8 24-bit RGB image
+>8     string          DEEP            \b, DEEP TVPaint/XiPaint image
 >8     string          DR2D            \b, DR2D 2-D object
 >8     string          TDDD            \b, TDDD 3-D rendering
 >8     string          LWOB            \b, LWOB 3-D object
+>8     string          LWO2            \b, LWO2 3-D object, v2
+>8     string          LWLO            \b, LWLO 3-D layered object
+>8     string          REAL            \b, REAL Real3D rendering
+>8     string          MC4D            \b, MC4D MaxonCinema4D rendering
 >8     string          ANIM            \b, ANIM animation
+>8     string          YAFA            \b, YAFA animation
+>8     string          SSA\            \b, SSA super smooth animation
 >8     string          ACBM            \b, ACBM continuous image
 >8     string          FAXX            \b, FAXX fax image
 # other formats
@@ -40,6 +47,7 @@
 >8     string          PTCH            \b, PTCH binary patch
 >8     string          AMFF            \b, AMFF AmigaMetaFile format
 >8     string          WZRD            \b, WZRD StormWIZARD resource
+>8     string          DOC\            \b, DOC desktop publishing document
 
 # These go at the end of the iff rules
 #

diff --git a/magic/Magdir/wordprocessors b/magic/Magdir/wordprocessors
index effe492b11eb66cbd0622e95fd9448fcc8375b52..369fd40cfd6ea01fc02e460821c6f10d750b0dc6 100644 (file)
--- a/magic/Magdir/wordprocessors
+++ b/magic/Magdir/wordprocessors
@@ -110,3 +110,8 @@
 0       string  CSBK    Ted Neslson's CosmicBook hypertext file
 
 2       string  EYWR    AmigaWriter file
+
+# chi:  file(1) magic for ChiWriter files
+0       string          \\1cw\          ChiWriter file
+>5      string          >\0             version %s
+0       string          \\1cw           ChiWriter file

diff --git a/magic/Makefile.am b/magic/Makefile.am
index 781af60071640f5b8e73bc2b77a48ba3fe9897fa..7b6c73a0808641d0fdc987aa630e2833bd4d8720 100644 (file)
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -55,7 +55,6 @@ Magdir/cad \
 Magdir/c-lang \
 Magdir/c64 \
 Magdir/cddb \
-Magdir/chi \
 Magdir/chord \
 Magdir/cisco \
 Magdir/citrus \