]> git.donarmstrong.com Git - lilypond.git/blobdiff - scripts/lilypond-book.py
(Paper size): \paper is in
[lilypond.git] / scripts / lilypond-book.py
index 47db68f0b36f31bdb9e4caeb2ab69fc5bd877ce0..e3e62de2dabee0d492cf4094bcc15b025a778457 100644 (file)
 #!@PYTHON@
-# vim: set noexpandtab:
-# TODO:
-# * junk --outdir for --output 
-# * Figure out clean set of options.
-# * 
-# * EndLilyPondOutput is def'd as vfil. Causes large white gaps.
-# * texinfo: add support for @pagesize
-
-# todo: dimension handling (all the x2y) is clumsy. (tca: Thats
-#       because the values are taken directly from texinfo.tex,
-#       geometry.sty and article.cls. Give me a hint, and I'll
-#       fix it.)
 
-#
-# TODO: magnification support should also work for texinfo -> html: eg. add as option to dvips. 
-# 
-
-# This is was the idea for handling of comments:
-#      Multiline comments, @ignore .. @end ignore is scanned for
-#      in read_doc_file, and the chunks are marked as 'ignore', so
-#      lilypond-book will not touch them any more. The content of the
-#      chunks are written to the output file. Also 'include' and 'input'
-#      regex has to check if they are commented out.
-#
-#      Then it is scanned for 'lilypond', 'lilypond-file' and 'lilypond-block'.
-#      These three regex's has to check if they are on a commented line,
-#      % for latex, @c for texinfo.
-#
-#      Then lines that are commented out with % (latex) and @c (Texinfo)
-#      are put into chunks marked 'ignore'. This cannot be done before
-#      searching for the lilypond-blocks because % is also the comment character
-#      for lilypond.
-#
-#      The the rest of the rexeces are searched for. They don't have to test
-#      if they are on a commented out line.
+'''
+Example usage:
+
+test:
+     lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
+
+convert-ly on book:
+     lilypond-book --filter="convert-ly --no-version --from=1.6.11 -" BOOK
+
+classic lilypond-book:
+     lilypond-book --process="lilypond" BOOK.tely
 
+TODO:
 
+    *  this script is too complex. Modularize.
+    
+    *  ly-options: intertext?
+    *  --linewidth?
+    *  eps in latex / eps by lilypond -b ps?
+    *  check latex parameters, twocolumn, multicolumn?
+    *  use --png --ps --pdf for making images?
 
-import os
+    *  Converting from lilypond-book source, substitute:
+       @mbinclude foo.itely -> @include foo.itely
+       \mbinput -> \input
+
+'''
+
+import __main__
+import glob
 import stat
 import string
-import getopt
-import sys
-import __main__
 
-# Handle bug in Python 1.6-2.1
-#
-# there are recursion limits for some patterns in Python 1.6 til 2.1.
-# fix this by importing the 1.5.2 implementation pre instead. Fix by Mats.
+# 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 <prefix>/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
+datadir = '@local_lilypond_datadir@'
+if not os.path.isdir (datadir):
+       datadir = '@lilypond_datadir@'
+if os.environ.has_key ('LILYPONDPREFIX'):
+       datadir = os.environ['LILYPONDPREFIX']
+       while datadir[-1] == os.sep:
+               datadir= datadir[:-1]
 
-## We would like to do this for python 2.2 as well, unfortunately
-## python 2.2 has another bug, see Sf.net bugtracker
-##
-## https://sourceforge.net/tracker/?func=detail&aid=604803&group_id=5470&atid=105470
-## 
+sys.path.insert (0, os.path.join (datadir, 'python'))
 
-if float (sys.version[0:3]) <= 2.1:
-       try:
-               import pre
-               re = pre
-               del pre
-       except ImportError:
-               import re
-else:
-       import re
-
-# Attempt to fix problems with limited stack size set by Python!
-# Sets unlimited stack size. Note that the resource module only
-# is available on UNIX.
-try:
-       import resource
-       resource.setrlimit (resource.RLIMIT_STACK, (-1, -1))
-except:
-       pass
-
-errorport = sys.stderr
+# Customize these.
+#if __name__ == '__main__':
+
+import lilylib as ly
+import fontextract
+global _;_=ly._
+global re;re = ly.re
+
+# Lilylib globals.
+program_version = '@TOPLEVEL_VERSION@'
+program_name = os.path.basename (sys.argv[0])
 verbose_p = 0
+pseudo_filter_p = 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
+   lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" BOOK
+   lilypond-book --process='lilypond -I include' BOOK
+''')
 
-try:
-       import gettext
-       gettext.bindtextdomain ('lilypond', localedir)
-       gettext.textdomain ('lilypond')
-       _ = gettext.gettext
-except:
-       def _ (s):
-               return s
+copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
+            'Han-Wen Nienhuys <hanwen@cs.uu.nl>')
 
-def progress (s):
-       errorport.write (s + '\n')
+option_definitions = [
+       (_ ("FMT"), 'f', 'format',
+         _ ('''use output format FMT (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...")),
+       (_(''), '', 'psfonts',
+        _ ('''extract all PostScript fonts into INPUT.psfonts for LaTeX
+        must use this with dvips -h INPUT.psfonts''')),
+       ('', 'V', 'verbose',
+         _ ("be verbose")),
+       ('', 'v', 'version',
+         _ ("print version information")),
+       ('', 'w', 'warranty',
+         _ ("show warranty and copyright")),
+]
+
+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'
+
+psfonts_p = 0
+use_hash_p = 1
+format = 0
+output_name = ''
+latex_filter_cmd = 'latex "\\nonstopmode \input /dev/stdin"'
+filter_cmd = 0
+process_cmd = ''
+default_ly_options = { 'alt': "[image of music]" }
 
+#
+# Is this pythonic?  Personally, I find this rather #define-nesque. --hwn
+#
+AFTER = 'after'
+BEFORE = 'before'
+EXAMPLEINDENT = 'exampleindent'
+FILTER = 'filter'
+FRAGMENT = 'fragment'
+HTML = 'html'
+INDENT = 'indent'
+LATEX = 'latex'
+LAYOUT = 'layout'
+LINEWIDTH = 'linewidth'
+NOFRAGMENT = 'nofragment'
+NOINDENT = 'noindent'
+NOQUOTE = 'noquote'
+NOTES = 'body'
+NOTIME = 'notime'
+OUTPUT = 'output'
+OUTPUTIMAGE = 'outputimage'
+PACKED = 'packed'
+PAPER = 'paper'
+PREAMBLE = 'preamble'
+PRINTFILENAME = 'printfilename'
+QUOTE = 'quote'
+RAGGEDRIGHT = 'raggedright'
+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.
+# NOQUOTE is used internally only.
+no_options = {
+       NOFRAGMENT: FRAGMENT,
+       NOINDENT: INDENT,
+}
 
-program_version = '@TOPLEVEL_VERSION@'
-if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
-       program_version = '1.6.0'
 
-# if set, LILYPONDPREFIX must take prevalence
-# if datadir is not set, we're doing a build and LILYPONDPREFIX 
-datadir = '@local_lilypond_datadir@'
+# Recognize special sequences in the input.
+#
+#   (?P<name>regex) -- Assign result of REGEX to NAME.
+#   *? -- Match non-greedily.
+#   (?m) -- Multiline regex: Make ^ and $ match at each line.
+#   (?s) -- Make the dot match all characters including newline.
+#   (?x) -- Ignore whitespace in patterns.
+no_match = 'a\ba'
+snippet_res = {
+       ##
+       HTML: {
+               'include':
+                 no_match,
+
+               'lilypond':
+                 r'''(?mx)
+                   (?P<match>
+                   <lilypond
+                     (\s*(?P<options>.*?)\s*:)?\s*
+                     (?P<code>.*?)
+                   />)''',
+
+               'lilypond_block':
+                 r'''(?msx)
+                   (?P<match>
+                   <lilypond
+                     \s*(?P<options>.*?)\s*
+                   >
+                   (?P<code>.*?)
+                   </lilypond>)''',
+
+               'lilypond_file':
+                 r'''(?mx)
+                   (?P<match>
+                   <lilypondfile
+                     \s*(?P<options>.*?)\s*
+                   >
+                   \s*(?P<filename>.*?)\s*
+                   </lilypondfile>)''',
+
+               'multiline_comment':
+                 r'''(?smx)
+                   (?P<match>
+                   \s*(?!@c\s+)
+                   (?P<code><!--\s.*?!-->)
+                   \s)''',
+
+               'singleline_comment':
+                 no_match,
+
+               'verb':
+                 r'''(?x)
+                   (?P<match>
+                     (?P<code><pre>.*?</pre>))''',
+
+               'verbatim':
+                 r'''(?x)
+                   (?s)
+                   (?P<match>
+                     (?P<code><pre>\s.*?</pre>\s))''',
+       },
+
+       ##
+       LATEX: {
+               'include':
+                 r'''(?smx)
+                   ^[^%\n]*?
+                   (?P<match>
+                   \\input\s*{
+                     (?P<filename>\S+?)
+                   })''',
+
+               'lilypond':
+                 r'''(?smx)
+                   ^[^%\n]*?
+                   (?P<match>
+                   \\lilypond\s*(
+                   \[
+                     \s*(?P<options>.*?)\s*
+                   \])?\s*{
+                     (?P<code>.*?)
+                   })''',
+
+               'lilypond_block':
+                 r'''(?smx)
+                   ^[^%\n]*?
+                   (?P<match>
+                   \\begin\s*(
+                   \[
+                     \s*(?P<options>.*?)\s*
+                   \])?\s*{lilypond}
+                     (?P<code>.*?)
+                   ^[^%\n]*?
+                   \\end\s*{lilypond})''',
+
+               'lilypond_file':
+                 r'''(?smx)
+                   ^[^%\n]*?
+                   (?P<match>
+                   \\lilypondfile\s*(
+                   \[
+                     \s*(?P<options>.*?)\s*
+                   \])?\s*\{
+                     (?P<filename>\S+?)
+                   })''',
+
+               'multiline_comment':
+                 no_match,
+
+               'singleline_comment':
+                 r'''(?mx)
+                   ^.*?
+                   (?P<match>
+                     (?P<code>
+                     %.*$\n+))''',
+
+               'verb':
+                 r'''(?mx)
+                   ^[^%\n]*?
+                   (?P<match>
+                     (?P<code>
+                     \\verb(?P<del>.)
+                       .*?
+                     (?P=del)))''',
+
+               'verbatim':
+                 r'''(?msx)
+                   ^[^%\n]*?
+                   (?P<match>
+                     (?P<code>
+                     \\begin\s*{verbatim}
+                       .*?
+                     \\end\s*{verbatim}))''',
+       },
+
+       ##
+       TEXINFO: {
+               'include':
+                 r'''(?mx)
+                   ^(?P<match>
+                   @include\s+
+                     (?P<filename>\S+))''',
+
+               'lilypond':
+                 r'''(?smx)
+                   ^[^\n]*?(?!@c\s+)[^\n]*?
+                   (?P<match>
+                   @lilypond\s*(
+                   \[
+                     \s*(?P<options>.*?)\s*
+                   \])?\s*{
+                     (?P<code>.*?)
+                   })''',
+
+               'lilypond_block':
+                 r'''(?msx)
+                   ^(?P<match>
+                   @lilypond\s*(
+                   \[
+                     \s*(?P<options>.*?)\s*
+                   \])?\s+?
+                   ^(?P<code>.*?)
+                   ^@end\s+lilypond)\s''',
+
+               'lilypond_file':
+                 r'''(?mx)
+                   ^(?P<match>
+                   @lilypondfile\s*(
+                   \[
+                     \s*(?P<options>.*?)\s*
+                   \])?\s*{
+                     (?P<filename>\S+)
+                   })''',
+
+               'multiline_comment':
+                 r'''(?smx)
+                   ^(?P<match>
+                     (?P<code>
+                     @ignore\s
+                       .*?
+                     @end\s+ignore))\s''',
+
+               'singleline_comment':
+                 r'''(?mx)
+                   ^.*
+                   (?P<match>
+                     (?P<code>
+                     @c([ \t][^\n]*|)\n))''',
+
+       # Don't do this: It interferes with @code{@{}.
+       #       'verb': r'''(?P<code>@code{.*?})''',
+
+               'verbatim':
+                 r'''(?sx)
+                   (?P<match>
+                     (?P<code>
+                     @example
+                       \s.*?
+                     @end\s+example\s))''',
+       },
+}
 
