#!@PYTHON@
-
-# Run lilypond, latex, dvips.
#
+# ly2dvi.py -- Run LilyPond, add titles to bare score, generate printable
+# document
+# Invokes: lilypond, latex (or pdflatex), dvips, ps2pdf, gs
+#
+# source file of the GNU LilyPond music typesetter
+#
+# (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# Jan Nieuwenhuizen <janneke@gnu.org>
+
# This is the third incarnation of ly2dvi.
#
# Earlier incarnations of ly2dvi were written by
# Jan Arne Fagertun <Jan.A.Fagertun@@energy.sintef.no> (Bourne shell script)
#
-#
# Note: gettext work best if we use ' for docstrings and "
# for gettextable strings.
-# --> DO NOT USE """ for docstrings.
+# --> DO NOT USE ''' for docstrings.
+
'''
TODO:
'''
-
-
-
-
-import os
-import stat
-import string
-import re
-import getopt
-import sys
-import shutil
import __main__
import operator
-import tempfile
+import re
+import stat
+import string
import traceback
-
-# 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
-
-
-################################################################
-# lilylib.py -- options and stuff
-#
-# source file of the GNU LilyPond music typesetter
-
-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.17'
-
-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):
- """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:
- 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
-
################################################################
-# END Library
-
-
-
-
-
-
-# if set, LILYPONDPREFIX must take prevalence
-# if datadir is not set, we're doing a build and LILYPONDPREFIX
-datadir = '@datadir@'
-
-
+# Users of python modules should include this snippet
+# and customize variables below.
+
+# We'll suffer this path init stuff as long as we don't install our
+# python packages in <prefix>/lib/pythonx.y (and don't kludge around
+# it as we do with teTeX on Red Hat Linux: set some environment var
+# (PYTHONPATH) in profile)
+
+# If set, LILYPONDPREFIX must take prevalence
+# if datadir is not set, we're doing a build and LILYPONDPREFIX
+import getopt, os, sys
+datadir = '@local_lilypond_datadir@'
+if not os.path.isdir (datadir):
+ datadir = '@lilypond_datadir@'
if os.environ.has_key ('LILYPONDPREFIX') :
datadir = os.environ['LILYPONDPREFIX']
-else:
- datadir = '@datadir@'
+ while datadir[-1] == os.sep:
+ datadir= datadir[:-1]
+sys.path.insert (0, os.path.join (datadir, 'python'))
-while datadir[-1] == os.sep:
- datadir= datadir[:-1]
+# Customize these
+#if __name__ == '__main__':
-program_name = 'ly2dvi'
+import lilylib as ly
+global _;_=ly._
+# lilylib globals
+program_name = 'ly2dvi'
+verbose_p = 0
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
-preview_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
-
-help_summary = _ ("Generate .dvi with LaTeX for LilyPond")
+## FIXME
+## ly2dvi: silly name?
+## do -P or -p by default?
+##help_summary = _ ("Run LilyPond using LaTeX for titling")
+help_summary = _ ("Run LilyPond, add titles, generate printable document")
option_definitions = [
- ('', 'd', 'dependencies', _ ("write Makefile dependencies for every input file")),
+ ('', 'd', 'dependencies',
+ _ ("write Makefile dependencies for every input file")),
('', 'h', 'help', _ ("this help")),
(_ ("DIR"), 'I', 'include', _ ("add DIR to LilyPond's search path")),
- ('', 'k', 'keep', _ ("keep all output, and name the directory %s.dir") % program_name),
+ ('', 'k', 'keep',
+ _ ("keep all output, output to directory %s.dir") % program_name),
('', '', 'no-lily', _ ("don't run LilyPond")),
('', 'm', 'no-paper', _ ("produce MIDI output only")),
(_ ("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")),
+ ('', 'p', 'pdf', _ ("generate PDF output")),
+ ('', '', 'pdftex', _ ("use pdflatex to generate a PDF output")),
+ # FIXME: preview, picture; to indicate creation of a PNG?
+ ('', '', 'preview', _ ("make a picture of the first system")),
(_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")),
('', 'V', 'verbose', _ ("verbose")),
('', 'v', 'version', _ ("print version number")),
('', 'w', 'warranty', _ ("show warranty and copyright")),
]
+# other globals
+preview_p = 0
+lilypond_error_p = 0
+preview_resolution = 90
+pseudo_filter_p = 0
+
+
+# Pdftex support
+pdftex_p = 0
+latex_cmd = 'latex'
+tex_extension = '.tex'
+
+
layout_fields = ['dedication', 'title', 'subtitle', 'subsubtitle',
'footer', 'head', 'composer', 'arranger', 'instrument',
'opus', 'piece', 'metre', 'meter', 'poet', 'texttranslator']
output_name = ''
-## docme: what does this do?
-targets = [ 'DVI', 'LATEX', 'MIDI', 'TEX']
+# Output formats that ly2dvi should create
+targets = ['DVI', 'LATEX', 'MIDI', 'TEX']
track_dependencies_p = 0
dependency_files = []
-
-
-kpse = os.popen ('kpsexpand \$TEXMF').read()
-kpse = re.sub('[ \t\n]+$','', kpse)
-type1_paths = os.popen ('kpsewhich -expand-path=\$T1FONTS').read ()
-
-environment = {
- ## todo: prevent multiple addition.
- 'TEXMF' : "{%s,%s}" % (datadir, kpse) ,
- 'GS_FONTPATH' : type1_paths,
- 'GS_LIB' : datadir + '/ps',
-}
+environment = {}
# tex needs lots of memory, more than it gets by default on Debian
non_path_environment = {
}
def setup_environment ():
+ global environment
+
+ kpse = ly.read_pipe ('kpsexpand \$TEXMF')
+ texmf = re.sub ('[ \t\n]+$','', kpse)
+ type1_paths = ly.read_pipe ('kpsewhich -expand-path=\$T1FONTS')
+
+ environment = {
+ # TODO: * prevent multiple addition.
+ # * clean TEXINPUTS, MFINPUTS, TFMFONTS,
+ # as these take prevalence over $TEXMF
+ # and thus may break tex run?
+ 'TEXMF' : "{%s,%s}" % (datadir, texmf) ,
+ 'GS_FONTPATH' : type1_paths,
+ 'GS_LIB' : datadir + '/ps',
+ }
+
# $TEXMF is special, previous value is already taken care of
- if os.environ.has_key ('TEXM'):
+ if os.environ.has_key ('TEXMF'):
del os.environ['TEXMF']
-
for key in environment.keys ():
val = environment[key]
if os.environ.has_key (key):
#what a name.
def set_setting (dict, key, val):
try:
- val = string.atof (val)
+ val = string.atoi (val)
except ValueError:
- #warning (_ ("invalid value: %s") % `val`)
+ #ly.warning (_ ("invalid value: %s") % `val`)
pass
+ if type(val) == type ('hoi'):
+ try:
+ val = string.atof (val)
+ except ValueError:
+ #ly.warning (_ ("invalid value: %s") % `val`)
+ pass
+
try:
dict[key].append (val)
except KeyError:
- warning (_ ("no such setting: %s") % `key`)
+ ly.warning (_ ("no such setting: `%s'") % `key`)
dict[key] = [val]
for (k,v) in os.environ.items ():
sys.stderr.write ("%s=\"%s\"\n" % (k,v))
-def quiet_system (cmd, name):
- if not verbose_p:
- progress ( _("Running %s...") % name)
- cmd = cmd + ' 1> /dev/null 2> /dev/null'
-
- return system (cmd)
-
+def run_lilypond (files, dep_prefix):
-def run_lilypond (files, outbase, dep_prefix):
opts = ''
-# opts = opts + '--output=%s.tex' % outbase
opts = opts + ' ' + string.join (map (lambda x : '-I ' + x,
include_path))
+ if pseudo_filter_p:
+ opts = opts + ' --output=lelie'
if paper_p:
opts = opts + ' ' + string.join (map (lambda x : '-H ' + x,
fields))
else:
opts = opts + ' --no-paper'
-
+
+ if pdftex_p:
+ opts = opts + ' -f pdftex'
+
if track_dependencies_p:
opts = opts + " --dependencies"
if dep_prefix:
fs = string.join (files)
- if not verbose_p:
- # cmd = cmd + ' 1> /dev/null 2> /dev/null'
- progress ( _("Running %s...") % 'LilyPond')
- else:
+ global verbose_p
+ if verbose_p:
opts = opts + ' --verbose'
-
- # for better debugging!
print_environment ()
- print opts, fs
- system ('lilypond %s %s ' % (opts, fs), 'lilypond')
+
+ cmd = 'lilypond %s %s ' % (opts, fs)
+
+ # We unset verbose, because we always want to see lily's
+ # progess on stderr
+ save_verbose = verbose_p
+ status = ly.system (cmd, ignore_error = 1)
+ verbose_p = save_verbose
+
+ signal = 0x0f & status
+ exit_status = status >> 8
+
+ # 2 == user interrupt.
+ if signal and signal != 2:
+ sys.stderr.write ('\n\n')
+ ly.error (_ ("LilyPond crashed (signal %d).") % signal)
+ ly.error (_ ("Please submit a bug report to bug-lilypond@gnu.org"))
+ ly.exit (status)
+
+ if status:
+ sys.stderr.write ('\n')
+ if len (files) == 1:
+ ly.error (_ ("LilyPond failed on input file %s (exit status %d)") % (files[0], exit_status))
+ ly.exit (status)
+ else:
+ ly.error (_ ("LilyPond failed on an input file (exit status %d)") % exit_status)
+ ly.error (_ ("Continuing..."))
+ global lilypond_error_p
+ lilypond_error_p = 1
+
def analyse_lilypond_output (filename, extra):
# urg
'''Grep FILENAME for interesting stuff, and
put relevant info into EXTRA.'''
- filename = filename+'.tex'
- progress (_ ("Analyzing %s...") % filename)
+ filename = filename+tex_extension
+ ly.progress (_ ("Analyzing %s...") % filename)
s = open (filename).read ()
# search only the first 10k
m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}'%x, s)
if m:
set_setting (extra, x, m.group (1))
+ ly.progress ('\n')
def find_tex_files_for_base (base, extra):
- """
+ '''
Find the \header fields dumped from BASE.
- """
+ '''
headerfiles = {}
for f in layout_fields:
if os.path.exists (base + '.' + f):
extra[f].append (open (base + '.' + f).read ())
- return (base +'.tex',headerfiles)
+ return (base+tex_extension,headerfiles)
def find_tex_files (files, extra):
- """
+ '''
Find all .tex files whose prefixes start with some name in FILES.
- """
+ '''
tfiles = []
x = 0
while 1:
fname = os.path.basename (f)
- fname = strip_extension (fname, '.ly')
+ fname = ly.strip_extension (fname, '.ly')
if x:
fname = fname + '-%d' % x
- if os.path.exists (fname + '.tex'):
+ if os.path.exists (fname + tex_extension):
tfiles.append (find_tex_files_for_base (fname, extra))
analyse_lilypond_output (fname, extra)
else:
x = x + 1
if not x:
fstr = string.join (files, ', ')
- warning (_ ("no lilypond output found for %s") % fstr)
+ ly.warning (_ ("no LilyPond output found for `%s'") % fstr)
return tfiles
def one_latex_definition (defn, first):
ly_paper_to_latexpaper = {
'a4' : 'a4paper',
'letter' : 'letterpaper',
+ 'a3' : 'a3paper'
}
#TODO: should set textheight (enlarge) depending on papersize.
try:
options = ly_paper_to_latexpaper[extra['papersize'][0]]
except KeyError:
- warning (_ ("invalid value: %s") % `extra['papersize'][0]`)
+ ly.warning (_ ("invalid value: `%s'") % `extra['papersize'][0]`)
pass
if extra['latexoptions']:
s = s + '\\documentclass[%s]{article}\n' % options
if extra['language']:
- s = s + r'\usepackage[%s]{babel}\n' % extra['language'][-1]
+ s = s + r'\usepackage[%s]{babel}' % extra['language'][-1] + '\n'
s = s + '\\usepackage{%s}\n' \
'''
if extra['pagenumber'] and extra['pagenumber'][-1] and extra['pagenumber'][-1] != 'no':
- s = s + '\setcounter{page}{%s}\n' % (extra['pagenumber'][-1])
+ s = s + '\setcounter{page}{%d}\n' % (extra['pagenumber'][-1])
s = s + '\\pagestyle{plain}\n'
else:
s = s + '\\pagestyle{empty}\n'
s = global_latex_preamble (extra) + '\\begin{document}\n'
+ s = s + '\\parindent 0pt\n'
s = s + '\\thispagestyle{firstpage}\n'
first = 1
def run_latex (files, outbase, extra):
- """Construct latex file, for FILES and EXTRA, dump it into
+ '''Construct latex file, for FILES and EXTRA, dump it into
OUTBASE.latex. Run LaTeX on it.
RETURN VALUE
None
- """
+ '''
+
latex_fn = outbase + '.latex'
wfs = find_tex_files (files, extra)
f.write (s)
f.close ()
- cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn
- quiet_system (cmd, 'LaTeX')
+ cmd = latex_cmd + ' \\\\nonstopmode \\\\input %s' % latex_fn
+ status = ly.system (cmd, ignore_error = 1)
+ signal = 0xf & status
+ exit_status = status >> 8
+
+ if exit_status:
+ logstr = ''
+ try:
+ logstr = open (outbase + '.log').read ()
+ m = re.search ("\n!", logstr)
+ start = m.start (0)
+ logstr = logstr[start:start+200]
+ except:
+ pass
+
+ ly.error (_ ("LaTeX failed on the output file."))
+ ly.error (_ ("The error log is as follows:"))
+ sys.stderr.write (logstr + '\n')
+ ly.exit (1)
+
if preview_p:
# make a preview by rendering only the 1st line.
preview_fn = outbase + '.preview.tex'
- f = open(preview_fn, 'w')
+ f = open (preview_fn, 'w')
f.write (r'''
%s
\input lilyponddefs
''' % (global_latex_preamble (extra), outbase))
f.close()
- cmd = 'latex \\\\nonstopmode \\\\input %s' % preview_fn
- quiet_system (cmd, "LaTeX for preview")
+ cmd = '%s \\\\nonstopmode \\\\input %s' % (latex_cmd, preview_fn)
+ ly.system (cmd)
def run_dvips (outbase, extra):
- """Run dvips using the correct options taken from EXTRA,
+ '''Run dvips using the correct options taken from EXTRA,
leaving a PS file in OUTBASE.ps
RETURN VALUE
None.
-"""
+'''
opts = ''
if extra['papersize']:
opts = opts + ' -t%s' % extra['papersize'][0]
if extra['orientation'] and extra['orientation'][0] == 'landscape':
opts = opts + ' -tlandscape'
+ if 'PDF' in targets:
+ opts = opts + ' -Ppdf -G0 -u lilypond.map'
+
cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi')
- quiet_system (cmd, 'dvips')
+ ly.system (cmd)
if preview_p:
cmd = 'dvips -E -o%s %s' % ( outbase + '.preview.ps', outbase + '.preview.dvi')
- quiet_system (cmd, 'dvips for preview')
+ ly.system (cmd)
+ if 'PDF' in targets:
+ cmd = 'ps2pdf %s.ps %s.pdf' % (outbase , outbase)
+ ly.system (cmd)
+
def get_bbox (filename):
# cut & paste
- system ('gs -sDEVICE=bbox -q -sOutputFile=- -dNOPAUSE %s -c quit > %s.bbox 2>&1 ' % (filename, filename))
+ ####ly.system ('gs -sDEVICE=bbox -q -sOutputFile=- -dNOPAUSE %s -c quit > %s.bbox 2>&1 ' % (filename, filename))
+ #### FIXME: 2>&1 ? --jcn
+ ly.system ('gs -sDEVICE=bbox -q -sOutputFile=- -dNOPAUSE %s -c quit > %s.bbox' % (filename, filename))
box = open (filename + '.bbox').read()
m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', box)
fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin))
fo.close ()
- res = 90
-
- x = (2* margin + bbox[2] - bbox[0]) * res / 72.
- y = (2* margin + bbox[3] - bbox[1]) * res / 72.
+ 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, res, name + '.trans.eps', name + '.preview.ps',name + '.png')
- quiet_system (cmd, 'gs')
+ cmd = cmd % (x, y, preview_resolution, name + '.trans.eps',
+ name + '.preview.ps',name + '.png')
+ ly.system (cmd)
try:
- status = system (cmd)
+ status = ly.system (cmd)
except:
os.unlink (name + '.png')
- error ("Removing output file")
-
-
+ ly.error (_ ("Removing output file"))
+ ly.exit (1)
def generate_dependency_file (depfile, outname):
df = open (depfile, 'w')
s = open (name).read ()
if s[:len (PS)] != PS:
# no ps header?
- errorport.write (_( "error: ") + _ ("not a PostScript file: `%s\'" % name))
- errorport.write ('\n')
- sys.exit (1)
+ ly.error (_ ("not a PostScript file: `%s\'" % name))
+ ly.exit (1)
here = 0
m = re.match ('.*?/(feta[-a-z0-9]+) +findfont', s[here:], re.DOTALL)
pfa = []
return pfa
-(sh, long) = getopt_args (option_definitions)
+(sh, long) = ly.getopt_args (option_definitions)
try:
- (options, files) = getopt.getopt(sys.argv[1:], sh, long)
+ (options, files) = getopt.getopt (sys.argv[1:], sh, long)
except getopt.error, s:
- errorport.write ('\n')
- errorport.write (_ ("error: ") + _ ("getopt says: `%s\'" % s))
- errorport.write ('\n')
- errorport.write ('\n')
- help ()
- sys.exit (2)
+ sys.stderr.write ('\n')
+ ly.error (_ ("getopt says: `%s\'" % s))
+ sys.stderr.write ('\n')
+ ly.help ()
+ ly.exit (2)
-for opt in options:
+for opt in options:
o = opt[0]
a = opt[1]
if 0:
pass
elif o == '--help' or o == '-h':
- help ()
+ ly.help ()
sys.exit (0)
elif o == '--find-pfa' or o == '-f':
fonts = map (lambda x: x + '.pfa', find_pfa_fonts (a))
include_path.append (a)
elif o == '--postscript' or o == '-P':
targets.append ('PS')
+ elif o == '--pdf' or o == '-p':
+ targets.append ('PS')
+ targets.append ('PDF')
elif o == '--keep' or o == '-k':
keep_temp_dir_p = 1
elif o == '--no-lily':
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 = ['MIDI']
paper_p = 0
elif o == '--output' or o == '-o':
elif o == '--verbose' or o == '-V':
verbose_p = 1
elif o == '--version' or o == '-v':
- identify ()
+ ly.identify (sys.stdout)
sys.exit (0)
+ elif o == '--pdftex':
+ latex_cmd = 'pdflatex'
+ targets.remove('DVI')
+ targets.append('PDFTEX')
+ pdftex_p = 1
+ tex_extension = '.pdftex'
elif o == '--warranty' or o == '-w':
- status = system ('lilypond -w', ignore_error = 1)
+ status = os.system ('lilypond -w')
if status:
- warranty ()
+ ly.warranty ()
sys.exit (0)
+# Don't convert input files to abspath, rather prepend '.' to include
+# path.
+include_path.insert (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
+# As a neat trick, add directory part of first input file
+# to include path. That way you can do without the clumsy -I in:
+# ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly
+if files and files[0] != '-' and os.path.dirname (files[0]) != '.':
+ include_path.append (os.path.dirname (files[0]))
+
+include_path = map (ly.abspath, include_path)
-if files and files[0] != '-':
+if files and (files[0] == '-' or output_name == '-'):
+ if len (files) == 1:
+ pseudo_filter_p = 1
+ output_name = 'lelie'
+ if verbose_p:
+ ly.progress (_ ("pseudo filter") + '\n')
+ else:
+ ly.help ()
+ ly.error (_ ("pseudo filter only for single input file"))
+ ly.exit (2)
+
+if not files:
+ ly.help ()
+ ly.error (_ ("no files specified on command line"))
+ ly.exit (2)
+
+if 1:
+ ly.identify (sys.stderr)
+ original_output = output_name
# Ugh, maybe make a setup () function
- files = map (lambda x: strip_extension (x, '.ly'), files)
+ files = map (lambda x: ly.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])
- outdir = abspath('.')
+ outdir = ly.abspath ('.')
elif output_name[-1] == os.sep:
- outdir = abspath (output_name)
+ outdir = ly.abspath (output_name)
outbase = os.path.basename (files[0])
else:
- (outdir, outbase) = os.path.split (abspath (output_name))
+ (outdir, outbase) = os.path.split (ly.abspath (output_name))
- for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'):
- output_name = strip_extension (output_name, i)
- outbase = strip_extension (outbase, i)
- files = map (abspath, files)
+ for i in ('.dvi', '.latex', '.ly', '.ps', '.tex', '.pdftex'):
+ output_name = ly.strip_extension (output_name, i)
+ outbase = ly.strip_extension (outbase, i)
for i in files[:] + [output_name]:
if string.find (i, ' ') >= 0:
- user_error (_ ("filename should not contain spaces: `%s'") % i)
+ ly.error (_ ("filename should not contain spaces: `%s'") %
+ i)
+ ly.exit (1)
if os.path.dirname (output_name) != '.':
dep_prefix = os.path.dirname (output_name)
reldir = os.path.dirname (output_name)
if outdir != '.' and (track_dependencies_p or targets):
- mkdir_p (outdir, 0777)
+ ly.mkdir_p (outdir, 0777)
setup_environment ()
- tmpdir = setup_temp ()
+ tmpdir = ly.setup_temp ()
# to be sure, add tmpdir *in front* of inclusion path.
#os.environ['TEXINPUTS'] = tmpdir + ':' + os.environ['TEXINPUTS']
os.chdir (tmpdir)
-
+
+ # We catch all exceptions, because we need to do stuff at exit:
+ # * copy any successfully generated stuff from tempdir and
+ # notify user of that
+ # * cleanout tempdir
if lily_p:
try:
- run_lilypond (files, outbase, dep_prefix)
+ run_lilypond (files, dep_prefix)
except:
# TODO: friendly message about LilyPond setup/failing?
#
# - parse error in .ly
# - unexpected: assert/core dump
targets = []
- traceback.print_exc ()
+ if verbose_p:
+ traceback.print_exc ()
+ # Our LilyPond pseudo filter always outputs to 'lelie'
+ # have subsequent stages and use 'lelie' output.
+ if pseudo_filter_p:
+ files[0] = 'lelie'
+
if 'PNG' in targets and 'PS' not in targets:
targets.append ('PS')
if 'PS' in targets and 'DVI' not in targets:
targets.remove ('DVI')
if 'PS' in targets:
targets.remove ('PS')
- traceback.print_exc ()
+ if verbose_p:
+ traceback.print_exc ()
if 'PS' in targets:
try:
except:
if 'PS' in targets:
targets.remove ('PS')
- traceback.print_exc ()
+ if verbose_p:
+ traceback.print_exc ()
if 'PNG' in targets:
make_preview (outbase, extra_init)
-
+
+ if 'PDFTEX' in targets:
+ try:
+ run_latex (files, outbase, extra_init)
+ # unless: add --tex, or --latex?
+ targets.remove ('TEX')
+ targets.remove ('LATEX')
+ targets.remove ('PDFTEX')
+ if 'PDF' not in targets:
+ targets.append('PDF')
+ except:
+ # TODO: friendly message about TeX/LaTeX setup,
+ # trying to run tex/latex by hand
+ if 'PDFTEX' in targets:
+ targets.remove ('PDFTEX')
+ if 'PDF' in targets:
+ targets.remove ('PDF')
+ if 'PS' in targets:
+ targets.remove ('PS')
+ if verbose_p:
+ traceback.print_exc ()
+
# add DEP to targets?
if track_dependencies_p:
depfile = os.path.join (outdir, outbase + '.dep')
generate_dependency_file (depfile, depfile)
if os.path.isfile (depfile):
- progress (_ ("dependencies output to `%s'...") % depfile)
+ ly.progress (_ ("dependencies output to `%s'...") %
+ depfile)
+ ly.progress ('\n')
+
+ if pseudo_filter_p:
+ main_target = 0
+ for i in 'PDF', 'PS', 'PNG', 'DVI', 'LATEX':
+ if i in targets:
+ main_target = i
+ break
+ ly.progress (_ ("%s output to <stdout>...") % i)
+ outname = outbase + '.' + string.lower (main_target)
+ if os.path.isfile (outname):
+ sys.stdout.write (open (outname).read ())
+ elif verbose_p:
+ ly.warning (_ ("can't find file: `%s'") % outname)
+ targets = []
+ ly.progress ('\n')
+
# Hmm, if this were a function, we could call it the except: clauses
for i in targets:
ext = string.lower (i)
- cp_to_dir ('.*\.%s$' % ext, outdir)
+ ly.cp_to_dir ('.*\.%s$' % ext, outdir)
outname = outbase + '.' + string.lower (i)
abs = os.path.join (outdir, outname)
if reldir != '.':
outname = os.path.join (reldir, outname)
if os.path.isfile (abs):
- progress (_ ("%s output to `%s'...") % (i, outname))
+ ly.progress (_ ("%s output to `%s'...") % (i, outname))
+ ly.progress ('\n')
elif verbose_p:
- warning (_ ("can't find file: `%s'") % outname)
+ ly.warning (_ ("can't find file: `%s'") % outname)
os.chdir (original_dir)
- cleanup_temp ()
-
-else:
- # FIXME: read from stdin when files[0] = '-'
- help ()
- user_error (_ ("no files specified on command line."), 2)
-
-
+ ly.cleanup_temp ()
+ sys.exit (lilypond_error_p)
projects / lilypond.git / blobdiff