X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=824cbabef9f5a69cdc081ba0223eddae1d303df5;hb=91708b30fba67f8fd589980e03ff420c26473a5a;hp=96c5dcc9c5f7360c3ae1fda604a3aac5f00b9985;hpb=e3be51aa65bc7573cc3b5c2e99499e8528dc2edf;p=lilypond.git

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 96c5dcc9c5..824cbabef9 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1245,19 +1245,12 @@ class Lilypond_snippet (Snippet):
         if PRINTFILENAME in self.option_dict:
             base = self.basename ()
             filename = os.path.basename (self.substring ('filename'))
-            str = output[global_options.format][PRINTFILENAME] % vars ()
+            str = output[format][PRINTFILENAME] % vars ()
 
         return str
 
     def output_texinfo (self):
-        str = ''
-        if self.output_print_filename (TEXINFO):
-            str += ('@html\n'
-                + self.output_print_filename (HTML)
-                + '\n@end html\n')
-            str += ('@tex\n'
-                + self.output_print_filename (LATEX)
-                + '\n@end tex\n')
+        str = self.output_print_filename (TEXINFO)
         base = self.basename ()
         if TEXIDOC in self.option_dict:
             texidoc = base + '.texidoc'