Correct errors in franz strauss horn concerto.

horndude77 · Dec 31, 2011 · eca2428 · eca2428
1 parent 07d7e56
commit eca2428
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 81 deletions.
diff --git a/FranzStraussHornConcerto1/defs.lyi b/FranzStraussHornConcerto1/defs.lyi
@@ -138,3 +138,28 @@ outline =
   \outlineMvtIII
 }
 
+afterGraceFraction = #(cons 15 16)
+
+\layout
+{
+  \context
+  {
+    \Score
+    skipBars = ##t
+    extraNatural = ##f
+    \override PaperColumn #'keep-inside-line = ##t
+    \override NonMusicalPaperColumn #'keep-inside-line = ##t
+    autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0)
+                               ,(make-accidental-rule 'any-octave 0)
+                               ,(make-accidental-rule 'same-octave 1))
+  }
+}
+
+\midi
+{
+  \context
+  {
+    \Voice
+    \remove "Dynamic_performer"
+  }
+}
diff --git a/FranzStraussHornConcerto1/horn.ly b/FranzStraussHornConcerto1/horn.ly
@@ -14,21 +14,5 @@ instrument = "Horn in F"
 
 \score
 {
-  \new Staff
-  {
-    #(set-accidental-style 'modern)
-    \set Score.skipBars = ##t
-    << \outline \horn >>
-  }
-  \layout
-  {
-  }
-  \midi
-  {
-    \context
-    {
-      \Voice
-      \remove Dynamic_performer
-    }
-  }
+  \new Staff << \outline \horn >>
 }
diff --git a/FranzStraussHornConcerto1/horn_notes.lyi b/FranzStraussHornConcerto1/horn_notes.lyi
@@ -17,7 +17,7 @@ hornMvtI = \relative c''
   a4\! r r2 |
   d2.( bes8 c |
   d2.) g,4~\< |
-  \times 4/6 {g8[ \acciaccatura a8 g( fis-. g-. bes-. d]-.} g4\sf\> ees,(
+  \times 4/6 {g8[ \acciaccatura a8 g( fis-. g-. bes-. d]-.} g4)\sf\> ees,(
   d2~)\! d8 f( bes d) |
   f(\< ees d c b c d ees) |
   cis( d g4~\> g8) d( ees) c-. |
@@ -92,7 +92,7 @@ hornMvtI = \relative c''
   bes( c bes) aes-. g8\< r g( a16) g-. fis( g) a-. bes-. |
   c( d c) bes-. a8 r a( bes16) a-. gis( a) bes-. c-. |
   d( ees d) c-. bes8 r16 bes b-. g( fis g) a-. b-. c-. d-. |
-  ees4 r8 b \acciaccatura d8 c16( b c) d-. ees-. f-. fis( g) |
+  ees4\! r8 b \acciaccatura d8 c16( b c) d-. ees-. f-. fis( g) |
   f4~ f16 a( bes) f-. d-. bes-. f-. d-. bes8-. d'-. |
   ees4~ ees16 fis( g) ees-. c-. a-. f-. ees-. c8. a16 |
   bes2-> d'-> |

diff --git a/FranzStraussHornConcerto1/piano.ly b/FranzStraussHornConcerto1/piano.ly
@@ -24,59 +24,15 @@ instrument = "Piano"
       fontSize = #-3
       \override StaffSymbol #'staff-space = #(magstep -3)
     }
-    {
-      #(set-accidental-style 'modern)
-      \horn
-    }
+    { \horn }
     \new PianoStaff
     <<
       \set PianoStaff.connectArpeggios = ##t
-      \new Staff="RH"
-      {
-        #(set-accidental-style 'modern)
-        \set Staff.extraNatural = ##f
-        << \pianoRH \outline >>
-      }
-
+      \new Staff="RH" { << \pianoRH \outline >> }
       \new Dynamics = "dynamics" \pianoDynamics
-
-      \new Staff="LH"
-      {
-        #(set-accidental-style 'modern)
-        \set Staff.extraNatural = ##f
-        \pianoLH
-      }
+      \new Staff="LH" { \pianoLH }
     >>
   >>
-  \layout
-  {
-    \context
-    {
-      \type "Engraver_group"
-      \name Dynamics
-      \alias Voice
-      \consists "Output_property_engraver"
-      \consists "Piano_pedal_engraver"
-      \consists "Script_engraver"
-      \consists "New_dynamic_engraver"
-      \consists "Dynamic_align_engraver"
-      \consists "Text_engraver"
-      \consists "Skip_event_swallow_translator"
-      \consists "Axis_group_engraver"
-
-      pedalSustainStrings = #'("Ped." "*Ped." "*")
-      pedalUnaCordaStrings = #'("una corda" "" "tre corde")
-      \override DynamicLineSpanner #'Y-offset = #0
-      \override TextScript #'font-size = #2
-      \override TextScript #'font-shape = #'italic
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
-    }
-    \context
-    {
-      \PianoStaff
-      \accepts Dynamics
-    }
-  }
 }
 
 \score
@@ -89,18 +45,11 @@ instrument = "Piano"
     }
     \new PianoStaff
     <<
-      \new Staff="RH" { << \pianoRH >> }
-      \new Staff="LH" { << \pianoLH >> }
+      \new Staff="RH" { << \pianoRH \pianoDynamics >> }
+      \new Staff="LH" { << \pianoLH \pianoDynamics >> }
     >>
     \outline
   >>
-  \midi
-  {
-    \context
-    {
-      \Voice
-      \remove Dynamic_performer
-    }
-  }
+  \midi { }
 }
 
diff --git a/FranzStraussHornConcerto1/piano_notes.lyi b/FranzStraussHornConcerto1/piano_notes.lyi
@@ -91,17 +91,17 @@ pianoRHMvtI = \relative c'
   <c g ees> c8. c16 <ees g,>2~ |
   \repeat unfold 3 {<ees g,>4 c8. c16 <ees g,>2~ |}
   <ees g,>4 c8. c16 <f aes,>2( |
-  <ees g,>4 c8. c16 <ees g,~>2( |
-  <d g,>4) b8. d16 <f~ d g,~>2( |
+  <ees g,>4) c8. c16 <ees g,~>2^( |
+  <d g,>4) b8. d16 <f~ d g,~>2^( |
   <f c g>4) << {ees2 d4} \\ {s4 <b g>2} >> |
   <c g>4 <d b>8( <ees c>) << {f4( fis)} \\ {<d c>2} >> |
-  <b d g>4 <b d>8. <c ees>16 <f d g~>2( |
+  <b d g>4 <b d>8. <c ees>16 <f d g,~>2( |
   <ees c g>4) c8. c16 <ees g,>2~ |
   <ees g,>4 c8. c16  <ees g,>2~ |
   <ees g,>4 <ees c>8. <ees c>16 <aes ees~ c>2( |
   <g ees bes>4) ees8. ees16 <g ees bes~>2( |
-  <aes f bes,>4) bes,8. bes16 <d aes>2~ |
-  <ees g,>4 c8. c16 <f c aes>2 |
+  <aes f bes,>4) bes,8. bes16 <d aes>2( |
+  <ees g,>4) c8. c16 <f c aes>2 |
   <ees bes g>4 <g bes,>8. <ees g,>16 <d bes~ aes>2( |
   <ees bes g>4) <bes g>( << {\voiceOne g'4 <f aes,>8 <ees g,>)} \new Voice {\voiceTwo bes2} >> \oneVoice |
   <<