Merge master into nested-bookparts

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

diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly
index e4442accd36c534dab9b0d5c6d5d78ce15e11efb..33d4006513a7f44884e126ae6f1f6ddabcdd207d 100644 (file)
--- a/input/manual/pitches-headword.ly
+++ b/input/manual/pitches-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.1 Pitches
 
@@ -7,23 +20,6 @@
 % Piano sonata 21 - Dem Grafen von Waldstein Gewidmet
 % chorale at measures 34 - 40+
 
-\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 20) 
-   }
-}
-
 \new PianoStaff <<
 
    % RH Staff
@@ -63,6 +59,7 @@
          |
          \clef treble
          <e' gs>4 %)
+         r4 r2
       }
 
       % RH Voice 2
@@ -83,8 +80,8 @@
          |
          b'2. ( \sf \>
          a'4 ) 
-         |
          \clef bass
+         | \break
          s1 \p
          |
          s1
@@ -93,6 +90,7 @@
          <a fs>2. )
          |
          s4
+         r4 r2
       }
 
    >>
@@ -100,18 +98,18 @@
    % LH Staff
    \new Staff {
       \override Staff.SustainPedalLineSpanner #'staff-padding = #5
-      <gs' e'>2 ( \sustainDown
-      <fs' ds' b>4 \sustainUp
+      <gs' e'>2 ( \sustainOn
+      <fs' ds' b>4 \sustainOff
       <e' cs'>4
       |
       <ds' bs gs>2
-      <cs' a>2 ) \sustainDown
+      <cs' a>2 ) \sustainOn
       |
       \clef bass
       \slurDown
-      <ds' b! a fs>2 ( \sustainUp
+      <ds' b! a fs>2 ( \sustainOff
       <e' b gs>4
-      <fs' cs' a>4 \sustainDown
+      <fs' cs' a>4 \sustainOn
       |
       \clef treble
       \voiceOne
@@ -122,7 +120,7 @@
          }
          \new Voice {
             \voiceTwo
-            b1 \sustainUp
+            b1 \sustainOff
          }
       >>
       \oneVoice
@@ -134,11 +132,12 @@
       <e cs>4
       |
       <ds bs, gs,>2
-      <cs a,>2 ) \sustainDown
+      <cs a,>2 ) \sustainOn
       |
-      <b,! b,,!>1 ( \sustainUp
+      <b,! b,,!>1 ( \sustainOff
       |
       <e e,>4 )
+      r4 r2
    }
 
 >>