more magic fixes

diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index 829c9460653ba14e75c8c434004a5b1911f97eb2..fd9d7715d71b5cd3ee543e3b049fd7834ad0b123 100644 (file)
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -475,10 +475,6 @@
 # From: Emanuel Haupt <ehaupt@critical.ch>
 0      string          ZXAYEMUL        Spectrum 128 tune
 
-# From: Alex Beregszaszi <alex@fsn.hu>
-0      string          MP+             Musepack
->3     byte&0x0f       x               SV%d
-
 0      string          \0BONK          BONK,
 #>5    byte            x               version %d
 >14    byte            x               %d channel(s),

diff --git a/magic/Magdir/cad b/magic/Magdir/cad
index fbb2fa30af26fcd47a7258c350ae43aba744f1b9..e2562abb352027011bea5d01dfcd8aa052767db4 100644 (file)
--- a/magic/Magdir/cad
+++ b/magic/Magdir/cad
@@ -53,3 +53,18 @@
 0      string AC1012   AutoCad (release 12)
 0      string AC1013   AutoCad (release 13)
 0      string AC1014   AutoCad (release 14)
+
+# CAD: file(1) magic for computer aided design files
+# Phillip Griffith <phillip dot griffith at gmail dot com>
+# AutoCAD magic taken from the Open Design Alliance's OpenDWG 
+specifications.
+#
+0      belong  0x08051700      Bentley/Intergraph MicroStation DGN cell library
+0      belong  0x0809fe02      Bentley/Intergraph MicroStation DGN vector CAD
+0      belong  0xc809fe02      Bentley/Intergraph MicroStation DGN vector CAD
+0      beshort 0x0809          Bentley/Intergraph MicroStation
+>0x02  byte    0xfe
+>>0x04 beshort 0x1800          CIT raster CAD
+0      string  AC1012          AutoDesk AutoCAD R13
+0      string  AC1014          AutoDesk AutoCAD R14 
+0      string  AC1015          AutoDesk AutoCAD R2000

diff --git a/magic/Magdir/editors b/magic/Magdir/editors
index 7edbe8bc6b648632b627cfd4e67e98546de1b0da..02826fa071e16640e07fa064fe2ecdd335d07b79 100644 (file)
--- a/magic/Magdir/editors
+++ b/magic/Magdir/editors
@@ -11,3 +11,6 @@
 # Vi IMproved Encrypted file 
 # by David Necas <yeti@physics.muni.cz>
 0      string  VimCrypt~       Vim encrypted file data
+# Vi IMproved Swap file
+# by Sven Wegener <swegener@gentoo.org>
+0      string  b0VIM\          Vim swap file, version %s

diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index b2eb247362b29b437d70d79f21f61163d8398978..18c9762da11044e4233adacb7a88f01f7b0f75cc 100644 (file)
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -96,7 +96,7 @@
 >>18   leshort         51              Stanford MIPS-X,
 >>18   leshort         52              Motorola Coldfire,
 >>18   leshort         53              Motorola M68HC12,
->>18   leshort         62              AMD x86-64,
+>>18   leshort         62              x86-64,
 >>18   leshort         75              Digital VAX,
 >>18   leshort         88              Renesas M32R,
 >>18   leshort         97              NatSemi 32k,

diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 5563ef761520ff56f96f185fbf0468612d9e9b33..dd4910a99dd57b35eaff54956681070a65505c73 100644 (file)
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -923,15 +923,15 @@
 0      string  VoIP\ Startup\ and      Aculab VoIP firmware
 >35    string  x       format %s
 
-# PPCBoot image file
+# u-boot/PPCBoot image file
 # From: Mark Brown <broonie@sirena.org.uk>
-0      belong  0x27051956      PPCBoot image
+0      belong  0x27051956      u-boot/PPCBoot image
 >4     string  PPCBoot
 >>12   string  x               version %s
 
 # JFFS2 file system
-0       leshort         0x1984                  Linux old jffs2 filesystem data little endian
-0       lelong          0xe0011985              Linux jffs2 filesystem data little endian
+0      leshort 0x1984          Linux old jffs2 filesystem data little endian
+0      leshort 0x1985          Linux jffs2 filesystem data little endian
 
 # Squashfs
 0      string  sqsh    Squashfs filesystem, big endian,

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 0eeb33d2faa6ebab66e632ee010a35ba2a31c685..4f226dd9bc9425e06d137a960f72ec448911307b 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -592,10 +592,16 @@
 >>(64.l)  lestring16 >0 Description: %15.15s
 
 # From: Alex Beregszaszi <alex@fsn.hu>
