Merge master into nested-bookparts

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

diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly
index 4c9ff368b81f29004de9cdad8ee273e859fe9184..cc9a465fe730ee97cd6bb781cc9f73349852e0ea 100644 (file)
--- a/input/manual/rhythms-headword.ly
+++ b/input/manual/rhythms-headword.ly
@@ -1,5 +1,10 @@
-\version "2.11.34"
+\version "2.11.61"
 \include "english.ly"
+#(set-global-staff-size 15)
+\paper {
+  line-width = 16\cm
+  indent = 0\cm
+}
 
 % NR 1.2 Rhythms
 
@@ -8,18 +13,15 @@
 % Movt II - Abwesenheit
 % Measures 31 - 34
 
-\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 40)
+      %\override SpacingSpanner #'strict-grace-spacing = ##t
+  }
 }
 
-\layout { }
-
-#(set-global-staff-size 16)
 \new PianoStaff <<
 
    % RH Staff
@@ -29,7 +31,12 @@
       \time 2/4
       \set Score.currentBarNumber = #31
 
-      <c'' c'>8 (
+      <c''' c''>8 ( -\markup {
+        \override #'(baseline-skip . 2) \italic \column {
+          \line { a tempo }
+          cantabile
+        }
+      }
       <g'' g'>8 )
       ~
       <g'' g'>8 (
@@ -39,7 +46,7 @@
       |
 
       \afterGrace
-         <f'' f'>8 (
+         <f'' f'>8 [ (
          {
             e''16 [
             f''16
@@ -47,8 +54,9 @@
             d''16 ]
          }
       <e''! e'>16
-      <f'' f'>16 )
-      <g'' g'>16 ( \staccato
+      <f'' f'>16 ] )
+      \once \override TextScript #'padding = #3.8
+      <g'' g'>16 ( \staccato -\markup { \italic cresc. }
       <a'' a'>16 ) \staccato
       <bf'' bf'>32  (
       <b'' b'>32 )
@@ -56,11 +64,12 @@
       <c''' c''>32 )
 
       |
-
-      b''32 (
+      
+      \once \override DynamicLineSpanner #'padding = #2
+      b''32 ( \p \>
       c'''32
       d'''32
-      c'''32 )
+      c'''32 ) \!
       g''8 (
       ~
       g''32 [
@@ -87,7 +96,7 @@
       |
 
       \afterGrace
-         <f'' f'>8 (
+         <f'' f'>8 [ (
          {
             e''16 [
             f''16
@@ -95,8 +104,8 @@
             d''16 ]
          }
       <e''! e'>16
-      <f'' f'>16 )
-      <g'' g'>16 ( \staccato
+      <f'' f'>16 ] )
+      <g'' g'>16 ( \staccato -\markup { \italic cresc. }
       <af''! af'!>16 ) \staccato
       <bf'' bf'>32  (
       <b'' b'>32 )