]> git.donarmstrong.com Git - lilypond.git/blobdiff - scripts/lilypond-book.py
* scripts/lilypond-book.py (compose_ly): bugfix for relative < 0.
[lilypond.git] / scripts / lilypond-book.py
index cbb84e7b84ef6843c0e7f15f564b0a2184771d57..7d298fd518ec1a431a1c9746a6ab97ea3dd172f7 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?
+      
+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 getopt
-import sys
 import __main__
-import operator
-
-# 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.
-
-if float (sys.version[0:3]) < 2.2:
-       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
-verbose_p = 0
+import glob
+import string
 
+################################################################
+# Users of python modules should include this snippet
+# and customize variables below.
+
+# 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)
+
+# 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]
 
+sys.path.insert (0, os.path.join (datadir, 'python'))
 
-try:
-       import gettext
-       gettext.bindtextdomain ('lilypond', localedir)
-       gettext.textdomain ('lilypond')
-       _ = gettext.gettext
-except:
-       def _ (s):
-               return s
+# Customize these
+#if __name__ == '__main__':
 
-def progress (s):
-       errorport.write (s + '\n')
+import lilylib as ly
+global _;_=ly._
+global re;re = ly.re
 
 
+# lilylib globals
 program_version = '@TOPLEVEL_VERSION@'
-if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
-       program_version = '1.5.53'
-
-# if set, LILYPONDPREFIX must take prevalence
-# if datadir is not set, we're doing a build and LILYPONDPREFIX 
-datadir = '@datadir@'
-
-if os.environ.has_key ('LILYPONDPREFIX') :
-       datadir = os.environ['LILYPONDPREFIX']
-else:
-       datadir = '@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 ()
-
-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',
-}
+program_name = 'lilypond-book'
+verbose_p = 0
+pseudo_filter_p = 0
+original_dir = os.getcwd ()
 
-# 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',
-}
 
-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_lilypond_fontsize = 0
-g_read_lys = 0
-g_do_pictures = 1
-g_num_cols = 1
-g_do_music = 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([]):
-                       value = map(conv_dimen_to_float, value)
-               else:
-                       value = conv_dimen_to_float(value)
-
-               if name == 'body' or name == 'text':
-                       if type(value) == type([]):
-                               self.m_geo_textwidth =  value[0]
-                       else:
-                               self.m_geo_textwidth =  value
-                       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() * value[0]
-                       else:
-                               self.m_geo_width = self.get_paperwidth() * value
-               elif name == 'hscale':
-                       self.m_geo_width = self.get_paperwidth() * 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[0]
-                               self.m_geo_rmargin =  value[1]
-                       else:
-                               self.m_geo_lmargin =  value
-                               self.m_geo_rmargin =  value
-               elif name == 'margin':#ugh there is a bug about this option in
-                                       # the geometry documentation
-                       if type(value) == type([]):
-                               self.m_geo_lmargin =  value[0]
-                               self.m_geo_rmargin =  value[0]
-                       else:
-                               self.m_geo_lmargin =  value
-                               self.m_geo_rmargin =  value
-               elif name == 'total':
-                       if type(value) == type([]):
-                               self.m_geo_width =  value[0]
-                       else:
-                               self.m_geo_width =  value
-               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 
+   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
 
-       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 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
-                       
-       
-# 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)}}
-
-html_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', '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' ),
+       (_ ("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")),
        ]
 
