Index: /pkpgcounter/trunk/pkpgpdls/tiff.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/tiff.py (revision 372)
+++ /pkpgcounter/trunk/pkpgpdls/tiff.py (revision 387)
@@ -35,12 +35,12 @@
     totiffcommand = "cat >%(fname)s"
     def isValid(self) :        
-        """Returns 1 if data is TIFF, else 0."""
+        """Returns True if data is TIFF, else False."""
         littleendian = (chr(0x49)*2) + chr(0x2a) + chr(0)
         bigendian = (chr(0x4d)*2) + chr(0) + chr(0x2a)
         if self.firstblock[:4] in (littleendian, bigendian) :
             self.logdebug("DEBUG: Input file is in the TIFF format.")
-            return 1
+            return True
         else :    
-            return 0
+            return False
     
     def getJobSize(self) :
Index: /pkpgcounter/trunk/pkpgpdls/pdlparser.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/pdlparser.py (revision 371)
+++ /pkpgcounter/trunk/pkpgpdls/pdlparser.py (revision 387)
@@ -78,5 +78,5 @@
             
     def isValid(self) :    
-        """Returns 1 if data is in the expected format, else 0."""
+        """Returns True if data is in the expected format, else False."""
         raise RuntimeError, "Not implemented !"
         
Index: /pkpgcounter/trunk/pkpgpdls/ooo.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/ooo.py (revision 357)
+++ /pkpgcounter/trunk/pkpgpdls/ooo.py (revision 387)
@@ -32,5 +32,5 @@
     """A parser for OpenOffice.org documents."""
     def isValid(self) :        
-        """Returns 1 if data is DVI, else 0."""
+        """Returns True if data is OpenDocument, else False."""
         if self.firstblock[:2] == "PK" :
             try :
@@ -39,10 +39,10 @@
                 self.metaxml = self.archive.read("meta.xml")
             except :    
-                return 0
+                return False
             else :
-                self.logdebug("DEBUG: Input file is in the OpenOffice.org format.")
-                return 1
+                self.logdebug("DEBUG: Input file is in the OpenDocument (ISO/IEC DIS 26300) format.")
+                return True
         else :    
-            return 0
+            return False
             
     def getJobSize(self) :
Index: /pkpgcounter/trunk/pkpgpdls/zjstream.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/zjstream.py (revision 385)
+++ /pkpgcounter/trunk/pkpgpdls/zjstream.py (revision 387)
@@ -34,15 +34,15 @@
     """A parser for ZjStream documents."""
     def isValid(self) :    
-        """Returns 1 if data is ZjStream, else 0."""
+        """Returns True if data is ZjStream, else False."""
         if self.firstblock[:4] == "ZJZJ" :
             self.logdebug("DEBUG: Input file is in the Zenographics ZjStream (little endian) format.")
             self.littleEndian()
-            return 1
+            return True
         elif self.firstblock[:4] == "JZJZ" :    
             self.logdebug("DEBUG: Input file is in the Zenographics ZjStream (big endian) format.")
             self.bigEndian()
-            return 1
+            return True
         else :    
-            return 0
+            return False
         
     def littleEndian(self) :
Index: /pkpgcounter/trunk/pkpgpdls/qpdl.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/qpdl.py (revision 386)
+++ /pkpgcounter/trunk/pkpgpdls/qpdl.py (revision 387)
@@ -73,12 +73,12 @@
             
     def isValid(self) :    
-        """Returns 1 if data is PCLXL aka PCL6, else 0."""
+        """Returns True if data is QPDL aka SPL2, else False."""
         if ((self.firstblock[:128].find("\033%-12345X") != -1) and \
              ((self.firstblock.find("LANGUAGE=QPDL") != -1) or \
               (self.firstblock.find("LANGUAGE = QPDL") != -1))) :
             self.logdebug("DEBUG: Input file is in the QPDL (aka SPL2) format.")
-            return 1
+            return True
         else :    
-            return 0
+            return False
             
     def beginPage(self, nextpos) :
Index: /pkpgcounter/trunk/pkpgpdls/pdf.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/pdf.py (revision 371)
+++ /pkpgcounter/trunk/pkpgpdls/pdf.py (revision 387)
@@ -45,5 +45,5 @@
     totiffcommand = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
     def isValid(self) :    
-        """Returns 1 if data is PDF, else 0."""
+        """Returns True if data is PDF, else False."""
         if self.firstblock.startswith("%PDF-") or \
            self.firstblock.startswith("\033%-12345X%PDF-") or \
@@ -51,7 +51,7 @@
            (self.firstblock.find("%PDF-") != -1) :
             self.logdebug("DEBUG: Input file is in the PDF format.")
-            return 1
+            return True
         else :    
-            return 0
+            return False
         
     def getJobSize(self) :    
Index: /pkpgcounter/trunk/pkpgpdls/postscript.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/postscript.py (revision 384)
+++ /pkpgcounter/trunk/pkpgpdls/postscript.py (revision 387)
@@ -36,5 +36,5 @@
     totiffcommand = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
     def isValid(self) :    
-        """Returns 1 if data is PostScript, else 0."""
+        """Returns True if data is PostScript, else False."""
         if self.firstblock.startswith("%!") or \
            self.firstblock.startswith("\004%!") or \
@@ -46,7 +46,7 @@
               (self.firstblock.find("%!PS-Adobe") != -1) :
             self.logdebug("DEBUG: Input file is in the PostScript format.")
