From e54d4aeea5ba9b781f114fd9dd9592f88268e0a9 Mon Sep 17 00:00:00 2001 From: Tucker Johnson Date: Mon, 27 Jan 2025 22:30:03 -0500 Subject: [PATCH] m. 2 engraved --- manuscripts/II-clarinet.ly | 42 ++++++++++++++- manuscripts/II-piano.ly | 105 ++++++++++++++++++++++++++++++++++--- net-clarity.ly | 1 - 3 files changed, 138 insertions(+), 10 deletions(-) diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly index 0183aad..7eec95b 100644 --- a/manuscripts/II-clarinet.ly +++ b/manuscripts/II-clarinet.ly @@ -8,6 +8,7 @@ \override StaffSymbol.staff-space = \clarinetMagstep \consists Text_mark_engraver \consists Mark_engraver + \RemoveEmptyStaves } \transpose bes c' \relative { @@ -171,8 +172,8 @@ 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) c4~ | %136 - c4\startTextSpan r8 \after 4 \stopTextSpan g4.\p \tempo 4=132 | %137 + g2)\startTextSpan c4~ | %136 + c4 r8 \after 4 \stopTextSpan g4.\p \tempo 4=132 | %137 \sectionLabel \markup { \box \number 138 } \omit Score.BarNumber @@ -201,5 +202,42 @@ 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 } diff --git a/manuscripts/II-piano.ly b/manuscripts/II-piano.ly index 7b19535..e7a841b 100644 --- a/manuscripts/II-piano.ly +++ b/manuscripts/II-piano.ly @@ -253,8 +253,8 @@ bes'8( g,8~ g4~ g8 b~ | %133 b8) d'8-. r8 e,,8( gis,4~ | %134 gis2) fis''4~ | %135 - fis2 r8 a8~ | %136 - a4 r8 aes4. | %137 + fis2\startTextSpan r8 a8~ | %136 + a4 r8 \after 4 \stopTextSpan aes4. | %137 \sectionLabel \markup { \box \number 138 } \omit Score.BarNumber @@ -294,9 +294,56 @@ r8 8~\p 2 | %152 2 4~ | %153 8\startTextSpan r8 r4 r4 | %154 - r4 r4 r8 \after 16 \stopTextSpan 8\p \tempo "Tempo primo" 4=168 | %155 + r4 r4 r8 \after 16 \stopTextSpan 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. 4.~\mf | %176 + 4 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 + } + >> } } @@ -584,10 +631,54 @@ gis'8( b4 ais8-.) r4 | %b151 R1*3/4\sustainOn | %b152 R1*3/4 | %b153 - r4\sustainOff r8 ees4. | %b144 - ees8-. r8 r4 r4 | %b145 - c4( des) r4 | %b146 - R1*3/4 | %b147 + \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 4.~ | %b166 + 8 r8 4.^\f 8-. | %b167 + r4 r8 aes'8^\mf^\>\sustainOn 4~\! | %b168 + 2.~ | %b169 + 2.~ | %b170 + 8 4 8-.^\p\sustainOff g4~^\f^\>\sustainOn | %b171 + 4 4. 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 } } diff --git a/net-clarity.ly b/net-clarity.ly index 949009b..cee2368 100644 --- a/net-clarity.ly +++ b/net-clarity.ly @@ -272,7 +272,6 @@ clarinetMagstep = #(magstep -2) } \context { \Staff - \RemoveEmptyStaves \override OttavaBracket.outside-staff-priority = 200 } } -- 2.39.5