-# format specific strings, ie. regex-es for input, and % strings for output
-output_dict= {
-       'html' : {'output-lilypond': '''<lilypond%s>
-%s
-</lilypond>''',
-               'output-filename' : r'''
-
-<pre>%s</pre>:''',       
-                 '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>''',
-                 ## 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>
-''',
-                 },
-       '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': r'''\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-noinline': r'''
-%% generated: %(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 ''',
-                 'output-noinline': r'''
-@c generated: %(fn)s.png                 
-''',
-                 'pagebreak': None,
-                 'output-verbatim': r'''@example
-%s
-@end example
-''',
+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'
+FRAGMENT = 'fragment'
+HTML = 'html'
+LATEX = 'latex'
+LINEWIDTH = 'linewidth'
+NOFRAGMENT = 'nofragment'
+NOTES = 'body'
+OUTPUT = 'output'
+PAPER = 'paper'
+PREAMBLE = 'preamble'
+PRINTFILENAME = 'printfilename'
+RAGGEDRIGHT = 'raggedright'
+RELATIVE = 'relative'
+STAFFSIZE = 'staffsize'
+TEXIDOC = 'texidoc'
+TEXINFO = 'texinfo'
+VERBATIM = 'verbatim'
+
+# 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\s+ignore)\s',
+       'singleline_comment': r'(?m)^.*(?P<match>(?P<code>@c([ \t][^\n]*|)\n))',
+
+# don't do this: fucks up with @code{@{}
+#      'verb': r'''(?P<code>@code{.*?})''',
+       'verbatim': r'''(?s)(?P<code>@example\s.*?@end\s+example\s)''',
+       },
+       }
 
-# 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.
+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*',
+       },
+       }
 
-# should also support fragment in
+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'''
+    \context {
+        \StaffContext
+        \remove Time_signature_engraver
+    }''',
+       RAGGEDRIGHT : r'''
+    indent = 0.0\mm
+    raggedright = ##t''',
+       },
+       PREAMBLE: {
+       STAFFSIZE: r'''
+#(set-global-staff-size %(staffsize)s)''',
+       },
+       }
 
-# 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
+output = {
+       HTML : {
+       AFTER: r'''
+  </a>
+</p>''',
+       BEFORE: r'''
 <p>
-<a href="%(fn)s.png">
-<img border=0 src="%(fn)s.png" alt="[picture of music]">
-</a>
-@end html
+  <a href="%(base)s.ly">''',
+       OUTPUT: r'''
+    <img align="center" valign="center"
+         border="0" src="%(image)s" alt="[image of music]">''',
+       PRINTFILENAME:'<p><tt><a href="%(base)s.ly">%(filename)s</a></tt></p>',
+       VERBATIM: r'''<pre>
+%(verb)s</pre>''',
+       },
+
+       LATEX : {
+       AFTER: '',
+       BEFORE: '',
+       OUTPUT: r'''{\parindent 0pt
+\catcode`\@=12
+\ifx\preLilyPondExample\preLilyPondExample\fi
+\def\lilypondbook{}
+\input %(base)s.tex
+\ifx\preLilyPondExample\postLilyPondExample\fi
+\catcode`\@=0}''',
+       PRINTFILENAME: '''\\texttt{%(filename)s}
+
+       ''',
+       VERBATIM: r'''\begin{verbatim}
+%(verb)s\end{verbatim}
 ''',
-               }
-       
+       },
+
+       TEXINFO : {
+       AFTER: '',
+       BEFORE: '',
+       OUTPUT: r'''
+       @image{%(base)s,,,[image of music],%(ext)s}
+''',   
+       PRINTFILENAME: '''@file{%(filename)s}
+
+       ''',
+       VERBATIM: r'''@example
+%(verb)s@end example
+''',
+       },
        }
 
-def output_verbatim (body):
-       if __main__.format == 'html':
-               body = re.sub ('&', '&amp;', body)
-               body = re.sub ('>', '&gt;', body)
-               body = re.sub ('<', '&lt;', body)
-       elif __main__.format == 'texi':
-               body = re.sub ('([@{}])', '@\\1', body)
-       return get_output ('output-verbatim') % 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,
-                },
-       
-       '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)^(?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,
-                }
+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'
+
+texinfo_linewidths = {
+       '@afourpaper': '160 \\mm',
+       '@afourwide': '6.5 \\in',
+       '@afourlatex': '150 \\mm',
+       '@smallbook': '5 \\in' ,
+       '@letterpaper': '6\\in',
        }
 
