From: Han-Wen Nienhuys Date: Sat, 24 Jul 2004 12:13:09 +0000 (+0000) Subject: * scripts/lilypond-latex.py (run_dvips): remove -bin everywhere. X-Git-Tag: release/2.3.10~59 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=4eeca0046602a7083480496eee2fe5c3e185bdc3;p=lilypond.git * scripts/lilypond-latex.py (run_dvips): remove -bin everywhere. * lily/GNUmakefile (NAME): create lilypond, not lilypond-bin * scripts/lilypond-latex.py: move from lilypond.py * make/lilypond-vars.make: centralize LILYPOND_BOOK_FLAGS setting. (LILYPOND_BOOK_FLAGS): use -f tex for lilypond-book. * lily/paper-book.cc (post_processing): call convert-to-{dvi,ps,png,pdf} * lily/paper-book.cc (output): call output-preview-framework (post_processing): new function. Do PDF/PNG conversion. * scm/framework-ps.scm (convert-to-pdf): new function. Call ps2pdf. (output-preview-framework): new function. Generate a preview .ps --- diff --git a/ChangeLog b/ChangeLog index 6d57c41b9e..652f7c07a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2004-07-24 Han-Wen Nienhuys + * scripts/lilypond-latex.py (run_dvips): remove -bin everywhere. + + * lily/GNUmakefile (NAME): create lilypond, not lilypond-bin + + * scripts/lilypond-latex.py: move from lilypond.py + + * make/lilypond-vars.make: centralize LILYPOND_BOOK_FLAGS setting. + (LILYPOND_BOOK_FLAGS): use -f tex for lilypond-book. + * scm/lily.scm (postscript->png): new function (postscript->pdf): new function diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 580d94c99d..af1a26a572 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -8,6 +8,11 @@ @itemize @bullet +@item The LilyPond binary now supports output options +@code{--dvi} @code{--png} @code{--ps} @code{--pdf} and +@code{--preview}. The old wrapper script for La@TeX{} has been +renamed to @code{lilypond-latex}. + @item Support ambituses has been rewritten. The Ambitus object is now a grouping object, composed of @code{AmbitusLine}, @code{AmbitusAccidental} and @code{AmbitusNoteHead}. These objects may diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 5a033da3b5..f06890b465 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -26,7 +26,6 @@ STEPMAKE_TEMPLATES=tex texinfo omf documentation OMF_FILES += $(outdir)/lilypond-internals.html.omf LOCALSTEPMAKE_TEMPLATES=lilypond ly -LILYPOND_BOOK_FLAGS = --process="lilypond-bin -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'" include $(depth)/make/stepmake.make diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 92fe71fddb..4aef5cf1f6 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -13,121 +13,6 @@ This chapter details the technicalities of running LilyPond. * Editor support:: * Point and click:: @end menu - -@node Invoking lilypond -@section Invoking lilypond - -Nicely titled output is created through a separate program: -@file{@code{lilypond}} is a script that uses the LilyPond formatting -engine (which is in a separate program) and La@TeX{} to create a -nicely titled piece of sheet music, in PDF (Portable Document Format) -format. - -@example - @code{lilypond} [@var{option}]@dots{} @var{file}@dots{} -@end example - -To have @code{lilypond} read from stdin, use a dash @code{-} for -@var{file}. The program supports the following options. - -@cindex stdin, reading - -@table @code -@item -k,--keep - Keep the temporary directory with all output -files. The temporary directory is created in the current directory as @code{@code{lilypond}.dir}. -@item -h,--help - Print usage help. -@item -I,--include=@var{dir} - Add @var{dir} to LilyPond's include path. -@item -o,--output=@var{file} - Generate output to @var{file}. The extension of @var{file} is ignored. -@item --png - Also generate pictures of each page, in PNG format. -@item --preview - Also generate a picture of the first system of the score. - -@cindex preview -@cindex picture -@cindex bitmap -@cindex pixmap -@cindex thumbnail -@cindex screen shot - -@item -s,--set=@var{key}=@var{val} - Add @var{key}= @var{val} to the settings, overriding those specified -in the files. Possible keys: @code{language}, @code{latexheaders}, -@code{latexpackages}, @code{latexoptions}, @code{papersize}, -@code{linewidth}, @code{orientation}, -@code{textheight}. -@item -v,--version -Show version information. -@item -V,--verbose -Be verbose. This prints out commands as they are executed, and more -information about the formatting process is printed. -@item --debug -Print even more information. This is useful when generating bug reports. -@item -w,--warranty -Show the warranty with which GNU LilyPond comes. (It comes with -@strong{NO WARRANTY}!) -@end table - - - -@subsection Additional parameters - -The @code{lilypond} program responds to several parameters specified -in a @code{\paper} section of the input file. They can be overridden -by supplying a @code{--set} command line option. - -@table @code -@item language - Specify La@TeX{} language: the @code{babel} package will be -included. Default: unset. - - Read from the @code{\header} block. - -@item latexheaders - Specify additional La@TeX{} headers file. -< - Normally read from the @code{\header} block. Default value: empty. - -@item latexpackages - Specify additional La@TeX{} packages file. This works cumulative, -so you can add multiple packages using multiple @code{-s=latexpackages} options. - Normally read from the @code{\header} block. Default value: -@code{geometry}. - -@item latexoptions - Specify additional options for the La@TeX{} -@code{\documentclass}. You can put any valid value here. This was -designed to allow @code{lilypond} to produce output for double-sided -paper, with balanced margins and page numbers on alternating sides. To -achieve this specify @code{twoside}. - -@item orientation - Set orientation. Choices are @code{portrait} or @code{landscape}. Is -read from the @code{\paper} block, if set. - -@item textheight - The vertical extension of the music on the page. It is normally - calculated automatically, based on the paper size. - -@item linewidth - The music line width. It is normally read from the @code{\paper} -block. - -@item papersize - The paper size (as a name, e.g. @code{a4}). It is normally read from -the @code{\paper} block. - -@item fontenc - The font encoding, should be set identical to the @code{font-encoding} - property in the score. -@end table - - - @node Invoking the lilypond binary @section Invoking the lilypond binary @cindex Invoking LilyPond @@ -137,7 +22,7 @@ the @code{\paper} block. The formatting system consists of two parts: a binary executable -(@file{lilypond-bin}), which is responsible for the formatting +(@file{lilypond}), which is responsible for the formatting functionality, and support scripts, which post-process the resulting output. Normally, the support scripts are called, which in turn invoke the @code{lilypond-bin} binary. However, @code{lilypond-bin} may be @@ -583,3 +468,116 @@ and set @code{XEDITOR} to @code{emacsclient --no-wait +%l:%c %f}. Vim users can set @var{XEDITOR} to @code{gvim --remote +:%l:norm%c| %f}. + +@node Invoking lilypond-latex +@section Invoking lilypond-latex + +Before LilyPond 3.0, the task of generating nicely titled output was +relegated to a separate program. This wrapper script +@code{lilypond-latex} uses the LilyPond program and La@TeX{} to create +a nicely titled piece of sheet music. + +@example + @code{lilypond} [@var{option}]@dots{} @var{file}@dots{} +@end example + +To have @code{lilypond} read from stdin, use a dash @code{-} for +@var{file}. The program supports the following options. + +@cindex stdin, reading + +@table @code +@item -k,--keep + Keep the temporary directory with all output +files. The temporary directory is created in the current directory as @code{@code{lilypond}.dir}. +@item -h,--help + Print usage help. +@item -I,--include=@var{dir} + Add @var{dir} to LilyPond's include path. +@item -o,--output=@var{file} + Generate output to @var{file}. The extension of @var{file} is ignored. +@item --png + Also generate pictures of each page, in PNG format. +@item --preview + Also generate a picture of the first system of the score. + +@cindex preview +@cindex picture +@cindex bitmap +@cindex pixmap +@cindex thumbnail +@cindex screen shot + +@item -s,--set=@var{key}=@var{val} + Add @var{key}= @var{val} to the settings, overriding those specified +in the files. Possible keys: @code{language}, @code{latexheaders}, +@code{latexpackages}, @code{latexoptions}, @code{papersize}, +@code{linewidth}, @code{orientation}, +@code{textheight}. +@item -v,--version +Show version information. +@item -V,--verbose +Be verbose. This prints out commands as they are executed, and more +information about the formatting process is printed. +@item --debug +Print even more information. This is useful when generating bug reports. +@item -w,--warranty +Show the warranty with which GNU LilyPond comes. (It comes with +@strong{NO WARRANTY}!) +@end table + + + +@subsection Additional parameters + +The @code{lilypond} program responds to several parameters specified +in a @code{\paper} section of the input file. They can be overridden +by supplying a @code{--set} command line option. + +@table @code +@item language + Specify La@TeX{} language: the @code{babel} package will be +included. Default: unset. + + Read from the @code{\header} block. + +@item latexheaders + Specify additional La@TeX{} headers file. + Normally read from the @code{\header} block. Default value: empty. + +@item latexpackages + Specify additional La@TeX{} packages file. This works cumulative, +so you can add multiple packages using multiple @code{-s=latexpackages} options. + Normally read from the @code{\header} block. Default value: +@code{geometry}. + +@item latexoptions + Specify additional options for the La@TeX{} +@code{\documentclass}. You can put any valid value here. This was +designed to allow @code{lilypond} to produce output for double-sided +paper, with balanced margins and page numbers on alternating sides. To +achieve this specify @code{twoside}. + +@item orientation + Set orientation. Choices are @code{portrait} or @code{landscape}. Is +read from the @code{\paper} block, if set. + +@item textheight + The vertical extension of the music on the page. It is normally + calculated automatically, based on the paper size. + +@item linewidth + The music line width. It is normally read from the @code{\paper} +block. + +@item papersize + The paper size (as a name, e.g. @code{a4}). It is normally read from +the @code{\paper} block. + +@item fontenc + The font encoding, should be set identical to the @code{font-encoding} + property in the score. +@end table + + + diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile index 5b51006a89..220219881a 100644 --- a/input/regression/GNUmakefile +++ b/input/regression/GNUmakefile @@ -2,7 +2,6 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -LILYPOND_BOOK_FLAGS = --process="lilypond-bin --header=texidoc -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'" include $(depth)/make/stepmake.make diff --git a/input/template/GNUmakefile b/input/template/GNUmakefile index 370b3e4398..2e22296084 100644 --- a/input/template/GNUmakefile +++ b/input/template/GNUmakefile @@ -1,7 +1,6 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex -LILYPOND_BOOK_FLAGS = --process="lilypond-bin --header=texidoc -I $(srcdir)/input/regression -e '(ly:set-option (quote internal-type-checking) \#t)'" LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc EXTRA_DIST_FILES=README diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile index 9aa3d84a97..7e38336fe7 100644 --- a/input/test/GNUmakefile +++ b/input/test/GNUmakefile @@ -3,7 +3,6 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -LILYPOND_BOOK_FLAGS = --process="lilypond-bin --header=texidoc -I $(srcdir)/input/regression -e '(ly:set-option (quote internal-type-checking) \#t)'" ## Hmm, would this work? No -- if we really want examples, move ## to other dir (input/) comes to mind. diff --git a/lily/GNUmakefile b/lily/GNUmakefile index a306551671..66ed748b46 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -1,7 +1,7 @@ depth = .. -NAME = lilypond-bin +NAME = lilypond SUBDIRS = include MODULE_LIBS=$(depth)/flower diff --git a/lily/include/main.hh b/lily/include/main.hh index 6319df9b68..21171a71a4 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -35,10 +35,15 @@ extern bool safe_global_b; extern bool verbose_global_b; extern bool store_locations_global_b; extern bool internal_type_checking_global_b; + +/* + todo: collect in Output_option struct? + */ extern bool make_png; extern bool make_dvi; extern bool make_ps; extern bool make_pdf; +extern bool make_tex; extern bool make_preview; /* misc */ diff --git a/lily/main.cc b/lily/main.cc index 35d07b844a..33e50ce334 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -65,9 +65,10 @@ String init_scheme_code_string = "(begin #t "; bool make_pdf = false; bool make_dvi = false; -bool make_ps = true; +bool make_ps = false; bool make_png = false; bool make_preview = false; +bool make_tex = false; /* * Miscellaneous global stuff. @@ -137,7 +138,8 @@ static Long_option_init options_static[] = {0, "png", 0, _i ("generate PNG")}, {0, "ps", 0, _i ("generate PostScript")}, {0, "dvi", 0, _i ("generate DVI")}, - {0, "pdf", 0, _i ("generate PDF")}, + {0, "pdf", 0, _i ("generate PDF (default)")}, + {0, "tex", 0, _i ("generate TeX")}, {0, "safe-mode", 's', _i ("run in safe mode")}, {0, "version", 'v', _i ("print version number")}, {0, "verbose", 'V', _i ("be verbose")}, @@ -251,6 +253,7 @@ prepend_load_path (String dir) static void determine_output_options () { + bool found_tex = false; SCM formats = ly_output_formats (); for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s)) @@ -258,6 +261,7 @@ determine_output_options () found_tex = found_tex || (ly_scm2string (ly_car (s)) == "tex"); } + if (make_ps && found_tex) { make_dvi = true; @@ -266,6 +270,16 @@ determine_output_options () { make_ps = true; } + if (make_dvi && found_tex) + { + make_tex = true; + } + if (!(make_dvi + || make_tex + || make_ps + || make_png + || make_pdf)) + make_pdf = true; } static void diff --git a/lily/paper-book.cc b/lily/paper-book.cc index a94be54856..6121bf8946 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -122,6 +122,7 @@ Paper_book::post_processing (SCM module, bool do_it_; char const *func_name_; } settings[] = { + {make_tex, "convert-to-tex"}, {make_dvi, "convert-to-dvi"}, {make_ps, "convert-to-ps"}, {make_pdf, "convert-to-pdf"}, diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 45c35c02f4..b571b4c160 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -38,6 +38,7 @@ CONVERT_LY = $(script-dir)/convert-ly.py LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond LILYPOND_BOOK = $(script-dir)/lilypond-book.py LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/ -I $(builddir)/mf/out/ +LILYPOND_BOOK_FLAGS = --process="lilypond-bin -f tex --header=texidoc -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'" #texi-html for www only: LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html) diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index f265932197..1fd5949691 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -274,6 +274,9 @@ (define-public (convert-to-dvi book name) (ly:warn "Can not generate DVI via the postscript back-end")) +(define-public (convert-to-tex book name) + (ly:warn "Can not generate TeX via the postscript back-end")) + (define-public (convert-to-ps book name) #t) diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index 754c50160d..ba2992b042 100644 --- a/scm/framework-tex.scm +++ b/scm/framework-tex.scm @@ -192,7 +192,7 @@ (ly:outputter-dump-string outputter x)) (list ;;FIXME - (header "creator" "timestamp" bookpaper (length lines) #f) + (header bookpaper (length lines) #f) "\\def\\lilypondclassic{1}%\n" (output-scopes scopes fields basename) (define-fonts bookpaper) @@ -257,3 +257,6 @@ (display (format #f "invoking ~S\n" cmd)) (system cmd))) +(define-public (convert-to-tex book name) + #t) + diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 90fd9e57b3..4c3348247a 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -10,12 +10,12 @@ convert-ly on book: lilypond-book --filter="convert-ly --no-version --from=1.6.11 -" BOOK classic lilypond-book: - lilypond-book --process="lilypond-bin" BOOK.tely + lilypond-book --process="lilypond" BOOK.tely TODO: * ly-options: intertext ? * --linewidth? - * eps in latex / eps by lilypond-bin -fps ? + * eps in latex / eps by lilypond -fps ? * check latex parameters, twocolumn, multicolumn? * Converting from lilypond-book source, substitute: @@ -71,7 +71,7 @@ Example usage: lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" BOOK - lilypond-book --process='lilypond-bin -I include' BOOK + lilypond-book --process='lilypond -I include' BOOK """) @@ -91,11 +91,11 @@ option_definitions = [ ] include_path = [ly.abspath (os.getcwd ())] -lilypond_binary = os.path.join ('@bindir@', 'lilypond-bin') +lilypond_binary = os.path.join ('@bindir@', 'lilypond') # only use installed binary when we're installed too. if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary): - lilypond_binary = 'lilypond-bin' + lilypond_binary = 'lilypond' use_hash_p = 1 @@ -415,7 +415,7 @@ def compose_ly (code, options): return (PREAMBLE_LY + body) % vars () # BARF -# use lilypond-bin for latex (.lytex) books, +# use lilypond for latex (.lytex) books, # and lilypond --preview for html, texinfo books? def to_eps (file): cmd = r'latex "\nonstopmode \input %s"' % file diff --git a/scripts/lilypond-latex.py b/scripts/lilypond-latex.py new file mode 100644 index 0000000000..faec0d33f9 --- /dev/null +++ b/scripts/lilypond-latex.py @@ -0,0 +1,851 @@ +#!@PYTHON@ +# lilypond.py -- frontend for lilypond +# +# source file of the GNU LilyPond music typesetter +# +# (c) 1998--2004 Han-Wen Nienhuys +# Jan Nieuwenhuizen +# +# Run lilypond, generate printable document +# Invokes: lilypond, latex (or pdflatex), dvips, ps2pdf, gs +# + +# This is the third incarnation of ly2dvi, renamed to lilypond. +# +# Earlier incarnations of ly2dvi were written by +# Jeffrey B. Reed (Python versioan) +# Jan Arne Fagertun (Bourne shell script) +# + +# Note: gettext work best if we use ' for program/docstrings and " +# for gettextable strings. +# USE ''' for docstrings. + + +''' +TODO: + + * cleanup + + * figure out which set of command line options should make lilypond: + + na: create tex only? + na: create latex only? + na: create tex and latex + default: create dvi only + na: create tex, latex and dvi + -P: create dvi and ps + -p: create pdf + na: * create ps only + + etc. + + * dvi from lilypond .tex output? This is hairy, because we create dvi + from lilypond .tex *and* header output. + +''' + +import operator +import stat +import string +import traceback +import glob + +################################################################ +# 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 /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'] + while datadir[-1] == os.sep: + datadir= datadir[:-1] + + +sys.path.insert (0, os.path.join (datadir, 'python')) + +# Customize these +#if __name__ == '__main__': + +import lilylib as ly +global _;_=ly._ +global re;re = ly.re + +# lilylib globals +program_name = 'lilypond' +program_version = '@TOPLEVEL_VERSION@' +# input without \book, use classic latex definitions +classic_p = 0 +verbose_p = 0 +latex_p = 1 +pseudo_filter_p = 0 +original_dir = os.getcwd () +temp_dir = os.path.join (original_dir, '%s.dir' % program_name) +keep_temp_dir_p = 0 +preview_resolution = 90 +debug_p = 0 + +TEX_PREAMBLE = '%%%% Generated by %(program_name)s (v%(program_version)s)' \ + % vars () + +## FIXME +## do -P or -p by default? +##help_summary = _ ("Run LilyPond using LaTeX for titling") +help_summary = _ ("Run LilyPond, generate printable document.") +copyright = ('Han-Wen Nienhuys > 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: + global lilypond_error_p + sys.stderr.write ('\n') + if len (files) == 1: + ly.error (_ ("LilyPond failed on input file %s (exit status %d)") % (files[0], exit_status)) + lilypond_error_p = 1 + ly.exit (1) + else: + ly.error (_ ("LilyPond failed on an input file (exit status %d)") % exit_status) + ly.error (_ ("Continuing...")) + 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_extension + ly.progress (_ ("Analyzing %s...") % filename) + s = open (filename).read () + + # search only the first 10k + s = s[:10240] + for x in header_fields: + m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}' % x, s) + if m: + set_setting (extra, x, m.group (1)) + + global classic_p + if s.find ('\\def\\lilypondclassic{1}') >= 0: + classic_p = 1 + + ly.progress ('\n') + +def find_tex_files_for_base (base, extra): + + if os.path.exists (base +'.dep'): + dependency_files.append (base + '.dep') + + for f in header_fields: + fn =base + '.' + f + if os.path.exists (fn): + extra[f].append (open (fn).read ()) + + return (base + tex_extension, {}) + + +def find_tex_files (files, extra): + ''' + Find all .tex files whose prefixes start with some name in FILES. + + ''' + + tfiles = [] + + for f in files: + x = 0 + while 1: + fname = os.path.basename (f) + fname = ly.strip_extension (fname, '.ly') + if x: + fname = fname + '-%d' % x + + if os.path.exists (fname + tex_extension): + tfiles.append (find_tex_files_for_base (fname, extra)) + analyse_lilypond_output (fname, extra) + else: + break + + x = x + 1 + if not x: + fstr = string.join (files, ', ') + ly.warning (_ ("no LilyPond output found for `%s'") % fstr) + return tfiles + +def one_latex_definition (defn, first): + s = '\n' + for (k, v) in defn[1].items (): + val = open (v).read () + if (string.strip (val)): + s += r'''\def\lilypond%s{%s}''' % (k, val) + else: + s += r'''\let\lilypond%s\relax''' % k + s += '\n' + + if classic_p and not first: + s += '\interscoreline' + + s += '%%PREVIEW%%\n' + s += '\\input %s\n' % defn[0] + return s + + +## FIXME: copied from tex/lilyponddefs.tex +LATEX_PREAMBLE = ''' +%% Nullify [La]TeX page layout settings, page layout by LilyPond. +\\topmargin-1in +\\headheight0pt\\headsep0pt +\\oddsidemargin-1in +\\evensidemargin\oddsidemargin +\\parindent 0pt''' + +CLASSIC_LATEX_PREAMBLE = ''' +%% FIXME: cannot do this, dimens in header part of lilypond output +%% Center staves horizontally on page +\\ifdim\\lypylinewidth\\lypyunit > 0pt +\\hsize\\lypylinewidth\\lypyunit +\\newdimen\\lypytempdim +\\lypytempdim\\paperwidth +\\advance\\lypytempdim-\\the\\hsize +\\lypytempdim0.5\\lypytempdim +\\advance\\lypytempdim -1in +\\oddsidemargin\\lypytempdim +\\evensidemargin\\lypytempdim +\\fi +\\parindent 0pt''' + +def global_latex_preamble (extra): + '''construct preamble from EXTRA,''' + + s = TEX_PREAMBLE + s += '\n' + + options = '' + + if extra['latexoptions']: + options = options + ',' + extra['latexoptions'][-1] + + s += '\\documentclass[%s]{article}\n' % options + + if safe_mode_p: + s += '\\nofiles\n' + + if classic_p: + if extra['linewidth']: + s += '\\def\\lypylinewidth{%s}\n' \ + % extra['linewidth'][-1] + else: + s += '\\let\\lypylinewidth\\texwidth\n' + s += '\\def\\lypyunit{%s}\n' % extra['unit'][-1] + + if extra['language']: + s += '\\usepackage[%s]{babel}' % extra['language'][-1] + '\n' + + s += '\\usepackage{%s}\n' \ + % string.join (extra['latexpackages'], ',') + + if extra['latexheaders']: + s += '\\include{%s}\n' \ + % string.join (extra['latexheaders'], '}\n\\include{') + + unit = extra['unit'][-1] + + # FIXME, must (only) from lilypond + s += r''' +\usepackage{inputenc} +\pagestyle{empty} +%%PREVIEW%%''' + + if classic_p: + s += CLASSIC_LATEX_PREAMBLE + else: + s += LATEX_PREAMBLE + 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 += '\\parindent 0pt' + + first = 1 + for t in tfiles: + s += one_latex_definition (t, first) + first = 0 + s += '\\end{document}\n' + return s + +def run_latex (files, outbase, extra): + '''Construct latex file, for FILES and EXTRA, dump it into +OUTBASE.latex. Run LaTeX on it. +''' + + latex_fn = outbase + '.latex' + + wfs = find_tex_files (files, extra) + s = global_latex_definition (wfs, extra) + + f = open (latex_fn, 'w') + f.write (s) + f.close () + + cmd = latex_cmd + ' \\\\nonstopmode \\\\input %s' % latex_fn + + # Ugh. (La)TeX writes progress and error messages on stdout + # Redirect to stderr + cmd = '(( %s >&2 ) >&- )' % cmd + 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 + # of each score + for score in find_tex_files (files, extra): + preview_base = ly.strip_extension (score[0], '.tex') + preview_fn = preview_base + '.preview.tex' + s = global_latex_definition ((score,), extra) + s = re.sub ('%%PREVIEW%%', + r'''\def\interscoreline{\endinput}''', s) + f = open (preview_fn, 'w') + f.write (s) + f.close () + 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, +leaving a PS file in OUTBASE.ps +''' + #FIXME: papersize, orientation must come from lilypond + opts = '' + if extra['papersize']: + opts = ' -t%s' % extra['papersize'][0] + + if extra['orientation'] and extra['orientation'][0] == 'landscape': + opts = opts + ' -tlandscape' + + if 'PDF' in targets: + where = ly.read_pipe ('kpsewhich feta20.pfa').strip() + + pfa_file = None + if where: + try: + pfa_file = open (where, 'r') + except IOError: + pass + + if pfa_file: + #opts = opts + ' -Ppdf -G0 -u +lm.map -u +lilypond.map' + opts = opts + ' -Ppdf -G0 -u +ec-mftrace.map -u +lilypond.map' + else: + ly.warning (_ ('''Trying create PDF, but no PFA fonts found. +Using bitmap fonts instead. This will look bad.''')) + + cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi') + ly.system (cmd) + + if preview_p: + for score in find_tex_files (files, extra): + preview_base = ly.strip_extension (score[0], '.tex') + cmd = 'dvips -E -Ppdf -u+ec-mftrace.map -u+lilypond.map -o%s %s' \ + % (preview_base + '.preview.ps', + preview_base + '.preview.dvi') + ly.system (cmd) + +def generate_dependency_file (depfile, outname): + df = open (depfile, 'w') + df.write (outname + ':' ) + + for d in dependency_files: + s = open (d).read () + s = re.sub ('#[^\n]*\n', '', s) + s = re.sub (r'\\\n', ' ', s) + m = re.search ('.*:(.*)\n', s) + + # ugh. Different targets? + if m: + df.write ( m.group (1) + ' ' ) + + df.write ('\n') + df.close (); + +def find_file_in_path (path, name): + for d in string.split (path, os.pathsep): + if not d: + d = original_dir + if name in os.listdir (d): + return os.path.join (d, name) + +def find_pfa_fonts (name): + PS = '%!PS-Adobe' + s = open (name).read () + if s[:len (PS)] != PS: + # no ps header? + ly.error (_ ("not a PostScript file: `%s\'" % name)) + ly.exit (1) + here = 0 + m = re.match ('.*?/([-a-zA-Z]*(feta|parmesan)[-a-z0-9]+) +findfont', s[here:], re.DOTALL) + pfa = [] + while m: + here = here + m.end (0) + pfa.append (m.group (1)) + m = re.match ('.*?/([-a-zA-Z]*(feta|parmesan)[-a-z0-9]+) +findfont', s[here:], re.DOTALL) + return pfa + +################################################################ +## MAIN +################################################################ + +(sh, long) = ly.getopt_args (option_definitions) +try: + (options, files) = getopt.getopt (sys.argv[1:], sh, long) +except getopt.error, s: + sys.stderr.write ('\n') + ly.error (_ ("getopt says: `%s\'" % s)) + sys.stderr.write ('\n') + ly.help () + ly.exit (2) + +for opt in options: + o = opt[0] + a = opt[1] + + if 0: + pass + elif o == '--help' or o == '-h': + ly.help () + sys.exit (0) + elif o == '--find-pfa' or o == '-f': + fonts = map (lambda x: x + '.pfa', find_pfa_fonts (a)) + files = map (lambda x: + find_file_in_path (os.environ['GS_FONTPATH'], x), + fonts) + print string.join (files, ' ') + sys.exit (0) + elif o == '--include' or o == '-I': + include_path.append (a) + elif o == '--latex' or o == '-l': + latex_p = 1 + targets += ['DVI', 'LATEX', 'TEX'] + elif o == '--postscript' or o == '-P': + if 'PDF' in targets: + targets.remove ('PDF') + if 'PS' not in targets: + targets.append ('PS') + elif o == '--pdf' or o == '-p': + if 'PDF' not in targets: + targets.append ('PDF') + elif o == '--keep' or o == '-k': + keep_temp_dir_p = 1 + elif o == '--debug': + verbose_p = 1 + debug_p = 1 + elif o == '--preview': + preview_p = 1 + if 'PNG' not in targets: + 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': + output_name = a + elif o == '--safe-mode' or o == '-s': + safe_mode_p = 1 + elif o == '--set' or o == '-S': + ss = string.split (a, '=') + set_setting (extra_init, ss[0], ss[1]) + elif o == '--verbose' or o == '-V': + verbose_p = 1 + elif o == '--version' or o == '-v': + ly.identify (sys.stdout) + sys.exit (0) + elif o == '--warranty' or o == '-w': + status = os.system ('%s -w' % lilypond_binary) + if status: + ly.warranty () + sys.exit (0) + elif o == '--png': + page_images_p = 1 + if 'PNG' not in targets: + targets.append ('PNG') + else: + unimplemented_option () # signal programming error + +# Don't convert input files to abspath, rather prepend '.' to include +# path. +include_path.insert (0, '.') + +# As a neat trick, add directory part of first input file +# to include path. That way you can do without the clumsy -I in: + +# lilypond -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] == '-' 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) + ly.lilypond_version_check (lilypond_binary, '@TOPLEVEL_VERSION@') + + original_output = output_name + + # Ugh, maybe make a setup () function + 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 = ly.abspath ('.') + elif output_name[-1] == os.sep: + outdir = ly.abspath (output_name) + outbase = os.path.basename (files[0]) + else: + (outdir, outbase) = os.path.split (ly.abspath (output_name)) + + for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'): + output_name = ly.strip_extension (output_name, i) + outbase = ly.strip_extension (outbase, i) + + for i in files[:] + [output_name]: + b = os.path.basename (i) + if string.find (b, ' ') >= 0: + ly.error (_ ("filename should not contain spaces: `%s'") % b) + ly.exit (1) + + 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 targets: + ly.mkdir_p (outdir, 0777) + + tmpdir = ly.setup_temp () + ly.setup_environment () + if safe_mode_p: + os.environ['openout_any'] = 'p' + + # 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 + try: + run_lilypond (files, dep_prefix) + except: + ### ARGH. This also catches python programming errors. + ### this should only catch lilypond nonzero exit status + ### --hwn + + # TODO: friendly message about LilyPond setup/failing? + # + targets = [] + if verbose_p: + traceback.print_exc () + else: + ly.warning (_("Running LilyPond failed. Rerun with --verbose for a trace.")) + + # Our LilyPond pseudo filter always outputs to 'lelie' + # have subsequent stages and use 'lelie' output. + if pseudo_filter_p: + files[0] = 'lelie' + + if 'PS.GZ' in targets: + targets.append ('PS') + + if 'PNG' in targets and 'PS' not in targets: + targets.append ('PS') + if latex_p and '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? + targets.remove ('TEX') + targets.remove('LATEX') + except: + # TODO: friendly message about TeX/LaTeX setup, + # trying to run tex/latex by hand + if 'DVI' in targets: + targets.remove ('DVI') + if 'PS' in targets: + targets.remove ('PS') + if verbose_p: + traceback.print_exc () + + if 'PS' in targets and "DVI" in targets: + try: + run_dvips (outbase, extra_init) + + except: + if 'PS' in targets: + targets.remove ('PS') + if verbose_p: + traceback.print_exc () + else: + ly.warning (_("Failed to make PS file. Rerun with --verbose for a trace.")) + + + if 'PDF' in targets: + papersize = 'a4' # fixme. + cmd = 'ps2pdf -sPAPERSIZE=%s %s.ps %s.pdf' % (papersize, outbase , outbase) + ly.system (cmd) + + + if preview_p: + for score in find_tex_files (files, extra_init): + preview_base = ly.strip_extension (score[0], '.tex') + ly.make_ps_images (preview_base + '.preview.ps', + resolution=preview_resolution + ) + + + if page_images_p: + ly.make_ps_images (outbase + '.ps' , + resolution = preview_resolution + ) + + 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 ...") % 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') + + if 'PS.GZ' in targets: + ly.system ("gzip *.ps") + targets.remove ('PS') + + # Hmm, if this were a function, we could call it the except: clauses + files_found = [] + for i in targets: + ext = string.lower (i) + + pattern = '%s.%s' % (outbase, ext) + if i == 'PNG': + pattern = '*.png' + ls = glob.glob (pattern) + files_found += ls + ly.cp_to_dir ('.*\.%s$' % ext, outdir) + + + if ls: + names = string.join (map (lambda x: "`%s'" % x, ls)) + ly.progress (_ ("%s output to %s...") % (i, names)) + ly.progress ('\n') + elif verbose_p: + ly.warning (_ ("can't find file: `%s.%s'") % (outbase, ext)) + + + os.chdir (original_dir) + ly.cleanup_temp () + + sys.exit (lilypond_error_p) diff --git a/scripts/lilypond.py b/scripts/lilypond.py deleted file mode 100644 index 025cd4df79..0000000000 --- a/scripts/lilypond.py +++ /dev/null @@ -1,851 +0,0 @@ -#!@PYTHON@ -# lilypond.py -- frontend for lilypond-bin -# -# source file of the GNU LilyPond music typesetter -# -# (c) 1998--2004 Han-Wen Nienhuys -# Jan Nieuwenhuizen -# -# Run lilypond-bin, generate printable document -# Invokes: lilypond-bin, latex (or pdflatex), dvips, ps2pdf, gs -# - -# This is the third incarnation of ly2dvi, renamed to lilypond. -# -# Earlier incarnations of ly2dvi were written by -# Jeffrey B. Reed (Python versioan) -# Jan Arne Fagertun (Bourne shell script) -# - -# Note: gettext work best if we use ' for program/docstrings and " -# for gettextable strings. -# USE ''' for docstrings. - - -''' -TODO: - - * cleanup - - * figure out which set of command line options should make lilypond: - - na: create tex only? - na: create latex only? - na: create tex and latex - default: create dvi only - na: create tex, latex and dvi - -P: create dvi and ps - -p: create pdf - na: * create ps only - - etc. - - * dvi from lilypond .tex output? This is hairy, because we create dvi - from lilypond .tex *and* header output. - -''' - -import operator -import stat -import string -import traceback -import glob - -################################################################ -# 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 /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'] - while datadir[-1] == os.sep: - datadir= datadir[:-1] - - -sys.path.insert (0, os.path.join (datadir, 'python')) - -# Customize these -#if __name__ == '__main__': - -import lilylib as ly -global _;_=ly._ -global re;re = ly.re - -# lilylib globals -program_name = 'lilypond' -program_version = '@TOPLEVEL_VERSION@' -# input without \book, use classic latex definitions -classic_p = 0 -verbose_p = 0 -latex_p = 0 -pseudo_filter_p = 0 -original_dir = os.getcwd () -temp_dir = os.path.join (original_dir, '%s.dir' % program_name) -keep_temp_dir_p = 0 -preview_resolution = 90 -debug_p = 0 - -TEX_PREAMBLE = '%%%% Generated by %(program_name)s (v%(program_version)s)' \ - % vars () - -## FIXME -## do -P or -p by default? -##help_summary = _ ("Run LilyPond using LaTeX for titling") -help_summary = _ ("Run LilyPond, generate printable document.") -copyright = ('Han-Wen Nienhuys > 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: - global lilypond_error_p - sys.stderr.write ('\n') - if len (files) == 1: - ly.error (_ ("LilyPond failed on input file %s (exit status %d)") % (files[0], exit_status)) - lilypond_error_p = 1 - ly.exit (1) - else: - ly.error (_ ("LilyPond failed on an input file (exit status %d)") % exit_status) - ly.error (_ ("Continuing...")) - 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_extension - ly.progress (_ ("Analyzing %s...") % filename) - s = open (filename).read () - - # search only the first 10k - s = s[:10240] - for x in header_fields: - m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}' % x, s) - if m: - set_setting (extra, x, m.group (1)) - - global classic_p - if s.find ('\\def\\lilypondclassic{1}') >= 0: - classic_p = 1 - - ly.progress ('\n') - -def find_tex_files_for_base (base, extra): - - if os.path.exists (base +'.dep'): - dependency_files.append (base + '.dep') - - for f in header_fields: - fn =base + '.' + f - if os.path.exists (fn): - extra[f].append (open (fn).read ()) - - return (base + tex_extension, {}) - - -def find_tex_files (files, extra): - ''' - Find all .tex files whose prefixes start with some name in FILES. - - ''' - - tfiles = [] - - for f in files: - x = 0 - while 1: - fname = os.path.basename (f) - fname = ly.strip_extension (fname, '.ly') - if x: - fname = fname + '-%d' % x - - if os.path.exists (fname + tex_extension): - tfiles.append (find_tex_files_for_base (fname, extra)) - analyse_lilypond_output (fname, extra) - else: - break - - x = x + 1 - if not x: - fstr = string.join (files, ', ') - ly.warning (_ ("no LilyPond output found for `%s'") % fstr) - return tfiles - -def one_latex_definition (defn, first): - s = '\n' - for (k, v) in defn[1].items (): - val = open (v).read () - if (string.strip (val)): - s += r'''\def\lilypond%s{%s}''' % (k, val) - else: - s += r'''\let\lilypond%s\relax''' % k - s += '\n' - - if classic_p and not first: - s += '\interscoreline' - - s += '%%PREVIEW%%\n' - s += '\\input %s\n' % defn[0] - return s - - -## FIXME: copied from tex/lilyponddefs.tex -LATEX_PREAMBLE = ''' -%% Nullify [La]TeX page layout settings, page layout by LilyPond. -\\topmargin-1in -\\headheight0pt\\headsep0pt -\\oddsidemargin-1in -\\evensidemargin\oddsidemargin -\\parindent 0pt''' - -CLASSIC_LATEX_PREAMBLE = ''' -%% FIXME: cannot do this, dimens in header part of lilypond output -%% Center staves horizontally on page -\\ifdim\\lypylinewidth\\lypyunit > 0pt -\\hsize\\lypylinewidth\\lypyunit -\\newdimen\\lypytempdim -\\lypytempdim\\paperwidth -\\advance\\lypytempdim-\\the\\hsize -\\lypytempdim0.5\\lypytempdim -\\advance\\lypytempdim -1in -\\oddsidemargin\\lypytempdim -\\evensidemargin\\lypytempdim -\\fi -\\parindent 0pt''' - -def global_latex_preamble (extra): - '''construct preamble from EXTRA,''' - - s = TEX_PREAMBLE - s += '\n' - - options = '' - - if extra['latexoptions']: - options = options + ',' + extra['latexoptions'][-1] - - s += '\\documentclass[%s]{article}\n' % options - - if safe_mode_p: - s += '\\nofiles\n' - - if classic_p: - if extra['linewidth']: - s += '\\def\\lypylinewidth{%s}\n' \ - % extra['linewidth'][-1] - else: - s += '\\let\\lypylinewidth\\texwidth\n' - s += '\\def\\lypyunit{%s}\n' % extra['unit'][-1] - - if extra['language']: - s += '\\usepackage[%s]{babel}' % extra['language'][-1] + '\n' - - s += '\\usepackage{%s}\n' \ - % string.join (extra['latexpackages'], ',') - - if extra['latexheaders']: - s += '\\include{%s}\n' \ - % string.join (extra['latexheaders'], '}\n\\include{') - - unit = extra['unit'][-1] - - # FIXME, must (only) from lilypond-bin - s += r''' -\usepackage{inputenc} -\pagestyle{empty} -%%PREVIEW%%''' - - if classic_p: - s += CLASSIC_LATEX_PREAMBLE - else: - s += LATEX_PREAMBLE - 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 += '\\parindent 0pt' - - first = 1 - for t in tfiles: - s += one_latex_definition (t, first) - first = 0 - s += '\\end{document}\n' - return s - -def run_latex (files, outbase, extra): - '''Construct latex file, for FILES and EXTRA, dump it into -OUTBASE.latex. Run LaTeX on it. -''' - - latex_fn = outbase + '.latex' - - wfs = find_tex_files (files, extra) - s = global_latex_definition (wfs, extra) - - f = open (latex_fn, 'w') - f.write (s) - f.close () - - cmd = latex_cmd + ' \\\\nonstopmode \\\\input %s' % latex_fn - - # Ugh. (La)TeX writes progress and error messages on stdout - # Redirect to stderr - cmd = '(( %s >&2 ) >&- )' % cmd - 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 - # of each score - for score in find_tex_files (files, extra): - preview_base = ly.strip_extension (score[0], '.tex') - preview_fn = preview_base + '.preview.tex' - s = global_latex_definition ((score,), extra) - s = re.sub ('%%PREVIEW%%', - r'''\def\interscoreline{\endinput}''', s) - f = open (preview_fn, 'w') - f.write (s) - f.close () - 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, -leaving a PS file in OUTBASE.ps -''' - #FIXME: papersize, orientation must come from lilypond-bin - opts = '' - if extra['papersize']: - opts = ' -t%s' % extra['papersize'][0] - - if extra['orientation'] and extra['orientation'][0] == 'landscape': - opts = opts + ' -tlandscape' - - if 'PDF' in targets: - where = ly.read_pipe ('kpsewhich feta20.pfa').strip() - - pfa_file = None - if where: - try: - pfa_file = open (where, 'r') - except IOError: - pass - - if pfa_file: - #opts = opts + ' -Ppdf -G0 -u +lm.map -u +lilypond.map' - opts = opts + ' -Ppdf -G0 -u +ec-mftrace.map -u +lilypond.map' - else: - ly.warning (_ ('''Trying create PDF, but no PFA fonts found. -Using bitmap fonts instead. This will look bad.''')) - - cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi') - ly.system (cmd) - - if preview_p: - for score in find_tex_files (files, extra): - preview_base = ly.strip_extension (score[0], '.tex') - cmd = 'dvips -E -Ppdf -u+ec-mftrace.map -u+lilypond.map -o%s %s' \ - % (preview_base + '.preview.ps', - preview_base + '.preview.dvi') - ly.system (cmd) - -def generate_dependency_file (depfile, outname): - df = open (depfile, 'w') - df.write (outname + ':' ) - - for d in dependency_files: - s = open (d).read () - s = re.sub ('#[^\n]*\n', '', s) - s = re.sub (r'\\\n', ' ', s) - m = re.search ('.*:(.*)\n', s) - - # ugh. Different targets? - if m: - df.write ( m.group (1) + ' ' ) - - df.write ('\n') - df.close (); - -def find_file_in_path (path, name): - for d in string.split (path, os.pathsep): - if not d: - d = original_dir - if name in os.listdir (d): - return os.path.join (d, name) - -def find_pfa_fonts (name): - PS = '%!PS-Adobe' - s = open (name).read () - if s[:len (PS)] != PS: - # no ps header? - ly.error (_ ("not a PostScript file: `%s\'" % name)) - ly.exit (1) - here = 0 - m = re.match ('.*?/([-a-zA-Z]*(feta|parmesan)[-a-z0-9]+) +findfont', s[here:], re.DOTALL) - pfa = [] - while m: - here = here + m.end (0) - pfa.append (m.group (1)) - m = re.match ('.*?/([-a-zA-Z]*(feta|parmesan)[-a-z0-9]+) +findfont', s[here:], re.DOTALL) - return pfa - -################################################################ -## MAIN -################################################################ - -(sh, long) = ly.getopt_args (option_definitions) -try: - (options, files) = getopt.getopt (sys.argv[1:], sh, long) -except getopt.error, s: - sys.stderr.write ('\n') - ly.error (_ ("getopt says: `%s\'" % s)) - sys.stderr.write ('\n') - ly.help () - ly.exit (2) - -for opt in options: - o = opt[0] - a = opt[1] - - if 0: - pass - elif o == '--help' or o == '-h': - ly.help () - sys.exit (0) - elif o == '--find-pfa' or o == '-f': - fonts = map (lambda x: x + '.pfa', find_pfa_fonts (a)) - files = map (lambda x: - find_file_in_path (os.environ['GS_FONTPATH'], x), - fonts) - print string.join (files, ' ') - sys.exit (0) - elif o == '--include' or o == '-I': - include_path.append (a) - elif o == '--latex' or o == '-l': - latex_p = 1 - targets += ['DVI', 'LATEX', 'TEX'] - elif o == '--postscript' or o == '-P': - if 'PDF' in targets: - targets.remove ('PDF') - if 'PS' not in targets: - targets.append ('PS') - elif o == '--pdf' or o == '-p': - if 'PDF' not in targets: - targets.append ('PDF') - elif o == '--keep' or o == '-k': - keep_temp_dir_p = 1 - elif o == '--debug': - verbose_p = 1 - debug_p = 1 - elif o == '--preview': - preview_p = 1 - if 'PNG' not in targets: - 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': - output_name = a - elif o == '--safe-mode' or o == '-s': - safe_mode_p = 1 - elif o == '--set' or o == '-S': - ss = string.split (a, '=') - set_setting (extra_init, ss[0], ss[1]) - elif o == '--verbose' or o == '-V': - verbose_p = 1 - elif o == '--version' or o == '-v': - ly.identify (sys.stdout) - sys.exit (0) - elif o == '--warranty' or o == '-w': - status = os.system ('%s -w' % lilypond_binary) - if status: - ly.warranty () - sys.exit (0) - elif o == '--png': - page_images_p = 1 - if 'PNG' not in targets: - targets.append ('PNG') - else: - unimplemented_option () # signal programming error - -# Don't convert input files to abspath, rather prepend '.' to include -# path. -include_path.insert (0, '.') - -# As a neat trick, add directory part of first input file -# to include path. That way you can do without the clumsy -I in: - -# lilypond -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] == '-' 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) - ly.lilypond_version_check (lilypond_binary, '@TOPLEVEL_VERSION@') - - original_output = output_name - - # Ugh, maybe make a setup () function - 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 = ly.abspath ('.') - elif output_name[-1] == os.sep: - outdir = ly.abspath (output_name) - outbase = os.path.basename (files[0]) - else: - (outdir, outbase) = os.path.split (ly.abspath (output_name)) - - for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'): - output_name = ly.strip_extension (output_name, i) - outbase = ly.strip_extension (outbase, i) - - for i in files[:] + [output_name]: - b = os.path.basename (i) - if string.find (b, ' ') >= 0: - ly.error (_ ("filename should not contain spaces: `%s'") % b) - ly.exit (1) - - 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 targets: - ly.mkdir_p (outdir, 0777) - - tmpdir = ly.setup_temp () - ly.setup_environment () - if safe_mode_p: - os.environ['openout_any'] = 'p' - - # 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 - try: - run_lilypond (files, dep_prefix) - except: - ### ARGH. This also catches python programming errors. - ### this should only catch lilypond nonzero exit status - ### --hwn - - # TODO: friendly message about LilyPond setup/failing? - # - targets = [] - if verbose_p: - traceback.print_exc () - else: - ly.warning (_("Running LilyPond failed. Rerun with --verbose for a trace.")) - - # Our LilyPond pseudo filter always outputs to 'lelie' - # have subsequent stages and use 'lelie' output. - if pseudo_filter_p: - files[0] = 'lelie' - - if 'PS.GZ' in targets: - targets.append ('PS') - - if 'PNG' in targets and 'PS' not in targets: - targets.append ('PS') - if latex_p and '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? - targets.remove ('TEX') - targets.remove('LATEX') - except: - # TODO: friendly message about TeX/LaTeX setup, - # trying to run tex/latex by hand - if 'DVI' in targets: - targets.remove ('DVI') - if 'PS' in targets: - targets.remove ('PS') - if verbose_p: - traceback.print_exc () - - if 'PS' in targets and "DVI" in targets: - try: - run_dvips (outbase, extra_init) - - except: - if 'PS' in targets: - targets.remove ('PS') - if verbose_p: - traceback.print_exc () - else: - ly.warning (_("Failed to make PS file. Rerun with --verbose for a trace.")) - - - if 'PDF' in targets: - papersize = 'a4' # fixme. - cmd = 'ps2pdf -sPAPERSIZE=%s %s.ps %s.pdf' % (papersize, outbase , outbase) - ly.system (cmd) - - - if preview_p: - for score in find_tex_files (files, extra_init): - preview_base = ly.strip_extension (score[0], '.tex') - ly.make_ps_images (preview_base + '.preview.ps', - resolution=preview_resolution - ) - - - if page_images_p: - ly.make_ps_images (outbase + '.ps' , - resolution = preview_resolution - ) - - 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 ...") % 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') - - if 'PS.GZ' in targets: - ly.system ("gzip *.ps") - targets.remove ('PS') - - # Hmm, if this were a function, we could call it the except: clauses - files_found = [] - for i in targets: - ext = string.lower (i) - - pattern = '%s.%s' % (outbase, ext) - if i == 'PNG': - pattern = '*.png' - ls = glob.glob (pattern) - files_found += ls - ly.cp_to_dir ('.*\.%s$' % ext, outdir) - - - if ls: - names = string.join (map (lambda x: "`%s'" % x, ls)) - ly.progress (_ ("%s output to %s...") % (i, names)) - ly.progress ('\n') - elif verbose_p: - ly.warning (_ ("can't find file: `%s.%s'") % (outbase, ext)) - - - os.chdir (original_dir) - ly.cleanup_temp () - - sys.exit (lilypond_error_p)