X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=7b79c9e2046e1af8bd411f3d66dac2588f4a8130;hb=bc4806967a924f0a705f1418293f3948fcf938af;hp=495577ead10237be92dc05c5ec28c89e631d8745;hpb=c93997ee6226dae036e411b39e5af873b8726293;p=lilypond.git diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 495577ead1..7b79c9e204 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -13,8 +13,11 @@ classic lilypond-book: lilypond-book --process="lilypond" BOOK.tely TODO: + + * this script is too complex. Modularize. + * ly-options: intertext? - * --linewidth? + * --line-width? * eps in latex / eps by lilypond -b ps? * check latex parameters, twocolumn, multicolumn? * use --png --ps --pdf for making images? @@ -29,45 +32,62 @@ import __main__ import glob import stat import string +import tempfile +import commands +import optparse +import os +import sys +import re # Users of python modules should include this snippet # and customize variables below. # We'll suffer this path initialization 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 variables -# (PYTHONPATH) in `etc/profile'). +# our python packages in /lib/pythonX.Y # If set, LILYPONDPREFIX must take prevalence. # if datadir is not set, we're doing a build and LILYPONDPREFIX. -import getopt, os, sys + +################ +# RELOCATION +################ + datadir = '@local_lilypond_datadir@' if not os.path.isdir (datadir): datadir = '@lilypond_datadir@' + +sys.path.insert (0, os.path.join (datadir, 'python')) + if os.environ.has_key ('LILYPONDPREFIX'): datadir = os.environ['LILYPONDPREFIX'] while datadir[-1] == os.sep: datadir= datadir[:-1] - + + datadir = os.path.join (datadir, "share/lilypond/current/") sys.path.insert (0, os.path.join (datadir, 'python')) -# Customize these. -#if __name__ == '__main__': +# dynamic relocation, for GUB binaries. +bindir = os.path.split (sys.argv[0])[0] +for p in ['share', 'lib']: + datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p) + sys.path.insert (0, os.path.join (datadir)) + import lilylib as ly +import fontextract global _;_=ly._ -global re;re = ly.re + # Lilylib globals. program_version = '@TOPLEVEL_VERSION@' -program_name = sys.argv[0] -verbose_p = 0 -pseudo_filter_p = 0 +program_name = os.path.basename (sys.argv[0]) + original_dir = os.getcwd () backend = 'ps' help_summary = _ ( '''Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document. + Example usage: lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK @@ -78,42 +98,58 @@ Example usage: copyright = ('Jan Nieuwenhuizen ', 'Han-Wen Nienhuys ') -option_definitions = [ - (_ ("EXT"), 'f', 'format', - _ ('''use output format EXT (texi [default], texi-html, - latex, html)''')), - (_ ("FILTER"), 'F', 'filter', - _ ("pipe snippets through FILTER [convert-ly -n -]")), - ('', 'h', 'help', - _ ("print this help")), - (_ ("DIR"), 'I', 'include', - _ ("add DIR to include path")), - (_ ("DIR"), 'o', 'output', - _ ("write output to DIR")), - (_ ("COMMAND"), 'P', 'process', - _ ("process ly_files using COMMAND FILE...")), - ('', 'V', 'verbose', - _ ("be verbose")), - ('', 'v', 'version', - _ ("print version information")), - ('', 'w', 'warranty', - _ ("show warranty and copyright")), -] +def get_option_parser (): + p = ly.get_option_parser (usage='lilypond-book [OPTIONS] FILE', + version="@TOPLEVEL_VERSION@", + description=help_summary) + + 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)'''), + action='store') + 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 ("-o", '--output', help=_('write output to DIR'), + metavar="DIR", + action='store', dest='output_name', default=None) + p.add_option ('-P', '--process', metavar=_("COMMAND"), + help = _ ("process ly_files using COMMAND FILE..."), + action='store', + dest='process_cmd', default='lilypond -b eps') + + 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", + dest="verbose") + + p.add_option ('-w', '--warranty', 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''') + + return p -include_path = [ly.abspath (os.getcwd ())] lilypond_binary = os.path.join ('@bindir@', 'lilypond') # Only use installed binary when we are installed too. if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary): lilypond_binary = 'lilypond' -use_hash_p = 1 -format = 0 -output_name = 0 -latex_filter_cmd = 'latex "\\nonstopmode \input /dev/stdin"' -filter_cmd = 0 -process_cmd = '' -default_ly_options = {} +global_options = None + + +default_ly_options = { 'alt': "[image of music]" } # # Is this pythonic? Personally, I find this rather #define-nesque. --hwn @@ -127,7 +163,7 @@ HTML = 'html' INDENT = 'indent' LATEX = 'latex' LAYOUT = 'layout' -LINEWIDTH = 'linewidth' +LINE_WIDTH = 'line-width' NOFRAGMENT = 'nofragment' NOINDENT = 'noindent' NOQUOTE = 'noquote' @@ -135,17 +171,20 @@ NOTES = 'body' NOTIME = 'notime' OUTPUT = 'output' OUTPUTIMAGE = 'outputimage' +PACKED = 'packed' PAPER = 'paper' PREAMBLE = 'preamble' PRINTFILENAME = 'printfilename' QUOTE = 'quote' -RAGGEDRIGHT = 'raggedright' +RAGGED_RIGHT = 'ragged-right' RELATIVE = 'relative' STAFFSIZE = 'staffsize' TEXIDOC = 'texidoc' TEXINFO = 'texinfo' VERBATIM = 'verbatim' FONTLOAD = 'fontload' +FILENAME = 'filename' +ALT = 'alt' # NOTIME has no opposite so it isn't part of this dictionary. @@ -155,6 +194,7 @@ no_options = { NOINDENT: INDENT, } + # Recognize special sequences in the input. # # (?Pregex) -- Assign result of REGEX to NAME. @@ -357,6 +397,9 @@ snippet_res = { }, } + + + format_res = { HTML: { 'intertext': r',?\s*intertext=\".*?\"', @@ -383,7 +426,9 @@ simple_options = [ PRINTFILENAME, TEXIDOC, VERBATIM, - FONTLOAD + FONTLOAD, + FILENAME, + ALT ] ly_options = { @@ -396,16 +441,23 @@ ly_options = { PAPER: { INDENT: r'''indent = %(indent)s''', - LINEWIDTH: r'''linewidth = %(linewidth)s''', + LINE_WIDTH: r'''line-width = %(line-width)s''', + + QUOTE: r'''line-width = %(line-width)s - 2.0 * %(exampleindent)s''', - QUOTE: r'''linewidth = %(linewidth)s - 2.0 * %(exampleindent)s''', + RAGGED_RIGHT: r'''ragged-right = ##t''', - RAGGEDRIGHT: r'''raggedright = ##t''', + PACKED: r'''packed = ##t''', }, ## LAYOUT: { - NOTIME: r'''\context { + NOTIME: r''' + \context { + \Score + timing = ##f + } + \context { \Staff \remove Time_signature_engraver }''', @@ -434,7 +486,7 @@ output = { OUTPUT: r''' [image of music]''', + border="0" src="%(image)s" alt="%(alt)s">''', PRINTFILENAME: '

