Fixes for 1.2.18 - Githubissues

avpanov commented 11 years ago

The calls to p.add_option() for --potrace and --autotrace have no action attributes. Due to this some options are always set to defaults. My patch fixes this issue. Also, it removes redundant empty parameters for p.add_option() and fixes the issue with calling fontforge which now lacks -usage option.

avpanov commented 11 years ago

diff -Nuar mftrace-1.2.18/mftrace.py mftrace-1.2.18.new/mftrace.py --- mftrace-1.2.18/mftrace.py 2011-03-13 02:00:52.000000000 +1100 +++ mftrace-1.2.18.new/mftrace.py 2013-06-06 20:15:10.000000000 +1100 @@ -721,11 +721,11 @@

 stat = 1
 if fontforge_cmd:

stat = system ("%s -usage > pfv 2>&1 " % fontforge_cmd,

 stat = system ("%s --help > pfv 2>&1 " % fontforge_cmd,
      ignore_error = 1)

if stat != 0:

warning ("Command `%s -usage' failed. Cannot simplify or convert to TTF.\n" % fontforge_cmd)
```
     warning ("Command `%s --help' failed.  Cannot simplify or convert to TTF.\n" % fontforge_cmd)
   return ''
```
if fontforge_cmd == 'pfaedit' \ @@ -974,7 +974,7 @@ action="store_true", dest="keep_tempdir", help= ("Keep all output in directory %s.dir") % program_name)
p.add_option ('','--magnification',
p.addoption ('--magnification', dest="magnification", metavar="MAG", default=1000.0, @@ -989,11 +989,12 @@ dest="formats", default=[], help=("Which formats to generate (choices: AFM, PFA, PFB, TTF, SVG)"))
p.add_option ('', '--simplify',
p.add_option ('--simplify', action="store_true", dest="simplify",
default=False, help=_ ("Simplify using fontforge"))
p.add_option ('', '--gffile',
p.addoption ('--gffile', dest="gffile", help= ("Use gf FILE instead of running Metafont")) p.addoption ('-I', '--include', @@ -1001,24 +1002,23 @@ action="append", default=[], help=("Add to path for searching files"))
p.add_option ('','--glyphs',
p.addoption ('--glyphs', default=[], action="append", dest="glyphs", metavar="LIST", help= ('Process only these glyphs. LIST is comma separated'))
p.add_option ('', '--tfmfile',
p.add_option ('--tfmfile', metavar='FILE', action='store', dest='tfm_file')
p.add_option ('-e', '--encoding', metavar="FILE", action='store', dest="encodingfile", default="", help= ("Use encoding file FILE"))
p.add_option ('','--keep-trying',
p.add_option ('--keep-trying', dest='keep_trying', default=False, action="store_true", @@ -1026,26 +1026,29 @@ p.add_option ('-w', '--warranty', action="storetrue", help= ("show warranty and copyright"))
p.add_option ('','--dos-kpath',
p.add_option ('--dos-kpath',
action='store_true', dest="doskpath", help=("try to use Miktex kpsewhich"))
p.add_option ('', '--potrace',
p.add_option ('--potrace',
action='storetrue', dest='potrace', help= ("Use potrace"))
p.add_option ('', '--autotrace',
p.add_option ('--autotrace',
action='storetrue', dest='autotrace', help= ("Use autotrace"))
p.add_option ('', '--no-afm',
p.add_option ('--no-afm', action='store_false', dest="readafm", default=True, help=("Don't read AFM file"))
p.add_option ('','--noround',
action="store_false",
p.add_option ('--noround',
action='store_false', dest='round_to_int', default=True,
help= ("Do not round coordinates of control points to integer values (use with --grid)"))
p.add_option ('','--grid',
help=_("Do not round coordinates of control points to integer values (use with --grid)"))
p.add_option ('--grid', metavar='SCALE', dest='grid_scale', type='float', @@ -1059,7 +1062,7 @@

global options

(options, files) = p.parse_args ()
if not files: sys.stderr.write ('Need argument on command line \n') p.print_help ()

hanwen commented 11 years ago

thanks for the patch. Next time, you'd probably better make pull request. github formats the comment box.

hanwen / mftrace

Fixes for 1.2.18 #1

(options, files) = p.parse_args ()