]> git.donarmstrong.com Git - lilypond.git/blobdiff - scripts/lilypond-book.py
* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.
[lilypond.git] / scripts / lilypond-book.py
index 7add63df5c145f34b8939d2ec7b57b026d7acb72..0592d020ad7c76926923fc7dcea6675ff2dfbc76 100644 (file)
@@ -55,6 +55,7 @@ sys.path.insert (0, os.path.join (datadir, 'python'))
 #if __name__ == '__main__':
 
 import lilylib as ly
+import fontextract
 global _;_=ly._
 global re;re = ly.re
 
@@ -79,8 +80,8 @@ copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
             'Han-Wen Nienhuys <hanwen@cs.uu.nl>')
 
 option_definitions = [
-       (_ ("EXT"), 'f', 'format',
-         _ ('''use output format EXT (texi [default], texi-html,
+       (_ ("FMT"), 'f', 'format',
+         _ ('''use output format FMT (texi [default], texi-html,
                latex, html)''')),
        (_ ("FILTER"), 'F', 'filter',
          _ ("pipe snippets through FILTER [convert-ly -n -]")),
@@ -92,6 +93,8 @@ option_definitions = [
          _ ("write output to DIR")),
        (_ ("COMMAND"), 'P', 'process',
          _ ("process ly_files using COMMAND FILE...")),
+       (_('FILE'), '', 'psfonts',
+        _('extract all PS snippet fonts into FILE')),
        ('', 'V', 'verbose',
          _ ("be verbose")),
        ('', 'v', 'version',
@@ -107,6 +110,7 @@ lilypond_binary = os.path.join ('@bindir@', 'lilypond')
 if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
        lilypond_binary = 'lilypond'
 
+psfonts_file = ''
 use_hash_p = 1
 format = 0
 output_name = 0
@@ -135,6 +139,7 @@ NOTES = 'body'
 NOTIME = 'notime'
 OUTPUT = 'output'
 OUTPUTIMAGE = 'outputimage'
+PACKED = 'packed'
 PAPER = 'paper'
 PREAMBLE = 'preamble'
 PRINTFILENAME = 'printfilename'
@@ -145,6 +150,8 @@ STAFFSIZE = 'staffsize'
 TEXIDOC = 'texidoc'
 TEXINFO = 'texinfo'
 VERBATIM = 'verbatim'
+FONTLOAD = 'fontload'
+
 
 # NOTIME has no opposite so it isn't part of this dictionary.
 # NOQUOTE is used internally only.
@@ -153,6 +160,7 @@ no_options = {
        NOINDENT: INDENT,
 }
 
+
 # Recognize special sequences in the input.
 #
 #   (?P<name>regex) -- Assign result of REGEX to NAME.
@@ -380,7 +388,8 @@ simple_options = [
        NOINDENT,
        PRINTFILENAME,
        TEXIDOC,
-       VERBATIM
+       VERBATIM,
+       FONTLOAD
 ]
 
 ly_options = {
@@ -398,6 +407,8 @@ ly_options = {
                QUOTE: r'''linewidth = %(linewidth)s - 2.0 * %(exampleindent)s''',
 
                RAGGEDRIGHT: r'''raggedright = ##t''',
+
+               PACKED: r'''packed = ##t''',
        },
 
        ##
@@ -494,9 +505,17 @@ output = {
 ''',
 
                OUTPUTIMAGE: r'''@noindent
-@ifnottex
+@ifinfo
 @image{%(base)s,,,[image of music],%(ext)s}
-@end ifnottex
+@end ifinfo
+@html
+<p>
+  <a href="%(base)s.ly">
+    <img align="center" valign="center"
+        border="0" src="%(image)s" alt="[image of music]">
+  </a>
+</p>
+@end html
 ''',
 
                PRINTFILENAME: '''@file{%(filename)s}
@@ -530,6 +549,7 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 
 \paper {
   #(define dump-extents #t)
+  %(font_dump_setting)s
   %(paper_string)s
 }
 
@@ -581,170 +601,6 @@ def classic_lilypond_book_compatibility (key, value):
 
        return (None, None)
 
-def compose_ly (code, options, type):
-       option_dict = {}
-
-       for i in options:
-               if string.find (i, '=') > 0:
-                       (key, value) = re.split ('\s*=\s*', i)
-                       option_dict[key] = value
-               else:
-                       if i in no_options.keys ():
-                               if no_options[i] in option_dict.keys ():
-                                       del option_dict[no_options[i]]
-                       else:
-                               option_dict[i] = None
-
-       has_linewidth = option_dict.has_key (LINEWIDTH)
-       no_linewidth_value = 0
-
-       # If LINEWIDTH is used without parameter, set it to default.
-       if has_linewidth and option_dict[LINEWIDTH] == None:
-               no_linewidth_value = 1
-               del option_dict[LINEWIDTH]
-
-       for i in default_ly_options.keys ():
-               if i not in option_dict.keys ():
-                       option_dict[i] = default_ly_options[i]
-
-       if not has_linewidth:
-               if type == 'lilypond' or FRAGMENT in option_dict.keys ():
-                       option_dict[RAGGEDRIGHT] = None
-
-               if type == 'lilypond':
-                       if LINEWIDTH in option_dict.keys ():
-                               del option_dict[LINEWIDTH]
-               else:
-                       if RAGGEDRIGHT in option_dict.keys ():
-                               if LINEWIDTH in option_dict.keys ():
-                                       del option_dict[LINEWIDTH]
-
-               if QUOTE in option_dict.keys () or type == 'lilypond':
-                       if LINEWIDTH in option_dict.keys ():
-                               del option_dict[LINEWIDTH]
-
-       if not INDENT in option_dict.keys ():
-               option_dict[INDENT] = '0\\mm'
-
-       # The QUOTE pattern from ly_options only emits the `linewidth'
-       # keyword.
-       if has_linewidth and QUOTE in option_dict.keys ():
-               if no_linewidth_value:
-                       del option_dict[LINEWIDTH]
-               else:
-                       del option_dict[QUOTE]
-
-       if FRAGMENT in option_dict.keys ():
-               body = FRAGMENT_LY
-       else:
-               body = FULL_LY
-
-       # Defaults.
-       relative = 1
-       override = {}
-       # The original concept of the `exampleindent' option is broken.
-       # It is not possible to get a sane value for @exampleindent at all
-       # without processing the document itself.  Saying
-       #
-       #   @exampleindent 0
-       #   @example
-       #   ...
-       #   @end example
-       #   @exampleindent 5
-       #
-       # causes ugly results with the DVI backend of texinfo since the
-       # default value for @exampleindent isn't 5em but 0.4in (or a smaller
-       # value).  Executing the above code changes the environment
-       # indentation to an unknown value because we don't know the amount
-       # of 1em in advance since it is font-dependent.  Modifying
-       # @exampleindent in the middle of a document is simply not
-       # supported within texinfo.
-       #
-       # As a consequence, the only function of @exampleindent is now to
-       # specify the amount of indentation for the `quote' option.
-       #
-       # To set @exampleindent locally to zero, we use the @format
-       # environment for non-quoted snippets.
-       override[EXAMPLEINDENT] = r'0.4\in'
-       override[LINEWIDTH] = texinfo_linewidths['@smallbook']
-       override.update (default_ly_options)
-
-       option_list = []
-       for (key, value) in option_dict.items ():
-               if value == None:
-                       option_list.append (key)
-               else:
-                       option_list.append (key + '=' + value)
-       option_string = string.join (option_list, ',')
-
-       compose_dict = {}
-       compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER]
-       for a in compose_types:
-               compose_dict[a] = []
-
-       for (key, value) in option_dict.items():
-               (c_key, c_value) = \
-                 classic_lilypond_book_compatibility (key, value)
-               if c_key:
-                       if c_value:
-                               ly.warning \
-                                 (_ ("deprecated ly-option used: %s=%s" \
-                                   % (key, value)))
-                               ly.warning \
-                                 (_ ("compatibility mode translation: %s=%s" \
-                                   % (c_key, c_value)))
-                       else:
-                               ly.warning \
-                                 (_ ("deprecated ly-option used: %s" \
-                                   % key))
-                               ly.warning \
-                                 (_ ("compatibility mode translation: %s" \
-                                   % c_key))
-
-                       (key, value) = (c_key, c_value)
-
-               if value:
-                       override[key] = value
-               else:
-                       if not override.has_key (key):
-                               override[key] = None
-
-               found = 0
-               for type in compose_types:
-                       if ly_options[type].has_key (key):
-                               compose_dict[type].append (ly_options[type][key])
-                               found = 1
-                               break
-
-               if not found and key not in simple_options:
-                       ly.warning (_ ("ignoring unknown ly option: %s") % i)
-
-       # URGS
-       if RELATIVE in override.keys () and override[RELATIVE]:
-               relative = string.atoi (override[RELATIVE])
-
-       relative_quotes = ''
-
-       # 1 = central C
-       if relative < 0:
-               relative_quotes += ',' * (- relative)
-       elif relative > 0:
-               relative_quotes += "'" * relative
-
-       program_name = __main__.program_name
-
-       paper_string = \
-         string.join (compose_dict[PAPER], '\n  ') % override
-       layout_string = \
-         string.join (compose_dict[LAYOUT], '\n  ') % override
-       notes_string = \
-         string.join (compose_dict[NOTES], '\n  ') % vars ()
-       preamble_string = \
-         string.join (compose_dict[PREAMBLE], '\n  ') % override
-
-       return (PREAMBLE_LY + body) % vars ()
-
-
 def find_file (name):
        for i in include_path:
                full = os.path.join (i, name)
@@ -765,7 +621,10 @@ def verbatim_texinfo (s):
                               re.sub ('@', '@@', s)))
 
 def split_options (option_string):
