more magic

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 037bb7e9c312bf12e74c6c55cab66141c39c7d8a..0ed435d3ecb2ce20a05c20947bd068128a8e2e3b 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -496,8 +496,21 @@
 # Bio-Rad .PIC is an image format used by microscope control systems
 # and related image processing software used by biologists.
 # From: Vebjorn Ljosa <vebjorn@ljosa.com>
-54             leshort 12345           Bio-Rad .PIC Image File
->0             leshort >0              %hd x
->2             leshort >0              %hd,
->4             leshort =1              1 image in file
->4             leshort >1              %hd images in file
+54     leshort 12345           Bio-Rad .PIC Image File
+>0     leshort >0              %hd x
+>2     leshort >0              %hd,
+>4     leshort =1              1 image in file
+>4     leshort >1              %hd images in file
+
+# From Jan "Yenya" Kasprzak <kas@fi.muni.cz>
+# The description of *.mrw format can be found at
+# http://www.dalibor.cz/minolta/raw_file_format.htm
+0      string  \000MRM                 Minolta Dimage camera raw image data
+
+# From: stephane.loeuillet@tiscali.f
+# http://www.djvuzone.org/
+0      string  AT&TFORM                DjVu Image file
+
+# From: Jason Bacon <bacon@smithers.neuro.mcw.edu>
+0      beshort 0x3020                  character Computer Graphics Metafile
+

diff --git a/magic/Magdir/macintosh b/magic/Magdir/macintosh
index b4a32d0e70b2cfe04ec378a49753f98771a46b38..91364a0c67dd8d43f7a9d9fe9b781ed09bcd0fe2 100644 (file)
--- a/magic/Magdir/macintosh
+++ b/magic/Magdir/macintosh
@@ -355,3 +355,6 @@
 >>>>0xa30      string          x               fourth type: %s,
 >>>>0xa10      string          x               name: %s,
 >>>>0xa54      belong          x               number of blocks: %d
+
+# From: Remi Mommsen <mommsen@slac.stanford.edu>
+0              string          BOMStore        Mac OS X bill of materials (BOM) fil

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index f2c1e6f39bb231ce820e3d901e86e6c88fb8d165..987dcf1f9bdf8639ae141d81cad49d19215fe48d 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -358,3 +358,7 @@
 
 # Outlook Personal Folders
 0      lelong  0x4E444221      Microsoft Outlook binary email folder
+
+# From: Dirk Jagdmann <doj@cubic.org>
+0      lelong  0x00035f3f      Windows 3.x help file
+

diff --git a/magic/magic.mime b/magic/magic.mime
index 6bdf09602fdbb6930cf1282b1fca3ba68bb289f8..3aa33cf7d5e6ddc8b0b2c70f0a38cd6f4a49eef2 100644 (file)
--- a/magic/magic.mime
+++ b/magic/magic.mime
@@ -785,3 +785,6 @@
 >>0xbc  string          DIVX            video/x-DivX
 >8      string          WAVE            audio/x-wav
 
+# From: stephane.loeuillet@tiscali.f
+# http://www.djvuzone.org/
+0      string          AT&TFORM        image/x.djvu