-
-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 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, options):
+       #Hmm
+       for i in default_ly_options.keys ():
+               if i not in options:
+                       options.append (i)
        
-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]
-
-def get_re (name):
-       return  re_dict[format][name]
-
-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 (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
-       indent = ''
-       linewidth = ''
-       for o in opts:
-               if g_force_lilypond_fontsize:
-                       music_size = g_force_lilypond_fontsize
-               else:
-                       m = re.match ('([0-9]+)pt', o)
-                       if m:
-                               music_size = string.atoi(m.group (1))
-
-               m = re.match ('latexfontsize=([0-9]+)pt', o)
-               if m:
-                       latex_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)
-               if m:
-                       f = float (m.group (1))
-                       linewidth = 'linewidth = %f\\%s' % (f, m.group (2))
-
-       if re.search ('\\\\score', body):
-               is_fragment = 0
+       m = re.search (r'''\\score''', code)
+       if not m and (not options \
+                     or not NOFRAGMENT in options or FRAGMENT in options):
+               if RAGGEDRIGHT not in options:
+                       options.append (RAGGEDRIGHT)
+               body = FRAGMENT_LY
        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')
+               body = FULL_LY
+
+       # defaults
+       relative = 1
+       staffsize = 16
+       override = {}
+       override.update (default_ly_options)
+
+       option_string = string.join (options, ',')
+       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 '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 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
-               
-               error ("format of option string invalid (was `%')" % s)
-       return d
-
-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
-       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])
+               if string.find (i, '=') > 0:
+                       key, value = string.split (i, '=')
+                       override[key] = value
                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
-       
-       while idx < len(chunks) and 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 == 'html':
-               scan_html_preamble (chunks)
-       elif __main__.format == 'latex':
-               scan_latex_preamble (chunks)
-       elif __main__.format == 'texi':
-               scan_texi_preamble (chunks)
+                       key = i
+                       if i not in override.keys ():
+                               override[i] = None
+
+               if key in ly_options[NOTES].keys ():
+                       notes_options.append (ly_options[NOTES][key])
+               elif key in ly_options[PREAMBLE].keys ():
+                       preamble_options.append (ly_options[PREAMBLE][key])
+               elif key in ly_options[PAPER].keys ():
+                       paper_options.append (ly_options[PAPER][key])
+               elif key not in (FRAGMENT, NOFRAGMENT, PRINTFILENAME,
+                                RELATIVE, VERBATIM, TEXIDOC):
+                       ly.warning (_("ignoring unknown ly option: %s") % i)
+
+       #URGS
+       if RELATIVE in override.keys () and override[RELATIVE]:
+               relative = string.atoi (override[RELATIVE])
+
+       relative_quotes = ''
+
+       # 1 = central C
+       if relative < 0:
+               relative_quotes += ',' * (- relative)
+       elif relative > 0:
+               relative_quotes += "'" * relative
                
+       program_name = __main__.program_name
+       paper_string = string.join (paper_options, '\n    ') % override
+       preamble_string = string.join (preamble_options, '\n    ') % override
+       notes_string = string.join (notes_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))
 
-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
+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 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 verbatim_html (s):
+       return re.sub ('>', '&gt;',
+                      re.sub ('<', '&lt;',
+                              re.sub ('&', '&amp;', s)))
 
-       return chunks
+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)
 
-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 do_ignore(match_object):
-       return [('ignore', match_object.group('code'))]
-def do_preamble_end(match_object):
-       return [('preamble-end', match_object.group('code'))]
+class Chunk:
+       def replacement_text (self):
+               return ''
 
-def make_verbatim(match_object):
-       return [('verbatim', match_object.group('code'))]
+       def is_outdated (self):
+               return 0
 
-def make_verb(match_object):
-       return [('verb', match_object.group('code'))]
+class Substring (Chunk):
+       def __init__ (self, source, start, end):
+               self.source = source
+               self.start = start
+               self.end = end
 