-if os.environ.has_key ('LILYPONDPREFIX') :
-       datadir = os.environ['LILYPONDPREFIX']
-else:
-       datadir = '@local_lilypond_datadir@'
-
-while datadir[-1] == os.sep:
-       datadir= datadir[:-1]
-
-kpse = os.popen ('kpsexpand \$TEXMF').read()
-kpse = re.sub('[ \t\n]+$','', kpse)
-type1_paths = os.popen ('kpsewhich -expand-path=\$T1FONTS').read ()
-
-binary = 'lilypond'
-#binary = 'valgrind --suppressions=/home/hanwen/usr/src/guile-1.6.supp  --num-callers=10 /home/hanwen/usr/src/lilypond/lily/out/lilypond'
-environment = {
-       # TODO: * prevent multiple addition.
-       #       * clean TEXINPUTS, MFINPUTS, TFMFONTS,
-       #         as these take prevalence over $TEXMF
-       #         and thus may break tex run?
-       'TEXMF' : "{%s,%s}" % (datadir, kpse) ,
-       'GS_FONTPATH' : type1_paths,
-       'GS_LIB' : datadir + '/ps',
+format_res = {
+       HTML: {
+               'intertext': r',?\s*intertext=\".*?\"',
+               'option_sep': '\s*',
+       },
+
+       LATEX: {
+               'intertext': r',?\s*intertext=\".*?\"',
+               'option_sep': '\s*,\s*',
+       },
+
+       TEXINFO: {
+               'intertext': r',?\s*intertext=\".*?\"',
+               'option_sep': '\s*,\s*',
+       },
 }
 
-# tex needs lots of memory, more than it gets by default on Debian
-non_path_environment = {
-       'extra_mem_top' : '1000000',
-       'extra_mem_bottom' : '1000000',
-       'pool_size' : '250000',
+# Options without a pattern in ly_options.
+simple_options = [
+       EXAMPLEINDENT,
+       FRAGMENT,
+       NOFRAGMENT,
+       NOINDENT,
+       PRINTFILENAME,
+       TEXIDOC,
+       VERBATIM,
+       FONTLOAD,
+       FILENAME,
+       ALT
+]
+
+ly_options = {
+       ##
+       NOTES: {
+               RELATIVE: r'''\relative c%(relative_quotes)s''',
+       },
+
+       ##
+       PAPER: {
+               INDENT: r'''indent = %(indent)s''',
+
+               LINEWIDTH: r'''linewidth = %(linewidth)s''',
+
+               QUOTE: r'''linewidth = %(linewidth)s - 2.0 * %(exampleindent)s''',
+
+               RAGGEDRIGHT: r'''raggedright = ##t''',
+
+               PACKED: r'''packed = ##t''',
+       },
+
+       ##
+       LAYOUT: {
+               NOTIME: r'''
+  \context {
+    \Score
+    timing = ##f
+  }
+  \context {
+    \Staff
+    \remove Time_signature_engraver
+  }''',
+       },
+
+       ##
+       PREAMBLE: {
+               STAFFSIZE: r'''#(set-global-staff-size %(staffsize)s)''',
+       },
 }
 
-def setup_environment ():
-       # $TEXMF is special, previous value is already taken care of
-       if os.environ.has_key ('TEXMF'):
-               del os.environ['TEXMF']
-       for key in environment.keys ():
-               val = environment[key]
-               if os.environ.has_key (key):
-                       val = val + os.pathsep + os.environ[key]
-               os.environ[key] = val
-
-       for key in non_path_environment.keys ():
-               val = non_path_environment[key]
-               os.environ[key] = val
-
-include_path = [os.getcwd()]
-
-
-# g_ is for global (?)
-g_extra_opts = ''
-g_here_dir = os.getcwd ()
-g_dep_prefix = ''
-g_outdir = ''
-g_force_music_fontsize = 0
-g_read_lys = 0
-g_do_pictures = 1
-g_do_music = 1
-
-format = ''
-g_run_lilypond = 1
-no_match = 'a\ba'
+output = {
+       ##
+       HTML: {
+               FILTER: r'''<lilypond %(options)s>
+%(code)s
+</lilypond>
+''',
 
-default_music_fontsize = 16
-default_text_fontsize = 12
-paperguru = None
+               AFTER: r'''
+  </a>
+</p>''',
 
-class LatexPaper:
-       def __init__(self):
-               self.m_document_preamble = []
-               self.m_num_cols = 1
-               self.m_multicols = 1
-               
-       def find_latex_dims(self):
-               if g_outdir:
-                       fname = os.path.join(g_outdir, "lily-tmp.tex")
-               else:
-                       fname = "lily-tmp.tex"
-               try:
-                       f = open(fname, "w")
-               except IOError:
-                       error ("Error creating temporary file '%s'" % fname)
-
-               for s in self.m_document_preamble:
-                       f.write(s)
-               f.write(r"""
-\begin{document}
-\typeout{---}
-\typeout{\columnsep \the\columnsep}
-\typeout{\textwidth \the\textwidth}
-\typeout{---}
-\end{document}
-               """)
-               f.close()
-               re_dim = re.compile(r"\\(\w+)\s+(\d+\.\d+)")
-
-               cmd = "latex '\\nonstopmode \input %s'" % fname
-               if verbose_p:
-                       sys.stderr.write ("Invoking `%s' as pipe" % cmd)
-               try:
-                       status = quiet_system (cmd, "Latex for finding dimensions")
-               except:
-                       sys.stderr.write (_("Invoking LaTeX failed.") + '\n' )
-                       sys.stderr.write (_("This is the error log:\n") + '\n')
-
-                       lns = open ('lily-tmp.log').readlines()
-
-                       countdown = -3
-                       for ln in lns:
-                               sys.stderr.write (ln)
-                               if re.match('^!', ln):
-                                       countdown = 3
-
-                               if countdown == 0:
-                                       break
-                               
-                               if countdown > 0:
-                                       countdown = countdown -1
+               BEFORE: r'''<p>
+  <a href="%(base)s.ly">''',
 
-                       sys.stderr.write ("  ... (further messages elided)...\n")
-                       sys.exit (1)
-                       
-               lns = open ('lily-tmp.log').readlines()
-               for ln in lns:
-                       ln = string.strip(ln)
-                       m = re_dim.match(ln)
-                       if m:
-                               if m.groups()[0] in ('textwidth', 'columnsep'):
-                                       self.__dict__['m_%s' % m.groups()[0]] = float(m.groups()[1])
-                                       
-               try:
-                       os.remove (fname)
-                       os.remove (os.path.splitext(fname)[0]+".aux")
-                       os.remove (os.path.splitext(fname)[0]+".log")
-               except:
-                       pass
+               OUTPUT: r'''
+    <img align="center" valign="center"
+        border="0" src="%(image)s" alt="%(alt)s">''',
 
-               if not self.__dict__.has_key ('m_textwidth'):
-                       raise 'foo!'
-               
-       def get_linewidth(self):
-               if self.m_num_cols == 1:
-                       w = self.m_textwidth
-               else:
-                       w = (self.m_textwidth - self.m_columnsep)/2
-               if self.m_multicols > 1:
-                       return (w - self.m_columnsep*(self.m_multicols-1)) \
-                          / self.m_multicols
-               return w
-
-
-class HtmlPaper:
-       def __init__(self):
-               self.m_papersize = 'letterpaper'
-               self.m_fontsize = 12
-       def get_linewidth(self):
-               return html_linewidths[self.m_papersize][self.m_fontsize]
-
-class TexiPaper:
-       def __init__(self):
-               self.m_papersize = 'letterpaper'
-               self.m_fontsize = 12
-       def get_linewidth(self):
-               return texi_linewidths[self.m_papersize][self.m_fontsize]
-
-def mm2pt(x):
-       return x * 2.8452756
-def in2pt(x):
-       return x * 72.26999
-def em2pt(x, fontsize = 10):
-       return {10: 10.00002, 11: 10.8448, 12: 11.74988}[fontsize] * x
-def ex2pt(x, fontsize = 10):
-       return {10: 4.30554, 11: 4.7146, 12: 5.16667}[fontsize] * x
-
-def pt2pt(x):
-       return x
-
-dimension_conversion_dict ={
-       'mm': mm2pt,
-       'cm': lambda x: mm2pt(10*x),
-       'in': in2pt,
-       'em': em2pt,
-       'ex': ex2pt,
-       'pt': pt2pt
-       }
-
-# Convert numeric values, with or without specific dimension, to floats.
-# Keep other strings
-def conv_dimen_to_float(value):
-       if type(value) == type(""):
-               m = re.match ("([0-9.]+)(cm|in|pt|mm|em|ex)",value)
-               if m:
-                       unit = m.group (2)
-                       num = string.atof(m.group (1))
-                       conv =  dimension_conversion_dict[m.group(2)]
-                       
-                       value = conv(num)
-               
-               elif re.match ("^[0-9.]+$",value):
-                       value = float(value)
-
-       return value
-
-texi_linewidths = {
-       'afourpaper': {12: mm2pt(160)},
-       'afourwide': {12: in2pt(6.5)},
-       'afourlatex': {12: mm2pt(150)},
-       'smallbook': {12: in2pt(5)},
-       'letterpaper': {12: in2pt(6)}}
-
-html_linewidths = {
-       'afourpaper': {12: mm2pt(160)},
-       'afourwide': {12: in2pt(6.5)},
-       'afourlatex': {12: mm2pt(150)},
-       'smallbook': {12: in2pt(5)},
-       'letterpaper': {12: in2pt(6)}}
+               PRINTFILENAME: '<p><tt><a href="%(base)s.ly">%(filename)s</a></tt></p>',
 
-option_definitions = [
-       ('EXT', 'f', 'format', 'use output format EXT (texi [default], latex, html)'),
-       ('DIM',  '', 'default-music-fontsize', 'default fontsize for music.  DIM is assumed to be in points'),
-       ('DIM',  '', 'default-lilypond-fontsize', 'deprecated, use --default-music-fontsize'),
-       ('OPT', '', 'extra-options' , 'Pass OPT quoted to the lilypond command line'),
-       ('DIM', '', 'force-music-fontsize', 'force fontsize for all inline lilypond. DIM is assumed be to in points'),
-       ('DIM', '', 'force-lilypond-fontsize', 'deprecated, use --force-music-fontsize'),
-       ('', 'h', 'help', 'this help'),
-       ('DIR', 'I', 'include', 'include path'),
-       ('', 'M', 'dependencies', 'write dependencies'),
-       ('PREF', '',  'dep-prefix', 'prepend PREF before each -M dependency'),
-       ('', 'n', 'no-lily', 'don\'t run lilypond'),
-       ('', '', 'no-pictures', "don\'t generate pictures"),
-       ('', '', 'no-music', "strip all lilypond blocks from output"),  
-       ('', '', 'read-lys', "don't write ly files."),
-       ('FILE', 'o', 'outname', 'filename main output file'),
-       ('FILE', '', 'outdir', "where to place generated files"),
-       ('', 'V', 'verbose', 'verbose' ),
-       ('', 'v', 'version', 'print version information' ),
-       ]
-
-# format specific strings, ie. regex-es for input, and % strings for output
-output_dict= {
-       'html' : {'output-lilypond': '''<lilypond%s>
-%s
-</lilypond>''',
-               'output-filename' : r'''
-<!-- %s >
-<a href="%s">
-<pre>%s</pre></a>:''',   
-                 'output-lilypond-fragment': '''<lilypond%s>
-\context Staff\context Voice{ %s }
-</lilypond>''',
-                 'output-noinline': r'''
-<!-- generated: %(fn)s.png !-->
-''',
-                 ## maybe <hr> ?
-                 'pagebreak': None,
-                 'output-verbatim': r'''<pre>
-%s
-</pre>''',
-                 'output-small-verbatim': r'''<font size=-1><pre>
-%s
-</pre></font>''',
-
-                 ## Ugh we need to differentiate on origin:
-                 ## lilypond-block origin wants an extra <p>, but
-                 ## inline music doesn't.
-                 ## possibly other center options?
-                 'output-all': r'''
-<a href="%(fn)s.png">
-<img align="center" valign="center" border="0" src="%(fn)s.png" alt="[picture of music]"></a>
+               QUOTE: r'''<blockquote>
+%(str)s
+</blockquote>
 ''',
-                 },
-       'latex': {
-               'output-lilypond-fragment' : r'''\begin[eps,singleline,%s]{lilypond}
-  \context Staff <
-    \context Voice{
-      %s
-    }
-  >
-\end{lilypond}''',
-               'output-filename' : r'''
-\verb+%s+:
-%% %s
-%% %s
-''',
-               'output-lilypond': r'''\begin[%s]{lilypond}
-%s
-\end{lilypond}
+
+               VERBATIM: r'''<pre>
+%(verb)s</pre>''',
+       },
+
+       ##
+       LATEX: {
+               OUTPUT: r'''{%%
+\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
+}''',
+
+               PRINTFILENAME: '''\\texttt{%(filename)s}
+       ''',
+
+               QUOTE: r'''\begin{quotation}
+%(str)s
+\end{quotation}
 ''',
-               'output-verbatim': r'''\begin{verbatim}%s\end{verbatim}%%
+
+               VERBATIM: r'''\noindent
+\begin{verbatim}
+%(verb)s\end{verbatim}
 ''',
-               'output-small-verbatim': r'''{\small\begin{verbatim}%s\end{verbatim}}%%''',
-               'output-default-post': "\\def\postLilypondExample{}\n",
-               'output-default-pre': "\\def\preLilypondExample{}\n",
-               'usepackage-graphics': '\\usepackage{graphics}\n',
-               'output-eps': '\\noindent\\parbox{\\lilypondepswidth{%(fn)s.eps}}{\includegraphics{%(fn)s}}',
-               'output-noinline': r'''
-%% generated: %(fn)s.eps
+
+               FILTER: r'''\begin{lilypond}[%(options)s]
+%(code)s
+\end{lilypond}''',
+       },
+
+       ##
+       TEXINFO: {
+               FILTER: r'''@lilypond[%(options)s]
+%(code)s
+@lilypond''',
+
+               OUTPUT: r'''
+@iftex
+@include %(base)s-systems.texi
+@end iftex
 ''',
-               'output-tex': '{\\preLilypondExample \\input %(fn)s.tex \\postLilypondExample\n}',
-               'pagebreak': r'\pagebreak',
-               },
-       
-       'texi' : {'output-lilypond': '''@lilypond[%s]
-%s
-@end lilypond 
+
+               OUTPUTIMAGE: r'''@noindent
+@ifinfo
+@image{%(base)s,,,%(alt)s,%(ext)s}
+@end ifinfo
+@html
+<p>
+  <a href="%(base)s.ly">
+    <img align="center" valign="center"
+        border="0" src="%(image)s" alt="%(alt)s">
+  </a>
+</p>
+@end html
 ''',
-               'output-filename' : r'''
-@ifnothtml
-@file{%s}:
-@end ifnothtml
-@ifhtml
-@uref{%s,@file{%s}}
-@end ifhtml
-''',     
-                 'output-lilypond-fragment': '''@lilypond[%s]
-\context Staff\context Voice{ %s }
-@end lilypond ''',
-                 'output-noinline': r'''
-@c generated: %(fn)s.png                 
+
+               PRINTFILENAME: '''@file{%(filename)s}
+       ''',
+
+               QUOTE: r'''@quotation
+%(str)s@end quotation
 ''',
-                 'pagebreak': None,
-                 'output-small-verbatim': r'''@smallexample
-%s
-@end smallexample
+
+               NOQUOTE: r'''@format
+%(str)s@end format
 ''',
-                 'output-verbatim': r'''@example
-%s
-@end example
+
+               VERBATIM: r'''@exampleindent 0
+@example
+%(verb)s@end example
 ''',
+       },
+}
 
-# do some tweaking: @ is needed in some ps stuff.
-# override EndLilyPondOutput, since @tex is done
-# in a sandbox, you can't do \input lilyponddefs at the
-# top of the document.
+PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
+%%%% Options: [%(option_string)s]
 
-# should also support fragment in
+#(set! toplevel-score-handler ly:parser-print-score)
+#(set! toplevel-music-handler (lambda (p m)
+                              (ly:parser-print-score
+                               p (ly:music-scorify m p))))
 
-# ugh, the <p> below breaks inline images...
-                 
-                 'output-all': r'''
-@tex
-\catcode`\@=12
-\input lilyponddefs
-\def\EndLilyPondOutput{}
-\input %(fn)s.tex
-\catcode`\@=0
-@end tex
-@html
-<p>
-<a href="%(fn)s.png">
-<img border=0 src="%(fn)s.png" alt="[picture of music]">
-</a><p>
-@end html
-''',
-               }
-       
-       }
-
-def output_verbatim (body, small):
-       if __main__.format == 'html':
-               body = re.sub ('&', '&amp;', body)
-               body = re.sub ('>', '&gt;', body)
-               body = re.sub ('<', '&lt;', body)
-       elif __main__.format == 'texi':
-               
-               # clumsy workaround for python 2.2 pre bug.
-               body = re.sub ('@', '@@', body)
-               body = re.sub ('{', '@{', body)
-               body = re.sub ('}', '@}', body)
+#(ly:set-option (quote no-point-and-click))
 
