(Lilypond_snippet.output_html,

Lilypond_snippet.output_latex): Always call output_print_filename.

diff --git a/ChangeLog b/ChangeLog
index cb511a7d60e80d849406a6b55e6c236bd26bc03b..a5faceed65e1309c08efc4be9135248488083be4 100644 (file)
--- 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 e9ed11648ef10c3122351e90192a8edc58bd2758..587879a50aebe828f7ff70d55d4a56aafbb20a80 100644 (file)
--- 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 ())