From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 25 Jul 2009 12:48:39 +0000 (+0200)
Subject: lilypond-book robustness: ensure EOL at the end of @verbatim
X-Git-Tag: release/2.13.4-1~303
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1423508c355989fa26a8cfe5985b0d6e1ab0a538;p=lilypond.git

lilypond-book robustness: ensure EOL at the end of @verbatim

Also honor NOGETTEXT fragment option for snippets-files.
---

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index ebea918cb4..14604ea827 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1036,10 +1036,12 @@ class LilypondSnippet (Snippet):
         self.do_options (os, self.type)
 
     def verb_ly (self):
-        if NOGETTEXT in self.option_dict:
-            return self.substring ('code')
-        else:
-            return verb_ly_gettext (self.substring ('code'))
+        verb_text = self.substring ('code')
+        if not NOGETTEXT in self.option_dict:
+            verb_text = verb_ly_gettext (verb_text)
+        if not verb_text.endswith ('\n'):
+            verb_text += '\n'
+        return verb_text
 
     def ly (self):
         contents = self.substring ('code')
@@ -1528,7 +1530,11 @@ class LilypondFileSnippet (LilypondSnippet):
         s = self.contents
         s = re_begin_verbatim.split (s)[-1]
         s = re_end_verbatim.split (s)[0]
-        return verb_ly_gettext (s)
+        if not NOGETTEXT in self.option_dict:
+            s = verb_ly_gettext (s)
+        if not s.endswith ('\n'):
+            s += '\n'
+        return s
 
     def ly (self):
         name = self.substring ('filename')