From 0cdcb4a70f1db37806f7407076fff961d76db942 Mon Sep 17 00:00:00 2001 From: Tucker Johnson Date: Sun, 30 Mar 2025 13:13:57 -0400 Subject: [PATCH] grace note edit --- manuscripts/II-clarinet.ly | 34 +++++++++++++++++----------------- manuscripts/II-piano.ly | 38 ++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly index 32e332e..c6ab0a3 100644 --- a/manuscripts/II-clarinet.ly +++ b/manuscripts/II-clarinet.ly @@ -115,21 +115,21 @@ \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 + \time 3/4 r8 e8-. f8( g8) g8( a~ | %086 + a8) \slashedGrace e8^( b'8)--\mp \grace ees,8^( c8\f d8-.) r8 d8-.-> | %087 + r8 \slashedGrace ces'8^( des,8\p ees8-.) ees8-. \grace d8^( e4->)\f | %088 + \slashedGrace 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 + ees8) ees8-.\mf \slashedGrace 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 + \time 3 3/8 aes8) \slashedGrace f8^( g8\ff a,8~ | %094 + \time 3/4 \pocAce a8)\startTextSpan \slashedGrace aes'8^( bes,8~ bes4.) bes8-.\> | %095 + bes8-. bes8-. bes8-. bes8-. bes8-.\mp \slashedGrace ees8^( c8\f | %096 d8-.) r8 d8-. d8-. d8( e8-.) | %097 - \grace bes8( f8)\mf f'8-. f8( g8-.) g8-.\< g8( | %098 + \slashedGrace 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 + \time 3/4 \slashedGrace a,8^( ges'8\ff aes8-.) aes8-. aes8( bes-.) r8 \bar "||" %100 \sectionLabel \markup { \huge \box \sans \bold 101 } @@ -163,17 +163,17 @@ \omit Score.BarNumber \tempo "Poco rubato" 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 + r8 a'4(\mp\< fis) bes8~-> | %125 + bes8 f4-> des4->\f \slashedGrace fis8( d8~\p | %126 d2\< fis4~\mp | %127 - fis4) \breathe des'4->\f bes8-> \grace f8( d'8~\> | %128 + fis4) \breathe des'4->\f bes8-> \slashedGrace 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 4=144 | %131 + \slashedGrace b8^( f8->)\startTextSpan ees'8~ ees4~\< ees8 \slashedGrace f,8^( b8~->\f\> | %130 + b8) c8~ \after 8 \p c4 \slashedGrace b8^( \after 8 \stopTextSpan e4~->\f \tempo 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)\startTextSpan \grace e''8( g,2~\> | %135 + b8) \slashedGrace gis''8^( dis4)\mf e,8( gis,4~ | %134 + gis4)\startTextSpan \slashedGrace e''8( g,2~\> | %135 g2) c4~ | %136 c4 r8 \after 4 \stopTextSpan g4.\p \tempo 4=132 | %137 diff --git a/manuscripts/II-piano.ly b/manuscripts/II-piano.ly index 0d23c2c..fa31baa 100644 --- a/manuscripts/II-piano.ly +++ b/manuscripts/II-piano.ly @@ -27,7 +27,7 @@ \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~ 8->-. r8 r4 | %009 - r4 r8 d'8-.-> r4\p \D \slashedGrace a,8( \U ges'4) | %010 + r4 r8 d'8-.-> r4\p \D \slashedGrace 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 @@ -348,7 +348,9 @@ } } - \new Staff = "d" + \new Staff = "d" \with { + \consists "Merge_rests_engraver" + } { \clef bass \set Staff.ottavationMarkups = #ottavation-ordinals @@ -358,22 +360,22 @@ \tempo "Vivace" 4=168 \omit Staff.DynamicText \omit Staff.Hairpin \time 2/4 b4~\f b8 r8 | %b001 - \time 6/8 r4. \slashedGrace ees8( c4.) | %b002 + \time 6/8 r4. \slashedGrace ees8^( c4.) | %b002 \time 3,2,2 7/8 R1*7/8 | %b003 - \time 4/4 r8 \slashedGrace b8( e,8)\mp r4 r8 aes8~ aes4 | %b004 + \time 4/4 r8 \slashedGrace b8^( e,8)\mp r4 r8 aes8~ aes4 | %b004 r2 a4.\f bes8 | %b005 \time 6/8 R1*6/8 | %b006 - \time 9/8 \slashedGrace a8( fis4.)\mp cis'4. r4. | %b007 + \time 9/8 \slashedGrace 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~ 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 \slashedGrace e'8( \D b8) | %b014 + \time 4/4 d,8\mp\< r8 r4 r8 cis'4 \U \slashedGrace e'8^( \D b8) | %b014 R1\f | %b015 - \time 3/4 des,4\p aes4 d4->~ | %b016 + \time 3/4 des,4\p aes4 d4\(->~ | %b016 d4. bes4.->~ | %b017 << { @@ -386,12 +388,12 @@ } >> \oneVoice - bes2. | %b019 - c2.->~ | %b020 + bes2.\) | %b019 + c2._\(->~ | %b020 << { \voiceOne - c8 g'8~ + c8 g'8~-> } \new Voice { \voiceTwo @@ -405,7 +407,7 @@ { \voiceTwo ees2->~ | %(b022) - ees2 des4->^~ | %(b023) + ees2\) des4^\(->^~ | %(b023) } \new Voice { \voiceOne @@ -419,7 +421,7 @@ { \voiceOne ges4. a4.->~\mf | %b025 - a2 b4->\< | %b026 + a2\) b4\(->\< | %b026 } \new Voice { \voiceTwo @@ -429,12 +431,20 @@ >> \oneVoice e4.-> gis4.->~\f | %b027 - gis2~ gis8 r8 | %b028 + gis2~ gis8\) r8 | %b028 r4 r4 ees,4\p( | %b029 b2. | %b030 c4~ c8) r8 fis'8~\mp\< 8~ | %b031 - 4~ 8~ -. r4\f | %b032 + << + { + \voiceTwo 4~ 4~ 8 r8\f | %b032 + } + \new Voice { + \voiceOne r4 r8 bes8~ bes8 r8 | + } + >> + \oneVoice r8 aes,8->~( aes2 | %b033 f'8-.)\p r8 r4 r4 | %b034 r4 r8 g,8(\< e8-.) r8 | %b035 -- 2.39.5