X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=824cbabef9f5a69cdc081ba0223eddae1d303df5;hb=91708b30fba67f8fd589980e03ff420c26473a5a;hp=4e4c3077824008b296f638c6dd01a2b6022c738b;hpb=51c3823d581c9c9ea14b1653ce913891492df3bc;p=lilypond.git diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 4e4c307782..824cbabef9 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -29,13 +29,13 @@ TODO: ''' import stat -import string import tempfile import commands import os import sys import re import md5 +import operator """ @relocate-preamble@ @@ -69,32 +69,31 @@ authors = ('Jan Nieuwenhuizen ', ################################################################ def exit (i): if global_options.verbose: - raise _ ('Exiting (%d)...') % i + raise Exception (_ ('Exiting (%d)...') % i) else: sys.exit (i) def identify (): - sys.stdout.write ('%s (GNU LilyPond) %s\n' % (program_name, program_version)) + ly.encoded_write (sys.stdout, '%s (GNU LilyPond) %s\n' % (program_name, program_version)) -def progress (s): - sys.stderr.write (s) +progress = ly.progress def warning (s): - sys.stderr.write (program_name + ": " + _ ("warning: %s") % s + '\n') + ly.stderr_write (program_name + ": " + _ ("warning: %s") % s + '\n') def error (s): - sys.stderr.write (program_name + ": " + _ ("error: %s") % s + '\n') + ly.stderr_write (program_name + ": " + _ ("error: %s") % s + '\n') def ps_page_count (ps_name): header = open (ps_name).read (1024) m = re.search ('\n%%Pages: ([0-9]+)', header) if m: - return string.atoi (m.group (1)) + return int (m.group (1)) return 0 def warranty (): identify () - sys.stdout.write (''' + ly.encoded_write (sys.stdout, ''' %s %s @@ -108,27 +107,39 @@ def warranty (): def get_option_parser (): p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'lilypond-book', - version="@TOPLEVEL_VERSION@", - description=help_summary) + description=help_summary, + add_help_option=False) p.add_option ('-F', '--filter', metavar=_ ("FILTER"), action="store", dest="filter_cmd", 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)"), action='store') - + + p.add_option("-h", "--help", + action="help", + help=_ ("show this help and exit")) + 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 ('--info-images-dir', + help=_ ("format Texinfo output so that Info will " + "look for images of music in DIR"), + metavar=_ ("DIR"), + action='store', dest='info_images_dir', + default='') + p.add_option ('--left-padding', - metavar=_("PAD"), + metavar=_ ("PAD"), dest="padding_mm", - help="Pad left side of music to align music inspite of uneven bar numbers. (in mm)", + help=_ ("pad left side of music to align music inspite of uneven bar numbers (in mm)"), type="float", default=3.0) @@ -141,23 +152,32 @@ def get_option_parser (): help = _ ("process ly_files using COMMAND FILE..."), action='store', 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"), action="store_true", default=False, dest="verbose") + + p.version = "@TOPLEVEL_VERSION@" + p.add_option("--version", + action="version", + help=_ ("show version number and exit")) + p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"), action='store_true') - p.add_option_group ('bugs', + p.add_option_group (ly.display_encode (_ ('Bugs')), description=(_ ("Report bugs via") + ''' http://post.gmane.org/post.php''' '''?group=gmane.comp.gnu.lilypond.bugs\n''')) @@ -628,7 +648,7 @@ output = { OUTPUTIMAGE: r'''@noindent @ifinfo -@image{%(base)s,,,%(alt)s,%(ext)s} +@image{%(info_image_path)s,,,%(alt)s,%(ext)s} @end ifinfo @html

@@ -759,14 +779,15 @@ def classic_lilypond_book_compatibility (key, value): return (None, None) -def find_file (name): +def find_file (name, raise_error=True): for i in global_options.include_path: full = os.path.join (i, name) if os.path.exists (full): return full - error (_ ("file not found: %s") % name + '\n') - exit (1) + if raise_error: + error (_ ("file not found: %s") % name + '\n') + exit (1) return '' def verbatim_html (s): @@ -986,7 +1007,7 @@ class Lilypond_snippet (Snippet): option_list.append (key) else: option_list.append (key + '=' + value) - option_string = string.join (option_list, ',') + option_string = ','.join (option_list) compose_dict = {} compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER] @@ -1042,14 +1063,10 @@ class Lilypond_snippet (Snippet): elif relative > 0: relative_quotes += "'" * relative - paper_string = string.join (compose_dict[PAPER], - '\n ') % override - layout_string = string.join (compose_dict[LAYOUT], - '\n ') % override - notes_string = string.join (compose_dict[NOTES], - '\n ') % vars () - preamble_string = string.join (compose_dict[PREAMBLE], - '\n ') % override + paper_string = '\n '.join (compose_dict[PAPER]) % override + layout_string = '\n '.join (compose_dict[LAYOUT]) % override + notes_string = '\n '.join (compose_dict[NOTES]) % vars () + preamble_string = '\n '.join (compose_dict[PREAMBLE]) % override padding_mm = global_options.padding_mm font_dump_setting = '' if FONTLOAD in self.option_dict: @@ -1085,10 +1102,9 @@ class Lilypond_snippet (Snippet): def ly_is_outdated (self): base = self.basename () - ly_file = base + '.ly' - tex_file = base + '.tex' - eps_file = base + '.eps' - systems_file = base + '-systems.tex' + ly_file = find_file (base + '.ly', raise_error=False) + tex_file = find_file (base + '.tex', raise_error=False) + systems_file = find_file (base + '-systems.tex', raise_error=False) if (os.path.exists (ly_file) and os.path.exists (systems_file) @@ -1103,33 +1119,26 @@ class Lilypond_snippet (Snippet): def png_is_outdated (self): base = self.basename () - # FIXME: refactor stupid OK stuff - ok = not self.ly_is_outdated () - if global_options.format in (HTML, TEXINFO): - ok = ok and os.path.exists (base + '.eps') - - page_count = 0 - if ok: - page_count = ps_page_count (base + '.eps') - - if page_count <= 1: - ok = ok and os.path.exists (base + '.png') - - elif page_count > 1: - for a in range (1, page_count + 1): - ok = ok and os.path.exists (base + '-page%d.png' % a) - - return not ok + eps_file = find_file (base + '.eps', raise_error=False) + png_file = find_file (base + '.png', raise_error=False) + if not self.ly_is_outdated () and global_options.format in (HTML, TEXINFO): + if os.path.exists (eps_file): + page_count = ps_page_count (eps_file) + if page_count <= 1: + return not os.path.exists (png_file) + else: + return not reduce (operator.or_, + [find_file (base + '-page%d.png' % a, raise_error=False) + for a in range (1, page_count + 1)]) + return True def texstr_is_outdated (self): if backend == 'ps': return 0 - # FIXME: refactor stupid OK stuff base = self.basename () - ok = self.ly_is_outdated () - ok = ok and (os.path.exists (base + '.texstr')) - return not ok + return not (self.ly_is_outdated () + and find_file (base + '.texstr', raise_error=False)) def filter_text (self): code = self.substring ('code') @@ -1204,6 +1213,7 @@ class Lilypond_snippet (Snippet): # Specifying no extension is most robust. ext = '' alt = self.option_dict[ALT] + info_image_path = os.path.join (global_options.info_images_dir, base) str += output[TEXINFO][OUTPUTIMAGE] % vars () base = self.basename () @@ -1234,20 +1244,13 @@ class Lilypond_snippet (Snippet): str = '' if PRINTFILENAME in self.option_dict: base = self.basename () - filename = self.substring ('filename') - str = output[global_options.format][PRINTFILENAME] % vars () + filename = os.path.basename (self.substring ('filename')) + str = output[format][PRINTFILENAME] % vars () return str def output_texinfo (self): - str = '' - if self.output_print_filename (TEXINFO): - str += ('@html\n' - + self.output_print_filename (HTML) - + '\n@end html\n') - str += ('@tex\n' - + self.output_print_filename (LATEX) - + '\n@end tex\n') + str = self.output_print_filename (TEXINFO) base = self.basename () if TEXIDOC in self.option_dict: texidoc = base + '.texidoc' @@ -1417,8 +1420,8 @@ def filter_pipe (input, cmd): exit_status = status >> 8 error (_ ("`%s' failed (%d)") % (cmd, exit_status)) error (_ ("The error log is as follows:")) - sys.stderr.write (error) - sys.stderr.write (stderr.read ()) + ly.stderr_write (error) + ly.stderr_write (stderr.read ()) exit (status) if global_options.verbose: @@ -1462,16 +1465,16 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets): # the --process=CMD switch is a bad idea # it is too generic for lilypond-book. if texstr_names: - my_system (string.join ([cmd, '--backend texstr', - 'snippet-map.ly'] + texstr_names)) + my_system (' '.join ([cmd, '--backend texstr', + 'snippet-map.ly'] + texstr_names)) for l in texstr_names: my_system ('latex %s.texstr' % l) if ly_names: open ('snippet-names', 'wb').write ('\n'.join (['snippet-map.ly'] - + ly_names)) + + ly_names)) - my_system (string.join ([cmd, 'snippet-names'])) + my_system (' '.join ([cmd, 'snippet-names'])) LATEX_INSPECTION_DOCUMENT = r''' @@ -1627,10 +1630,15 @@ def write_if_updated (file_name, lines): try: f = open (file_name) oldstr = f.read () - new_str = string.join (lines, '') + new_str = ''.join (lines) if oldstr == new_str: progress (_ ("%s is up to date.") % file_name) progress ('\n') + + # this prevents make from always rerunning lilypond-book: + # .texi target must be touched in order to be up to date + if global_options.format == 'texinfo': + os.utime (file_name, None) return except: pass @@ -1816,7 +1824,7 @@ def main (): + ' --formats=%s --backend eps ' % formats) if global_options.process_cmd: - global_options.process_cmd += string.join ([(' -I %s' % ly.mkarg (p)) + global_options.process_cmd += ' '.join ([(' -I %s' % ly.mkarg (p)) for p in global_options.include_path]) if global_options.format in (TEXINFO, LATEX):