Changeset 3436

Show
Ignore:
Timestamp:
10/06/08 00:22:07 (3 months ago)
Author:
jerome
Message:

Removed spaces at EOL.

Location:
pkpgcounter/trunk
Files:
38 modified

Legend:

Unmodified
Added
Removed
  • pkpgcounter/trunk/bin/pkpgcounter

    r564 r3436  
    11#! /usr/bin/env python 
    2 # -*- coding: UTF-8 -*- 
     2# -*- coding: utf-8 -*- 
    33# 
    44# pkpgcounter : a generic Page Description Language parser 
     
    99# the Free Software Foundation, either version 3 of the License, or 
    1010# (at your option) any later version. 
    11 #  
     11# 
    1212# This program is distributed in the hope that it will be useful, 
    1313# but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1515# GNU General Public License for more details. 
    16 #  
     16# 
    1717# You should have received a copy of the GNU General Public License 
    1818# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     
    7171  -v | --version        Prints pkpgcounter's version number then exits. 
    7272  -h | --help           Prints this message then exits. 
    73    
    74   -d | --debug          Activate debug mode.  
    75    
     73 
     74  -d | --debug          Activate debug mode. 
     75 
    7676  -cCOLORSPACE, --colorspace=COLORSPACE 
    7777                        Activate the computation of ink usage, and defines the 
    7878                        colorspace to use. Supported values are 'BW' (Black), 
    7979                        'RGB', 'CMYK', 'CMY', and 'GC' (Grayscale vs Color). 
    80                         'GC' is useful if you only need to differentiate  
     80                        'GC' is useful if you only need to differentiate 
    8181                        grayscale pages from coloured pages but don't care 
    8282                        about ink usage per se. 
    83                          
     83 
    8484  -rRESOLUTION, --resolution=RESOLUTION 
    8585                        The resolution in DPI to use when checking ink usage. 
    8686                        Lower resolution is faster but less accurate. Default 
    8787                        is 72 dpi. 
    88    
    89 examples :                               
     88 
     89examples : 
    9090 
    9191  $ pkpgcounter file1.ps file2.escp2 file3.pclxl <file4.pcl345 
    92    
     92 
    9393  Will launch pkpgcounter and will output the total number of pages 
    9494  needed to print all the documents specified. 
    95    
     95 
    9696  $ pkpgcounter --colorspace bw --resolution 150 file1.ps 
    97    
     97 
    9898  Will output the percent of black ink needed on each page of 
    9999  the file1.ps file rendered at 150 dpi. 
    100    
    101 %(__gplblurb__)s   
     100 
     101%(__gplblurb__)s 
    102102 
    103103Please e-mail bugs to: %(__authoremail__)s""" 
    104104 
    105 if __name__ == "__main__" :  
     105if __name__ == "__main__" : 
    106106    if (len(sys.argv) >= 2) and (sys.argv[1] in ("-h", "--help")) : 
    107107        print __doc__ % globals() 
    108     else :     
     108    else : 
    109109        analyzer.main() 
    110110 
  • pkpgcounter/trunk/BUGS

    r564 r3436  
    2020 
    2121pkpgcounter BUGS : 
    22     
     22 
    2323  - All parsers need more testing, especially those which allow the number 
    2424    of copies to be specified as part of the data streams, as well as those 
  • pkpgcounter/trunk/clean.sh

    r564 r3436  
    88# the Free Software Foundation, either version 3 of the License, or 
    99# (at your option) any later version. 
    10 #  
     10# 
    1111# This program is distributed in the hope that it will be useful, 
    1212# but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1313# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414# GNU General Public License for more details. 
    15 #  
     15# 
    1616# You should have received a copy of the GNU General Public License 
    1717# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  • pkpgcounter/trunk/CREDITS

    r3409 r3436  
    2020 
    2121The following people helped the pkpgcounter project : 
    22    
    23    
     22 
     23 
    2424  - Eduardo Gielamo Oliveira & Rodolfo Broco Manin : initial PCL parser. 
    25    
     25 
    2626  - Valcir C. Vargas : helped on PCL3GUI support. 
    27    
    28   - Daniel Franklin : pkpgcounter's algorithm for the computation  
     27 
     28  - Daniel Franklin : pkpgcounter's algorithm for the computation 
    2929    of ink coverage comes from Daniel's PrintBill project. 
    30      
    31   - Aur�en Croc : reverse engineered Samsung QPDL and published   
     30 
     31  - Aur�en Croc : reverse engineered Samsung QPDL and published 
    3232                    a language specification. 
    3333 
    3434  - Franck (?) : sent a path to improve the PostScript parser when 
    3535                 the PS code generated several copies. 
    36                   
    37   - Yves Lavoie : reported a bug with Python 2.5                  
    38    
     36 
     37  - Yves Lavoie : reported a bug with Python 2.5 
     38 
    3939  - Kumar Appaiah : put pkpgcounter in Debian. 
    40    
     40 
    4141  - Roger Jochem : reported problems and test files for custom 
    4242                   made printer drivers. 
     
    5050  THINK YOU DESERVE TO BE LISTED, JUST SEND ME AN EMAIL 
    5151  ASKING FOR BEING INCLUDED. 
    52    
     52 
    5353  I APOLOGIZE IN ADVANCE IF I'VE FORGOTTEN TO ADD YOUR NAME. 
    54    
    55   ALSO, SOME PEOPLE MAY HAVE REFUSED TO BE LISTED HERE, THIS  
     54 
     55  ALSO, SOME PEOPLE MAY HAVE REFUSED TO BE LISTED HERE, THIS 
    5656  IS YOUR RIGHT TO DO SO TOO, JUST TELL ME. 
    57    
     57 
    5858============================================================== 
  • pkpgcounter/trunk/man/genman.sh

    r564 r3436  
    88# the Free Software Foundation, either version 3 of the License, or 
    99# (at your option) any later version. 
    10 #  
     10# 
    1111# This program is distributed in the hope that it will be useful, 
    1212# but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1313# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414# GNU General Public License for more details. 
    15 #  
     15# 
    1616# You should have received a copy of the GNU General Public License 
    1717# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     
    1919# $Id$ 
    2020# 
    21 for prog in pkpgcounter ; do  
     21for prog in pkpgcounter ; do 
    2222    echo "$prog" ; 
    2323    help2man --no-info \ 
     
    2727             --source="C@LL - Conseil Internet & Logiciels Libres" \ 
    2828             --output="temp$prog.1" \ 
    29              $prog ;  
     29             $prog ; 
    3030    /bin/sed -e "s/--/\\\-\\\-/g" <"temp$prog.1" >"$prog.1" ; 
    3131    /bin/rm -f "temp$prog.1" 
  • pkpgcounter/trunk/NEWS

    r3402 r3436  
    2222 
    2323  * 3.51 : 
    24    
     24 
    2525    - Partial rewrite of the PostScript parser, with huge performance increase. 
    26      
     26 
    2727    - Fixed a problem in the PostScript parser where the number of copies set with 
    28       e.g. "dvips -c 9 -o output.ps input.dvi" wasn't correctly detected.  
     28      e.g. "dvips -c 9 -o output.ps input.dvi" wasn't correctly detected. 
    2929 
    3030    - Increased accuracy in the PDF parser, with some speed expense but 
    3131      some big room for future improvements. 
    32        
     32 
    3333  * 3.50 : 
    34    
     34 
    3535    - Added support for Canon BJ/BJC documents in page counting mode. 
    36      
     36 
    3737    - Added support for Structured Fax documents in page counting mode. 
    38      
     38 
    3939    - Added support for ASCII PNM (Netpbm) documents in page counting mode. 
    40      
     40 
    4141    - Fixed a problem with the parsing of SPL1 (GDI) documents : all such 
    4242      documents should now be correctly parsed. 
    43      
     43 
    4444    - Improved the PCL3/4/5 parser. 
    45      
     45 
    4646  * 3.40 : 
    47    
     47 
    4848    - Fixed a major bug in the detection of OpenDocument (ISO/IEC DIS 26300) 
    4949      files. 
    50        
     50 
    5151    - Added support for page counting in Microsoft Word (c) (tm) (r) (etc...) 
    5252      documents. 
    53        
     53 
    5454    - Added support for ink accounting in Microsoft Word (c) (tm) (r) (etc...) 
    5555      and OpenDocument (ISO/IEC DIS 26300) documents. 
    56        
    57     - Now automatically detects missing executable dependencies at runtime.   
    58        
     56 
     57    - Now automatically detects missing executable dependencies at runtime. 
     58 
    5959  * 3.30 : 
    60    
     60 
    6161    - Added support for all file formats supported by the Python Imaging 
    6262      Library. 
    63      
    64     - Added a minimal parser for Hewlett-Packard LIDIL documents, as  
     63 
     64    - Added a minimal parser for Hewlett-Packard LIDIL documents, as 
    6565      produced by the hpijs driver. 
    66        
     66 
    6767    - Improved general reliability. 
    68      
     68 
    6969    - Improved detection of PCL3/4/5 jobs. 
    70      
    71     - Major code cleaning.   
    72        
     70 
     71    - Major code cleaning. 
     72 
    7373  * 3.20 : 
    74     
     74 
    7575    - Added a minimal parser for Brother HBP documents. 
    76      
     76 
    7777    - Added support for Canon ImageRunner commands to the PCLXL parser, 
    7878      much like it was already done for the PCL3/4/5 parser. 
    79        
     79 
    8080  * 3.10 : 
    81    
     81 
    8282    - Added a minimal parser for ESC/PAGES03 style documents. 
    83      
     83 
    8484    - Fixed another problem in the code handling the output of Canon's 
    8585      ImageRunner printer drivers. 
    86      
     86 
    8787  * 3.00 : 
    88    
     88 
    8989    - Fixed a problem in the code handling the output of Canon's ImageRunner 
    9090      printer drivers. 
    91        
    92     - Licensing terms changed to GNU GPL v3.0 or higher.   
    93      
     91 
     92    - Licensing terms changed to GNU GPL v3.0 or higher. 
     93 
    9494  * 2.18 : 
    95    
     95 
    9696    - Fixed an incompatibility with Python v2.5 
    97      
    98   * 2.17 :  
    99    
     97 
     98  * 2.17 : 
     99 
    100100    - Fixed problems in the handling of PJL number of copies (COPIES= and QTY=) 
    101101      which caused the number of copies for each page to be squared. 
    102      
    103   * 2.16 :  
    104    
     102 
     103  * 2.16 : 
     104 
    105105    - Fixed a problem in the PCL3/4/5 parser to accomodate line based 
    106106      report generators which expect the printer to skip to next page 
    107107      based on lines per page instead of sending a specific command. 
    108        
     108 
    109109  * 2.15 : 
    110     
     110 
    111111    - Fixed a regexp in the PDF parser which caused some files to be 
    112112      incorrectly accounted for. 
    113      
     113 
    114114    - Improved the detection of the number of copies in PostScript documents. 
    115      
     115 
    116116  * 2.14 : 
    117    
     117 
    118118    - Fixed a problem with some PS drivers which don't output %%Page: 
    119119      comments. 
    120        
    121   * 2.13 :  
    122     
     120 
     121  * 2.13 : 
     122 
    123123    - Nowrecognizes the GC colorspace if you only want to differentiate 
    124124      grayscale pages from coloured pages. In this colorspace, the 
    125125      percents are always "G : 100.0   C : 0.0" or "G : 0.0   C : 100.0" 
    126126      respectively for a grayscale page and a coloured page. 
    127    
     127 
    128128  * 2.12 : 
    129    
     129 
    130130    - Fixed a problem with the PostScript parser. 
    131      
     131 
    132132  * 2.11 : 
    133    
     133 
    134134    - Improved overall robustness in ink accounting mode. 
    135      
     135 
    136136  * 2.10 : 
    137    
     137 
    138138    - Added a plain text parser, with support for both page counting and 
    139139      ink coverage. 
    140      
     140 
    141141    - Added a minimal SPL1 parser. 
    142      
     142 
    143143    - Fixed a problem in the PCLXL parser related to Kyocera printer drivers. 
    144      
     144 
    145145  * 2.00 : 
    146    
     146 
    147147    - The PCL3/4/5 parser was rewritten from scratch and is now 
    148148      table driven. 
    149        
     149 
    150150    - Improved the PostScript parser. 
    151      
     151 
    152152  * 1.85 : 
    153    
     153 
    154154    - Added support for Samsung QPDL (aka SPL2) file format in page 
    155155      counting mode, thanks to the work done by Aur�en Croc on 
    156156      reverse engineering the file format. 
    157        
     157 
    158158  * 1.85alpha : 
    159    
     159 
    160160    - Added test document and program to generate the test document 
    161161      to check the functionning of the ink coverage computation algorithm. 
    162        
     162 
    163163  * 1.84 : 
    164    
     164 
    165165    - Computation of ink coverage now works and is documented. 
    166166      The supported file formats are : PS, PDF, PCLXL, PCL3/4/5, 
    167167      DVI and TIFF. 
    168        
     168 
    169169  * 1.84alpha : 
    170    
     170 
    171171    - Added initial support for the computation of ink coverage. 
    172172      See python analyzer.py --help for details. The same command 
    173173      line options work for pkpgcounter, although it's not 
    174174      documented yet. 
    175      
     175 
    176176  * 1.83 : 
    177    
    178     - Fixed a famously known 'brown paper bag' issue with file type autodetection.  
    179      
     177 
     178    - Fixed a famously known 'brown paper bag' issue with file type autodetection. 
     179 
    180180  * 1.82 : 
    181    
    182     - Fixed PCL3/4/5 parser to detect recent Xerox drivers' output.  
    183      
     181 
     182    - Fixed PCL3/4/5 parser to detect recent Xerox drivers' output. 
     183 
    184184  * 1.81 : 
    185    
     185 
    186186    - Improved the gs+Acrobat Reader fix done in 1.78. 
    187      
     187 
    188188  * 1.80 : 
    189    
     189 
    190190    - Added support for Zenographics ZjStream input format. 
    191      
     191 
    192192  * 1.79 : 
    193    
     193 
    194194    - Fixed a small problem in PostScript parser with dvips output. 
    195      
     195 
    196196  * 1.78 : 
    197    
     197 
    198198    - Launches gs less often when printing is done from Acrobat 
    199199      Reader. 
    200      
    201   * 1.77 :  
    202    
     200 
     201  * 1.77 : 
     202 
    203203    - Fixed some problems with the code introduced in 1.76. 
    204      
     204 
    205205    - Improved PCLXL parser's speed by almost 10%. 
    206      
     206 
    207207  * 1.76 : 
    208    
     208 
    209209    - Improved the PCLXL parser wrt undocumented tags. 
    210      
     210 
    211211    - Preliminary support for Kyocera Prescribe commands. 
    212      
     212 
    213213  * 1.75 : 
    214    
     214 
    215215    - Added preliminary support for Canon ImageRunner's "LIPS" or "UFR" 
    216       (I don't know which) Page Description Language.  
    217        
     216      (I don't know which) Page Description Language. 
     217 
    218218  * 1.74 : 
    219    
     219 
    220220    - Fixed a problem in the retrieval of named media sizes in PCLXL. 
    221      
     221 
    222222    - Changed copyright years. 
    223      
     223 
    224224  * 1.73 : 
    225    
     225 
    226226    - Fixed duplex detection code in PCL3/4/5 parser. 
    227      
     227 
    228228    - Fixed PCLXL detection code. 
    229      
     229 
    230230    - Fixed retrieval of custom media types' names in PCLXL. 
    231      
     231 
    232232    - Added inactive code to compute ink coverage ala PrintBill. 
    233      
     233 
    234234  * 1.72 : 
    235    
     235 
    236236    - Improved heuristic to detect when ghostscript has to be used to do 
    237237      the parsing. 
    238     
     238 
    239239  * 1.71 : 
    240    
     240 
    241241    - Now uses ghostscript as the parser when the PS stream was created by a 
    242242      particular MSWindows driver. 
    243      
     243 
    244244    - Only complains about Psyco missing at install time, and stays 
    245245      quiet when running without Psyco. 
    246        
     246 
    247247  * 1.70 : 
    248    
     248 
    249249    - Fixed some PJL escaping issue in the PCLXL and PCL3/4/5 parsers. 
    250      
     250 
    251251  * 1.69 : 
    252    
    253     - Improved PCL3/4/5 parser. 
    254      
     252 
     253    - Improved PCL3/4/5 parser. 
     254 
    255255    - Improved PCLXL parser wrt PJL stuff. 
    256      
     256 
    257257  * 1.68 : 
    258    
     258 
    259259    - Improved PostScript parser. 
    260      
     260 
    261261  * 1.67 : 
    262    
     262 
    263263    - Improved PostScript parser. 
    264      
    265     - Improved PCL3/4/5 parser. 
    266      
    267   * 1.66 :  
    268    
     264 
     265    - Improved PCL3/4/5 parser. 
     266 
     267  * 1.66 : 
     268 
    269269    - Improved PCLXL parser. 
    270      
    271     - Improved PCL3/4/5 parser. 
    272      
     270 
     271    - Improved PCL3/4/5 parser. 
     272 
    273273  * 1.65 : 
    274      
     274 
    275275    - Improved PostScript parser. 
    276      
    277     - Improved PCL3/4/5 parser. 
    278      
     276 
     277    - Improved PCL3/4/5 parser. 
     278 
    279279  * 1.64 : 
    280      
    281     - Improved PCL3/4/5 parser. 
    282      
     280 
     281    - Improved PCL3/4/5 parser. 
     282 
    283283  * 1.63 : 
    284    
     284 
    285285    - Now handles PJL statements to extract number of copies, duplex mode 
    286286      and paper size in the PCLXL and PCL3/4/5 parsers. 
    287      
     287 
    288288  * 1.62 : 
    289