-       if small:
-               key = 'output-small-verbatim'
-       else:
-               key = 'output-verbatim'
-       return get_output (key) % body
-
-
-#warning: this uses extended regular expressions. Tread with care.
-
-# legenda
-
-# (?P  -- name parameter
-# *? -- match non-greedily.
-# (?m)  -- ?  
-re_dict = {
-       'html': {
-                'include':  no_match,
-                'input': no_match,
-                'header': no_match,
-                'preamble-end': no_match,
-                'landscape': no_match,
-                'verbatim': r'''(?s)(?P<code><pre>\s.*?</pre>\s)''',
-                'verb': r'''(?P<code><pre>.*?</pre>)''',
-                'lilypond-file': r'(?m)(?P<match><lilypondfile(?P<options>[^>]+)?>\s*(?P<filename>[^<]+)\s*</lilypondfile>)',
-                'lilypond' : '(?m)(?P<match><lilypond((?P<options>[^:]*):)(?P<code>.*?)/>)',
-                'lilypond-block': r'''(?ms)(?P<match><lilypond(?P<options>[^>]+)?>(?P<code>.*?)</lilypond>)''',
-                 'option-sep' : '\s*',
-                 'intertext': r',?\s*intertext=\".*?\"',
-                 'multiline-comment': r"(?sm)\s*(?!@c\s+)(?P<code><!--\s.*?!-->)\s",
-                 'singleline-comment': no_match,
-                 'numcols': no_match,
-                 'multicols': no_match,
-                },
-       
-       'latex': {'input': r'(?m)^[^%\n]*?(?P<match>\\mbinput{?([^}\t \n}]*))',
-                 'include': r'(?m)^[^%\n]*?(?P<match>\\mbinclude{(?P<filename>[^}]+)})',
-                 'option-sep' : ',\s*',
-                 'header': r"\n*\\documentclass\s*(\[.*?\])?",
-                 'preamble-end': r'(?P<code>\\begin\s*{document})',
-                 'verbatim': r"(?s)(?P<code>\\begin\s*{verbatim}.*?\\end{verbatim})",
-                 'verb': r"(?P<code>\\verb(?P<del>.).*?(?P=del))",
-                 'lilypond-file': r'(?m)^[^%\n]*?(?P<match>\\lilypondfile\s*(\[(?P<options>.*?)\])?\s*\{(?P<filename>.+)})',
-                 'lilypond' : r'(?m)^[^%\n]*?(?P<match>\\lilypond\s*(\[(?P<options>.*?)\])?\s*{(?P<code>.*?)})',
-                 'lilypond-block': r"(?sm)^[^%\n]*?(?P<match>\\begin\s*(\[(?P<options>.*?)\])?\s*{lilypond}(?P<code>.*?)\\end{lilypond})",
-                 'def-post-re': r"\\def\\postLilypondExample",
-                 'def-pre-re': r"\\def\\preLilypondExample",
-                 'usepackage-graphics': r"\usepackage\s*{graphics}",
-                 'intertext': r',?\s*intertext=\".*?\"',
-                 'multiline-comment': no_match,
-                 'singleline-comment': r"(?m)^.*?(?P<match>(?P<code>^%.*$\n+))",
-                 'numcols': r"(?P<code>\\(?P<num>one|two)column)",
-                 'multicols': r"(?P<code>\\(?P<be>begin|end)\s*{multicols}({(?P<num>\d+)?})?)",
-                 },
-
-
-       # why do we have distinction between @mbinclude and @include?
+#(define version-seen? #t)
+%(preamble_string)s
 
-       
-       'texi': {
-                'include':  '(?m)^[^%\n]*?(?P<match>@mbinclude[ \n\t]+(?P<filename>[^\t \n]*))',
-                'input': no_match,
-                'header': no_match,
-                'preamble-end': no_match,
-                'landscape': no_match,
-                'verbatim': r'''(?s)(?P<code>@example\s.*?@end example\s)''',
-                'verb': r'''(?P<code>@code{.*?})''',
-                'lilypond-file': '(?m)^(?P<match>@lilypondfile(\[(?P<options>[^]]*)\])?{(?P<filename>[^}]+)})',
-                'lilypond' : '(?m)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?{(?P<code>.*?)})',
-                'lilypond-block': r'''(?ms)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?\s(?P<code>.*?)@end +lilypond)\s''',
-                'option-sep' : ',\s*',
-                'intertext': r',?\s*intertext=\".*?\"',
-                'multiline-comment': r"(?sm)^\s*(?!@c\s+)(?P<code>@ignore\s.*?@end ignore)\s",
-                'singleline-comment': r"(?m)^.*?(?P<match>(?P<code>@c.*$\n+))",
-                'numcols': no_match,
-                'multicols': no_match,
-                }
-       }
-
-
-for r in re_dict.keys ():
-       olddict = re_dict[r]
-       newdict = {}
-       for k in olddict.keys ():
-               try:
-                       newdict[k] = re.compile (olddict[k])
-               except:
-                       print 'invalid regexp: %s' % olddict[k]
-
-                       # we'd like to catch and reraise a more detailed  error, but
-                       # alas, the exceptions changed across the 1.5/2.1 boundary.
-                       raise "Invalid re"
-       re_dict[r] = newdict
 
