From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 12 Mar 2004 21:40:18 +0000 (+0000)
Subject: (Lilypond_snippet.output_html,
X-Git-Tag: release/2.1.31~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=998869243e58c9ae1d3c855e9c3b05c620859860;p=lilypond.git

(Lilypond_snippet.output_html,
Lilypond_snippet.output_latex): Always call output_print_filename.
---

diff --git a/ChangeLog b/ChangeLog
index cb511a7d60..a5faceed65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* scripts/lilypond-book.py (Lilypond_snippet.output_html,
+	Lilypond_snippet.output_latex): Always call output_print_filename.
+
 	* lily/paper-book.cc (fill_pages): New method.  Try to cramp or
 	expand pages.
 
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index e9ed11648e..587879a50a 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -517,10 +517,9 @@ class Lilypond_snippet (Snippet):
 		return images
 		
 	def output_html (self):
+		str = self.output_print_filename (HTML)
 		base = self.basename ()
-		str = ''
 		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 ())
@@ -533,6 +532,7 @@ class Lilypond_snippet (Snippet):
 		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)
@@ -544,10 +544,9 @@ class Lilypond_snippet (Snippet):
 		return str
 
 	def output_latex (self):
-		str = ''
+		str = self.output_print_filename (LATEX)
 		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 ())