Merge branch '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 abeca9094a4818194dfafff913221889a8cd73e8..b5ce0822d0d7117bdb0120de99e55f57e616816a 100644 (file)
--- a/input/manual/pitches-headword.ly
+++ b/input/manual/pitches-headword.ly
@@ -1,6 +1,143 @@
-\version "2.11.32"
+\version "2.11.57"
 \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
+  }
+}
 
-\markup{ Example removed temporarily}
+% NR 1.1 Pitches
 
+% L. v. Beethoven 
+% Piano sonata 21 - Dem Grafen von Waldstein Gewidmet
+% chorale at measures 34 - 40+
 
+\new PianoStaff <<
+
+   % RH Staff
+   \new Staff <<
+
+      % RH Voice 1
+      \new Voice {
+         \set Score.currentBarNumber = #34
+         \voiceOne
+         gs''2 ( ^ \markup \italic { dolce e molto ligato }
+         fs''4
+         e''4
+         |
+         ds''2
+         cs''2 )
+         |
+         ds''2 (
+         e''4
+         fs''4
+         |
+         <gs'' e''>2
+         <fs'' ds''>2 )
+         |
+         \oneVoice
+         \clef bass
+         <gs' e' b>2 (
+         <fs' ds' a>4
+         <e' cs' gs>4
+         |
+         <ds' bs fs>2
+         <cs' a e>2 )
+         |
+         \voiceOne
+         b2 %(
+         cs'4
+         ds'4
+         |
+         \clef treble
+         <e' gs>4 %)
+         r4 r2
+      }
+
+      % RH Voice 2
+      \new Voice {
+         \voiceTwo
+         \override Staff.DynamicLineSpanner #'staff-padding = #2.5
+         <e'' b'>2 \p
+         <ds'' a'>4
+         <cs'' gs'>4
+         |
+         <bs' fs'>2
+         e'2
+         |
+         \once \override TextScript #'staff-padding = #2.5
+         <b'! a'>2 _ \markup \italic { cresc. }
+         b'4
+         <e'' cs''>4
+         |
+         b'2. ( \sf \>
+         a'4 ) 
+         \clef bass
+         | \break
+         s1 \p
+         |
+         s1
+         |
+         <gs e>4 (
+         <a fs>2. )
+         |
+         s4
+         r4 r2
+      }
+
+   >>
+
+   % LH Staff
+   \new Staff {
+      \override Staff.SustainPedalLineSpanner #'staff-padding = #5
+      <gs' e'>2 ( \sustainOn
+      <fs' ds' b>4 \sustainOff
+      <e' cs'>4
+      |
+      <ds' bs gs>2
+      <cs' a>2 ) \sustainOn
+      |
+      \clef bass
+      \slurDown
+      <ds' b! a fs>2 ( \sustainOff
+      <e' b gs>4
+      <fs' cs' a>4 \sustainOn
+      |
+      \clef treble
+      \voiceOne
+      <<
+         {
+            <gs' e'>2
+            <fs' ds'>2 )
+         }
+         \new Voice {
+            \voiceTwo
+            b1 \sustainOff
+         }
+      >>
+      \oneVoice
+      |
+      %\break
+      \clef bass
+      <gs e>2 ( 
+      <fs ds b,>4
+      <e cs>4
+      |
+      <ds bs, gs,>2
+      <cs a,>2 ) \sustainOn
+      |
+      <b,! b,,!>1 ( \sustainOff
+      |
+      <e e,>4 )
+      r4 r2
+   }
+
+>>