X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=1f925c13bde7094a954d579f3e64c35cc4bc0c08;hb=e72fc73821781e72d20730f0f79c2a16f52cc947;hp=495c3683a7685aa4751f01c3c3811dea4bb61545;hpb=722aaff887f824e0c5f731f2c7e45dca39274ca7;p=lilypond.git diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 495c3683a7..1f925c13bd 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -28,7 +28,7 @@ TODO: ''' -import commands +import glob import md5 import os import re @@ -42,6 +42,7 @@ import tempfile import lilylib as ly import fontextract +import langdefs global _;_=ly._ @@ -57,13 +58,13 @@ _ ("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 + $ lilypond-book --filter="tr '[a-z]' '[A-Z]'" %(BOOK)s + $ lilypond-book -F "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): @@ -100,9 +101,9 @@ def warranty (): %s %s ''' % ( _ ('Copyright (c) %s by') % '2001--2007', - ' '.join (authors), - _ ("Distributed under terms of the GNU General Public License."), - _ ("It comes with NO WARRANTY."))) + ' '.join (authors), + _ ("Distributed under terms of the GNU General Public License."), + _ ("It comes with NO WARRANTY."))) def get_option_parser (): p = ly.get_option_parser (usage=_ ("%s [OPTION]... FILE") % 'lilypond-book', @@ -112,11 +113,12 @@ def get_option_parser (): p.add_option ('-F', '--filter', metavar=_ ("FILTER"), action="store", dest="filter_cmd", - help=_ ("pipe snippets through FILTER [convert-ly -n -]"), + help=_ ("pipe snippets through FILTER [default: `convert-ly -n -']"), default=None) p.add_option ('-f', '--format', help=_ ("use output format FORMAT (texi [default], texi-html, latex, html, docbook)"), + metavar=_ ("FORMAT"), action='store') p.add_option("-h", "--help", @@ -135,6 +137,12 @@ def get_option_parser (): action='store', dest='info_images_dir', default='') + p.add_option ('--latex-program', + help=_ ("run executable PROG instead of latex"), + metavar=_ ("PROG"), + action='store', dest='latex_program', + default='latex') + p.add_option ('--left-padding', metavar=_ ("PAD"), dest="padding_mm", @@ -144,11 +152,23 @@ def get_option_parser (): p.add_option ("-o", '--output', help=_ ("write output to DIR"), metavar=_ ("DIR"), - action='store', dest='output_name', + action='store', dest='output_dir', default='') + p.add_option ('--skip-lily-check', + help=_ ("do not fail if no lilypond output is found"), + metavar=_ ("DIR"), + action='store_true', dest='skip_lilypond_run', + default=False) + + p.add_option ('--skip-png-check', + help=_ ("do not fail if no PNG images are found for EPS files"), + metavar=_ ("DIR"), + action='store_true', dest='skip_png_check', + default=False) + p.add_option ('--lily-output-dir', - help=_ ("write lily-XXX files to DIR, link into --output dir."), + help=_ ("write lily-XXX files to DIR, link into --output dir"), metavar=_ ("DIR"), action='store', dest='lily_output_dir', default=None) @@ -164,11 +184,6 @@ def get_option_parser (): 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, @@ -182,10 +197,10 @@ must use this with dvips -h INPUT.psfonts'''), p.add_option ('-w', '--warranty', help=_ ("show warranty and copyright"), action='store_true') - 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''')) + p.add_option_group ('', + 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') @@ -199,6 +214,8 @@ global_options = None default_ly_options = { 'alt': "[image of music]" } +document_language = '' + # # Is this pythonic? Personally, I find this rather #define-nesque. --hwn # @@ -211,6 +228,7 @@ FILTER = 'filter' FRAGMENT = 'fragment' HTML = 'html' INDENT = 'indent' +LANG = 'lang' LATEX = 'latex' LAYOUT = 'layout' LINE_WIDTH = 'line-width' @@ -218,6 +236,7 @@ LILYQUOTE = 'lilyquote' NOFRAGMENT = 'nofragment' NOINDENT = 'noindent' NOQUOTE = 'noquote' +NORAGGED_RIGHT = 'noragged-right' NOTES = 'body' NOTIME = 'notime' OUTPUT = 'output' @@ -230,6 +249,7 @@ QUOTE = 'quote' RAGGED_RIGHT = 'ragged-right' RELATIVE = 'relative' STAFFSIZE = 'staffsize' +DOCTITLE = 'doctitle' TEXIDOC = 'texidoc' TEXINFO = 'texinfo' VERBATIM = 'verbatim' @@ -516,7 +536,9 @@ simple_options = [ NOFRAGMENT, NOINDENT, PRINTFILENAME, + DOCTITLE, TEXIDOC, + LANG, VERBATIM, FONTLOAD, FILENAME, @@ -542,6 +564,8 @@ ly_options = { RAGGED_RIGHT: r'''ragged-right = ##t''', + NORAGGED_RIGHT: r'''ragged-right = ##f''', + PACKED: r'''packed = ##t''', }, @@ -549,12 +573,12 @@ ly_options = { LAYOUT: { NOTIME: r''' \context { - \Score - timing = ##f + \Score + timing = ##f } \context { - \Staff - \remove Time_signature_engraver + \Staff + \remove "Time_signature_engraver" }''', }, @@ -807,26 +831,42 @@ def verbatim_html (s): re.sub ('<', '<', re.sub ('&', '&', s))) -def split_options (option_string): - if option_string: - if global_options.format == HTML: - options = re.findall('[\w\.-:]+(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|\S+))?',option_string) - for i in range(len(options)): - options[i] = re.sub('^([^=]+=\s*)(?P["\'])(.*)(?P=q)','\g<1>\g<3>',options[i]) - return options - else: - return re.split (format_res[global_options.format]['option_sep'], - option_string) - return [] +ly_var_def_re = re.compile (r'^([a-zA-Z]+)[\t ]*=', re.M) +ly_comment_re = re.compile (r'(%+[\t ]*)(.*)$', re.M) -def set_default_options (source): - global default_ly_options - if not default_ly_options.has_key (LINE_WIDTH): - if global_options.format == LATEX: +def ly_comment_gettext (t, m): + return m.group (1) + t (m.group (2)) + +def verb_ly_gettext (s): + if not document_language: + return s + try: + t = langdefs.translation[document_language] + except: + return s + + s = ly_comment_re.sub (lambda m: ly_comment_gettext (t, m), s) + + for v in ly_var_def_re.findall (s): + s = re.sub (r"(?m)(^|[' \\#])%s([^a-zA-Z])" % v, + "\\1" + t (v) + "\\2", + s) + return s + +texinfo_lang_re = re.compile ('(?m)^@documentlanguage (.*?)( |$)') +def set_default_options (source, default_ly_options, format): + global document_language + if LINE_WIDTH not in default_ly_options: + if format == LATEX: textwidth = get_latex_textwidth (source) default_ly_options[LINE_WIDTH] = '%.0f\\pt' % textwidth - elif global_options.format == TEXINFO: - for (k, v) in texinfo_line_widths.items (): + elif format == TEXINFO: + m = texinfo_lang_re.search (source) + if m and not m.group (1).startswith ('en'): + document_language = m.group (1) + else: + document_language = '' + for regex in texinfo_line_widths: # FIXME: @layout is usually not in # chunk #0: # @@ -835,8 +875,8 @@ def set_default_options (source): # Bluntly search first K items of # source. # s = chunks[0].replacement_text () - if re.search (k, source[:1024]): - default_ly_options[LINE_WIDTH] = v + if re.search (regex, source[:1024]): + default_ly_options[LINE_WIDTH] = texinfo_line_widths[regex] break class Chunk: @@ -846,12 +886,6 @@ class Chunk: def filter_text (self): return self.replacement_text () - def ly_is_outdated (self): - return False - - def png_is_outdated (self): - return False - def is_plain (self): return False @@ -894,7 +928,7 @@ class Snippet (Chunk): class IncludeSnippet (Snippet): def processed_filename (self): f = self.substring ('filename') - return os.path.splitext (f)[0] + format2ext[global_options.format] + return os.path.splitext (f)[0] + format2ext[self.format] def replacement_text (self): s = self.match.group ('match') @@ -909,7 +943,7 @@ class LilypondSnippet (Snippet): self.do_options (os, self.type) def verb_ly (self): - return self.substring ('code') + return verb_ly_gettext (self.substring ('code')) def ly (self): contents = self.substring ('code') @@ -922,21 +956,34 @@ class LilypondSnippet (Snippet): return self.compose_ly (s) return '' + def split_options (self, option_string): + if option_string: + if self.format == HTML: + options = re.findall('[\w\.-:]+(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|\S+))?', + option_string) + options = [re.sub('^([^=]+=\s*)(?P["\'])(.*)(?P=q)', '\g<1>\g<3>', opt) + for opt in options] + return options + else: + return re.split (format_res[self.format]['option_sep'], + option_string) + return [] + def do_options (self, option_string, type): self.option_dict = {} - options = split_options (option_string) + options = self.split_options (option_string) - for i in options: - if '=' in i: - (key, value) = re.split ('\s*=\s*', i) + for option in options: + if '=' in option: + (key, value) = re.split ('\s*=\s*', option) self.option_dict[key] = value else: - if i in no_options.keys (): - if no_options[i] in self.option_dict.keys (): - del self.option_dict[no_options[i]] + if option in no_options: + if no_options[option] in self.option_dict: + del self.option_dict[no_options[option]] else: - self.option_dict[i] = None + self.option_dict[option] = None has_line_width = self.option_dict.has_key (LINE_WIDTH) no_line_width_value = 0 @@ -946,39 +993,45 @@ class LilypondSnippet (Snippet): no_line_width_value = 1 del self.option_dict[LINE_WIDTH] - for i in default_ly_options.keys (): - if i not in self.option_dict.keys (): - self.option_dict[i] = default_ly_options[i] + for k in default_ly_options: + if k not in self.option_dict: + self.option_dict[k] = default_ly_options[k] + + # RELATIVE does not work without FRAGMENT; + # make RELATIVE imply FRAGMENT + has_relative = self.option_dict.has_key (RELATIVE) + if has_relative and not self.option_dict.has_key (FRAGMENT): + self.option_dict[FRAGMENT] = None if not has_line_width: - if type == 'lilypond' or FRAGMENT in self.option_dict.keys (): + if type == 'lilypond' or FRAGMENT in self.option_dict: self.option_dict[RAGGED_RIGHT] = None if type == 'lilypond': - if LINE_WIDTH in self.option_dict.keys (): + if LINE_WIDTH in self.option_dict: del self.option_dict[LINE_WIDTH] else: - if RAGGED_RIGHT in self.option_dict.keys (): - if LINE_WIDTH in self.option_dict.keys (): + if RAGGED_RIGHT in self.option_dict: + if LINE_WIDTH in self.option_dict: del self.option_dict[LINE_WIDTH] - if QUOTE in self.option_dict.keys () or type == 'lilypond': - if LINE_WIDTH in self.option_dict.keys (): + if QUOTE in self.option_dict or type == 'lilypond': + if LINE_WIDTH in self.option_dict: del self.option_dict[LINE_WIDTH] - if not INDENT in self.option_dict.keys (): + if not INDENT in self.option_dict: self.option_dict[INDENT] = '0\\mm' # The QUOTE pattern from ly_options only emits the `line-width' # keyword. - if has_line_width and QUOTE in self.option_dict.keys (): + if has_line_width and QUOTE in self.option_dict: if no_line_width_value: del self.option_dict[LINE_WIDTH] else: del self.option_dict[QUOTE] def compose_ly (self, code): - if FRAGMENT in self.option_dict.keys (): + if FRAGMENT in self.option_dict: body = FRAGMENT_LY else: body = FULL_LY @@ -1031,18 +1084,14 @@ class LilypondSnippet (Snippet): if c_key: if c_value: warning ( - _ ("deprecated ly-option used: %s=%s" - % (key, value))) + _ ("deprecated ly-option used: %s=%s") % (key, value)) warning ( - _ ("compatibility mode translation: %s=%s" - % (c_key, c_value))) + _ ("compatibility mode translation: %s=%s") % (c_key, c_value)) else: warning ( - _ ("deprecated ly-option used: %s" - % key)) + _ ("deprecated ly-option used: %s") % key) warning ( - _ ("compatibility mode translation: %s" - % c_key)) + _ ("compatibility mode translation: %s") % c_key) (key, value) = (c_key, c_value) @@ -1063,7 +1112,7 @@ class LilypondSnippet (Snippet): warning (_ ("ignoring unknown ly option: %s") % key) # URGS - if RELATIVE in override.keys () and override[RELATIVE]: + if RELATIVE in override and override[RELATIVE]: relative = int (override[RELATIVE]) relative_quotes = '' @@ -1097,77 +1146,122 @@ class LilypondSnippet (Snippet): return self.checksum def basename (self): - if FILENAME in self.option_dict: - return self.option_dict[FILENAME] - cs = self.get_checksum () - - # TODO: use xx/xxxxx directory layout. - name = 'lily-%s' % (cs[:2], cs[2:]) - if global_options.lily_output_dir: - name = os.path.join (global_options.lily_output_dir, name) + name = '%s/lily-%s' % (cs[:2], cs[2:10]) return name def write_ly (self): - out = file (self.basename () + '.ly', 'w') + base = self.basename () + path = os.path.join (global_options.lily_output_dir, base) + directory = os.path.split(path)[0] + if not os.path.isdir (directory): + os.makedirs (directory) + out = file (path + '.ly', 'w') out.write (self.full_ly ()) - file (self.basename () + '.txt', 'w').write ('image of music') + file (path + '.txt', 'w').write ('image of music') def relevant_contents (self, ly): return re.sub (r'\\(version|sourcefileline|sourcefilename)[^\n]*\n', '', ly) - - def ly_is_outdated (self): - base = self.basename () - 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 (not os.path.exists (ly_file) - or not os.path.exists (systems_file)): - return True - - lines = file (systems_file).readlines () - if not lines: - return True - if not re.match ('% eof', lines[-1]): - return true - - # and FILENAME in self.option_dict - #huh? + def link_all_output_files (self, output_dir, output_dir_files, destination): + existing, missing = self.all_output_files (output_dir, output_dir_files) + if missing: + print '\nMissing', missing + raise CompileError(self.basename()) + for name in existing: + try: + os.unlink (os.path.join (destination, name)) + except OSError: + pass + + src = os.path.join (output_dir, name) + dst = os.path.join (destination, name) + dst_path = os.path.split(dst)[0] + if not os.path.isdir (dst_path): + os.makedirs (dst_path) + os.link (src, dst) - if (self.relevant_contents (self.full_ly ()) - != self.relevant_contents (file (ly_file).read ())): - return True - return False + def all_output_files (self, output_dir, output_dir_files): + """Return all files generated in lily_output_dir, a set. - def png_is_outdated (self): - base = self.basename () - eps_file = find_file (base + '.eps', raise_error=False) - png_file = find_file (base + '.png', raise_error=False) - if self.ly_is_outdated (): - return True - - if (global_options.format in (HTML, TEXINFO) - and os.path.exists (eps_file)): - page_count = ps_page_count (eps_file) + output_dir_files is the list of files in the output directory. + """ + result = set () + missing = set () + base = self.basename() + full = os.path.join (output_dir, base) + def consider_file (name): + if name in output_dir_files: + result.add (name) + + def require_file (name): + if name in output_dir_files: + result.add (name) + else: + missing.add (name) + + # UGH - junk global_options + skip_lily = global_options.skip_lilypond_run + for required in [base + '.ly', + base + '.txt']: + require_file (required) + if not skip_lily: + require_file (base + '-systems.count') + + if 'ddump-profile' in global_options.process_cmd: + require_file (base + '.profile') + if 'dseparate-log-file' in global_options.process_cmd: + require_file (base + '.log') + + map (consider_file, [base + '.tex', + base + '.eps', + base + '.texidoc', + base + '.doctitle', + base + '-systems.texi', + base + '-systems.tex', + base + '-systems.pdftexi']) + if document_language: + map (consider_file, + [base + '.texidoc' + document_language, + base + '.doctitle' + document_language]) + + # UGH - junk global_options + if (base + '.eps' in result and self.format in (HTML, TEXINFO) + and not global_options.skip_png_check): + page_count = ps_page_count (full + '.eps') if page_count <= 1: - return not os.path.exists (png_file) + require_file (base + '.png') else: - for a in range (1, page_count + 1): - if not find_file (base + '-page%d.png' % a, - raise_error=False): - return True - - return False + for page in range (1, page_count + 1): + require_file (base + '-page%d.png' % page) + + system_count = 0 + if not skip_lily and not missing: + system_count = int(file (full + '-systems.count').read()) + + for number in range(1, system_count + 1): + systemfile = '%s-%d' % (base, number) + require_file (systemfile + '.eps') + consider_file (systemfile + '.pdf') + + # We can't require signatures, since books and toplevel + # markups do not output a signature. + if 'ddump-signature' in global_options.process_cmd: + consider_file (systemfile + '.signature') + + + return (result, missing) + + def is_outdated (self, output_dir, current_files): + found, missing = self.all_output_files (output_dir, current_files) + return missing def filter_text (self): """Run snippet bodies through a command (say: convert-ly). This functionality is rarely used, and this code must have bitrot. """ - code = self.substring ('code') s = filter_pipe (code, global_options.filter_cmd) d = { @@ -1192,8 +1286,9 @@ class LilypondSnippet (Snippet): or (os.stat (multiple)[stat.ST_MTIME] > os.stat (single)[stat.ST_MTIME]))): count = ps_page_count ('%(base)s.eps' % vars ()) - images = ['%s-page%d.png' % (base, a) for a in range (1, count+1)] + images = ['%s-page%d.png' % (base, page) for page in range (1, count+1)] images = tuple (images) + return images def output_docbook (self): @@ -1215,7 +1310,7 @@ class LilypondSnippet (Snippet): def output_html (self): str = '' base = self.basename () - if global_options.format == HTML: + if self.format == HTML: str += self.output_print_filename (HTML) if VERBATIM in self.option_dict: verb = verbatim_html (self.verb_ly ()) @@ -1244,13 +1339,13 @@ class LilypondSnippet (Snippet): str += output[TEXINFO][OUTPUTIMAGE] % vars () base = self.basename () - str += output[global_options.format][OUTPUT] % vars () + str += output[self.format][OUTPUT] % vars () return str def output_latex (self): str = '' base = self.basename () - if global_options.format == LATEX: + if self.format == LATEX: str += self.output_print_filename (LATEX) if VERBATIM in self.option_dict: verb = self.verb_ly () @@ -1279,9 +1374,19 @@ class LilypondSnippet (Snippet): def output_texinfo (self): str = self.output_print_filename (TEXINFO) base = self.basename () + if DOCTITLE in self.option_dict: + doctitle = base + '.doctitle' + translated_doctitle = doctitle + document_language + if os.path.exists (translated_doctitle): + str += '@lydoctitle %s\n' % open (translated_doctitle).read () + elif os.path.exists (doctitle): + str += '@lydoctitle %s\n' % open (doctitle).read () if TEXIDOC in self.option_dict: texidoc = base + '.texidoc' - if os.path.exists (texidoc): + translated_texidoc = texidoc + document_language + if os.path.exists (translated_texidoc): + str += '@include %(translated_texidoc)s\n\n' % vars () + elif os.path.exists (texidoc): str += '@include %(texidoc)s\n\n' % vars () substr = '' @@ -1320,7 +1425,7 @@ class LilypondFileSnippet (LilypondSnippet): s = self.contents s = re_begin_verbatim.split (s)[-1] s = re_end_verbatim.split (s)[0] - return s + return verb_ly_gettext (s) def ly (self): name = self.substring ('filename') @@ -1351,16 +1456,16 @@ def find_linestarts (s): nls.append (len (s)) return nls -def find_toplevel_snippets (s, types): +def find_toplevel_snippets (input_string, format, types): res = {} - for i in types: - res[i] = ly.re.compile (snippet_res[global_options.format][i]) + for t in types: + res[t] = re.compile (snippet_res[format][t]) snippets = [] index = 0 found = dict ([(t, None) for t in types]) - line_starts = find_linestarts (s) + line_starts = find_linestarts (input_string) line_start_idx = 0 # We want to search for multiple regexes, without searching # the string multiple times for one regex. @@ -1376,14 +1481,13 @@ def find_toplevel_snippets (s, types): if not found[type] or found[type][0] < index: found[type] = None - m = res[type].search (s[index:endex]) + m = res[type].search (input_string[index:endex]) if not m: continue - cl = Snippet - if snippet_type_to_class.has_key (type): - cl = snippet_type_to_class[type] - + klass = Snippet + if type in snippet_type_to_class: + klass = snippet_type_to_class[type] start = index + m.start ('match') line_number = line_start_idx @@ -1391,7 +1495,7 @@ def find_toplevel_snippets (s, types): line_number += 1 line_number += 1 - snip = cl (type, m, global_options.format, line_number) + snip = klass (type, m, format, line_number) found[type] = (start, snip) @@ -1413,14 +1517,14 @@ def find_toplevel_snippets (s, types): endex = found[first][0] if not first: - snippets.append (Substring (s, index, len (s), line_start_idx)) + snippets.append (Substring (input_string, index, len (input_string), line_start_idx)) break while (start > line_starts[line_start_idx+1]): line_start_idx += 1 (start, snip) = found[first] - snippets.append (Substring (s, index, start, line_start_idx + 1)) + snippets.append (Substring (input_string, index, start, line_start_idx + 1)) snippets.append (snip) found[first] = None index = start + len (snip.match.group ('match')) @@ -1472,26 +1576,29 @@ def system_in_directory (cmd, directory): os.chdir (current) -def process_snippets (cmd, snippets): +def process_snippets (cmd, snippets, + format, lily_output_dir): """Run cmd on all of the .ly files from snippets.""" + if not snippets: return - if global_options.format in (HTML, TEXINFO) and '--formats' not in cmd: + if format in (HTML, TEXINFO) and '--formats' not in cmd: cmd += ' --formats=png ' - elif global_options.format in (DOCBOOK) and '--formats' not in cmd: + elif format in (DOCBOOK) and '--formats' not in cmd: cmd += ' --formats=png,pdf ' checksum = snippet_list_checksum (snippets) contents = '\n'.join (['snippet-map-%d.ly' % checksum] - + [snip.basename() for snip in snippets]) - name = os.path.join (global_options.lily_output_dir, - 'snippet-names-%d' % checksum) + + [snip.basename() + '.ly' for snip in snippets]) + name = os.path.join (lily_output_dir, + 'snippet-names-%d.ly' % checksum) file (name, 'wb').write (contents) system_in_directory (' '.join ([cmd, name]), - global_options.lily_output_dir) - + lily_output_dir) + + ### # Retrieve dimensions from LaTeX LATEX_INSPECTION_DOCUMENT = r''' @@ -1524,7 +1631,8 @@ def get_latex_textwidth (source): tmp_handle.write (latex_document) tmp_handle.close () - ly.system ('latex %s' % tmpfile, be_verbose=global_options.verbose) + ly.system ('%s %s' % (global_options.latex_program, tmpfile), + be_verbose=global_options.verbose) parameter_string = file (logfile).read() os.unlink (tmpfile) @@ -1578,22 +1686,34 @@ def write_file_map (lys, name): snippet_map = file (os.path.join ( global_options.lily_output_dir, 'snippet-map-%d.ly' % snippet_list_checksum (lys)), 'w') + snippet_map.write (""" #(define version-seen #t) #(define output-empty-score-list #f) -#(ly:add-file-name-alist '( -""") - - for ly in lys: - snippet_map.write ('("%s.ly" . "%s")\n' - % (ly.basename (), name)) +#(ly:add-file-name-alist '(%s + ))\n +""" % '\n'.join(['("%s.ly" . "%s")\n' % (ly.basename (), name) + for ly in lys])) - snippet_map.write ('))\n') +def split_output_files(directory): + """Returns directory entries in DIRECTORY/XX/ , where XX are hex digits. -def do_process_cmd (chunks, input_name): - outdated = [c for c in chunks - if (isinstance (c, LilypondSnippet) - and (c.ly_is_outdated () or c.png_is_outdated ()))] + Return value is a set of strings. + """ + files = [] + for subdir in glob.glob (os.path.join (directory, '[a-f0-9][a-f0-9]')): + base_subdir = os.path.split (subdir)[1] + sub_files = [os.path.join (base_subdir, name) + for name in os.listdir (subdir)] + files += sub_files + return set (files) + +def do_process_cmd (chunks, input_name, options): + snippets = [c for c in chunks if isinstance (c, LilypondSnippet)] + + output_files = split_output_files (options.lily_output_dir) + outdated = [c for c in snippets if c.is_outdated (options.lily_output_dir, output_files)] + write_file_map (outdated, input_name) progress (_ ("Writing snippets...")) for snippet in outdated: @@ -1603,9 +1723,19 @@ def do_process_cmd (chunks, input_name): if outdated: progress (_ ("Processing...")) progress ('\n') - process_snippets (global_options.process_cmd, outdated) + process_snippets (options.process_cmd, outdated, + options.format, options.lily_output_dir) + else: progress (_ ("All snippets are up to date...")) + + if options.lily_output_dir != options.output_dir: + output_files = split_output_files (options.lily_output_dir) + for snippet in snippets: + snippet.link_all_output_files (options.lily_output_dir, + output_files, + options.output_dir) + progress ('\n') @@ -1627,7 +1757,7 @@ ext2format = { def guess_format (input_filename): format = None e = os.path.splitext (input_filename)[1] - if e in ext2format.keys (): + if e in ext2format: # FIXME format = ext2format[e] else: @@ -1648,9 +1778,14 @@ def write_if_updated (file_name, lines): # this prevents make from always rerunning lilypond-book: # output file must be touched in order to be up to date os.utime (file_name, None) + return except: pass + output_dir = os.path.dirname (file_name) + if not os.path.exists (output_dir): + os.makedirs (output_dir) + progress (_ ("Writing `%s'...") % file_name) file (file_name, 'w').writelines (lines) progress ('\n') @@ -1669,7 +1804,7 @@ def samefile (f1, f2): f2 = re.sub ("//*", "/", f2) return f1 == f2 -def do_file (input_filename): +def do_file (input_filename, included=False): # Ugh. if not input_filename or input_filename == '-': in_handle = sys.stdin @@ -1687,35 +1822,37 @@ def do_file (input_filename): if input_filename == '-': input_base = 'stdin' + elif included: + input_base = os.path.splitext (input_filename)[0] else: input_base = os.path.basename ( os.path.splitext (input_filename)[0]) - # Only default to stdout when filtering. - if global_options.output_name == '-' or (not global_options.output_name and global_options.filter_cmd): - output_filename = '-' - output_file = sys.stdout + # don't complain when global_options.output_dir is existing + if not global_options.output_dir: + global_options.output_dir = os.getcwd() else: - # don't complain when global_options.output_name is existing - output_filename = input_base + format2ext[global_options.format] - if global_options.output_name: - if not os.path.isdir (global_options.output_name): - os.mkdir (global_options.output_name, 0777) - os.chdir (global_options.output_name) - else: - if (os.path.exists (input_filename) - and os.path.exists (output_filename) - and samefile (output_filename, input_fullname)): - error ( - _ ("Output would overwrite input file; use --output.")) - exit (2) + global_options.output_dir = os.path.abspath(global_options.output_dir) + + if not os.path.isdir (global_options.output_dir): + os.mkdir (global_options.output_dir, 0777) + os.chdir (global_options.output_dir) + + output_filename = os.path.join(global_options.output_dir, + input_base + format2ext[global_options.format]) + if (os.path.exists (input_filename) + and os.path.exists (output_filename) + and samefile (output_filename, input_fullname)): + error ( + _ ("Output would overwrite input file; use --output.")) + exit (2) try: progress (_ ("Reading %s...") % input_fullname) source = in_handle.read () progress ('\n') - set_default_options (source) + set_default_options (source, default_ly_options, global_options.format) # FIXME: Containing blocks must be first, see @@ -1731,7 +1868,7 @@ def do_file (input_filename): 'lilypond', ) progress (_ ("Dissecting...")) - chunks = find_toplevel_snippets (source, snippet_types) + chunks = find_toplevel_snippets (source, global_options.format, snippet_types) if global_options.format == LATEX: for c in chunks: @@ -1745,7 +1882,7 @@ def do_file (input_filename): write_if_updated (output_filename, [c.filter_text () for c in chunks]) elif global_options.process_cmd: - do_process_cmd (chunks, input_fullname) + do_process_cmd (chunks, input_fullname, global_options) progress (_ ("Compiling %s...") % output_filename) progress ('\n') write_if_updated (output_filename, @@ -1757,11 +1894,11 @@ def do_file (input_filename): name = snippet.substring ('filename') progress (_ ("Processing include: %s") % name) progress ('\n') - return do_file (name) + return do_file (name, included=True) include_chunks = map (process_include, - filter (lambda x: isinstance (x, IncludeSnippet), - chunks)) + filter (lambda x: isinstance (x, IncludeSnippet), + chunks)) return chunks + reduce (lambda x, y: x + y, include_chunks, []) @@ -1776,7 +1913,6 @@ def do_options (): opt_parser = get_option_parser() (global_options, args) = opt_parser.parse_args () - if global_options.format in ('texi-html', 'texi'): global_options.format = TEXINFO @@ -1791,22 +1927,6 @@ 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 () @@ -1826,8 +1946,13 @@ def main (): + ' --formats=%s -dbackend=eps ' % formats) if global_options.process_cmd: - global_options.process_cmd += ' '.join ([(' -I %s' % ly.mkarg (p)) - for p in global_options.include_path]) + includes = global_options.include_path + if global_options.lily_output_dir: + # This must be first, so lilypond prefers to read .ly + # files in the other lybookdb dir. + includes = [os.path.abspath(global_options.lily_output_dir)] + includes + global_options.process_cmd += ' '.join ([' -I %s' % ly.mkarg (p) + for p in includes]) if global_options.format in (TEXINFO, LATEX): ## prevent PDF from being switched on by default. @@ -1841,45 +1966,28 @@ def main (): if global_options.padding_mm: global_options.process_cmd += " -deps-box-padding=%f " % global_options.padding_mm - global_options.process_cmd += " -dread-file-list " + global_options.process_cmd += " -dread-file-list -dno-strip-output-dir" if global_options.lily_output_dir: global_options.lily_output_dir = os.path.abspath(global_options.lily_output_dir) if not os.path.isdir (global_options.lily_output_dir): os.makedirs (global_options.lily_output_dir) else: - global_options.lily_output_dir = os.path.abspath(global_options.output_name) + global_options.lily_output_dir = os.path.abspath(global_options.output_dir) identify () try: chunks = do_file (files[0]) - if global_options.psfonts: - fontextract.verbose = global_options.verbose - snippet_chunks = filter ( - lambda x: isinstance (x, LilypondSnippet), - chunks) - - psfonts_file = basename + '.psfonts' - if not global_options.verbose: - progress (_ ("Writing fonts to %s...") % psfonts_file) - fontextract.extract_fonts ( - psfonts_file, - [x.basename() + '.eps' for x in snippet_chunks]) - if not global_options.verbose: - progress ('\n') - except CompileError: exit (1) - psfonts_warning (global_options, basename) - inputs = note_input_file ('') inputs.pop () base_file_name = os.path.splitext (os.path.basename (files[0]))[0] - dep_file = os.path.join (global_options.output_name, base_file_name + '.dep') - final_output_file = os.path.join (global_options.output_name, + dep_file = os.path.join (global_options.output_dir, base_file_name + '.dep') + final_output_file = os.path.join (global_options.output_dir, base_file_name + '.%s' % global_options.format)