X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=3cda39ba5f66f009faa4323c6985674e0c56e148;hb=caaa194f737ab263aab3abbafc7c4f8e737e5ec1;hp=687d060d9bbc0bb6c89bc51f829fb00069cb1ddc;hpb=650039e88636510bd0468605cf0d0b9953705f79;p=lilypond.git diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 687d060d9b..3cda39ba5f 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1,15 +1,6 @@ #!@PYTHON@ ''' -TODO: - ly-options: intertext, quote ? - --linewidth? - eps in latex? - check latex parameters, twocolumn - multicolumn? - papersizes? - ly2dvi/notexidoc? - Example usage: test: @@ -19,18 +10,31 @@ 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 -fps ? + * check latex parameters, twocolumn, multicolumn? + + * Converting from lilypond-book source, substitute: + @mbinclude foo.itely -> @include foo.itely + \mbinput -> \input - must substitute: - @mbinclude foo.itely -> @include foo.itely - \mbinput -> \input - ''' import __main__ import glob +import stat import string +# +# TODO: +# +# * use --png --ps --pdf for making images? +# + ################################################################ # Users of python modules should include this snippet # and customize variables below. @@ -69,15 +73,16 @@ pseudo_filter_p = 0 original_dir = os.getcwd () -help_summary = _ ("""Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document. Example usage: +help_summary = _ ("""Process LilyPond snippets in hybrid HTML, LaTeX or texinfo 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-bin -I include' BOOK + lilypond-book --process='lilypond -I include' BOOK """) -copyright = ('Jan Nieuwenhuizen >', +copyright = ('Jan Nieuwenhuizen ', 'Han-Wen Nienhuys ') option_definitions = [ @@ -93,11 +98,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 @@ -105,21 +110,37 @@ format = 0 output_name = 0 latex_filter_cmd = 'latex "\\nonstopmode \input /dev/stdin"' filter_cmd = 0 -process_cmd = lilypond_binary -default_ly_options = { } +process_cmd = '' +default_ly_options = {} +# +# is this pythonic? Personally, I find this rather #define-nesque. --hwn +# AFTER = 'after' BEFORE = 'before' +BOOKPAPER = 'bookpaper' +EXAMPLEINDENT = 'exampleindent' +FILTER = 'filter' +FRAGMENT = 'fragment' HTML = 'html' +INDENT = 'indent' LATEX = 'latex' LINEWIDTH = 'linewidth' +NOFRAGMENT = 'nofragment' +NOINDENT = 'noindent' NOTES = 'body' +NOTIME = 'notime' OUTPUT = 'output' PAPER = 'paper' PREAMBLE = 'preamble' +PRINTFILENAME = 'printfilename' +QUOTE = 'quote' +RAGGEDRIGHT = 'raggedright' +RELATIVE = 'relative' +STAFFSIZE = 'staffsize' +TEXIDOC = 'texidoc' TEXINFO = 'texinfo' VERBATIM = 'verbatim' -PRINTFILENAME = 'printfilename' # Recognize special sequences in the input # @@ -152,12 +173,12 @@ snippet_res = { }, TEXINFO: { - 'include': '(?m)^[^%\n]*?(?P@include\s+(?P\S*))', + 'include': '(?m)^[^%\n]*?(?P@include\s+(?P\S+))', 'lilypond' : '(?m)^(?P@lilypond(\[(?P[^]]*)\])?{(?P.*?)})', 'lilypond_block': r'''(?ms)^(?P@lilypond(\[(?P[^]]*)\])?\s(?P.*?)@end lilypond)\s''', 'lilypond_file': '(?m)^(?P@lilypondfile(\[(?P[^]]*)\])?{(?P[^}]+)})', - 'multiline_comment': r"(?sm)^\s*(?!@c\s+)(?P@ignore\s.*?@end ignore)\s", - 'singleline_comment': r"(?m)^.*(?P(?P@c([ \t][^\n]*|)\n))", + 'multiline_comment': r'(?sm)^\s*(?!@c\s+)(?P@ignore\s.*?@end\s+ignore)\s', + 'singleline_comment': r'(?m)^.*(?P(?P@c([ \t][^\n]*|)\n))', # don't do this: fucks up with @code{@{} # 'verb': r'''(?P@code{.*?})''', @@ -182,32 +203,48 @@ format_res = { ly_options = { NOTES: { - 'relative': r'''\relative c%(relative_quotes)s''', + RELATIVE: r'''\relative c%(relative_quotes)s''', }, - PAPER: { - 'indent' : r''' + BOOKPAPER: { + INDENT : r''' indent = %(indent)s''', 'linewidth' : r''' linewidth = %(linewidth)s''', - 'noindent' : r''' - indent = 0.0\mm''', - 'notime' : r''' - \translator { - \StaffContext - \remove Time_signature_engraver - }''', - 'raggedright' : r''' + NOINDENT : r''' + indent = 0.0\mm''', + QUOTE : r''' + linewidth = %(linewidth)s - 2.0 * %(exampleindent)s +''', + RAGGEDRIGHT : r''' indent = 0.0\mm raggedright = ##t''', }, + + ## + PAPER: { + EXAMPLEINDENT : '', + + NOTIME : r''' + \context { + \Staff + \remove Time_signature_engraver + }''', + }, + + ## PREAMBLE: { - 'staffsize': r''' + STAFFSIZE: r''' #(set-global-staff-size %(staffsize)s)''', - }, + }, } output = { HTML : { + FILTER: r''' +%(code)s + +''', + AFTER: r'''