-0      string  COWD            VMWare3 disk image
->12    belong  x               %d bytes
+0      string  COWD            VMWare3
+>4     byte    3               disk image
+>>32   lelong  x               (%d/
+>>36   lelong  x               \b%d/
+>>40   lelong  x               \b%d)
+>4     byte    2               undoable disk image
+>>32   string  >\0             (%s)
 
 0      string  VMDK             VMware4 disk image
+0      string  KDMV             VMware4 disk image
 
 0      belong  0x514649fb      QEMU Copy-On-Write disk image
 >4     belong  x               version %d,

diff --git a/magic/Magdir/riff b/magic/Magdir/riff
index 01c6f1b16ae3bf1900c9e5869a41f5dd9e315c61..5aa9d109388d25c92aabf26d51c2a677f20270d9 100644 (file)
--- a/magic/Magdir/riff
+++ b/magic/Magdir/riff
@@ -122,6 +122,7 @@
 >>>>>>>(104.l+132)      string/c        iv50    Indeo 5.0
 >>>>>>>(104.l+132)      string/c        mp42    Microsoft MPEG-4 v2
 >>>>>>>(104.l+132)      string/c        mp43    Microsoft MPEG-4 v3
+>>>>>>>(104.l+132)      string/c        fmp4    FFMpeg MPEG-4
 >>>>>>>(104.l+132)      string/c        mjpg    Motion JPEG
 >>>>>>>(104.l+132)      string/c        div3    DivX 3
 >>>>>>>>112             string/c        div3    Low-Motion

diff --git a/magic/Magdir/sysex b/magic/Magdir/sysex
index e2a4bd827d2e243d5341316bcf78a66cc3f28c5a..03d6cdd6b78a1490272824e580d22c82847586b5 100644 (file)
--- a/magic/Magdir/sysex
+++ b/magic/Magdir/sysex
@@ -11,7 +11,28 @@
 >1     byte                    0x04            Moog
 >1     byte                    0x05            Passport
 >1     byte                    0x06            Lexicon
->1     byte                    0x07            Kurzweil
+>1     byte                    0x07            Kurzweil/Future Retro
+>>3    byte                    0x77            777
+>>4    byte                    0x00            Bank
+>>4    byte                    0x01            Song
+>>5    byte                    0x0f            16
+>>5    byte                    0x0e            15
+>>5    byte                    0x0d            14
+>>5    byte                    0x0c            13
+>>5    byte                    0x0b            12
+>>5    byte                    0x0a            11
+>>5    byte                    0x09            10
+>>5    byte                    0x08            9
+>>5    byte                    0x07            8
+>>5    byte                    0x06            7
+>>5    byte                    0x05            6
+>>5    byte                    0x04            5
+>>5    byte                    0x03            4
+>>5    byte                    0x02            3
+>>5    byte                    0x01            2
+>>5    byte                    0x00            1
+>>5    byte                    0x10            (ALL)
+>>2    byte                    x                       \b, Channel %d
 >1     byte                    0x08            Fender
 >1     byte                    0x09            Gulbransen
 >1     byte                    0x0a            AKG
@@ -21,6 +42,12 @@
 >1     byte                    0x0e            Garfield
 >1     byte                    0x0f            Ensoniq
 >1     byte                    0x10            Oberheim
+>>2    byte                    0x06            Matrix 6 series
+>>3    byte                    0x0A            Dump (All)
+>>3    byte                    0x01            Dump (Bank)
+>>4 belong                     0x0002040E              Matrix 1000
+>>>11 byte                     <2                      User bank %d
+>>>11 byte                     >1                      Preset bank %d
 >1     byte                    0x11            Apple
 >1     byte                    0x12            GreyMatter
 >1     byte                    0x14            PalmTree
@@ -52,11 +79,107 @@
 >>3    byte                    0x09            EK-44
 
 >1     byte                    0x30            Dynacord
+>1     byte                    0x31            Jomox
 >1     byte                    0x33            Clavia
 >1     byte                    0x39            Soundcraft
-
+# Some Waldorf info from http://Stromeko.Synth.net/Downloads#WaldorfDocs
 >1     byte                    0x3e            Waldorf
+>>2    byte                    0x00            microWave
+>>2    byte                    0x0E            microwave2 / XT
+>>2    byte                    0x0F            Q / Q+
+>>3    byte                    =0                      (default id)
+>>3 byte                       >0                      (
+>>>3 byte                      <0x7F           \bdevice %d)
+>>>3 byte                      =0x7F           \bbroadcast id)
 >>3    byte                    0x7f            Microwave I