-       return re.split (format_res[format]['option_sep'], option_string)
+       if option_string:
+               return re.split (format_res[format]['option_sep'],
+                                option_string)
+       return []
 
 class Chunk:
        def replacement_text (self):
@@ -781,21 +640,23 @@ class Chunk:
                return 0
 
 class Substring (Chunk):
-       def __init__ (self, source, start, end):
+       def __init__ (self, source, start, end, line_number):
                self.source = source
                self.start = start
                self.end = end
+               self.line_number = line_number
 
        def replacement_text (self):
                return self.source[self.start:self.end]
 
 class Snippet (Chunk):
-       def __init__ (self, type, match, format):
+       def __init__ (self, type, match, format, line_number):
                self.type = type
                self.match = match
                self.hash = 0
-               self.options = []
+               self.option_dict = {}
                self.format = format
+               self.line_number = line_number
 
        def replacement_text (self):
                return self.match.group ('match')
@@ -818,11 +679,11 @@ class Include_snippet (Snippet):
                return re.sub (f, self.processed_filename (), s)
 
 class Lilypond_snippet (Snippet):
-       def __init__ (self, type, match, format):
-               Snippet.__init__ (self, type, match, format)
+       def __init__ (self, type, match, format, line_number):
+               Snippet.__init__ (self, type, match, format, line_number)
                os = match.group ('options')
                if os:
-                       self.options = split_options (os)
+                       self.do_options (os, self.type)
 
        def ly (self):
                return self.substring ('code')
@@ -830,9 +691,179 @@ class Lilypond_snippet (Snippet):
        def full_ly (self):
                s = self.ly ()
                if s:
-                       return compose_ly (s, self.options, self.type)
+                       return self.compose_ly (s)
                return ''
 
+       def do_options (self, option_string, type):
+               self.option_dict = {}
+
+               options = split_options (option_string)
+
+               for i in options:
+                       if string.find (i, '=') > 0:
+                               (key, value) = re.split ('\s*=\s*', i)
+                               self.option_dict[key] = value
+                       else:
+                               if i in no_options.keys ():
+                                       if no_options[i] in self.option_dict.keys ():
+                                               del self.option_dict[no_options[i]]
+                               else:
+                                       self.option_dict[i] = None
+
+               has_linewidth = self.option_dict.has_key (LINEWIDTH)
+               no_linewidth_value = 0
+
+               # If LINEWIDTH is used without parameter, set it to default.
+               if has_linewidth and self.option_dict[LINEWIDTH] == None:
+                       no_linewidth_value = 1
+                       del self.option_dict[LINEWIDTH]
+
+               for i in default_ly_options.keys ():
+                       if i not in self.option_dict.keys ():
+                               self.option_dict[i] = default_ly_options[i]
+
+               if not has_linewidth:
+                       if type == 'lilypond' or FRAGMENT in self.option_dict.keys ():
+                               self.option_dict[RAGGEDRIGHT] = None
+
+                       if type == 'lilypond':
+                               if LINEWIDTH in self.option_dict.keys ():
+                                       del self.option_dict[LINEWIDTH]
+                       else:
+                               if RAGGEDRIGHT in self.option_dict.keys ():
+                                       if LINEWIDTH in self.option_dict.keys ():
+                                               del self.option_dict[LINEWIDTH]
+
+                       if QUOTE in self.option_dict.keys () or type == 'lilypond':
+                               if LINEWIDTH in self.option_dict.keys ():
+                                       del self.option_dict[LINEWIDTH]
+
+               if not INDENT in self.option_dict.keys ():
+                       self.option_dict[INDENT] = '0\\mm'
+
+               # The QUOTE pattern from ly_options only emits the `linewidth'
+               # keyword.
+               if has_linewidth and QUOTE in self.option_dict.keys ():
+                       if no_linewidth_value:
+                               del self.option_dict[LINEWIDTH]
+                       else:
+                               del self.option_dict[QUOTE]
+
+       def compose_ly (self, code):
+               if FRAGMENT in self.option_dict.keys ():
+                       body = FRAGMENT_LY
+               else:
+                       body = FULL_LY
+
+               # Defaults.
+               relative = 1
+               override = {}
+               # The original concept of the `exampleindent' option is broken.
+               # It is not possible to get a sane value for @exampleindent at all
+               # without processing the document itself.  Saying
+               #
+               #   @exampleindent 0
+               #   @example
+               #   ...
+               #   @end example
+               #   @exampleindent 5
+               #
+               # causes ugly results with the DVI backend of texinfo since the
+               # default value for @exampleindent isn't 5em but 0.4in (or a smaller
+               # value).  Executing the above code changes the environment
+               # indentation to an unknown value because we don't know the amount
+               # of 1em in advance since it is font-dependent.  Modifying
+               # @exampleindent in the middle of a document is simply not
+               # supported within texinfo.
+               #
+               # As a consequence, the only function of @exampleindent is now to
+               # specify the amount of indentation for the `quote' option.
+               #
+               # To set @exampleindent locally to zero, we use the @format
+               # environment for non-quoted snippets.
+               override[EXAMPLEINDENT] = r'0.4\in'
+               override[LINEWIDTH] = texinfo_linewidths['@smallbook']
+               override.update (default_ly_options)
+
+               option_list = []
+               for (key, value) in self.option_dict.items ():
+                       if value == None:
+                               option_list.append (key)
+                       else:
+                               option_list.append (key + '=' + value)
+               option_string = string.join (option_list, ',')
+
+               compose_dict = {}
+               compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER]
+               for a in compose_types:
+                       compose_dict[a] = []
+
+               for (key, value) in self.option_dict.items ():
+                       (c_key, c_value) = \
+                         classic_lilypond_book_compatibility (key, value)
+                       if c_key:
+                               if c_value:
+                                       ly.warning \
+                                         (_ ("deprecated ly-option used: %s=%s" \
+                                           % (key, value)))
+                                       ly.warning \
+                                         (_ ("compatibility mode translation: %s=%s" \
+                                           % (c_key, c_value)))
+                               else:
+                                       ly.warning \
+                                         (_ ("deprecated ly-option used: %s" \
+                                           % key))
+                                       ly.warning \
+                                         (_ ("compatibility mode translation: %s" \
+                                           % c_key))
+
+                               (key, value) = (c_key, c_value)
+
+                       if value:
+                               override[key] = value
+                       else:
+                               if not override.has_key (key):
+                                       override[key] = None
+
+                       found = 0
+                       for type in compose_types:
+                               if ly_options[type].has_key (key):
+                                       compose_dict[type].append (ly_options[type][key])
+                                       found = 1
+                                       break
+
+                       if not found and key not in simple_options:
+                               ly.warning (_ ("ignoring unknown ly option: %s") % key)
+
+               # URGS
+               if RELATIVE in override.keys () and override[RELATIVE]:
+                       relative = string.atoi (override[RELATIVE])
+
+               relative_quotes = ''
+
+               # 1 = central C
+               if relative < 0:
+                       relative_quotes += ',' * (- relative)
+               elif relative > 0:
+                       relative_quotes += "'" * relative
+
+               program_name = __main__.program_name
+
+               paper_string = string.join (compose_dict[PAPER],
+                                           '\n  ') % override
+               layout_string = string.join (compose_dict[LAYOUT],
+                                            '\n  ') % override
+               notes_string = string.join (compose_dict[NOTES],
+                                           '\n  ') % vars ()
+               preamble_string = string.join (compose_dict[PREAMBLE],
+                                              '\n  ') % override
+
+               font_dump_setting = ''
+               if FONTLOAD in self.option_dict:
+                       font_dump_setting = '#(define-public force-eps-font-include #t)\n'
+
+               return (PREAMBLE_LY + body) % vars ()
+
        # TODO: Use md5?
        def get_hash (self):
                if not self.hash:
@@ -878,7 +909,7 @@ class Lilypond_snippet (Snippet):
        def texstr_is_outdated (self):
                if backend == 'ps':
                        return 0
-               
+
                base = self.basename ()
                ok = self.ly_is_outdated ()
                ok = ok and (os.path.exists (base + '.texstr'))
@@ -916,10 +947,10 @@ class Lilypond_snippet (Snippet):
                base = self.basename ()
                if format == HTML:
                        str += self.output_print_filename (HTML)
-                       if VERBATIM in self.options:
+                       if VERBATIM in self.option_dict:
                                verb = verbatim_html (self.substring ('code'))
                                str += write (output[HTML][VERBATIM] % vars ())
-                       if QUOTE in self.options:
+                       if QUOTE in self.option_dict:
                                str = output[HTML][QUOTE] % vars ()
 
                str += output[HTML][BEFORE] % vars ()
@@ -939,8 +970,8 @@ class Lilypond_snippet (Snippet):
                        ext = ''
                        str += output[TEXINFO][OUTPUTIMAGE] % vars ()
 
-               base = self.basename()
-               str += output[format][OUTPUT] % vars()
+               base = self.basename ()
+               str += output[format][OUTPUT] % vars ()
                return str
 
        def output_latex (self):
@@ -948,10 +979,10 @@ class Lilypond_snippet (Snippet):
                base = self.basename ()
                if format == LATEX:
                        str += self.output_print_filename (LATEX)
