Changeset 248

Timestamp:

08/20/05 17:56:22 (19 years ago)

Author:

jerome

Message:

Fixed PCLXL computation of number of copies for each page.
Now uses a similar routine in the PostScript? parser.
Added detection of a special number of copies setting for some PS drivers.

Location:

pkpgcounter/trunk

Files:

• NEWS (modified) (1 diff)
• pkpgpdls/pclxl.py (modified) (1 diff)
• pkpgpdls/postscript.py (modified) (4 diffs)
• pkpgpdls/version.py (modified) (1 diff)

pkpgcounter/trunk/NEWS

@@ -22 +22 @@
 pkpgcounter News :
    
+  * 1.61 :
+  
+    - Better handling of the number of copies in the PostScript parser.
+      Now the number can be different from page to page.
+    
   * 1.60 : 
   

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -495 +495 @@
             # but the formula below is still correct : we want 
             # to decrease the total number of pages in this case.
-            page = self.pages.get(pnum, 1)
+            page = self.pages.get(pnum, self.pages.get(1, { "copies" : 1 }))
             copies = page["copies"]
             self.pagecount += (copies - 1)

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -79 +79 @@
         self.infile.seek(0)
         pagecount = 0
+        pages = {}
+        pages[0] = { "copies" : 1 }
         for line in self.infile.xreadlines() : 
             if line.startswith(r"%%Page: ") :
                 pagecount += 1
+                pages[pagecount] = { "copies" : 1 }
             elif line.startswith(r"%%Requirements: numcopies(") :    
                 try :
@@ -88 +91 @@
                     pass
                 else :    
-                    if number > self.copies :
-                        self.copies = number
+                    if number > pages[pagecount]["copies"] :
+                        pages[pagecount]["copies"] = number
             elif line.startswith(r"%%BeginNonPPDFeature: NumCopies ") :
                 # handle # of copies set by some Windows printer driver
@@ -97 +100 @@
                     pass
                 else :    
-                    if number > self.copies :
-                        self.copies = number
+                    if number > pages[pagecount]["copies"] :
+                        pages[pagecount]["copies"] = number
             elif line.startswith("1 dict dup /NumCopies ") :
                 # handle # of copies set by mozilla/kprinter
@@ -106 +109 @@
                     pass
                 else :    
-                    if number > self.copies :
-                        self.copies = number
-        return pagecount * self.copies
+                    if number > pages[pagecount]["copies"] :
+                        pages[pagecount]["copies"] = number
+            elif line.startswith("/languagelevel where{pop languagelevel}{1}ifelse 2 ge{1 dict dup/NumCopies") :
+                try :
+                    number = int(previousline.strip()[2:])
+                except :
+                    pass
+                else :
+                    if number > pages[pagecount]["copies"] :
+                        pages[pagecount]["copies"] = number
+            previousline = line
+            
+        # extract max number of copies to please the ghostscript parser, just    
+        # in case we will use it later
+        self.copies = max([ v["copies"] for (k, v) in pages.items() ])
+        
+        # now apply the number of copies to each page
+        for pnum in range(1, pagecount + 1) :
+            page = pages.get(pnum, pages.get(1, { "copies" : 1 }))
+            copies = page["copies"]
+            pagecount += (copies - 1)
+            if self.debug :
+                sys.stderr.write("%s * page #%s\n" % (copies, pnum))
+        return pagecount
         
     def getJobSize(self) :    

pkpgcounter/trunk/pkpgpdls/version.py

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