+>>>4   byte                    0x00            SNDR (Sound Request)
+>>>4   byte                    0x10            SNDD (Sound Dump)
+>>>4   byte                    0x20            SNDP (Sound Parameter Change)
+>>>4   byte                    0x30            SNDQ (Sound Parameter Inquiry)
+>>>4   byte                    0x70            BOOT (Sound Reserved)
+>>>4   byte                    0x01            MULR (Multi Request)
+>>>4   byte                    0x11            MULD (Multi Dump)
+>>>4   byte                    0x21            MULP (Multi Parameter Change)
+>>>4   byte                    0x31            MULQ (Multi Parameter Inquiry)
+>>>4   byte                    0x71            OS (Multi Reserved)
+>>>4   byte                    0x02            DRMR (Drum Map Request)
+>>>4   byte                    0x12            DRMD (Drum Map Dump)
+>>>4   byte                    0x22            DRMP (Drum Map Parameter Change)
+>>>4   byte                    0x32            DRMQ (Drum Map Parameter Inquiry)
+>>>4   byte                    0x72            BIN (Drum Map Reserved)
+>>>4   byte                    0x03            PATR (Sequencer Pattern Request)
+>>>4   byte                    0x13            PATD (Sequencer Pattern Dump)
+>>>4   byte                    0x23            PATP (Sequencer Pattern Parameter Change)
+>>>4   byte                    0x33            PATQ (Sequencer Pattern Parameter Inquiry)
+>>>4   byte                    0x73            AFM (Sequencer Pattern Reserved)
+>>>4   byte                    0x04            GLBR (Global Parameter Request)
+>>>4   byte                    0x14            GLBD (Global Parameter Dump)
+>>>4   byte                    0x24            GLBP (Global Parameter Parameter Change)
+>>>4   byte                    0x34            GLBQ (Global Parameter Parameter Inquiry)
+>>>4   byte                    0x07            MODR (Mode Parameter Request)
+>>>4   byte                    0x17            MODD (Mode Parameter Dump)
+>>>4   byte                    0x27            MODP (Mode Parameter Parameter Change)
+>>>4   byte                    0x37            MODQ (Mode Parameter Parameter Inquiry)
+>>2    byte                    0x10            microQ
+>>>4   byte                    0x00            SNDR (Sound Request)
+>>>4   byte                    0x10            SNDD (Sound Dump)
+>>>4   byte                    0x20            SNDP (Sound Parameter Change)
+>>>4   byte                    0x30            SNDQ (Sound Parameter Inquiry)
+>>>4   byte                    0x70            (Sound Reserved)
+>>>4   byte                    0x01            MULR (Multi Request)
+>>>4   byte                    0x11            MULD (Multi Dump)
+>>>4   byte                    0x21            MULP (Multi Parameter Change)
+>>>4   byte                    0x31            MULQ (Multi Parameter Inquiry)
+>>>4   byte                    0x71            OS (Multi Reserved)
+>>>4   byte                    0x02            DRMR (Drum Map Request)
+>>>4   byte                    0x12            DRMD (Drum Map Dump)
+>>>4   byte                    0x22            DRMP (Drum Map Parameter Change)
+>>>4   byte                    0x32            DRMQ (Drum Map Parameter Inquiry)
+>>>4   byte                    0x72            BIN (Drum Map Reserved)
+>>>4   byte                    0x04            GLBR (Global Parameter Request)
+>>>4   byte                    0x14            GLBD (Global Parameter Dump)
+>>>4   byte                    0x24            GLBP (Global Parameter Parameter Change)
+>>>4   byte                    0x34            GLBQ (Global Parameter Parameter Inquiry)
+>>2    byte                    0x11            rackAttack
+>>>4   byte                    0x00            SNDR (Sound Parameter Request)
+>>>4   byte                    0x10            SNDD (Sound Parameter Dump)
+>>>4   byte                    0x20            SNDP (Sound Parameter Parameter Change)
+>>>4   byte                    0x30            SNDQ (Sound Parameter Parameter Inquiry)
+>>>4   byte                    0x01            PRGR (Program Parameter Request)
+>>>4   byte                    0x11            PRGD (Program Parameter Dump)
+>>>4   byte                    0x21            PRGP (Program Parameter Parameter Change)
+>>>4   byte                    0x31            PRGQ (Program Parameter Parameter Inquiry)
+>>>4   byte                    0x71            OS (Program Parameter Reserved)
+>>>4   byte                    0x03            PATR (Pattern Parameter Request)
+>>>4   byte                    0x13            PATD (Pattern Parameter Dump)
+>>>4   byte                    0x23            PATP (Pattern Parameter Parameter Change)
+>>>4   byte                    0x33            PATQ (Pattern Parameter Parameter Inquiry)
+>>>4   byte                    0x04            GLBR (Global Parameter Request)
+>>>4   byte                    0x14            GLBD (Global Parameter Dump)
+>>>4   byte                    0x24            GLBP (Global Parameter Parameter Change)
+>>>4   byte                    0x34            GLBQ (Global Parameter Parameter Inquiry)
+>>>4   byte                    0x05            EFXR (FX Parameter Request)
+>>>4   byte                    0x15            EFXD (FX Parameter Dump)
+>>>4   byte                    0x25            EFXP (FX Parameter Parameter Change)
+>>>4   byte                    0x35            EFXQ (FX Parameter Parameter Inquiry)
+>>>4   byte                    0x07            MODR (Mode Command Request)
+>>>4   byte                    0x17            MODD (Mode Command Dump)
+>>>4   byte                    0x27            MODP (Mode Command Parameter Change)
+>>>4   byte                    0x37            MODQ (Mode Command Parameter Inquiry)
+>>2    byte                    0x03            Wave
+>>>4   byte                    0x00            SBPR (Soundprogram)
+>>>4   byte                    0x01            SAPR (Performance)
+>>>4   byte                    0x02            SWAVE (Wave)
+>>>4   byte                    0x03            SWTBL (Wave control table)
+>>>4   byte                    0x04            SVT (Velocity Curve)
+>>>4   byte                    0x05            STT (Tuning Table)
+>>>4   byte                    0x06            SGLB (Global Parameters)
+>>>4   byte                    0x07            SARRMAP (Performance Program Change Map)
+>>>4   byte                    0x08            SBPRMAP (Sound Program Change Map)
+>>>4   byte                    0x09            SBPRPAR (Sound Parameter)
+>>>4   byte                    0x0A            SARRPAR (Performance Parameter)
+>>>4   byte                    0x0B            SINSPAR (Instrument/External Parameter)
+>>>4   byte                    0x0F            SBULK (Bulk Switch on/off)
 
 # Japanese Group
 >1     byte                    0x40            Kawai

