lilypond-book: Fix a couple of regression tests (issue 2223).

suffix-lyxml:
  Failed, image '05/lily-f58ad554.pdf' not found.
  Fixed in lilypond-book by linking pdf files to the output folder.

texinfo-language-detection:
  Suspicious, had the doctitle and texititle popping up between the
  snippet's filename and the image of music. Fixed in lilypond-book
  by reordering the output.

diff --git a/python/book_snippets.py b/python/book_snippets.py
index 127453d6afa6f79c9c84db7e6792926f9001a8f0..e8fbd50317d4ca0e094b45129ba9e28f91c775af 100644 (file)
--- a/python/book_snippets.py
+++ b/python/book_snippets.py
@@ -697,6 +697,7 @@ printing diff against existing file." % filename)
 
         map (consider_file, [base + '.tex',
                              base + '.eps',
+                             base + '.pdf',
                              base + '.texidoc',
                              base + '.doctitle',
                              base + '-systems.texi',

diff --git a/python/book_texinfo.py b/python/book_texinfo.py
index ca9ee31754f84dfe6adfd57d510dc2c292577957..31a10612b1b938024c00223d3a9548c7f95d74e3 100644 (file)
--- a/python/book_texinfo.py
+++ b/python/book_texinfo.py
@@ -330,15 +330,15 @@ class BookTexinfoOutputFormat (BookBase.BookOutputFormat):
         return str
 
     def snippet_output (self, basename, snippet):
-        str = self.output_print_filename (basename, snippet)
+        str = ''
         base = basename
         if DOCTITLE in snippet.option_dict:
             doctitle = base + '.doctitle'
             translated_doctitle = doctitle + self.document_language
             if os.path.exists (translated_doctitle):
-                str += '@lydoctitle %s\n\n' % open (translated_doctitle).read ()
+                str += '\n@lydoctitle %s\n\n' % open (translated_doctitle).read ()
             elif os.path.exists (doctitle):
-                str += '@lydoctitle %s\n\n' % open (doctitle).read ()
+                str += '\n@lydoctitle %s\n\n' % open (doctitle).read ()
         if TEXIDOC in snippet.option_dict:
             texidoc = base + '.texidoc'
             translated_texidoc = texidoc + self.document_language
@@ -346,6 +346,7 @@ class BookTexinfoOutputFormat (BookBase.BookOutputFormat):
                 str += '@include %(translated_texidoc)s\n\n' % vars ()
             elif os.path.exists (texidoc):
                 str += '@include %(texidoc)s\n\n' % vars ()
+        str += self.output_print_filename (basename, snippet)
 
         substr = ''
         rep = snippet.get_replacements ();