Changeset 267

Timestamp:

09/19/05 14:25:12 (19 years ago)

Author:

jerome

Message:

Improved PCL3/4/5 parser.

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.69 :
+  
+    - Improved PCL3/4/5 parser.
+    
+    - Improved PCLXL parser wrt PJL stuff.
+    
   * 1.68 :
   

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -310 +310 @@
         
         if (orientationcount == (pagecount - 1)) and (resets == 1) :
+            self.logdebug("Rule #1")
             pagecount -= 1
         elif pagecount and (pagecount == orientationcount) :
-            pass
+            self.logdebug("Rule #2")
         elif resets == ejects == mediasourcecount == mediasizecount == escstart == 1 :
-            if (startgfx and endgfx) and (startgfx != endgfx) :
+            #if ((startgfx and endgfx) and (startgfx != endgfx)) or (startgfx == endgfx == 0) :
+            if (startgfx and endgfx) or (startgfx == endgfx == 0) :
+                self.logdebug("Rule #3")
                 pagecount = orientationcount
             elif (endgfx and not startgfx) and (pagecount > orientationcount) :    
+                self.logdebug("Rule #4")
                 pagecount = orientationcount
             else :     
+                self.logdebug("Rule #5")
                 pagecount += 1
         elif (ejects == mediasourcecount == orientationcount) and (startgfx == endgfx) :     
-            pass
+            if (resets == 2) and (orientationcount == (pagecount - 1)) and (orientationcount > 1) :
+                self.logdebug("Rule #6")
+                pagecount = orientationcount
         elif pagecount == mediasourcecount == escstart : 
-            pass        # should be OK.
+            self.logdebug("Rule #7")
         elif resets == startgfx == endgfx == mediasizecount == orientationcount == escstart == 1 :     
-            pass
+            self.logdebug("Rule #8")
         elif resets == startgfx == endgfx == (pagecount - 1) :    
-            pass
+            self.logdebug("Rule #9")
         elif (not startgfx) and (not endgfx) :
-            pass
+            self.logdebug("Rule #10")
         elif (resets == 2) and (startgfx == endgfx) and (mediasourcecount == 1) :
-            pass
+            if orientationcount == (pagecount - 1) :
+                self.logdebug("Rule #11")
+                pagecount = orientationcount
         elif (resets == 1) and (startgfx == endgfx) and (mediasourcecount == 0) :
             if (startgfx > 1) and (startgfx != (pagecount - 1)) :
+                self.logdebug("Rule #12")
                 pagecount -= 1
-            else :    
-                pass
         elif startgfx == endgfx :    
+            self.logdebug("Rule #13")
             pagecount = startgfx
         elif startgfx == (endgfx - 1) :    
+            self.logdebug("Rule #14")
             pagecount = startgfx
         elif (startgfx == 1) and not endgfx :    
+            self.logdebug("Rule #15")
             pass
         else :    
+            self.logdebug("Rule #16")
             pagecount = abs(startgfx - endgfx)
             

pkpgcounter/trunk/pkpgpdls/version.py

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