(main): add png for HTML too, guess

only if necessary. Thanks to John Williams.

diff --git a/ChangeLog b/ChangeLog
index 93fd797f5562ffa63ac2701896d4bbc5ffc84a9c..f5e76a1faf5909919ba402ed494ff1a70cef721d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scripts/lilypond-book.py (main): add png for HTML too, guess
+       only if necessary. Thanks to John Williams.
+
+       * flower/include/virtual-methods.hh: simplify. Patch by Matthias
+       Neeracher.
+
        * mf/GNUmakefile (depth): use $(FONTFORGE). Patch by Jeff Smith
        <whydoubt@yahoo.com>
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 58ad1d30686edea60ea77a8879cc897361a810ad..6f26c1ff841038221dc8266246f863ca69d79b74 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1447,10 +1447,11 @@ 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:
+       if format == TEXINFO or format == HTML: 
                formats += ',png' 
        if process_cmd == '':
                process_cmd = lilypond_binary + ' --formats=%s --backend eps ' % formats