]> git.donarmstrong.com Git - lilypond.git/blobdiff - scripts/lilypond-book.py
* scripts/lilypond-book.py (Snippet.output_print_filename): new
[lilypond.git] / scripts / lilypond-book.py
index 4e431b030fd3897c2914897e81767e8b5e0726df..2ece2f7ed36a6aa03c719c82644cc51ec88eb27e 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.
+'''
+TODO:
+      ly-options: intertext, quote ?
+      --linewidth?
+      eps in latex?
+      check latex parameters, twocolumn
+      multicolumn?
+      papersizes?
+      ly2dvi/notexidoc?
+      
+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-bin" BOOK.tely
+
+   must substitute:
+     @mbinclude foo.itely -> @include foo.itely
+     \mbinput -> \input
+     
+'''
 
-
-
-import os
-import stat
 import string
-import re
-import getopt
-import sys
 import __main__
-import operator
 
+################################################################
+# Users of python modules should include this snippet
+# and customize variables below.
 
-program_version = '@TOPLEVEL_VERSION@'
-if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
-       program_version = '1.5.18'
+# We'll suffer this path init stuff as long as we don't install our
+# python packages in <prefix>/lib/pythonx.y (and don't kludge around
+# it as we do with teTeX on Red Hat Linux: set some environment var
+# (PYTHONPATH) in profile)
 
-#
-# Try to cater for bad installations of LilyPond, that have
-# broken TeX setup.  Just hope this doesn't hurt good TeX
-# setups.  Maybe we should check if kpsewhich can find
-# feta16.{afm,mf,tex,tfm}, and only set env upon failure.
-#
-datadir = '@datadir@'
-environment = {
-       'MFINPUTS' : datadir + '/mf:',
-       'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:.:',
-       'TFMFONTS' : datadir + '/tfm:',
-       'GS_FONTPATH' : datadir + '/afm:' + datadir + '/pfa',
-       'GS_LIB' : datadir + '/ps',
-}
+# 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]
 
-def setup_environment ():
-       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
+sys.path.insert (0, os.path.join (datadir, 'python'))
 
+# Customize these
+#if __name__ == '__main__':
 
+import lilylib as ly
+global _;_=ly._
+global re;re = ly.re
 
-include_path = [os.getcwd()]
 
+# lilylib globals
+program_version = '@TOPLEVEL_VERSION@'
+program_name = 'lilypond-book'
+verbose_p = 0
+pseudo_filter_p = 0
+original_dir = os.getcwd ()
 
-# g_ is for global (?)
 
