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 6c4823f1d42a5767161835f2abc29071dce76714..b5ce0822d0d7117bdb0120de99e55f57e616816a 100644 (file)
--- a/input/manual/pitches-headword.ly
+++ b/input/manual/pitches-headword.ly
@@ -1,212 +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
+  }
+}
+
+% NR 1.1 Pitches
+
+% L. v. Beethoven 
+% Piano sonata 21 - Dem Grafen von Waldstein Gewidmet
+% chorale at measures 34 - 40+
 
 \new PianoStaff <<
-   \set PianoStaff.connectArpeggios = ##t
-   \new Staff {
-      \time 2/4
-      \key fs \major
-      <<
-         \new Voice {
-            \voiceOne
-            fs''8 ( 
-            ^ \markup \column { 
-               \line \bold { Un peu retenu  }
-               \line \italic { très expressif } }
-            es''16
-            cs''16
-            as'4 )
-            |
-            fs''8 (
-            es''16
-            cs''16
-            as'4 )
-            |
-            fs''8 (
-            es''16
-            cs''16
-            as'8
-            cs''8 )
-            |
-         }
-         \new Voice {
-            \voiceTwo
-            r8 \ppp
-            fs'4 (
-            es'8 )
-            |
-            r8
-            fs'4 (
-            es'8 )
-            |
-            r8
-            fs'4 (
-            es'8 )
-            |
-         }
-      >>
-      \clef bass
-      <ds b! es'>4 (
-      ^ \markup \bold { Rall. }
-      \once \override Script #'padding = #2
-      <ds' as'>8 ) \fermata
-      \noBeam
-      \clef treble
-      \slurUp
-      <as fs'>8 ( \pp
-      |
-      <gs b cs'>4. )
-      ^ \markup \bold { a tempo }
-      \slurUp
-      <as fs'>8 (
-      |
-      <gs b cs'>4. )
-      <<
-         \new Voice {
-            \voiceOne
-            <as fs'>8 (
-            ^ \markup \bold { Rallentando }
-            |
-            cs'8
-            b16
-            cs'16
-            d'8
-            e'16
-            fs'16
-            |
-            <as! cs' gs'>4. )
-            s8
-            |
-            r8
-            <cs'' as'' cs'''>4 \arpeggio
-            e''16 (
-            ^ \markup \bold { Lent }
-            fs''16
-            |
-            \stemDown
-            <as'! cs'' gs''>2 )
-            |
-         }
-         \new Voice {
-            \voiceTwo
-            s8
-            |
-            <gs b>4 \<
-            <fs bs>4 \>
-            |
-            s4. \!
-            \slurUp
-            \once \override Script #'direction = #up
-            <a bs e'>8 ( \accent 
-            |
-            <as! cs' gs'>4. )
-            <a' bs'>8 \ppp \>
-            |
-            s8 \!
-            \stemDown
-            \once \override Script #'direction = #up
-            #(set-octavation 1)
-            % \once \override Arpeggio #'extra-offset = #'(-0.25 . 0)
-            <cs''' as''' cs''''>4. \arpeggio \fermata
-            #(set-octavation 0)
-            \bar "|."   
-         }
-      >>
-   }
+
+   % RH Staff
    \new Staff <<
-      \set Staff.pedalSustainStyle = #'bracket
-      \key fs \major
-      \clef bass
+
+      % RH Voice 1
       \new Voice {
+         \set Score.currentBarNumber = #34
          \voiceOne
-         ds'4 \tenuto
-         cs'4 \tenuto
+         gs''2 ( ^ \markup \italic { dolce e molto ligato }
+         fs''4
+         e''4
          |
-         ds'4 \tenuto
-         cs'4 \tenuto
+         ds''2
+         cs''2 )
          |
-         ds'4 \tenuto
-         cs'4 \tenuto
+         ds''2 (
+         e''4
+         fs''4
          |
-         s8
-         \clef treble
-         <b' cs''>8 [
-         \clef bass
-         <es b cs'>8 \fermata ]
-         s8
-         |
-         r8
-         \clef treble
-         <b' cs''>4 \tenuto
-         s8
+         <gs'' e''>2
+         <fs'' ds''>2 )
          |
-         r8
-         \clef treble
-         <b' cs''>4 \tenuto
-         s8
-         |
-         s2
-         |
-         r8
-         \clef treble
-         <as' cs''>4
+         \oneVoice
          \clef bass
-         s8
+         <gs' e' b>2 (
+         <fs' ds' a>4
+         <e' cs' gs>4
          |
-         s8
-         \clef treble
-         <as'>4 \arpeggio
-         \clef bass
-         s8
+         <ds' bs fs>2
+         <cs' a e>2 )
          |
-         s8
-         \clef treble
-         <as''>4. \arpeggio \fermata
+         \voiceOne
+         b2 %(
+         cs'4
+         ds'4
          |
+         \clef treble
+         <e' gs>4 %)
+         r4 r2
       }
+
+      % RH Voice 2
       \new Voice {
          \voiceTwo
-         ds'8 [ (
-         < ds bs >8
-         cs'8
-         < ds as >8 ] )
-         |
-         ds'8 [ (
-         < ds bs >8
-         cs'8
-         < ds as >8 ] )
-         |
-         ds'8 [ (
-         < ds bs >8
-         cs'8
-         < ds as >8 ] )
+         \override Staff.DynamicLineSpanner #'staff-padding = #2.5
+         <e'' b'>2 \p
+         <ds'' a'>4
+         <cs'' gs'>4
          |
-         \once \override Script #'outside-staff-priority = #100
-         \once \override TextScript #'outside-staff-priority = #500
-         <cs, gs,>4. \fermata
-         _ \markup \italic { ped. }
-         <fs, cs>8 (
+         <bs' fs'>2
+         e'2
          |
-         <e, b,>4. ) \sustainDown
-         \clef bass
-         <fs, cs>8 ( \sustainUp
+         \once \override TextScript #'staff-padding = #2.5
+         <b'! a'>2 _ \markup \italic { cresc. }
+         b'4
+         <e'' cs''>4
          |
-         <e, b,>4. ) \sustainDown
+         b'2. ( \sf \>
+         a'4 ) 
          \clef bass
-         <fs, cs>8 ( \sustainUp
-         |
-         <e, b,>4
-         <d, a,>4
+         | \break
+         s1 \p
          |
-         <fs,, cs,>4. ) \sustainDown
-         <a, e>8 ( \sustainUp
+         s1
          |
-         <fs, cs>4. ) \sustainDown
-         \slurUp
-         <a e'>8 ( \sustainUp \sustainDown
-         |
-         <fs cs'>2 ) \sustainUp \sustainDown
+         <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
+   }
+
 >>