-       
-def uniq (list):
-       list.sort ()
-       s = list
-       list = []
-       for x in s:
-               if x not in list:
-                       list.append (x)
-       return list
-               
+%% ********************************
+%% Start cut-&-pastable-section 
+%% ********************************
 
-def get_output (name):
-       return  output_dict[format][name]
+\paper {
+  #(define dump-extents #t)
+  %(font_dump_setting)s
+  %(paper_string)s
+}
 
-def get_re (name):
-       return  re_dict[format][name]
+\layout {
+  %(layout_string)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 = {
+       '@afourpaper': '160\\mm',
+       '@afourwide': '6.5\\in',
+       '@afourlatex': '150\\mm',
+       '@smallbook': '5\\in',
+       '@letterpaper': '6\\in',
+}
 
-def bounding_box_dimensions(fname):
-       if g_outdir:
-               fname = os.path.join(g_outdir, fname)
-       try:
-               fd = open(fname)
-       except IOError:
-               error ("Error opening `%s'" % fname)
-       str = fd.read ()
-       s = re.search('%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', str)
-       if s:
-               
-               gs = map (lambda x: string.atoi (x), s.groups ())
-               return (int (gs[2] - gs[0] + 0.5),
-                       int (gs[3] - gs[1] + 0.5))
-       else:
-               return (0,0)
-
-def error (str):
-       sys.stderr.write ("\n\n" + str + "\nExiting ... \n\n")
-       raise 'Exiting.'
-
-
-def compose_full_body (body, opts):
-       '''Construct the lilypond code to send to Lilypond.
-       Add stuff to BODY using OPTS as options.'''
-       music_size = default_music_fontsize
-       if g_force_music_fontsize:
-               music_size = g_force_music_fontsize
-       indent = ''
-       linewidth = ''
-       for o in opts:
-               if not g_force_music_fontsize:
-                       m = re.match ('([0-9]+)pt', o)
-                       if m:
-                               music_size = string.atoi(m.group (1))
-
-               m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt)', o)
-               if m:
-                       f = float (m.group (1))
-                       indent = 'indent = %f\\%s' % (f, m.group (2))
-                       
-               m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt)', o)
+def classic_lilypond_book_compatibility (key, value):
+       if key == 'singleline' and value == None:
+               return (RAGGEDRIGHT, None)
+
+       m = re.search ('relative\s*([-0-9])', key)
+       if m:
+               return ('relative', m.group (1))
+
+       m = re.match ('([0-9]+)pt', key)
+       if m:
+               return ('staffsize', m.group (1))
+
+       if key == 'indent' or key == 'linewidth':
+               m = re.match ('([-.0-9]+)(cm|in|mm|pt|staffspace)', value)
                if m:
                        f = float (m.group (1))
-                       linewidth = 'linewidth = %f\\%s' % (f, m.group (2))
+                       return (key, '%f\\%s' % (f, m.group (2)))
 
-       if re.search ('\\\\score', body):
-               is_fragment = 0
-       else:
-               is_fragment = 1
-       if 'fragment' in opts:
-               is_fragment = 1
-       if 'nofragment' in opts:
-               is_fragment = 0
-
-       if is_fragment and not 'multiline' in opts:
-               opts.append('singleline')
-               
-       if 'singleline' in opts:
-               linewidth = 'linewidth = -1.0'
-       elif not linewidth:
-               l = __main__.paperguru.get_linewidth ()
-               linewidth = 'linewidth = %f\pt' % l
-
-       if 'noindent' in opts:
-               indent = 'indent = 0.0\mm'
-
-       for o in opts:
-               m= re.search ('relative(.*)', o)
-               v = 0
-               if m:
-                       try:
-                               v = string.atoi (m.group (1))
-                       except ValueError:
-                               pass
-
-                       v = v + 1
-                       pitch = 'c'
-                       if v < 0:
-                               pitch = pitch + '\,' * v
-                       elif v > 0:
-                               pitch = pitch + '\'' * v
-
-                       body = '\\relative %s { %s }' %(pitch, body)
-       
-       if is_fragment:
-               body = r'''\score { 
- \notes { %s }
-  \paper { }  
-}''' % body
-
-       opts = uniq (opts)
-       optstring = string.join (opts, ' ')
-       optstring = re.sub ('\n', ' ', optstring)
-       body = r'''
-%% Generated automatically by: lilypond-book.py
-%% options are %s  
-\include "paper%d.ly"
-\paper  {
-  %s
-  %s
-} 
-''' % (optstring, music_size, linewidth, indent) + body
-
-       # ughUGH not original options
-       return body
-
-def scan_html_preamble (chunks):
-       return
-
-def scan_latex_preamble(chunks):
-       # First we want to scan the \documentclass line
-       # it should be the first non-comment line.
-       # The only thing we really need to know about the \documentclass line
-       # is if there are one or two columns to begin with.
-       idx = 0
-       while 1:
-               if chunks[idx][0] == 'ignore':
-                       idx = idx + 1
-                       continue
-               m = get_re ('header').match(chunks[idx][1])
-               if not m:
-                       error ("Latex documents must start with a \documentclass command")
-               if m.group (1):
-                       options = re.split (',[\n \t]*', m.group(1)[1:-1])
+       return (None, None)
+
+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") % name + '\n')
+       ly.exit (1)
+       return ''
+
+def verbatim_html (s):
+       return re.sub ('>', '&gt;',
+                      re.sub ('<', '&lt;',
+                              re.sub ('&', '&amp;', s)))
+
+def verbatim_texinfo (s):
+       return re.sub ('{', '@{',
+                      re.sub ('}', '@}',
+                              re.sub ('@', '@@', s)))
+
+def split_options (option_string):
+       if option_string:
+               if format == HTML:
+                       options = re.findall('[\w\.-:]+(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|\S+))?',option_string)
+                       for i in range(len(options)):
+                               options[i] = re.sub('^([^=]+=\s*)(?P<q>["\'])(.*)(?P=q)','\g<1>\g<3>',options[i])
+                       return options
                else:
-                       options = []
-               if 'twocolumn' in options:
-                       paperguru.m_num_cols = 2
-               break
-
-
-       # Then we add everythin before \begin{document} to
-       # paperguru.m_document_preamble so that we can later write this header
-       # to a temporary file in find_latex_dims() to find textwidth.
-       while idx < len(chunks) and chunks[idx][0] != 'preamble-end':
-               if chunks[idx] == 'ignore':
-                       idx = idx + 1
-                       continue
-               paperguru.m_document_preamble.append(chunks[idx][1])
-               idx = idx + 1
-
-       if len(chunks) == idx:
-               error ("Didn't find end of preamble (\\begin{document})")
-               
-       paperguru.find_latex_dims()
-
-def scan_texi_preamble (chunks):
-       # this is not bulletproof..., it checks the first 10 chunks
-       for c in chunks[:10]:
-               if c[0] == 'input':
-                       for s in ('afourpaper', 'afourwide', 'letterpaper',
-                                 'afourlatex', 'smallbook'):
-                               if string.find(c[1], "@%s" % s) != -1:
-                                       paperguru.m_papersize = s
-
-
-def scan_preamble (chunks):
-       if __main__.format == 'html':
-               scan_html_preamble (chunks)
-       elif __main__.format == 'latex':
-               scan_latex_preamble (chunks)
-       elif __main__.format == 'texi':
-               scan_texi_preamble (chunks)
-               
+                       return re.split (format_res[format]['option_sep'],
+                                        option_string)
+       return []
 
-def completize_preamble (chunks):
-       if __main__.format != 'latex':
-               return chunks
-       pre_b = post_b = graphics_b = None
-       for chunk in chunks:
-               if chunk[0] == 'preamble-end':
-                       break
-               if chunk[0] == 'input':
-                       m = get_re('def-pre-re').search(chunk[1])
-                       if m:
-                               pre_b = 1
-               if chunk[0] == 'input':
-                       m = get_re('def-post-re').search(chunk[1])
-                       if m:
-                               post_b = 1
-                               
-               if chunk[0] == 'input':
-                       m = get_re('usepackage-graphics').search(chunk[1])
-                       if m:
-                               graphics_b = 1
-       x = 0
-       while x < len (chunks) and   chunks[x][0] != 'preamble-end':
-               x = x + 1
-
-       if x == len(chunks):
-               return chunks
-       
-       if not pre_b:
-               chunks.insert(x, ('input', get_output ('output-default-pre')))
-       if not post_b:
-               chunks.insert(x, ('input', get_output ('output-default-post')))
-       if not graphics_b:
-               chunks.insert(x, ('input', get_output ('usepackage-graphics')))
+def invokes_lilypond ():
+       return re.search ('^[\'\"0-9A-Za-z/]*lilypond', process_cmd)
+
+def set_default_options (source):
+       global default_ly_options
+       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
 
-       return chunks
+class Chunk:
+       def replacement_text (self):
+               return ''
 
+       def filter_text (self):
+               return self.replacement_text ()
 
-read_files = []
-def find_file (name):
-       '''
-       Search the include path for NAME. If found, return the (CONTENTS, PATH) of the file.
-       '''
-
-       if name == '-':
-               return (sys.stdin.read (), '<stdin>')
-       f = None
-       nm = ''
-       for a in include_path:
-               try:
-                       nm = os.path.join (a, name)
-                       f = open (nm)
-                       __main__.read_files.append (nm)
-                       break
-               except IOError:
-                       pass
-       if f:
-               sys.stderr.write ("Reading `%s'\n" % nm)
-               return (f.read (), nm)
-       else:
-               error ("File not found `%s'\n" % name)
-               return ('', '')
+       def ly_is_outdated (self):
+               return 0
 
-def do_ignore(match_object):
-       return [('ignore', match_object.group('code'))]
-def do_preamble_end(match_object):
-       return [('preamble-end', match_object.group('code'))]
+       def png_is_outdated (self):
+               return 0
 
-def make_verbatim(match_object):
-       return [('verbatim', match_object.group('code'))]
+class Substring (Chunk):
+       def __init__ (self, source, start, end, line_number):
+               self.source = source
+               self.start = start
+               self.end = end
+               self.line_number = line_number
 
-def make_verb(match_object):
-       return [('verb', match_object.group('code'))]
+       def replacement_text (self):
+               return self.source[self.start:self.end]
 
-def do_include_file(m):
-       "m: MatchObject"
-       return [('input', get_output ('pagebreak'))] \
-            + read_doc_file(m.group('filename')) \
-            + [('input', get_output ('pagebreak'))] 
+class Snippet (Chunk):
+       def __init__ (self, type, match, format, line_number):
+               self.type = type
+               self.match = match
+               self.hash = 0
+               self.option_dict = {}
+               self.format = format
+               self.line_number = line_number
 
-def do_input_file(m):
-       return read_doc_file(m.group('filename'))
+       def replacement_text (self):
+               return self.match.group ('match')
 
-def make_lilypond(m):
-       if m.group('options'):
-               options = m.group('options')
-       else:
-               options = ''
-       return [('input', get_output('output-lilypond-fragment') % 
-                       (options, m.group('code')))]
+       def substring (self, s):
+               return self.match.group (s)
 
-def make_lilypond_file(m):
-       '''
+       def __repr__ (self):
+               return `self.__class__` + ' type = ' + self.type
 
-       Find @lilypondfile{bla.ly} occurences and substitute bla.ly
-       into a @lilypond .. @end lilypond block.
-       
-       '''
-       
-       if m.group('options'):
-               options = m.group('options')
-       else:
-               options = ''
-       (content, nm) = find_file(m.group('filename'))
-       options = "filename=%s," % nm + options
+class Include_snippet (Snippet):
+       def processed_filename (self):
+               f = self.substring ('filename')
+               return os.path.splitext (f)[0] + format2ext[format]
 
-       return [('input', get_output('output-lilypond') %
-                       (options, content))]
+       def replacement_text (self):
+               s = self.match.group ('match')
+               f = self.substring ('filename')
 
-def make_lilypond_block(m):
-       if not g_do_music:
-               return []
-       
-       if m.group('options'):
-               options = get_re('option-sep').split (m.group('options'))
-       else:
-           options = []
-       options = filter(lambda s: s != '', options)
-       return [('lilypond', m.group('code'), options)]
-
-def do_columns(m):
-       if __main__.format != 'latex':
-               return []
-       if m.group('num') == 'one':
-               return [('numcols', m.group('code'), 1)]
-       if m.group('num') == 'two':
-               return [('numcols', m.group('code'), 2)]
-
-def do_multicols(m):
-       if __main__.format != 'latex':
-               return []
-       if m.group('be') == 'begin':
-               return [('multicols', m.group('code'), int(m.group('num')))]
-       else:
-               return [('multicols', m.group('code'), 1)]
-       return []
+               return re.sub (f, self.processed_filename (), s)
 
-def chop_chunks(chunks, re_name, func, use_match=0):
-       newchunks = []
-       for c in chunks:
-               if c[0] == 'input':
-                       str = c[1]
-                       while str:
-                               m = get_re (re_name).search (str)
-                               if m == None:
-                                       newchunks.append (('input', str))
-                                       str = ''
-                               else:
-                                       if use_match:
-                                               newchunks.append (('input', str[:m.start ('match')]))
-                                       else:
-                                               newchunks.append (('input', str[:m.start (0)]))
-                                       #newchunks.extend(func(m))
-                                       # python 1.5 compatible:
-                                       newchunks = newchunks + func(m)
-                                       str = str [m.end(0):]
-               else:
-                       newchunks.append(c)
-       return newchunks
+class Lilypond_snippet (Snippet):
+       def __init__ (self, type, match, format, line_number):
+               Snippet.__init__ (self, type, match, format, line_number)
+               os = match.group ('options')
+               self.do_options (os, self.type)
 
-def determine_format (str):
-       if __main__.format == '':
-               
-               html = re.search ('(?i)<[dh]tml', str[:200])
-               latex = re.search (r'''\\document''', str[:200])
-               texi = re.search ('@node|@setfilename', str[:200])
+       def ly (self):
+               return self.substring ('code')
 
-               f = ''
-               g = None
-               
-               if html and not latex and not texi:
-                       f = 'html'
-               elif latex and not html and not texi:
-                       f = 'latex'
-               elif texi and not html and not latex:
-                       f = 'texi'
-               else:
-                       error ("can't determine format, please specify")
-               __main__.format = f
-
-       if __main__.paperguru == None:
-               if __main__.format == 'html':
-                       g = HtmlPaper ()
-               elif __main__.format == 'latex':
-                       g = LatexPaper ()
-               elif __main__.format == 'texi':
-                       g = TexiPaper ()
-                       
-               __main__.paperguru = g
+       def full_ly (self):
+               s = self.ly ()
+               if s:
+                       return self.compose_ly (s)
+               return ''
 
+       def do_options (self, option_string, type):
+               self.option_dict = {}
 
-def read_doc_file (filename):
-       '''Read the input file, find verbatim chunks and do \input and \include
-       '''
-       (str, path) = find_file(filename)
-       determine_format (str)
-       
-       chunks = [('input', str)]
-       
-       # we have to check for verbatim before doing include,
-       # because we don't want to include files that are mentioned
-       # inside a verbatim environment
-       chunks = chop_chunks(chunks, 'verbatim', make_verbatim)
+               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
 
-       chunks = chop_chunks(chunks, 'verb', make_verb)
-       chunks = chop_chunks(chunks, 'multiline-comment', do_ignore)
-       #ugh fix input
-       chunks = chop_chunks(chunks, 'include', do_include_file, 1)
-       chunks = chop_chunks(chunks, 'input', do_input_file, 1)
-       return chunks
+               has_linewidth = self.option_dict.has_key (LINEWIDTH)
+               no_linewidth_value = 0
 
+               # If LINEWIDTH is used without parameter, set it to default.
+               if has_linewidth and self.option_dict[LINEWIDTH] == None:
+                       no_linewidth_value = 1
+                       del self.option_dict[LINEWIDTH]
 
