Changeset 262 for pkpgcounter

Timestamp:

09/15/05 09:37:46 (19 years ago)

Author:

jerome

Message:

Improved the PCL3/4/5 parser a bit.

Location:

pkpgcounter/trunk

Files:

• NEWS (modified) (1 diff)
• pkpgpdls/pcl345.py (modified) (1 diff)
• pkpgpdls/version.py (modified) (1 diff)

pkpgcounter/trunk/NEWS

@@ -22 +22 @@
 pkpgcounter News :
    
+  * 1.67 :
+  
+    - Improved PostScript parser.
+    
+    - Improved PCL3/4/5 parser.
+    
   * 1.66 : 
   

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -309 +309 @@
             sys.stderr.write("escstart : %s\n" % escstart)
         
-        if resets == ejects == mediasourcecount == mediasizecount == escstart == 1 :
-            pagecount = orientationcount
+        if pagecount and (pagecount == orientationcount) :
+            pass
+        elif resets == ejects == mediasourcecount == mediasizecount == escstart == 1 :
+            if (startgfx and endgfx) and (startgfx != endgfx) :
+                pagecount = orientationcount
+            else :     
+                pagecount += 1
+        elif (ejects == mediasourcecount == orientationcount) and (startgfx == endgfx) :     
+            pass
         elif pagecount == mediasourcecount == escstart : 
             pass        # should be OK.

pkpgcounter/trunk/pkpgpdls/version.py

@@ -20 +20 @@
 #
 
-__version__ = "1.66"
+__version__ = "1.67"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""