PR/339: updates from Rick Richardson

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 41cddec270149728009d17cf463ccea32ce58e69..ee6ae1fd18eb5e219c494d42e6bbff85cf419d51 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.87 2013/12/11 14:14:20 christos Exp $
+# $File: images,v 1.88 2014/03/30 21:41:45 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -826,7 +826,7 @@
 0      string/t        [BitmapInfo2]   Polar Monitor Bitmap text
 !:mime image/x-polar-monitor-bitmap
 
-# From: Rick Richardson <rick.richardson@comcast.net>
+# From: Rick Richardson <rickrich@gmail.com>
 0      string  GARMIN\ BITMAP\ 01      Garmin Bitmap file
 
 # Type:        Ulead Photo Explorer5 (.pe5)

diff --git a/magic/Magdir/printer b/magic/Magdir/printer
index 342dd2883f58b7b730d5cd7a173f9fbca13e8e53..74ed35d5bbbde33329775a216bbf66fcbb3c2a88 100644 (file)
--- a/magic/Magdir/printer
+++ b/magic/Magdir/printer
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: printer,v 1.24 2011/05/08 16:34:51 christos Exp $
+# $File: printer,v 1.25 2011/05/20 23:31:46 christos Exp $
 # printer:  file(1) magic for printer-formatted files
 #
 
@@ -68,6 +68,22 @@
 0      string          \033%-12345X@PJL
 >&0    search/10000    %!                      PJL encapsulated PostScript document text
 
+# Rick Richardson <rickrich@gmail.com>
+
+# For Fuji-Xerox Printers - HBPL stands for Host Based Printer Language
+# For Oki Data Printers - HIPERC
+# For Konica Minolta Printers - LAVAFLOW
+# For Samsung Printers - QPDL
+# For HP Printers - ZJS stands for Zenographics ZJStream
+0      string          \033%-12345X@PJL        HP Printer Job Language data
+>0     search/10000    @PJL\ ENTER\ LANGUAGE=HBPL      - HBPL
+>0     search/10000    @PJL\ ENTER\ LANGUAGE=HIPERC    - Oki Data HIPERC
+>0     search/10000    @PJL\ ENTER\ LANGUAGE=LAVAFLOW  - Konica Minolta LAVAFLOW
+>0     search/10000    @PJL\ ENTER\ LANGUAGE=QPDL      - Samsung QPDL
+>0     search/10000    @PJL\ ENTER\ LANGUAGE\ =\ QPDL  - Samsung QPDL
+>0     search/10000    @PJL\ ENTER\ LANGUAGE=ZJS       - HP ZJS
+
+
 # HP Printer Control Language, Daniel Quinlan (quinlan@yggdrasil.com)
 0      string          \033E\033       HP PCL printer data
 >3     string          \&l0A           - default page size
@@ -108,7 +124,7 @@
 
 #------------------------------------------------------------------------------
 # zenographics:  file(1) magic for Zenographics ZjStream printer data
-# Rick Richardson  rickr@mn.rr.com
+# Rick Richardson <rickrich@gmail.com>
 0      string          JZJZ
 >0x12  string          ZZ              Zenographics ZjStream printer data (big-endian)
 0      string          ZJZJ
@@ -117,7 +133,7 @@
 
 #------------------------------------------------------------------------------
 # Oak Technologies printer stream
-# Rick Richardson <rickr@mn.rr.com>
+# Rick Richardson <rickrich@gmail.com>
 0       string          OAK
 >0x07  byte            0
 >0x0b  byte            0       Oak Technologies printer stream