-g_here_dir = os.getcwd ()
-g_dep_prefix = ''
-g_outdir = ''
-g_force_lilypond_fontsize = 0
-g_read_lys = 0
-g_do_pictures = 1
-g_num_cols = 1
-format = ''
-g_run_lilypond = 1
-no_match = 'a\ba'
+help_summary = _ ("""Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document.  Example usage:
 
-default_music_fontsize = 16
-default_text_fontsize = 12
-paperguru = None
-
-# this code is ugly. It should be cleaned
-class LatexPaper:
-       def __init__(self):
-               self.m_paperdef =  {
-                       # the dimensions are from geometry.sty
-                       'a0paper': (mm2pt(841), mm2pt(1189)),
-                       'a1paper': (mm2pt(595), mm2pt(841)),
-                       'a2paper': (mm2pt(420), mm2pt(595)),
-                       'a3paper': (mm2pt(297), mm2pt(420)),
-                       'a4paper': (mm2pt(210), mm2pt(297)),
-                       'a5paper': (mm2pt(149), mm2pt(210)),
-                       'b0paper': (mm2pt(1000), mm2pt(1414)),
-                       'b1paper': (mm2pt(707), mm2pt(1000)),
-                       'b2paper': (mm2pt(500), mm2pt(707)),
-                       'b3paper': (mm2pt(353), mm2pt(500)),
-                       'b4paper': (mm2pt(250), mm2pt(353)),
-                       'b5paper': (mm2pt(176), mm2pt(250)),
-                       'letterpaper': (in2pt(8.5), in2pt(11)),
-                       'legalpaper': (in2pt(8.5), in2pt(14)),
-                       'executivepaper': (in2pt(7.25), in2pt(10.5))}
-               self.m_use_geometry = None
-               self.m_papersize = 'letterpaper'
-               self.m_fontsize = 10
-               self.m_num_cols = 1
-               self.m_landscape = 0
-               self.m_geo_landscape = 0
-               self.m_geo_width = None
-               self.m_geo_textwidth = None
-               self.m_geo_lmargin = None
-               self.m_geo_rmargin = None
-               self.m_geo_includemp = None
-               self.m_geo_marginparwidth = {10: 57, 11: 50, 12: 35}
-               self.m_geo_marginparsep = {10: 11, 11: 10, 12: 10}
-               self.m_geo_x_marginparwidth = None
-               self.m_geo_x_marginparsep = None
-               self.__body = None
-       def set_geo_option(self, name, 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)
-
-               if name == 'body' or name == 'text':
-                       if type(value) == type(""):
-                               self.m_geo_textwidth =  value
-                       else:
-                               self.m_geo_textwidth =  value[0]
-                       self.__body = 1
-               elif name == 'portrait':
-                       self.m_geo_landscape = 0
-               elif name == 'reversemp' or name == 'reversemarginpar':
-                       if self.m_geo_includemp == None:
-                               self.m_geo_includemp = 1
-               elif name == 'marginparwidth' or name == 'marginpar':
-                       self.m_geo_x_marginparwidth =  value
-                       self.m_geo_includemp = 1
-               elif name == 'marginparsep':
-                       self.m_geo_x_marginparsep =  value
-                       self.m_geo_includemp = 1
-               elif name == 'scale':
-                       if type(value) == type(""):
-                               self.m_geo_width = self.get_paperwidth() * float(value)
-                       else:
-                               self.m_geo_width = self.get_paperwidth() * float(value[0])
-               elif name == 'hscale':
-                       self.m_geo_width = self.get_paperwidth() * float(value)
-               elif name == 'left' or name == 'lmargin':
-                       self.m_geo_lmargin =  value
-               elif name == 'right' or name == 'rmargin':
-                       self.m_geo_rmargin =  value
-               elif name == 'hdivide' or name == 'divide':
-                       if value[0] not in ('*', ''):
-                               self.m_geo_lmargin =  value[0]
-                       if value[1] not in ('*', ''):
-                               self.m_geo_width =  value[1]
-                       if value[2] not in ('*', ''):
-                               self.m_geo_rmargin =  value[2]
-               elif name == 'hmargin':
-                       if type(value) == type(""):
-                               self.m_geo_lmargin =  value
-                               self.m_geo_rmargin =  value
-                       else:
-                               self.m_geo_lmargin =  value[0]
-                               self.m_geo_rmargin =  value[1]
-               elif name == 'margin':#ugh there is a bug about this option in
-                                       # the geometry documentation
-                       if type(value) == type(""):
-                               self.m_geo_lmargin =  value
-                               self.m_geo_rmargin =  value
-                       else:
-                               self.m_geo_lmargin =  value[0]
-                               self.m_geo_rmargin =  value[0]
-               elif name == 'total':
-                       if type(value) == type(""):
-                               self.m_geo_width =  value
-                       else:
-                               self.m_geo_width =  value[0]
-               elif name == 'width' or name == 'totalwidth':
-                       self.m_geo_width =  value
-               elif name == 'paper' or name == 'papername':
-                       self.m_papersize = value
-               elif name[-5:] == 'paper':
-                       self.m_papersize = name
-               else:
-                               pass 
-                       # what is _set_dimen ?? /MB
-                               #self._set_dimen('m_geo_'+name, value)
-       def __setattr__(self, name, value):
-               if type(value) == type("") and \
-                  dimension_conversion_dict.has_key (value[-2:]):
-                       f = dimension_conversion_dict[value[-2:]]
-                       self.__dict__[name] = f(float(value[:-2]))
-               else:
-                       self.__dict__[name] = value
-                       
-       def __str__(self):
-               s =  "LatexPaper:\n-----------"
-               for v in self.__dict__.keys():
-                       if v[:2] == 'm_':
-                               s = s +  str (v) + ' ' + str (self.__dict__[v])
-               s = s +  "-----------"
-               return s
-       
-       def get_linewidth(self):
-               w = self._calc_linewidth()
-               if self.m_num_cols == 2:
-                       return (w - 10) / 2
-               else:
-                       return w
-       def get_paperwidth(self):
-               #if self.m_use_geometry:
-                       return self.m_paperdef[self.m_papersize][self.m_landscape or self.m_geo_landscape]
-               #return self.m_paperdef[self.m_papersize][self.m_landscape]
-       
-       def _calc_linewidth(self):
-               # since geometry sometimes ignores 'includemp', this is
-               # more complicated than it should be
-               mp = 0
-               if self.m_geo_includemp:
-                       if self.m_geo_x_marginparsep is not None:
-                               mp = mp + self.m_geo_x_marginparsep
-                       else:
-                               mp = mp + self.m_geo_marginparsep[self.m_fontsize]
-                       if self.m_geo_x_marginparwidth is not None:
-                               mp = mp + self.m_geo_x_marginparwidth
-                       else:
-                               mp = mp + self.m_geo_marginparwidth[self.m_fontsize]
-
-               #ugh test if this is necessary                          
-               if self.__body:
-                       mp = 0
-
-               if not self.m_use_geometry:
-                       return latex_linewidths[self.m_papersize][self.m_fontsize]
-               else:
-                       geo_opts = (self.m_geo_lmargin == None,
-                                   self.m_geo_width == None,
-                                   self.m_geo_rmargin == None)
-
-                       if geo_opts == (1, 1, 1):
-                               if self.m_geo_textwidth:
-                                       return self.m_geo_textwidth
-                               w = self.get_paperwidth() * 0.8
-                               return w - mp
-                       elif geo_opts == (0, 1, 1):
-                                if self.m_geo_textwidth:
-                                       return self.m_geo_textwidth
-                                return self.f1(self.m_geo_lmargin, mp)
-                       elif geo_opts == (1, 1, 0):
-                                if self.m_geo_textwidth:
-                                       return self.m_geo_textwidth
-                                return self.f1(self.m_geo_rmargin, mp)
-                       elif geo_opts \
-                                       in ((0, 0, 1), (1, 0, 0), (1, 0, 1)):
-                               if self.m_geo_textwidth:
-                                       return self.m_geo_textwidth
-                               return self.m_geo_width - mp
-                       elif geo_opts in ((0, 1, 0), (0, 0, 0)):
-                               w = self.get_paperwidth() \
-                                 - self.m_geo_lmargin - self.m_geo_rmargin - mp
-                               if w < 0:
-                                       w = 0
-                               return w
-                       raise "Never do this!"
-       def f1(self, m, mp):
-               tmp = self.get_paperwidth() - m * 2 - mp
-               if tmp < 0:
-                       tmp = 0
-               return tmp
-       def f2(self):
-               tmp = self.get_paperwidth() - self.m_geo_lmargin \
-                       - self.m_geo_rmargin
-               if tmp < 0:
-                       return 0
-               return tmp
-
-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
-       }
+   lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
+   lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" BOOK
+   lilypond-book --process='lilypond-bin -I include' BOOK
 
-       
-# latex linewidths:
-# indices are no. of columns, papersize,  fontsize
-# Why can't this be calculated?
-latex_linewidths = {
-       'a4paper':{10: 345, 11: 360, 12: 390},
-       'a4paper-landscape': {10: 598, 11: 596, 12:592},
-       'a5paper':{10: 276, 11: 276, 12: 276},
-       'b5paper':{10: 345, 11: 356, 12: 356},
-       'letterpaper':{10: 345, 11: 360, 12: 390},
-       'letterpaper-landscape':{10: 598, 11: 596, 12:596},
-       'legalpaper': {10: 345, 11: 360, 12: 390},
-       'executivepaper':{10: 345, 11: 360, 12: 379}}
-
-texi_linewidths = {
-       'afourpaper': {12: mm2pt(160)},
-       'afourwide': {12: in2pt(6.5)},
-       'afourlatex': {12: mm2pt(150)},
-       'smallbook': {12: in2pt(5)},
-       'letterpaper': {12: in2pt(6)}}
+""")
+
+copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>>',
+            'Han-Wen Nienhuys <hanwen@cs.uu.nl>')
 
 option_definitions = [
-  ('EXT', 'f', 'format', 'set format.  EXT is one of texi and latex.'),
-  ('DIM',  '', 'default-music-fontsize', 'default fontsize for music.  DIM is assumed to be in points'),
-  ('DIM',  '', 'default-lilypond-fontsize', 'deprecated, use --default-music-fontsize'),
-  ('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'),
-  ('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"),
-  ('', '', 'read-lys', "don't write ly files."),
-  ('FILE', 'o', 'outname', 'filename main output file'),
-  ('FILE', '', 'outdir', "where to place generated files"),
-  ('', 'v', 'version', 'print version information' ),
-  ('', 'h', 'help', 'print help'),
-  ]
-
-# format specific strings, ie. regex-es for input, and % strings for output
-output_dict= {
-       'latex': {
-               'output-lilypond-fragment' : r"""\begin[eps,singleline,%s]{lilypond}
-  \context Staff <
-    \context Voice{
-      %s
-    }
-  >
-\end{lilypond}""",
-               'output-filename' : r'''
-
-\verb+%s+:''',
-               'output-lilypond': r"""\begin[%s]{lilypond}
-%s
-\end{lilypond}""",
-               'output-verbatim': "\\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.eps}}',
-               'output-tex': '{\\preLilypondExample \\input %(fn)s.tex \\postLilypondExample\n}',
-               'pagebreak': r'\pagebreak',
-               },
-       'texi' : {'output-lilypond': """@lilypond[%s]
-%s
-@end lilypond 
-""",
-               'output-filename' : r'''
-
-@file{%s}:''',   
-                 'output-lilypond-fragment': """@lilypond[%s]
-\context Staff\context Voice{ %s }
-@end lilypond """,
-                 'pagebreak': None,
-                 'output-verbatim': r"""@example
-%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.
-
-# should also support fragment in
-                 
-                 '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>
-@end html
-""",
-               }
+       (_ ("EXT"), 'f', 'format', _ ("use output format EXT (texi [default], texi-html, latex, html)")),
+       (_ ("FILTER"), 'F', 'filter', _ ("pipe snippets through FILTER [convert-ly -n -]")),
+       ('', 'h', 'help', _ ("print this help")),
+       (_ ("DIR"), 'I', 'include', _ ("add DIR to include path")),
+       (_ ("COMMAND"), 'P', 'process', _ ("process ly_files using COMMAND FILE...")),
+       (_ ("DIR"), 'o', 'output', _ ("write output to DIR")),
+       ('', '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-bin')
+
+# only use installed binary  when we're installed too.
+if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
+       lilypond_binary = 'lilypond-bin'
+
+
+use_hash_p = 1
+format = 0
+output_name = 0
+latex_filter_cmd = 'latex "\\nonstopmode \input /dev/stdin"'
+filter_cmd = 0
+process_cmd = lilypond_binary
+default_ly_options = { }
+
+AFTER = 'after'
+BEFORE = 'before'
+HTML = 'html'
+LATEX = 'latex'
+LINEWIDTH = 'linewidth'
+NOTES = 'body'
+OUTPUT = 'output'
+PAPER = 'paper'
+PREAMBLE = 'preamble'
+TEXINFO = 'texinfo'
+VERBATIM = 'verbatim'
+PRINTFILENAME = 'printfilename'
+
+# 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
+no_match = 'a\ba'
+snippet_res = {
+       HTML: {
+       'include':  no_match,
+       'lilypond' : '(?m)(?P<match><lilypond((?P<options>[^:]*):)(?P<code>.*?)/>)',
+       'lilypond_block': r'''(?ms)(?P<match><lilypond(?P<options>[^>]+)?>(?P<code>.*?)</lilypond>)''',
+       'lilypond_file': r'(?m)(?P<match><lilypondfile(?P<options>[^>]+)?>\s*(?P<filename>[^<]+)\s*</lilypondfile>)',
+       'multiline_comment': r"(?sm)\s*(?!@c\s+)(?P<code><!--\s.*?!-->)\s",
+       'singleline_comment': no_match,
+       'verb': r'''(?P<code><pre>.*?</pre>)''',
+       'verbatim': r'''(?s)(?P<code><pre>\s.*?</pre>\s)''',
+       },
+
+       LATEX: {
+       'include': r'(?m)^[^%\n]*?(?P<match>\\input{(?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})",
+       'lilypond_file': r'(?m)^[^%\n]*?(?P<match>\\lilypondfile\s*(\[(?P<options>.*?)\])?\s*\{(?P<filename>.+)})',
+       'multiline_comment': no_match,
+       'singleline_comment': r"(?m)^.*?(?P<match>(?P<code>^%.*$\n+))",
+       'verb': r"(?P<code>\\verb(?P<del>.).*?(?P=del))",
+       'verbatim': r"(?s)(?P<code>\\begin\s*{verbatim}.*?\\end{verbatim})",
+       },
+
+       TEXINFO: {
+       'include':  '(?m)^[^%\n]*?(?P<match>@include\s+(?P<filename>\S*))',
+       'lilypond' : '(?m)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?{(?P<code>.*?)})',
+       'lilypond_block': r'''(?ms)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?\s(?P<code>.*?)@end lilypond)\s''',
+       'lilypond_file': '(?m)^(?P<match>@lilypondfile(\[(?P<options>[^]]*)\])?{(?P<filename>[^}]+)})',
+       'multiline_comment': r"(?sm)^\s*(?!@c\s+)(?P<code>@ignore\s.*?@end ignore)\s",
+       'singleline_comment': r"(?m)^.*?(?P<match>(?P<code>@c([ \t][^\n]*|)\n))",
+       'verb': r'''(?P<code>@code{.*?})''',
+       'verbatim': r'''(?s)(?P<code>@example\s.*?@end example\s)''',
+       },
        }
 
-def output_verbatim (body):
-       if __main__.format == 'texi':
-               body = re.sub ('([@{}])', '@\\1', body)
-       return get_output ('output-verbatim') % body
-
-
-re_dict = {
-       'latex': {'input': r'(?m)^[^%\n]*?(?P<match>\\mbinput{?([^}\t \n}]*))',
-                 'include': r'(?m)^[^%\n]*?(?P<match>\\mbinclude{(?P<filename>[^}]+)})',
-                 'option-sep' : ',\s*',
-                 'header': r"\\documentclass\s*(\[.*?\])?",
-                 'geometry': r"^(?m)[^%\n]*?\\usepackage\s*(\[(?P<options>.*)\])?\s*{geometry}",
-                 'preamble-end': r'(?P<code>\\begin{document})',
-                 'verbatim': r"(?s)(?P<code>\\begin{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{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)",
-                 },
-
-
-       # why do we have distinction between @mbinclude and @include? 
-       '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)^(?!@c)(?P<match>@lilypondfile(\[(?P<options>.*?)\])?{(?P<filename>[^}]+)})',
-                'lilypond' : '(?m)^(?!@c)(?P<match>@lilypond(\[(?P<options>.*?)\])?{(?P<code>.*?)})',
-# pyton2.2b2 barfs on this
-                'lilypond-block': r"""(?m)^(?!@c)(?P<match>(?s)(?P<match>@lilypond(\[(?P<options>.*?)\])?\s(?P<code>.*?)@end lilypond\s))""",
-
-# 1.5.2 barfs on this. 
-# 'lilypond-block': r"""(?m)^(?!@c)(?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,
-                }
+format_res = {
+       HTML: {
+       'option-sep' : '\s*',
+       'intertext': r',?\s*intertext=\".*?\"',
+       },
+       LATEX: {
+       'intertext': r',?\s*intertext=\".*?\"',
+       'option-sep' : ',\s*',
+       },
+       TEXINFO: {
+       'intertext': r',?\s*intertext=\".*?\"',
+       'option-sep' : ',\s*',
+       },
        }
 
+ly_options = {
+       NOTES: {
+       'relative': r'''\relative c%(relative_quotes)s''',
+       },
+       PAPER: {
+       'indent' : r'''
+    indent = %(indent)s''',
+       'linewidth' : r'''
+    linewidth = %(linewidth)s''',
+       'noindent' : r'''
+    indent = 0.0\mm''',
+       'notime' : r'''
+    \translator {
+        \StaffContext
+        \remove Time_signature_engraver
+    }''',
+       'raggedright' : r'''
+    indent = 0.0\mm
+    raggedright = ##t''',
+       },
+       PREAMBLE: {
+       'staffsize': r'''
+#(set-global-staff-size %(staffsize)s)''',
+       },
+       }
 
-for r in re_dict.keys ():
-       olddict = re_dict[r]
-       newdict = {}
-       for k in olddict.keys ():
-               newdict[k] = re.compile (olddict[k])
-       re_dict[r] = newdict
-
+output = {
+       HTML : {
+       AFTER: '',
+       PRINTFILENAME:'<p><tt><a href="%(base)s.ly">%(filename)s</a></tt></p>',
+       BEFORE: '',
+       OUTPUT: r'''
+<img align="center" valign="center"
+border="0" src="%(base)s.png" alt="[picture of music]">''',
+       VERBATIM: r'''<pre>
+%(verb)s</pre>''',
+       },
        
-def uniq (list):
-       list.sort ()
-       s = list
-       list = []
-       for x in s:
-               if x not in list:
-                       list.append (x)
-       return list
-               
-
-def get_output (name):
-       return  output_dict[format][name]
+       LATEX : {
+       AFTER: '',
+       PRINTFILENAME: '''\\texttt{%(filename)s}
 
-def get_re (name):
-       return  re_dict[format][name]
+       ''',
+       BEFORE: '',
+       OUTPUT: r'''{\parindent 0pt
+\catcode`\@=12
+\ifx\preLilyPondExample\preLilyPondExample\fi
+\def\lilypondbook{}
+\input %(base)s.tex
+\ifx\preLilyPondExample\postLilyPondExample\fi
+\catcode`\@=0}''',
+       VERBATIM: r'''\begin{verbatim}
+%(verb)s\end{verbatim}
+''',
+       },
+       
+       TEXINFO :       {
+       BEFORE: '',
+       AFTER: '',
+       VERBATIM: r'''@example
+%(verb)s@end example''',
+       
+       },
+       
+       }
 
-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:
-               return (int (s.group (3) - s.group (1) + 0.5),
-                       int (s.group (4) - s.group (2) + 0.5))
+PREAMBLE_LY = r'''%% Generated by %(program_name)s
+%% Options: [%(option_string)s]
+%(preamble_string)s
+\paper {%(paper_string)s
+}
+''' 
+
+FRAGMENT_LY = r'''\score{
+    \notes%(notes_string)s{
+        %(code)s    }
+}'''
+FULL_LY = '%(code)s'
+
+def classic_lilypond_book_compatibility (o):
+       if o == 'singleline':
+               return 'raggedright'
+       m = re.search ('relative\s*([-0-9])', o)
+       if m:
+               return 'relative=%s' % m.group (1)
+       m = re.match ('([0-9]+)pt', o)
+       if m:
+               return 'staffsize=%s' % m.group (1)
+       m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt)', o)
+       if m:
+               f = float (m.group (1))
+               return 'indent=%f\\%s' % (f, m.group (2))
+       m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt)', o)
+       if m:
+               f = float (m.group (1))
+               return 'linewidth=%f\\%s' % (f, m.group (2))
+       return None
+
+def compose_ly (code, option_string):
+       options = []
+       # urg
+       for i in default_ly_options.keys ():
+               options.append (i)
+               vars ()[i] = default_ly_options[i]
+
+       if option_string:
+               options = options + split_options (option_string)
+       
+       m = re.search (r'''\\score''', code)
+       if not m and (not options \
+                     or not 'nofragment' in options \
+                     or 'fragment' in options):
+               options.append ('raggedright')
+               body = FRAGMENT_LY
        else:
-               return (0,0)
-
-def error (str):
-       sys.stderr.write (str + "\n  Exiting ... \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
-       latex_size = default_text_fontsize
-       for o in opts:
-               if g_force_lilypond_fontsize:
-                       music_size = g_force_lilypond_fontsize
+               body = FULL_LY
+
+       # defaults
+       relative = 0
+       staffsize = '16'
+
+       notes_options = []
+       paper_options = []
+       preamble_options = []
+       for i in options:
+               c = classic_lilypond_book_compatibility (i)
+               if c:
+                       ly.warning (_ ("deprecated ly-option used: %s" % i))
+                       ly.warning (_ ("compatibility mode translation: %s" \
+                                      % c))
+                       i = c
+               
+               if string.find (i, '=') > 0:
+                       key, value = string.split (i, '=')
+                       # hmm
+                       vars ()[key] = value
                else:
-                       m = re.match ('([0-9]+)pt', o)
-                       if m:
-                               music_size = string.atoi(m.group (1))
+                       key = i
+
+               if key in ly_options[NOTES].keys ():
+                       notes_options.append (ly_options[NOTES][key])
+               elif key in ly_options[PREAMBLE].keys ():
+                       preamble_options.append (ly_options[PREAMBLE][key])
+               elif key in ly_options[PAPER].keys ():
+                       paper_options.append (ly_options[PAPER][key])
+               elif key not in ('fragment', 'nofragment', 'printfilename',
+                                'relative', 'verbatim'):
+                       ly.warning (_("ignoring unknown ly option: %s") % i)
+
+       relative_quotes = (",,,", ",,", ",", "", "'", "''", "'''")[relative-3]
+       program_name = __main__.program_name
+       notes_string = string.join (notes_options, '\n    ') % vars ()
+       paper_string = string.join (paper_options, '\n    ') % vars ()
+       preamble_string = string.join (preamble_options, '\n    ') % vars ()
+       return (PREAMBLE_LY + body) % vars ()
+
+
+# BARF
+# use lilypond-bin for latex (.lytex) books,
+# and lilypond --preview for html, texinfo books?
+def to_eps (file):
+       cmd = r'latex "\nonstopmode \input %s"' % file
+       # Ugh.  (La)TeX writes progress and error messages on stdout
+       # Redirect to stderr
+       cmd = '(( %s  >&2 ) >&- )' % cmd
+       ly.system (cmd)
+       ly.system ('dvips -Ppdf -u+lilypond.map -E -o %s.eps %s' \
+                  % (file, file))
 
-               m = re.match ('latexfontsize=([0-9]+)pt', o)
-               if m:
-                       latex_size = string.atoi (m.group (1))
-
-       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:
-               l = -1.0;
-       else:
-               l = __main__.paperguru.get_linewidth()
-
-       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)
+def find_file (name):
+       for i in include_path:
+               full = os.path.join (i, name)
+               if os.path.exists (full):
+                       return full
+       ly.error (_ ('file not found: %s\n' % name))
+       ly.exit (1)
+       return ''
        
