Changeset 265

Timestamp:

09/19/05 13:18:44 (19 years ago)

Author:

jerome

Message:

Improved PCL3/4/5 parser

Files:

• pkpgcounter/trunk/pkpgpdls/pcl345.py (modified) (2 diffs)

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -309 +309 @@
             sys.stderr.write("escstart : %s\n" % escstart)
         
-        if pagecount and (pagecount == orientationcount) :
+        if (orientationcount == (pagecount - 1)) and (resets == 1) :
+            pagecount -= 1
+        elif pagecount and (pagecount == orientationcount) :
             pass
         elif resets == ejects == mediasourcecount == mediasizecount == escstart == 1 :
             if (startgfx and endgfx) and (startgfx != endgfx) :
+                pagecount = orientationcount
+            elif (endgfx and not startgfx) and (pagecount > orientationcount) :    
                 pagecount = orientationcount
             else :     
@@ -329 +333 @@
             pass
         elif (resets == 1) and (startgfx == endgfx) and (mediasourcecount == 0) :
-            pass
+            if (startgfx > 1) and (startgfx != (pagecount - 1)) :
+                pagecount -= 1
+            else :    
+                pass
         elif startgfx == endgfx :    
             pagecount = startgfx