-taken_file_names = {}
-def schedule_lilypond_block (chunk):
-       '''Take the body and options from CHUNK, figure out how the
-       real .ly should look, and what should be left MAIN_STR (meant
-       for the main file).  The .ly is written, and scheduled in
-       TODO.
+               for i in default_ly_options.keys ():
+                       if i not in self.option_dict.keys ():
+                               self.option_dict[i] = default_ly_options[i]
 
-       Return: a chunk (TYPE_STR, MAIN_STR, OPTIONS, TODO, BASE)
+               if not has_linewidth:
+                       if type == 'lilypond' or FRAGMENT in self.option_dict.keys ():
+                               self.option_dict[RAGGEDRIGHT] = None
 
-       TODO has format [basename, extension, extension, ... ]
-       
-       '''
-       (type, body, opts) = chunk
-       assert type == 'lilypond'
-       file_body = compose_full_body (body, opts)
-       ## Hmm, we should hash only lilypond source, and skip the
-       ## %options are ...
-       ## comment line
-       basename = 'lily-' + `abs(hash (file_body))`
-       for o in opts:
-               m = re.search ('filename="(.*?)"', o)
-               if m:
-                       basename = m.group (1)
-                       if not taken_file_names.has_key(basename):
-                               taken_file_names[basename] = 0
+                       if type == 'lilypond':
+                               if LINEWIDTH in self.option_dict.keys ():
+                                       del self.option_dict[LINEWIDTH]
                        else:
-                               taken_file_names[basename] = taken_file_names[basename] + 1
-                               basename = basename + "-%i" % taken_file_names[basename]
-       if not g_read_lys:
-               update_file(file_body, os.path.join(g_outdir, basename) + '.ly')
-       needed_filetypes = ['tex']
-
-       if format == 'html' or format == 'texi':
-               needed_filetypes.append ('eps')
-               needed_filetypes.append ('png')
-       if 'eps' in opts and not ('eps' in needed_filetypes):
-               needed_filetypes.append('eps')
-       pathbase = os.path.join (g_outdir, basename)
-       def f (base, ext1, ext2):
-               a = os.path.isfile(base + ext2)
-               if (os.path.isfile(base + ext1) and
-                   os.path.isfile(base + ext2) and
-                               os.stat(base+ext1)[stat.ST_MTIME] >
-                               os.stat(base+ext2)[stat.ST_MTIME]) or \
-                               not os.path.isfile(base + ext2):
+                               if RAGGEDRIGHT in self.option_dict.keys ():
+                                       if LINEWIDTH in self.option_dict.keys ():
+                                               del self.option_dict[LINEWIDTH]
+
+                       if QUOTE in self.option_dict.keys () or type == 'lilypond':
+                               if LINEWIDTH in self.option_dict.keys ():
+                                       del self.option_dict[LINEWIDTH]
+
+               if not INDENT in self.option_dict.keys ():
+                       self.option_dict[INDENT] = '0\\mm'
+
+               # The QUOTE pattern from ly_options only emits the `linewidth'
+               # keyword.
+               if has_linewidth and QUOTE in self.option_dict.keys ():
+                       if no_linewidth_value:
+                               del self.option_dict[LINEWIDTH]
+                       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[LINEWIDTH] = texinfo_linewidths['@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:
+                       self.hash = abs (hash (self.full_ly ()))
+               return self.hash
+
+       def basename (self):
+               if FILENAME in self.option_dict:
+                       return self.option_dict[FILENAME]
+               if use_hash_p:
+                       return 'lily-%d' % self.get_hash ()
+               raise 'to be done'
+
+       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 ly_is_outdated (self):
+               base = self.basename ()
+
+               tex_file = '%s.tex' % base
+               eps_file = '%s.eps' % base
+               system_file = '%s-systems.tex' % base
+               ly_file = '%s.ly' % base
+               ok = os.path.exists (ly_file) \
+                    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 (not use_hash_p 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
+               return self
+
+       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'))
+               return not ok
+       def texstr_is_outdated (self):
+               if backend == 'ps':
+                       return 0
+
+               base = self.basename ()
+               ok = self.ly_is_outdated ()
+               ok = ok and (os.path.exists (base + '.texstr'))
+               return not ok
+
+       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 get_images (self):
+               base = self.basename ()
+               # URGUGHUGHUGUGH
+               single = '%(base)s.png' % vars ()
+               multiple = '%(base)s-page1.png' % vars ()
+               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])):
+                       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.option_dict:
+                               verb = verbatim_html (self.substring ('code'))
+                               str += write (output[HTML][VERBATIM] % vars ())
+                       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
+
+       def output_info (self):
+               str = ''
+               for image in self.get_images ():
+                       (base, ext) = os.path.splitext (image)
+
+                       # 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 ()
+               return str
+
+       def output_latex (self):
+               str = ''
+               base = self.basename ()
+               if format == LATEX:
+                       str += self.output_print_filename (LATEX)
+                       if VERBATIM in self.option_dict:
+                               verb = self.substring ('code')
+                               str += (output[LATEX][VERBATIM] % vars ())
+                       if QUOTE in self.option_dict:
+                               str = output[LATEX][QUOTE] % vars ()
+
+               str += (output[LATEX][OUTPUT] % vars ())
+               return str
+
+       def output_print_filename (self, format):
+               str = ''
+               if PRINTFILENAME in self.option_dict:
+                       base = self.basename ()
+                       filename = self.substring ('filename')
+                       str = output[format][PRINTFILENAME] % vars ()
+
+               return str
+
+       def output_texinfo (self):
+               str = ''
+               if self.output_print_filename (TEXINFO):
+                       str += ('@html\n'
+                               + self.output_print_filename (HTML)
+                               + '\n@end html\n')
+                       str += ('@tex\n'
+                               + self.output_print_filename (LATEX)
+                               + '\n@end tex\n')
+               base = self.basename ()
+               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.option_dict:
+                       verb = verbatim_texinfo (self.substring ('code'))
+                       str += (output[TEXINFO][VERBATIM] % vars ())
+                       if not QUOTE in self.option_dict:
+                               str = output[TEXINFO][NOQUOTE] % vars ()
+
+               str += self.output_info ()
+
+#              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')
+
+               if QUOTE in self.option_dict:
+                       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_file_snippet,
+       'lilypond_block': Lilypond_snippet,
+       'lilypond': Lilypond_snippet,
+       '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])
+
+       snippets = []
+       index = 0
+       ## found = dict (map (lambda x: (x, None),
+       ##                    types))
+       ## urg python2.1
+       found = {}
+       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
+       # where we search.
+       # Since every part of the string is traversed at most once for
+       # every type of snippet, this is linear.
+
+       while 1:
+               first = None
+               endex = 1 << 30
+               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
+
+                               cl = Snippet
+                               if snippet_type_to_class.has_key (type):
+                                       cl = snippet_type_to_class[type]
+
+
+                               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, format, line_number)
+                               found[type] = (start, snip)
+
+                       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 as 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:
+                       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, line_start_idx + 1))
+               snippets.append (snip)
+               found[first] = None
+               index = start + len (snip.match.group ('match'))
+
+       return snippets
+
+def filter_pipe (input, cmd):
+       if verbose_p:
+               ly.progress (_ ("Opening filter `%s'") % cmd)
+
+       (stdin, stdout, stderr) = os.popen3 (cmd)
+       stdin.write (input)
+       status = stdin.close ()
+
+       if not status:
+               status = 0
+               output = stdout.read ()
+               status = stdout.close ()
+               error = stderr.read ()
+
+       if not status:
+               status = 0
+       signal = 0x0f & status
+       if status or (not output and error):
+               exit_status = status >> 8
+               ly.error (_ ("`%s' failed (%d)") % (cmd, exit_status))
+               ly.error (_ ("The error log is as follows:"))
+               sys.stderr.write (error)
+               sys.stderr.write (stderr.read ())
+               ly.exit (status)
+
+       if verbose_p:
+               ly.progress ('\n')
+
+       return output
+
+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
-       todo = []
-       if 'tex' in needed_filetypes and f(pathbase, '.ly', '.tex'):
-               todo.append('tex')
-       if 'eps' in needed_filetypes and f(pathbase, '.tex', '.eps'):
-               todo.append('eps')
-       if 'png' in needed_filetypes and f(pathbase, '.eps', '.png'):
-               todo.append('png')
-       newbody = ''
-
-       if 'printfilename' in opts:
-               for o in opts:
-                       m= re.match ("filename=(.*)", o)
-                       if m:
-                               newbody = newbody + get_output ("output-filename") % (m.group(1), basename + '.ly', m.group(1))
-                               break
-               
+       return 0
 
-       if 'smallverbatim' in opts:
-               newbody = newbody + output_verbatim (body, 1)
-       elif 'verbatim' in opts:
-               newbody = newbody + output_verbatim (body, 0)
+def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
+       ly_names = filter (lambda x: x,
+                          map (Lilypond_snippet.basename, ly_snippets))
+       texstr_names = filter (lambda x: x,
+                          map (Lilypond_snippet.basename, texstr_snippets))
+       png_names = filter (lambda x: x,
+                           map (Lilypond_snippet.basename, png_snippets))
 
-       for o in opts:
-               m = re.search ('intertext="(.*?)"', o)
-               if m:
-                       newbody = newbody  + m.group (1) + "\n\n"
-       
-       if 'noinline' in opts:
-               s = 'output-noinline'
-       elif format == 'latex':
-               if 'eps' in opts:
-                       s = 'output-eps'
-               else:
-                       s = 'output-tex'
-       else: # format == 'html' or format == 'texi':
-               s = 'output-all'
-       newbody = newbody + get_output (s) % {'fn': basename }
-       return ('lilypond', newbody, opts, todo, basename)
-
-def process_lilypond_blocks(chunks):#ugh rename
-       newchunks = []
-       # Count sections/chapters.
-       for c in chunks:
-               if c[0] == 'lilypond':
-                       c = schedule_lilypond_block (c)
-               elif c[0] == 'numcols':
-                       paperguru.m_num_cols = c[2]
-               elif c[0] == 'multicols':
-                       paperguru.m_multicols = c[2]
-               newchunks.append (c)
-       return newchunks
-
-
-
-def system (cmd):
-       sys.stderr.write ("invoking `%s'\n" % cmd)
-       st = os.system (cmd)
-       if st:
-               error ('Error command exited with value %d\n' % st)
-       return st
-
-def quiet_system (cmd, name):
-       if not verbose_p:
-               progress ( _("Running %s...") % name)
-               cmd = cmd + ' 1> /dev/null 2> /dev/null'
-
-       return system (cmd)
-
-def get_bbox (filename):
-
-       # gs bbox device is ugh, it always prints of stderr.
-       system ('gs -sDEVICE=bbox -q  -sOutputFile=- -dNOPAUSE %s -c quit > %s.bbox 2>&1' % (filename, filename))
-
-       box = open (filename + '.bbox').read()
-       m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', box)
-       gr = []
+       status = 0
+       def my_system (cmd):
+               status = ly.system (cmd,
+                                   ignore_error = 1, progress_p = 1)
+
+               if status:
+                       ly.error ('Process %s exited unsuccessfully.' % cmd)
+                       raise Compile_error
+
+       # UGH
+       # the --process=CMD switch is a bad idea
+       # it is too generic for lilypond-book.
+       if texstr_names and invokes_lilypond:
+               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, 'snippet-map.ly'] + ly_names))
+
+LATEX_DOCUMENT = r'''
+%(preamble)s
+\begin{document}
+\typeout{textwidth=\the\textwidth}
+\typeout{columnsep=\the\columnsep}
+\makeatletter\if@twocolumn\typeout{columns=2}\fi\makeatother
+\end{document}
+'''
+
+# Do we need anything else besides `textwidth'?
+def get_latex_textwidth (source):
+       m = re.search (r'''(?P<preamble>\\begin\s*{document})''', source)
+       preamble = source[:m.start (0)]
+       latex_document = LATEX_DOCUMENT % vars ()
+       parameter_string = filter_pipe (latex_document, latex_filter_cmd)
+
+       columns = 0
+       m = re.search ('columns=([0-9.]*)', parameter_string)
        if m:
