#!@PYTHON@
+
# Run lilypond, latex, dvips.
#
# This is the third incarnation of ly2dvi.
# Jan Arne Fagertun <Jan.A.Fagertun@@energy.sintef.no> (Bourne shell script)
#
-
-#
-# TODO: should allow to set a central pk cache directory from the command line.
-# TODO: should allow to switch off pk cache.
#
-
-
# Note: gettext work best if we use ' for docstrings and "
# for gettextable strings.
# --> DO NOT USE """ for docstrings.
import tempfile
import traceback
+
+################################################################
+# lilylib.py -- options and stuff
+#
+# source file of the GNU LilyPond music typesetter
+
+# Handle bug in Python 1.6-2.1
+#
+# there are recursion limits for some patterns in Python 1.6 til 2.1.
+# fix this by importing pre instead. Fix by Mats.
+
+# todo: should check Python version first.
+try:
+ import pre
+ re = pre
+ del pre
+except ImportError:
+ import re
+
+# Attempt to fix problems with limited stack size set by Python!
+# Sets unlimited stack size. Note that the resource module only
+# is available on UNIX.
+try:
+ import resource
+ resource.setrlimit (resource.RLIMIT_STACK, (-1, -1))
+except:
+ pass
+
+try:
+ import gettext
+ gettext.bindtextdomain ('lilypond', localedir)
+ gettext.textdomain ('lilypond')
+ _ = gettext.gettext
+except:
+ def _ (s):
+ return s
+
+program_version = '@TOPLEVEL_VERSION@'
+if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
+ program_version = '1.5.54'
+
+def identify ():
+ sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version))
+
+def warranty ():
+ identify ()
+ sys.stdout.write ('\n')
+ sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002'))
+ sys.stdout.write ('\n')
+ sys.stdout.write (' Han-Wen Nienhuys')
+ sys.stdout.write (' Jan Nieuwenhuizen')
+ sys.stdout.write ('\n')
+ sys.stdout.write (_ (r'''
+Distributed under terms of the GNU General Public License. It comes with
+NO WARRANTY.'''))
+ sys.stdout.write ('\n')
+
+def progress (s):
+ errorport.write (s + '\n')
+
+def warning (s):
+ progress (_ ("warning: ") + s)
+
+def user_error (s, e=1):
+ errorport.write (program_name + ":" + _ ("error: ") + s + '\n')
+ sys.exit (e)
+
+def error (s):
+ '''Report the error S. Exit by raising an exception. Please
+ do not abuse by trying to catch this error. If you do not want
+ a stack trace, write to the output directly.
+
+ RETURN VALUE
+
+ None
+
+ '''
+
+ progress (_ ("error: ") + s)
+ raise _ ("Exiting ... ")
+
+def getopt_args (opts):
+ '''Construct arguments (LONG, SHORT) for getopt from list of options.'''
+ short = ''
+ long = []
+ for o in opts:
+ if o[1]:
+ short = short + o[1]
+ if o[0]:
+ short = short + ':'
+ if o[2]:
+ l = o[2]
+ if o[0]:
+ l = l + '='
+ long.append (l)
+ return (short, long)
+
+def option_help_str (o):
+ '''Transform one option description (4-tuple ) into neatly formatted string'''
+ sh = ' '
+ if o[1]:
+ sh = '-%s' % o[1]
+
+ sep = ' '
+ if o[1] and o[2]:
+ sep = ','
+
+ long = ''
+ if o[2]:
+ long= '--%s' % o[2]
+
+ arg = ''
+ if o[0]:
+ if o[2]:
+ arg = '='
+ arg = arg + o[0]
+ return ' ' + sh + sep + long + arg
+
+
+def options_help_str (opts):
+ '''Convert a list of options into a neatly formatted string'''
+ w = 0
+ strs =[]
+ helps = []
+
+ for o in opts:
+ s = option_help_str (o)
+ strs.append ((s, o[3]))
+ if len (s) > w:
+ w = len (s)
+
+ str = ''
+ for s in strs:
+ str = str + '%s%s%s\n' % (s[0], ' ' * (w - len(s[0]) + 3), s[1])
+ return str
+
+def help ():
+ ls = [(_ ("Usage: %s [OPTION]... FILE") % program_name),
+ ('\n\n'),
+ (help_summary),
+ ('\n\n'),
+ (_ ("Options:")),
+ ('\n'),
+ (options_help_str (option_definitions)),
+ ('\n\n'),
+ (_ ("Report bugs to %s") % 'bug-lilypond@gnu.org'),
+ ('\n')]
+ map (sys.stdout.write, ls)
+
+def setup_temp ():
+ """
+ Create a temporary directory, and return its name.
+ """
+ global temp_dir
+ if not keep_temp_dir_p:
+ temp_dir = tempfile.mktemp (program_name)
+ try:
+ os.mkdir (temp_dir, 0777)
+ except OSError:
+ pass
+
+ return temp_dir
+
+
+def system (cmd, ignore_error = 0, quiet =0):
+ """Run CMD. If IGNORE_ERROR is set, don't complain when CMD returns non zero.
+
+ RETURN VALUE
+
+ Exit status of CMD
+ """
+
+ if verbose_p:
+ progress (_ ("Invoking `%s\'") % cmd)
+
+ st = os.system (cmd)
+ if st:
+ name = re.match ('[ \t]*([^ \t]*)', cmd).group (1)
+ msg = name + ': ' + _ ("command exited with value %d") % st
+ if ignore_error:
+ if not quiet:
+ warning (msg + ' ' + _ ("(ignored)") + ' ')
+ else:
+ error (msg)
+
+ return st
+
+
+def cleanup_temp ():
+ if not keep_temp_dir_p:
+ if verbose_p:
+ progress (_ ("Cleaning %s...") % temp_dir)
+ shutil.rmtree (temp_dir)
+
+
+def strip_extension (f, ext):
+ (p, e) = os.path.splitext (f)
+ if e == ext:
+ e = ''
+ return p + e
+
+
+def cp_to_dir (pattern, dir):
+ "Copy files matching re PATTERN from cwd to DIR"
+ # Duh. Python style portable: cp *.EXT OUTDIR
+ # system ('cp *.%s %s' % (ext, outdir), 1)
+ files = filter (lambda x, p=pattern: re.match (p, x), os.listdir ('.'))
+ map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files)
+
+
+# Python < 1.5.2 compatibility
+#
+# On most platforms, this is equivalent to
+#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2*
+if os.path.__dict__.has_key ('abspath'):
+ abspath = os.path.abspath
+else:
+ def abspath (path):
+ return os.path.normpath (os.path.join (os.getcwd (), path))
+
+if os.__dict__.has_key ('makedirs'):
+ makedirs = os.makedirs
+else:
+ def makedirs (dir, mode=0777):
+ system ('mkdir -p %s' % dir)
+
+
+def mkdir_p (dir, mode=0777):
+ if not os.path.isdir (dir):
+ makedirs (dir, mode)
+
+
# if set, LILYPONDPREFIX must take prevalence
# if datadir is not set, we're doing a build and LILYPONDPREFIX
datadir = '@datadir@'
-if os.environ.has_key ('LILYPONDPREFIX') \
- or '@datadir@' == '@' + 'datadir' + '@':
+
+if os.environ.has_key ('LILYPONDPREFIX') :
datadir = os.environ['LILYPONDPREFIX']
else:
datadir = '@datadir@'
-sys.path.append (os.path.join (datadir, 'python'))
-sys.path.append (os.path.join (datadir, 'python/out'))
+
+while datadir[-1] == os.sep:
+ datadir= datadir[:-1]
+
+sys.path.insert (0, os.path.join (datadir, 'python'))
+
+################################################################
+# END Library
+
program_name = 'ly2dvi'
-program_version = '@TOPLEVEL_VERSION@'
+
original_dir = os.getcwd ()
temp_dir = os.path.join (original_dir, '%s.dir' % program_name)
errorport = sys.stderr
keep_temp_dir_p = 0
verbose_p = 0
-
-try:
- import gettext
- gettext.bindtextdomain ('lilypond', '@localedir@')
- gettext.textdomain ('lilypond')
- _ = gettext.gettext
-except:
- def _ (s):
- return s
-
-# Attempt to fix problems with limited stack size set by Python!
-# Sets unlimited stack size. Note that the resource module only
-# is available on UNIX.
-try:
- import resource
- resource.setrlimit (resource.RLIMIT_STACK, (-1, -1))
-except:
- pass
+preview_p = 0
+preview_resolution = 90
help_summary = _ ("Generate .dvi with LaTeX for LilyPond")
(_ ("FILE"), 'o', 'output', _ ("write ouput to FILE")),
(_ ("FILE"), 'f', 'find-pfa', _ ("find pfa fonts used in FILE")),
# why capital P?
+ ('', '', 'preview', _("Make a picture of the first system.")),
+ (_ ('RES'), '', 'preview-resolution', _("Set the resolution of the preview to RES.")),
('', 'P', 'postscript', _ ("generate PostScript output")),
(_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")),
('', 'V', 'verbose', _ ("verbose")),
('', 'w', 'warranty', _ ("show warranty and copyright")),
]
-from lilylib import *
-
layout_fields = ['dedication', 'title', 'subtitle', 'subsubtitle',
'footer', 'head', 'composer', 'arranger', 'instrument',
'opus', 'piece', 'metre', 'meter', 'poet', 'texttranslator']
'pagenumber' : [1],
'textheight' : [],
'linewidth' : [],
- 'orientation' : []
+ 'orientation' : [],
+ 'unit' : ['pt'],
}
extra_fields = extra_init.keys ()
include_path = ['.']
lily_p = 1
paper_p = 1
-cache_pks_p = 1
-
-PK_PATTERN='feta.*\.[0-9]+pk'
output_name = ''
-targets = {
- 'DVI' : 0,
- 'LATEX' : 0,
- 'MIDI' : 0,
- 'TEX' : 0,
- }
+
+## docme: what does this do?
+targets = [ 'DVI', 'LATEX', 'MIDI', 'TEX']
track_dependencies_p = 0
dependency_files = []
-#
-# Try to cater for bad installations of LilyPond, that have
-# broken TeX setup. Just hope this doesn't hurt good TeX
-# setups. Maybe we should check if kpsewhich can find
-# feta16.{afm,mf,tex,tfm}, and only set env upon failure.
-#
+
+kpse = os.popen ('kpsexpand \$TEXMF').read()
+kpse = re.sub('[ \t\n]+$','', kpse)
+type1_paths = os.popen ('kpsewhich -expand-path=\$T1FONTS').read ()
+
environment = {
- 'MFINPUTS' : datadir + '/mf' + ':',
- 'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:' + '.:'
- + os.getcwd() + ':',
- 'TFMFONTS' : datadir + '/tfm' + ':',
- 'GS_FONTPATH' : datadir + '/afm:' + datadir + '/pfa',
+ # TODO: * prevent multiple addition.
+ # * clean TEXINPUTS, MFINPUTS, TFMFONTS,
+ # as these take prevalence over $TEXMF
+ # and thus may break tex run?
+ 'TEXMF' : "{%s,%s}" % (datadir, kpse) ,
+ 'GS_FONTPATH' : type1_paths,
'GS_LIB' : datadir + '/ps',
}
+# tex needs lots of memory, more than it gets by default on Debian
+non_path_environment = {
+ 'extra_mem_top' : '1000000',
+ 'extra_mem_bottom' : '1000000',
+ 'pool_size' : '250000',
+}
def setup_environment ():
+ # $TEXMF is special, previous value is already taken care of
+ if os.environ.has_key ('TEXMF'):
+ del os.environ['TEXMF']
+
for key in environment.keys ():
val = environment[key]
if os.environ.has_key (key):
val = os.environ[key] + os.pathsep + val
os.environ[key] = val
+ for key in non_path_environment.keys ():
+ val = non_path_environment[key]
+ os.environ[key] = val
+
#what a name.
def set_setting (dict, key, val):
try:
for (k,v) in os.environ.items ():
sys.stderr.write ("%s=\"%s\"\n" % (k,v))
+def quiet_system (cmd, name, ignore_error = 0):
+ if not verbose_p:
+ progress ( _("Running %s...") % name)
+ cmd = cmd + ' 1> /dev/null 2> /dev/null'
+
+ return system (cmd, ignore_error, quiet = 1)
+
+
def run_lilypond (files, outbase, dep_prefix):
opts = ''
# opts = opts + '--output=%s.tex' % outbase
# for better debugging!
print_environment ()
- print opts, fs
- system ('lilypond %s %s ' % (opts, fs))
+
+ cmd = 'lilypond %s %s ' % (opts, fs)
+ if verbose_p:
+ progress ("Invoking `%s'"% cmd)
+ status = os.system (cmd)
+
+ signal = 0x0f & status
+ exit_status = status >> 8
+
+ # 2 == user interrupt.
+ if signal <> 2:
+ error("\n\nLilyPond crashed (signal %d). Please submit a bugreport to bug-lilypond@gnu.org\n" % signal)
+
+ if status:
+ error ("\n\nLilyPond failed on the input file. (exit status %d)\n" % exit_status)
+
def analyse_lilypond_output (filename, extra):
# search only the first 10k
s = s[:10240]
- for x in ('textheight', 'linewidth', 'papersize', 'orientation'):
+ for x in extra_fields:
m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}'%x, s)
if m:
set_setting (extra, x, m.group (1))
'letter' : 'letterpaper',
}
-def global_latex_definition (tfiles, extra):
-
- '''construct preamble from EXTRA, dump Latex stuff for each
-lily output file in TFILES after that, and return the Latex file constructed. '''
-
-
+#TODO: should set textheight (enlarge) depending on papersize.
+def global_latex_preamble (extra):
+ '''construct preamble from EXTRA,'''
s = ""
s = s + '% generation tag\n'
options = ''
+
if extra['papersize']:
try:
- options = '%s' % ly_paper_to_latexpaper[extra['papersize'][0]]
+ options = ly_paper_to_latexpaper[extra['papersize'][0]]
except KeyError:
warning (_ ("invalid value: %s") % `extra['papersize'][0]`)
pass
s = s + '\\include{%s}\n' \
% string.join (extra['latexheaders'], '}\n\\include{')
+ unit = extra['unit'][-1]
+
textheight = ''
if extra['textheight']:
- textheight = ',textheight=%fpt' % extra['textheight'][0]
+ textheight = ',textheight=%f%s' % (extra['textheight'][0], unit)
orientation = 'portrait'
if extra['orientation']:
orientation = extra['orientation'][0]
- # set sane geometry width (a4-width) for linewidth = -1.
+ # set sane geometry width (a4-width) for linewidth = -1.
maxlw = max (extra['linewidth'] + [-1])
if maxlw < 0:
# who the hell is 597 ?
- linewidth = '597'
+ linewidth = '597pt'
else:
- linewidth = maxlw
- s = s + '\geometry{width=%spt%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+ linewidth = '%d%s' % (maxlw, unit)
+ s = s + '\geometry{width=%s%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
if extra['latexoptions']:
s = s + '\geometry{twosideshift=4mm}\n'
else:
s = s + '\\pagestyle{empty}\n'
- s = s + '\\begin{document}\n'
+
+ return s
+
+
+def global_latex_definition (tfiles, extra):
+ '''construct preamble from EXTRA, dump Latex stuff for each
+lily output file in TFILES after that, and return the Latex file constructed. '''
+
+
+ s = global_latex_preamble (extra) + '\\begin{document}\n'
s = s + '\\thispagestyle{firstpage}\n'
first = 1
f.close ()
cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn
+ status = quiet_system (cmd, 'LaTeX', ignore_error = 1)
- if not verbose_p:
- progress ( _("Running %s...") % 'LaTeX')
- cmd = cmd + ' 1> /dev/null 2> /dev/null'
+ signal = 0xf & status
+ exit_stat = status >> 8
- system (cmd)
+ if exit_stat:
+ logstr = open (outbase + '.log').read()
+ m = re.search ("\n!", logstr)
+ start = m.start (0)
+ logstr = logstr[start:start+200]
+
+ sys.stderr.write(_("""LaTeX failed on the output file.
+The error log is as follows:
+%s...\n""" % logstr))
+ raise 'LaTeX error'
+
+ if preview_p:
+ # make a preview by rendering only the 1st line.
+ preview_fn = outbase + '.preview.tex'
+ f = open(preview_fn, 'w')
+ f.write (r'''
+%s
+\input lilyponddefs
+\pagestyle{empty}
+\begin{document}
+\def\interscoreline{\endinput}
+\input %s
+\end{document}
+''' % (global_latex_preamble (extra), outbase))
+
+ f.close()
+ cmd = 'latex \\\\nonstopmode \\\\input %s' % preview_fn
+ quiet_system (cmd, "LaTeX for preview")
+
def run_dvips (outbase, extra):
opts = opts + ' -tlandscape'
cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi')
+ quiet_system (cmd, 'dvips')
+
+ if preview_p:
+ cmd = 'dvips -E -o%s %s' % ( outbase + '.preview.ps', outbase + '.preview.dvi')
+ quiet_system (cmd, 'dvips for preview')
+
+def get_bbox (filename):
+ # cut & paste
+ system ('gs -sDEVICE=bbox -q -sOutputFile=- -dNOPAUSE %s -c quit > %s.bbox 2>&1 ' % (filename, filename))
+
+ box = open (filename + '.bbox').read()
+ m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', box)
+ gr = []
+ if m:
+ gr = map (string.atoi, m.groups ())
- if not verbose_p:
- progress ( _("Running %s...") % 'dvips')
- cmd = cmd + ' 1> /dev/null 2> /dev/null'
-
- system (cmd)
+ return gr
+
+#
+# cut & paste from lilypond-book.
+#
+def make_preview (name, extra):
+ bbox = get_bbox (name + '.preview.ps')
+ margin = 0
+ fo = open (name + '.trans.eps' , 'w')
+ fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin))
+ fo.close ()
+
+ x = (2* margin + bbox[2] - bbox[0]) * preview_resolution / 72.
+ y = (2* margin + bbox[3] - bbox[1]) * preview_resolution / 72.
+
+ cmd = r'''gs -g%dx%d -sDEVICE=pgm -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=- -r%d -dNOPAUSE %s %s -c quit | pnmtopng > %s'''
+
+ cmd = cmd % (x, y, preview_resolution, name + '.trans.eps', name + '.preview.ps',name + '.png')
+ quiet_system (cmd, 'gs')
+
+ try:
+ status = system (cmd)
+ except:
+ os.unlink (name + '.png')
+ error ("Removing output file")
+
+
def generate_dependency_file (depfile, outname):
df = open (depfile, 'w')
elif o == '--include' or o == '-I':
include_path.append (a)
elif o == '--postscript' or o == '-P':
- targets['PS'] = 0
+ targets.append ('PS')
elif o == '--keep' or o == '-k':
keep_temp_dir_p = 1
elif o == '--no-lily':
lily_p = 0
+ elif o == '--preview':
+ preview_p = 1
+ targets.append ('PNG')
+ elif o == '--preview-resolution':
+ preview_resolution = string.atoi (a)
elif o == '--no-paper' or o == '-m':
- targets = {}
- targets['MIDI'] = 0
+ targets = ['MIDI']
paper_p = 0
elif o == '--output' or o == '-o':
output_name = a
sys.exit (0)
-
-def cp_to_dir (pattern, dir):
- "Copy files matching re PATTERN from cwd to DIR"
- # Duh. Python style portable: cp *.EXT OUTDIR
- # system ('cp *.%s %s' % (ext, outdir), 1)
- files = filter (lambda x, p=pattern: re.match (p, x), os.listdir ('.'))
- map (lambda x, d=dir: shutil.copy2 (x, os.path.join (d, x)), files)
-
-# Python < 1.5.2 compatibility
-#
-# On most platforms, this is equivalent to
-#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2*
-if os.path.__dict__.has_key ('abspath'):
- abspath = os.path.abspath
-else:
- def abspath (path):
- return os.path.normpath (os.path.join (os.getcwd (), path))
-
-if os.__dict__.has_key ('makedirs'):
- makedirs = os.makedirs
-else:
- def makedirs (dir, mode=0777):
- system ('mkdir -p %s' % dir)
-
-def mkdir_p (dir, mode=0777):
- if not os.path.isdir (dir):
- makedirs (dir, mode)
-
include_path = map (abspath, include_path)
original_output = output_name
if files and files[0] != '-':
-
+
# Ugh, maybe make a setup () function
files = map (lambda x: strip_extension (x, '.ly'), files)
+ # hmmm. Wish I'd 've written comments when I wrote this.
+ # now it looks complicated.
+
(outdir, outbase) = ('','')
if not output_name:
outbase = os.path.basename (files[0])
for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'):
output_name = strip_extension (output_name, i)
+ outbase = strip_extension (outbase, i)
+ files = map (abspath, files)
- files = map (abspath, files)
-
+ for i in files[:] + [output_name]:
+ if string.find (i, ' ') >= 0:
+ user_error (_ ("filename should not contain spaces: `%s'") % i)
+
if os.path.dirname (output_name) != '.':
dep_prefix = os.path.dirname (output_name)
else:
dep_prefix = 0
reldir = os.path.dirname (output_name)
- if outdir != '.' and (track_dependencies_p or targets.keys ()):
+ if outdir != '.' and (track_dependencies_p or targets):
mkdir_p (outdir, 0777)
setup_environment ()
tmpdir = setup_temp ()
- if cache_pks_p :
- os.chdir (outdir)
- cp_to_dir (PK_PATTERN, tmpdir)
# to be sure, add tmpdir *in front* of inclusion path.
#os.environ['TEXINPUTS'] = tmpdir + ':' + os.environ['TEXINPUTS']
# - init.ly setup failure
# - parse error in .ly
# - unexpected: assert/core dump
- targets = {}
+ targets = []
traceback.print_exc ()
- if targets.has_key ('DVI') or targets.has_key ('PS'):
+ if 'PNG' in targets and 'PS' not in targets:
+ targets.append ('PS')
+ if 'PS' in targets and 'DVI' not in targets:
+ targets.append('DVI')
+
+ if 'DVI' in targets:
try:
run_latex (files, outbase, extra_init)
# unless: add --tex, or --latex?
- del targets['TEX']
- del targets['LATEX']
+ targets.remove ('TEX')
+ targets.remove('LATEX')
except:
# TODO: friendly message about TeX/LaTeX setup,
# trying to run tex/latex by hand
- if targets.has_key ('DVI'):
- del targets['DVI']
- if targets.has_key ('PS'):
- del targets['PS']
+ if 'DVI' in targets:
+ targets.remove ('DVI')
+ if 'PS' in targets:
+ targets.remove ('PS')
traceback.print_exc ()
- if targets.has_key ('PS'):
+ if 'PS' in targets:
try:
run_dvips (outbase, extra_init)
except:
- if targets.has_key ('PS'):
- del targets['PS']
+ if 'PS' in targets:
+ targets.remove ('PS')
traceback.print_exc ()
+ if 'PNG' in targets:
+ make_preview (outbase, extra_init)
+
# add DEP to targets?
if track_dependencies_p:
depfile = os.path.join (outdir, outbase + '.dep')
progress (_ ("dependencies output to `%s'...") % depfile)
# Hmm, if this were a function, we could call it the except: clauses
- for i in targets.keys ():
+ for i in targets:
ext = string.lower (i)
cp_to_dir ('.*\.%s$' % ext, outdir)
outname = outbase + '.' + string.lower (i)
elif verbose_p:
warning (_ ("can't find file: `%s'") % outname)
- if cache_pks_p:
- cp_to_dir (PK_PATTERN, outdir)
-
os.chdir (original_dir)
cleanup_temp ()
else:
# FIXME: read from stdin when files[0] = '-'
help ()
- errorport.write (program_name + ":" + _ ("error: ") + _ ("no files specified on command line.") + '\n')
- sys.exit (2)
+ user_error (_ ("no files specified on command line."), 2)