Changeset 262

Show
Ignore:
Timestamp:
09/15/05 09:37:46 (19 years ago)
Author:
jerome
Message:

Improved the PCL3/4/5 parser a bit.

Location:
pkpgcounter/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • pkpgcounter/trunk/NEWS

    r258 r262  
    2222pkpgcounter News : 
    2323    
     24  * 1.67 : 
     25   
     26    - Improved PostScript parser. 
     27     
     28    - Improved PCL3/4/5 parser. 
     29     
    2430  * 1.66 :  
    2531   

  • pkpgcounter/trunk/pkpgpdls/pcl345.py

    r258 r262  
    309309            sys.stderr.write("escstart : %s\n" % escstart) 
    310310         
    311         if resets == ejects == mediasourcecount == mediasizecount == escstart == 1 : 
    312             pagecount = orientationcount 
     311        if pagecount and (pagecount == orientationcount) : 
     312            pass 
     313        elif resets == ejects == mediasourcecount == mediasizecount == escstart == 1 : 
     314            if (startgfx and endgfx) and (startgfx != endgfx) : 
     315                pagecount = orientationcount 
     316            else :      
     317                pagecount += 1 
     318        elif (ejects == mediasourcecount == orientationcount) and (startgfx == endgfx) :      
     319            pass 
    313320        elif pagecount == mediasourcecount == escstart :  
    314321            pass        # should be OK. 

  • pkpgcounter/trunk/pkpgpdls/version.py

    r258 r262  
    2020# 
    2121 
    22 __version__ = "1.66" 
     22__version__ = "1.67" 
    2323 
    2424__doc__ = """pkpgcounter : a generic Page Description Languages parser."""