-       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  { linewidth = %f \pt } 
-""" % (optstring, music_size, l) + body
-
-       # ughUGH not original options
-       return body
-
-def parse_options_string(s):
-       d = {}
-       r1 = re.compile("((\w+)={(.*?)})((,\s*)|$)")
-       r2 = re.compile("((\w+)=(.*?))((,\s*)|$)")
-       r3 = re.compile("(\w+?)((,\s*)|$)")
-       while s:
-               m = r1.match(s)
-               if m:
-                       s = s[m.end():]
-                       d[m.group(2)] = re.split(",\s*", m.group(3))
-                       continue
-               m = r2.match(s)
-               if m:
-                       s = s[m.end():]
-                       d[m.group(2)] = m.group(3)
-                       continue
-               m = r3.match(s)
-               if m:
-                       s = s[m.end():]
-                       d[m.group(1)] = 1
-                       continue
+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):
+       return re.split (format_res[format]['option-sep'], option_string)
+
+
+class Snippet:
+       def __init__ (self, type, source, match):
+               self.type = type
+               self.source = source
+               self.match = match
+               self.hash = 0
+
+       def start (self, s):
+               return self.match.start (s)
+
+       def end (self, s):
+               return self.match.end (s)
+
+       def substring (self, s):
+               return self.match.group (s)
+
+       def ly (self):
+               s = ''
+               if self.type == 'lilypond_block' or self.type == 'lilypond':
+                       s = self.substring ('code')
+               elif self.type == 'lilypond_file':
+                       name = self.substring ('filename')
+                       s = open (find_file (name)).read ()
+               return s
                
-               error ("format of option string invalid (was `%')" % s)
-       return d
-
-def scan_latex_preamble(chunks):
-       # first we want to scan the \documentclass line
-       # it should be the first non-comment line
-       idx = 0
-       while 1:
-               if chunks[idx][0] == 'ignore':
-                       idx = idx + 1
-                       continue
-               m = get_re ('header').match(chunks[idx][1])
-               if m <> None and m.group (1):
-                       options = re.split (',[\n \t]*', m.group(1)[1:-1])
+       def full_ly (self):
+               s = self.ly ()
+               if s:
+                       return compose_ly (s, self.match.group ('options'))
+               return ''
+       
+       def get_hash (self):
+               if not self.hash:
+                       self.hash = abs (hash (self.ly ()))
+               return self.hash
+
+       def basename (self):
+               if use_hash_p:
+                       return 'lily-%d' % self.get_hash ()
+               raise 'to be done'
+
+       def write_ly (self):
+               if self.type == 'lilypond_block' or self.type == 'lilypond'\
+                      or self.type == 'lilypond_file':
+                       outf = open (self.basename () + '.ly', 'w')
+                       outf.write (self.full_ly ())
+
+       def replacement_text (self, format):
+               if self.type in ['lilypond_file',
+                                'lilypond_block',
+                                'lilypond']:
+                       
+                       func = Snippet.__dict__ ['output_' + format]
+                       return func (self)
+               elif self.type == 'include':
+                       return ''
                else:
-                       options = []
-               for o in options:
-                       if o == 'landscape':
-                               paperguru.m_landscape = 1
-                       m = re.match("(.*?)paper", o)
-                       if m:
-                               paperguru.m_papersize = m.group()
-                       else:
-                               m = re.match("(\d\d)pt", o)
-                               if m:
-                                       paperguru.m_fontsize = int(m.group(1))
-               break
+                       return self.match.group (0)
        
-       while chunks[idx][0] != 'preamble-end':
-               if chunks[idx] == 'ignore':
-                       idx = idx + 1
-                       continue
-               m = get_re ('geometry').search(chunks[idx][1])
-               if m:
-                       paperguru.m_use_geometry = 1
-                       o = parse_options_string(m.group('options'))
-                       for k in o.keys():
-                               paperguru.set_geo_option(k, o[k])
-               idx = idx + 1
-
-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 == 'texi':
-               scan_texi_preamble(chunks)
-       else:
-               assert __main__.format == 'latex'
-               scan_latex_preamble(chunks)
+       def output_html (self):
+               base = self.basename ()
+               option_string = self.match.group ('options')
+               str = self.output_print_filename (HTML)
+               if option_string and VERBATIM in split_options (option_string)\
+                      and format == HTML:
+                       verb = verbatim_html (self.substring ('code'))
+                       str  += write (output[HTML][VERBATIM] % vars ())
+               return (str + output[HTML][BEFORE] 
+                       + (output[HTML][OUTPUT] % vars ())
+                       + output[HTML][AFTER])
+                       
+       def output_latex (self):
+               option_string = self.match.group ('options')
+
+               str = self.output_print_filename (LATEX)
+                       
+               base = self.basename ()
+               str +=  (output[LATEX][BEFORE]
+                        + (output[LATEX][OUTPUT] % vars ())
+                        + output[LATEX][AFTER])
+
                
+               if option_string and VERBATIM in split_options (option_string)\
+                  and format == LATEX:
+                       verb = self.substring ('code')
+                       str += (output[LATEX][VERBATIM] % vars ())
+
+               return str
+
+       def output_print_filename (self,format):
+               str = ''
+               option_string = self.substring ('options')
+               if option_string and PRINTFILENAME in split_options (option_string):
+                       base = self.basename ()
+                       filename = self.substring ('filename')
+                       str += output[format][PRINTFILENAME] % vars ()
+
+               return str
+       
+       def output_texinfo (self):
+               str = ''
 
-def completize_preamble (chunks):
-       if __main__.format == 'texi':
-               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 chunks[x][0] != 'preamble-end':
-               x = x + 1
-       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')))
-       return chunks
-
-
-read_files = []
-def find_file (name):
-       """
-       Search the include path for NAME. If found, return the (CONTENTS, PATH) of the file.
-       """
+               option_string = self.substring ('options')
+               if option_string and VERBATIM in split_options (option_string):
+                       verb = verbatim_texinfo (self.substring ('code'))
+                       str +=  (output[TEXINFO][VERBATIM] % vars ())
+
+               str += '\n@tex\n'
+               str += self.output_latex ()
+               str += ('\n@end tex\n')
+               
+               str += ('\n@html\n')
+               str += self.output_html ()
+               str += ('\n@end html\n')
+
+               return str
+                       
+       def outdated_p (self):
+               if self.type != 'lilypond_block' and self.type != 'lilypond'\
+                      and self.type != 'lilypond_file':
+                       return None
+               base = self.basename ()
+               if os.path.exists (base + '.ly') \
+                  and os.path.exists (base + '.tex') \
+                  and (use_hash_p \
+                       or self.ly () == open (base + '.ly').read ()):
+                       # TODO: something smart with target formats
+                       # (ps, png) and m/ctimes
+                       return None
+               return self
+
+       def filter_code (self):
+               pass # todo
        
-       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 do_ignore(match_object):
-       return [('ignore', match_object.group('code'))]
-def do_preamble_end(match_object):
-       return [('preamble-end', match_object.group('code'))]
 
-def make_verbatim(match_object):
-       return [('verbatim', match_object.group('code'))]
+def find_toplevel_snippets (str, types):
+       "return: (new string, snippets)" 
+       snippets  = []
+       for t in types:
+               regex = re.compile (snippet_res[format][t])
 
-def make_verb(match_object):
-       return [('verb', match_object.group('code'))]
+               # ugh, this can be done nicer in python 2.x
+               def notice_snippet (match, snippets = snippets,
+                                   t = t, str = str):
+                       s = Snippet (t, str, match)
+                       snippets.append (s)
 
-def do_include_file(m):
-       "m: MatchObject"
-       return [('input', get_output ('pagebreak'))] \
-            + read_doc_file(m.group('filename')) \
-            + [('input', get_output ('pagebreak'))] 
+                       
+                       return s.replacement_text (format)
 
-def do_input_file(m):
-       return read_doc_file(m.group('filename'))
+               str = regex.sub (notice_snippet, str)
+       return (str, snippets)
 
-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 make_lilypond_file(m):
-       """
 
