X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=2ff452fdf9304d6ffd34a03e6c60ab66b19e021c;hb=c4e15cb458d9c6ec7c8168716803b8ec5873eddf;hp=b921d8dde429478c8b835eb9080a78625111f5c7;hpb=6c1d83456de48485e27ab062297ef04f9720fc3c;p=lilypond.git diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index b921d8dde4..2ff452fdf9 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -37,23 +37,9 @@ import sys import re import md5 -################ -# RELOCATION -################ - - -for d in ['@lilypond_datadir@', - '@lilypond_libdir@']: - sys.path.insert (0, os.path.join (d, 'python')) - -# dynamic relocation, for GUB binaries. -bindir = os.path.abspath (os.path.split (sys.argv[0])[0]) - -os.environ['PATH'] = bindir + os.pathsep + os.environ['PATH'] -for p in ['share', 'lib']: - datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p) - sys.path.insert (0, datadir) - +""" +@relocate-preamble@ +""" import lilylib as ly import fontextract @@ -67,20 +53,19 @@ program_name = os.path.basename (sys.argv[0]) original_dir = os.getcwd () backend = 'ps' -help_summary = _ ( -'''Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document. - -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 -I include' BOOK -''') +help_summary = ( +_ ("Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document.") ++ '\n\n' ++ _ ("Examples:") ++ ''' + lilypond-book --filter="tr '[a-z]' '[A-Z]'" %(BOOK)s + lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" %(BOOK)s + lilypond-book --process='lilypond -I include' %(BOOK)s +''' % {'BOOK': _ ("BOOK")}) authors = ('Jan Nieuwenhuizen ', - 'Han-Wen Nienhuys ') + 'Han-Wen Nienhuys ') - ################################################################ def exit (i): if global_options.verbose: @@ -116,14 +101,13 @@ def warranty (): %s %s -''' % ( _('Copyright (c) %s by') % '2001--2006', +''' % ( _ ('Copyright (c) %s by') % '2001--2006', ' '.join (authors), - _('Distributed under terms of the GNU General Public License.'), - _('It comes with NO WARRANTY.'))) - + _ ("Distributed under terms of the GNU General Public License."), + _ ("It comes with NO WARRANTY."))) def get_option_parser (): - p = ly.get_option_parser (usage='lilypond-book [OPTIONS] FILE', + p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'lilypond-book', version="@TOPLEVEL_VERSION@", description=help_summary) @@ -133,47 +117,50 @@ def get_option_parser (): help=_ ("pipe snippets through FILTER [convert-ly -n -]"), default=None) p.add_option ('-f', '--format', - help=_('''use output format FORMAT (texi [default], texi-html, latex, html, docbook)'''), + help=_ ("use output format FORMAT (texi [default], texi-html, latex, html, docbook)"), action='store') - p.add_option ("-I", '--include', help=_('add DIR to include path'), - metavar="DIR", + p.add_option ("-I", '--include', help=_ ("add DIR to include path"), + metavar=_ ("DIR"), action='append', dest='include_path', default=[os.path.abspath (os.getcwd ())]) + + p.add_option ('--left-padding', + metavar=_("PAD"), + dest="padding_mm", + help="Pad left side of music to align music inspite of uneven bar numbers. (in mm)", + type="float", + default=3.0) - p.add_option ("-o", '--output', help=_('write output to DIR'), - metavar="DIR", + p.add_option ("-o", '--output', help=_ ("write output to DIR"), + metavar=_ ("DIR"), action='store', dest='output_name', default='') - p.add_option ('-P', '--process', metavar=_("COMMAND"), + + p.add_option ('-P', '--process', metavar=_ ("COMMAND"), help = _ ("process ly_files using COMMAND FILE..."), action='store', - dest='process_cmd', default='lilypond -b eps') - + dest='process_cmd', default='lilypond -dbackend=eps') p.add_option ('--pdf', action="store_true", dest="create_pdf", - help="Create PDF files for use with PDFTeX", + help=_ ("Create PDF files for use with PDFTeX"), default=False) - p.add_option ('', '--psfonts', action="store_true", dest="psfonts", help=_ ('''extract all PostScript fonts into INPUT.psfonts for LaTeX must use this with dvips -h INPUT.psfonts'''), default=None) - p.add_option ('-V', '--verbose', help=_("be verbose"), + p.add_option ('-V', '--verbose', help=_ ("be verbose"), action="store_true", default=False, dest="verbose") - p.add_option ('-w', '--warranty', - help=_("show warranty and copyright"), + help=_ ("show warranty and copyright"), action='store_true') - - - p.add_option_group ('bugs', - description='''Report bugs via http://post.gmane.org/post.php''' - '''?group=gmane.comp.gnu.lilypond.bugs\n''') - + p.add_option_group ('bugs', + description=(_ ("Report bugs via") + + ''' http://post.gmane.org/post.php''' + '''?group=gmane.comp.gnu.lilypond.bugs\n''')) return p lilypond_binary = os.path.join ('@bindir@', 'lilypond') @@ -704,6 +691,8 @@ PREAMBLE_LY = '''%%%% Generated by %(program_name)s #(define dump-extents #t) %(font_dump_setting)s %(paper_string)s + force-assignment = #"" + line-width = #(- line-width (* mm %(padding_mm)f)) } \layout { @@ -1058,7 +1047,7 @@ class Lilypond_snippet (Snippet): '\n ') % vars () preamble_string = string.join (compose_dict[PREAMBLE], '\n ') % override - + padding_mm = global_options.padding_mm font_dump_setting = '' if FONTLOAD in self.option_dict: font_dump_setting = '#(define-public force-eps-font-include #t)\n' @@ -1106,8 +1095,7 @@ class Lilypond_snippet (Snippet): and (self.relevant_contents (self.full_ly ()) == self.relevant_contents (open (ly_file).read ()))): return None - if global_options.verbose: - print 'OUT OF DATE: ', ly_file + return self def png_is_outdated (self): @@ -1445,10 +1433,12 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets): be_verbose=global_options.verbose, progress_p=1) - if global_options.format in (HTML, TEXINFO): + if global_options.format in (HTML, TEXINFO) and '--formats' not in cmd: cmd += ' --formats=png ' - if global_options.format in (DOCBOOK): + elif global_options.format in (DOCBOOK) and '--formats' not in cmd: cmd += ' --formats=png,pdf ' + + # UGH # the --process=CMD switch is a bad idea # it is too generic for lilypond-book. @@ -1479,7 +1469,7 @@ LATEX_INSPECTION_DOCUMENT = r''' def get_latex_textwidth (source): m = re.search (r'''(?P\\begin\s*{document})''', source) if m == None: - warning (_ ("Can't find \\begin{document} in LaTeX document")) + warning (_ ("cannot find \\begin{document} in LaTeX document")) ## what's a sensible default? return 550.0 @@ -1560,6 +1550,7 @@ def write_file_map (lys, name): snippet_map = open ('snippet-map.ly', 'w') snippet_map.write (""" #(define version-seen #t) +#(define output-empty-score-list #f) #(ly:add-file-name-alist '( """) for ly in lys: @@ -1572,7 +1563,7 @@ def write_file_map (lys, name): def do_process_cmd (chunks, input_name): all_lys = filter (lambda x: is_derived_class (x.__class__, Lilypond_snippet), - chunks) + chunks) write_file_map (all_lys, input_name) ly_outdated = filter (lambda x: is_derived_class (x.__class__, @@ -1768,6 +1759,22 @@ def do_options (): return args +def psfonts_warning (options, basename): + if options.format in (TEXINFO, LATEX): + psfonts_file = os.path.join (options.output_name, basename + '.psfonts') + output = os.path.join (options.output_name, basename + '.dvi' ) + + if not options.create_pdf: + if not options.psfonts: + warning (_ ("option --psfonts not used")) + warning (_ ("processing with dvips will have no fonts")) + else: + progress ('\n') + progress (_ ("DVIPS usage:")) + progress ('\n') + progress (" dvips -h %(psfonts_file)s %(output)s" % vars ()) + progress ('\n') + def main (): # FIXME: 85 lines of `main' macramee?? files = do_options () @@ -1796,15 +1803,16 @@ def main (): if global_options.format in (TEXINFO, LATEX): ## prevent PDF from being switched on by default. global_options.process_cmd += ' --formats=eps ' - - if (global_options.format in (TEXINFO, LATEX) - and global_options.create_pdf): - global_options.process_cmd += "--pdf -dinclude-eps-fonts -dgs-load-fonts " + if global_options.create_pdf: + global_options.process_cmd += "--pdf -dinclude-eps-fonts -dgs-load-fonts " if global_options.verbose: global_options.process_cmd += " --verbose " - global_options.process_cmd += " -dread-file-list -deps-box-padding=-3 " + if global_options.padding_mm: + global_options.process_cmd += " -deps-box-padding=%f " % global_options.padding_mm + + global_options.process_cmd += " -dread-file-list " identify () @@ -1828,19 +1836,7 @@ def main (): except Compile_error: exit (1) - if global_options.format in (TEXINFO, LATEX): - psfonts_file = os.path.join (global_options.output_name, basename + '.psfonts') - output = os.path.join (global_options.output_name, basename + '.dvi' ) - - if not global_options.psfonts and not global_options.create_pdf: - warning (_ ("option --psfonts not used")) - warning (_ ("processing with dvips will have no fonts")) - else: - progress ('\n') - progress (_ ("DVIPS usage:")) - progress ('\n') - progress (" dvips -h %(psfonts_file)s %(output)s" % vars ()) - progress ('\n') + psfonts_warning (global_options, basename) inputs = note_input_file ('') inputs.pop ()