Changeset 452 for pkpgcounter/trunk/pkpgpdls

Timestamp:

03/15/07 19:48:25 (18 years ago)

Author:

jerome

Message:

v2.16 is out with a fix for some line based PCL3/4/5 drivers.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• pcl345.py (modified) (7 diffs)
• version.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -33 +33 @@
 
 NUL = chr(0x00)
+LINEFEED = chr(0x0a)
 FORMFEED = chr(0x0c)
 ESCAPE = chr(0x1b)
@@ -105 +106 @@
     def setPageDict(self, attribute, value) :
         """Initializes a page dictionnary."""
-        dic = self.pages.setdefault(self.pagecount, { "copies" : 1, "mediasource" : "Main", "mediasize" : "Default", "mediatype" : "Plain", "orientation" : "Portrait", "escaped" : "", "duplex": 0})
+        dic = self.pages.setdefault(self.pagecount, { "linescount" : 1,
+                                                      "copies" : 1, 
+                                                      "mediasource" : "Main", 
+                                                      "mediasize" : "Default", 
+                                                      "mediatype" : "Plain", 
+                                                      "orientation" : "Portrait", 
+                                                      "escaped" : "", 
+                                                      "duplex": 0 })
         dic[attribute] = value
         
@@ -226 +234 @@
                 self.setPageDict("copies", value)
                 #self.logdebug("COPIES %i" % value)
+            elif end == 'F' :    
+                self.linesperpagevalues.append(value)
+                self.linesperpage = value
+                #self.logdebug("LINES PER PAGE : %i" % self.linesperpage)
+            #else :
+            #    self.logdebug("Unexpected end <%s> and value <%s>" % (end, value))
                 
     def escAmpa(self) :    
@@ -293 +307 @@
                 #self.logdebug("SKIPTO %08x" % self.pos)
                 
+    def newLine(self) :            
+        """Handles new lines markers."""
+        if not self.hpgl2 :
+            dic = self.pages.get(self.pagecount, None)
+            if dic is None :
+                self.setPageDict("linescount", 1)                              
+                dic = self.pages.get(self.pagecount)
+            nblines = dic["linescount"]    
+            self.setPageDict("linescount", nblines + 1)                              
+            if (self.linesperpage is not None) \
+               and (dic["linescount"] > self.linesperpage) :
+                self.pagecount += 1
+        
     def getInteger(self) :    
         """Returns an integer value and the end character."""
@@ -360 +387 @@
         self.orientationsvalues = []
         self.mediatypesvalues = []
+        self.linesperpagevalues = []
+        self.linesperpage = None
         self.startgfx = []
         self.endgfx = []
@@ -368 +397 @@
         
         tags = [ lambda : None] * 256
+        tags[ord(LINEFEED)] = self.newLine
         tags[ord(FORMFEED)] = self.endPage
         tags[ord(ESCAPE)] = self.escape
@@ -442 +472 @@
         if self.isimagerunner :
             self.pagecount += 1      # ImageRunner adjustment
+        elif self.linesperpage is not None :    
+            self.pagecount += 1      # Adjusts for incomplete last page
         elif len(self.startgfx) == len(self.endgfx) == 0 :
             if self.resets % 2 :

pkpgcounter/trunk/pkpgpdls/version.py

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