From b04c7c8deddd5effd0d72cbd335c809f2136ea85 Mon Sep 17 00:00:00 2001 From: Tucker Johnson Date: Tue, 27 Jan 2026 12:27:58 -0500 Subject: [PATCH] update --- general/scoreLayout.ly | 2 ++ manuscripts/bass.ly | 13 ++++++++++++- manuscripts/bassClarinet.ly | 6 ++++++ manuscripts/bassoon.ly | 6 ++++++ manuscripts/cello.ly | 13 ++++++++++++- manuscripts/clarinetSolo.ly | 6 ++++++ manuscripts/flute.ly | 14 ++++++++++---- manuscripts/horn.ly | 5 ++++- manuscripts/oboe.ly | 6 +++++- manuscripts/perc1.ly | 4 ++++ manuscripts/perc2.ly | 4 ++++ manuscripts/pianoDown.ly | 33 +++++++++++++++++++++++---------- manuscripts/pianoUp.ly | 9 ++++++--- manuscripts/tempoMap.ly | 33 +++++++++++++++++++-------------- manuscripts/trombone.ly | 5 ++++- manuscripts/trumpet.ly | 4 +++- manuscripts/viola.ly | 15 +++++++++++---- manuscripts/violin1.ly | 9 ++++++++- manuscripts/violin2.ly | 11 +++++++++-- 19 files changed, 154 insertions(+), 44 deletions(-) diff --git a/general/scoreLayout.ly b/general/scoreLayout.ly index 233e1e0..ed9bcd0 100644 --- a/general/scoreLayout.ly +++ b/general/scoreLayout.ly @@ -1,6 +1,7 @@ \layout { \context { \Score + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/14) \override InstrumentName.self-alignment-X = 1 \override RehearsalMark.break-visibility = #begin-of-line-invisible \override Hairpin.to-barline = ##f @@ -50,6 +51,7 @@ \consists Metronome_mark_engraver \consists Text_mark_engraver \remove Clef_engraver + pedalSustainStyle = #'bracket } \context { \OneStaff diff --git a/manuscripts/bass.ly b/manuscripts/bass.ly index e8932c4..3b99f3c 100644 --- a/manuscripts/bass.ly +++ b/manuscripts/bass.ly @@ -32,7 +32,18 @@ bassMusic = r8 f''8 e8 d8 cis8 b8 a8 gis8 | %066 r2 r8 c8-. r4 | %067 R1*3/4 | %068 - R1*4 + R1*4 | %069-72 + r2 r4 d,4 | %073 + e2. f4 | %074 + fis2. r2 | %075 + g4. c,8~-> c2 | %076 + ees4. d8~-> d2 | %077 + R1 | %078 + R1*5/4 | %079 + r2 r4 a'4 | %080 + r8 a4.->^\markup { "arco" } gis4( b4~ | %081 + b2~ b4) f8( d8~ d8 c4.) | %082 + bes2 a2\fermata | %083 } bassStaff = diff --git a/manuscripts/bassClarinet.ly b/manuscripts/bassClarinet.ly index 5b0db92..d519ea1 100644 --- a/manuscripts/bassClarinet.ly +++ b/manuscripts/bassClarinet.ly @@ -55,6 +55,12 @@ bassClarinetMusic = r2 d''4-- \tuplet 3/2 { d8-.-> bes8-.-> ges8-.-> } | %081 R1*6/4 | %082 r2 r2\fermata | %083 + r4 cis,,8 dis8 e8 fis8 gis4 | %084 + g4. d8~-> d4 ees4~-> | %085 + ees2. r2 | %086 + R1*2 | %087-88 + \tuplet 3/2 { b''2( dis4~ } dis2) | %089 + R1 | %090 } bassClarinetStaff = diff --git a/manuscripts/bassoon.ly b/manuscripts/bassoon.ly index a236b22..2d65cde 100644 --- a/manuscripts/bassoon.ly +++ b/manuscripts/bassoon.ly @@ -63,6 +63,12 @@ bassoonMusic = R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 + r4 cis8 dis8 e8 fis8 gis4 | %084 + g4. d8~-> d4 ees4~ | %085 + ees2. r2 | %086 + R1*2 \clef tenor | %087-88 + b''1( | %089 + b'1) | %090 } bassoonStaff = diff --git a/manuscripts/cello.ly b/manuscripts/cello.ly index 86503fa..8647f08 100644 --- a/manuscripts/cello.ly +++ b/manuscripts/cello.ly @@ -59,7 +59,18 @@ celloMusic = cis1 | %069 R1*2 | %070-071 r2 gis'2~ | %072 - gis2. r4 | %073 + gis2. d,4 | %073 + e2. f4 | %074 + fis2.~ fis2 | %075 + g4. c,8~ c2 | %076 + ees8( ges8 bes8) d,8~ d4 r4 | %077 + R1 | %078 + R1*5/4 | %079 + r2 r4 a'4^\markup { "pizz" } | %080 + r8 a4.->^\markup { "arco" } gis4( b4~ | %081 + b2~ b4) f8( d'8~ d8 c4.) | %082 + bes2 a'2\fermata | %083 + } celloStaff = diff --git a/manuscripts/clarinetSolo.ly b/manuscripts/clarinetSolo.ly index d60787d..ba94c3c 100644 --- a/manuscripts/clarinetSolo.ly +++ b/manuscripts/clarinetSolo.ly @@ -35,6 +35,12 @@ clarinetMusic = f8-.-> r8 f8-.-> des8-.-> r4 des4~ | %081 des2. r2. | %082 r2 r2\fermata | %083 + r8 ces'8~ ces2~ ces8 bes8-. | %084 + a8-. b8-. c2. | %085 + ges8-. aes8-. f1~ | %086 + f4 g8-. e8~ e4 f4-> | %087 + d2~ d8 cis8~ cis4~ | %088 + cis1 | %089 } clarinetStaff = diff --git a/manuscripts/flute.ly b/manuscripts/flute.ly index 0fdf145..a7aaa18 100644 --- a/manuscripts/flute.ly +++ b/manuscripts/flute.ly @@ -25,11 +25,11 @@ fluteMusic = b1~ | %024 b2 r2^\markup { "take piccolo" } | %025 R1*3 | %026-27 - r2 g2~(^\markup { "piccolo" } | %028 + r2 g2~(^\markup { \bold \box "piccolo" } | %028 g2 f4 e4~ | %029 e4 fis4-.) r2^\markup { "take flute" } | %030 R1*5 | %031-35 - r2 a'8(^\markup { "flute" } gis8~ gis4~ | %036 + r2 a'8(^\markup { \bold \box "flute" } gis8~ gis4~ | %036 gis2) g4-- e4-- | %037 c2 r8 bes8~ bes4~ | %038 bes8 r8 r4 r2 | %039 @@ -46,16 +46,22 @@ fluteMusic = R1*2 |%066-067 R1*3/4 | %068 R1 | %069 - r2 r4 \tuplet 3/2 { r8 r8 a,8~^\markup { "piccolo" } } | %070 + r2 r4 \tuplet 3/2 { r8 r8 a,8~^\markup { \bold \box "piccolo" } } | %070 a1 | %071 R1*2 | %072-073 r4 r8 c8-. g8-. bes8-. r4 | %074 r8 b8-. r4 r8 ees,8-. r2 | %075 - R1*3 | %076-78 + R1*3^\markup { "take flute" } | %076-78 R1*5/4 | %079 R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 + R1 | %084 + r2 e8-.->^\markup { \bold \box "flute" } f8-.-> r4 | %085 + ges8-.-> aes8-.-> f1 | %086 + R1*2 | %087-88 + \tuplet 3/2 { b,2( dis4~ } \tuplet 3/2 { dis4 fis2 } | %089 + \tuplet 3/2 { b2 dis4~ } \tuplet 3/2 { dis4 fis2) } | %090 } fluteStaff = diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly index 9c07878..51a0af2 100644 --- a/manuscripts/horn.ly +++ b/manuscripts/horn.ly @@ -32,10 +32,13 @@ hornMusic = R1*5/4 | %075 R1*2 | %076-77 e,,2. r4 | %078 - r8 ees'8( des2~ des4) r4 | %079 + r8 ees'8( des2~ des2) | %079 R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 + R1*2 | %084-85 + R1*5/4 | %086 + R1*4 } hornStaff = diff --git a/manuscripts/oboe.ly b/manuscripts/oboe.ly index bc160f7..c37420d 100644 --- a/manuscripts/oboe.ly +++ b/manuscripts/oboe.ly @@ -47,7 +47,11 @@ oboeMusic = R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 - + R1 | %084 + r2 e8-.-> f8-.-> r4 | %085 + ges8-.-> aes8-.-> f1 | %086 + R1*3 | %087-89 + \tuplet 3/2 { b2( dis4~ } dis2) | %090 } oboeStaff = diff --git a/manuscripts/perc1.ly b/manuscripts/perc1.ly index d880af4..8b7de4d 100644 --- a/manuscripts/perc1.ly +++ b/manuscripts/perc1.ly @@ -98,6 +98,10 @@ percOnePitchedMusic = r8 kdr8 r4 r2 | %081 R1*6/4 | %082 r2 r2\fermata | %083 + R1 | %084 + kdr4 r8 kdr8 r4 kdr4 | %085 + r8 tml8 r4 r4 r2 | %086 + R1*4 } } diff --git a/manuscripts/perc2.ly b/manuscripts/perc2.ly index ef478fa..a53345b 100644 --- a/manuscripts/perc2.ly +++ b/manuscripts/perc2.ly @@ -130,6 +130,10 @@ percTwoMusic = r4 r8 rcy8\laissezVibrer r4 4 | %081 R1*6/4 | %082 r2 r2\fermata | %083 + r2 r4 r8 htc8 | %084 + r4 htc4 htc8 sds8 r8 htc8 | %085 + sds4 sds8 rcy8 r4 r2 | %086 + R1*4 } } diff --git a/manuscripts/pianoDown.ly b/manuscripts/pianoDown.ly index 5d1736f..970fd95 100644 --- a/manuscripts/pianoDown.ly +++ b/manuscripts/pianoDown.ly @@ -28,13 +28,8 @@ pianoDownMusic = R1*3/4*5 | %043-47 r4 r4 r8 f,8( | %048 cis4 gis'4 fis8 b,8-.) | %049 - R1*3/4 \clef treble | %050 - r4 r4 s4 | %051 - s2. | %052 - s2. | %053 - s2. | %054 - R1*3/4*2 | %055-56 - R1*5/4 \clef bass | %057 + R1*3/4*7 | %050-56 + R1*5/4 | %057 c8( ees8~ ees4) \clef treble g''8( d'8 fis8 e8 cis'8) r8 \clef bass | %058 4 4 | %059 1\fermata | %060 @@ -44,7 +39,25 @@ pianoDownMusic = R1 | %064 a8-. r8 r4 r4 r2. | %065 R1 | %066 - r2 r8 c'8-+ r4 | %067 - R1*3/4 | %068 - R1*4 | %069 + << + { + r2 r8 c'8-+ r4 | %067 + R1*3/4 | %068 + R1*4 | %069-72 + } + { + s1\sustainOn | + s2. | + s4\sustainOff s8 s8\sustainOn s2 | + s2 s2\sustainOff | + } + >> + r2 r4 d,4 | %073 + e2. f4 | %074 + fis2.~ fis2 | %075 + R1*3 | %076-78 + R1*5/4 | %079 + R1*2 | %080-81 + R1*3/2 | %082 + r2 r2\fermata | %083 } diff --git a/manuscripts/pianoUp.ly b/manuscripts/pianoUp.ly index b623137..f35371d 100644 --- a/manuscripts/pianoUp.ly +++ b/manuscripts/pianoUp.ly @@ -24,9 +24,12 @@ pianoUpMusic = 1\fermata | %060 R1*4 \clef bass | %061-64 d,,,8-. r8 r4 r4 r2. | %065 - R1*2 | %066-067 - R1*3/4 | %068 - R1*6 | %069-74 + R1 \clef treble | %066 + r8 aes''8~ aes2.~ | %067 + aes2. | %068 + r4 r8 d8~ d2~ | %069 + d2 r2 | %070 + R1*4 | %071-74 R1*5/4 | %075 R1*3 | %076-78 R1*5/4 | %079 diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly index 70204f4..22d4584 100644 --- a/manuscripts/tempoMap.ly +++ b/manuscripts/tempoMap.ly @@ -5,30 +5,35 @@ tempoMap = \remove Clef_engraver } { - \tempo "Allegro energico" 4=208 - \time 4/4 s1 | %001 + \tempo "Allegro energico" 2=104 + \time 2/2 s1 | %001 \time 3/4 s1*3/4*2 | %002-3 - \time 4/4 s1*11 | %004-14 + \time 2/2 s1*11 | %004-14 \time 3/4 s1*3/4*2 | %015-16 \mark \default - \time 4/4 s1*26 | %016-42 + \time 2/2 s1*26 | %016-42 \mark \default \time 3/4 s1*3/4*14 | %043-56 \time 5/4 s1*5/4 | %057 s2 \timeSpanner "molto rit." s2.\startTextSpan | %058 \time 2/4 s4.. s16\stopTextSpan | %059 - \time 4/4 s1 \bar "||" | %060 + \time 2/2 s1 \bar "||" | %060 \mark \default - \tempo "Poco Meno Mosso" 4=19 - \time 4/4 s1*4 | %061-64 - \time 6/4 s1*6/4 | %065 - \time 4/4 s1*2 | %066-67 + \tempo "Poco Meno Mosso" 2=96 + \time 2/2 s1*4 | %061-64 + \time 3/2 s1*6/4 | %065 + \time 2/2 s1*2 | %066-67 \time 3/4 s1*3/4 | %068 - \time 4/4 s1*6 | %069-074 + \time 2/2 s1*6 | %069-074 \time 5/4 s1*5/4 | %075 - \time 4/4 s1*3 | %076-078 + \time 2/2 s1*3 | %076-078 \time 5/4 s1*5/4 | %079 - \time 4/4 s1*2 | %080-81 - \time 6/4 s2. \timeSpanner "molto rit." s2.\startTextSpan | %082 - \time 4/4 s4.. s16\stopTextSpan s2 \bar "||" | %083 + \time 2/2 s1*2 | %080-81 + \time 3/2 s2. \timeSpanner "molto rit." s2.\startTextSpan | %082 + \time 2/2 s4.. s16\stopTextSpan s2 \bar "||" | %083 + \mark \default + \tempo "A tempo" 2=96 + s1*2 | %84-85 + \time 5/4 s1*5/4 | %086 + \time 2/2 s1*9 | %087 } diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly index 9296bb3..59abdd5 100644 --- a/manuscripts/trombone.ly +++ b/manuscripts/trombone.ly @@ -57,7 +57,10 @@ tromboneMusic = R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 - + R1 | %084 + g,4. d'8~-> d4 ees4~-> | %085 + ees2. r2 | %086 + R1*4 } tromboneStaff = diff --git a/manuscripts/trumpet.ly b/manuscripts/trumpet.ly index 0799556..0c72e75 100644 --- a/manuscripts/trumpet.ly +++ b/manuscripts/trumpet.ly @@ -43,7 +43,9 @@ trumpetMusic = R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 - + R1*2 | %084-85 + R1*5/4 | %086 + R1*4 } trumpetStaff = diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly index d5b51a6..5bfef0d 100644 --- a/manuscripts/viola.ly +++ b/manuscripts/viola.ly @@ -4,7 +4,7 @@ violaMusic = \clef alto R1 | %001 R1*3/4*2 | %002-3 - \time 4/4 R1*6 | %004-9 + R1*6 | %004-9 r2 r4 e'4-.^\markup { "pizz" } | %010 cis4-. r4 r2 | %011 ees8-. f4-. ges8-. aes4-. r4 | %012 @@ -49,9 +49,16 @@ violaMusic = R1 | %067 ees8-. f8-. fis8( g8) e8-. d8-. | %068 cis1 | %069 - R1*2 | %070 - r2 r4 \tuplet 3/2 { r8 dis4~ } | %071 - dis2. r4 | + R1*2 | %070-71 + r2 r4 \tuplet 3/2 { r8 dis4~ } | %072 + dis2. r4 | %073 + R1 | %074 + R1*5/4 | %075 + R1*3 | %076-78 + R1*5/4 | %079 + R1*2 | %080-81 + r8 ges8^\markup { "pizz" } r4 e2~ \tuplet 3/2 { e2 g4~ } | %082 + g2 g2\fermata | %083 } violaStaff = diff --git a/manuscripts/violin1.ly b/manuscripts/violin1.ly index c4d64d9..9d91064 100644 --- a/manuscripts/violin1.ly +++ b/manuscripts/violin1.ly @@ -42,7 +42,14 @@ violinOneMusic = g,,1-> | %067 bes8-. des8-. b4( a4~ | %068 a1) | %069 - R1*4 + R1*5 | %070-74 + R1*5/4 | %075 + R1*3 | %076-78 + r2. r4 b'4~ | %079 + \tuplet 3/2 { b2 g4( } c2~ | %080 + c8) r8 r4 r2 | %081 + R1*3/2 | %082 + r2 r2\fermata | %083 } violinOneStaff = diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly index 49c3b99..b77a2a8 100644 --- a/manuscripts/violin2.ly +++ b/manuscripts/violin2.ly @@ -10,7 +10,7 @@ violinTwoMusic = g4.) ges8~( ges4 f4~ | %014 f2.~ | %015 f2) r4 | %016 - \time 4/4 r4 cis8-.^\markup { "pizz" } dis8-. r8 ais8-. r8 gis8-. | %017 + r4 cis8-.^\markup { "pizz" } dis8-. r8 ais8-. r8 gis8-. | %017 r8 a8-. r4 r4 r8 cis8-. | %018 R1*13 | %019-31 r2 r8 g8-.^\markup { "col legno" }^\markup { "arco" } aes8-. bes8-. | %032 @@ -42,7 +42,14 @@ violinTwoMusic = g,1-> | %067 bes8-. des8-. b4( a4~ | %068 a1) | %069 - R1*4 + R1*5 | %070-74 + R1*5/4 | %075 + R1*3 | %076-78 + r2. r4 b'4~ | %079 + \tuplet 3/2 { b2 g4~ } g2~ | %080 + g8 r8 r4 r2 | %081 + r2 r2 r4 \tuplet 3/2 { r8 g,4~ } | %082 + g2 g2\fermata | %083 } violinTwoStaff = -- 2.39.5