Changeset 456 for pkpgcounter

Show
Ignore:
Timestamp:
06/25/07 11:07:12 (15 years ago)
Author:
jerome
Message:

Fixed handling of number of copies as defined through PJL statements.

Location:
pkpgcounter/trunk
Files:
7 modified

Legend:

Unmodified
Added
Removed
  • pkpgcounter/trunk/man/pkpgcounter.1

    r452 r456  
    11.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36. 
    2 .TH PKPGCOUNTER "1" "March 2007" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
     2.TH PKPGCOUNTER "1" "June 2007" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NAME 
    4 pkpgcounter \- manual page for pkpgcounter 2.16 
     4pkpgcounter \- manual page for pkpgcounter 2.17 
    55.SH DESCRIPTION 
    6 pkpgcounter v2.16 (c) 2003, 2004, 2005, 2006, 2007 Jerome Alet 
     6pkpgcounter v2.17 (c) 2003, 2004, 2005, 2006, 2007 Jerome Alet 
    77.PP 
    88pkpgcounter is a generic Page Description Language parser. 
  • pkpgcounter/trunk/NEWS

    r452 r456  
    2222pkpgcounter News : 
    2323 
     24  * 2.17 :  
     25   
     26    - Fixed problems in the handling of PJL number of copies (COPIES= and QTY=) 
     27      which caused the number of copies for each page to be squared. 
     28     
    2429  * 2.16 :  
    2530   
  • pkpgcounter/trunk/pkpgpdls/pcl345.py

    r452 r456  
    562562            oldduplexmode = duplexmode 
    563563            oldpapersize = papersize 
    564             copies = pjlcopies * page["copies"]         
     564            copies = max(pjlcopies, page["copies"]) # Was : pjlcopies * page["copies"] 
    565565            self.pagecount += (copies - 1) 
    566566            self.logdebug("%s*%s*%s*%s*%s*%s*BW" % (copies, \ 
  • pkpgcounter/trunk/pkpgpdls/pclxl.py

    r454 r456  
    190190            try : 
    191191                nbcopies = unpack(self.unpackShort, minfile[pos3-2:pos3])[0] 
    192                 self.logdebug("Number of copies : %i" % nbcopies) 
     192                # self.logdebug("Number of copies : %i" % nbcopies) 
    193193                self.pages[self.pagecount]["copies"] = nbcopies 
    194194            except KeyError :     
     
    651651            oldduplexmode = duplexmode 
    652652            oldpapersize = papersize 
    653             copies = pjlcopies * page["copies"] 
     653            copies = max(pjlcopies, page["copies"]) # Was : pjlcopies * page["copies"] 
    654654            self.pagecount += (copies - 1) 
    655655            self.logdebug("%s*%s*%s*%s*%s*%s*%s" % (copies,  
  • pkpgcounter/trunk/pkpgpdls/qpdl.py

    r443 r456  
    286286            oldduplexmode = duplexmode 
    287287            oldpapersize = papersize 
    288             copies = pjlcopies * page["copies"] 
     288            copies = max(pjlcopies, page["copies"]) # Was : pjlcopies * page["copies"] 
    289289            self.pagecount += (copies - 1) 
    290290            self.logdebug("%s*%s*%s*%s" % (copies,  
  • pkpgcounter/trunk/pkpgpdls/spl1.py

    r443 r456  
    3030 
    3131import pdlparser 
    32 import pjl 
    3332import version 
    3433 
  • pkpgcounter/trunk/pkpgpdls/version.py

    r452 r456  
    2323 
    2424 
    25 __version__ = "2.16" 
     25__version__ = "2.17" 
    2626 
    2727__doc__ = """pkpgcounter : a generic Page Description Languages parser."""