-            return 1
+            return True
         else :    
-            return 0
+            return False
         
     def throughGhostScript(self) :
Index: /pkpgcounter/trunk/pkpgpdls/pcl345.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/pcl345.py (revision 375)
+++ /pkpgcounter/trunk/pkpgpdls/pcl345.py (revision 387)
@@ -84,5 +84,5 @@
         
     def isValid(self) :    
-        """Returns 1 if data is PCL, else 0."""
+        """Returns True if data is PCL3/4/5, else False."""
         if self.firstblock.startswith("\033E\033") or \
            (self.firstblock.startswith("\033*rbC") and (not self.lastblock[-3:] == "\f\033@")) or \
@@ -92,7 +92,7 @@
            (self.firstblock.startswith(chr(0xcd)+chr(0xca)) and self.firstblock.find("\033E\033")) :
             self.logdebug("DEBUG: Input file is in the PCL3/4/5 format.")
-            return 1
+            return True
         else :    
-            return 0
+            return False
         
     def setPageDict(self, pages, number, attribute, value) :
Index: /pkpgcounter/trunk/pkpgpdls/escp2.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/escp2.py (revision 357)
+++ /pkpgcounter/trunk/pkpgpdls/escp2.py (revision 387)
@@ -31,5 +31,5 @@
     """A parser for ESC/P2 documents."""
     def isValid(self) :        
-        """Returns 1 if data is ESC/P2, else 0."""
+        """Returns True if data is ESC/P2, else False."""
         if self.firstblock.startswith("\033@") or \
            self.firstblock.startswith("\033*") or \
@@ -37,7 +37,7 @@
            self.firstblock.startswith("\0\0\0\033\1@EJL") : # ESC/P Raster ??? Seen on Stylus Photo 1284
             self.logdebug("DEBUG: Input file is in the ESC/P2 format.")
-            return 1
+            return True
         else :    
-            return 0
+            return False
             
     def getJobSize(self) :    
Index: /pkpgcounter/trunk/pkpgpdls/pclxl.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/pclxl.py (revision 375)
+++ /pkpgcounter/trunk/pkpgpdls/pclxl.py (revision 387)
@@ -81,5 +81,5 @@
             
     def isValid(self) :    
-        """Returns 1 if data is PCLXL aka PCL6, else 0."""
+        """Returns True if data is PCLXL aka PCL6, else False."""
         if ((self.firstblock[:128].find("\033%-12345X") != -1) and \
              (self.firstblock.find(" HP-PCL XL;") != -1) and \
@@ -87,7 +87,7 @@
               (self.firstblock.find("LANGUAGE = PCLXL") != -1))) :
             self.logdebug("DEBUG: Input file is in the PCLXL (aka PCL6) format.")
-            return 1
+            return True
         else :    
-            return 0
+            return False
             
     def beginPage(self, nextpos) :
Index: /pkpgcounter/trunk/pkpgpdls/dvi.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/dvi.py (revision 373)
+++ /pkpgcounter/trunk/pkpgpdls/dvi.py (revision 387)
@@ -35,13 +35,13 @@
     totiffcommand = 'cat >%(fname)s && dvips -q -o - %(fname)s | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
     def isValid(self) :        
-        """Returns 1 if data is DVI, else 0."""
+        """Returns True if data is DVI, else False."""
         try :
             if (ord(self.firstblock[0]) == 0xf7) and (ord(self.lastblock[-1]) == 0xdf) :
                 self.logdebug("DEBUG: Input file is in the DVI format.")
-                return 1
+                return True
             else :    
-                return 0
+                return False
         except IndexError :          
-            return 0
+            return False
             
     def getJobSize(self) :
Index: /pkpgcounter/trunk/pkpgpdls/version.py
===================================================================
--- /pkpgcounter/trunk/pkpgpdls/version.py (revision 383)
+++ /pkpgcounter/trunk/pkpgpdls/version.py (revision 387)
@@ -23,5 +23,5 @@
 
 
-__version__ = "1.85alpha"
+__version__ = "1.85"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""
Index: /pkpgcounter/trunk/man/pkpgcounter.1
===================================================================
--- /pkpgcounter/trunk/man/pkpgcounter.1 (revision 386)
+++ /pkpgcounter/trunk/man/pkpgcounter.1 (revision 387)
@@ -2,7 +2,7 @@
 .TH PKPGCOUNTER "1" "September 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pkpgcounter \- manual page for pkpgcounter 1.85alpha
+pkpgcounter \- manual page for pkpgcounter 1.85
 .SH DESCRIPTION
-pkpgcounter v1.85alpha (c) 2003, 2004, 2005, 2006 Jerome Alet
+pkpgcounter v1.85 (c) 2003, 2004, 2005, 2006 Jerome Alet
 .PP
 pkpgcounter is a generic Page Description Language parser.
Index: /pkpgcounter/trunk/NEWS
===================================================================
--- /pkpgcounter/trunk/NEWS (revision 383)
+++ /pkpgcounter/trunk/NEWS (revision 387)
@@ -22,4 +22,10 @@
 pkpgcounter News :
 
+  * 1.85 :
+  
+    - Added support for Samsung QPDL (aka SPL2) file format in page
+      counting mode, thanks to the work done by Aur�en Croc on
+      reverse engineering the file format.
+      
   * 1.85alpha :
   