-                       if VERBATIM in self.options:
+                       if VERBATIM in self.option_dict:
                                verb = self.substring ('code')
                                str += (output[LATEX][VERBATIM] % vars ())
-                       if QUOTE in self.options:
+                       if QUOTE in self.option_dict:
                                str = output[LATEX][QUOTE] % vars ()
 
                str += (output[LATEX][OUTPUT] % vars ())
@@ -959,7 +990,7 @@ class Lilypond_snippet (Snippet):
 
        def output_print_filename (self, format):
                str = ''
-               if PRINTFILENAME in self.options:
+               if PRINTFILENAME in self.option_dict:
                        base = self.basename ()
                        filename = self.substring ('filename')
                        str = output[format][PRINTFILENAME] % vars ()
@@ -976,24 +1007,24 @@ class Lilypond_snippet (Snippet):
                                + self.output_print_filename (LATEX)
                                + '\n@end tex\n')
                base = self.basename ()
-               if TEXIDOC in self.options:
+               if TEXIDOC in self.option_dict:
                        texidoc = base + '.texidoc'
                        if os.path.exists (texidoc):
                                str += '@include %(texidoc)s\n\n' % vars ()
 
-               if VERBATIM in self.options:
+               if VERBATIM in self.option_dict:
                        verb = verbatim_texinfo (self.substring ('code'))
                        str += (output[TEXINFO][VERBATIM] % vars ())
-                       if not QUOTE in self.options:
-                               str = output[TEXINFO][NOQUOTE] % vars()
+                       if not QUOTE in self.option_dict:
+                               str = output[TEXINFO][NOQUOTE] % vars ()
 
                str += self.output_info ()
-               
+
 #              str += ('@ifinfo\n' + self.output_info () + '\n@end ifinfo\n')
 #              str += ('@tex\n' + self.output_latex () + '\n@end tex\n')
 #              str += ('@html\n' + self.output_html () + '\n@end html\n')
 
-               if QUOTE in self.options:
+               if QUOTE in self.option_dict:
                        str = output[TEXINFO][QUOTE] % vars ()
 
                # need par after image
@@ -1014,6 +1045,22 @@ snippet_type_to_class = {
        'include': Include_snippet,
 }
 
+def find_linestarts (s):
+       nls = [0]
+       start = 0
+       end = len (s)
+       while 1:
+               i = s.find ('\n', start)
+               if i < 0:
+                       break
+
+               i = i + 1
+               nls.append (i)
+               start = i
+
+       nls.append (len (s))
+       return nls
+
 def find_toplevel_snippets (s, types):
        res = {}
        for i in types:
@@ -1028,6 +1075,8 @@ def find_toplevel_snippets (s, types):
        map (lambda x, f = found: f.setdefault (x, None),
             types)
 
+       line_starts = find_linestarts (s)
+       line_start_idx = 0
        # We want to search for multiple regexes, without searching
        # the string multiple times for one regex.
        # Hence, we use earlier results to limit the string portion
@@ -1048,8 +1097,15 @@ def find_toplevel_snippets (s, types):
                                cl = Snippet
                                if snippet_type_to_class.has_key (type):
                                        cl = snippet_type_to_class[type]
-                               snip = cl (type, m, format)
+
+
                                start = index + m.start ('match')
+                               line_number = line_start_idx
+                               while (line_starts[line_number] < start):
+                                       line_number += 1
+
+                               line_number += 1
+                               snip = cl (type, m, format, line_number)
                                found[type] = (start, snip)
 
                        if found[type] \
@@ -1070,11 +1126,14 @@ def find_toplevel_snippets (s, types):
                                endex = found[first][0]
 
                if not first:
-                       snippets.append (Substring (s, index, len (s)))
+                       snippets.append (Substring (s, index, len (s), line_start_idx))
                        break
 
+               while (start > line_starts[line_start_idx+1]):
+                       line_start_idx += 1
+
                (start, snip) = found[first]
-               snippets.append (Substring (s, index, start))
+               snippets.append (Substring (s, index, start, line_start_idx + 1))
                snippets.append (snip)
                found[first] = None
                index = start + len (snip.match.group ('match'))
@@ -1144,12 +1203,13 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
        # it is too generic for lilypond-book.
        if texstr_names and re.search ('^[0-9A-Za-z/]*lilypond', cmd):
 
-               my_system (string.join ([cmd + ' --backend texstr ' ] + texstr_names))
+               my_system (string.join ([cmd, '--backend texstr',
+                                        'snippet-map.ly'] + texstr_names))
                for l in texstr_names:
                        my_system ('latex %s.texstr' % l)
 
        if ly_names:
