Merge master into nested-bookparts

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

diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
index e1826feb1e1f248475a7addb53617cd85ce773eb..089e4db8728ec3646bd280a028c4c2c2a975c78e 100644 (file)
--- a/input/manual/simultaneous-headword.ly
+++ b/input/manual/simultaneous-headword.ly
@@ -1,5 +1,18 @@
-\version "2.11.34"
+\version "2.11.61"
 \include "english.ly"
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+
+\layout {
+  \context { \Score
+    \override PaperColumn #'keep-inside-line = ##t
+    \override NonMusicalPaperColumn #'keep-inside-line = ##t
+  }
+}
 
 % NR 1.5 Simultaneous notes
 
@@ -8,27 +21,23 @@
 % Movt II - Arietta - Adagio molto semplice e cantabile
 % measures 108 - 118
 
-#(set-global-staff-size 16)
-
-\paper {
-  #(define dump-extents #t)
-  indent = 0\mm
-  ragged-right = ##t
-  line-width = 16\cm
-  force-assignment = #""
-  line-width = #(- line-width (* mm  3.000000))
-}
-
 \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 =
+    #(markup #:translate-scaled '(-0.05 . -1)
+             #:concat (#:musicglyph "scripts.trill"
+                       #:translate '(-0.5 . 1.9) #:fontsize -7 #:flat))
+
+
 \new PianoStaff <<
 
    % RH
@@ -76,7 +85,9 @@
          af''8. ]
 
          |
+         \break
 
+         \trillflat
          af''4. \startTrillSpan
          ~
          af''8.
@@ -108,8 +119,9 @@
 
          \key ef \major
          c'''8. [
-         cs'''8. \f ] \stopTrillSpan 
-         
+         cs'''8. \f ] \stopTrillSpan
+         r8.
+
       }
 
       % RH voice 2
@@ -131,6 +143,7 @@
          |
 
          d''8. \stopTrillSpan
+         \trillflat
          d''4. \startTrillSpan
          ~
 
@@ -157,6 +170,7 @@
 
          |
 
+         \trillflat
          d''4. \startTrillSpan
          ~
          d''8.
@@ -292,6 +306,7 @@
       \key ef \major
       r8.
       r8.
+      r8.
          
    }