changed the command line interface of ttdump and ttcompile ***incompatibly***; changed ttdump -s considerably: now outputs a small file containing references to the individual table file; -d is gone; etc.
git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@211 4cde692c-a291-49d1-8350-778aa11640f8
This commit is contained in:
jvr
parent
64b5c80e80
commit
b1ad7eb139
@ -1,22 +1,17 @@
|
||||
#! /usr/bin/env python
|
||||
|
||||
"""\
|
||||
usage: ttcompile [-hvbf] [-d output-dir] [-i TTF-input-file] TTX-1 ... TTX-N
|
||||
usage: ttcompile [-hvbf] [-i input-TTF] scr [target]
|
||||
ttcompile [-hvbf] [-i input-TTF] src1 ... srcN directory
|
||||
|
||||
Translate one or more TTX files (as output by ttDump) to a TrueType
|
||||
font file. If a TTX-file argument is a directory instead of a file, all
|
||||
files in that directory ending in '.ttx' will be merged into one
|
||||
TrueType file. This is mostly useful in conjunction with the -s option
|
||||
of ttDump.py.
|
||||
font file.
|
||||
|
||||
Options:
|
||||
-h Help: print this message
|
||||
-i TrueType-input-file: specify a TT file to be merged with the TTX file.
|
||||
This option is only valid when at most one TTX file (or directory
|
||||
containing separated TTX files) is specified.
|
||||
This option is only valid when at most one TTX file is specified.
|
||||
-b Don't recalc glyph boundig boxes: use the values in the TTX file as-is.
|
||||
-d <output-dir> Specify a directory in which the output file(s)
|
||||
should end up. The directory must exist.
|
||||
-f Force overwriting existing files.
|
||||
-v Verbose: messages will be written to stdout about what is being done
|
||||
"""
|
||||
@ -28,6 +23,13 @@ def usage():
|
||||
print __doc__
|
||||
sys.exit(2)
|
||||
|
||||
def makeOutputFileName(xmlPath, outputDir):
|
||||
dir, file = os.path.split(xmlPath)
|
||||
file, ext = os.path.splitext(file)
|
||||
if outputDir:
|
||||
dir = outputDir
|
||||
return os.path.join(dir, file + ".ttf")
|
||||
|
||||
try:
|
||||
options, args = getopt.getopt(sys.argv[1:], "hvbfd:i:")
|
||||
except getopt.GetoptError:
|
||||
@ -38,7 +40,6 @@ verbose = 0
|
||||
ttInFile = None
|
||||
recalcBBoxes = 1
|
||||
forceOverwrite = 0
|
||||
outputDir = None
|
||||
|
||||
for option, value in options:
|
||||
if option == "-i":
|
||||
@ -50,26 +51,35 @@ for option, value in options:
|
||||
sys.exit(0)
|
||||
elif option == "-b":
|
||||
recalcBBoxes = 0
|
||||
elif option == "-d":
|
||||
outputDir = value
|
||||
elif option == "-f":
|
||||
forceOverwrite = 1
|
||||
|
||||
if not args:
|
||||
usage()
|
||||
|
||||
if ttInFile and len(args) > 1:
|
||||
print "Must specify exactly one TTX file (or directory) when using -i"
|
||||
if ttInFile and len(args) > 2:
|
||||
print "Must specify exactly one TTX source file when using -i"
|
||||
sys.exit(2)
|
||||
|
||||
|
||||
for xmlPath in args:
|
||||
path, ext = os.path.splitext(xmlPath)
|
||||
if outputDir is not None:
|
||||
fileName = os.path.basename(path)
|
||||
path = os.path.join(outputDir, fileName)
|
||||
ttPath = path + '.ttf'
|
||||
nargs = len(args)
|
||||
if nargs == 1:
|
||||
files = [(args[0], makeOutputFileName(args[0], None))]
|
||||
elif nargs == 2:
|
||||
xmlPath = args[0]
|
||||
outPath = args[1]
|
||||
print "000", outPath
|
||||
if os.path.isdir(outPath):
|
||||
outPath = makeOutputFileName(xmlPath, outPath)
|
||||
files = [(xmlPath, outPath)]
|
||||
else:
|
||||
outputDir = args[-1]
|
||||
files = []
|
||||
for xmlPath in args[:-1]:
|
||||
files.append((xmlPath, makeOutputFileName(xmlPath, outputDir)))
|
||||
|
||||
|
||||
for xmlPath, ttPath in files:
|
||||
if not forceOverwrite and os.path.exists(ttPath):
|
||||
answer = raw_input('Overwrite "%s"? ' % ttPath)
|
||||
if not answer[:1] in ("Y", "y"):
|
||||
@ -79,16 +89,7 @@ for xmlPath in args:
|
||||
print 'Compiling "%s" to "%s"...' % (xmlPath, ttPath)
|
||||
|
||||
tt = ttLib.TTFont(ttInFile, recalcBBoxes=recalcBBoxes, verbose=verbose)
|
||||
|
||||
if os.path.isdir(xmlPath):
|
||||
import glob
|
||||
files = glob.glob1(xmlPath, "*.ttx")
|
||||
for xmlFile in files:
|
||||
xmlFile = os.path.join(xmlPath, xmlFile)
|
||||
tt.importXML(xmlFile)
|
||||
else:
|
||||
tt.importXML(xmlPath)
|
||||
|
||||
tt.save(ttPath)
|
||||
|
||||
if verbose:
|
||||
|
||||
60
Tools/ttdump
60
Tools/ttdump
@ -1,7 +1,8 @@
|
||||
#! /usr/bin/env python
|
||||
|
||||
"""\
|
||||
usage: ttdump [-hvisf] [-t <table>] [-x <table>] [-d <output-dir>] TTF-1 ... TTF-N
|
||||
usage: ttdump [-hvisf] [-t <table>] [-x <table>] src [target]
|
||||
ttdump [-hvisf] [-t <table>] [-x <table>] src1 ... srcN directory
|
||||
|
||||
Dump one or more TrueType/OpenType fonts as TTX files (an XML-based
|
||||
text format).
|
||||
@ -15,13 +16,11 @@ usage: ttdump [-hvisf] [-t <table>] [-x <table>] [-d <output-dir>] TTF-1 ... TTF
|
||||
pre-program) will be written to the TTX file as assembly
|
||||
instead of hex data.
|
||||
-s Split tables: save the TTX data into separate TTX files per
|
||||
table. The files will be saved in a directory. The name of this
|
||||
directory will be constructed from the input filename (by
|
||||
dropping the extension) or can be specified by the optional
|
||||
TTX-output-file argument. This option implies -f.
|
||||
table and write one small TTX file that contains references
|
||||
to the individual table dumps. This file can be used as
|
||||
input to ttcompile, as long as the table files are in the
|
||||
same directory.
|
||||
-f Force overwriting existing files.
|
||||
-d <output-dir> Specify a directory in which the output file(s)
|
||||
should end up. The directory must exist.
|
||||
-t <table> Specify a table to dump. Multiple -t options
|
||||
are allowed. When no -t option is specified, all tables
|
||||
will be dumped.
|
||||
@ -36,6 +35,13 @@ def usage():
|
||||
print __doc__
|
||||
sys.exit(2)
|
||||
|
||||
def makeOutputFileName(ttPath, outputDir):
|
||||
dir, file = os.path.split(ttPath)
|
||||
file, ext = os.path.splitext(file)
|
||||
if outputDir:
|
||||
dir = outputDir
|
||||
return os.path.join(dir, file + ".ttx")
|
||||
|
||||
try:
|
||||
options, args = getopt.getopt(sys.argv[1:], "hvisft:x:d:")
|
||||
except getopt.GetoptError:
|
||||
@ -48,7 +54,7 @@ disassembleInstructions = 0
|
||||
forceOverwrite = 0
|
||||
tables = []
|
||||
skipTables = []
|
||||
outputDir = None
|
||||
|
||||
|
||||
for option, value in options:
|
||||
if option == "-t":
|
||||
@ -65,8 +71,6 @@ for option, value in options:
|
||||
# normalize tag
|
||||
value = value + (4 - len(value)) * " "
|
||||
skipTables.append(value)
|
||||
elif option == "-d":
|
||||
outputDir = value
|
||||
elif option == "-v":
|
||||
verbose = 1
|
||||
elif option == "-f":
|
||||
@ -86,23 +90,33 @@ if tables and skipTables:
|
||||
if not args:
|
||||
usage()
|
||||
|
||||
for ttPath in args:
|
||||
path, ext = os.path.splitext(ttPath)
|
||||
if outputDir is not None:
|
||||
fileName = os.path.basename(path)
|
||||
path = os.path.join(outputDir, fileName)
|
||||
|
||||
if splitTables:
|
||||
xmlPath = path
|
||||
else:
|
||||
xmlPath = path + ".ttx"
|
||||
if not forceOverwrite and os.path.exists(xmlPath):
|
||||
answer = raw_input('Overwrite "%s"? ' % xmlPath)
|
||||
nargs = len(args)
|
||||
if nargs == 1:
|
||||
files = [(args[0], makeOutputFileName(args[0], None))]
|
||||
elif nargs == 2:
|
||||
ttPath = args[0]
|
||||
outPath = args[1]
|
||||
if os.path.isdir(outPath):
|
||||
outPath = makeOutputFileName(ttPath, outPath)
|
||||
files = [(ttPath, outPath)]
|
||||
else:
|
||||
outputDir = args[-1]
|
||||
files = []
|
||||
for ttPath in args[:-1]:
|
||||
files.append((ttPath, makeOutputFileName(ttPath, outputDir)))
|
||||
|
||||
|
||||
for ttPath, outFile in files:
|
||||
if not forceOverwrite and os.path.exists(outFile):
|
||||
answer = raw_input('Overwrite "%s"? ' % outFile)
|
||||
if not answer[:1] in ("Y", "y"):
|
||||
print "skipped."
|
||||
continue
|
||||
print 'Dumping "%s" to "%s"...' % (ttPath, xmlPath)
|
||||
if not os.path.isdir(outFile):
|
||||
os.remove(outFile)
|
||||
print 'Dumping "%s" to "%s"...' % (ttPath, outFile)
|
||||
tt = ttLib.TTFont(ttPath, 0, verbose=verbose)
|
||||
tt.saveXML(xmlPath, tables=tables, skipTables=skipTables,
|
||||
tt.saveXML(outFile, tables=tables, skipTables=skipTables,
|
||||
splitTables=splitTables, disassembleInstructions=disassembleInstructions)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user