-def do_include_file(m):
-       "m: MatchObject"
-       return [('input', get_output ('pagebreak'))] \
-            + read_doc_file(m.group('filename')) \
-            + [('input', get_output ('pagebreak'))] 
+       def replacement_text (self):
+               return self.source [self.start:self.end]
+       
+class Snippet (Chunk):
+       def __init__ (self, type, match, format):
+               self.type = type
+               self.match = match
+               self.hash = 0
+               self.options = []
+               self.format = format
+
+       def replacement_text (self):
+               return self.match.group (0)
+       
+       def substring (self, s):
+               return self.match.group (s)
 
-def do_input_file(m):
-       return read_doc_file(m.group('filename'))
+       def filter_code (self):
+               pass # todo
 
-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 __repr__ (self):
+               return `self.__class__`  +  " type =  " + self.type
 
-def make_lilypond_file(m):
-       '''
+class Include_snippet (Snippet):
+       def processed_filename (self):
+               f = self.substring ('filename')
+               return os.path.splitext (f)[0] + format2ext[format]
 
-       Find @lilypondfile{bla.ly} occurences and substitute bla.ly
-       into a @lilypond .. @end lilypond block.
+       def replacement_text (self):
+               s = self.match.group (0)
+               f = self.substring ('filename')
        
-       '''
+               return re.sub (f, self.processed_filename (), s)
+
+class Lilypond_snippet (Snippet):
+       def __init__ (self, type, match, format):
+               Snippet.__init__ (self, type, match, format)
+               os = match.group ('options')
+               if os:
+                       self.options = split_options (os)
+
+       def ly (self):
+               if self.type == 'lilypond_file':
+                       name = self.substring ('filename')
+                       return '\\renameinput \"%s\"\n' % name\
+                              + open (find_file (name)).read ()
+               else:
+                       return self.substring ('code')
+               
+       def full_ly (self):
+               s = self.ly ()
+               if s:
+                       return compose_ly (s, self.options)
+               return ''
        