diff --git a/magic/Magdir/vmware b/magic/Magdir/vmware
index 6af543c435de198ace1f945acb96ebe71209b019..28e19e57a8990ebcd2e2ced2115caf2283d749d8 100644 (file)
--- a/magic/Magdir/vmware
+++ b/magic/Magdir/vmware
@@ -3,10 +3,3 @@
 # VMware specific files (deducted from version 1.1 and log file entries)
 # Anthon van der Neut (anthon@mnt.org)
 0      belong  0x4d52564e      VMware nvram 
-0      belong  0x434f5744      VMware
->4     byte    3               virtual disk 
->>32   lelong  x               (%d/
->>36   lelong  x               \b%d/
->>40   lelong  x               \b%d)
->4     byte    2               undoable disk
->>32   string  >\0             (%s)

diff --git a/magic/Magdir/wordprocessors b/magic/Magdir/wordprocessors
index 0ac97baafa52c374ee0f7801b4b4568204a849e9..7af0c42bf709ad63daad47f02326a3649544e8cb 100644 (file)
--- a/magic/Magdir/wordprocessors
+++ b/magic/Magdir/wordprocessors
@@ -104,7 +104,9 @@
 #end of WordPerfect type files Version 1.6 - PLEASE DO NOT REMOVE THIS LINE
 
 # Hangul (Korean) Word Processor File
-0      string  HWP\ Document\ File     Hangul (Korean) Word Processor File
+0      string  HWP\ Document\ File     Hangul (Korean) Word Processor File 3.0
+# From: Won-Kyu Park <wkpark@kldp.org>
+512    string          R\0o\0o\0t\0    Hangul (Korean) Word Processor File 2000
 
 # CosmicBook, from Benoît Rouits
 0       string  CSBK    Ted Neslson's CosmicBook hypertext file
@@ -121,3 +123,7 @@
 2      string  IIXPRa                  Intel Quark Express Document (Korean)
 2      string  MMXPR3                  Motorola Quark Express Document (English)
 2      string  MMXPRa                  Motorola Quark Express Document (Korean)
+
+# adobe indesign (document, whatever...) from querkan
+0      belong  0x0606edf5              Adobe InDesign
+>16    string  DOCUMENT                Document

diff --git a/magic/Magdir/xwindows b/magic/Magdir/xwindows
index 1805d45b9282a94c63d9de04f63fd3a08fe6ae55..57f3b083f3b3e66f2713b1d5ff2399b7646bef75 100644 (file)
--- a/magic/Magdir/xwindows
+++ b/magic/Magdir/xwindows
@@ -13,7 +13,7 @@
 
 # xfsdump archive
 0      string  xFSdump0                        xfsdump archive
->8     long    x       (version %d)
+>8     belong  x       (version %d)
 
 # Jaleo XFS files
 0      long    395726                          Jaleo XFS file