Changeset 3495

Timestamp:

03/16/09 11:32:09 (16 years ago)

Author:

jerome

Message:

Now correctly handles the <ESC>$b???W sequences.
IMPORTANT : a post-parsing adjustment was done for ImageRunner?
documents, which incremented the page count. This adjustment **might**
have been needed because of this bug. A new adjustment is now done for
ImageRunner? files, which decrements the page count instead. Seems to
work on the set of test files. Fixes #40.

Files:

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

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -193 +193 @@
         #self.logdebug("AMP")
         self.handleTag(self.escamptags)
+
+    def escDollar(self) :
+        """Handles the ESC$ sequence."""
+        #self.logdebug("DOLLAR")
+        self.handleTag(self.escdollartags)
 
     def escStar(self) :
@@ -364 +369 @@
             if codop != self.imagerunnermarker2 :
                 self.pos += length
-            self.logdebug("IMAGERUNNERTAG SKIP %i AT %08x" % (self.pos-oldpos, self.pos))
+            self.logdebug("ImageRunner tag : Skip %i bytes from 0x%08x to 0x%08x" % (self.pos-oldpos,
+                                                                                     oldpos,
+                                                                                     self.pos))
         else :
             self.pos -= 1 # Adjust position
@@ -416 +423 @@
         self.esctags[ord('%')] = self.escPercent
         self.esctags[ord('*')] = self.escStar
+        self.esctags[ord('$')] = self.escDollar
         self.esctags[ord('&')] = self.escAmp
         self.esctags[ord('(')] = self.escLeftPar
@@ -441 +449 @@
         self.escstartags[ord('m')] = self.escSkipSomethingW
         self.escstartags[ord('v')] = self.escSkipSomethingW
+
+        self.escdollartags = [ lambda : None ] * 256
+        self.escdollartags[ord('b')] = self.escSkipSomethingW
 
         self.escleftpartags = [ lambda : None ] * 256
@@ -483 +494 @@
         self.logdebug("IsImageRunner : \t\t\t%s" % self.isimagerunner)
 
+#        if self.isimagerunner :
+#            self.logdebug("Adjusting PageCount : +1")
+#            self.pagecount += 1      # ImageRunner adjustment
         if self.isimagerunner :
-            self.logdebug("Adjusting PageCount : +1")
-            self.pagecount += 1      # ImageRunner adjustment
+            self.logdebug("Adjusting PageCount : -1")
+            self.pagecount -= 1      # ImageRunner adjustment
         elif self.linesperpage is not None :
             self.logdebug("Adjusting PageCount : +1")