-               gr = map (string.atoi, m.groups ())
-       
-       return gr
-
-def make_pixmap (name):
-       bbox = get_bbox (name + '.eps')
-       margin = 0
-       fo = open (name + '.trans.eps' , 'w')
-       fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin))
-       fo.close ()
-       
-       res = 90
+               columns = string.atoi (m.group (1))
 
-       x = (2* margin + bbox[2] - bbox[0]) * res / 72.
-       y = (2* margin + bbox[3] - bbox[1]) * res / 72.
+       columnsep = 0
+       m = re.search ('columnsep=([0-9.]*)pt', parameter_string)
+       if m:
+               columnsep = string.atof (m.group (1))
 
-       cmd = r'''gs -g%dx%d -sDEVICE=pnggray  -dTextAlphaBits=4 -dGraphicsAlphaBits=4  -q -sOutputFile=%s -r%d -dNOPAUSE %s %s -c quit '''
-       
-       cmd = cmd % (x, y, name + '.png', res, name + '.trans.eps', name + '.eps')
-       status = 0
-       try:
-               status = system (cmd)
-       except:
-               status = -1
-
-       if status:
-               os.unlink (name + '.png')
-               error ("Removing output file")
-
-def compile_all_files (chunks):
-       global foutn
-       eps = []
-       tex = []
-       png = []
-
-       for c in chunks:
-               if c[0] != 'lilypond':
-                       continue
-               base  = c[4]
-               exts = c[3]
-               for e in exts:
-                       if e == 'eps':
-                               eps.append (base)
-                       elif e == 'tex':
-                               #ugh
-                               if base + '.ly' not in tex:
-                                       tex.append (base + '.ly')
-                       elif e == 'png' and g_do_pictures:
-                               png.append (base)
-       d = os.getcwd()
-       if g_outdir:
-               os.chdir(g_outdir)
-       if tex:
-               # fixme: be sys-independent.
-               def incl_opt (x):
-                       if g_outdir and x[0] != '/' :
-                               x = os.path.join (g_here_dir, x)
-                       return ' -I %s' % x
-
-               incs = map (incl_opt, include_path)
-               lilyopts = string.join (incs, ' ' )
-               if do_deps:
-                       lilyopts = lilyopts + ' --dependencies '
-                       if g_outdir:
-                               lilyopts = lilyopts + '--dep-prefix=' + g_outdir + '/'
-               texfiles = string.join (tex, ' ')
-               cmd = '%s --header=texidoc %s %s %s' \
-                     % (binary, lilyopts, g_extra_opts, texfiles)
-
-               system (cmd)
+       textwidth = 0
+       m = re.search ('textwidth=([0-9.]*)pt', parameter_string)
+       if m:
+               textwidth = string.atof (m.group (1))
+               if columns:
+                       textwidth = (textwidth - columnsep) / columns
+
+       return textwidth
+
+ext2format = {
+       '.html': HTML,
+       '.itely': TEXINFO,
+       '.latex': LATEX,
+       '.lytex': LATEX,
+       '.tely': TEXINFO,
+       '.tex': LATEX,
+       '.texi': TEXINFO,
+       '.texinfo': TEXINFO,
+       '.xml': HTML,
+}
 
-               #
-               # Ugh, fixing up dependencies for .tex generation
-               #
-               if do_deps:
-                       depfiles=map (lambda x: re.sub ('(.*)\.ly', '\\1.dep', x), tex)
-                       for i in depfiles:
-                               f =open (i)
-                               text=f.read ()
-                               f.close ()
-                               text=re.sub ('\n([^:\n]*):', '\n' + foutn + ':', text)
-                               f = open (i, 'w')
-                               f.write (text)
-                               f.close ()
-
-       for e in eps:
-               cmd = r"echo $TEXMF; tex '\nonstopmode \input %s'" % e
-               quiet_system (cmd, 'TeX')
-               
-               cmd = r"dvips -E -o %s %s" % (e + '.eps', e)
-               quiet_system (cmd, 'dvips')
-               
-       for g in png:
-               make_pixmap (g)
-               
-       os.chdir (d)
+format2ext = {
+       HTML: '.html',
+       # TEXINFO: '.texinfo',
+       TEXINFO: '.texi',
+       LATEX: '.tex',
+}
 
+class Compile_error:
+       pass
+
+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)
+                           and x.ly_is_outdated (),
+                 chunks)
+       texstr_outdated = \
+         filter (lambda x: is_derived_class (x.__class__,
+                                             Lilypond_snippet)
+                           and x.texstr_is_outdated (),
+                 chunks)
+       png_outdated = \
+         filter (lambda x: is_derived_class (x.__class__,
+                                             Lilypond_snippet)
+                           and x.png_is_outdated (),
+                 chunks)
+
+       ly.progress (_ ("Writing snippets..."))
+       map (Lilypond_snippet.write_ly, ly_outdated)
+       ly.progress ('\n')
+
+       if ly_outdated:
+               ly.progress (_ ("Processing..."))
+               ly.progress ('\n')
+               process_snippets (process_cmd, ly_outdated, texstr_outdated, png_outdated)
+       else:
+               ly.progress (_ ("All snippets are up to date..."))
+       ly.progress ('\n')
+
+def guess_format (input_filename):
+       format = None
+       e = os.path.splitext (input_filename)[1]
+       if e in ext2format.keys ():
+               # FIXME
+               format = ext2format[e]
+       else:
+               ly.error (_ ("can't determine format for: %s" \
+                            % input_filename))
+               ly.exit (1)
+       return format
 
-def update_file (body, name):
-       '''
-       write the body if it has changed
-       '''
-       same = 0
+def write_if_updated (file_name, lines):
        try:
-               f = open (name)
-               fs = f.read (-1)
-               same = (fs == body)
+               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
 
-       if not same:
-               f = open (name , 'w')
-               f.write (body)
-               f.close ()
-       
-       return not same
-
-
-def getopt_args (opts):
-       "Construct arguments (LONG, SHORT) for getopt from  list of options."
-       short = ''
-       long = []
-       for o in opts:
-               if o[1]:
-                       short = short + o[1]
-                       if o[0]:
-                               short = short + ':'
-               if o[2]:
-                       l = o[2]
-                       if o[0]:
-                               l = l + '='
-                       long.append (l)
-       return (short, long)
-
-def option_help_str (o):
-       "Transform one option description (4-tuple ) into neatly formatted string"
-       sh = '  '       
-       if o[1]:
-               sh = '-%s' % o[1]
-
-       sep = ' '
-       if o[1] and o[2]:
-               sep = ','
-               
-       long = ''
-       if o[2]:
-               long= '--%s' % o[2]
-
-       arg = ''
-       if o[0]:
-               if o[2]:
-                       arg = '='
-               arg = arg + o[0]
-       return '  ' + sh + sep + long + arg
-
-
-def options_help_str (opts):
-       "Convert a list of options into a neatly formatted string"
-       w = 0
-       strs =[]
-       helps = []
-
-       for o in opts:
-               s = option_help_str (o)
-               strs.append ((s, o[3]))
-               if len (s) > w:
-                       w = len (s)
-
-       str = ''
-       for s in strs:
-               str = str + '%s%s%s\n' % (s[0], ' ' * (w - len(s[0])  + 3), s[1])
-       return str
-
-def help():
-       sys.stdout.write('''Usage: lilypond-book [options] FILE\n
-Generate hybrid LaTeX input from Latex + lilypond
-Options:
-''')
-       sys.stdout.write (options_help_str (option_definitions))
-       sys.stdout.write (r'''Warning all output is written in the CURRENT directory
-
+       ly.progress (_ ("Writing `%s'...") % file_name)
+       open (file_name, 'w').writelines (lines)
+       ly.progress ('\n')
 
+def do_file (input_filename):
+       # Ugh.
+       if not input_filename or input_filename == '-':
+               in_handle = sys.stdin
+               input_fullname = '<stdin>'
+       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)
 
-Report bugs to bug-lilypond@gnu.org.
+       if input_filename == '-':
+               input_base = 'stdin'
+       else:
+               input_base = os.path.basename \
+                            (os.path.splitext (input_filename)[0])
 
-Written by Tom Cato Amundsen <tca@gnu.org> and
-Han-Wen Nienhuys <hanwen@cs.uu.nl>
-''')
+       # Only default to stdout when filtering.
+       if output_name == '-' or (not output_name and filter_cmd):
+               output_filename = '-'
+               output_file = sys.stdout
+       else:
+               if output_name:
+                       if not os.path.isdir (output_name):
+                               os.mkdir (output_name, 0777)
+                       os.chdir (output_name)
+
+               output_filename = 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)
 