%(filename)s

', @@ -450,34 +502,30 @@ output = { ## LATEX: { OUTPUT: r'''{%% -\parindent 0pt -\catcode`\@=12 -\ifx\preLilyPondExample \undefined - \relax -\else - \preLilyPondExample -\fi +\parindent 0pt%% +\catcode`\@=12%% +\ifx\preLilyPondExample \undefined%% + \relax%% +\else%% + \preLilyPondExample%% +\fi%% \def\lilypondbook{}%% -\input %(base)s-systems.tex -\ifx\postLilyPondExample \undefined - \relax -\else - \postLilyPondExample -\fi +\input %(base)s-systems.tex%% +\ifx\postLilyPondExample \undefined%% + \relax%% +\else%% + \postLilyPondExample%% +\fi%% }''', PRINTFILENAME: '''\\texttt{%(filename)s} ''', - QUOTE: r'''\begin{quotation} -%(str)s -\end{quotation} -''', + QUOTE: r'''\begin{quotation}%(str)s +\end{quotation}''', VERBATIM: r'''\noindent -\begin{verbatim} -%(verb)s\end{verbatim} -''', +\begin{verbatim}%(verb)s\end{verbatim}''', FILTER: r'''\begin{lilypond}[%(options)s] %(code)s @@ -498,13 +546,13 @@ output = { OUTPUTIMAGE: r'''@noindent @ifinfo -@image{%(base)s,,,[image of music],%(ext)s} +@image{%(base)s,,,%(alt)s,%(ext)s} @end ifinfo @html

[image of music] + border="0" src="%(image)s" alt="%(alt)s">

