From: Tucker Johnson <tucker@newer.systems>
Date: Tue, 28 Jan 2025 03:33:38 +0000 (-0500)
Subject: stuff
X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=76cd481c43335c6f965c471d9e61582819843211;p=net-clarity.git

stuff
---

76cd481c43335c6f965c471d9e61582819843211
diff --cc manuscripts/II-clarinet.ly
index 27f6ef2,7eec95b..21125fe
--- a/manuscripts/II-clarinet.ly
+++ b/manuscripts/II-clarinet.ly
@@@ -8,100 -8,236 +8,331 @@@
    \override StaffSymbol.staff-space = \clarinetMagstep
    \consists Text_mark_engraver
    \consists Mark_engraver
+   \RemoveEmptyStaves
   }
- %\transpose bes c'
+ \transpose bes c'
  \relative {
++<<<<<<< HEAD
 +  \numericTimeSignature
 +  \tempo "Vivace" 4=168
 +  \time 5/8 ces'4\f ees8[ bes']-. r8 | %001
 +  \time 4/4 \grace { s8 } c,4 d'\> a'8( cis4.)\mp | %002
 +  \time 5/8 \grace { s8 } e,,,8[ g']-. r8 aes,4 | %003
 +  \time 6/8 f''4  ges8-. a,,4->\f bes8( | %004
 +  f' d8)-. r8 c'4 e'8-. | %005
 +  fis,,,4(\mp  cis') ees'8-. r8 | %006
 +  \time 5/8 g8-. r8 b4( aes8-.) | %007
 +  \time 4/4 c,,4->\f des' bes'8-. r8 a,4 |%008
 +  \time 3/8 e d''8-. | %009
 +  \time 3/4 aes,4\p ges'4 f'8-. r8 | %010
 +  \time 4/4 ees,,,8( g4)\< b'8 f,4->\f ges' | %011
 +  \time 5/8 g''8 bes,,,4 a' | %012
 +  \time 4/4 aes'8[ d,,,8]\mp e''4 c'8-.\< r8 cis,,4 | %013
 +  \grace { s8 } b'8 ees'8--\f r4 \once \override Hairpin.circled-tip = ##t f,,2\<\fermata | %014
 +
 +  \sectionLabel \markup { \box \number 15 }
 +
 +  \time 7/8 f4\fp des( aes4) d8
 +  \time 4/4 c'4 b'4 bes,,8 a''4.
 +  \time 7/8 ees4 ges,,4  g''8 e'4 \breathe
 +  \time 4/4 d,4( f8) cis' c,,4  bes'4
 +  fis'4 aes,,8 g'8~ 8 a'4 b,,8(
 +  e,4) \breathe ees'8 d,8~ d8 b''4 c'8
 +  bes,,4 des4~ des8 g'4 ges,,8
 +  aes'4 ees''4 \breathe f,,,8\< a4 e''8~\mp
 +  \time 6/8 e4. ees,,8\< b' fis''
 +  e,,8 cis'' a gis,4.\f
 +  \time 2/4 r8  f'4\> bes8-.
 +  \time 4/4 \after 4 \< d2~\p d8\f r8 aes'4(\mp
 +  \time 6/8 b2.
 +  e,4.) \breathe d,,8-.\mf fis-. a-.
 +  r8 bes(\< des f4 fis8)\f
 +  ees'2.\p
 +  \time 4/4 f,,8-.-> c''8~\< 4~\f\> 2
 +  \time 4/4 d,8(\!\< bes)-. a'4\f des,8-.-> ees( g) aes,-.
 +  c'2~\p\< c8\f r8 r4 |
 +  r2 r8 e,,8-.-> a''4(\p |
 +  \time 9/8 fis8[) b,,-.-> d''-- g,,,]-.-> b''4 dis,,,8-.-> ais'''( cis)
 +  \time 4/4 gis,8\f( e b'4) r2 |
 +  f'2~\p\< f8\mf r8 c,-.-> r8
 +  \time 7/8 b'8-> e4 bes8[->\f\< des,-.-> ges,-.->\! c8]-.-> |
 +  \time 4/4 ees'4(\p f2.~ |
 +  \time 3/4 4~ 8) r8 a,8(\f\< e) |
 +  \time 6/8 aes,-.->\! r8 r8 b''4.\p |
 +  ees,,8\f\< g,-.-> d-.->\! bes'''4.(~\p |
 +  \time 3/4 bes4. a8) f,-> r8
 +  a2.~\pp\<( |
 +  a2.~ |
 +  a4.\mf\< bes,8-.)\! r4 |
 +  ees4 8-. r8 b'-. e,~( |
 +  e4 f,8-.) r8 r4 |
 +  R1*3/4
 +  R1*3/4
 +  R1*3/4
 +  bes''8-.\mf bes8~\p bes2 |
 +  ees,2->\mf( des'8-.) r8
 +  r8 des8-.\p r8 b8-.\mf b4~\p |
 +  b4 fis'2~->\mf( |
 +  fis2~ fis8 a,8-.)|
 +  r8 a8-.\p r4 ees8-.\mf r8 |
 +  ees8-. r8 r4 r4 |
 +  r8 c'8~ c4. c8( |
 +  f,8-.) bes8-. r8 aes'8~( 8 des,-.) |
 +  r8 g,,8-- g8-. r8 r4 |
 +  g8-. r8 d4---> b''8-. d,,8( |
 +  e'8-.) r8 fis'8->( a,-.) r4 |
 +  a8-. r8 \override Hairpin.circled-tip = ##t a,4.\< c'8-.->\f |
 +  a,2\< e'8-.->\f \override Hairpin.circled-tip = ##f a,8(~\mp\< |
 +  a8 cis4 f8~ f4)\f |
 +  aes,8-.-> r8 r4 r4 |
 +  r8 b'8( dis,)[ e,,(] c'[) d'8]-.-> |
 +  d2.\pp |
 +  g8-.-> d8~ d2 |
 +  aes,8--\mf d'-.\< fis-. bes-.\! b,,8-- c'-- |
 +  r4 ees,,8---> des''-. f-.-> g,,---> |
 +  e''8-.-> f8~\pp\< f2~ |
 +  f8\mf gis8-. a2~\> |
 +  a4\!\< a8( b,8)\f d8-. des,---> |
 +  b'4. f8-- ees'8-- fis-.-> ees4-- a,8( g'8~ g4~\> |
 +  g4~ 8\fermata bes,8-.)\mp r4  |
 +  \time 4/4
 +  bes8-.\mf\< b( des ees)\f c8-.\p r8 r4 |
 +  c8-. c(\< d e)\mp r4 r8 e8-. |
 +  \time 3/4
 +  r8 e8-. f(\mf g) g( a~ |
 +  a) \grace { e16( } b'8--)\mp \grace { ees,16^( } c8-.\ff d8-.) r8 d8-.-> |
 +  r8 \grace
 +
 +
 +
++=======
+   \tempo "Vivace" 4=168 \time 2/4 ces'4.\f ees8 | %001
+   \time 6/8 bes'8-. r8 r8 c,4. | %002
+   \time 3,2,2 7/8 d'4.\> a'8( cis8~\mp 4~ | %003
+   \time 4/4 cis8) e,,,8 g'8-. r8 r8 aes,8~ aes4 | %004
+   f''4. ges8 a,,4.\f bes8( | %005
+   \time 6/8 f'8 d8-.) r8 c'4 e'8-. | %006
+   \time 9/8 \grace s8 fis,,,4.(\p cis'4.) ees'8-. r8 r8 | %007
+   \time 3/4 g-. r8 b4( aes8-.) c,,->~\f | %008
+   \time 4/4 c8 des'8~ des4 bes'8-. r8 r8 a,~ | %009
+   a8 e4 d''8-. aes,4\p ges' |%010
+   \time 3,2 5/8 f'8-. r8 r8 ees,,,8(\< g8~ | %011
+   \time 3/4 g8) b'8 f,4->\f ges'4 | %012
+   g''8 bes,,,4 a'4 aes'8-. | %013
+   \time 4/4 d,,,8\mp  e''4 c'8-. r8 cis,,4\< b'8 | %014
+   ees'8--\f r8 f,,2\niente\< f4->\ff | %015
+ 
+   \sectionLabel \markup { \box \number 16 }
+   \omit Score.BarNumber
+   \time 3/4 des4(\psempre aes4) d8 c'8~ | \undo \omit Score.BarNumber %016
+   c8 b'4 bes,,8 a''4~ | %017
+   a8 ees4 ges,,4 g''8 | %018
+   e'4 \breathe d,4( f8) des'8 | %019
+   c,,4 bes'4 ges'4 | %020
+   aes,,8 g'4 a'4 b,,8( | %021
+   e,4) \breathe ees'8 d,4 b''8~ | %022
+   b8 c'8 bes,,4 des4~ | %023
+   des8 f'4 \breathe ges,,8 aes'4 | %024
+   ees''4 f,,,8 a4 e''8~ | %025
+   e4. ees,,8\< b'8 fis''8 | %026
+   e,,8 cis''8 a8 gis,4.\f | %027
+   r8 f'8 r8 bes8( d4~ | %028
+   d4~ d8) r8 r8 aes'8~\mp | %029
+ 
+   \sectionLabel \markup { \box \number 30 }
+   \omit Score.BarNumber
+   aes2. | \undo \omit Score.BarNumber %030
+   e8( g8-.) r8 d,8--\f fis,8-.\mp\< a8-. | %031
+   d8( des f)\f bes,8-. fis'8->-- b'8(\p | %032
+   ees,2.) | %033
+   f,,8-. c''8~\< c2~\f\> | %034
+   c4 d,8-.\mp\< bes8( a4) | %035
+   des8-.->\f g8-.->  des''8 ees,,,8( c'8) aes'-.-> | %036
+   R1*3/4 | %037
+   r4 r4 r8 e8-.-> | %038
+   a'4(\p fis8) b,,8~(\< b8 g8~ | %039
+   g4) ees'8-.->\mf cis''8-- e,,,8(\< gis8) | %040
+   b'8-.->\f r8 r4 r4 | %041
+ 
+   \sectionLabel \markup { \box \number 42 }
+   \omit Score.BarNumber
+   d'8(\> f,8~ f2~\pp\< | \undo \omit Score.BarNumber %042
+   f8)\f c,8~\p\< c8 b'8-.->\mf e4 | %043
+   bes8-.->\f\< des,8-.-> ges,8-.-> c8-.->\! ees'4(\p | %044
+   f2.~ | %045
+   f4~ f8) r8 a,8(\f\< e8) | %046
+   aes,8-.->\! r8 r8 b''4.\p | %047
+   ees,,8\f\< g,8-.-> d8-.->\! bes'''4.~(\p | %048
+   bes4. a8) f,8-> r8 | %049
+   a2.~(\pp\< | %050
+   a2.~ | %051
+   a4.\mf bes,8-.) r4 | %052
+   ees4 ees8-. r8 b'8-. e,8~( | %053
+   e4 f,8-.) r8 r4 | %054
+   R1*3/4 | %055
+   R1*3/4 | %056
+ 
+   \sectionLabel \markup { \box \number 57 }
+   \omit Score.BarNumber
+   R1*3/4 | \undo \omit Score.BarNumber %057
+   bes''8-.\mf bes8~\p bes2 | %058
+   ees,->(\mf des'8-.) r8 | %059
+   r8 des8-.\p r8 b8-.\mf b4~\p | %060
+   b4 fis'2~->( | %061
+   fis2~ fis8 a,8-.)\> | %062
+   r8 a8-. r4 ees8-. r8 | %063
+   ees8-.\p  r8 r4 r4 | %064
+   r8 c'8~\< c4~ c8 c8( | %065
+   f,8-.)\f bes8-.\mp r8 aes'4(\f des,8-.) | %066
+   r8 g,,8--\p g8-. r8 r4 | %067
+   g8-. r8 d4->--\< b''8-. d,,( | %068
+   e'8-.) r8 fis'8(\f a,8-.) r4 | %069
+ 
+   \sectionLabel \markup { \box \number 70 }
+   \omit Score.BarNumber
+   a8-.-> r8 a,4~\niente\< a8 c'8-.->\f | \undo \omit Score.BarNumber %070
+   a,2\niente\< e'8-.->\f a,~(\mp\< | %071
+   a8 cis4 f4.)\f | %072
+   aes,8-.-> r8 r4 r4 | %073
+   r8 b'8( dis,8) e,,8( c') d'8-.-> | %074
+   d2.\pp | %075
+   g8-.-> d8~ d4~ d8 d8-. | %076
+   aes,8--\mf\< d'8-. fis-. bes-.\f b,,8-- c'-- | %077
+   r4 ees,,8->-- des''8-. f8-.-> g,,8---> | %078
+   e''8-.-> f8~\pp\< f4~ f8 f8-. | %079
+   f8-.\mf gis8-. a2\> | %080
+   a8-.\p\< a8-. a8( b,8-.)\f d8-. des,8---> | %081
+   b'4 b8-. f8 ees'8-- fis8-.-> | %082
+   ees8-. ees8-. a,8( f'4\> bes,8-.)\mp | %083
+ 
+   \sectionLabel \markup { \box \number 84 }
+   \omit Score.BarNumber
+   \time 4/4 bes8-.\mf\< ces8( des ees)\f c8-.\p r8 r4 | \undo \omit Score.BarNumber %084
+   c8-. c8(\< d8 e8)\mf r4 r8 e8-. | %085
+   \time 3/4 r8 e8-. f8( g8) g8( a~) | %086
+   a8 \grace e8^( b'8)--\mp \grace ees,8^( c8\f d8-.) r8 d8-.-> | %087
+   r8 \grace ces'8^( des,8\p ees8-.) ees8-. \grace d8^( e4->)\f | %088
+   \grace a8^( fis8)\p\< fis8-. fis( gis8) gis8( ais8~ | %089
+   ais4) r8 ais8(\f b8-.) r8 | %090
+   b8( cis8~ cis4)\> r8 des( | %091
+   ees8) ees8-.\mf \grace e,8^( f'4.)\ff f8-.\> | %092
+   f8-. f8-. f8-. ges8--\mf\< ges8-. ges( | %093
+   \time 3 3/8 aes8) \grace f8^( g8\ff a,8~ | %094
+   \time 3/4 \pocAce a8)\startTextSpan \grace aes'8^( bes,8~ bes4.) bes8-.\> | %095
+   bes8-. bes8-. bes8-. bes8-. bes8-.\mp \grace ees8^( c8\f | %096
+   d8-.) r8 d8-. d8-. d8( e8-.) | %097
+   \grace bes8( f8)\mf f'8-. f8( g8-.) g8-.\< g8( | %098
+   \time 3 3/8 a8-.) a8-. a8-.\stopTextSpan \tempo 4=174 | %099
+   \time 3/4 \grace a,8^( ges'8\ff aes8-.) aes8-. aes8( bes-.) r8 | %100
+ 
+   \sectionLabel \markup { \box \number 101 }
+   \omit Score.BarNumber
+   \tempo \markup { \rhythm { \tuplet 3/2 { 8[ 8 8] } } "=" \rhythm { { 8[ 8] 8 } } "Prestissimo" } 4=232
+   \time 4/4 R1*6 | \undo \omit Score.BarNumber
+   \rit \after 4. \startTextSpan R1
+   r2 r4 r8 f,,,8~\niente\<\stopTextSpan | %108
+ 
+   \sectionLabel \markup { \box \number 109 }
+   \omit Score.BarNumber
+   \tempo 4=200
+   \time 3/4 f2~ f8 des'8->~\f | \undo \omit Score.BarNumber %109
+   des4 bes2->~ | %110
+   bes2\> d,4~\mp | %111
+   2.~\> | %112
+   \after 4 \< 2.\niente | %113
+   c'2.->~\f | %114
+   \rit c4.\startTextSpan b4.->\> | %115
+   ees,2.~\p\< | %116
+   2 f4~\f | %117
+   \after 2 \stopTextSpan f2. \tempo "Tempo primo" 4=168 | %118
+   fis4-> a2->~ | %119
+   4. g4.~-> | %120
+   g4 aes4->~ aes8 e8~-> | %121
+   2.~\>\startTextSpan | %122
+   4\p r4 \after 8 \stopTextSpan r4 | %123
+ 
+   \sectionLabel \markup { \box \number 124 }
+   \omit Score.BarNumber
+   \tempo "Meno mosso" 4=152
+   R1*3/4 | \undo \omit Score.BarNumber %124
+   r8 a'4(\mp\> fis) bes8~-> | %125
+   bes8 f4-> des4->\f \grace fis8( d8~\p | %126
+   d2\< fis4~\mp | %127
+   fis4) \breathe des'4->\f bes8-> \grace f8( d'8~\> | %128
+   d8 a8~ \after 4. \mp a2) | %129
+   \grace b8( f8->)\startTextSpan ees'8~ ees4~\< ees8 \grace f,8( b8~->\f\> | %130
+   b8) c8~ \after 8 \p c4 \grace b8( \after 8 \stopTextSpan e4~->\f \tempo "Poco rubato" 4=144 | %131
+   e8) aes8-> g,2~\> | %132
+   8\mp \breathe g8~( g4~ g8 b,8~ | %133
+   b8) \grace gis''8( dis4)\mf e,8( gis,4~ | %134
+   gis4) \grace e''8( g,2~\> | %135
+   g2)\startTextSpan c4~ | %136
+   c4 r8 \after 4 \stopTextSpan g4.\p \tempo 4=132 | %137
+ 
+   \sectionLabel \markup { \box \number 138 }
+   \omit Score.BarNumber
+   fis8 d4 f( c'8~ | \undo \omit Score.BarNumber %138
+   c2) r4 | %139
+   r8 a,8~(\mf a2 | %140
+   gis4.) e''4.\p | %141
+   ees,,4.\mf b''4\p bes8~( | %142
+   bes2) des,4-> | %143
+   a'2 bes'8(\< c,8~ | %144
+   c2)\mf r8 b,8~ | %145
+   \ace b8\startTextSpan d4 f'8 e,,4( | %146
+   fis4) ees'4( aes8 g~ | %147
+   g4) c,8\p\< des'4 ces'8-. | %148
+   r8 bes,,8 fes''2~( | %149
+   fes8 ges8-.) \after 4. \stopTextSpan f,,2\f | %150
+ 
+   \sectionLabel \markup { \box \number 151 }
+   \omit Score.BarNumber
+   \tempo 4=144
+   r4 r4 r8 g8\> | \undo \omit Score.BarNumber %151
+   d'8 cis'8-.\mp r8 ges,4\f\> fes'8 | %152
+   ees'-.\mp r8 f,4\mf c'4~\< | %153
+   c8\startTextSpan a,8\f r8 f8 g'4~\mf | %154
+   g8 r8 e,8\f\> fis'4 \after 16 \stopTextSpan gis'8\mp \tempo "Tempo primo" 4=168 | %155
+   d,,4.\f d8-. r8 a''8~\mp | %156
+   a8 b'4(\< bes8-.) ees,4~ | %157
+   ees4 ces,8-.\f r8 r4 | %158
+   bes8\> c'8-.\p r4 r8 aes,8\mf\> | %159
+   des'8-. e'4(\p f d8-.) | %160
+   r8 ees,,,8(\f\> c'4 b'8-.)\p r8 | %161
+   r4 bes4 g'8-. r8 | %162
+   r4 aes,8 ges'8-. r8 a8~\< | %163
+   a4 cis,,8-.\mf r8 r8 a'8~\> | %164
+ 
+   \sectionLabel \markup { \box \number 165 }
+   \omit Score.BarNumber
+   a8 c'8-.\p r8 b,,\mf\> aes''4~\> | \undo \omit Score.BarNumber %165
+   aes8 f8-.\p r4 r8 cis8-.\mf | %166
+   e8-. r8 r4 ees,,8(\f g8-.) | %167
+   f8\> g'8( ees'8-.)\mp aes,,8(\f\> c8) bes''8~ | %168
+   bes2\mp r8 cis,,8(\mf | %169
+   a'2) a8-- a8-- | %170
+   b8-. e,,8\f\> fis''8( d'-.)\p g,,,8\f c'8--\mp\< | %171
+   c8-- bes,8-. ees,8\f f''8\p des'8-.\< ces,,8 | %172
+   ges8\f aes'4~\mf aes8--\< aes-- aes8-. | %173
+   d,8\f\> e'8 a8-.\mp r8 r8 a-- | %174
+   a8-- a8-- c,,8\f\> bes' g'8-.\mp f,8-- | %175
+   f8--\< f8-- f8-- des\mf ees'8-. e,(\> | %176
+   gis8) fis'8-.\mp a,,8\mf b'8-- 8--\< 8-- | %177
+ 
+   \sectionLabel \markup { \box \number 178 }
+   \omit Score.BarNumber
+   d,8-.\f r8 c8(\mf bes) bes( aes) | \undo \omit Score.BarNumber %178
+   aes-- g( f)\> f( ees8) ees-- | %179
+   \ritPoc ees--\startTextSpan ees-- ees-- ees-- ees-- d(\mp | %180
+   e fis) a( b cis) g( | %181
+   bes\< c) des( ees f) ges( | %182
+   aes) aes-- aes-- aes-- aes( fes')\mf | %183
+   d-- d-- d-- d(\< b a) | %184
+   g( c f)\f f-- dis(\> cis | %185
+   ais) gis( fis e)\p b'8--\mp b-- | %186
+   b( d, a') g(\> f \after 16 \stopTextSpan ees) \tempo 4=104 | %187
+   c8( bes aes)\p \molRit cis(\>\startTextSpan b a) | %188
+   fis( \after 16 \stopTextSpan e d2)\pp\fermata \bar "|." %189
++>>>>>>> working
  
  }
diff --cc manuscripts/II-piano.ly
index b5d795a,e7a841b..ed3d634
--- a/manuscripts/II-piano.ly
+++ b/manuscripts/II-piano.ly
@@@ -12,262 -12,674 +12,928 @@@
    \override PianoStaff.Arpeggio.arpeggio-direction = #UP
    \new Staff = "u" \with {
      \consists "Merge_rests_engraver"
++<<<<<<< HEAD
 +  }
 +  {
 +    <<
 +      \relative {
 +        \tempo "Vivace" 4=168
 +        \override DynamicLineSpanner.staff-padding = \phds
 +        \time 5/8 r4\f ees'8[ bes']-.-> r8 | %001
 +        \time 4/4 \grace { s8 } r4 d\> a'8( cis4.)\mp | %002
 +        \time 5/8 \grace { s8 } s4 r8 r4 | %003
 +        \time 6/8 f,4 \grace { des'8^( } ges,8-.) r4.\f r4. c,4 e'8->-. | %004-005
 +        r4.\mp r8 ees,4( | %006
 +        \time 5/8 g8-.) r8 b4( aes8-.) | %007
 +        \time 4/4 r4\f des,~ <des bes'>8-.-> r8 r4 | %008
 +        \time 3/8 r8 r8 d'8-.-> | %009
 +        \time 3/4 r4\p \D \grace { a,8( } \U ges'4) f'8-. r8 | %010
 +        \time 4/4 r4\< r8 b,,8 r2\f | %011
 +        \time 5/8 g''8 r8 r8 a,,4 | %012
 +        \time 4/4 aes'8-. r8 e4 c'8-.->\< r8 r4 | %013
 +        r8 ees8--->\f r4 r2  | %014
 +        \time 7/8 \after 4 \p f,,2~-> f4 r8 |
 +        \time 4/4 c'4 b'8 r8 r8 a4. |
 +        \time 7/8  ees4 \D \once \showStaffSwitch \grace { gis,,8( } fis4) \once \showStaffSwitch \U \grace { ees''8( } g8) e'8-. r8 |
 +        \time 4/4 d,4 f8 cis'-. r4 \grace { f,8( } bes,4) |
 +        \grace { cis'8( } fis,8-.) r8 \D aes,,8 \U g'8~-> g2~ |
 +        g4 ees2.~-> |
 +        <ees bes>4 r4 r8 f'8-. r4 |
 +        aes,4 ees''8 r8 r4 r8 e,8~\mf |
 +        \time 6/8 e4.\< \D \once \showStaffSwitch ees,,8 \once \showStaffSwitch \U r8 fis''8 |
 +        r8 cis8 a r4.\f |
 +        c,4\> g4 |
 +        \after 2. \p R1\! |
 +        \time 6/8 R1*6/8
 +        \after 4. \mp \after 2 \< R1*6/8
 +        r8 bes8-.-> des-.-> f-.-> r8 fis-.->\f |
 +        R1*6/8
 +        \time 4/4 R1 |
 +        d8-.->\mf\< bes a'-.-> r8 des,8 ees-.-> g-.->\f aes, |
 +        c'8-.-> r8 r4 r2 |
 +        R1 |
 +        \time 9/8 R1*9/8 |
 +        \time 4/4 gis8-.-> e-.-> b'-.-> r8 r2 |
 +        R1 |
 +        <<
 +          \relative {
 +            \voiceOne
 +            g''8-. r8 r8 g8-. r8 g8[-. aes]~ |
 +            aes1~ |
 +            4~ 8 r8 d8( des8-.) |
 +            r8 r8 des8-. ges,4. |
 +            ges4 ges8-. r4. |
 +            r4 c8-. r8 c,8-. r8 |
 +          }
 +          \new Voice
 +            \relative {
 +            \voiceTwo
 +            \time 7/8 b'8-. r8 r8 bes8-. r8 bes[-. bes]~
 +            \time 4/4 bes1~ |
 +            \time 3/4 4~ 8 r8 a8( e8-.) |
 +            \time 6/8 r8 r8 e8-. e4. |
 +            ees4 ees8-. r4.
 +            \time 3/4 r4 ees8-. r8 f8-. r8 |
 +          }
 +        >>
 +        \oneVoice
 +        r4 r4 r8 c'8~ |
 +        c4 c8( d,8~ d4~ |
 +        d8 cis'-.) r4 r4 |
 +        R1*3/4 |
 +        <<
 +          \relative {
 +            \voiceOne
 +            r4 g'''4. g8~( |
 +            g4 aes,2~ |
 +            aes2 fis'8-.) r8 |
 +          }
 +          \new Voice
 +          \relative {
 +            \voiceTwo
 +            r4 c''8-. c8~( c4~
 +            c2 d,4~ |
 +            d4 cis'8-.) r8 r4 |
 +          }
 +        >>
 +        \oneVoice
 +        r4 r4 r8 b,8-. |
 +        r8 f''8-. r4 r8 ees,8~->( |
 +        ees4 c'8-.) r8 c8-. r8
 +        r8 c8-. r4 cis,8-. r8 |
 +        r4
 +        <<
 +          \relative {
 +            \voiceOne
 +            r4 r8 e'''8-. |
 +          }
 +          \new Voice
 +          \relative {
 +            \voiceTwo
 +            r8 gis''8~( gis4 |
 +            ais,8-.)
 +          }
 +        >>
 +        \oneVoice
 +        r8 bes8-. r8 r4
 +        r8 g'8~->( g8 d'-.) r4 |
 +        g,,8-. r8 r4 r4 d'4.( e,8-.) r4 |
 +        r8 bes''8-. r8 aes'8~( aes des,8-.) |
 +        R1*3/4
 +        r4 r4 b8-. r8 |
 +        r4 fis'8( a,8-.) r4 |
 +        a8-. r8 r4 r8 c8-. |
 +        r4 \after 8 \p r4 e,8-. r8 |
 +        R1*3/4 |
 +        aes,8-. r8 r4 r4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        e8-. gis8-. r4 r4 |
 +        r4 r8\fermata <bes bes,>8-.\pp r4 |
 +<<<<<<< HEAD
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        <f' f'>8-.-> <g g'>8-.-> r8 <a a'>-.-> r4 |
 +        R1*3/4 |
 +        r4 r4 \ottava #1 <fis' fis'>8-.-> r8 |
 +        <gis gis'>8-.-> r8 <ais ais'>8-.-> r8 r4 |
 +        8-.-> <b, b'>8-.-> r8 <cis cis'>8-.-> r4 |
 +        r8 <ees ees'>8-.-> r4 r4 |
 +        R1*3/4 |
 +        r8 e4( b'8) 8( cis) |
 +        8( dis) r8 <c, c'>8-.-> <d d'>8-.-> 8-.-> |
 +        r8 <e e'>8-.-> \ottava #0 r4 r4 |
 +        \ottava #1 \tuplet 3/2 { f'8\p\< \D <f, g> \U <f' g a> } \tuplet 3/2 { \D ges, \U ges' \D <ges, aes> } \tuplet 3/2 { \U <ges' aes> \D <ges, aes bes>\! \U <ges' aes bes> } \bar "||" | \clef "bass"
 +        \tempo "A tempo" 4=168
 +        \ottava #0 s4\f s4 s4\mp |
 +
 +=======
 +>>>>>>> e692014 (start)
++=======
+     \override DynamicLineSpanner.staff-padding = \phds
+   }
+   {
+     \set Staff.ottavationMarkups = #ottavation-ordinals
+     \relative {
+       \tempo "Vivace" 4=168
+       \time 2/4 r4\f r8 ees'8 | %001
+       \time 6/8 bes'8-.-> r8 r8 r4. | %002
+       \time 3,2,2 7/8 d4.\> a'8-. cis8~\mp cis4~ | %003
+       \time 4/4 cis8 r8 g,8-. r8 r2 | %004
+       f'4. \grace des'8( ges,8) r2\f | %005
+       \time 6/8 f,8-> d8-.-> r8 c'4 e'8-.-> | %006
+       \time 9/8 \grace s8 r4.\mp r4. ees,4.( | %007
+       \time 3/4 g8-.) r8 b4( aes8-.) r8\f | %008
+       \time 4/4 r8 des,8~ des4~ <des bes'>8->-. r8 r4 | %009
+       r4 r8 d'8-.-> r4\p \D \grace a,8( \U ges'4) | %010
+       \time 5/8 f'8-. r8 r8 r4\< | %011
+       \time 3/4 r8 b,,8 r4\f r4 | %012
+       g''8 r8 r8 a,,4 aes'8-. | %013
+       \time 4/4 r8\mp\< e4 c'8-.-> r2 | %014
+       ees8--\f r8 r4 r4 f,,4~-> | %015
  
+       \sectionLabel \markup { \box \number 16 }
+       \omit Score.BarNumber
+       \time 3/4 f2\psempre r8 c'8~ | \undo \omit Score.BarNumber %016
+       c8 b'8-. r4 a4~ | %017
+       a8 ees4 r8 r8 \grace ees8( g8) | %018
+       e'8-. r8 d,4 f8 cis'8 | %019
+       r4 bes,4 \grace des'8( ges,8-.) r8 | %020
+       r4 r8 a8-. r8 \clef bass \grace gis,,8( b8) | %021
+       e,4 r8 d8~ 8 r8 \clef treble | %022
+       r8 c'''8-. r4 r4 | %023
+       r8 f,8-. r4 aes,4 | %024
+       ees''8-. r8 r4 r8 e,8~\mf | %025
+       e4~ e8 r8 r8\< fis8 | %026
+       r8 cis8 a8 r8\f r4 | %027
+       c,8 r8 g8 r8 r4 | %028
+       \after 2 \p R1*3/4 | %029
++>>>>>>> working
  
+       \sectionLabel \markup { \box \number 30 }
+       \omit Score.BarNumber
+       R1*3/4 | \undo \omit Score.BarNumber %030
+       r4 r8 d'8-.->\f r4\mp\< | %031
+       r8 des8-.-> f-.-> r8 fis8-.->\f r8 | %032
+       R1*3/4 | %033
+       R1*3/4\p | %034
+       <<
+         {
+           \voiceOne
+           r4 d4~\< d8 r8 | %035
+         }
+         \new Voice {
+           \voiceTwo
+           r4 r8 bes8-.-> a-.-> r8 | %(035)
+         }
+       >>
+       \oneVoice
+       des8~ <des g>8~ \after 8 \f 4 c8-.-> aes'8~ | %036
+       aes2 \after 8 \pp r4 | %037
+       R1*3/4 | %038
+       r4 r8 b,8-.->\< r8 g8-.-> | %039
+       r4 r4 e8-.-> gis8-.-> | %040
+       R1*3/4\f | %041
  
-       }
-     >>
+       \sectionLabel \markup { \box \number 42 }
+       \omit Score.BarNumber
+       \after 8 \p R1*3/4 | \undo \omit Score.BarNumber %042
+       r4 r8 g''8-.\mf r4 | %043
+       g8-. r8 g8-.-> aes4.~ | %044
+       aes2.~ | %045
+       aes4~ aes8 r8 d8->( cis8-.) | %046
+       r4 cis8-.-> fis,4.\mp\< | %047
+       fis4 fis8-.->\f r8 r4 | %048
+       r4 c'8-.\mp r8 c,8-.-> r8 | %049
+       r4 r4\f r8 c'8~ | %040
+       c4 c8( d,4.~ | %051
+       d8 cis'8-.) r4 r4 | %052
+       R1*3/4 | %053
+       r4 g'4.\> g8~( | %054
+       g4 aes,2~ | %055
+       \voiceOne aes2 fis'8-.)\p r8 | %056
+ 
+       \sectionLabel \markup { \box \number 57 }
+       \omit Score.BarNumber
+       \oneVoice
+       r4 r4 r8 b,,8-. | \undo \omit Score.BarNumber %057
+       r8 f''8-. r4 r8 ees,8->~ | %058
+       ees4 c'8-. r8 c8-. r8 | %059
+       r8 c8-. r4 cis,8-. r8 | %060
+       <<
+         {
+           \voiceTwo r4 r8 gis'8~(\f gis4 | %061
+         }
+         \new Voice {
+           \voiceOne r4 r4 r8 e'8-. | %(061)
+         }
+       >>
+       \oneVoice ais,,8-.) r8 bes8-. r8 r4 | %062
+       r8 g'4(-> d'8-.) r4 | %063
+       g,,8-.\p r8 r4 r4\< | %064
+       d'4.( e,8-.)\mf r4 | %065
+       r8 bes''8-.\mp r8 aes'4(\f des,8-.) | %066
+       \after 4 \p R1*3/4 | %067
+       r4 r4 b8-. r8 | %068
+       r4 fis'8(\f a,8-.) r4 | %069
+ 
+       \sectionLabel \markup { \box \number 70 }
+       \omit Score.BarNumber
+       a8-.-> r8 r4 r8\psempre c8-. | \undo \omit Score.BarNumber %070
+       r4 r4 e,8-. r8 | %071
+       R1*3/4 | %072
+       aes,8-. r8 r4 r4 | %073
+       R1*3/4 | %074
+       R1*3/4 | %075
+       R1*3/4 | %076
+       R1*3/4 | %077
+       R1*3/4 | %078
+       R1*3/4 | %079
+       R1*3/4 | %080
+       R1*3/4 | %081
+       R1*3/4 | %082
+       e8-. gis8-. r4 r8 <bes bes,>8-. | %083
+ 
+       \sectionLabel \markup { \box \number 84 }
+       \omit Score.BarNumber
+       \time 4/4 <bes bes,>8-. r8 r4 <c c,>8-. r8 r4 | \undo \omit Score.BarNumber %084
+       <c c,>8-. r8 <d d,>8-. r8 r8 ges8(\mp\< aes8) aes8( | %085
+       \time 3/4 bes8)\! r8 r4 r4 | %086
+       r4 r8 bes8-.->\f r8 f'8~ | %087
+       f2.~ | %088
+       f2 f4\mp | %089
+       f8(\< g8 a2~\ff | %090
+       a8) a4 a8( c8) r8 | %091
+       \ottava #1 c4\mf\< c8( d8) d8-. d8( | %092
+       e4)\f e8-. e8-. \stemDown
+       \tuplet 3/2 { \D <e, c>8 \U <d' e c>8 \D <fis, e d c>8 } | %093
+       \time 3/8 \U <fis' gis e d c>8-. r8 r8 | %094
+       \time 3/4 \pocAce e4->\startTextSpan b8-.\mp\< b8-. b8( cis~ | %095
+       cis8) cis8( dis8)\f\< dis8-. dis8-. <dis c>8-. | %096
+       <d! e>-. ees8-.\ff d8-.\mf\< d8-. d8-. e8-.\f | %097
+       r4 \tuplet 3/2 { r8 r8 d8 } \tuplet 3/2  { \D <d, e>8 \U <d' e f>8 \D <d, e f g> } | %098
+       \time 3/8 \U <d' e f g a>8-. r8 r8\stopTextSpan \tempo 4=174 | %099
+       \time 3/4 \grace s8 \tuplet 3/2 { r8 \D ges,8 \U <ges' aes>8 }
+       \override NoteColumn.ignore-collision = ##t
+       <<
+         {
+           \tuplet 3/2 { \D <ges, aes f>8 \U <aes'! \footnote \markup &dagger; #'(1 . 1) \markup \tiny \left-column {
+             \line {
+               \concat { &dagger; \bold "Cluster Notation" ":" }
+               "Play all keys in between the upper and lower note of the cluster."
+             }
+           }
+           f>8
+           \D <f, a!> } \U <f' bes>8-.
+         }
+         \new Voice {
+           \override ClusterSpanner.style = #'centered-stairs
+           \tuplet 3/2 { s8 \U \makeClusters { <f a>32 <g>32 <g>32 <f a> } \D s8 } \U s
+         }
+         \new Voice {
+           \override ClusterSpanner.style = #'centered-stairs
+           \tuplet 3/2 { s8 \U s8 \D \makeClusters { <f, a>32 g32 g32 <f a>32 } } \U s8
+         }
+         \new Voice {
+           \override ClusterSpanner.style = #'centered-stairs
+           \tuplet 3/2 { s8 \U s8 \D s } \U \makeClusters { <f' bes>32 <g a>32 <f bes> } s32
+         }
+       >>
+       \override NoteColumn.ignore-collision = ##f
+       \oneVoice \ottava #0 r8 \clef bass | %100
+ 
+       \sectionLabel \markup { \box \number 101 }
+       \omit Score.BarNumber
+       \tempo \markup { \rhythm { \tuplet 3/2 { 8[ 8 8] } } "=" \rhythm { { 8[ 8] 8 } } "Prestissimo" } 4=232
+       \time 4/4 \stemNeutral g,,,,,8-.\ff r8 ees8( c8) r8 a'8( f'8-.) r8 | \undo \omit Score.BarNumber %101
+       b,,8-- gis'8-. e8-. fis'8 r8 a,,8-. d8( des8 | %102
+       bes8) r8 aes''8 r8 f,8 ges8-. r4 | %103
+       g'8( e8) r4 r4 c,8-. r8 | %104
+       d'8 r8 r4 aes8 bes8( des8) r8 | %105
+       e,8 dis8-. b8-. r8 r2 | %106
+       r4 r8 \rit g'8(\startTextSpan fis8) b8 cis,8-. d8-. | %107
+       a8-.\> r8 c'8 r8 bes,8-. r8 ees'8 <f f,>8--\stopTextSpan\f | %108
+ 
+       \sectionLabel \markup { \box \number 109 }
+       \omit Score.BarNumber
+       \tempo 4=200
+       \time 3/4 r4 r4 r8 <cis cis'>8-- | \undo \omit Score.BarNumber %109
+       r8 e8 <bes bes'>4 r4 | %110
+       r4 g'8 r8 <d d,>4 | %111
+       r4 gis8 r8 fis,8-. f'8 | %112
+       R1*3/4 | %113
+       <c c'>4 r4 r4 | %114
+       fis8-.\startTextSpan r8 a,8 <b b'>8-- r4 | %115
+       <ees ees,>8-- aes,8-. c8 r8 bes8-. r8 | %116
+       r4 r4 <f f'>4 | %117
+       r4 r8 b8\> dis8 r8\stopTextSpan \tempo "Tempo primo" 4=168 | %118
+       <fis fis,>8--\mf cis8-. <a a'>4 r4 | %119
+       r4 r8 <g g'>8-- <ees ees'>8-. r8 | %120
+       f'4.---> a~---> | %121
+       <<
+         {
+           \voiceOne a2\startTextSpan\> r4 | %122
+         }
+         \new Voice {
+           \voiceTwo r4 des,8( bes4) <b b'>8-. | %(122)
+         }
+       >>
+       \oneVoice
+       r8 d8--\mp <ees ees'>8-- r8 \after 8 \stopTextSpan r4 \clef treble | %123
+ 
+       \sectionLabel \markup { \box \number 124 }
+       \omit Score.BarNumber
+       \tempo "Meno mosso" 4=152
+       <g g'>4--\mp r4 r4 | \undo \omit Score.BarNumber %124
+       c'8-. <a a,>4( <fis fis,>) bes8-.-> | %125
+       r8 f-.-> r8 des8-.-> r8 <d d'>8~ | %126
+       2 fis8( e'8-.) | %127
+       <<
+         {
+           \voiceTwo r4 des8-.-> r8 bes8-.-> d8~ | %128
+           d8 a8~ a2 | %129
+         }
+         \new Voice {
+           \voiceOne r4 s8 r8 r8 b'8-. | %(128)
+           r8 aes8-. s2 | %(129)
+         }
+       >>
+       \oneVoice f,8-.->\startTextSpan ees'8~ 4~ 8 b8-. | %130
+       <<
+         {
+           \voiceTwo r8 c8~ c4
+         }
+         \new Voice {
+           \voiceOne r4 des'8-. r8
+         }
+       >>
+       \oneVoice <e, e,>8-. r8\stopTextSpan \tempo "Poco rubato" 4=144 | %131
+       r8 f8( g,2) | %132
+       bes'8( g,8~ g4~ g8 b~ | %133
+       b8) d'8-. r8 e,,8( gis,4~ | %134
+       gis2) fis''4~ | %135
+       fis2\startTextSpan r8 a8~ | %136
+       a4 r8 \after 4 \stopTextSpan aes4. | %137
+ 
+       \sectionLabel \markup { \box \number 138 }
+       \omit Score.BarNumber
+       \tempo 4=132
+       r8 d,,8~ d4. ees'8~ | \undo \omit Score.BarNumber %138
+       ees2 r8 des8~\mp | %139
+       <<
+         {
+           \voiceOne des2. | %140
+         }
+         \new Voice {
+           \voiceTwo r8 a,8~ a2 | %(140)
+         }
+       >>
+       \oneVoice aes2~\p aes8 g''8~\mf | %141
+       g4.~\> <g d>4.~ | %142
+       <<
+         {
+           \voiceOne <g d>8~ <g d a>8~\p 2 | %143
+         }
+         \new Voice {
+           \voiceTwo r4 r4 <des, des,>4-> | %(143)
+         }
+       >>
+       \oneVoice r4\p\< r4 bes''8( <c c,>8~\mf | %144
+       <c c,>2.~ | %145
+       \ace <c c,>4.)\startTextSpan <f f,>4.~ | %146
+       2. | %147
+       r4\p\< r4 r8 <b, b,>8~ | %148
+       4 <e, e,>4 <b b'>4\f | %149
+       r8 <fis' fis'>8~ \after 4. \stopTextSpan 2 | %150
+ 
+       \sectionLabel \markup { \box \number 151 }
+       \tempo 4=144
+       \omit Score.BarNumber
+       R1*3/4 | \undo \omit Score.BarNumber %151
+       r8 <des des'>8~\p 2 | %152
+       <ees ees'>2 <c c'>4~ | %153
+       8\startTextSpan r8 r4 r4 | %154
+       r4 r4 r8 \after 16 \stopTextSpan <aes aes'>8-.\pp \tempo "Tempo primo" 4=168 | %155
+       R1*3/4 | %156
+       R1*3/4 | %157
+       R1*3/4 | %158
+       R1*3/4 | %159
+       R1*3/4 | %160
+       R1*3/4 | %161
+       R1*3/4 | %162
+       R1*3/4 | %163
+       R1*3/4 | %164
+ 
+       \sectionLabel \markup { \box \number 165 }
+       \omit Score.BarNumber
+       R1*3/4 | \undo \omit Score.BarNumber %165
+       R1*3/4 | %166
+       R1*3/4 | %167
+       R1*3/4 | %168
+       R1*3/4 | %169
+       R1*3/4 | %170
+       R1*3/4 | %171
+       R1*3/4 | %172
+       R1*3/4 | %173
+       R1*3/4 | %174
+       r4 r4 r8 f8~\mp | %175
+       4. <f des>4.~\mf | %176
+       4 <f des b>2\mp | %177
+ 
+       \sectionLabel \markup { \box \number 178 }
+       \omit Score.BarNumber
+       8-.\mf r8 r4 r4 | \undo \omit Score.BarNumber %178
+       R1*3/4 | %179
+       \ritPoc R1*3/4\startTextSpan | %180
+       R1*3/4 | %181
+       R1*3/4 | %182
+       R1*3/4 | %183
+       R1*3/4 | %184
+       R1*3/4 | %185
+       R1*3/4 | %186
+       <<
+         {
+           s4 s4 s8 s16 s16\stopTextSpan \tempo 4=104 %187
+           s4. \molRit s8\startTextSpan s4  %188
+           \after 8. \stopTextSpan s2.
+         }
+         \new Voice {
+           R1*3/4 % s4\stopTextSpan \tempo 4=104 %187
+           R1*3/4 % \molRit s8\startTextSpan s4.  %188
+           r4 r2\fermata \bar "|." %189
+         }
+       >>
+ 
+     }
    }
    \new Staff = "d"
    {
      \clef bass
++<<<<<<< HEAD
 +    \set Staff.pedalSustainStyle = #'bracket
 +    <<
 +      \relative {
 +        \tempo "Vivace" 4=168
 +        \override Staff.Hairpin.stencil = ##f
 +        \override Staff.DynamicText.stencil = ##f
 +        b4\f r8 r4 | %001
 +        \time 4/4 \grace { ees8( } c4) r4 r2 | %002
 +        \time 5/8 \grace { b8(\mp } e,8) \U g' \D r8 aes,4 | %003
 +        r4. a4\f bes8 | %004
 +        f'-> d8-.-> r8 r4. | %005
 +        \grace { a8(\mp } fis4) cis' r4 | %006
 +        R1*5/8 | %007
 +        c2~\f 8 r8 a'4~-> | %008
 +        <a e>~ 8 | %009
 +        aes4\p r4 r4 | %010
 +        ees,8 g4\< r8 f4\f ges'4 | %011
 +        r8 bes,4 r4 | %012
 +        r8 d,8 r4 r4\< \grace { a''8( } cis,4) | %013
 +        \time 4/4 \U \grace { e'8( } \D b8) r8\f r4 r2 | %014
 +        r4 des,4\p aes d8~-> |
 +        d2 bes2~-> |
 +        bes~ bes4.~ |
 +        bes2 c2~-> |
 +        c4. r8 r8 \clef treble a''8 r8 \clef bass \grace { gis,,8( } b8) |
 +        e,4 r8 d8~ d8 \clef treble b''4  c'8 |
 +        r4 \clef bass des,,4~-> des4. ges,8~-> |
 +        ges2~ <ges f>8 a4.~-> |
 +        \time 6/8 a2 b4-> |
 +        e,4.-> gis~-> |
 +        gis2~ gis8 r8 r4 r4 ees,4~\p |
 +        \time 6/8  ees2. |
 +        g8( c,8-.) r8 d'~\mp\< <d fis>~ <d fis a>~ |
 +        8 r8 r8\f r8 b,8-. r8 |
 +        r8 gis'4~( gis4. |
 +        f'8-.) r8 r4 r2 |
 +        r4 e,8-. r8 r4 bes4~ |
 +        bes8 r8 r4 r4 r8 f'8~(-> |
 +        f2~ f8 des8-.) r4 |
 +        R1*9/8 |
 +        r4 fis4~( fis4. d8 |
 +        a8) r8 r4 r2 |
 +        s1*7/8
 +        s1
 +        s1*3/4
 +        s1*6/8
 +        s1*6/8
 +        s1*3/4
 +        r4 e''4(\mf\> f,8-.)\! r8 |
 +        r8 b8-. r4 r8 \clef treble g''8~ |
 +        g4 g4( fis'4~ |
 +        fis8) fis8( aes,8-.) r8 r4 \clef bass |
 +        ees,8-. r8 r4 r4 |
 +        r8 bes8~( bes2~ |
 +        bes8 a'-.) r4 r4 |
 +        e,8-. d'4->( g,8-.) r4 |
 +        r4 r8 \clef treble ges''8~( ges4~ |
 +        ges2.~ |
 +        ges8 a'-.) r4 r4 \clef bass |
 +        dis,,,8-. r8 r4 r4 |
 +        r4 c'8->( f,8-.) r4 |
 +        R1*3/4 |
 +        b,8-. r8 b8-. r8 a'4~ |
 +        4 8( fis8-.) r4 |
 +        <fis e'>8-. r8 r4 r4 |
 +        r4 ees8-. r8 c'4~ |
 +        c8 des,8-. des8-. r8 r4 |
 +        aes'2~ aes8 <aes c>->( |
 +        <f bes>8-.) r8 r4 d8-.^\p\sustainOn r8 |
 +        r4 r8 g8-. r4 |
 +        r4 r4 r8 fis8-.\sustainOff\sustainOn |
 +        r4 bes8-. r8 ees,8-. b-. |
 +        des,8-.\sustainOff\sustainOn r8 r4 r4 |
 +        r4 r4 r8 f8-. |
 +        a8-. r8 r4 r4 |
 +        R1*3/4 |
 +        r8 d8-.\sustainOff\sustainOn r4 r8 fis8-. |
 +        R1*3/4 |
 +        bes8-. r8 r4 r4 |
 +        r4 c8-.\sustainOff\sustainOn r8 r4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4\sustainOff |
 +<<<<<<< HEAD
 +        R1*3/4 |
 +        R1*3/4 | \clef treble
 +        r8 ges'8( aes) aes( bes) r8 |
 +        R1*3/4 |
 +        r8 bes8-. r8 f'8~ 4 |
 +        f2.~ |
 +        f8 f4 f8( g a8~ |
 +        a2) a8( c8-.) |
 +        r8 c8-. r8 c8( d8) d8( |
 +        e2.) |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 |
 +        R1*3/4 | \clef "bass_8"
 +        \stemUp d,,,,,8[(^\f g] \U ees'-.)[ \D bes,]-.
 +      }
 +=======
 +             }
 +>>>>>>> e692014 (start)
 +    >>
++=======
+     \set Staff.ottavationMarkups = #ottavation-ordinals
+     \set Staff.pedalSustainStyle = #'bracket
+     \override DynamicLineSpanner.staff-padding = \phds
+     \relative {
+       \tempo "Vivace" 4=168
+       \omit Staff.DynamicText \omit Staff.Hairpin
+       \time 2/4 b4~\f b8 r8 | %b001
+       \time 6/8 r4. \grace ees8( c4.) | %b002
+       \time 3,2,2 7/8 R1*7/8 | %b003
+       \time 4/4 r8 \grace b8( e,8)\mp r4 r8  aes8~ aes4 | %b004
+       r2 a4.\f bes8 | %b005
+       \time 6/8 R1*6/8 | %b006
+       \time 9/8 \grace a8( fis4.)\mp cis'4. r4. | %b007
+       \time 3/4 r4 r4 r8 c8~\f | %b008
+       \time 4/4 c2~ c8 r8 r8 a'8~ | %b009
+       a8~ <a e>8~ 4 aes4\p r4 | %b010
+       \time 3,2 5/8 r4. ees,8\< g8~ | %b011
+       \time 3/4 g8 r8 f4\f ges'4 | %b012
+       r8 bes,4 r8 r4 | %b013
+       \time 4/4 d,8\mp\< r8 r4 r8 cis'4 \U \grace e'8( \D b8) | %b014
+       R1\f | %b015
+ 
+       \time 3/4 des,4\p aes4 d4->~ | %b016
+       d4. bes4.->~ | %b017
+       <<
+         {
+           \voiceOne
+           bes2.~ | %b018
+         }
+         \new Voice {
+           \voiceTwo
+           r4 r8 \grace aes8( ges8~ ges8) r8 | %(b018)
+         }
+       >>
+       \oneVoice
+       bes2. | %b019
+       c2.->~ | %b020
+       <<
+         {
+           \voiceOne
+           c8 g'8~
+         }
+         \new Voice {
+           \voiceTwo
+           aes,8 r8
+         }
+       >>
+       \oneVoice
+       g'2~ | %b021
+       g4
+       <<
+         {
+           \voiceTwo
+           ees2->~ | %(b022)
+           ees2 des4->^~ | %(b023)
+         }
+         \new Voice {
+           \voiceOne
+           r4 r8 b'8~ | %b022
+           b8 r8 bes,4 s4 | %b023
+         }
+       >>
+       \oneVoice
+       des4. ges,4.->~ | %b024
+       <<
+         {
+           \voiceOne
+           ges4. a4.->~\mf | %b025
+           a2 b4->\< | %b026
+         }
+         \new Voice {
+           \voiceTwo
+           r4 f8 r8 r4 | %(b025)
+           r4 r8 ees8 r4 | %(b026)
+         }
+       >>
+       \oneVoice
+       e4.-> gis4.->~\f | %b027
+       gis2~ gis8 r8 | %b028
+       r4 r4 ees,4\p( | %b029
+ 
+       b2. | %b030
+       c4~ c8) r8 fis'8~\mp\< <fis a>8~ | %b031
+       4~ 8~ <fis a bes>-. r4\f | %b032
+       r8 aes,8->~( aes2 | %b033
+       f'8-.)\p r8 r4 r4 | %b034
+       r4 r8 g,8(\< e8-.) r8 | %b035
+       r4 r8 ees'8-. r8 f,8->~ | %b036
+       f2~ f8 f8-.\pp | %b037
+       r4 r4 r8 des8-. | %b038
+       r4 r4\< d4~ | %b039
+       d4 bes2-> | %b040
+       fis'2.->\f | %b041
+ 
+       r8 a,8~\p a2~ | %b042
+       a8 r8 r8 b'''8-.\mf r4 | %b043
+       bes8-. r8 bes8-.-> bes4.~ | %b044
+       bes2.~ | %b045
+       bes4~ bes8 r8 a8->( e-.) | %b046
+       r4 e8-.-> e4.\mp\< | %b047
+       ees4 ees8-. \f r8 r4 | %b048
+       r4 ees8-.\mp r8 f8-.-> r8 | %b049
+       r4 e,4(\f f,8-.) r8 | %b050
+       r8 b-. r4 r8 \clef treble g''8~ | %b051
+       g4 g4( fis'4~ | %b052
+       fis8) fis8( aes,8-.) r8 r4 \clef bass | %b053
+       ees,8-. r8 b''8-.\> b4.~( | %b054
+       <<
+         {
+           \voiceOne
+           b2 d,4~ | %b055
+           \showStaffSwitch d4\p \U \voiceTwo cis'8_.) r8 r4 \hideStaffSwitch \D | %b056
+         }
+         \new Voice {
+           \voiceTwo
+           r8 bes,,8~( bes2~ | %(b055)
+           bes8 a'8-.) \oneVoice r4 r4 | %(b056)
+         }
+       >>
+       \oneVoice
+ 
+       e,8-.\mf d'4->( g,8-.) r4 | %b057
+       r4 r8 \clef treble ges''4.~(\p | %b058
+       ges2.~ | %b059
+       ges8 a'8-.) r4 r4 \clef bass | %b060
+       dis,,,8-. r8 r4 r4 | %b061
+       r4 c'8->(\f f,8-.) r4 | %b062
+       R1*3/4 | %b063
+       b,8-.\p r8 b8-. r8 a'4~\< | %b064
+       a4 a8( fis-.)\mf r4 | %b065
+       <fis e'>8-. r8 r4 r4 | %b066
+       r4 ees8-. r8 c'4~ | %b067
+       c8 des,8-. des-. r8 r4 | %b068
+       aes'2~
+       <<
+         {
+           \voiceTwo aes8 aes8( | %b069
+           f8-.->)
+         }
+         \new Voice {
+           \voiceOne r8 c'8( | %(b069)
+           bes8-.->)
+         }
+       >>
+ 
+       \oneVoice r8 r4 d,8-.\sustainOn\p r8 | %b070
+       r4 r8 g8-. r4 | %b071
+       r4 r4 r8 fis8-.\sustainOff\sustainOn | %b072
+       r4 bes8-. r8 ees,8-. b-. | %b073
+       des,8-.\sustainOff\sustainOn r8 r4 r4 | %b074
+       r4 r4 r8 f8-. | %b075
+       a8-. r8 r4 r4 | %b076
+       R1*3/4 | %b077
+       r8 d8-.\sustainOff\sustainOn r4 r8 fis8-. | %b078
+       R1*3/4 | %b079
+       bes8-. r8 r4 r4 | %b080
+       r4 c8-.\sustainOff\sustainOn r8 r4 | %b081
+       R1*3/4 | %b082
+       \after 2 \sustainOff R1*3/4 | %b083
+ 
+       \time 4/4 R1 | %b084
+       R1 | %b085
+       \undo \omit Staff.DynamicText \undo \omit Staff.Hairpin
+       \time 3/4 r4 \clef treble <f f'>8-.^\mp <g g'>8-. r8 <a a'>8-. | %b086
+       R1*3/4 | %b087
+       R1*3/4 | %b088
+       <fis fis'>8-. r8 r8 <aes aes'>8-. r8 <bes bes'>8-.-> | %b089
+       r4 r8 <ais ais'>8-.-> <b b'>8-. r8 | %b090
+       r8 <cis cis'>8-.-> r4 r4 | %b091
+       <ees ees'>8-.-> r8 r4 r4 | %b092
+       r4 r4 s4^\p^\< | %b093
+       \time 3/8 R1*3/8^\f | %b094
+       \time 3/4 R1*3/4 | %b095
+       r4 r4 r8 <c c'>8-.^\f | %b096
+       <d d'>8-. r8 8-. 8-. 8-. <e e'>8-. | %b097
+       r4 r4*1/2 s8^\mp^\< s4 | %b098
+       \time 3/8 R1*3/8^\f | %b099
+       \time 3/4 \grace s8 s16 s8.^\mf^\< s4 r4^\ff \clef bass | %b100
+       \omit Staff.Hairpin \omit Staff.DynamicText
+ 
+       \time 4/4 \ottava #-1 g,,,,8-.^\mf d8---> ees8( c8) bes---> a8( f'8-.) r8 | %b101
+       b,8-- gis'8-. e-. fis cis8---> a-. d( des | %b102
+       bes) c---> aes' ees---> f-. ges-. r4 | %b103
+       g8( e) r4 r8 b8---> c-. f---> | %b104
+       d a4.---> aes'8 bes,( des) fis--->  | %b105
+       e8 dis-. b-. r8 r2 | %b106
+       r4 r8 g'8( fis) b, cis-. d-. | %b107
+       a\> e'---> c8 aes'---> bes,-. g'--->\mp ees r8 | %b108
+ 
+       R1*3/4 | %b109
+       <f f'>8-. e-. r4 r4 | %b110
+       r4 g8 c,4---> <a a'>8-. | %b111
+       r8 dis8---> gis b,---> fis'-. f | %b112
+       bes,---> des~---> des2 | %b113
+       R1*3/4 | %b114
+       fis8 d---> a r8 <e' e'>8-. <g g'>8-. | %b115
+       r8 <aes aes'>8 c, g'8---> bes-. r8 | %b116
+       r4 r4 r8 <d d,>8-. | %b117
+       r4 r8 b,8\> dis e~ | %b118
+       e8\p cis'8-. r8 gis4.->~ | %b119
+       8 fis'->~ fis2 \ottava #0 | %b120
+       r4 <aes aes'>4 r8 <e e'> | %b121
+       <c c'> r8 \ottava #-1 des,8( bes4) r8 | %b122
+       r8 d8 \ottava #0 r4 e'4~\mf | %123
+ 
+       <<
+         {
+           \voiceTwo e4~ <e b'>~ 4~ | %b124
+           2~ 8 r8 | %b125
+           r8 f'4~ <f des>8~ 4 | %b126
+           ees,2.~ | %b127
+           ees4
+         }
+         \new Voice {
+           \voiceOne r4 r4 gis'8~ <gis e>~\sostenutoOn | %(b124)
+           2~ 8\sostenutoOff bes8~ | %(b125)
+           bes2. | %(b126)
+           r4 g2~ | %(b127)
+           <g c,>4
+         }
+       >>
+       \oneVoice
+       des'4~ <des bes>4~ | %b128
+       4. des8~ <des bes>4~ | %b129
+       <<
+         {
+           \voiceOne <des bes>4.
+         }
+         \new Voice {
+           \voiceTwo f,4.
+         }
+       >>
+       \oneVoice
+       d,4.~ | %b130
+       d2. | %b131
+       <<
+         {
+           \voiceTwo d4~ <d a'>4~ <d a'>~ | %b132
+           4~ 8 <d a'>4\arpeggio r8 | %b133
+           r4 r4 gis4 | %134
+         }
+         \new Voice {
+           \voiceOne
+           r4 r4 fis'4~ | %(b132)
+           fis4~ 8 fis4\arpeggio b8~ | %(b133)
+           b4.~ <b e,>4. | %(b134)
+         }
+       >>
+       \oneVoice
+       f,2~ f8 f8->~ | %b135
+       <<
+         {
+           \voiceTwo <f bes>2.~ | %b136
+           4. b4.\p | %b137
+ 
+           r8\sostenutoOn d8~ d4. \after 16 \sostenutoOff <e e,>8~ | %b138
+           <e e,>2.\sustainOn | %b139
+         }
+         \new Voice {
+           \voiceOne r4 des4.~ <des bes'>8~ | %(b136)
+           4. <g~ b>4. | %(b137)
+ 
+           g2. | %(b138)
+           g4~ <g d>2 | %(b139)
+         }
+       >>
+       \oneVoice r8 a,8( <bes bes,>2) | %b140
+       <f aes f'>2~\sustainOff\sustainOn\p 8 <ges ges'>8(\sustainOff\sustainOn\mf | %b141
+       <ees' ees'>4~ 8) r8\sustainOff r4 | %b142
+       r4 r4\sustainOn\p <c c,>4-> | %b143
+       <des des,>4(\<\sustainOff\sustainOn <aes aes'>4 <g g'>4~\sustainOff\sustainOn | %b144
+       2)\mf r4\sustainOff | %b145
+       R1*3/4 | %b146
+       R1*3/4 | %b147
+       <ees ees'>2\p r4 | %b148
+       r8\sustainOn <d d'>8~\mf 2 | %b149
+       \after 8 \sustainOff r4 <a a'>2\f | %b150
+ 
+       gis'8( b4 ais8-.) r4 | %b151
+       R1*3/4\sustainOn | %b152
+       R1*3/4 | %b153
+       \undo \omit Staff.Hairpin \undo \omit Staff.DynamicText
+       r4\sustainOff r8 ees'4.^\mf | %b154
+       ees8-. r8 r4 r4 | %b155
+       c4(^\f des) r4 | %b156
+       R1*3/4 | %b157
+       g,4~^\mf g8 r8 a4~ | %b158
+       a4 r8 fis4.~^\mp | %b159
+       fis8 r8 r4 r4 | %b160
+       R1*3/4 | %b161
+       r8 f8~^\p f4~ f8 r8 | %b162
+       e2 r4 | %b163
+       d4~ d8 r8 bes'4~^\mf | %b164
+ 
+       bes4 r4 r4 | %b165
+       r4 r8 <bes fis'>4.~ | %b166
+       8 r8 <bes d fis>4.^\f 8-. | %b167
+       r4 r8 aes'8^\mf^\>\sustainOn <aes c>4~\! | %b168
+       2.~ | %b169
+       2.~ | %b170
+       8 <e aes c>4 8-.^\p\sustainOff g4~^\f^\>\sustainOn | %b171
+       4 <ees g>4. <ees g b>8~ | %b172
+       8 8-.^\p\sustainOff r4 r4 | %b173
+       R1*3/4 | %b174
+       <<
+         {
+           s4 s4 s8 s8\sustainOn |
+           s2. s2. |
+         }
+         \new Voice {
+           R1*3/4 | %b175
+           R1*3/4 | %b176
+           R1*3/4 | %b177
+         }
+       >>
+ 
+       \oneVoice
+       r4\sustainOff c'8(\sustainOn bes4 aes8~ | %b178
+       aes2.) | %b179
+       R1*3/4 | %b180
+       R1*3/4 | %b181
+       R1*3/4 | %b182
+       R1*3/4 | %b183
+       R1*3/4 | %b184
+       R1*3/4 | %b185
+       R1*3/4 | %b186
+       R1*3/4 | %b187
+       R1*3/4 | %b188
+       r4\sustainOff r2\fermata \bar "|." %b189
+ 
+     }
++>>>>>>> working
    }
  >>
diff --cc net-clarity.ly
index 0977dac,cee2368..01043ec
--- a/net-clarity.ly
+++ b/net-clarity.ly
@@@ -242,43 -247,17 +247,44 @@@ clarinetMagstep = #(magstep -2
  %    }
  %  }
  
++<<<<<<< HEAD
 +%  \bookpart {
 +%    \tocItem \markup { "II. " \bold "Vivace" }
 +%    \score {
 +%      \header {
 +%        title = \markup { \fontsize #1 \xtitle }
 +%        subtitle = \markup { \medium \italic \xsub }
 +%        composer = \xcomp
 +%        poet = \markup { \xinst }
 +%        piece = \markup { \large \bold "II. " }
 +%      }
 +%      <<
 +%        \removeWithTag #'part \include "manuscripts/II-clarinet.ly"
 +%        \removeWithTag #'part \include "manuscripts/II-piano.ly"
 +%      >>
 +%      %\midi { }
 +%      \layout {
 +%        \context {
 +%          \Score
 +%          \override RehearsalMark.break-visibility = #begin-of-line-invisible
 +%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
 +%          \override Hairpin.to-barline = ##f
 +%        }
 +%      }
 +%    }
 +%  }
- 
++=======
    \bookpart {
-     \tocItem \markup { "III." \bold "Lento, poco rubato" \parenthesize \italic "to Amber Lucas" }
+     \tocItem \markup { "II. " \bold "Vivace" }
      \score {
        \header {
-         piece = \markup { \large \bold "III. " \parenthesize \italic "to Amber Lucas"  }
+         piece = \markup { \large \bold "II. " }
        }
        <<
-         \removeWithTag #'part \include "manuscripts/III-clarinet.ly"
-         \removeWithTag #'part \include "manuscripts/III-piano.ly"
+         \removeWithTag #'part \include "manuscripts/II-clarinet.ly"
+         \removeWithTag #'part \include "manuscripts/II-piano.ly"
        >>
-      %\midi { }
+       %\midi { }
        \layout {
          \context {
            \Score
@@@ -295,41 -277,69 +304,107 @@@
        }
      }
    }
++>>>>>>> working
  
+ %  \bookpart {
+ %    \tocItem \markup { "III." \bold "Lento, poco rubato" \parenthesize \italic "to Amber Lucas" }
+ %    \score {
+ %      \header {
+ %        piece = \markup { \large \bold "III. " \parenthesize \italic "to Amber Lucas"  }
+ %      }
+ %      <<
+ %        \removeWithTag #'part \include "manuscripts/III-clarinet.ly"
+ %        \removeWithTag #'part \include "manuscripts/III-piano.ly"
+ %      >>
+ %     %\midi { }
+ %      \layout {
+ %        \context {
+ %          \Score
+ %          \remove Mark_engraver
+ %          \remove Text_mark_engraver
+ %          \override RehearsalMark.break-visibility = #begin-of-line-invisible
+ %          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
+ %          \override Hairpin.to-barline = ##f
+ %        }
+ %        \context {
+ %          \Staff
+ %          \RemoveEmptyStaves
+ %        }
+ %      }
+ %    }
+ %  }
+ 
++<<<<<<< HEAD
 +  \bookpart {
 +    \tocItem \markup { "IV. " \bold "Allegro energico" }
 +    \score {
 +      \header {
 +        title = ##f
 +        subtitle = ##f
 +        composer = ##f
 +        poet = ##f
 +        piece = \markup { \large \bold "IV." }
 +      }
 +      <<
 +        \removeWithTag #'part \include "manuscripts/IV-clarinet.ly"
 +        \include "manuscripts/IV-piano.ly"
 +      >>
 +      \midi { }
 +      \layout {
 +        \context {
 +          \Score
 +          \remove Text_mark_engraver
 +          \remove Mark_engraver
 +          \override TextSpanner.bound-details.left-broken.text = " "
 +          \override RehearsalMark.break-visibility = #begin-of-line-invisible
 +          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
 +          \override Hairpin.to-barline = ##f
 +          \override Stem.stemlet-length = #0.75
 +        }
 +        \context {
 +          \Staff
 +          \RemoveEmptyStaves
 +          \consists Mark_engraver
 +        }
 +      }
 +    }
 +  }
++=======
+ %  \bookpart {
+ %    \tocItem \markup { "IV. " \bold "Allegro energico" }
+ %    \score {
+ %      \header {
+ %        title = ##f
+ %        subtitle = ##f
+ %        composer = ##f
+ %        poet = ##f
+ %        piece = \markup { \large \bold "IV." }
+ %      }
+ %      <<
+ %        \removeWithTag #'part \include "manuscripts/IV-clarinet.ly"
+ %        \include "manuscripts/IV-piano.ly"
+ %      >>
+ %      %\midi { }
+ %      \layout {
+ %        \context {
+ %          \Score
+ %          \remove Text_mark_engraver
+ %          \remove Mark_engraver
+ %          \override TextSpanner.bound-details.left-broken.text = " "
+ %          \override RehearsalMark.break-visibility = #begin-of-line-invisible
+ %          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
+ %          \override Hairpin.to-barline = ##f
+ %          \override Stem.stemlet-length = #0.75
+ %        }
+ %        \context {
+ %          \Staff
+ %          \RemoveEmptyStaves
+ %          \consists Mark_engraver
+ %        }
+ %      }
+ %    }
+ %  }
++>>>>>>> working
  
    \pageBreak
    \markup { \null }