Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / input / manual / simultaneous-headword.ly

diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
index 8650c35d86da82c1e72020432f0c829fcf47092e..a6b5ff8e470a606d795921df34adc286b60d96dc 100644 (file)
--- a/input/manual/simultaneous-headword.ly
+++ b/input/manual/simultaneous-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.12.0"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper{
@@ -6,7 +6,7 @@
   line-width=17\cm
   indent=0\cm
 }
- 
+
 \layout {
   \context { \Score
     \override PaperColumn #'keep-inside-line = ##t
@@ -24,15 +24,15 @@
 \layout {
    \context {
       \Score
-      \override SpacingSpanner #'base-shortest-duration = 
-         #(ly:make-moment 1 18) 
+      \override SpacingSpanner #'base-shortest-duration =
+         #(ly:make-moment 1 18)
       \override NonMusicalPaperColumn #'line-break-system-details =
          #'((alignment-offsets . (0 -12)))
    }
 }
 
-trillflat = 
-  \once \override TrillSpanner #'bound-details #'left #'text =
+trillflat =
+  \once \override TrillSpanner #'(bound-details left text) =
     #(markup #:translate-scaled '(-0.05 . -1)
              #:concat (#:musicglyph "scripts.trill"
                        #:translate '(-0.5 . 1.9) #:fontsize -7 #:flat))
@@ -85,6 +85,7 @@ trillflat =
          af''8. ]
 
          |
+         \break
 
          \trillflat
          af''4. \startTrillSpan
@@ -118,9 +119,9 @@ trillflat =
 
          \key ef \major
          c'''8. [
-         cs'''8. \f ] \stopTrillSpan 
+         cs'''8. \f ] \stopTrillSpan
          r8.
-         
+
       }
 
       % RH voice 2