@end html @@ -528,17 +576,41 @@ output = { }, } -PREAMBLE_LY = r'''%%%% Generated by %(program_name)s +# +# Maintain line numbers. +# + +## TODO +if 0: + for f in [HTML, LATEX]: + for s in (QUOTE, VERBATIM): + output[f][s] = output[f][s].replace("\n"," ") + + +PREAMBLE_LY = '''%%%% Generated by %(program_name)s %%%% Options: [%(option_string)s] -#(set! toplevel-score-handler ly:parser-print-score) -#(set! toplevel-music-handler (lambda (p m t) - (ly:parser-print-score - p (ly:music-scorify m t p)))) +#(set! toplevel-score-handler print-score-with-defaults) +#(set! toplevel-music-handler + (lambda (p m) + (if (not (eq? (ly:music-property m \'void) #t)) + (print-score-with-defaults + p (scorify-music m p))))) +#(ly:set-option (quote no-point-and-click)) +#(define inside-lilypond-book #t) #(define version-seen? #t) %(preamble_string)s + + + + + +%% **************************************************************** +%% Start cut-&-pastable-section +%% **************************************************************** + \paper { #(define dump-extents #t) %(font_dump_setting)s @@ -553,19 +625,35 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s FRAGMENT_LY = r''' %(notes_string)s { + + +%% **************************************************************** %% ly snippet contents follows: +%% **************************************************************** %(code)s + + +%% **************************************************************** %% end ly snippet +%% **************************************************************** } ''' FULL_LY = ''' + + +%% **************************************************************** %% ly snippet: +%% **************************************************************** %(code)s + + +%% **************************************************************** %% end ly snippet +%% **************************************************************** ''' -texinfo_linewidths = { +texinfo_line_widths = { '@afourpaper': '160\\mm', '@afourwide': '6.5\\in', '@afourlatex': '150\\mm', @@ -575,7 +663,7 @@ texinfo_linewidths = { def classic_lilypond_book_compatibility (key, value): if key == 'singleline' and value == None: - return (RAGGEDRIGHT, None) + return (RAGGED_RIGHT, None) m = re.search ('relative\s*([-0-9])', key) if m: @@ -585,7 +673,7 @@ def classic_lilypond_book_compatibility (key, value): if m: return ('staffsize', m.group (1)) - if key == 'indent' or key == 'linewidth': + if key == 'indent' or key == 'line-width': m = re.match ('([-.0-9]+)(cm|in|mm|pt|staffspace)', value) if m: f = float (m.group (1)) @@ -593,179 +681,12 @@ def classic_lilypond_book_compatibility (key, value): return (None, None) -def compose_ly (code, options, type): - option_dict = {} - - for i in options: - if string.find (i, '=') > 0: - (key, value) = re.split ('\s*=\s*', i) - option_dict[key] = value - else: - if i in no_options.keys (): - if no_options[i] in option_dict.keys (): - del option_dict[no_options[i]] - else: - option_dict[i] = None - - has_linewidth = option_dict.has_key (LINEWIDTH) - no_linewidth_value = 0 - - # If LINEWIDTH is used without parameter, set it to default. - if has_linewidth and option_dict[LINEWIDTH] == None: - no_linewidth_value = 1 - del option_dict[LINEWIDTH] - - for i in default_ly_options.keys (): - if i not in option_dict.keys (): - option_dict[i] = default_ly_options[i] - - if not has_linewidth: - if type == 'lilypond' or FRAGMENT in option_dict.keys (): - option_dict[RAGGEDRIGHT] = None - - if type == 'lilypond': - if LINEWIDTH in option_dict.keys (): - del option_dict[LINEWIDTH] - else: - if RAGGEDRIGHT in option_dict.keys (): - if LINEWIDTH in option_dict.keys (): - del option_dict[LINEWIDTH] - - if QUOTE in option_dict.keys () or type == 'lilypond': - if LINEWIDTH in option_dict.keys (): - del option_dict[LINEWIDTH] - - if not INDENT in option_dict.keys (): - option_dict[INDENT] = '0\\mm' - - # The QUOTE pattern from ly_options only emits the `linewidth' - # keyword. - if has_linewidth and QUOTE in option_dict.keys (): - if no_linewidth_value: - del option_dict[LINEWIDTH] - else: - del option_dict[QUOTE] - - if FRAGMENT in option_dict.keys (): - body = FRAGMENT_LY - else: - body = FULL_LY - - # Defaults. - relative = 1 - override = {} - # The original concept of the `exampleindent' option is broken. - # It is not possible to get a sane value for @exampleindent at all - # without processing the document itself. Saying - # - # @exampleindent 0 - # @example - # ... - # @end example - # @exampleindent 5 - # - # causes ugly results with the DVI backend of texinfo since the - # default value for @exampleindent isn't 5em but 0.4in (or a smaller - # value). Executing the above code changes the environment - # indentation to an unknown value because we don't know the amount - # of 1em in advance since it is font-dependent. Modifying - # @exampleindent in the middle of a document is simply not - # supported within texinfo. - # - # As a consequence, the only function of @exampleindent is now to - # specify the amount of indentation for the `quote' option. - # - # To set @exampleindent locally to zero, we use the @format - # environment for non-quoted snippets. - override[EXAMPLEINDENT] = r'0.4\in' - override[LINEWIDTH] = texinfo_linewidths['@smallbook'] - override.update (default_ly_options) - - option_list = [] - for (key, value) in option_dict.items (): - if value == None: - option_list.append (key) - else: - option_list.append (key + '=' + value) - option_string = string.join (option_list, ',') - - compose_dict = {} - compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER] - for a in compose_types: - compose_dict[a] = [] - - for (key, value) in option_dict.items(): - (c_key, c_value) = \ - classic_lilypond_book_compatibility (key, value) - if c_key: - if c_value: - ly.warning \ - (_ ("deprecated ly-option used: %s=%s" \ - % (key, value))) - ly.warning \ - (_ ("compatibility mode translation: %s=%s" \ - % (c_key, c_value))) - else: - ly.warning \ - (_ ("deprecated ly-option used: %s" \ - % key)) - ly.warning \ - (_ ("compatibility mode translation: %s" \ - % c_key)) - - (key, value) = (c_key, c_value) - - if value: - override[key] = value - else: - if not override.has_key (key): - override[key] = None - - found = 0 - for type in compose_types: - if ly_options[type].has_key (key): - compose_dict[type].append (ly_options[type][key]) - found = 1 - break - - if not found and key not in simple_options: - ly.warning (_ ("ignoring unknown ly option: %s") % i) - - # 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 - - 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 - - font_dump_setting = '' - if FONTLOAD in options: - font_dump_setting = '#(define-public force-eps-font-include #t)\n' - - return (PREAMBLE_LY + body) % vars () - - def find_file (name): - for i in include_path: + for i in global_options.include_path: full = os.path.join (i, name) if os.path.exists (full): return full + ly.error (_ ("file not found: %s") % name + '\n') ly.exit (1) return '' @@ -781,7 +702,37 @@ def verbatim_texinfo (s): re.sub ('@', '@@', s))) def split_options (option_string): - return re.split (format_res[format]['option_sep'], 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 [] + +def set_default_options (source): + global default_ly_options + if not default_ly_options.has_key (LINE_WIDTH): + if global_options.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 (): + # FIXME: @layout is usually not in + # chunk #0: + # + # \input texinfo @c -*-texinfo-*- + # + # Bluntly search first K items of + # source. + # s = chunks[0].replacement_text () + if re.search (k, source[:1024]): + default_ly_options[LINE_WIDTH] = v + break class Chunk: def replacement_text (self): @@ -796,22 +747,34 @@ class Chunk: def png_is_outdated (self): return 0 + def is_plain (self): + return False + class Substring (Chunk): - def __init__ (self, source, start, end): + def __init__ (self, source, start, end, line_number): self.source = source self.start = start self.end = end + self.line_number = line_number + self.override_text = None + + def is_plain (self): + return True def replacement_text (self): - return self.source[self.start:self.end] + if self.override_text: + return self.override_text + else: + return self.source[self.start:self.end] class Snippet (Chunk): - def __init__ (self, type, match, format): + def __init__ (self, type, match, format, line_number): self.type = type self.match = match self.hash = 0 - self.options = [] + self.option_dict = {} self.format = format + self.line_number = line_number def replacement_text (self): return self.match.group ('match') @@ -825,7 +788,7 @@ class Snippet (Chunk): class Include_snippet (Snippet): def processed_filename (self): f = self.substring ('filename') - return os.path.splitext (f)[0] + format2ext[format] + return os.path.splitext (f)[0] + format2ext[global_options.format] def replacement_text (self): s = self.match.group ('match') @@ -834,11 +797,10 @@ class Include_snippet (Snippet): return re.sub (f, self.processed_filename (), s) class Lilypond_snippet (Snippet): - def __init__ (self, type, match, format): - Snippet.__init__ (self, type, match, format) + def __init__ (self, type, match, format, line_number): + Snippet.__init__ (self, type, match, format, line_number) os = match.group ('options') - if os: - self.options = split_options (os) + self.do_options (os, self.type) def ly (self): return self.substring ('code') @@ -846,9 +808,179 @@ class Lilypond_snippet (Snippet): def full_ly (self): s = self.ly () if s: - return compose_ly (s, self.options, self.type) + return self.compose_ly (s) return '' + def do_options (self, option_string, type): + self.option_dict = {} + + options = split_options (option_string) + + for i in options: + if string.find (i, '=') > 0: + (key, value) = re.split ('\s*=\s*', i) + 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]] + else: + self.option_dict[i] = None + + has_line_width = self.option_dict.has_key (LINE_WIDTH) + no_line_width_value = 0 + + # If LINE_WIDTH is used without parameter, set it to default. + if has_line_width and self.option_dict[LINE_WIDTH] == None: + 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] + + if not has_line_width: + if type == 'lilypond' or FRAGMENT in self.option_dict.keys (): + self.option_dict[RAGGED_RIGHT] = None + + if type == 'lilypond': + if LINE_WIDTH in self.option_dict.keys (): + del self.option_dict[LINE_WIDTH] + else: + if RAGGED_RIGHT in self.option_dict.keys (): + if LINE_WIDTH in self.option_dict.keys (): + del self.option_dict[LINE_WIDTH] + + if QUOTE in self.option_dict.keys () or type == 'lilypond': + if LINE_WIDTH in self.option_dict.keys (): + del self.option_dict[LINE_WIDTH] + + if not INDENT in self.option_dict.keys (): + 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 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 (): + body = FRAGMENT_LY + else: + body = FULL_LY + + # Defaults. + relative = 1 + override = {} + # The original concept of the `exampleindent' option is broken. + # It is not possible to get a sane value for @exampleindent at all + # without processing the document itself. Saying + # + # @exampleindent 0 + # @example + # ... + # @end example + # @exampleindent 5 + # + # causes ugly results with the DVI backend of texinfo since the + # default value for @exampleindent isn't 5em but 0.4in (or a smaller + # value). Executing the above code changes the environment + # indentation to an unknown value because we don't know the amount + # of 1em in advance since it is font-dependent. Modifying + # @exampleindent in the middle of a document is simply not + # supported within texinfo. + # + # As a consequence, the only function of @exampleindent is now to + # specify the amount of indentation for the `quote' option. + # + # To set @exampleindent locally to zero, we use the @format + # environment for non-quoted snippets. + override[EXAMPLEINDENT] = r'0.4\in' + override[LINE_WIDTH] = texinfo_line_widths['@smallbook'] + override.update (default_ly_options) + + option_list = [] + for (key, value) in self.option_dict.items (): + if value == None: + option_list.append (key) + else: + option_list.append (key + '=' + value) + option_string = string.join (option_list, ',') + + compose_dict = {} + compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER] + for a in compose_types: + compose_dict[a] = [] + + for (key, value) in self.option_dict.items (): + (c_key, c_value) = \ + classic_lilypond_book_compatibility (key, value) + if c_key: + if c_value: + ly.warning \ + (_ ("deprecated ly-option used: %s=%s" \ + % (key, value))) + ly.warning \ + (_ ("compatibility mode translation: %s=%s" \ + % (c_key, c_value))) + else: + ly.warning \ + (_ ("deprecated ly-option used: %s" \ + % key)) + ly.warning \ + (_ ("compatibility mode translation: %s" \ + % c_key)) + + (key, value) = (c_key, c_value) + + if value: + override[key] = value + else: + if not override.has_key (key): + override[key] = None + + found = 0 + for type in compose_types: + if ly_options[type].has_key (key): + compose_dict[type].append (ly_options[type][key]) + found = 1 + break + + if not found and key not in simple_options: + ly.warning (_ ("ignoring unknown ly option: %s") % key) + + # 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 + + 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 + + font_dump_setting = '' + if FONTLOAD in self.option_dict: + font_dump_setting = '#(define-public force-eps-font-include #t)\n' + + return (PREAMBLE_LY + body) % vars () + # TODO: Use md5? def get_hash (self): if not self.hash: @@ -856,7 +988,9 @@ class Lilypond_snippet (Snippet): return self.hash def basename (self): - if use_hash_p: + if FILENAME in self.option_dict: + return self.option_dict[FILENAME] + if global_options.use_hash: return 'lily-%d' % self.get_hash () raise 'to be done' @@ -877,8 +1011,9 @@ class Lilypond_snippet (Snippet): and os.path.exists (system_file)\ and os.stat (system_file)[stat.ST_SIZE] \ and re.match ('% eof', open (system_file).readlines ()[-1]) - if ok and (use_hash_p \ - or self.ly () == open (ly_file).read ()): + if ok and (not global_options.use_hash or FILENAME in self.option_dict): + ok = (self.full_ly () == open (ly_file).read ()) + if ok: # TODO: Do something smart with target formats # (ps, png) and m/ctimes. return None @@ -887,10 +1022,21 @@ class Lilypond_snippet (Snippet): def png_is_outdated (self): base = self.basename () ok = self.ly_is_outdated () - if format == HTML or format == TEXINFO: - ok = ok and (os.path.exists (base + '.png') - or glob.glob (base + '-page*.png')) + if global_options.format in (HTML, TEXINFO): + ok = ok and os.path.exists (base + '.eps') + + page_count = 0 + if ok: + page_count = ly.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 + def texstr_is_outdated (self): if backend == 'ps': return 0 @@ -924,23 +1070,26 @@ class Lilypond_snippet (Snippet): and (not os.path.exists (single) \ or (os.stat (multiple)[stat.ST_MTIME] \ > os.stat (single)[stat.ST_MTIME])): - images = glob.glob ('%(base)s-page*.png' % vars ()) + count = ly.ps_page_count ('%(base)s.eps' % vars ()) + images = ['%s-page%d.png' % (base, a) for a in range (1, count+1)] + images = tuple (images) return images def output_html (self): str = '' base = self.basename () - if format == HTML: + if global_options.format == HTML: str += self.output_print_filename (HTML) - if VERBATIM in self.options: + if VERBATIM in self.option_dict: verb = verbatim_html (self.substring ('code')) str += write (output[HTML][VERBATIM] % vars ()) - if QUOTE in self.options: + if QUOTE in self.option_dict: str = output[HTML][QUOTE] % vars () str += output[HTML][BEFORE] % vars () for image in self.get_images (): (base, ext) = os.path.splitext (image) + alt = self.option_dict[ALT] str += output[HTML][OUTPUT] % vars () str += output[HTML][AFTER] % vars () return str @@ -953,32 +1102,39 @@ class Lilypond_snippet (Snippet): # URG, makeinfo implicitly prepends dot to extension. # Specifying no extension is most robust. ext = '' + alt = self.option_dict[ALT] str += output[TEXINFO][OUTPUTIMAGE] % vars () base = self.basename () - str += output[format][OUTPUT] % vars () + str += output[global_options.format][OUTPUT] % vars () return str def output_latex (self): str = '' base = self.basename () - if format == LATEX: + if global_options.format == LATEX: str += self.output_print_filename (LATEX) - if VERBATIM in self.options: + if VERBATIM in self.option_dict: verb = self.substring ('code') str += (output[LATEX][VERBATIM] % vars ()) - if QUOTE in self.options: - str = output[LATEX][QUOTE] % vars () - + str += (output[LATEX][OUTPUT] % vars ()) + + ## todo: maintain breaks + if 0: + breaks = self.ly ().count ("\n") + str += "".ljust (breaks, "\n").replace ("\n","%\n") + + if QUOTE in self.option_dict: + str = output[LATEX][QUOTE] % vars () return str def output_print_filename (self, format): str = '' - if PRINTFILENAME in self.options: + if PRINTFILENAME in self.option_dict: base = self.basename () filename = self.substring ('filename') - str = output[format][PRINTFILENAME] % vars () + str = output[global_options.format][PRINTFILENAME] % vars () return str @@ -992,15 +1148,15 @@ class Lilypond_snippet (Snippet): + self.output_print_filename (LATEX) + '\n@end tex\n') base = self.basename () - if TEXIDOC in self.options: + if TEXIDOC in self.option_dict: texidoc = base + '.texidoc' if os.path.exists (texidoc): str += '@include %(texidoc)s\n\n' % vars () - if VERBATIM in self.options: + if VERBATIM in self.option_dict: verb = verbatim_texinfo (self.substring ('code')) str += (output[TEXINFO][VERBATIM] % vars ()) - if not QUOTE in self.options: + if not QUOTE in self.option_dict: str = output[TEXINFO][NOQUOTE] % vars () str += self.output_info () @@ -1009,7 +1165,7 @@ class Lilypond_snippet (Snippet): # str += ('@tex\n' + self.output_latex () + '\n@end tex\n') # str += ('@html\n' + self.output_html () + '\n@end html\n') - if QUOTE in self.options: + if QUOTE in self.option_dict: str = output[TEXINFO][QUOTE] % vars () # need par after image @@ -1020,7 +1176,7 @@ class Lilypond_snippet (Snippet): class Lilypond_file_snippet (Lilypond_snippet): def ly (self): name = self.substring ('filename') - return '\\renameinput \"%s\"\n%s' \ + return '\\sourcefilename \"%s\"\n%s' \ % (name, open (find_file (name)).read ()) snippet_type_to_class = { @@ -1030,10 +1186,26 @@ snippet_type_to_class = { 'include': Include_snippet, } +def find_linestarts (s): + nls = [0] + start = 0 + end = len (s) + while 1: + i = s.find ('\n', start) + if i < 0: + break + + i = i + 1 + nls.append (i) + start = i + + nls.append (len (s)) + return nls + def find_toplevel_snippets (s, types): res = {} for i in types: - res[i] = ly.re.compile (snippet_res[format][i]) + res[i] = ly.re.compile (snippet_res[global_options.format][i]) snippets = [] index = 0 @@ -1044,6 +1216,8 @@ def find_toplevel_snippets (s, types): map (lambda x, f = found: f.setdefault (x, None), types) + line_starts = find_linestarts (s) + line_start_idx = 0 # We want to search for multiple regexes, without searching # the string multiple times for one regex. # Hence, we use earlier results to limit the string portion @@ -1057,6 +1231,7 @@ def find_toplevel_snippets (s, types): for type in types: if not found[type] or found[type][0] < index: found[type] = None + m = res[type].search (s[index:endex]) if not m: continue @@ -1064,8 +1239,16 @@ def find_toplevel_snippets (s, types): cl = Snippet if snippet_type_to_class.has_key (type): cl = snippet_type_to_class[type] - snip = cl (type, m, format) + + start = index + m.start ('match') + line_number = line_start_idx + while (line_starts[line_number] < start): + line_number += 1 + + line_number += 1 + snip = cl (type, m, global_options.format, line_number) + found[type] = (start, snip) if found[type] \ @@ -1086,11 +1269,14 @@ def find_toplevel_snippets (s, types): endex = found[first][0] if not first: - snippets.append (Substring (s, index, len (s))) + snippets.append (Substring (s, index, len (s), 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)) + snippets.append (Substring (s, index, start, line_start_idx + 1)) snippets.append (snip) found[first] = None index = start + len (snip.match.group ('match')) @@ -1098,7 +1284,7 @@ def find_toplevel_snippets (s, types): return snippets def filter_pipe (input, cmd): - if verbose_p: + if global_options.verbose: ly.progress (_ ("Opening filter `%s'") % cmd) (stdin, stdout, stderr) = os.popen3 (cmd) @@ -1122,13 +1308,13 @@ def filter_pipe (input, cmd): sys.stderr.write (stderr.read ()) ly.exit (status) - if verbose_p: + if global_options.verbose: ly.progress ('\n') return output def run_filter (s): - return filter_pipe (s, filter_cmd) + return filter_pipe (s, global_options.filter_cmd) def is_derived_class (cl, baseclass): if cl == baseclass: @@ -1158,16 +1344,17 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets): # UGH # the --process=CMD switch is a bad idea # it is too generic for lilypond-book. - if texstr_names and re.search ('^[0-9A-Za-z/]*lilypond', cmd): - - my_system (string.join ([cmd + ' --backend texstr ' ] + texstr_names)) + if texstr_names: + my_system (string.join ([cmd, '--backend texstr', + 'snippet-map.ly'] + texstr_names)) for l in texstr_names: my_system ('latex %s.texstr' % l) if ly_names: - my_system (string.join ([cmd] + ly_names)) + my_system (string.join ([cmd, 'snippet-map.ly'] + ly_names)) -LATEX_DOCUMENT = r''' +LATEX_INSPECTION_DOCUMENT = r''' +\nonstopmode %(preamble)s \begin{document} \typeout{textwidth=\the\textwidth} @@ -1180,8 +1367,16 @@ LATEX_DOCUMENT = r''' def get_latex_textwidth (source): m = re.search (r'''(?P\\begin\s*{document})''', source) preamble = source[:m.start (0)] - latex_document = LATEX_DOCUMENT % vars () - parameter_string = filter_pipe (latex_document, latex_filter_cmd) + latex_document = LATEX_INSPECTION_DOCUMENT % vars () + # Workaround problems with unusable $TMP on Cygwin: + tempfile.tempdir = '' + tmpfile = tempfile.mktemp('.tex') + logfile = os.path.splitext (tmpfile)[0] + '.log' + open (tmpfile,'w').write (latex_document) + ly.system ('latex %s' % tmpfile) + parameter_string = open (logfile).read() + os.unlink (tmpfile) + os.unlink (logfile) columns = 0 m = re.search ('columns=([0-9.]*)', parameter_string) @@ -1202,6 +1397,18 @@ def get_latex_textwidth (source): return textwidth +def modify_preamble (chunk): + str = chunk.replacement_text () + if (re.search (r"\\begin *{document}", str) + and not re.search ("{graphic[sx]", str)): + str = re.sub (r"\\begin{document}", + r"\\usepackage{graphics}" + '\n' + + r"\\begin{document}", + str) + chunk.override_text = str + + + ext2format = { '.html': HTML, '.itely': TEXINFO, @@ -1224,7 +1431,27 @@ format2ext = { class Compile_error: pass -def do_process_cmd (chunks): +def write_file_map (lys, name): + snippet_map = open ('snippet-map.ly', 'w') + snippet_map.write (""" +#(define version-seen? #t) +#(ly:add-file-name-alist '( +""") + for ly in lys: + snippet_map.write ('("%s.ly" . "%s:%d (%s.ly)")\n' + % (ly.basename (), + name, + ly.line_number, + ly.basename ())) + + snippet_map.write ('))\n') + +def do_process_cmd (chunks, input_name): + all_lys = filter (lambda x: is_derived_class (x.__class__, + Lilypond_snippet), + chunks) + + write_file_map (all_lys, input_name) ly_outdated = \ filter (lambda x: is_derived_class (x.__class__, Lilypond_snippet) @@ -1248,7 +1475,7 @@ def do_process_cmd (chunks): if ly_outdated: ly.progress (_ ("Processing...")) ly.progress ('\n') - process_snippets (process_cmd, ly_outdated, texstr_outdated, png_outdated) + process_snippets (global_options.process_cmd, ly_outdated, texstr_outdated, png_outdated) else: ly.progress (_ ("All snippets are up to date...")) ly.progress ('\n') @@ -1260,11 +1487,31 @@ def guess_format (input_filename): # FIXME format = ext2format[e] else: - ly.error (_ ("cannot determine format for: %s" \ + ly.error (_ ("can't determine format for: %s" \ % input_filename)) ly.exit (1) return format +def write_if_updated (file_name, lines): + try: + f = open (file_name) + oldstr = f.read () + new_str = string.join (lines, '') + if oldstr == new_str: + ly.progress (_ ("%s is up to date.") % file_name) + ly.progress ('\n') + return + except: + pass + + ly.progress (_ ("Writing `%s'...") % file_name) + open (file_name, 'w').writelines (lines) + ly.progress ('\n') + +def note_input_file (name, inputs=[]): + inputs.append (name) + return inputs + def do_file (input_filename): # Ugh. if not input_filename or input_filename == '-': @@ -1273,12 +1520,14 @@ def do_file (input_filename): else: if os.path.exists (input_filename): input_fullname = input_filename - elif format == LATEX: + elif global_options.format == LATEX and ly.search_exe_path ('kpsewhich'): # urg python interface to libkpathsea? input_fullname = ly.read_pipe ('kpsewhich ' + input_filename)[:-1] else: input_fullname = find_file (input_filename) + + note_input_file (input_fullname) in_handle = open (input_fullname) if input_filename == '-': @@ -1288,34 +1537,32 @@ def do_file (input_filename): (os.path.splitext (input_filename)[0]) # Only default to stdout when filtering. - if output_name == '-' or (not output_name and filter_cmd): + if global_options.output_name == '-' or (not global_options.output_name and global_options.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.")) - ly.exit (2) - - output_file = open (output_filename, 'w') - if output_name: - os.chdir (output_name) + # 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 os.path.samefile (output_filename, input_fullname): + ly.error ( + _ ("Output would overwrite input file; use --output.")) + ly.exit (2) + try: ly.progress (_ ("Reading %s...") % input_fullname) source = in_handle.read () ly.progress ('\n') + set_default_options (source) + + # FIXME: Containing blocks must be first, see # find_toplevel_snippets. snippet_types = ( @@ -1330,140 +1577,134 @@ def do_file (input_filename): ) ly.progress (_ ("Dissecting...")) chunks = find_toplevel_snippets (source, snippet_types) + + if global_options.format == LATEX: + for c in chunks: + if (c.is_plain () and + re.search (r"\\begin *{document}", c.replacement_text())): + modify_preamble (c) + break ly.progress ('\n') - global default_ly_options - textwidth = 0 - 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 texinfo_linewidths.items (): - # FIXME: @layout is usually not in - # chunk #0: - # - # \input texinfo @c -*-texinfo-*- - # - # Bluntly search first K items of - # source. - # s = chunks[0].replacement_text () - if re.search (k, source[:1024]): - default_ly_options[LINEWIDTH] = v - break - - if filter_cmd: - output_file.writelines ([c.filter_text () \ - for c in chunks]) - - elif process_cmd: - do_process_cmd (chunks) + if global_options.filter_cmd: + write_if_updated (output_filename, + [c.filter_text () for c in chunks]) + elif global_options.process_cmd: + do_process_cmd (chunks, input_fullname) ly.progress (_ ("Compiling %s...") % output_filename) - output_file.writelines ([s.replacement_text () \ - for s in chunks]) ly.progress ('\n') - + write_if_updated (output_filename, + [s.replacement_text () + for s in chunks]) + def process_include (snippet): os.chdir (original_dir) name = snippet.substring ('filename') ly.progress (_ ("Processing include: %s") % name) ly.progress ('\n') - do_file (name) + return do_file (name) + + include_chunks = map (process_include, + filter (lambda x: is_derived_class (x.__class__, + Include_snippet), + chunks)) + - map (process_include, - filter (lambda x: is_derived_class (x.__class__, - Include_snippet), - chunks)) + return chunks + reduce (lambda x,y: x + y, include_chunks, []) + except Compile_error: os.chdir (original_dir) ly.progress (_ ("Removing `%s'") % output_filename) ly.progress ('\n') - - os.unlink (output_filename) raise Compile_error def do_options (): - global format, output_name - global filter_cmd, process_cmd, verbose_p + opt_parser = get_option_parser() + (options, args) = opt_parser.parse_args () - (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) + if options.format in ('texi-html', 'texi'): + options.format = TEXINFO + options.use_hash = True + options.pseudo_filter = False - for opt in options: - o = opt[0] - a = opt[1] + options.include_path = map (os.path.abspath, options.include_path) - if 0: - pass - elif o == '--filter' or o == '-F': - filter_cmd = a - process_cmd = 0 - elif o == '--format' or o == '-f': - format = a - if a == 'texi-html' or a == 'texi': - format = TEXINFO - elif o == '--tex-backend ': - backend = 'tex' - elif o == '--help' or o == '-h': - ly.help () - sys.exit (0) - elif o == '--include' or o == '-I': - include_path.append (os.path.join (original_dir, - ly.abspath (a))) - elif o == '--output' or o == '-o': - output_name = a - elif o == '--outdir': - output_name = a - elif o == '--process' or o == '-P': - process_cmd = a - filter_cmd = 0 - elif o == '--version' or o == '-v': - ly.identify (sys.stdout) - sys.exit (0) - elif o == '--verbose' or o == '-V': - verbose_p = 1 - elif o == '--warranty' or o == '-w': - if 1 or status: - ly.warranty () - sys.exit (0) - return files + global global_options + global_options = options + return args def main (): files = do_options () - if not files: - ly.warning ("Need to have command line option") + if not files or len (files) > 1: + ly.help () ly.exit (2) file = files[0] - global process_cmd, format - format = guess_format (files[0]) + + basename = os.path.splitext (file)[0] + basename = os.path.split (basename)[1] + + if not global_options.format: + global_options.format = guess_format (files[0]) formats = 'ps' - if format == TEXINFO: - formats += ',png' - if process_cmd == '': - process_cmd = lilypond_binary + ' --formats=%s --backend eps ' % formats + if global_options.format in (TEXINFO, HTML): + formats += ',png' + if global_options.process_cmd == '': + global_options.process_cmd = lilypond_binary \ + + ' --formats=%s --backend eps ' % formats - if process_cmd: - process_cmd += string.join ([(' -I %s' % p) - for p in include_path]) + if global_options.process_cmd: + global_options.process_cmd += string.join ([(' -I %s' % commands.mkarg (p)) + for p in global_options.include_path]) ly.identify (sys.stderr) - ly.setup_environment () try: - do_file (file) + chunks = do_file (file) + if global_options.psfonts: + fontextract.verbose = global_options.verbose + snippet_chunks = filter (lambda x: is_derived_class (x.__class__, + Lilypond_snippet), + chunks) + + psfonts_file = basename + '.psfonts' + if not global_options.verbose: + ly.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: + ly.progress ('\n') + except Compile_error: ly.exit (1) + if global_options.format in (TEXINFO, LATEX): + if not global_options.psfonts: + ly.warning (_ ("option --psfonts not used")) + ly.warning (_ ("processing with dvips will have no fonts")) + + psfonts_file = os.path.join (global_options.output_name, basename + '.psfonts') + output = os.path.join (global_options.output_name, basename + '.dvi' ) + + ly.progress ('\n') + ly.progress (_ ("DVIPS usage:")) + ly.progress ('\n') + ly.progress (" dvips -h %(psfonts_file)s %(output)s" % vars ()) + ly.progress ('\n') + + inputs = note_input_file ('') + inputs.pop () + + base_file_name = os.path.splitext (os.path.basename (file))[0] + dep_file = os.path.join (global_options.output_name, base_file_name + '.dep') + final_output_file = os.path.join (global_options.output_name, + base_file_name + + '.%s' % global_options.format) + + os.chdir (original_dir) + open (dep_file, 'w').write ('%s: %s' % (final_output_file, ' '.join (inputs))) if __name__ == '__main__': main ()