From: hanwen <hanwen>
Date: Sun, 27 Mar 2005 12:44:09 +0000 (+0000)
Subject: (main): add png for HTML too, guess
X-Git-Tag: release/2.5.23~307
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf2c51fb6dfbd2ec0a3eda31d93cd524f9be56e3;p=lilypond.git

(main): add png for HTML too, guess
only if necessary. Thanks to John Williams.
---

diff --git a/ChangeLog b/ChangeLog
index 93fd797f55..f5e76a1faf 100644
--- 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 58ad1d3068..6f26c1ff84 100644
--- 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