''', @@ -216,103 +253,147 @@ output = { ''', OUTPUT: r''' [picture of music]''', + border="0" src="%(image)s" alt="[image of music]">''', PRINTFILENAME:'

%(filename)s

', + QUOTE: r'''
+%(str)s +
+''', VERBATIM: r'''
 %(verb)s
''', }, - + LATEX : { AFTER: '', BEFORE: '', OUTPUT: r'''{\parindent 0pt \catcode`\@=12 -\ifx\preLilyPondExample\preLilyPondExample\fi +\ifx\preLilyPondExample\undefined\relax\else\preLilyPondExample\fi \def\lilypondbook{} \input %(base)s.tex -\ifx\preLilyPondExample\postLilyPondExample\fi +\ifx\postLilyPondExample\undefined\relax\else\postLilyPondExample\fi \catcode`\@=0}''', PRINTFILENAME: '''\\texttt{%(filename)s} ''', - VERBATIM: r'''\begin{verbatim} + QUOTE: r'''\begin{quotation} +%(str)s +\end{quotation} +''', + VERBATIM: r'''\noindent +\begin{verbatim} %(verb)s\end{verbatim} ''', + FILTER: r'''\begin{lilypond}[%(options)s] +%(code)s +\end{lilypond}''', }, - - TEXINFO : { + + TEXINFO : { + FILTER: r'''@lilypond[%(options)s] +%(code)s +@lilypond''', AFTER: '', BEFORE: '', + OUTPUT: r'''@noindent +@image{%(base)s,,,[image of music],%(ext)s} +''', PRINTFILENAME: '''@file{%(filename)s} ''', - VERBATIM: r'''@example + QUOTE: r'''@quotation +%(str)s +@end quotation +''', + # FIXME: @exampleindent 5 is the default... + VERBATIM: r'''@exampleindent 0 +@example %(verb)s@end example +@exampleindent 5 ''', - }, - } -PREAMBLE_LY = r'''%% Generated by %(program_name)s -%% Options: [%(option_string)s] +PREAMBLE_LY = r'''%%%% Generated by %(program_name)s +%%%% Options: [%(option_string)s] +#(set! toplevel-score-handler ly:parser-print-score) +#(set! toplevel-music-handler (lambda (p m) + (ly:parser-print-score + p (ly:music-scorify m)) + )) %(preamble_string)s -\paper {%(paper_string)s +\bookpaper {%(bookpaper_string)s +} +\paper { %(paper_string)s } + ''' -FRAGMENT_LY = r'''\score{ - \notes%(notes_string)s{ +FRAGMENT_LY = r''' + %(notes_string)s{ %(code)s } -}''' +''' FULL_LY = '%(code)s' -texi_linewidths = { 'afourpaper': '160 \\mm', - 'afourwide': '6.5\\in', - 'afourlatex': '150 \\mm', - 'smallbook': '5 \\in' , - 'letterpaper': '6\\in'} +texinfo_linewidths = { + '@afourpaper': '160 \\mm', + '@afourwide': '6.5 \\in', + '@afourlatex': '150 \\mm', + '@smallbook': '5 \\in' , + '@letterpaper': '6\\in', + } def classic_lilypond_book_compatibility (o): if o == 'singleline': - return 'raggedright' + return RAGGEDRIGHT m = re.search ('relative\s*([-0-9])', o) if m: return 'relative=%s' % m.group (1) m = re.match ('([0-9]+)pt', o) if m: return 'staffsize=%s' % m.group (1) - m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt)', o) + m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt|staffspace)', o) if m: f = float (m.group (1)) return 'indent=%f\\%s' % (f, m.group (2)) - m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt)', o) + m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt|staffspace)', o) if m: f = float (m.group (1)) return 'linewidth=%f\\%s' % (f, m.group (2)) return None def compose_ly (code, options): + #Hmm + for i in default_ly_options.keys (): + if i not in options: + options.append (i) - options += default_ly_options.keys () - vars ().update (default_ly_options) - - m = re.search (r'''\\score''', code) - if not m and (not options \ - or not 'nofragment' in options \ - or 'fragment' in options): - options.append ('raggedright') + #Hmm + if QUOTE in options and LINEWIDTH in options: + options.remove (LINEWIDTH) + + if FRAGMENT in options: + if RAGGEDRIGHT not in options: + options.append (RAGGEDRIGHT) body = FRAGMENT_LY else: body = FULL_LY # defaults - relative = 0 - staffsize = '16' + relative = 1 + staffsize = 16 + override = {} + override.update (default_ly_options) + #FIXME: where to get sane value for exampleindent? + override[EXAMPLEINDENT] = r'9.0 \mm' + option_string = string.join (options, ',') - notes_options = [] - paper_options = [] - preamble_options = [] + + options_dict = {} + option_types = [NOTES, PREAMBLE, PAPER, BOOKPAPER] + for a in option_types: + options_dict[a] = [] + for i in options: c = classic_lilypond_book_compatibility (i) if c: @@ -323,31 +404,47 @@ def compose_ly (code, options): if string.find (i, '=') > 0: key, value = string.split (i, '=') - # hmm - vars ()[key] = value + override[key] = value else: key = i + if not override.has_key (i): + override[i] = None + + found = 0 + for type in option_types: + if ly_options[type].has_key (key): + + options_dict[type].append (ly_options[type][key]) + found = 1 + break - if key in ly_options[NOTES].keys (): - notes_options.append (ly_options[NOTES][key]) - elif key in ly_options[PREAMBLE].keys (): - preamble_options.append (ly_options[PREAMBLE][key]) - elif key in ly_options[PAPER].keys (): - paper_options.append (ly_options[PAPER][key]) - elif key not in ('fragment', 'nofragment', 'printfilename', - 'relative', 'verbatim', 'texidoc'): + if not found and key not in (FRAGMENT, NOFRAGMENT, PRINTFILENAME, + RELATIVE, VERBATIM, TEXIDOC): ly.warning (_("ignoring unknown ly option: %s") % i) - relative_quotes = (",,,", ",,", ",", "", "'", "''", "'''")[relative-3] + #URGS + if RELATIVE in override.keys () and override[RELATIVE]: + relative = string.atoi (override[RELATIVE]) + + relative_quotes = '' + + # 1 = central C + if relative < 0: + relative_quotes += ',' * (- relative) + elif relative > 0: + relative_quotes += "'" * relative + program_name = __main__.program_name - notes_string = string.join (notes_options, '\n ') % vars () - paper_string = string.join (paper_options, '\n ') % vars () - preamble_string = string.join (preamble_options, '\n ') % vars () + + paper_string = string.join (options_dict[PAPER], '\n ') % override + bookpaper_string = string.join (options_dict[BOOKPAPER], '\n ') % override + notes_string = string.join (options_dict[NOTES], '\n ') % vars () + preamble_string = string.join (options_dict[PREAMBLE], '\n ') % override 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 @@ -355,15 +452,32 @@ def to_eps (file): # Redirect to stderr cmd = '(( %s >&2 ) >&- )' % cmd ly.system (cmd) - ly.system ('dvips -Ppdf -u+lilypond.map -E -o %s.eps %s' \ + ly.system ('dvips -Ppdf -u+ec-mftrace.map -u+lilypond.map -E -o %s.eps %s' \ % (file, file)) + + # check if it really is EPS. + # Otherwise music glyphs disappear from 2nd and following pages. + + # TODO: should run dvips -pp -E per page, then we get proper + # cropping as well. + + f = open ('%s.eps' % file) + for x in range(0,10) : + if re.search ("^%%Pages: ", f.readline ()): + + # make non EPS. + ly.system ('dvips -Ppdf -u+ec-mftrace.map -u+lilypond.map -o %s.eps %s' \ + % (file, file)) + break + + def find_file (name): for i in include_path: full = os.path.join (i, name) if os.path.exists (full): return full - ly.error (_ ('file not found: %s\n' % name)) + ly.error (_ ('file not found: %s') % name + '\n') ly.exit (1) return '' @@ -384,6 +498,10 @@ def split_options (option_string): class Chunk: def replacement_text (self): return '' + + def filter_text (self): + return self.replacement_text () + def is_outdated (self): return 0 @@ -411,17 +529,14 @@ class Snippet (Chunk): def substring (self, s): return self.match.group (s) - def filter_code (self): - pass # todo - - def __repr__(self): - return `self.__class__` + " type = " + self.type + def __repr__ (self): + return `self.__class__` + " type = " + self.type class Include_snippet (Snippet): def processed_filename (self): f = self.substring ('filename') return os.path.splitext (f)[0] + format2ext[format] - + def replacement_text (self): s = self.match.group (0) f = self.substring ('filename') @@ -436,19 +551,15 @@ class Lilypond_snippet (Snippet): self.options = split_options (os) def ly (self): - if self.type == 'lilypond_file': - name = self.substring ('filename') - return '\\renameinput \"%s\"\n' % name\ - + open (find_file (name)).read () - else: - return self.substring ('code') + return self.substring ('code') def full_ly (self): s = self.ly () if s: return compose_ly (s, self.options) return '' - + + # todo: use md5? def get_hash (self): if not self.hash: self.hash = abs (hash (self.full_ly ())) @@ -462,55 +573,98 @@ class Lilypond_snippet (Snippet): def write_ly (self): outf = open (self.basename () + '.ly', 'w') outf.write (self.full_ly ()) + + open (self.basename() + '.txt', 'w').write("image of music") + def is_outdated (self): base = self.basename () - if os.path.exists (base + '.ly') \ - and os.path.exists (base + '.tex') \ - and (use_hash_p \ - or self.ly () == open (base + '.ly').read ()): + + tex_file = '%s.tex' % base + ly_file = '%s.ly' % base + ok = os.path.exists (ly_file) and os.path.exists (tex_file)\ + and os.stat (tex_file)[stat.ST_SIZE] \ + and open (tex_file).readlines ()[-1][1:-1] \ + == 'lilypondend' + + if format == HTML or format == TEXINFO: + ok = ok and (os.path.exists (base + '.png') + or glob.glob (base + '-page*.png')) + + if ok and (use_hash_p or self.ly () == open (ly_file).read ()): # TODO: something smart with target formats # (ps, png) and m/ctimes return None return self + def filter_text (self): + code = self.substring ('code') + s = run_filter (code) + d = {'code' : s, + 'options': self.match.group ('options') + } + # TODO + return output[self.format][FILTER] % d + def replacement_text (self): func = Lilypond_snippet.__dict__ ['output_' + self.format] return func (self) - def output_html (self): + def get_images (self): base = self.basename () - str = '' - if format == HTML: - str = self.output_print_filename (HTML) - if VERBATIM in self.options: - verb = verbatim_html (self.substring ('code')) - str += write (output[HTML][VERBATIM] % vars ()) - # URGUGHUGHUGUGHU single = '%(base)s.png' % vars () multiple = '%(base)s-page1.png' % vars () - pictures = (single,) + images = (single,) if os.path.exists (multiple) \ and (not os.path.exists (single)\ or (os.stat (multiple)[stat.ST_MTIME] \ > os.stat (single)[stat.ST_MTIME])): - pictures = glob.glob ('%(base)s-page*.png' % vars ()) + images = glob.glob ('%(base)s-page*.png' % vars ()) + return images + def output_html (self): + str = '' + base = self.basename () + if format == HTML: + str += self.output_print_filename (HTML) + if VERBATIM in self.options: + verb = verbatim_html (self.substring ('code')) + str += write (output[HTML][VERBATIM] % vars ()) + if QUOTE in self.options: + str = output[HTML][QUOTE] % vars () + str += output[HTML][BEFORE] % vars () - for picture in pictures: + for image in self.get_images (): + base, ext = os.path.splitext (image) str += output[HTML][OUTPUT] % vars () str += output[HTML][AFTER] % vars () return str + + def output_info (self): + str = self.output_print_filename (HTML) + str = output[TEXINFO][BEFORE] % vars () + for image in self.get_images (): + base, ext = os.path.splitext (image) + # URG, makeinfo implicitely prepends dot to ext + # specifying no extension is most robust + ext = '' + str += output[TEXINFO][OUTPUT] % vars () + str += output[TEXINFO][AFTER] % vars () + return str + def output_latex (self): str = '' base = self.basename () if format == LATEX: - str = self.output_print_filename (LATEX) + str += self.output_print_filename (LATEX) if VERBATIM in self.options: verb = self.substring ('code') str += (output[LATEX][VERBATIM] % vars ()) + if QUOTE in self.options: + str = output[LATEX][QUOTE] % vars () + str += (output[LATEX][BEFORE] + (output[LATEX][OUTPUT] % vars ()) + output[LATEX][AFTER]) @@ -523,33 +677,46 @@ class Lilypond_snippet (Snippet): filename = self.substring ('filename') str = output[format][PRINTFILENAME] % vars () return str - + def output_texinfo (self): - ## Ugh, this breaks texidoc. - ## str = self.output_print_filename (TEXINFO) str = '' + # 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') base = self.basename () - if 'texidoc' in self.options : + if TEXIDOC in self.options: texidoc = base + '.texidoc' if os.path.exists (texidoc): - str += '@include %s\n' % texidoc + str += '@include %(texidoc)s\n\n' % vars () - if VERBATIM in self.options: + if VERBATIM in self.options: verb = verbatim_texinfo (self.substring ('code')) str += (output[TEXINFO][VERBATIM] % vars ()) + str += ('@ifinfo\n' + self.output_info () + '\n@end ifinfo\n') str += ('@tex\n' + self.output_latex () + '\n@end tex\n') str += ('@html\n' + self.output_html () + '\n@end html\n') - # need par after picture + + if QUOTE in self.options: + str = output[TEXINFO][QUOTE] % vars () + + # need par after image str += '\n' return str + +class Lilypond_file_snippet (Lilypond_snippet): + def ly (self): + name = self.substring ('filename') + return '\\renameinput \"%s\"\n%s' % (name, open (find_file (name)).read ()) snippet_type_to_class = { - 'lilypond_file' : Lilypond_snippet, + 'lilypond_file' : Lilypond_file_snippet, 'lilypond_block' : Lilypond_snippet, 'lilypond' : Lilypond_snippet, - 'include' : Include_snippet + 'include' : Include_snippet, } def find_toplevel_snippets (s, types): @@ -559,7 +726,10 @@ def find_toplevel_snippets (s, types): snippets = [] index = 0 - found = dict (map (lambda x: (x, None), types)) + ## found = dict (map (lambda x: (x, None), types)) + ## urg python2.1 + found = {} + map (lambda x, f=found: f.setdefault (x, None), types) # We want to search for multiple regexes, without searching # the string multiple times for one regex. @@ -577,7 +747,7 @@ def find_toplevel_snippets (s, types): m = res[type].search (s[index:endex]) if not m: continue - + cl = Snippet if snippet_type_to_class.has_key (type): cl = snippet_type_to_class[type] @@ -588,6 +758,17 @@ def find_toplevel_snippets (s, types): if found[type] \ and (not first or found[type][0] < found[first][0]): first = type + + # FIXME. + + # Limiting the search space is a cute + # idea, but this *requires* to search + # for possible containing blocks + # first, at least long as we do not + # search for the start of blocks, but + # always/directly for the entire + # @block ... @end block. + endex = found[first][0] if not first: @@ -597,6 +778,7 @@ def find_toplevel_snippets (s, types): (start , snip) = found[first] snippets.append (Substring (s, index, start)) snippets.append (snip) + found[first] = None index = start + len (snip.match.group (0)) return snippets @@ -634,16 +816,29 @@ def filter_pipe (input, cmd): def run_filter (s): return filter_pipe (s, filter_cmd) +def is_derived_class (cl, baseclass): + if cl == baseclass: + return 1 + for b in cl.__bases__: + if is_derived_class (b, baseclass): + return 1 + return 0 + + def process_snippets (cmd, snippets): names = filter (lambda x: x, map (Lilypond_snippet.basename, snippets)) if names: - ly.system (string.join ([cmd] + names)) + ly.system (string.join ([cmd] + names), progress_p = 1) if format == HTML or format == TEXINFO: for i in names: - if os.path.exists (i + '.tex'): + if not os.path.exists (i + '.eps') and os.path.exists (i + '.tex'): to_eps (i) ly.make_ps_images (i + '.eps', resolution=110) + +# elif os.path.exists (i + '.ps'): +# ly.make_ps_images (i + '.ps', resolution=110) + LATEX_DOCUMENT = r''' %(preamble)s @@ -679,7 +874,6 @@ def get_latex_textwidth (source): return textwidth - ext2format = { '.html' : HTML, '.itely' : TEXINFO, @@ -697,7 +891,6 @@ format2ext = { TEXINFO: '.texi', LATEX: '.tex', } - def do_file (input_filename): #ugh @@ -711,66 +904,92 @@ def do_file (input_filename): ly.error (_ ("cannot determine format for: %s" \ % input_filename)) - ly.progress (_ ("Reading %s...") % input_filename) if not input_filename or input_filename == '-': in_handle = sys.stdin + input_fullname = '' + else: + if os.path.exists (input_filename): + input_fullname = input_filename + elif format == LATEX: + # urg python interface to libkpathsea? + input_fullname = ly.read_pipe ('kpsewhich ' + + input_filename)[:-1] + else: + input_fullname = find_file (input_filename) + in_handle = open (input_fullname) + + if input_filename == '-': + input_base = 'stdin' else: - in_handle = open (input_filename) + input_base = os.path.basename \ + (os.path.splitext (input_filename)[0]) + # only default to stdout when filtering + if output_name == '-' or (not output_name and filter_cmd): + output_filename = '-' + output_file = sys.stdout + else: + if not output_name: + output_filename = input_base + format2ext[format] + else: + if not os.path.isdir (output_name): + os.mkdir (output_name, 0777) + output_filename = (output_name + + '/' + input_base + + format2ext[format]) + + + if (os.path.exists (input_filename) and + os.path.exists (output_filename) and + os.path.samefile (output_filename, input_fullname)): + ly.error (_("Output would overwrite input file; use --output.")) + sys.exit (2) + + output_file = open (output_filename, 'w') + if output_name: + os.chdir (output_name) + + ly.progress (_ ("Reading %s...") % input_fullname) + source = in_handle.read () ly.progress ('\n') - ly.progress (_ ("Dissecting...")) + # FIXME: containing blocks must be first, see find_toplevel_snippets snippet_types = ( + 'multiline_comment', + 'verbatim', 'lilypond_block', # 'verb', - 'verbatim', 'singleline_comment', - 'multiline_comment', 'lilypond_file', 'include', 'lilypond', ) - - output_file = None - if output_name == '-' or not output_name: - output_file = sys.stdout - output_filename = '-' - else: - if not os.path.isdir (output_name): - os.mkdir (output_name, 0777) - if input_filename == '-': - input_base = 'stdin' - else: - input_base = os.path.splitext (input_filename)[0] - input_base = os.path.basename (input_base) - - output_filename = output_name + '/' + input_base \ - + format2ext[format] - output_file = open (output_filename, 'w') - os.chdir (output_name) - - - source = in_handle.read () + ly.progress (_ ("Dissecting...")) chunks = find_toplevel_snippets (source, snippet_types) ly.progress ('\n') global default_ly_options textwidth = 0 - if LINEWIDTH not in default_ly_options.keys (): + if not default_ly_options.has_key (LINEWIDTH): if format == LATEX: textwidth = get_latex_textwidth (source) default_ly_options[LINEWIDTH] = '''%.0f\\pt''' \ % textwidth elif format == TEXINFO: - for (k,v) in texi_linewidths.items (): - s = chunks[0].replacement_text() - if re.search (k, s): + for (k, v) in texinfo_linewidths.items (): + # FIXME: @paper is usually not in chunk #0: + # \input texinfo @c -*-texinfo-*- + # bluntly search first K of source + # s = chunks[0].replacement_text () + if re.search (k, source[:1024]): default_ly_options[LINEWIDTH] = v break if filter_cmd: - pass # todo + output_file.writelines ([c.filter_text () for c in chunks]) + + elif process_cmd: - outdated = filter (lambda x: x.__class__ == Lilypond_snippet \ + outdated = filter (lambda x: is_derived_class (x.__class__, Lilypond_snippet) \ and x.is_outdated (), chunks) ly.progress (_ ("Writing snippets...")) map (Lilypond_snippet.write_ly, outdated) @@ -796,7 +1015,7 @@ def do_file (input_filename): do_file (name) map (process_include, - filter (lambda x: x.__class__ == Include_snippet, chunks)) + filter (lambda x: is_derived_class (x.__class__, Include_snippet), chunks)) def do_options (): global format, output_name @@ -852,6 +1071,9 @@ def do_options (): def main (): files = do_options () global process_cmd + if process_cmd == '': + process_cmd = lilypond_binary + " -f tex " + if process_cmd: process_cmd += string.join ([(' -I %s' % p) for p in include_path])