-               my_system (string.join ([cmd] + ly_names))
+               my_system (string.join ([cmd, 'snippet-map.ly'] + ly_names))
 
 LATEX_DOCUMENT = r'''
 %(preamble)s
@@ -1208,7 +1268,27 @@ format2ext = {
 class Compile_error:
        pass
 
-def do_process_cmd (chunks):
+def write_file_map (lys, name):
+       snippet_map = open ('snippet-map.ly', 'w')
+       snippet_map.write ("""
+#(define version-seen? #t)
+#(ly:add-file-name-alist '(
+""")
+       for ly in lys:
+               snippet_map.write ('("%s.ly" . "%s:%d (%s.ly)")\n'
+                                  % (ly.basename (),
+                                     name,
+                                     ly.line_number,
+                                     ly.basename ()))
+
+       snippet_map.write ('))\n')
+
+def do_process_cmd (chunks, input_name):
+       all_lys = filter (lambda x: is_derived_class (x.__class__,
+                                                     Lilypond_snippet),
+                         chunks)
+
+       write_file_map (all_lys, input_name)
        ly_outdated = \
          filter (lambda x: is_derived_class (x.__class__,
                                              Lilypond_snippet)
@@ -1230,7 +1310,8 @@ def do_process_cmd (chunks):
        ly.progress ('\n')
 
        if ly_outdated:
-               ly.progress (_ ("Processing...\n"))
+               ly.progress (_ ("Processing..."))
+               ly.progress ('\n')
                process_snippets (process_cmd, ly_outdated, texstr_outdated, png_outdated)
        else:
                ly.progress (_ ("All snippets are up to date..."))
@@ -1243,11 +1324,25 @@ def guess_format (input_filename):
                # FIXME
                format = ext2format[e]
        else:
-               ly.error (_ ("cannot determine format for: %s" \
+               ly.error (_ ("can't determine format for: %s" \
                             % input_filename))
                ly.exit (1)
        return format
-       
+
+def write_if_updated (file_name, lines):
+       try:
+               f = open (file_name)
+               oldstr = f.read ()
+               new_str = string.join (lines, '')
+               if old == new_str:
+                       ly.progress (_ ("Output file is up to date."))
+                       return
+       except:
+               pass
+
+       ly.progress (_ ("Writing output file."))
+       open (file_name, 'w').writelines (lines)
+
 def do_file (input_filename):
        # Ugh.
        if not input_filename or input_filename == '-':
@@ -1275,15 +1370,12 @@ def do_file (input_filename):
                output_filename = '-'
                output_file = sys.stdout
        else:
-               if not output_name:
-                       output_filename = input_base + format2ext[format]
-               else:
+               if output_name:
                        if not os.path.isdir (output_name):
                                os.mkdir (output_name, 0777)
-                       output_filename = (output_name
-                                          + '/' + input_base
-                                          + format2ext[format])
+                       os.chdir (output_name)
 
+               output_filename = input_base + format2ext[format]
                if os.path.exists (input_filename) \
                   and os.path.exists (output_filename) \
                   and os.path.samefile (output_filename, input_fullname):
@@ -1291,9 +1383,6 @@ def do_file (input_filename):
                          _ ("Output would overwrite input file; use --output."))
                        ly.exit (2)
 
-               output_file = open (output_filename, 'w')
-               if output_name:
-                       os.chdir (output_name)
        try:
                ly.progress (_ ("Reading %s...") % input_fullname)
                source = in_handle.read ()
@@ -1337,37 +1426,41 @@ def do_file (input_filename):
                                                break
 
                if filter_cmd:
-                       output_file.writelines ([c.filter_text () \
-                                                for c in chunks])
-
+                       write_if_updated (output_filename,
+                                         [c.filter_text () for c in chunks])
                elif process_cmd:
-                       do_process_cmd (chunks)
+                       do_process_cmd (chunks, input_fullname)
                        ly.progress (_ ("Compiling %s...") % output_filename)
-                       output_file.writelines ([s.replacement_text () \
-                                                for s in chunks])
+                       write_if_updated (output_filename,
+                                         [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)
+                       return do_file (name)
+
+               include_chunks = map (process_include,
+                                     filter (lambda x: is_derived_class (x.__class__,
+                                                                         Include_snippet),
+                                             chunks))
+
 
-               map (process_include,
-                    filter (lambda x: is_derived_class (x.__class__,
-                                                        Include_snippet),
-                            chunks))
+               return chunks + reduce (lambda x,y: x + y, include_chunks, [])
+               
        except Compile_error:
                os.chdir (original_dir)
                ly.progress (_ ("Removing `%s'") % output_filename)
                ly.progress ('\n')
-
-               os.unlink (output_filename)
                raise Compile_error
 
 def do_options ():
-       global format, output_name
+       global format, output_name, psfonts_file
        global filter_cmd, process_cmd, verbose_p
 
        (sh, long) = ly.getopt_args (option_definitions)
@@ -1413,6 +1506,8 @@ def do_options ():
                        sys.exit (0)
                elif o == '--verbose' or o == '-V':
                        verbose_p = 1
+               elif o == '--psfonts':
+                       psfonts_file = a
                elif o == '--warranty' or o == '-w':
                        if 1 or status:
                                ly.warranty ()
@@ -1427,13 +1522,15 @@ def main ():
 
        file = files[0]
        global process_cmd, format
-       format = guess_format (files[0])
+       if not format:
+               format = guess_format (files[0])
 
-       formats = "ps"
-       if format == TEXINFO:
-               formats += ',png' 
+       formats = 'ps'
+       if format == TEXINFO or format == HTML:
+               formats += ',png'
        if process_cmd == '':
-               process_cmd = lilypond_binary + ' --formats=%s --backend eps ' % formats
+               process_cmd = lilypond_binary \
+                             + ' --formats=%s --backend eps ' % formats
 
        if process_cmd:
                process_cmd += string.join ([(' -I %s' % p)
@@ -1443,7 +1540,16 @@ def main ():
        ly.setup_environment ()
 
        try:
-               do_file (file)
+               chunks = do_file (file)
+               if psfonts_file:
+                       fontextract.verbose = verbose_p
+                       snippet_chunks = filter (lambda x: is_derived_class (x.__class__,
+                                                                             Lilypond_snippet),
+                                                chunks)
+                       fontextract.extract_fonts (psfonts_file,
+                                                  [x.basename() + '.eps'
+                                                   for x in snippet_chunks])
+                       
        except Compile_error:
                ly.exit (1)