-       if m.group('options'):
-               options = m.group('options')
-       else:
-               options = ''
-       (content, nm) = find_file(m.group('filename'))
-       options = "filename=%s," % nm + options
-
-       return [('input', get_output('output-lilypond') %
-                       (options, content))]
-
-def make_lilypond_block(m):
-       if not g_do_music:
-               return []
+       def get_hash (self):
+               if not self.hash:
+                       self.hash = abs (hash (self.full_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):
+               outf = open (self.basename () + '.ly', 'w')
+               outf.write (self.full_ly ())
+
+       def is_outdated (self):
+               base = self.basename ()
+               ## FIXME: adding PNG to is_outdated test fixes
+               ##        interrupted (web) builds.
+               ##        should only do this if PNG is actually target
+               if os.path.exists (base + '.ly') \
+                  and os.path.exists (base + '.tex') \
+                  and os.path.exists (base + '.png') \
+                  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
        
-       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 replacement_text (self):
+               func = Lilypond_snippet.__dict__ ['output_' + self.format]
+               return func (self)
        
-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 == '':
+       def get_images (self):
+               base = self.basename ()
+               # URGUGHUGHUGUGHU
+               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
                
-               html = re.search ('(?i)<[dh]tml', str[:200])
-               latex = re.search (r'''\\document''', str[:200])
-               texi = re.search ('@node|@setfilename', str[:200])
-
-               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 ()
+       def output_html (self):
+               str = ''
+               base = self.basename ()
+               if format == HTML:
+                       str += self.output_print_filename (HTML)
+                       if VERBATIM in self.options:
+                               verb = verbatim_html (self.substring ('code'))
+                               str += write (output[HTML][VERBATIM] % vars ())
+
+               str += output[HTML][BEFORE] % vars ()
+               for image in self.get_images ():
+                       base, ext = os.path.splitext (image)
+                       str += output[HTML][OUTPUT] % vars ()
+               str += output[HTML][AFTER] % vars ()
+               return str
+
+       def output_info (self):
+               str = self.output_print_filename (HTML)
+               str = output[TEXINFO][BEFORE] % vars ()
+               for image in self.get_images ():
+                       base, ext = os.path.splitext (image)
+                       # URG, makeinfo implicitely prepends dot to ext
+                       # specifying no extension is most robust
+                       ext = ''
+                       str += output[TEXINFO][OUTPUT] % vars ()
+               str += output[TEXINFO][AFTER] % vars ()
+               return str
+
+       def output_latex (self):
+               str = ''
+               base = self.basename ()
+               if format == LATEX:
+                       str += self.output_print_filename (LATEX)
+                       if  VERBATIM in self.options:
+                               verb = self.substring ('code')
+                               str += (output[LATEX][VERBATIM] % vars ())
+               str +=  (output[LATEX][BEFORE]
+                        + (output[LATEX][OUTPUT] % vars ())
+                        + output[LATEX][AFTER])
+               return str
+
+       def output_print_filename (self,format):
+               str = ''
+               if  PRINTFILENAME in self.options:
+                       base = self.basename ()
+                       filename = self.substring ('filename')
+                       str = output[format][PRINTFILENAME] % vars ()
+               return str
+
+       def output_texinfo (self):
+               str = ''
+               # self.output_print_filename (TEXINFO)
+               str += ('@html\n' + self.output_print_filename (HTML)
+                       + '\n@end html\n')
+               str += ('@tex\n' + self.output_print_filename (LATEX)
+                       + '\n@end tex\n')
+               base = self.basename ()
+               if TEXIDOC in self.options:
+                       texidoc = base + '.texidoc'
+                       if os.path.exists (texidoc):
+                               str += '@include %(texidoc)s\n' % vars ()
+
+               if  VERBATIM in self.options:
+                       verb = verbatim_texinfo (self.substring ('code'))
+                       str +=  (output[TEXINFO][VERBATIM] % vars ())
+
+               str += ('@ifinfo\n' + self.output_info () + '\n@end ifinfo\n')
+               str += ('@tex\n' + self.output_latex () + '\n@end tex\n')
+               str += ('@html\n' + self.output_html () + '\n@end html\n')
+               # need par after image
+               str += '\n'
+
+               return str
                        
-               __main__.paperguru = g
+snippet_type_to_class = {
+       'lilypond_file' : Lilypond_snippet,
+       'lilypond_block' : Lilypond_snippet,
+       'lilypond' : Lilypond_snippet,
+       'include' : Include_snippet,
+       }
 
+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)
+
+       # 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]
+                               snip = cl (type, m, format)
+                               start = index + m.start (0)
+                               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 long as we do not
+                               # search for the start of blocks, but
+                               # always/directly for the entire
+                               # @block ... @end block.
+                               
+                                endex = found[first][0]
 
-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)
-       ## 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
-                       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):
-                       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 not first:
+                       snippets.append (Substring (s, index, len (s)))
+                       break
+
+               (start , snip) = found[first]
+               snippets.append (Substring (s, index, start))
+               snippets.append (snip)
+               found[first] = None
+                index = start + len (snip.match.group (0))
+
+        return snippets
+
+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 'verbatim' in opts:
-               newbody = output_verbatim (body)
+       if verbose_p:
+               ly.progress ('\n')
 
-       for o in opts:
-               m = re.search ('intertext="(.*?)"', o)
-               if m:
-                       newbody = newbody  + m.group (1) + "\n\n"
+       return output
        
