Changeset 444

Timestamp:

01/22/07 23:09:19 (18 years ago)

Author:

jerome

Message:

Fixed a problem with PostScript? parser and some printer drivers.

Location:

pkpgcounter/trunk

Files:

• NEWS (modified) (1 diff)
• pkpgpdls/postscript.py (modified) (4 diffs)
• pkpgpdls/version.py (modified) (1 diff)

pkpgcounter/trunk/NEWS

@@ -22 +22 @@
 pkpgcounter News :
 
+  * 2.14 :
+  
+    - Fixed a problem with some PS drivers which don't output %%Page:
+      comments.
+      
   * 2.13 : 
    

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -90 +90 @@
         prescribe = 0 # Kyocera's Prescribe commands
         acrobatmarker = 0
+        pagescomment = None
         for line in self.infile.xreadlines() : 
             if (not prescribe) and line.startswith(r"%%BeginResource: procset pdf") \
@@ -98 +99 @@
             elif line.startswith("!R!") :
                 prescribe = 1
+            elif line.startswith(r"%%Pages: ") :
+                try :
+                    pagescomment = int(line.split()[1])
+                except ValueError :
+                    pass # strange, to say the least
             elif line.startswith(r"%%Page: ") or line.startswith(r"(%%[Page: ") :
                 proceed = 1
@@ -177 +183 @@
             pagecount += (copies - 1)
             self.logdebug("%s * page #%s" % (copies, pnum))
+            
+        if not pagecount and pagescomment :    
+            pagecount = pagescomment
         self.logdebug("Internal parser said : %s pages" % pagecount)
         return (pagecount, notrust)
@@ -185 +194 @@
         (nbpages, notrust) = self.natively()
         newnbpages = nbpages
-        if notrust :
+        if notrust or not nbpages :
             try :
                 newnbpages = self.throughGhostScript()

pkpgcounter/trunk/pkpgpdls/version.py

@@ -23 +23 @@
 
 
-__version__ = "2.14alpha"
+__version__ = "2.14"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""