Merge master into nested-bookparts

[lilypond.git] / input / mutopia / R.Schumann / romanze-op28-2.ly

diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 2a0430f82663243da9014ea6808cca01cdbf3270..0f37f3a1edf3817178c5f8ee5c493da5454447ac 100644 (file)
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -1,11 +1,10 @@
-#(ly:set-option 'old-relative)
 % NOT FINISHED!!!!
 
 \include "deutsch.ly"
 
 #(set-global-staff-size 16)
 
-\version "2.4.0"
+\version "2.11.61"
 
 \header {
   title = "Romanzen"
@@ -84,7 +83,7 @@ righta =  \transpose c cis' {
   f) f'-5( e'-5 d'-4 c'-3  f')-5 <f^4 a^5>4( <e^3 g^5>8 |
  <a, f^4>4 <g, e^3>8 f16^4 d'^5~ d'8.[ c'16^4] |
  \forcedBreak 
- << f8)^3_\pp \context Voice = "another" { \m  a,16[ \u c8 c16] } >> \m  g,[ \u c_3] \m  b,[^\markup { \finger "2-1" } \u c8 c16] \m  a,[ \u c]~ | \stemNeutral
+ << f8)^3_\pp \new Voice =  "another" { \m  a,16[ \u c8 c16] } >> \m  g,[ \u c_3] \m  b,[^\markup { \finger "2-1" } \u c8 c16] \m  a,[ \u c]~ | \stemNeutral
  c16 c8_4 c c16~c c8_2 c c16~ |
  c16 c8 c c16~c c8 c c16~ |
  c16 c8 c c16 r4^\fermata r8 | \bar "|."
@@ -124,7 +123,7 @@ rightb =  \transpose c cis' {
   f,8.. f32^1 g8^2  a4.) |
   a4^1( c8^1_\accent~[c b)] g16^1([ b^2] |
    c4)^1 es8^1~es d^1 f^1~ |
-  \override PianoStaff.Arpeggio  #'direction = #1
+  \override PianoStaff.Arpeggio  #'direction = #UP
   f f8.. f32^1( as4.)^\fermata\arpeggio ~ |
   \revert PianoStaff.Arpeggio #'direction
   \stemUp \tieUp as r4 r8 |
@@ -164,7 +163,7 @@ lefta =  \transpose c cis {
   g4 a8~a f g | a4 g8~g f e |
   d4 g8~g es f | g4 f8~f es d |
   c4 r8 f4 as8~ | as g b as4 ces'8~ |
-  ces' b des' c'4 \context Voice = "another" { \stemUp \tieUp <es' es>8~ |
+  ces' b des' c'4 \new Voice =  "another" { \stemUp \tieUp <es' es>8~ |
   es' des'4^1~ \stemDown  des'8.[ c'16] }
  }
  \transpose c' c, {
@@ -237,44 +236,46 @@ leftb =  \transpose c cis {
  c c8 c c16 r4_\fermata r8 \bar "|." |
 }
 
+
+\paper {
+    indent = 0.5 \in
+    % textheight = 29.8 \cm
+    pagenumber = no
+    line-width = 17.0 \cm
+}  
+                      
 \score { 
   \context PianoStaff <<
     #(set-accidental-style 'piano-cautionary)
     \override PianoStaff.NoteCollision   #'merge-differently-dotted = ##t
     \set PianoStaff.connectArpeggios = ##t
-    \arpeggioBracket
+    \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
 
-    \override PianoStaff.InstrumentName   #'font-size = #6
-    \override PianoStaff.InstrumentName   #'font-shape = #'italic
-    \override PianoStaff.InstrumentName   #'font-magnification = #3
+    \override PianoStaff.InstrumentName #'font-size = #6
+    \override PianoStaff.InstrumentName #'font-shape = #'italic
+    \override PianoStaff.InstrumentName #'font-magnification = #3
     
-    \set PianoStaff.instrument = "  2."
-    \context Staff = "up" {
-      \override Staff.DynamicLineSpanner   #'direction = #-1
-      \clef G <<\global \context Voice = "upv" \righta >>
+    \set PianoStaff.instrumentName = "  2."
+    \new Staff =  "up" {
+      \override Staff.DynamicLineSpanner   #'direction = #DOWN
+      \clef G <<\global \new Voice =  "upv" \righta >>
     }
-    \context Staff = "mid" {
+    \new Staff =  "mid" {
     \override Staff.InstrumentName #'font-size = #0
     \override Staff.InstrumentName #'font-shape = #'upright
     \override Staff.InstrumentName #'font-magnification = #1
     \override Staff.InstrumentName #'extra-offset = #'(0 . 6)
-   % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}"
-    \set Staff.instrument = \markup { \column < Rechte Hand >  \hspace #2 }
-      \clef F <<\global \context Voice = "midv" \rightb>>
+   % \set Staff.instrumentName = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}"
+    \set Staff.instrumentName = \markup { \column { Rechte Hand }  \hspace #2 }
+      \clef F <<\global \new Voice =  "midv" \rightb>>
     }
-      \context Staff = "down" {
-        \override Staff.DynamicLineSpanner   #'direction = #1
+      \new Staff =  "down" {
+        \override Staff.DynamicLineSpanner   #'direction = #UP
         \clef F
-       << \global \context Voice = "lva" \lefta \context Voice = "lvb" \leftb >>
+       << \global \new Voice \lefta \new Voice \leftb >>
     }
   >>
-  \layout {
-    interscoreline = 0.0
-    interscorelinefill = 1
-    indent = 0.5 \in
-    % textheight = 29.8 \cm
-    pagenumber = no
-    linewidth = 17.0 \cm
+  \layout { 
     \context {
       \RemoveEmptyStaffContext
     }
@@ -282,12 +283,16 @@ leftb =  \transpose c cis {
       \Score
       \override SpacingSpanner #'common-shortest-duration = #(ly:make-moment 1 8)
     }
+  }
+  
+  \midi {
     \context {
-      \PianoStaff
-      \override VerticalAlignment #'forced-distance = #13.0
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 100 8)
+      }
     }
-  }
-  \midi { \tempo 8=100 }
+
+
 }