Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

[lilypond.git] / scripts / lilypond-book.py

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index dee3b9133ec6145507bf2be86d691864ee6dcbb4..8e14256ccb8a96712a83b05ab235f1d389a7c26d 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -235,6 +235,7 @@ LILYQUOTE = 'lilyquote'
 NOFRAGMENT = 'nofragment'
 NOINDENT = 'noindent'
 NOQUOTE = 'noquote'
+NORAGGED_RIGHT = 'noragged-right'
 NOTES = 'body'
 NOTIME = 'notime'
 OUTPUT = 'output'
@@ -562,6 +563,8 @@ ly_options = {
 
         RAGGED_RIGHT: r'''ragged-right = ##t''',
 
+        NORAGGED_RIGHT: r'''ragged-right = ##f''',
+
         PACKED: r'''packed = ##t''',
     },
 
@@ -1207,6 +1210,8 @@ class LilypondSnippet (Snippet):
 
         if 'ddump-profile' in global_options.process_cmd:
             require_file (base + '.profile')
+        if 'dseparate-log-file' in global_options.process_cmd:
+            require_file (base + '.log')
 
         map (consider_file, [base + '.tex',
                              base + '.eps',
@@ -1239,8 +1244,10 @@ class LilypondSnippet (Snippet):
             require_file (systemfile + '.eps')
             consider_file (systemfile + '.pdf')
 
+            # We can't require signatures, since books and toplevel
+            # markups do not output a signature.
             if 'ddump-signature' in global_options.process_cmd:
-                require_file (systemfile + '.signature')
+                consider_file (systemfile + '.signature')
              
        
         return (result, missing)