-       Find @lilypondfile{bla.ly} occurences and substitute bla.ly
-       into a @lilypond .. @end lilypond block.
+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
        
-       if m.group('options'):
-               options = m.group('options')
-       else:
-               options = ''
-       (content, nm) = find_file(m.group('filename'))
-       options = "filename=%s," % nm + options
+def run_filter (s):
+       return filter_pipe (s, filter_cmd)
+
+def process_snippets (cmd, snippets):
+       names = filter (lambda x:x, map (Snippet.basename, snippets))
+       if names:
+               ly.system (string.join ([cmd] + names))
+
+       if format == HTML or format == TEXINFO:
+               for i in names:
+                       if os.path.exists (i + '.tex'):
+                               to_eps (i)
+                               ly.make_ps_images (i + '.eps', resolution=110)
+
+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}
+'''
+#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:
+               columns = string.atoi (m.group (1))
+
+       columnsep = 0
+       m = re.search ('columnsep=([0-9.]*)pt', parameter_string)
+       if m:
+               columnsep = string.atof (m.group (1))
+
+       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,
+       '.lytex' : LATEX,
+       '.tely' : TEXINFO,
+       '.tex': LATEX,
+       '.texi' : TEXINFO,
+       '.texinfo' : TEXINFO,
+       '.xml' : HTML,
+       }
+                              
+format2ext = {
+       HTML: '.html',
+       #TEXINFO: '.texinfo',
+       TEXINFO: '.texi',
+       LATEX: '.tex',
+       }
 
-       return [('input', get_output('output-lilypond') %
-                       (options, content))]
+def do_file (input_filename):
+       #ugh
+       global format
+       if not format:
+               e = os.path.splitext (input_filename)[1]
+               if e in ext2format.keys ():
+                       #FIXME
+                       format = ext2format[e]
+               else:
+                       ly.error (_ ("cannot determine format for: %s" \
+                                    % input_filename))
 
-def make_lilypond_block(m):
-       if m.group('options'):
-               options = get_re('option-sep').split (m.group('options'))
+       ly.progress (_ ("Reading %s...") % input_filename)
+       if not input_filename or input_filename == '-':
+               ih = sys.stdin
        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)]
+               ih = open (input_filename)
+
+       source = ih.read ()
+       ly.progress ('\n')
+
+       ly.progress (_ ("Dissecting..."))
+       #snippets = find_toplevel_snippets (source, snippet_res[format].keys ())
+       snippet_types = (
+               'lilypond_block',
+               'verb',
+               'verbatim',
+               'singleline_comment',
+               'multiline_comment',
+               'lilypond_file',
+               'include',
+               'lilypond', )
        
-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
-
-def determine_format (str):
-       if __main__.format == '':
-               
-               latex =  re.search ('\\\\document', str[:200])
-               texinfo =  re.search ('@node|@setfilename', str[:200])
+       (source, snippets) = simple_toplevel_snippets (source, snippet_types)
+       ly.progress ('\n')
 
-               f = ''
-               g = None
-               
-               if texinfo and latex == None:
-                       f = 'texi'
-               elif latex and texinfo == None: 
-                       f = 'latex'
-               else:
-                       error("error: can't determine format, please specify")
-               __main__.format = f
-
-       if __main__.paperguru == None:
-               if __main__.format == 'texi':
-                       g = TexiPaper()
+       output_file = None
+       if output_name == '-' or not output_name:
+               output_file = sys.stdout
+               output_filename = '-'
+       else:
+               if not os.path.isdir (output_name):
+                       os.mkdir (output_name, 0777)
+               if input_filename == '-':
+                       input_base = 'stdin'
                else:
-                       g = LatexPaper()
+                       input_base = os.path.splitext (input_filename)[0]
+                       input_base = os.path.basename (input_base)
                        
-               __main__.paperguru = g
-
+               output_filename = output_name + '/' + input_base \
+                                 + format2ext[format]
+               output_file = open (output_filename, 'w')
+               os.chdir (output_name)
 
-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)
-       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
-
-
-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.
-
-       Return: a chunk (TYPE_STR, MAIN_STR, OPTIONS, TODO, BASE)
-
-       TODO has format [basename, extension, extension, ... ]
-       
-       """
-       (type, body, opts) = chunk
-       assert type == 'lilypond'
-       file_body = compose_full_body (body, opts)
-       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
-                       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  == '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):
-                       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)
-                               break
                
-       
-       if 'verbatim' in opts:
-               newbody = output_verbatim (body)
-
-       for o in opts:
-               m = re.search ('intertext="(.*?)"', o)
-               if m:
-                       newbody = newbody  + m.group (1) + "\n\n"
-       if format == 'latex':
-               if 'eps' in opts:
-                       s = 'output-eps'
-               else:
-                       s = 'output-tex'
-       else: # format == 'texi'
-               s = 'output-all'
-       newbody = newbody + get_output (s) % {'fn': basename }
-       return ('lilypond', newbody, opts, todo, basename)
-
-def process_lilypond_blocks(outname, 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]
-               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 get_bbox (filename):
-       f = open (filename)
-       gr = []
-       while 1:
-               l =f.readline ()
-               m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', l)
-               if m:
-                       gr = map (string.atoi, m.groups ())
-                       break
-       
-       return gr
-
-def make_pixmap (name):
-       bbox = get_bbox (name + '.eps')
-       margin = 3
-       fo = open (name + '.trans.eps' , 'w')
-       fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin))
-       fo.close ()
-       
-       res = 90
 
-       x = (2* margin + bbox[2] - bbox[0]) * res / 72.
-       y = (2* margin + bbox[3] - bbox[1]) * res / 72.
-
-       cmd = r"""gs -g%dx%d -sDEVICE=pgm  -dTextAlphaBits=4 -dGraphicsAlphaBits=4  -q -sOutputFile=- -r%d -dNOPAUSE %s %s -c quit | pnmtopng > %s"""
-       
-       cmd = cmd % (x, y, res, name + '.trans.eps', name + '.eps',name + '.png')
-       try:
-               status = system (cmd)
-       except:
-               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, ' ')
-               system ('lilypond --header=texidoc %s %s' % (lilyopts, texfiles))
-
-               #
-               # 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:
-               system(r"tex '\nonstopmode \input %s'" % e)
-               system(r"dvips -E -o %s %s" % (e + '.eps', e))
+       global default_ly_options
+       textwidth = 0
+       if format == LATEX and LINEWIDTH not in default_ly_options.keys ():
+               textwidth = get_latex_textwidth (source)
+               default_ly_options[LINEWIDTH] = '''%.0f\pt''' % textwidth
+
+       if filter_cmd:
+               pass # todo
+       elif process_cmd:
+               outdated = filter (lambda x:x,
+                                  map (Snippet.outdated_p, snippets))
+               ly.progress (_ ("Writing snippets..."))
+               map (Snippet.write_ly, snippets)
+               ly.progress ('\n')
                
-       for g in png:
-               make_pixmap (g)
-               
-       os.chdir (d)
-
-
-def update_file (body, name):
-       """
-       write the body if it has changed
-       """
-       same = 0
-       try:
-               f = open (name)
-               fs = f.read (-1)
-               same = (fs == body)
-       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 = ','
+               if outdated:
+                       ly.progress (_ ("Processing..."))
+                       process_snippets (process_cmd, outdated)
+               else:
+                       ly.progress (_ ("All snippets are up to date..."))
+               ly.progress ('\n')
                
-       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 (_ ("Compiling %s...") % output_filename)
+               ly.progress ('\n')
 
+       output_file.write (source)
 
-Report bugs to bug-gnu-music@gnu.org.
+       def process_include (snippet):
+               os.chdir (original_dir)
+               name = snippet.substring ('filename')
+               ly.progress (_ ('Processing include: %s') % name)
+               ly.progress ('\n')
+               do_file (name)
 
-Written by Tom Cato Amundsen <tca@gnu.org> and
-Han-Wen Nienhuys <hanwen@cs.uu.nl>
-""")
+       map (process_include, filter (lambda x: x.type == 'include', snippets))
 
-       sys.exit (0)
-
-
-def write_deps (fn, target, chunks):
-       global read_files
-       sys.stdout.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():
-       sys.stdout.write ('lilypond-book (GNU LilyPond) %s\n' % program_version)
-
-def print_version ():
-       identify()
-       sys.stdout.write (r"""Copyright 1998--1999
-Distributed under terms of the GNU General Public License. It comes with
-NO WARRANTY.
-""")
-
-
-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
-
-
-foutn=""
-def do_file(input_filename):
-       global foutn
-       file_settings = {}
-       if outname:
-               my_outname = outname
-       else:
-               my_outname = os.path.basename(os.path.splitext(input_filename)[0])
-       my_depname = my_outname + '.dep'                
-
-       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)
-       #print "-" * 50
-       #for c in chunks: print "c:", c;
-       #sys.exit()
-       scan_preamble(chunks)
-       chunks = process_lilypond_blocks(my_outname, chunks)
-
-       foutn = os.path.join (g_outdir, my_outname + '.' + format)
-
-       # Do It.
-       if __main__.g_run_lilypond:
-               compile_all_files (chunks)
-               chunks = fix_epswidth (chunks)
-
-       if __main__.format == 'texi':
-               chunks = check_texidoc (chunks)
-
-       x = 0
-       chunks = completize_preamble (chunks)
-       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 == '--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 == '--force-music-fontsize':
-               g_force_lilypond_fontsize = string.atoi(a)
-       elif o == '--force-lilypond-fontsize':
-               print "--force-lilypond-fontsize is deprecated, use --default-lilypond-fontsize"
-               g_force_lilypond_fontsize = string.atoi(a)
-       elif o == '--dep-prefix':
-               g_dep_prefix = a
-       elif o == '--no-pictures':
-               g_do_pictures = 0
-       elif o == '--read-lys':
-               g_read_lys = 1
-       elif o == '--outdir':
-               g_outdir = a
-
-identify()
-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)
+def do_options ():
+       global format, output_name
+       global filter_cmd, process_cmd, verbose_p
        
-#
-# Petr, ik zou willen dat ik iets zinvoller deed,
-# maar wat ik kan ik doen, het verandert toch niets?
-#   --hwn 20/aug/99
+       (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 == '--help' or o == '-h':
+                       ly.help ()
+                       sys.exit (0)
+               elif o == '--include' or o == '-I':
+                       include_path.append (os.path.join (original_dir,
+                                                          ly.abspath (a)))
+               elif o == '--output' or o == '-o':
+                       output_name = a
+               elif o == '--outdir':
+                       output_name = a
+               elif o == '--process' or o == '-P':
+                       process_cmd = a
+                       filter_cmd = 0
+               elif o == '--version' or o == '-v':
+                       ly.identify (sys.stdout)
+                       sys.exit (0)
+               elif o == '--verbose' or o == '-V':
+                       verbose_p = 1
+               elif o == '--warranty' or o == '-w':
+                       if 1 or status:
+                               ly.warranty ()
+                       sys.exit (0)
+       return files
+
+def main ():
+
+       files = do_options ()
+       global process_cmd
+       if process_cmd:
+               process_cmd += string.join ([(' -I %s' % p) for p in include_path])
+       ly.identify (sys.stderr)
+       ly.setup_environment ()
+       if files:
+               do_file (files[0])
+
+if __name__ == '__main__':
+       main ()