Changeset 323

Show
Ignore:
Timestamp:
02/15/06 20:21:48 (19 years ago)
Author:
jerome
Message:

Fixed a problem with PS files produced by dvips and embedded EPS figures.
v1.79 is out.

Location:
pkpgcounter/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • pkpgcounter/trunk/man/pkpgcounter.1

    r321 r323  
    1 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36. 
     1.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35. 
    22.TH PKPGCOUNTER "1" "February 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NAME 
    4 pkpgcounter \- manual page for pkpgcounter 1.78 
     4pkpgcounter \- manual page for pkpgcounter 1.79 
    55.SH DESCRIPTION 
    6 pkpgcounter v1.78 (c) 2003, 2004, 2005, 2006 Jerome Alet 
     6pkpgcounter v1.79 (c) 2003, 2004, 2005, 2006 Jerome Alet 
    77.PP 
    88pkpgcounter is a generic Page Description Language parser. 

  • pkpgcounter/trunk/pkpgpdls/postscript.py

    r321 r323  
    8686        notrust = 0 
    8787        prescribe = 0 # Kyocera's Prescribe commands 
    88         acrobatmarker = 0 
     88        acrobatmarker = 0 
    8989        for line in self.infile.xreadlines() :  
    9090            if (not prescribe) and line.startswith(r"%%BeginResource: procset pdf") \ 
    91                and not acrobatmarker : 
     91               and not acrobatmarker : 
    9292                notrust = 1 # Let this stuff be managed by GhostScript, but we still extract number of copies 
    93             elif line.startswith(r"%ADOPrintSettings: L3") : 
    94                 acrobatmarker = 1 
     93            elif line.startswith(r"%ADOPrintSettings: L3") : 
     94                acrobatmarker = 1 
    9595            elif line.startswith("!R!") : 
    9696                prescribe = 1 
    … …  
    100100                    newpagenum = int(line.split(']')[0].split()[1]) 
    101101                except :     
    102                     pass 
    103                 else :     
     102                    notinteger = 1 # It seems that sometimes it's not an integer but an EPS file name 
     103                else :     
     104                    notinteger = 0 
    104105                    if newpagenum == oldpagenum : 
    105106                        proceed = 0 
    106107                    else : 
    107108                        oldpagenum = newpagenum 
    108                 if proceed :         
     109                if proceed and not notinteger :         
    109110                    pagecount += 1 
    110111                    self.pages[pagecount] = { "copies" : self.pages[pagecount-1]["copies"] } 

  • pkpgcounter/trunk/pkpgpdls/version.py

    r321 r323  
    2020# 
    2121 
    22 __version__ = "1.78" 
     22__version__ = "1.79" 
    2323 
    2424__doc__ = """pkpgcounter : a generic Page Description Languages parser."""