-       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]
-               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):
-       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 = []
+def run_filter (s):
+       return filter_pipe (s, filter_cmd)
+
+def process_snippets (cmd, snippets):
+       names = filter (lambda x: x, map (Lilypond_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:
-               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=- -r%d -dNOPAUSE %s %s -c quit  > %s'''
+       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',
+       }
        
-       cmd = cmd % (x, y, res, name + '.trans.eps', name + '.eps',name + '.png')
-       quiet_system (cmd, 'gs')
+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))
 
-       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, ' ')
-               cmd = 'lilypond --header=texidoc %s %s %s' \
-                     % (lilyopts, g_extra_opts, texfiles)
-
-               system (cmd)
-
-               #
-               # 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)
+       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)
                
-       os.chdir (d)
-
+       if input_filename == '-':
+               input_base = 'stdin'
+       else:
+               input_base = os.path.basename \
+                            (os.path.splitext (input_filename)[0])
 
-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 = ','
+       # only default to stdout when filtering 
+       if output_name == '-' or (not output_name and filter_cmd):
+               output_filename = '-'
+               output_file = sys.stdout
+       else:
+               if not output_name:
+                       output_filename = input_base + format2ext[format]
+               else:
+                       if not os.path.isdir (output_name):
+                               os.mkdir (output_name, 0777)
+                       output_filename = (output_name
+                                          + '/' + input_base
+                                          + format2ext[format])
+
+
+               if (os.path.exists (input_filename) and 
+                   os.path.exists (output_filename) and 
+                   os.path.samefile (output_filename, input_fullname)):
+                       ly.error (_("Output would overwrite input file; use --output."))
+                       sys.exit (2)
+
+               output_file = open (output_filename, 'w')
+               if output_name:
+                       os.chdir (output_name)
+
+       ly.progress (_ ("Reading %s...") % input_fullname)
+       source = in_handle.read ()
+       ly.progress ('\n')
+
+       # 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')
+
+       global default_ly_options
+       textwidth = 0
+       if LINEWIDTH not in default_ly_options.keys ():
+               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: @paper is usually not in chunk #0:
+                               #        \input texinfo @c -*-texinfo-*-
+                               # bluntly search first K of source
+                               # s = chunks[0].replacement_text ()
+                               if re.search (k, source[:1024]):
+                                       default_ly_options[LINEWIDTH] = v
+                                       break
+
+       if filter_cmd:
+               pass # todo
+       elif process_cmd:
+               outdated = filter (lambda x: x.__class__ == Lilypond_snippet \
+                                  and x.is_outdated (), chunks)
+               ly.progress (_ ("Writing snippets..."))
+               map (Lilypond_snippet.write_ly, outdated)
+               ly.progress ('\n')
+
+               if outdated:
+                       ly.progress (_ ("Processing..."))
+                       process_snippets (process_cmd, outdated)
+               else:
+                       ly.progress (_ ("All snippets are up to date..."))
+               ly.progress ('\n')
+
+               ly.progress (_ ("Compiling %s...") % output_filename)
+               output_file.writelines ([s.replacement_text () \
+                                        for s in chunks])
+               ly.progress ('\n')
+
+       def process_include (snippet):
+               os.chdir (original_dir)
+               name = snippet.substring ('filename')
+               ly.progress (_ ('Processing include: %s') % name)
+               ly.progress ('\n')
+               do_file (name)
                
-       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
-
-
-
-Report bugs to bug-lilypond@gnu.org.
-
-Written by Tom Cato Amundsen <tca@gnu.org> and
-Han-Wen Nienhuys <hanwen@cs.uu.nl>
-''')
-
-       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.
-''')
-
-
-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
-
-
-##docme: why global?
-foutn=""
-def do_file(input_filename):
-
-       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(chunks)
-
-       # Do It.
-       if __main__.g_run_lilypond:
-               compile_all_files (chunks)
-               chunks = fix_epswidth (chunks)
-
-       if __main__.format == 'texi':
-               chunks = check_texidoc (chunks)
+       map (process_include,
+            filter (lambda x: x.__class__ == Include_snippet, chunks))
 
-       x = 0
-       chunks = completize_preamble (chunks)
-
-
-       global foutn
-
-       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'                
+def do_options ():
+       global format, output_name
+       global filter_cmd, process_cmd, verbose_p
        
-       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_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 == '--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
+       (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 ()