From: tucker Date: Tue, 2 Apr 2024 18:54:46 +0000 (-0400) Subject: work X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=2928561aea050c5e69cfb310ff765e3c8b3420e2;p=net-clarity.git work --- diff --git a/eng-files/spacing and marks.ly b/eng-files/spacing and marks.ly index 9535166..19b8987 100644 --- a/eng-files/spacing and marks.ly +++ b/eng-files/spacing and marks.ly @@ -16,12 +16,13 @@ rst = \override TextSpanner.bound-details.right.text = " st" lord = \override TextSpanner.bound-details.left.text = "ord" rord = \override TextSpanner.bound-details.right.text = " ord" rit = \override TextSpanner.bound-details.left.text = \markup { \upright "rit. " } -ritpoc = \override TextSpanner.bound-details.left.text = \markup { \upright "ritardando poco a poco " } -molrit = \override TextSpanner.bound-details.left.text = \markup { \upright "molto rit. " } -pocrit = \override TextSpanner.bound-details.left.text = \markup { \upright "poco rit. " } +ritPoc = \override TextSpanner.bound-details.left.text = \markup { \upright "ritardando poco a poco " } +molRit = \override TextSpanner.bound-details.left.text = \markup { \upright "molto rit. " } +pocRit = \override TextSpanner.bound-details.left.text = \markup { \upright "poco rit. " } ace = \override TextSpanner.bound-details.left.text = \markup { \upright "accel. " } -acepoc = \override TextSpanner.bound-details.left.text = \markup { \upright "accelerando poco a poco " } -molace = \override TextSpanner.bound-details.left.text = \markup { \upright "molto accel. " } +pocAce = \override TextSpanner.bound-details.left.text = \markup { \upright "poco accel. " } +acePoc = \override TextSpanner.bound-details.left.text = \markup { \upright "accelerando poco a poco " } +molAce = \override TextSpanner.bound-details.left.text = \markup { \upright "molto accel. " } ffsempre = #(make-dynamic-script (markup #:combine #:transparent "f" "ff" #:combine diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly index 22b244a..1a6423d 100644 --- a/manuscripts/III-clarinet.ly +++ b/manuscripts/III-clarinet.ly @@ -27,8 +27,8 @@ \time 7/8 4. b4(\> e | \time 3/4 cis'2)\p r8 g8(\< | \time 7/8 a4. ges,2)\mp | - \time 4/4 r8^\markup { "poco accel." } f4.~\p\< 8 ges8_( aes'4~ | - aes8) r8 c,4~-> c8 b8~->\f \tuplet 3/2 { 8 d8_(\> g8 } \bar "||" + \time 4/4 \pocAce r8\startTextSpan f4.~\p\< 8 ges8_( aes'4~ | + aes8) r8 c,4~-> c8 b8~->\f \tuplet 3/2 { 8 d8_(\> g8\stopTextSpan } \bar "||" \sectionLabel \markup { \box \number 15 } @@ -40,7 +40,7 @@ bes,1)\p | r2 a'2~(\mp | a4 e,2.) | - \time 3/4 gis,4.(\<^\markup { "rit." } fis'8 cis'4)\f \bar "||" + \time 3/4 \rit gis,4.(\<\startTextSpan fis'8 \after 8 \stopTextSpan cis'4)\f \bar "||" \sectionLabel \markup { \box \number 23 } @@ -82,7 +82,7 @@ 8)[\< c8]( a' d,~\> 2) | g8( ees~\! 2) e4~ | e4. cis'8(\f gis8 b8~ 4) | - fis16( a d,8~ 4) f(^\markup { "rit." } ees8.) fes,16( | + fis16( a d,8~ 4) f(\startTextSpan ees8.) fes,16(\stopTextSpan | \sectionLabel \markup { \box \number 48 } @@ -100,7 +100,7 @@ \time 3/4 r4 r4 r8 c8~\f | \time 4/4 c2.\> g4(\mp | \time 3/4 b2.~\< | - \time 4/4 8)\mf r8 r4 r2^\markup { "molto rit." } | + \time 4/4 8)\mf r8 \molRit r4 \after 4. \stopTextSpan r2\startTextSpan | \sectionLabel \markup { \box \number 55 } diff --git a/manuscripts/III-piano.ly b/manuscripts/III-piano.ly index af78dad..9173c36 100644 --- a/manuscripts/III-piano.ly +++ b/manuscripts/III-piano.ly @@ -28,20 +28,20 @@ \time 7/8 gis4.)\p b,4^(~ 4) | \time 3/4 cis'4.(\< d,8~ 8)[ g]( | \time 7/8 a4. ges,8~[\mp ~] 4) | - \time 4/4 r8\p\<^\markup { "poco accel." }_\markup { \tiny \italic "quasi-waltz" } f8( fis cis') r8 bes( aes' ees~\mf | - 2)\mp\< r4 \tuplet 3/2 { r8 a,(\f\> e') } \bar "||" + \time 4/4 \pocAce r8\p\<\startTextSpan_\markup { \tiny \italic "quasi-waltz" } f8( fis cis') r8 bes( aes' ees~\mf | + 2)\mp\< r4 \tuplet 3/2 { r8 a,(\f\> e')\stopTextSpan } \bar "||" \sectionLabel \markup { \box \number 15 } \tempo "Piu Mosso" 4=65 r2\mf \tuplet 3/2 { r8 c'4~-> } 8 \clef bass e,,8 | - 1~\arpeggio | + r8 d16~ 16~ 2.~ | 1 | R1 | r2 ees2~\p | 4 \clef treble 2.~\mp\arpeggio | 1 | - \time 3/4 r4\mf^\markup { "rit." } a'2 \bar "||" + \time 3/4 \rit r4\mf\startTextSpan \after 4. \stopTextSpan a'2 \bar "||" \sectionLabel \markup { \box \number 23 } @@ -84,7 +84,7 @@ 4 2.) | r8 8~ 2 \ottava #0 r8 \clef bass 8~\mf | 1 | - g,4. \clef treble des''16(\> c \tuplet 3/2 { aes4)^\markup { "rit." } bes8( } g8) b8 \bar "||" + g,4. \clef treble des''16(\> c \rit \tuplet 3/2 { aes4)\startTextSpan bes8( } g8) \after 16 \stopTextSpan b8 \bar "||" \sectionLabel \markup { \box \number 48 } @@ -102,7 +102,7 @@ \time 3/4 d\< a d a d a | d\f\> a d a d a d a | \time 3/4 d\< e, d' e, d' e, | - d'\mf\> e, d' e, d'^\markup { "molto rit." } e, d \clef bass e, \bar "||" + d'\mf\> e, d' e, \molRit d'\startTextSpan e, d \clef bass e,\stopTextSpan \bar "||" \sectionLabel \markup { \box \number 55 } @@ -196,9 +196,9 @@ \tempo "Piu Mosso" 4=65 b,2~-> \tuplet 3/2 { 8 a'4~-> } 8 r8 | - 1~\arpeggio | + bes,16~ 8.~ 2.~ | 1 | - r2 2~^\mp\arpeggio | + r2 \tuplet 3/2 { c16~^\mp 8~ } 4.~ | 1~ | 4 d,2.~ | 4~ 2. diff --git a/manuscripts/IV-clarinet.ly b/manuscripts/IV-clarinet.ly index e309887..ae88e37 100644 --- a/manuscripts/IV-clarinet.ly +++ b/manuscripts/IV-clarinet.ly @@ -21,7 +21,7 @@ \time 5/4 R1*5/4 | \time 4/4 R1*13 | \time 3/4 R1*3/4*7 | - \time 5/8 R1*5/8 \molrit \after 4 \startTextSpan R1*5/8 | + \time 5/8 R1*5/8 \molRit \after 4 \startTextSpan R1*5/8 | \time 2/8 \after 8. \stopTextSpan R1*2/8 | \once \override Hairpin.circled-tip = ##t \time 3/4 c'2.~\fermata\< \bar "||" %031 @@ -51,7 +51,7 @@ \time 5/4 bes1\mp\> aes'8(\pp fes8 | %050 \time 2/2 ees2.) r4 | %051 f8[-.->\f r8 f8-.-> cis8]]-.-> r4 cis4~\> | %052 - \time 3/2 \after 2 \mp cis2. r4 \molrit r2\startTextSpan | %053 + \time 3/2 \after 2 \mp cis2. r4 \molRit r2\startTextSpan | %053 \time 2/2 \after 4. \stopTextSpan r2 r2\fermata | %054 \omit Score.BarNumber @@ -69,7 +69,7 @@ a4) d4.->\f f,8~-> f4 | %064 \tuplet 3/2 { fis4( b, a'\> } \tuplet 3/2 { bes, aes' c, } | %065 \time 7/8 g'2~\mp 8) r8 cis,8( | %066 - \pocrit + \pocRit \time 3/4 \after 4 \startTextSpan e,2.\> | %067 \after 2 \p \after 2 \stopTextSpan ees2.) \bar "||" %068 @@ -95,7 +95,7 @@ f' g4.~\f 4) \breathe | %084 \time 2/2 e,,,4.--\mp aes''8(\f\> d, ees a,8)\! r8 | %085 cis,4.--\mp bes'8_(\f\< f' c'\! b-.) g,,-- | %086 - \molrit fis4\>\startTextSpan gis2 b4\p \breathe | %087 + \molRit fis4\>\startTextSpan gis2 b4\p \breathe | %087 \time 3/8 cis''8(\mf e,) fis,(\stopTextSpan \bar "||" %088 \omit Score.BarNumber @@ -118,7 +118,7 @@ \omit Score.BarNumber \sectionLabel \markup { \box \number 103 } - \time 2/2 \acepoc r8 ges,8( ees8) r8 r4 r8 g8(\< | %103 + \time 2/2 \acePoc r8 ges,8( ees8) r8 r4 r8 g8(\< | %103 \undo \omit Score.BarNumber \time 5/8 e8)\startTextSpan r8 r4 c'8( | %104 \time 2/2 a4) r8 cis8( gis4) r4 | %105 diff --git a/manuscripts/IV-piano.ly b/manuscripts/IV-piano.ly index 1783e21..b1233a3 100644 --- a/manuscripts/IV-piano.ly +++ b/manuscripts/IV-piano.ly @@ -50,7 +50,7 @@ bes16\f ees8.~ ees8 d8~ d4~ | %026 d8) r8 aes4 f'8-. c16-.\> g16-. | %027 \time 5/8 \after 4.. \mp R1*5/8 | %028 - f'16(\< bes,8.) \molrit g16[(\startTextSpan d'16 fis16 e16 cis'16 a16]) | %029 + f'16(\< bes,8.) \molRit g16[(\startTextSpan d'16 fis16 e16 cis'16 a16]) | %029 \time 2/8 \tuplet 3/2 { 8->\f\> 8-> 8->\stopTextSpan } | %030 \time 3/4 2.\mf\fermata \clef bass | %031 @@ -100,7 +100,7 @@ 4\f bes8-> c8~ 2 | %064 \tuplet 3/2 { e,8~\mf ~ ~ } 4 \tuplet 3/2 { ees8~\mp ~ ~ } 4 | %065 \time 7/8 R1*7/8 | %066 - \time 3/4 fis'4(\> \pocrit a,\startTextSpan b,~ | %067 + \time 3/4 fis'4(\> \pocRit a,\startTextSpan b,~ | %067 b4. bes8~ bes4)\pp\stopTextSpan | %068 \sectionLabel \markup { \box \number 69 } @@ -135,7 +135,7 @@ >> \oneVoice a8) c8( f) fis( | %085 4.) gis'8 \tuplet 3/2 { a4(\mf d, e) } \clef bass | %086 - \molrit \tuplet 3/2 { cis(\>\startTextSpan dis) c_( } \tuplet 3/2 { f,) bes,( g~\pp } | %087 + \molRit \tuplet 3/2 { cis(\>\startTextSpan dis) c_( } \tuplet 3/2 { f,) bes,( g~\pp } | %087 \time 3/8 \after 4 \stopTextSpan g4.) \clef treble \bar "||" %088 \sectionLabel \markup { \box \number 89 } @@ -169,14 +169,14 @@ \time 12/8 e'^(\mp a e) a^( e a) e(\< a e) a( e a) | %099 \time 3/16 s8. | %100 \time 6/8 g8(\mf bes, g') bes,( g' bes,) | %101 - \time 15/8 \molrit gis'(\>\startTextSpan d gis) d( gis d) gis( d gis) d( gis d) gis(\pp d gis)\stopTextSpan | %102 + \time 15/8 \molRit gis'(\>\startTextSpan d gis) d( gis d) gis( d gis) d( gis d) gis(\pp d gis)\stopTextSpan | %102 } >> \oneVoice \sectionLabel \markup { \box \number 103 } \tempo 2 = 48 - \time 2/2 \acepoc r2 f'8( b-.) r4 | %103 + \time 2/2 \acePoc r2 f'8( b-.) r4 | %103 \time 5/8 r4\startTextSpan c,8([\< fis-.]) r8 | %104 \time 2/2 r8 bes,8( f'4) r8 ees8( a8-.) r8 | %105 r8 d,8( aes'-.) r8 r8 cis,8( g'-.) r8 | %106