Changeset 3409

Timestamp:

09/14/08 17:22:43 (16 years ago)

Author:

jerome

Message:

Added basic support for Brother's XL2HB Page Description Language, thanks to Geovanny Junio.

Location:

pkpgcounter/trunk

Files:

• CREDITS (modified) (1 diff)
• pkpgpdls/pclxl.py (modified) (5 diffs)
• README (modified) (2 diffs)

pkpgcounter/trunk/CREDITS

@@ -42 +42 @@
                    made printer drivers.
 
+  - Geovanny Junio : Sent a patch to support Brother's XL2HB Page
+                     Description Language.
+
 ==============================================================
 

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -1 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # pkpgcounter : a generic Page Description Language parser
@@ -83 +83 @@
             
     def isValid(self) :    
-        """Returns True if data is PCLXL aka PCL6, else False."""
+        """Returns True if data is HP PCLXL aka PCL6, or Brother's' XL2HB, else False."""
         if (((self.firstblock[:128].find("\033%-12345X") != -1) and \
              (self.firstblock.find(" HP-PCL XL;") != -1) and \
@@ -89 +89 @@
               (self.firstblock.find("LANGUAGE = PCLXL") != -1)))) \
              or ((self.firstblock.startswith(chr(0xcd)+chr(0xca)) and (self.firstblock.find(" HP-PCL XL;") != -1))) :
+            return True
+        elif (self.firstblock[:128].find("\033%-12345X") != -1) \
+            and (self.firstblock.find("BROTHER XL2HB;") != -1) :
+            self.format = "XL2HB"
             return True
         else :    
@@ -255 +259 @@
         """Skip the 'HP-PCL XL' statement if needed."""
         minfile = self.minfile
-        if nextpos and (minfile[nextpos:nextpos+11] == " HP-PCL XL;") :
+        if nextpos \
+           and ((minfile[nextpos:nextpos+11] == " HP-PCL XL;") \
+             or (minfile[nextpos:nextpos+14] == " BROTHER XLHB;")) :
             pos = nextpos
             while minfile[pos] != '\n' :
@@ -378 +384 @@
             if not line :
                 break
-            pos = line.find(" HP-PCL XL;")    
+            pos = line.find(" HP-PCL XL;")
+            if pos == -1 :
+                pos = line.find(" BROTHER XL2HB;")
             if pos != -1 :
                 found = True

pkpgcounter/trunk/README

@@ -56 +56 @@
         
         - Brother HBP
+
+        - Brother XL2HB
         
         - Hewlett-Packard Lightweight Imaging Device Interface Language
@@ -65 +67 @@
         - ASCII PNM (Netpbm)
         
-The ten latter ones, as well as some TIFF documents, are currently 
+The eleven latter ones, as well as some TIFF documents, are currently 
 only supported in page counting mode.