X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Fmusicexp.py;h=e8cbcb016769301209d51af8a4f8283537959b37;hb=55e87e06de25f758f6ae665995cb9438d103fe08;hp=998267550e22a2570a8dd0f51f6d2cba2a15a3ff;hpb=0398fdb9df24ac2e22a8cbff1b3c18ca04e9f221;p=lilypond.git

diff --git a/python/musicexp.py b/python/musicexp.py
index 998267550e..e8cbcb0167 100644
--- a/python/musicexp.py
+++ b/python/musicexp.py
@@ -898,7 +898,6 @@ class Paper:
             printer.newline ()
         printer.dump ('\\paper {')
         printer.newline ()
-        printer.dump ("markup-system-spacing #'padding = #2")
         printer.newline ()
         self.print_length_field (printer, "paper-width", self.page_width)
         self.print_length_field (printer, "paper-height", self.page_height)
@@ -1361,7 +1360,12 @@ class TextEvent (Event):
         return { 1: '^', -1: '_', 0: '-' }.get (self.force_direction, '-')
 
     def ly_expression (self):
-        base_string = '%s\"%s\"'
+        # self.text will be enclosed by quotes, and the direction
+        # modifier must be separated from the opening quote by a space.
+        # This is so that subsequent line breaking for the output file
+        # using utilities.split_string_and_preserve_doublequoted_strings()
+        # properly detects the opening quote.
+        base_string = '%s \"%s\"'
         if self.markup:
             base_string = '%s\markup{ ' + self.markup + ' {%s} }'
         return base_string % (self.direction_mod (), self.text)
@@ -2167,7 +2171,7 @@ class StaffGroup:
             self.print_ly_context_mods (printer)
             for m in self.context_modifications:
                 printer.dump (m)
-            printer.dump ("} <<")
+            printer.dump ("}")
             printer.newline ()
         #print a single << after StaffGroup only when the with-block is not needed.
         #This doesn't work. << is printed before and after StaffGroup!