From: Tucker Johnson Date: Sun, 18 Jan 2026 02:27:09 +0000 (-0500) Subject: m.60 X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=38c5cee651455dc9edaf86ff93948e0b50e26772;p=tiny-cartel.git m.60 --- diff --git a/general/scoreLayout.ly b/general/scoreLayout.ly new file mode 100644 index 0000000..e16d2e7 --- /dev/null +++ b/general/scoreLayout.ly @@ -0,0 +1,44 @@ +\layout { + \context { + \Score + \override InstrumentName.self-alignment-X = 1 + \override RehearsalMark.break-visibility = #begin-of-line-invisible + \override Hairpin.to-barline = ##f + \overrideTimeSignatureSettings 4/4 1/4 1,1,1,1 #'() + \overrideTimeSignatureSettings 3/4 1/4 1,1,1 #'() + \overrideTimeSignatureSettings 5/8 1/8 2,3 #'() + \override CenteredBarNumber.font-name = "classico" + \phrasingSlurDashPattern #0.5 #2.0 + \override PhrasingSlur.thickness = 0.5 + \override StaffSymbol.layer = #4 + \override Stem.layer = #4 + \override Beam.layer = #4 + \override Hairpin.layer = #4 + \override TimeSignature.layer = #2 + \override Tie.layer = #1 + \override TupletBracket.layer = #2 + \override StringNumber.layer = #2 + \override TextSpanner.layer = #3 + \override NoteHead.layer = #4 + \override Accidental.layer = #4 + \override TimeSignature.whiteout = 2 + \override TextScript.padding = 1 + \override TextScript.layer = #4 + \numericTimeSignature + \override TupletNumber.layer = 4 + \override TupletNumber.font-shape = #'upright + centerBarNumbers = ##t + barNumberVisibility = #all-bar-numbers-visible + rehearsalMarkFormatter = #rounded-measure-number-mark + \override CenteredBarNumber.stencil = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) + \override CenteredBarNumberLineSpanner.direction = #DOWN + \remove Text_mark_engraver + \remove Mark_engraver + \remove Metronome_mark_engraver + } + \context { + \Staff + \consists Text_mark_engraver + \consists Metronome_mark_engraver + } +} diff --git a/general/scorePaper.ly b/general/scorePaper.ly index d7b5d1b..ad219c0 100644 --- a/general/scorePaper.ly +++ b/general/scorePaper.ly @@ -119,49 +119,3 @@ \concat { \if \on-page #42 \evfoot } } } - - -\layout { - \context { - \Score - \override InstrumentName.self-alignment-X = 1 - \override RehearsalMark.break-visibility = #begin-of-line-invisible - \override Hairpin.to-barline = ##f - \overrideTimeSignatureSettings 4/4 1/4 1,1,1,1 #'() - \overrideTimeSignatureSettings 3/4 1/4 1,1,1 #'() - \overrideTimeSignatureSettings 5/8 1/8 2,3 #'() - \override CenteredBarNumber.font-name = "classico" - \phrasingSlurDashPattern #0.5 #2.0 - \override PhrasingSlur.thickness = 0.5 - \override StaffSymbol.layer = #4 - \override Stem.layer = #4 - \override Beam.layer = #4 - \override Hairpin.layer = #4 - \override TimeSignature.layer = #2 - \override Tie.layer = #1 - \override TupletBracket.layer = #2 - \override StringNumber.layer = #2 - \override TextSpanner.layer = #3 - \override NoteHead.layer = #4 - \override Accidental.layer = #4 - \override TimeSignature.whiteout = 2 - \override TextScript.padding = 1 - \override TextScript.layer = #4 - \numericTimeSignature - \override TupletNumber.layer = 4 - \override TupletNumber.font-shape = #'upright - centerBarNumbers = ##t - barNumberVisibility = #all-bar-numbers-visible - rehearsalMarkFormatter = #rounded-measure-number-mark - \override CenteredBarNumber.stencil = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) - \override CenteredBarNumberLineSpanner.direction = #DOWN - \remove Text_mark_engraver - \remove Mark_engraver - \remove Metronome_mark_engraver - } - \context { - \Staff - \consists Text_mark_engraver - \consists Metronome_mark_engraver - } -} diff --git a/manuscripts/bass.ly b/manuscripts/bass.ly index 40123e6..0fc8437 100644 --- a/manuscripts/bass.ly +++ b/manuscripts/bass.ly @@ -2,11 +2,28 @@ bassMusic = \relative { \clef bass - \time 4/4 R1 | %001 - \time 3/4 R1*3/4*2 | %002-3 - \time 4/4 R1*11 | %004-14 - \time 3/4 R1*3/4*2 | %015-16 - \time 4/4 R1*26 | %016-42 + R1 | %001 + R1*3/4*2 | %002-3 + R1*11 | %004-14 + R1*3/4*2 | %015-16 + R1*26 | %016-42 + R1*3/4*2 | %043-44 + r4 r8 ees8->~ ees4~ | %045 + ees2. | %046 + r4 fis'8^\markup { "pizz" } c8 g4 | %047 + e'4. bes4 f8 | %048 + cis4 gis'4 fis8 b,8 | %049 + r8 c8 d4 bes8 e8 | %050 + r4 r8 ees8-.^\markup { "arco" } a,4~( | %051 + a4 aes2) | %052 + g8( c8~ c2) | %053 + f2.~-> | %054 + f4 r4 e4~ | %055 + e8 fis8-. d'8-. r8 r4 | %056 + r4 r4 r8 fis,8^\markup { "pizz" } r8 cis8 r4 | %057 + r2 r4 bes2 | %058 + f4-> d'4-> | %059 + g,1\fermata | %060 } bassStaff = diff --git a/manuscripts/bassClarinet.ly b/manuscripts/bassClarinet.ly index a2f1ce9..27f3b18 100644 --- a/manuscripts/bassClarinet.ly +++ b/manuscripts/bassClarinet.ly @@ -21,7 +21,18 @@ bassClarinetMusic = f8) r8 r4 r4 r8 fis,8-. | %040 g8-. c8-. d8-. e8-. r2 | %041 r2 gis8-. r8 r8 b8-. | %042 - cis8-. + cis8-. r8 r4 r4 | %043 + r4 b,8( cis8~ cis4) | %044 + d4.-- ees,8~-> ees4~ | %045 + ees2. | %046 + R1*3/4*3 | %047-49 + r8 c8( d8-.) r8 bes8-. e8-. | %050 + r8 g8-. r4 r4 | %051 + R1*3/4*5 | %052-56 + r2 r8 fis8-. r4 r4 | %057 + c8( ees8~ ees2) bes2 | %058 + f'4-> d4-> | %059 + g1\fermata | %060 } bassClarinetStaff = diff --git a/manuscripts/bassoon.ly b/manuscripts/bassoon.ly index 82d83fc..d630067 100644 --- a/manuscripts/bassoon.ly +++ b/manuscripts/bassoon.ly @@ -33,7 +33,20 @@ bassoonMusic = bes8 r8 r4 r4 r8 \clef bass fis,,8-. | %40 g8-. c8-. d8-. e8-. r2 | %041 r2 r4 r8 b8-. | %042 - dis8-. + dis8-. r8 r4 a8-. aes8-. | %043 + f8-. r8 b8( cis8~ cis4) | %044 + d4.-- ees8~ ees4~ | %045 + ees2.-> | %046 + R1*3/4*2 | %047-48 + r4 r4 fis,8( b,8-.) | %049 + r8 c8( d8-.) r8 bes8-. e8-. | %050 + r8 g8-. r4 r4 | %051 + R1*3/4*5 | %052-56 + r2 b8-. r8 r8 cis,8-. r4 | %057 + c8( ees8~ ees2) bes2 | %058 + f'4-> d4-> | %059 + g1\fermata | %060 + } bassoonStaff = diff --git a/manuscripts/cello.ly b/manuscripts/cello.ly index 21b83b2..038ed09 100644 --- a/manuscripts/cello.ly +++ b/manuscripts/cello.ly @@ -17,7 +17,37 @@ celloMusic = fis,8(^\markup { "arco" } aes8~ aes4 g8-.) r8 r4 | %019 c,8^\markup { "pizz" } bes8 r4 r2 | %020 R1*7 | %021-27 - r2 r8 des8^\markup { "pizz" } ees8 f8 + r2 r8 des8^\markup { "(pizz)" } ees8 f8 | %028 + ges8 aes8 r4 r4 r8 b!8 | %029 + e8 c8 r4 r8 a8 r4 | %030 + R1*2 | %031-32 + r8 c,8-.^\markup { "arco" } des8-. f8-. ees8-. r8 r4 | %033 + r2 r8 g8~( g4 | %034 + a,1) | %035 + b4.( g'8~ g4) r4 | %036 + r8 ges8^\markup { "pizz" } r8 c,8 r4 r8 des8-.->^\markup { "arco" } | %037 + ees,1~-> | %038 + ees4. \markSpanner "" "msp" a8(\startTextSpan d4 f4~ | %039 + f8) b8-.->\stopTextSpan r4 r2 | %040 + R1*2 | %041-42 + R1*3/4 | %043 + r4 b,8(^\markup { \italic "ord" } cis8~ cis4) | %044 + d4.-- ees,8->~ ees4~ | %045 + ees2. | %046 + r4 fis'8( c8 g4~ | %047 + 4.) bes4( f8 | %048 + cis4) gis'4( fis8 b8-.) | %049 + r4 f''4.^\markup { "pizz" } f8\laissezVibrer | %050 + r4 r8 ees,8-.^\markup { "arco" } a,4~( | %051 + a4 aes2) | %052 + g8( c,8~ c2) | %053 + f2.~-> | %054 + f4 r4 e4~ | %055 + e8 fis8-. d'8-. r8 r4 | %056 + r4 r4 b8^\markup { "pizz" } r8 r4 r4 | %057 + c,8( ees8~ ees2) bes'2 | %058 + f4-> d4-> | %059 + g1\fermata | %060 } celloStaff = diff --git a/manuscripts/flute.ly b/manuscripts/flute.ly index febd5b4..11b78a9 100644 --- a/manuscripts/flute.ly +++ b/manuscripts/flute.ly @@ -33,9 +33,14 @@ fluteMusic = gis2) g4-- e4-- | %037 c2 r8 bes8~ bes4~ | %038 bes8 r8 r4 r2 | %039 - r2 r8 fis'8~ fis4~ | %040 - fis2~ fis4 fis4-- | %041 - fis8-.-> + r2 r8 fis'8~ fis4~ | %041 + fis2~ fis4 fis4-- | %042 + fis8-.-> r8 r4 r4 | %043 + R1*3/4*13 | %044-56 + R1*5/4 | %057 + f8( bes,8~ bes4) g'8( d'8 fis8 e8 cis'8 a) | %058 + \tuplet 3/2 { ees4 aes,4 b4 } | %059 + c1\fermata | %060 } fluteStaff = diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly index 8f951e9..fc4b801 100644 --- a/manuscripts/horn.ly +++ b/manuscripts/horn.ly @@ -15,7 +15,14 @@ hornMusic = ees8 f4 g8 d8-.) r8 r4 | %027 R1*14 | %028-41 r8 ees8-. r8 f8-. aes8-. r8 r4 | %042 - + R1*3/4*11 | %043-53 + r8 a8~ a2~ | %054 + a4 r4 r4 | %055 + R1*3/4 | %056 + r8 e8-. r4 r2. | %057 + R1*5/4 | %058 + \tuplet 3/2 { ees'4 aes4 b4 } | %059 + c1\fermata | %060 } hornStaff = diff --git a/manuscripts/oboe.ly b/manuscripts/oboe.ly index e06a1d2..9747492 100644 --- a/manuscripts/oboe.ly +++ b/manuscripts/oboe.ly @@ -26,9 +26,15 @@ oboeMusic = d4 ees2.~ | %036 ees4) r4 r2 | %037 R1*3 | %038-40 - r2 r8 fis8~ fis4~ | %031 + r2 r8 fis8~ fis4~ | %041 fis2~ fis4 fis4-- | %042 - fis8-.-> + fis8-.-> r8 r4 r4 | %043 + R1*3/4*13 | %044-56 + R1*5/4 | %057 + f8( bes,8~ bes4) g8( d'8 fis8 e8 cis'8 a) | %058 + \tuplet 3/2 { ees'4 aes,4 b4 } | %059 + c1\fermata | %060 + } oboeStaff = diff --git a/manuscripts/perc1.ly b/manuscripts/perc1.ly index 245e9cd..955324f 100644 --- a/manuscripts/perc1.ly +++ b/manuscripts/perc1.ly @@ -27,6 +27,21 @@ percOneMusic = R1*13 | %027-40 r2 a8-+ bes8~ bes4 | %041 r4 r8 f8-+ aes8-+ r8 r4 | %042 + R1*3/4*2 | %043-44 + fis'4. g8:32~ g4:32 | %045 + r4 r4 r8 cis8->-+ | %046 + R1*3/4 | %047 + r4 r4 ees,4:32~ | %048 + ees2:32 ees4 | %049 + r4 f4-+ r8 f8-+ | %050 + r4 a4-+ r8 cis8 | %051 + e,4 b'4. fis8 | %052 + bes8 ees8~ ees2 | %053 + d2. | %054 + R1*3/4*2 | %055-56 + R1*5/4*2 | %057-58 + R1*2/4 | %059 + R1\fermata | %060 } percOneStaff = diff --git a/manuscripts/perc2.ly b/manuscripts/perc2.ly index d60d9a4..eb4b621 100644 --- a/manuscripts/perc2.ly +++ b/manuscripts/perc2.ly @@ -38,6 +38,21 @@ percTwoMusic = R1 | %040 r4 d8 e8 a8 bes8:32~ bes4:32 | %041 r8 ees,8-+ r8 f8-+ aes8-+ r8 r4 | %042 + R1*3/4*2 \clef treble | %043-44 + fis'4. g8:32~ g4:32 | %045 + r4 r4 r8 cis8->-+ | %046 + R1*3/4 | %047 + r4 r4 ees,4:32~ | %048 + ees2:32 ees4 | %049 + r4 f4-+ r8 f8-+ | %050 + r4 a4-+ r4 | %051 + R1*3/4*3 | %052-54 + r4 r4 aes4:32~ | %055 + aes4:32 f'8 r8 r8 g,8 \clef bass | %056 + a,8 e8 r4 b8 r8 r4 r4 | %057 + R1*5/4 | %058 + R1*2/4 | %059 + R1\fermata | %60 } percTwoStaff = diff --git a/manuscripts/pianoDown.ly b/manuscripts/pianoDown.ly index f7bc5af..5829160 100644 --- a/manuscripts/pianoDown.ly +++ b/manuscripts/pianoDown.ly @@ -25,4 +25,17 @@ pianoDownMusic = R1 | %040 g8-. c8-. d8-. e8-. a8-. bes8~ bes4 | %041 R1 | %042 + 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 + c8( ees8~ ees4) \clef treble g''8( d'8 fis8 e8 cis'8) r8 \clef bass | %058 + 4 4 | %059 + 1\fermata | %060 } diff --git a/manuscripts/pianoUp.ly b/manuscripts/pianoUp.ly index ba6cd57..b4d71a8 100644 --- a/manuscripts/pianoUp.ly +++ b/manuscripts/pianoUp.ly @@ -11,7 +11,17 @@ pianoUpMusic = R1*7 \clef treble | %017-23 r4 r8 \repeat tremolo 2 { a''32( b } \repeat tremolo 8 { a32 b } | %024 \repeat tremolo 8 { a32 b) } r2 | %025 - R1*17 + R1*17 | %26-42 + R1*3/4*8 | %043-50 + r4 r4 r8 cis8 | %051 + e,4 b'4. fis8 | %052 + bes8 ees8~ ees2 | %053 + d2. | %054 + R1*3/4*2 | %055-6 + R1*5/4 | %057 + f8( bes,8~ bes4) \ottava #1 g'8( d'8 fis8 e8 cis'8 a8) \ottava #0 | %058 + \tuplet 3/2 { 4 4 4 } | %059 + 1\fermata | %060 } pianoStaff = diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly index ce83b0b..1c20a80 100644 --- a/manuscripts/tempoMap.ly +++ b/manuscripts/tempoMap.ly @@ -12,5 +12,12 @@ tempoMap = \mark \default \time 4/4 s1*26 | %016-42 \mark \default - s1 + \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 + \mark \default + \tempo "Poco Meno Mosso" 4=19 + \time 4/4 s1 | } diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly index 7329226..427c766 100644 --- a/manuscripts/trombone.ly +++ b/manuscripts/trombone.ly @@ -28,6 +28,21 @@ tromboneMusic = R1*6 | %035-40 r8 c8-. d8-. e8-. a8-. bes8~ bes4 | %041 r8 ees,8-. r8 f8-. aes8-. r8 r4 | %042 + R1*3/4 | %043 + r4 b,8( cis8~ cis4) | %044 + d4.-- ees8~-> ees4~ | %045 + ees2. | %046 + R1*3/4*4 | %047-50 + r8 g,8-. r8 ees'8-. a,4~( | %051 + a4 aes2) | %052 + R1*3/4 | %053 + r4 r8 bes8~ bes4~ | %054 + bes4 cis8( dis8~ dis4~ | %055 + dis8) r8 r4 r4 | %056 + R1*5/4 | %057 + c8( ees8~ ees2) bes2 | %058 + f4 d'4 | %059 + g,1\fermata | %060 } tromboneStaff = diff --git a/manuscripts/trumpet.ly b/manuscripts/trumpet.ly index b52620f..427bea7 100644 --- a/manuscripts/trumpet.ly +++ b/manuscripts/trumpet.ly @@ -16,8 +16,20 @@ trumpetMusic = e4 fis8 dis8 b4 gis'4 | %031 cis,1~ | %032 cis1) | %033 - R1*9 - + R1*9 | %034-42 + r4 r4 a,8-. aes8-. | %043 + f8-. r8 r4 r4 | %044 + R1*3/4*6 | %045-50 + r4 a'8-. r8 r8 cis8( | %051 + e,4 b'4.) fis8( | %052 + bes8 ees8~ ees2 | %053 + d2.~ | %054 + d4) r4 aes4~ | %055 + aes4 f'8-. r8 c8-. g8-. | %056 + R1*5/4 | %057 + f'8( bes,8~ bes2) bes,2 | %058 + \tuplet 3/2 { ees'4 aes,4 b4 } | %059 + c1\fermata | %060 } trumpetStaff = diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly index 03f9ea6..2868b13 100644 --- a/manuscripts/viola.ly +++ b/manuscripts/viola.ly @@ -15,8 +15,41 @@ violaMusic = r2 r8 ais8-.^\markup { "pizz" } r8 gis8-. | %017 r8 a8-. r8 b8-. r8 d8-. r4 | %018 fis,8(^\markup { "arco" } aes8~ aes4 g8-.) r8 r4 | %019 - R1*9 + R1*9 | %020-28 + r2 r4 r8 b8-.^\markup { "arco" } | %029 + e8-. c8-. r8 d8-. r2 | %030 + R1*2 | %031-32 + r8 c,8-. des8-. f8-. ees8-. r8 r4 | %033 + R1*5 | %034-38 + r2 \markSpanner "" "msp" d4(\startTextSpan f4~ | %039 + f8) b8-.->\stopTextSpan r4 r2 | %040 + R1*2 | %041-42 + r4 r4 a8-.^\markup { "pizz" } aes8-. | %043 + f8-. r8 r4 r4 | %044 + fis'4.--^\markup { "arco" } g8~-> g4 | %045 + bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046 + r4 d8( a8 b4~ | %047 + b2) ees,4~ | %048 + ees2 ees4-- | %049 + r4 f4.^\markup { "pizz" } f8\laissezVibrer | %050 + R1*3/4*3 | %051-53 + r8 a,8~^\markup { "arco" } a2~ | %054 + a4 cis,8( dis8~ dis4~ | %055 + dis8) fis8-. d8-. r8 r4 | %056 + R1*5/4 | %057 + c8( ees8~ ees2) bes'2 | %058 + f4-> d4-> | %059 + g1\fermata | %060 } violaStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "viola" \with { instrumentName = \markup { "viola " } shortInstrumentName = \markup { "vla " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) + #{ + \new Staff = "viola" + \with { + instrumentName = \markup { "viola " } + shortInstrumentName = \markup { "vla " } + \override DynamicLineSpanner.staff-padding = \sods + } + << $music >> + #}) diff --git a/manuscripts/violin1.ly b/manuscripts/violin1.ly index d838fb7..cb7b251 100644 --- a/manuscripts/violin1.ly +++ b/manuscripts/violin1.ly @@ -24,6 +24,18 @@ violinOneMusic = bes8 bes8-.->\stopTextSpan r4 r2 | %040 r2 r8 fis'8~^\markup { \italic "ord" } fis4~ | %041 fis2.~ fis8 r8 | %042 + R1*3/4*2 | %043-44 + fis,4.-- g8~-> g4 | %045 + bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046 + r4 d8( a8 b4~ | %047 + b2) ees,4~ | %048 + ees2 ees4-- | %049 + r4 f4.^\markup { "pizz" } f8\laissezVibrer | %050 + R1*3/4*6 | %051-56 + a,8^\markup { "pizz" } r8 r4 r2. | %057 + f''8(^\markup { "arco" } bes,8~ bes4) g'8( d'8 fis8 e8 cis'8 a8) | %058 + \tuplet 3/2 { ees4 aes,4 b4 } | %059 + c1\fermata | %060 } violinOneStaff = diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly index 375e9e3..8e82663 100644 --- a/manuscripts/violin2.ly +++ b/manuscripts/violin2.ly @@ -24,6 +24,18 @@ violinTwoMusic = bes8 bes8-.->\stopTextSpan r4 r2 | %040 r2 r8 fis'8~^\markup { \italic "ord" } fis4~ | %041 fis2.~ fis8 r8 | %042 + R1*3/4*2 | %043-44 + fis,4.-- g8~-> g4 | %045 + bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046 + r4 d8( a8 b4~ | %047 + b2) ees,4~ | %048 + ees2 ees4-- | %049 + r4 f4.^\markup { "pizz" } f8\laissezVibrer | %050 + R1*3/4*6 | %051-56 + a,8^\markup { "pizz" } r8 r4 r2. | %057 + f''8(^\markup { "arco" } bes,8~ bes4) g8( d'8 fis8 e8 cis'8 a8) | %058 + \tuplet 3/2 { ees4 aes,4 b4 } | %059 + c1\fermata | %060 } violinTwoStaff = diff --git a/tiny-cartel.ly b/tiny-cartel.ly index 456f863..d4d5498 100644 --- a/tiny-cartel.ly +++ b/tiny-cartel.ly @@ -3,6 +3,7 @@ \include "general/info.ly" \include "lib/load.ly" \include "general/scorePaper.ly" +\include "general/scoreLayout.ly" \include "manuscripts/tempoMap.ly" \include "manuscripts/clarinetSolo.ly"