-       sys.exit (0)
-
-
-def write_deps (fn, target, chunks):
-       global read_files
-       sys.stderr.write('Writing `%s\'\n' % os.path.join(g_outdir, fn))
-       f = open (os.path.join(g_outdir, fn), 'w')
-       f.write ('%s%s: ' % (g_dep_prefix, target))
-       for d in read_files:
-               f.write ('%s ' %  d)
-       basenames=[]
-        for c in chunks:
-               if c[0] == 'lilypond':
-                       (type, body, opts, todo, basename) = c;
-                       basenames.append (basename)
-       for d in basenames:
-               if g_outdir:
-                       d=g_outdir + '/' + d
-               if g_dep_prefix:
-                       #if not os.isfile (d): # thinko?
-                       if not re.search ('/', d):
-                               d = g_dep_prefix + d
-               f.write ('%s.tex ' %  d)
-       f.write ('\n')
-       #if len (basenames):
-       #       for d in basenames:
-       #               f.write ('%s.ly ' %  d)
-       #       f.write (' : %s' % target)
-       f.write ('\n')
-       f.close ()
-       read_files = []
-
-def identify (stream):
-       stream.write ('lilypond-book (GNU LilyPond) %s\n' % program_version)
-
-def print_version ():
-       identify (sys.stdout)
-       sys.stdout.write (r'''Copyright 1998--1999
-Distributed under terms of the GNU General Public License. It comes with
-NO WARRANTY.
-''')
+       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 = (
+                       'multiline_comment',
+                       'verbatim',
+                       'lilypond_block',
+       #               'verb',
+                       'singleline_comment',
+                       'lilypond_file',
+                       'include',
+                       'lilypond',
+               )
+               ly.progress (_ ("Dissecting..."))
+               chunks = find_toplevel_snippets (source, snippet_types)
+               ly.progress ('\n')
+
+               if filter_cmd:
+                       write_if_updated (output_filename,
+                                         [c.filter_text () for c in chunks])
+               elif process_cmd:
+                       do_process_cmd (chunks, input_fullname)
+                       ly.progress (_ ("Compiling %s...") % output_filename)
+                       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')
+                       return do_file (name)
 
+               include_chunks = map (process_include,
+                                     filter (lambda x: is_derived_class (x.__class__,
+                                                                         Include_snippet),
+                                             chunks))
 
-def check_texidoc (chunks):
-       n = []
-        for c in chunks:
-               if c[0] == 'lilypond':
-                       (type, body, opts, todo, basename) = c;
-                       pathbase = os.path.join (g_outdir, basename)
-                       if os.path.isfile (pathbase + '.texidoc'):
-                               body = '\n@include %s.texidoc\n' % basename + body
-                               c = (type, body, opts, todo, basename)
-               n.append (c)
-       return n
-
-
-## what's this? Docme --hwn
-##
-def fix_epswidth (chunks):
-       newchunks = []
-       for c in chunks:
-               if c[0] != 'lilypond' or 'eps' not in c[2]:
-                       newchunks.append (c)
-                       continue
-
-               mag = 1.0
-               for o in c[2]:
-                       m  = re.match ('magnification=([0-9.]+)', o)
-                       if m:
-                               mag = string.atof (m.group (1))
-
-               def replace_eps_dim (match, lmag = mag):
-                       filename = match.group (1)
-                       dims = bounding_box_dimensions (filename)
-
-                       return '%fpt' % (dims[0] *lmag)
-       
-               body = re.sub (r'''\\lilypondepswidth{(.*?)}''', replace_eps_dim, c[1])
-               newchunks.append(('lilypond', body, c[2], c[3], c[4]))
-                       
-       return newchunks
 
+               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')
+               raise Compile_error
 
-##docme: why global?
-foutn=""
-def do_file(input_filename):
+def do_options ():
+       global format, output_name, psfonts_p
+       global filter_cmd, process_cmd, verbose_p
 
-       chunks = read_doc_file(input_filename)
-       chunks = chop_chunks(chunks, 'lilypond', make_lilypond, 1)
-       chunks = chop_chunks(chunks, 'lilypond-file', make_lilypond_file, 1)
-       chunks = chop_chunks(chunks, 'lilypond-block', make_lilypond_block, 1)
-       chunks = chop_chunks(chunks, 'singleline-comment', do_ignore, 1)
-       chunks = chop_chunks(chunks, 'preamble-end', do_preamble_end)
-       chunks = chop_chunks(chunks, 'numcols', do_columns)
-       chunks = chop_chunks(chunks, 'multicols', do_multicols)
-       #print "-" * 50
-       #for c in chunks: print "c:", c;
-       #sys.exit()
-       scan_preamble(chunks)
-       chunks = process_lilypond_blocks(chunks)
+       (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)
+
+       for opt in options:
+               o = opt[0]
+               a = opt[1]
+
+               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 == '--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 == '--psfonts':
+                       psfonts_p = 1 
+               elif o == '--warranty' or o == '-w':
+                       if 1 or status:
+                               ly.warranty ()
+                       sys.exit (0)
+       return files
+
+def main ():
+       files = do_options ()
+       if not files or len (files) > 1:
+               ly.help ()
+               ly.exit (2)
+
+       file = files[0]
+
+       basename = os.path.splitext (file)[0]
+       basename = os.path.split (basename)[1]
+       
+       global process_cmd, format
+       if not format:
+               format = guess_format (files[0])
 
-       # Do It.
-       if __main__.g_run_lilypond:
-               compile_all_files (chunks)
-               chunks = fix_epswidth (chunks)
+       formats = 'ps'
+       if format == TEXINFO or format == HTML:
+               formats += ',png'
+       if process_cmd == '':
+               process_cmd = lilypond_binary \
+                             + ' --formats=%s --backend eps ' % formats
 
-       if __main__.format == 'texi':
-               chunks = check_texidoc (chunks)
+       if process_cmd:
+               process_cmd += string.join ([(' -I %s' % p)
+                                            for p in include_path])
 
-       x = 0
-       chunks = completize_preamble (chunks)
+       ly.identify (sys.stderr)
+       ly.setup_environment ()
 
+       try:
+               chunks = do_file (file)
+               if psfonts_p and invokes_lilypond ():
+                       fontextract.verbose = verbose_p
+                       snippet_chunks = filter (lambda x: is_derived_class (x.__class__,
+                                                                             Lilypond_snippet),
+                                                chunks)
+
+                       psfonts_file = basename + '.psfonts' 
+                       if not verbose_p:
+                               ly.progress (_ ("Writing fonts to %s...") % psfonts_file)
+                       fontextract.extract_fonts (psfonts_file,
+                                                  [x.basename() + '.eps'
+                                                   for x in snippet_chunks])
+                       if not verbose_p:
+                               ly.progress ('\n')
+                       
+       except Compile_error:
+               ly.exit (1)
 
-       global foutn
+       if format == TEXINFO or format == LATEX:
+               if not psfonts_p:
+                       ly.warning (_ ("option --psfonts not used"))
+                       ly.warning (_ ("processing with dvips will have no fonts"))
 
-       if outname:
-               my_outname = outname
-       elif input_filename == '-' or input_filename == "/dev/stdin":
-               my_outname = '-'
-       else:
-               my_outname = os.path.basename (os.path.splitext(input_filename)[0]) + '.' + format
-       my_depname = my_outname + '.dep'                
-       
-       if my_outname == '-' or my_outname == '/dev/stdout':
-               fout = sys.stdout
-               foutn = "<stdout>"
-               __main__.do_deps = 0
-       else:
-               foutn = os.path.join (g_outdir, my_outname)
-               sys.stderr.write ("Writing `%s'\n" % foutn)
-               fout = open (foutn, 'w')
-       for c in chunks:
-               fout.write (c[1])
-       fout.close ()
-       # should chmod -w
-
-       if do_deps:
-               write_deps (my_depname, foutn, chunks)
-
-outname = ''
-try:
-       (sh, long) = getopt_args (__main__.option_definitions)
-       (options, files) = getopt.getopt(sys.argv[1:], sh, long)
-except getopt.error, msg:
-       sys.stderr.write("error: %s" % msg)
-       sys.exit(1)
-
-do_deps = 0
-for opt in options:    
-       o = opt[0]
-       a = opt[1]
-
-       if o == '--include' or o == '-I':
-               include_path.append (a)
-       elif o == '--version' or o == '-v':
-               print_version ()
-               sys.exit  (0)
-       elif o == '--verbose' or o == '-V':
-               __main__.verbose_p = 1
-       elif o == '--format' or o == '-f':
-               __main__.format = a
-       elif o == '--outname' or o == '-o':
-               if len(files) > 1:
-                       #HACK
-                       sys.stderr.write("Lilypond-book is confused by --outname on multiple files")
-                       sys.exit(1)
-               outname = a
-       elif o == '--help' or o == '-h':
-               help ()
-       elif o == '--no-lily' or o == '-n':
-               __main__.g_run_lilypond = 0
-       elif o == '--dependencies' or o == '-M':
-               do_deps = 1
-       elif o == '--default-music-fontsize':
-               default_music_fontsize = string.atoi (a)
-       elif o == '--default-lilypond-fontsize':
-               print "--default-lilypond-fontsize is deprecated, use --default-music-fontsize"
-               default_music_fontsize = string.atoi (a)
-       elif o == '--extra-options':
-               g_extra_opts = a
-       elif o == '--force-music-fontsize':
-               g_force_music_fontsize = string.atoi(a)
-       elif o == '--force-lilypond-fontsize':
-               print "--force-lilypond-fontsize is deprecated, use --default-lilypond-fontsize"
-               g_force_music_fontsize = string.atoi(a)
-       elif o == '--dep-prefix':
-               g_dep_prefix = a
-       elif o == '--no-pictures':
-               g_do_pictures = 0
-       elif o == '--no-music':
-               g_do_music = 0
-       elif o == '--read-lys':
-               g_read_lys = 1
-       elif o == '--outdir':
-               g_outdir = a
-
-identify (sys.stderr)
-if g_outdir:
-       if os.path.isfile(g_outdir):
-               error ("outdir is a file: %s" % g_outdir)
-       if not os.path.exists(g_outdir):
-               os.mkdir(g_outdir)
-setup_environment ()
-for input_filename in files:
-       do_file(input_filename)
-       
-#
-# Petr, ik zou willen dat ik iets zinvoller deed,
-# maar wat ik kan ik doen, het verandert toch niets?
-#   --hwn 20/aug/99
+               psfonts_file = os.path.join (output_name, basename + '.psfonts')
+               output = os.path.join (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')
+
+if __name__ == '__main__':
+       main ()