From 6286c0cd53c2c1ac46552cfb4ec92bc41838d22b Mon Sep 17 00:00:00 2001 From: Tucker Johnson Date: Mon, 2 Feb 2026 11:05:53 -0500 Subject: [PATCH] m. 118 --- general/partLayout.ly | 75 +++++++++ general/partPaper.ly | 42 ----- general/scoreLayout.ly | 3 + manuscripts/bass.ly | 53 +++++-- manuscripts/bassClarinet.ly | 68 +++++--- manuscripts/bassoon.ly | 59 +++++-- manuscripts/cello.ly | 72 ++++++--- manuscripts/clarinetSolo.ly | 71 ++++++--- manuscripts/flute.ly | 42 +++-- manuscripts/horn.ly | 27 +++- manuscripts/oboe.ly | 34 +++- manuscripts/perc1.ly | 51 ++++-- manuscripts/perc2.ly | 68 ++++++-- manuscripts/pianoDown.ly | 27 +++- manuscripts/pianoUp.ly | 30 +++- manuscripts/tempoMap.ly | 21 ++- manuscripts/trombone.ly | 37 ++++- manuscripts/trumpet.ly | 31 +++- manuscripts/viola.ly | 55 +++++-- manuscripts/violin1.ly | 52 +++++-- manuscripts/violin2.ly | 50 ++++-- parts/brassParts.ly | 68 -------- parts/parts_tiny-cartel.ly | 298 ++++++++++++++++++++++++++++++++++++ parts/percussionParts.ly | 55 ------- parts/pianoPart.ly | 42 ----- parts/stringParts.ly | 94 ------------ parts/woodwindParts.ly | 81 ---------- tiny-cartel.ly | 2 +- 28 files changed, 1029 insertions(+), 579 deletions(-) create mode 100644 general/partLayout.ly delete mode 100644 parts/brassParts.ly create mode 100644 parts/parts_tiny-cartel.ly delete mode 100644 parts/percussionParts.ly delete mode 100644 parts/pianoPart.ly delete mode 100644 parts/stringParts.ly delete mode 100644 parts/woodwindParts.ly diff --git a/general/partLayout.ly b/general/partLayout.ly new file mode 100644 index 0000000..10530a8 --- /dev/null +++ b/general/partLayout.ly @@ -0,0 +1,75 @@ +\layout { + \context { + \Score + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10) + \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 + \override TextScript.whiteout = 2 + \override Fermata.outside-staff-priority = 200 + \numericTimeSignature + \romanStringNumbers + \override TupletNumber.layer = 4 + \override TupletNumber.font-shape = #'upright + rehearsalMarkFormatter = #rounded-measure-number-mark + \remove Text_mark_engraver + \remove Mark_engraver + \remove Metronome_mark_engraver + \remove Instrument_name_engraver + \override MultiMeasureRest.expand-limit = 1 + \override RehearsalMark.break-visibility = #(vector #f #t #t) + + %\override PaperColumn.show-horizontal-skylines = ##t + %\override NonMusicalPaperColumn.show-horizontal-skylines = ##t + %\override VerticalAxisGroup.show-vertical-skylines = ##t + %\override System.show-vertical-skylines = ##t + %\override PaperColumn.show-horizontal-skylines = ##t + %\override VerticalAlignment.show-vertical-skylines = ##t + + } + \context { + \Staff + \consists Metronome_mark_engraver + \remove Instrument_name_engraver + \consists Text_mark_engraver + \remove Clef_engraver + pedalSustainStyle = #'bracket + } + \context { + \OneStaff + \remove Instrument_name_engraver + \consists Time_signature_engraver + } + \context { + \GrandStaff + \remove Instrument_name_engraver + \override StaffGrouper.staff-staff-spacing = #'( + (basic-distance . 2) + (padding . 2)) + } + \context { + \Voice + \remove Instrument_name_engraver + \consists Clef_engraver + } +} diff --git a/general/partPaper.ly b/general/partPaper.ly index 48d4ccb..920e308 100644 --- a/general/partPaper.ly +++ b/general/partPaper.ly @@ -111,45 +111,3 @@ \concat { \if \on-page #38 \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 BarNumber.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 - } - \context { - \Staff - \remove Instrument_name_engraver - \override MultiMeasureRest.expand-limit = 1 - } - \context { - \GrandStaff - \remove Instrument_name_engraver - } -} diff --git a/general/scoreLayout.ly b/general/scoreLayout.ly index ed9bcd0..ae94b77 100644 --- a/general/scoreLayout.ly +++ b/general/scoreLayout.ly @@ -26,12 +26,15 @@ \override TextScript.padding = 1 \override TextScript.layer = #4 \override TextScript.whiteout = 2 + \override Fermata.outside-staff-priority = 200 \numericTimeSignature + \romanStringNumbers \override TupletNumber.layer = 4 \override TupletNumber.font-shape = #'upright centerBarNumbers = ##t barNumberVisibility = #all-bar-numbers-visible rehearsalMarkFormatter = #rounded-measure-number-mark + \override RehearsalMark.break-visibility = #(vector #f #t #t) \override CenteredBarNumber.stencil = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) \override CenteredBarNumberLineSpanner.direction = #DOWN \remove Text_mark_engraver diff --git a/manuscripts/bass.ly b/manuscripts/bass.ly index 4c67cf2..4ec0cf2 100644 --- a/manuscripts/bass.ly +++ b/manuscripts/bass.ly @@ -31,7 +31,7 @@ bassMusic = r2 r4 bes2\mf | %058 f4->\ff\>^\markup { "arco" } d'4-> | %059 g,1\mf\fermata | %060 - b4^\markup { "pizz" } r4 r8 d8 g4 | %061 + b4\mp^\markup { "pizz" } r4 r8 d8 g4 | %061 e8 f8 r4 r8 ees8 r4 | %062 r2 g8 bes,4 des8 | %063 R1 | %064 @@ -40,24 +40,45 @@ bassMusic = r2 r8 c8-. r4 | %067 R1*3/4 | %068 R1*4 | %069-72 - r2 r4 d,4 | %073 - e2. f4 | %074 - fis2. r2 | %075 - g4. c,8~-> c2 | %076 - ees4. d8~-> d2 | %077 + r2 r4 d,4\p | %073 + e2 r4 f4\< | %074 + fis2\mp r4 r2 | %075 + g4.\mf c,8~-> c2 | %076 + ees4.\f 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 + r2 r4 a'4\mp | %080 + r8 a4.->\mf^\markup { "arco" } gis4( b4~ | %081 + b2~ b4) f8(\> d8~ d8 c4.) | %082 + bes2\p a2\3\fermata | %083 R1 | %084 - r2 r4 ees'4~ | %085 - ees2.~ ees8 des8~ des4~ | %086 - \tuplet 3/2 { des2 b4~ } b4 fis'4~ | %087 - fis8 g'8-. c,8-. f8-. bes,4( a4 | %088 - gis2) 2 | %089 - R1 + r2 r4 ees'4~\pp\< | %085 + ees2.~ ees8 des8~\mf des4~ | %086 + \tuplet 3/2 { des2\> b4~\mp } b4 fis'4~ | %087 + fis8 g'8-^\f c,8-^ f8-^ bes,4(\> a4 | %088 + gis2)\mp 2 | %089 + R1*6 | %90-95 + R1*3/4*2 | %096-97 + R1 | %098 + R1*7/8 | %099 + r8 r8 ees8-.\p r4 bes8-. r8 | %100 + r4 e8-.\< e8-. r8 f8-. fis8-.-> r8 | %101 + b,8-.->\mf r8 r4 r2 | %102 + R1 | %103 + R1*3/4 | %104 + R1 | %105 + r2 r8 b8-.\f^\markup { "pizz" } r4 | %106 + R1 | %107 + r4 ges'8-.\mp^\markup { "arco" } ges8( f4~ | %108 + f4) r4 r8 des8~\mf | %109 + des4~ des8 r8 | %110 + r4 g8-. g8-. aes4~ | %111 + aes4~ aes8 r8 r8 c,8~\f | %112 + c2. | %113 + b2\mf bes2 | %114 + R1*2 | %115-116 + r4.\shortfermata r4. | %117 + } bassStaff = diff --git a/manuscripts/bassClarinet.ly b/manuscripts/bassClarinet.ly index 92b70e5..ba4d33e 100644 --- a/manuscripts/bassClarinet.ly +++ b/manuscripts/bassClarinet.ly @@ -41,33 +41,63 @@ bassClarinetMusic = c8(\mf ees8~ ees2) bes2 | %058 f'4->\ff\> d4-> | %059 g1\mf\fermata | %060 - r8 f'8~ f2.~ | %061 + r8 f'8~\p f2.~ | %061 f4 ges2 bes8( des,8 | %062 - c2.) b'4~( | %063 + c2.) b'4~(\< | %063 b8 gis8~ gis4 e4.) ees8( | %064 - d8-.) r8 r4 r4 c,2.( | %065 - bes8-.) r8 e'8( d8 cis8 b8 a8 gis8) | %066 - g'1-> | %067 + d8-.)\mf r8 r4 r4 c,2.(\mp\< | %065 + bes8-.)\mf r8 e'8(\p d8 cis8 b8 a8 gis8) | %066 + << + { + g'1-> | %067 + } + { + s4\mp\> s4 s4 s4\! + } + >> R1*3/4 | %068 - r2 r4 r8 f8-. | %069 - ees8( aes8) g8( c8) fis2~ | %070 - fis1 | %071 + r2 r4 r8 f8-.\p | %069 + ees8(\< aes8) g8( c8) fis2~\mf\> | %070 + fis1\mp | %071 R1*3 | %072-74 - fis,,2.~ fis2 | %075 - g4. c,8~-> c2 | %076 - ees8( ges8 bes8) d8~ \tuplet 3/2 { d2 cis,4( } | %077 - e2.) g4~ | %078 + fis,,2.~\mp fis2 | %075 + g4.\< c,8~->\mf c2 | %076 + ees8( ges8 bes8) d8~-> \tuplet 3/2 { d2\> cis,4( } | %077 + e2.)\mp g4~ | %078 g2.~ g2 | %079 R1 | %080 - r2 d''4-- \tuplet 3/2 { d8-.-> bes8-.-> ges8-.-> } | %081 - R1*6/4 | %082 + r2 d''4--\f \tuplet 3/2 { d8-.-> bes8-.-> ges8-.-> } | %081 + r8 aes8-.-> r4 r2 r2 | %082 r2 r2\fermata | %083 - r4 cis,,8 dis8 e8 fis8 gis4 | %084 - g4. d8~-> d4 ees4~-> | %085 - ees2. r2 | %086 + r4 cis,,8\mf dis8 e8 fis8 gis4 | %084 + g4.\< d8~->\f d4 ees4~-> | %085 + \after 2 \! ees2.\> r2 | %086 R1*2 | %087-88 - \tuplet 3/2 { b''2( dis4~ } dis2) | %089 - R1 | %090 + \tuplet 3/2 { b''2(\mp\> dis4~ } \after 4 \p dis2) | %089 + R1*2 | %090-91 + r2 r4 ges,4~\mp | %092 + ges8 ees8~\mf ees2~ ees8 des8~ | %093 + des2. r4 | %094 + R1 | %095 + aes2.( | %096 + f'4\> a,4 c,4)\mp | %097 + R1 | %098 + r8 d''4->\f\> fis4( cis4)\mf | %099 + des,8[(\p\< c8 e8] a,8[ d8 b8 f'8] | %100 + ees8 aes8 g8 ges8 bes,8)\mf c8(\p\< des8 ees8 | %101 + d8 e8 f8 g8~ g8)\mf r8 r4 | %102 + R1 | %103 + R1*3/4 | %104 + R1*2 | %105-106 + r8 ges'8-.\mf r8 a,,8( g8-.) r8 r4 | %107 + R1*3/4*2 | %108-109 + R1*2/4 | %110 + R1*3/4*2 | %111-112 + r4 r4 r8 fis''8(\f | %113 + cis8 d a4~ a8) c8(\> f8) fis( | %114 + cis4.) dis,8~\mf\> dis4. g8 | %115 + fis4 gis2 d4~\p | %116 + d4.~\shortfermata d4. | %117 } bassClarinetStaff = diff --git a/manuscripts/bassoon.ly b/manuscripts/bassoon.ly index fba227f..a3e6980 100644 --- a/manuscripts/bassoon.ly +++ b/manuscripts/bassoon.ly @@ -54,29 +54,60 @@ bassoonMusic = f'4->\ff\> d4-> | %059 g1\mf\fermata | %060 R1*4 | %061-064 - r2. c,2.( | %065 - bes8-.) r8 r4 r2 | %066 + r2. c,2.(\mp\< | %065 + bes8-.)\mf r8 r4 r2 | %066 R1 | %067 R1*3/4 | %068 - r2 r4 r8 f''8-. | %069 - ees8( aes8) g8( c8) \clef tenor fis8( b8~ b4~ | %070 - b1) | %071 + r2 r4 r8 f''8-.\p | %069 + ees8(\< aes8) g8( c8) \clef tenor fis8( b8~\mf\> b4~ | %070 + b1)\mp | %071 R1*3 | %072-74 R1*5/4 \clef bass | %075 - g,,4. c8->~ c2 | %076 - ees8( ges,8 bes8) d,8~ \tuplet 3/2 { d2 cis4( } | %077 - e2.) r4 | %078 + g,,4.\< c8->~\mf c2 | %076 + ees8( ges,8 bes8) d,8~-> \tuplet 3/2 { d2\> cis4( } | %077 + e2.)\mp r4 | %078 R1*5/4 | %079 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 + r4 cis8\mf dis8 e8 fis8 gis4 | %084 + g4.\< d8~->\f d4 ees4~ | %085 + \after 2 \! ees2.\> r2 | %086 R1*2 \clef tenor | %087-88 - b''1( | %089 - b'1) | %090 + b''1(\mp\> | %089 + b'1)\p | %090 + R1 | %091 + c2\mp r2 | %092 + R1*3 \clef bass | %093-95 + aes,,4.(\mf d4. | %096 + f4\> a,4 c,4)\mp | %097 + R1 \clef tenor | %098 + r8 b'''4->\f\> gis4( dis4)\mf \clef bass | %099 + r8 r8 ees,,8-.\p r4 bes8-. r8 | %100 + r4 e8-.\< e8-. r8 f8-. fis8-.-> r8 | %101 + b,8-.->\mf r8 r4 r8 des'8-.-> r4 | %102 + R1 | %103 + R1*3/4 | %104 + R1 | %105 + r2 r8 b,8-.\f\> r4 | %106 + f'''8-. r8 r8 a,,8( g8-.)\mf r8 r4 | %107 + R1*3/4*2 | %108-109 + R1*2/4 | %110 + R1*3/4*3 | %111-113 + b,2\mf bes2 | %114 + e'4. dis8~\> dis4. g8 | %115 + fis4 a,4 a4 d4~\p | %116 + d4.~\shortfermata d4. | %117 + } bassoonStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "bassoon" \with { instrumentName = \markup { "bassoon " } shortInstrumentName = \markup { "bsn " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) + #{ + \new Staff = "bassoon" \with { + instrumentName = \markup { "bassoon " } + shortInstrumentName = \markup { "bsn " } + \override DynamicLineSpanner.staff-padding = \sods + } + << $music >> + #}) diff --git a/manuscripts/cello.ly b/manuscripts/cello.ly index 43e560b..453ce3b 100644 --- a/manuscripts/cello.ly +++ b/manuscripts/cello.ly @@ -55,35 +55,63 @@ celloMusic = c,8(\mf^\markup { "arco" } ees8~ ees2) bes'2 | %058 f4->\ff\> d4-> | %059 g1\mf\fermata | %060 - r8 f'8~^\markup { "pizz" } f2. | %061 + r8 f'4.\p^\markup { "pizz" } r2 | %061 r4 ges2 bes8 des,8 | %062 - c2. b'4~ | %063 + c2 r4 b'4~\< | %063 b8 gis8~ gis4 e4. ees8(^\markup { "arco" } | %064 - d8-.) r8 r4 r4 r2. | %065 - r8 f8^\markup { "pizz" } e8 d8 cis8 b8 a8 gis8 | %066 + d8-.)\mf r8 r4 r4 r2. | %065 + r8 f8^\markup { "pizz" } e8\mp d8 cis8 b8 a8 gis8 | %066 R1 | %067 - ees'8-.^\markup { "arco" } f8-. fis8( g8) e8-. d8-. | %068 - cis1 | %069 + \markSpanner "msp" "ord" ees'8-.\<\startTextSpan^\markup { "arco" } f8-. fis8( g8)\mf\> e8-. d8-. | %068 + cis1\mp\stopTextSpan | %069 R1*2 | %070-071 - r2 gis'2~ | %072 - gis2. d,4 | %073 - e2. f4 | %074 - fis2.~ fis2 | %075 - g4. c,8~ c2 | %076 - ees8( ges8 bes8) d,8~ d4 r4 | %077 + r2 gis'2~\mf^\markup { \italic "sul tasto" } | %072 + gis2. d,4\p^\markup { \italic "ord" } | %073 + \after 2 \< e2. f4 | %074 + fis2.~\mp fis2 | %075 + g4.\< c,8~->\mf c2 | %076 + ees8(\< ges8 bes8) d,8~->\f 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 + r2 r4 a'4\mp^\markup { "pizz" } | %080 + r8 a4.->\mf^\markup { "arco" } gis4( b4~ | %081 + b2~ b4) f8(\> d'8~ d8 c4.) | %082 + bes2\p a'2\1\fermata | %083 R1 | %084 - r2 r4 ees4~ | %085 - ees2.~ ees8 des,8~ des4~ | %086 - \tuplet 3/2 { des2 b'4~ } b4 fis4~ | %087 - fis8 g'8-. c,8-. f8-. bes,4( a4 | %088 - gis2) 2 | %089 - R1 + r2 r4 ees4~\pp\< | %085 + ees2.~ ees8 des,8~\mf des4~ | %086 + \tuplet 3/2 { des2\> b'4~\mp } b4 fis4~ | %087 + fis8 g'8-^\f c,8-^ f8-^ bes,4(\> a4 | %088 + gis2)\mp 2-- | %089 + R1*2 | %090-91 + \override NoteHead.style = #'harmonic-black + r2 r4 e''4\1\mf | %092 + \revert NoteHead.style + r8 ees,8~ ees2~ ees8 des8~ | %093 + des2. r4 | %094 + R1 | %095 + R1*3/4*2 | %096-97 + a'4\mf e'2.^\markup { \italic "sul pont." } | %098 + R1*7/8 | %099 + r8 r8 fis,8-.\p^\markup { \italic "ord" } r4 g8-. r8 | %100 + r4 e,8-.\< e8-. r8 f8-. fis8-.-> r8 | %101 + b8-.->\mf r8 r4 r2 | %102 + R1 | %103 + R1*3/4 | %104 + \override NoteHead.style = #'harmonic-mixed + r4 c4\4\f c2\4 | %105 + \revert NoteHead.style + r4 aes8-.^\markup { "pizz" } r8 r2 | %106 + R1 | %107 + r4 ges8-.\mp^\markup { "arco" } ges8( f4~ | %108 + f4) r4 r8 des8~\mf | %109 + des4~ des8 r8 | %110 + r4 g8-. g8-. aes4~ | %111 + aes4~ aes8 r8 r8 c,8~\f | %112 + c2. | %113 + g''2\mf r2 | %114 + R1*2 | %115-116 + r4.\shortfermata r4. | %117 } celloStaff = diff --git a/manuscripts/clarinetSolo.ly b/manuscripts/clarinetSolo.ly index ba94c3c..b95d140 100644 --- a/manuscripts/clarinetSolo.ly +++ b/manuscripts/clarinetSolo.ly @@ -16,31 +16,60 @@ clarinetMusic = c2.~ c8\pp r8 | %062 r4 f2.~(\< | %063 f1 | %064 - g1~\mf g8 fis8 ees8) r8 | %065 + g1~\mf g8\< fis8 ees8)\! r8 | %065 R1 | %066 - r8 aes8~ aes2.~ | %067 - aes2. | %068 - r4 r8 d8~ d2~ | %069 - d2 r4 e4~ | %070 - e1~ | %071 - e4 cis,2.~ | %072 - \tuplet 5/4 { cis2 a'8~ } a2~ | %073 - a1 | %074 - r4 bes1~( | %075 - bes4 b2.) | %076 - r2 c8-. g8-. a4~ | %077 - a4. d,8~( d4 bes4) | %078 - bes1 aes'8( ges8 | %079 + r8 aes8~\mp\< aes2.~ | %067 + \after 2 \! aes2.\mf\> | %068 + r4 r8 d8~\p\< d2~ | %069 + d2\mf r4 e4~ | %070 + e1~\> | %071 + e4 cis,2.~\mp | %072 + \tuplet 5/4 { cis2\< a'8~\mf } a2~ | %073 + \after 2.. \p a1\> | %074 + r4 \after 4 \< bes1~( | %075 + bes4 b2.)\mf | %076 + r2 c8-.\f g8-. a4~ | %077 + a4. d,8~(\> d4 aes4) | %078 + bes1\mp\> aes'8(\pp ges8 | %079 ees2.) r4 | %080 - f8-.-> r8 f8-.-> des8-.-> r4 des4~ | %081 - des2. r2. | %082 + f8-.->\f r8 f8-.-> des8-.-> r4 des4~\> | %081 + \after 2 \mp des2. r4 r2 | %082 r2 r2\fermata | %083 - r8 ces'8~ ces2~ ces8 bes8-. | %084 + r8 ces'8~->\f 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 + ges8-. aes8-. f1~\> | %086 + f4 g8-. e8~\mp e4 f4->\f | %087 + d2~\> d8 cis8~ cis4~ | %088 + \after 2. \p cis1 | %089 + r2 r4 r8 c'8(\mp | %090 + d8 bes8 aes8 ges8~ ges4) r8 e'8( | %091 + g8 f4) ees8~(\< ees8 cis8 b'8 a8~ | %092 + a4) d4~->\f d8 f,8~ f4 | %093 + \tuplet 3/2 { fis4(\> b,4 a'4 } \tuplet 3/2 { bes,4 aes'4 c,4 } | %094 + g'2.)\mp r8 des8( | %095 + fes,2.\< | %096 + \after 2 \p ees2.) | %097 + g8(\mf\< d'8 ces8 ges'8 bes8 des4) c8( | %098 + e4\f a,8) ees8[(\> f8] aes,4) | %099 + des,8[(\mp\< c8 e8] a,8[ d8 b8 f'8] | %100 + ees8 aes8 g8 ges8 bes,8)\f c8(\mf\< des8 ees8 | %101 + d8 e8 f8 g8~ g8) r8 aes8-. ges8-. | %102 + ces8(\f bes8 a8)-. r8 \tuplet 3/2 { g4(\< c4 e4) } | %103 + aes16( bes16 ces16 des16 ees16 f16 ges8~ ges8.) a,16( | %0104 + ees'2)\ff r8 e8( fis8 b,8) | %105 + g8(\> f8 ees8 bes'8~ bes8) a8( aes4 | %106 + des4-.)\f r8 d8(\> c4-.) r8 e8(\mf | %107 + d8 b8 a8-.) c,,8(\< ees,8-.->)\ff des'''8(^\mf | %108 + bes8 c8 g8-.) bes,,8-.->\ff aes''8(^\mf^\< ges8 | %109 + f8 ees4)^\f d8(^\mf | %110 + e8 a cis8-.) f,,,8(\< a8-.->)\ff ees''8(^\< | %111 + ges8 b8 c8-.)^\f d,,,8-.->\ff aes'''8(^\< bes8 | %112 + f'8 g8~^\ff g2) | %113 + fes,,,4.\mf aes''8(\f\> d, ees a,4)\! | %114 + des,4.\mf bes'8(\f\< f' c' b8-.)\! g,,8-- | %115 + fis4\> gis2 b4~\p | %116 + b4.\shortfermata cis''8(\mf e,8) fis,8( | %117 + gis1.) | %118 } clarinetStaff = diff --git a/manuscripts/flute.ly b/manuscripts/flute.ly index b56b0e0..9cd4d2c 100644 --- a/manuscripts/flute.ly +++ b/manuscripts/flute.ly @@ -2,7 +2,7 @@ fluteMusic = \relative { \clef treble - R1 | %001 + <>^\markup { \bold \box "flute" } R1 | %001 R1*3/4*2 | %002-3 r8 bes'8~->\mf\> bes2.~ | %004 \after 2 \! bes2. f'4~->\mf\> | %005 @@ -46,22 +46,46 @@ fluteMusic = R1*2 |%066-067 R1*3/4 | %068 R1 | %069 - r2 r4 \tuplet 3/2 { r8 r8 a,8~^\markup { \bold \box "piccolo" } } | %070 + r2 r4 \tuplet 3/2 { r8 r8 a,8~\mf^\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^\markup { "take flute" } | %076-78 + r4 r8 c8-^\mp g8-^ bes8-^ r4 | %074 + r8 b8-^\mf r4 r8 ees,8-^ r2 | %075 + <>^\markup { "take flute" } R1*3 | %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 + r2 e8-^\mf^\markup { \bold \box "flute" } f8-^ r4 | %085 + ges8-^ aes8-^ \after 2. \! 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 + \tuplet 3/2 { b,2(\mp\> dis4~ } \tuplet 3/2 { dis4 fis2 } | %089 + \tuplet 3/2 { b2 dis4~ } \tuplet 3/2 { dis4 fis2)\p } | %090 + r8 des'8(\mp f,4) des'2 | %091 + d2 r2 | %092 + r4 b,8(->\mf c8 aes'2) | %093 + R1*2 | %094-95 + fis2.(\mf | %096 + \after 2 \p b,,2.)\> | %097 + r2 r4 r8 c''8(\f | %098 + e4.)\> bes,4( c4)\mf | %099 + R1*7/8 | %0100 + r2 r4 gis8-.-> r8 | %101 + a8-.-> r8 r4 r8 e'8-.->\f r4 | %102 + r4 d8-.-> r8 r2 | %103 + R1*3/4 | %104 + R1 | %105 + r2 c'8-.\f\> r8 r4 | %106 + r8 bes8-. r4 ees,8-.\mf r8 r4 | %107 + R1*3/4*2 | %108-109 + R1*2/4 | %110 + R1*3/4*2 | %111-112 + r4 r4 r8 fis8(\f | %113 + cis8 d8 a4~ a8) r8 r8 fis8( | %114 + b4.)\> gis8 \tuplet 3/2 { a4( d,4 e4)\mp } | %115 + r2 r4 b4~\p | %116 + b4.~\shortfermata b4. | %117 } fluteStaff = diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly index 596eb58..6313446 100644 --- a/manuscripts/horn.ly +++ b/manuscripts/horn.ly @@ -31,14 +31,35 @@ hornMusic = R1*6 | %069-74 R1*5/4 | %075 R1*2 | %076-77 - e,,2. r4 | %078 - r8 ees'8( des2~ des2) | %079 + e,,2.\mf r4 | %078 + r8 ees'8( des2~\> des2)\mp | %079 R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 R1*2 | %084-85 R1*5/4 | %086 - R1*4 + R1*9 | %087-95 + R1*3/4 | %096 + f,2.-+\mf | %097 + R1 | %098 + R1*7/8 | %099 + r8 r8 aes8-.\p r4 g8-. r8 | %100 + r4 cis8-.\< d8-.\! r2 | %101 + r2 bes8(\< ees8-.->)\f r4 | %102 + r4 f8-.-> r8 r2 | %103 + R1*3/4 | %104 + R1 | %105 + r2 r4 r8 e8(\f | %106 + f8-.) ges8-. r4 r2 | %107 + r4 r8 c,8(\p bes4~ | %108 + bes4) r8 bes8~\mp bes4~ | %109 + bes4~ bes8 r8 | %110 + r4 r8 bes8-.\mf e4~ | %111 + e4~ e8 r8 ees4~\f | %112 + ees2. | %113 + R1*3 | %114-116 + r4.\shortfermata r4. | %117 + } hornStaff = diff --git a/manuscripts/oboe.ly b/manuscripts/oboe.ly index ed9ea16..f2e746e 100644 --- a/manuscripts/oboe.ly +++ b/manuscripts/oboe.ly @@ -39,19 +39,41 @@ oboeMusic = R1*2 |%066-067 R1*3/4 | %068 R1*5 | %069-73 - r4 r8 c8-. g8-. bes8-. r4 | %074 - r8 b8-. r4 r8 ees,8-. des8-. f8-. aes8-. r8 | %075 - r2 e8-. a,8-. fis8-. d8-. | %076 + r4 r8 c8-^\mp g8-^ bes8-^ r4 | %074 + r8 b8-^\mf r4 r8 ees,8-^ des8-^ f8-^ aes8-^ r8 | %075 + r2 e8-^\> a,8-^ fis8-^ d8-^\! | %076 R1*2 | %077-78 R1*5/4 | %079 R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 R1 | %084 - r2 e8-.-> f8-.-> r4 | %085 - ges8-.-> aes8-.-> f1 | %086 + r2 e8-^\mf f8-^ r4 | %085 + ges8-^ aes8-^ \after 2. \! f1\> | %086 R1*3 | %087-89 - \tuplet 3/2 { b2( dis4~ } dis2) | %090 + \tuplet 3/2 { b2(\p dis4~ } dis2) | %090 + r4 f4\mp f2 | %091 + a2 r2 | %092 + r4 b,8(-> c8~ c2) | %093 + R1*2 | %094-95 + fis4(\mf a,4 b,~ | %096 + b4.\> \after 8 \p bes4.) | %097 + r2 r4 r8 f''8(\f | %098 + g4.)\> bes,4( c4)\mf | %099 + R1*7/8 | %0100 + r2 r4 gis8-.-> r8 | %101 + a8-.-> r8 r4 r8 ees8-.->\f r4 | %102 + r4 d'8-.-> r8 r2 | %103 + R1*3/4 | %104 + R1*2 | %104-105 + b'8-.\f r8 r4 ees,8-.\mf r8 r4 | %106 + R1*3/4*2 | %107-108 + R1*2/4 | %109 + R1*3/4*3 | %110-112 + r2 r8 c,8(\f f8) fis8( | %113 + b4.)\> gis8 \tuplet 3/2 { a4( d,4 e4)\mp } | %114 + R1 | %115 + r4.\shortfermata r4. | %116 } oboeStaff = diff --git a/manuscripts/perc1.ly b/manuscripts/perc1.ly index b0f40e7..04eb449 100644 --- a/manuscripts/perc1.ly +++ b/manuscripts/perc1.ly @@ -21,7 +21,7 @@ midiDrumPitches.tmh = ees midiDrumPitches.cxl = e midiDrumPitches.cxh = f -percOnePitchedMusic = +percOneMusic = { \new Staff \with { \remove Time_signature_engraver @@ -75,33 +75,58 @@ percOnePitchedMusic = drumPitchTable = #(alist->hash-table midiDrumPitches) } \drummode { - <>^\markup { \bold \box "low tom" } tml1:32\fermata | %060 - <>^\markup { \bold \box "kick drum" } kdr4 r4 r8 kdr8 r4 | %061 + <>^\markup { \bold \box "low tom" } tml1:32\mp\fermata | %060 + <>^\markup { \bold \box "kick drum" } kdr4\pp r4 r8 kdr8 r4 | %061 kdr4 r4 r8 kdr8 r4 | %062 kdr4 r4 r8 kdr8 r4 | %063 r8 kdr8 r4 kdr4 r8 kdr8 | %064 R1*6/4 | %065 R1 | %066 - r2 r8 tml8-+ r4 | %067 + r2 r8 tml8-+\p r4 | %067 R1*3/4 | %068 R1*2 | %069-070 - <>^\markup { \bold \box "caxixi" } 1:32~^\markup { "swirl" } | %071 - 4:32~ 8:32 r8 r2 | %072 + <>^\markup { \bold \box "caxixi" } 1:32~\p^\markup { "swirl" } | %071 + 4:32~\> 8:32\! r8 r2 | %072 R1 | %073 - kdr4 r4 r8 kdr8 r4 | %074 + kdr4\p r4 r8 kdr8 r4 | %074 kdr4 r4 r8 kdr8 r2 | %075 - kdr4 r8 kdr8 r4 tmm4 | %076 - kdr4 r8 kdr8 r2 | %077 + kdr4\< r8 kdr8 r4 tmm4 | %076 + kdr4\mf r8 kdr8 r2 | %077 R1 | %078 R1*5/4 | %079 - r2 r4 kdr4 | %080 + r2 r4 kdr4\p | %080 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 + kdr4\mp\< r8 kdr8 r4 kdr4\mf | %085 + r8 tml8\mp r4 r4 r2 | %086 + R1*4 | %087-90 + r2 cxh8\p cxl8 cxh4 | %091 + r4 cxl4\< cxh4 r4 | %092 + cxl8 cxh8 r8 cxh8 cxl4\mf cxh4 | %093 + R1*2 | %094-95 + R1*3/4*2 | %96-97 + r4 cxl4\< r4 cxh8 cxl8 | %98 + r8 cxh8\f\> r8 cxl8[ cxh8] r8 cxl8\mf | %99 + R1*7/8 | %100 + r4 r8 kdr8\mp\< r4 kdr4 | %101 + kdr4\mf r4 tmh8\< kdr8\f r4 | %102 + r4 4-> r2 | %103 + R1*3/4 | %104 + R1 | %105 + kdr4\f\> tmm4 tml8 kdr4 tmh8 | %106 + kdr8 tmm4 tml8 kdr4\mf r4 | %107 + kdr4\mp tmm4 kdr4 | %109 + kdr4\< tml8 kdr4 tml8 | %110 + kdr4\mf r4 | %111 + kdr8\mp\< tmm8 tml4 kdr4 | %112 + kdr4 tmh8 kdr8 tml8 kdr8\f | %113 + r4 r8 kdr4 tmm8\> | %114 + r4 r8 tmh8 r4 r8 tml8 | %115 + r4 r8 tmm8 r4 r8 kdr8 | %116 + r4 r8 tml8\p r2 | %117 + r4.\shortfermata r4. | %117 } } diff --git a/manuscripts/perc2.ly b/manuscripts/perc2.ly index 94a0862..375360b 100644 --- a/manuscripts/perc2.ly +++ b/manuscripts/perc2.ly @@ -84,7 +84,7 @@ percTwoMusic = a,8 e8 r4 b8\mp r8 r4 r4 | %057 R1*5/4 | %058 R1*2/4 \clef treble | %059 - <>^\markup { \bold \box "tubular bells" } 1\fermata | %60 + <>^\markup { \bold \box "tubular bells" } 1\f\fermata | %60 \override Voice.Clef.stencil = ##f } \new DrumStaff \with { @@ -94,11 +94,11 @@ percTwoMusic = } \drummode { R1 | %061 - r2 r4 r8 <>^\markup { \bold \box "hi-hat" } htc8 \parenthesize -+ | %062 + r2 r4 r8 <>^\markup { \bold \box "hi-hat" } htc8\pp \parenthesize -+ | %062 r4 htc4 r2 | %063 - htc4 htc8 htc8 r8 htc8 htc8 hth8 | %064 - <>^\markup { \bold \box "snare drum" } 8 r8 r4 r4 r4 <>^\markup { \bold \box "ride cymbal" } rcy4\laissezVibrer r4 | %065 - r2 r4 htc8 hth8 | %066 + htc4 htc8 htc8 r8 htc8\< htc8 hth8 | %064 + <>^\markup { \bold \box "snare drum" } 8\mp r8 r4 r4 r4 <>^\markup { \bold \box "ride cymbal" } rcy4\pp\laissezVibrer r4 | %065 + r2 r4 htc8\mp hth8 | %066 8 r8 r4 r2 | %067 R1*3/4 | %068 R1 | %069 @@ -108,9 +108,9 @@ percTwoMusic = \remove Time_signature_engraver } \relative { - r2 r4 <>^\markup { \bold \box "marimba" } e''4:32~ | %070 + r2 r4 <>^\markup { \bold \box "marimba" } e''4:32~\niente\< | %070 e1:32~ | %071 - e4:32 cis,2.:32 | %072 + e4:32\mp\> \after 2 \niente cis,2.:32 | %072 R1 | %073 \override Voice.Clef.stencil = ##f } @@ -120,20 +120,58 @@ percTwoMusic = drumPitchTable = #(alist->hash-table midiDrumPitches) } \drummode { - r2 r4 htc8 htc8 | %074 + r2 r4 htc8\p htc8 | %074 r4 r8 sds8 rcy4\laissezVibrer r4 rcy8\laissezVibrer sds8 | %075 - r8 htc8 hth8 htp8 r8 htc8 r8 sds8 | %076 - sds4 htc8 sds8 rcy4\laissezVibrer r4 | %077 + r8 htc8\< hth8 htp8 r8 htc8 r8 sds8 | %076 + sds4\mf htc8 sds8 rcy4\laissezVibrer r4 | %077 R1 | %078 R1*5/4 | %079 - r2 r4 r8 hhc8 | %080 - r4 r8 rcy8\laissezVibrer r4 4 | %081 + r2 r4 r8 htc8\p | %080 + r4 r8 rcy8\<\laissezVibrer r4 4\mf | %081 R1*6/4 | %082 r2 r2\fermata | %083 - r2 r4 r8 htc8 | %084 - r4 htc4 htc8 sds8 r8 htc8 | %085 + r2 r4 r8 htc8\mp\< | %084 + r4 htc4 htc8 sds8\mf r8 htc8 | %085 sds4 sds8 rcy8\laissezVibrer r4 r2 | %086 - R1*4 + R1*4 | %087-90 + r2 tbr4\p tbr4 | %091 + tbr4\< r4 r4 tbr4 | %092 + r8 tbr8\mf r4 r2 | %093 + R1*2 | %094-95 + R1*3/4*2 | %096-97 + R1 | %098 + R1*7/8 | %099 + r8 r8 sdr8\p\< htc8[ htc8] sdr4 | %100 + r8 htc8 sdr8 sdr8 htc4 htc8 hth8 | %101 + 4\mf r4 r2 | %102 + R1 | %103 + R1*3/4 | %104 + \override Voice.Clef.stencil = ##f + } + \new Staff \with { + \remove Time_signature_engraver + } + \relative { + <>^\markup { \bold \box "tubular bells" } r4 4\f 2 | %105 + R1*2 | %106-107 + \override Voice.Clef.stencil = ##f + } + \new DrumStaff \with { + \remove Time_signature_engraver + drumStyleTable = #(alist->hash-table perc2-drum-style) + drumPitchTable = #(alist->hash-table midiDrumPitches) + } + \drummode { + r4 r8 8\mp\< htp8 sdr8 | %108 + r8 htc8 htc4 htc8 sdr8\mf | %109 + r8 rcy8\laissezVibrer htc4 | %110 + r8 rcy8\laissezVibrer\mp\< sdr8 hth8 htp8 htc8 | %111 + r8 sdr8 htc4 htc8 sdr8\f | %112 + r8 htc8 htc8 rcy8\laissezVibrer r4 | %113 + R1 | %114 + 4\> htc8 sdr8 r8 htc8 sdr4 | %115 + htc8 htc8 sdr8 rcy8\pp\laissezVibrer r2 | %116 + r4.\shortfermata r4. | %117 } } diff --git a/manuscripts/pianoDown.ly b/manuscripts/pianoDown.ly index 5ca577f..5fc7a81 100644 --- a/manuscripts/pianoDown.ly +++ b/manuscripts/pianoDown.ly @@ -41,7 +41,7 @@ pianoDownMusic = c8( ees8~ ees4) \clef treble g''8( d'8 fis8 e8 cis'8) r8 \clef bass | %058 4 4 | %059 1\fermata | %060 - b,8-. r8 r4 r8 d8-. g8-. r8 | %061 + b,8-.^\p r8 r4 r8 d8-. g8-. r8 | %061 e8-. f8-. r4 r8 ees8-. r4 | %062 r2 g8-. bes,8-. r8 des8-. | %063 R1 | %064 @@ -60,7 +60,7 @@ pianoDownMusic = s2 s2\sustainOff | } >> - r2 r4 d,4 | %073 + r2 r4 d,4^\p | %073 e2. f4 | %074 fis2.~ fis2 | %075 R1*3 | %076-78 @@ -70,6 +70,25 @@ pianoDownMusic = r2 r2\fermata | %083 R1*2 | %084-85 R1*5/4 | %086 - R1*4 - + R1*4 | %087-90 + <>\sustainOn R1 \clef treble | %091 + c'''2\sustainOff\sustainOn aes4\sustainOff\sustainOn aes4 | %092 + \after 8 \sustainOff bes4 r4 r2 | %093 + R1*2 | %094-95 + R1*3/4*2 | %096-97 + r4 2.\arpeggio | %098 + R1*7/8 \clef bass | %099 + r8 r8 ees,,8-. r4 bes8-. r8 | %100 + r4 e8-. e8-. r8 f8-. fis8-.-> r8 | %101 + b,8-.-> r8 r4 bes''8( des,8-.->) r4 | %102 + R1 | %103 + R1*3/4 | %104 + r4 c4 c2 | %105 + r2 r8 b,8-. r4 | %106 + r4 r8 a'8( g8-.) r8 r4 | %107 + R1*3/4*2 | %108-109 + R1*2/4 | %110-111 + R1*3/4*3 | %112-114 + R1*3 | %115-117 + r4.\shortfermata r4. | %118 } diff --git a/manuscripts/pianoUp.ly b/manuscripts/pianoUp.ly index 9a9cbfd..443cc95 100644 --- a/manuscripts/pianoUp.ly +++ b/manuscripts/pianoUp.ly @@ -22,9 +22,9 @@ pianoUpMusic = \tuplet 3/2 { 4\ff\> 4 4 } | %059 1\mf\fermata | %060 R1*4 \clef bass | %061-64 - d,,,8-. r8 r4 r4 r2. | %065 + d,,,8-.\mf r8 r4 r4 r2. | %065 R1 \clef treble | %066 - r8 aes''8~ aes2.~ | %067 + r8 aes''8~\p aes2.~ | %067 aes2. | %068 r4 r8 d8~ d2~ | %069 d2 r2 | %070 @@ -35,11 +35,31 @@ pianoUpMusic = R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 - r2 r4 r8 bes8-+ | %084 + r2 r4 r8 bes8-+\mf | %084 a8-+ b8-+ c8-+ r8 e,8-+ f8-+ r4 | %085 - ges8-+ aes8-+ f8-+ des8-+ r4 r4 r8 d'8-+ | %086 + ges8-+ aes8-+ f8-+ des8-+ r4 r4 r8 d'8-+\mp | %086 r4 g,8-+ r8 r2 | %087 - R1*3 + R1*3 | %086-90 + r8 des''8\mp f,4 2 | %091 + 2 r4\< e,4 | %092 + g4\mf r4 r2 | %093 + R1*2 | %094-95 + R1*3/4*2 | %096-97 + r4 2.\arpeggio\mf | %098 + R1*7/8 \clef bass | %099 + r8 r8 8-.\p r4 g8-. r8 \clef treble | %100 + r4 8-.\< 8-. r4 gis'8-.-> r8 | %101 + 8-.->\mf r8 r4 r8\< 8-.->\f r4 | %102 + R1 | %103 + R1*3/4 | %104 + r4 g4\f g2 | %105 + r2 c'8-.\> r8 r4 | %106 + r2 ees,8-.\mf r8 r4 | %107 + R1*3/4*2 | %108-109 + R1*2/4 | %110-111 + R1*3/4*3 | %112-114 + R1*3 | %115-117 + r4.\shortfermata r4. | %118 } pianoStaff = diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly index 5c30a8b..35ec7e3 100644 --- a/manuscripts/tempoMap.ly +++ b/manuscripts/tempoMap.ly @@ -35,5 +35,24 @@ tempoMap = \tempo "A tempo" 2=96 s1*2 | %84-85 \time 5/4 s1*5/4 | %086 - \time 2/2 s1*9 | %087 + \time 2/2 s1*9 | %087-095 + \time 3/4 s4 \timeSpanner "poco rit." s2\startTextSpan | %096 + s4 s4 s8. s16\stopTextSpan \bar "||" | %097 + \mark \default + \tempo "A Tempo" 2=96 + \time 2/2 s1 | %098 + \time 7/8 \textMark \markup { \tiny \sans "3+2+2" } s1*7/8*2 | %099-100 + \time 2/2 s1*3 | %101-103 + \time 3/4 s1*3/4 | %104 + \time 2/2 s1*3 | %105-107 + \time 3/4 s1*3/4*2 | %108-109 + \time 2/4 s1*2/4 | %110 + \time 3/4 s1*3/4*3 | %111-113 + \time 2/2 s1*2 | %114-115 + \timeSpanner "molto rit." s1\startTextSpan | %116 + \time 6/8 s2 s8. s16\stopTextSpan \bar "||" | %117 + \mark \default + \tempo "Andante" 4.=64 + \time 12/8 s1*12/8 | %118 + \time 6/8 s1*6/8 | %119 } diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly index 0f689a7..dda03df 100644 --- a/manuscripts/trombone.ly +++ b/manuscripts/trombone.ly @@ -53,21 +53,42 @@ tromboneMusic = R1*4 | %061-064 R1*6/4 | %065 R1 | %066 - r2 r8 c8-. r4 | %067 + r2 r8 c8-.\mp r4 | %067 R1*3/4 | %068 R1*6 | %069-74 R1*5/4 | %075 - g4. c8->~ c2 | %076 - ees8( ges,8 bes8) d8~ \tuplet 3/2 { d2 cis4( } | %077 - e4 b2) g4( | %078 - c8 f8~ f2~ f2) | %079 + g4.\< c8->~\mf c2 | %076 + ees8( ges,8 bes8) d8~-> \tuplet 3/2 { d2 cis4( } | %077 + e4 b2) g4(\> | %078 + c8 f8~\mp f2~ f2) | %079 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 + g,4.\mp\< d'8~->\mf d4 ees4~-> | %085 + \after 2 \! ees2.\> r2 | %086 + <>^\markup { "take harmon mute" } R1*9 | %087-95 + r4 r4 b'4->\mf | %096 + f4-> a,2-> | %097 + <>^\markup { "open" } R1 | %098 + R1*7/8 | %099 + r8 r8 fis'8-.\p r4 g8-. r8 | %100 + r4 a8-.\< b8-.\! r2 | %101 + c8-.->\mf r8 r4 r8 des,8-.->\f r4 | %102 + r4 f'8-.-> r8 r2 | %103 + R1*3/4 | %104 + R1 | %105 + r4 aes,,8-.\f r8 r2 | %106 + r2 g8-.\mf r8 r4 | %107 + r4 r8 g'8(\p ees4~ | %108 + ees4) r8 b'8~\mp b4~ | %109 + b4~ b8 r8 | %110 + r4 r8 f8-.\mf a4~ | %111 + a4~ a8 r8 r8 c,8~\f | %112 + c2. | %113 + R1*2 | %114-115 + \tuplet 3/2 { des'4(\mf\> ees4 c4) } \tuplet 3/2 { f,4( bes,4 g4~\p } | %116 + g4.~\shortfermata g4.) | %117 } tromboneStaff = diff --git a/manuscripts/trumpet.ly b/manuscripts/trumpet.ly index 30f8efe..bcd8248 100644 --- a/manuscripts/trumpet.ly +++ b/manuscripts/trumpet.ly @@ -33,17 +33,36 @@ trumpetMusic = R1*2 |%066-067 R1*3/4 | %068 R1*6 | %069-74 - r2 r4 des8-. f8-. aes8-. r8 | %075 - r2 e8-. a,8-. fis8-. d8-. | %076 + r2 r4 des8-.\mf f8-. aes8-. r8 | %075 + r2 e8-.\f\> a,8-. fis8-. d8-.\! | %076 R1 | %077 - r8 f8-. gis,8-. a8~ a2 | %078 - c2.~ c2 | %079 - R1*2 | %080-81 + r8 f8-.\mf gis,8-. a8~ a2\> | %078 + c2.~\mp c2 | %079 + <><>^\markup { "take harmon mute" } R1*2 | %080-81 R1*6/4 | %082 r2 r2\fermata | %083 R1*2 | %084-85 R1*5/4 | %086 - R1*4 + R1*9 | %087-95 + fis'4->\mf a,2-> | %096 + <>^\markup { "open" } R1*3/4 | %097 + R1 | %098 + R1*7/8*2 | %099-100 + R1 | %101 + r2 r8 e'8-.->\f r4 | %102 + r4 d8-.-> r8 r2 | %103 + R1*3/4 | %104 + R1*2 | %105-106 + r2 ees8-.\mf r8 r4 | %107 + R1*3/4*2 | %108-109 + R1*2/4 | %110 + R1*3/4 | %111 + r4 r4 ees,4~\f | %112 + ees2. | %113 + R1 | %114 + r4 r8 gis8\> \tuplet 3/2 { a4( d,4 e4 } | %115 + \tuplet 3/2 { cis4)\mp r4 r4 } r4 b4~\p | %116 + b4.~\shortfermata b4. | %117 } trumpetStaff = diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly index d173ad8..2670adb 100644 --- a/manuscripts/viola.ly +++ b/manuscripts/viola.ly @@ -40,31 +40,58 @@ violaMusic = c8(\mf ees8~ ees2) bes'2 | %058 f4->\ff\> d4-> | %059 g1\mf\fermata | %060 - r8 f8~ f2.~ | %061 + r8 f8~\mp^\markup { \italic "sul pont." } f2.~ | %061 f4 ges2 aes8( des,8 | %062 - c2.) b'4~ | %063 + c2.) b'4~\< | %063 b8 gis8~ gis4 e4. ees8( | %064 - d8-.) r8 r4 r4 r2. | %065 - r8 f8~ f2. | %066 + d8-.)\f r8 r4 r4 r2. | %065 + r8 f8~\mp^\markup { \italic "ord" } f2. | %066 R1 | %067 - ees8-. f8-. fis8( g8) e8-. d8-. | %068 - cis1 | %069 + \markSpanner "msp" "ord" ees8-.\<\startTextSpan f8-. fis8( g8)\mf\> e8-. d8-. | %068 + cis1\mp\stopTextSpan | %069 R1*2 | %070-71 - r2 r4 \tuplet 3/2 { r8 dis4~ } | %072 + r2 r4 \tuplet 3/2 { r8 dis4~\mf^\markup { \italic "sul tasto" } } | %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 + r8 ges8-.->\mf^\markup { "pizz" } r4 e2~ \tuplet 3/2 { e2\> g4~ } | %082 + g2\p g2\3\fermata | %083 R1*2 | %084-85 - r4 r8 des'8-. bes'4(\glissando c4.) d8-. | %086 - a2.~ a8 aes8~-> | %087 - aes2. r4 | %088 - r2 e,2 | %089 - g2 2 | %90 + r4 r8 des'8-.\f\> bes'4(\glissando c4.) d8-. | %086 + a2.~\mp a8 aes8~-> | %087 + \after 2 \! aes2.\> r4 | %088 + r2 e,2--\mp | %089 + g2-- 2-- | %90 + R1*2 | %091-92 + \override NoteHead.style = #'harmonic-black + c4\3\mf r4 r2 | %093 + \revert NoteHead.style + \tuplet 3/2 { e8 e8 e8~ } e4 \tuplet 3/2 { ees8\mp ees8 ees8~ } ees4 | %094 + R1 | %095 + R1*3/4*2 | %096-97 + a,4\mf gis'2.^\markup { \italic "sul pont." } | %098 + R1*7/8 | %099 + des8[(\p^\markup { \italic "msp" } c8 e8] a,8[) d8( b8 f'8] | %100 + ees8) aes8( g8 ges8\< bes,8) r8 aes8-.->^\markup { \italic "ord" } r8 | %101 + c8-.->\mf r8 r4 bes8(\< des8-.->)\f r4 | %102 + R1 | %103 + R1*3/4 | %104 + \override NoteHead.style = #'harmonic-mixed + r4 g4\3\f g2\3 | %105 + \revert NoteHead.style + r4 des8-.^\markup { "pizz" } r8 r2 | %106 + f8-. r8 r4 r2 | %107 + r4 r8 g,8(\mp^\markup { "arco" } ees4~ | %108 + ees4) r4 r8 des8~\mf | %109 + des4~ des8 r8 | %110 + r4 r8 f8-. a4~ | %111 + a4~ a8 r8 r8 c,8~\f | %112 + c2. | %113 + R1*3 | %114-116 + r4.\shortfermata r4. | %117 } violaStaff = diff --git a/manuscripts/violin1.ly b/manuscripts/violin1.ly index 8f2b4e7..1c8a9b9 100644 --- a/manuscripts/violin1.ly +++ b/manuscripts/violin1.ly @@ -39,24 +39,56 @@ violinOneMusic = R1*4 | %061-064 R1*6/4 | %065 R1 | %066 - g,,1-> | %067 - bes8-. des8-. b4( a4~ | %068 - a1) | %069 + << + { + g,,1-> | %067 + } + { + s4\mf\> s4 s4 s4\! + } + >> + \markSpanner "msp" "ord" bes8-.\<\startTextSpan des8-. b4(\mf\> a4~ | %068 + a1)\mp\stopTextSpan | %069 R1*5 | %070-74 R1*5/4 | %075 R1*3 | %076-78 - r2. r4 b'4~ | %079 - \tuplet 3/2 { b2 g4( } c2~ | %080 + r2. r4 b'4~\p | %079 + \tuplet 3/2 { b2\< g4( } c2~\mp | %080 c8) r8 r4 r2 | %081 R1*3/2 | %082 r2 r2\fermata | %083 - r8 b8~ b2~ b8 bes8-. | %084 + r8 b8~->\mf b2~ b8 bes8-. | %084 a8-. b8-. c2. | %085 - r4 r8 des,8-. bes'4(\glissando c4.) d8-. | %086 - a2.~ a8 aes8~-> | %087 - aes2. r4 | %088 + r4 r8 des,8-.\f\> bes'4(\glissando c4.) d8-. | %086 + a2.~\mp a8 aes8~-> | %087 + \after 2 \! aes2.\> r4 | %088 R1 | %089 - g,2 2 | %90 + g,2--\p 2-- | %90 + r2 b2--\mp^\markup { \italic "sul pont." } | %091 + bes2-- gis'4--\< e'4-- | %092 + g4-- d'4~\mf^\markup { \italic "ord" } d8 f,8~ f4 | %93 + \tuplet 3/2 { g8 g8 g8~ } g4 \tuplet 3/2 { f8\mp f8 f8~ } f4 | %094 + R1 | %095 + R1*3/4*2 | %096-97 + a,,4\mf dis'2.^\markup { \italic "sul pont." } | %098 + R1*7/8 | %099 + r8 r8 aes,8-.\p^\markup { \italic "ord" } r4 g8-. r8 | %100 + r4 cis8-.\< d8-. r4 gis8-.-> r8 | %101 + a8-.->\mf r8 r4 r8 e'8-.->\f gis8-. fis8-. | %102 + b8( bes8 a8-.->) r8 r2 | %103 + R1*3/4 | %104 + R1 | %105 + r2 c8-.\f^\markup { "pizz" } r8 r4 | %106 + r8 bes8-. r4 r2 | %107 + r4 r8 c,,8(\mp^\markup { "arco" } bes4~ | %108 + bes4) r8 b8~\mf b4~ | %109 + b4~ b8 r8 | %110 + r4 r8 bes8-. e4~ | %111 + e4~ e8 r8 ees4~\f | %112 + ees2. | %113 + g,2\mf r2 | %114 + R1*2 | %115-116 + r4.\shortfermata r4. | %117 } violinOneStaff = diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly index 2f07792..2224e38 100644 --- a/manuscripts/violin2.ly +++ b/manuscripts/violin2.ly @@ -39,23 +39,53 @@ violinTwoMusic = R1*4 | %061-064 R1*6/4 | %065 R1 | %066 - g,1-> | %067 - bes8-. des8-. b4( a4~ | %068 - a1) | %069 + << + { + g,1-> | %067 + } + { + s4\mf\> s4 s4 s4\! + } + >> + \markSpanner "msp" "ord" bes8-.\<\startTextSpan des8-. b4(\mf\> a4~ | %068 + a1)\mp\stopTextSpan | %069 R1*5 | %070-74 R1*5/4 | %075 R1*3 | %076-78 - r2. r4 b'4~ | %079 - \tuplet 3/2 { b2 g4~ } g2~ | %080 + r2. r4 b'4~\p | %079 + \tuplet 3/2 { b2\< g4~ } g2~\mp | %080 g8 r8 r4 r2 | %081 - r2 r2 r4 \tuplet 3/2 { r8 g,4~ } | %082 + r2 r2 r4 \tuplet 3/2 { r8 g,4~\p } | %082 g2 g2\fermata | %083 R1*2 | %084-85 - r4 r8 des'8-. bes'4(\glissando c4.) d8-. | %086 - a2.~ a8 aes8~-> | %087 - aes2. r4 | %088 + r4 r8 des'8-.\f\> bes'4(\glissando c4.) d8-. | %086 + a2.~\mp a8 aes8~-> | %087 + \after 2 \! aes2.\> r4 | %088 R1 | %089 - g,2 2 | %90 + g,2--\p 2-- | %90 + r2 b4--\mp^\markup { \italic "sul pont." } bes4-- | %091 + bes2-- aes'4--\< aes4-- | %092 + bes4-- d'4~\mf^\markup { \italic "ord" } d8 f,8~ f4 | %93 + \tuplet 3/2 { b,8 b8 b8~ } b4 \tuplet 3/2 { cis8\mp cis8 cis8~ } cis4 | %094 + R1 | %095 + R1*3/4*2 | %096-97 + a,4\mf gis'2.^\markup { \italic "sul pont." } | %098 + R1*7/8 | %099 + r8 r8 aes,8-.\p r4 g8-. r8 | %100 + r4 a8-.\< b8-. r8 c8(^\markup { \italic "msp" } des8 ees8 | %101 + d8) e8( f8 g8~\mf g8) r8 r4 | %102 + R1 | %103 + R1*3/4 | %104 + R1*2 | %105-106 + r8 ges8-.\f^\markup { \italic "ord" }^\markup { "pizz" } r4 r2 | %107 + r4 r8 g,8(\mp^\markup { "arco" } bes4~ | %108 + bes4) r8 bes8~\mf bes4~ | %109 + bes4~ bes8 r8 | %110 + r4 r8 bes8-. a4~ | %111 + a4~ a8 r8 ees'4~\f | %112 + ees2. | %113 + R1*3 | %114-116 + r4.\shortfermata r4. | %117 } violinTwoStaff = diff --git a/parts/brassParts.ly b/parts/brassParts.ly deleted file mode 100644 index 6ce5799..0000000 --- a/parts/brassParts.ly +++ /dev/null @@ -1,68 +0,0 @@ -\version "2.24.4" - -\include "../general/info.ly" -\include "../general/aliases.ly" -\include "../general/scripts.ly" -\include "../general/umbel.ly" -\include "../general/partPaper.ly" - -\include "../manuscripts/tempoMap.ly" -\include "../manuscripts/clarinetSolo.ly" -\include "../manuscripts/flute.ly" -\include "../manuscripts/oboe.ly" -\include "../manuscripts/bassClarinet.ly" -\include "../manuscripts/bassoon.ly" -\include "../manuscripts/horn.ly" -\include "../manuscripts/trumpet.ly" -\include "../manuscripts/trombone.ly" -\include "../manuscripts/perc1.ly" -\include "../manuscripts/perc2.ly" -\include "../manuscripts/pianoUp.ly" -\include "../manuscripts/pianoDown.ly" -\include "../manuscripts/violin1.ly" -\include "../manuscripts/violin2.ly" -\include "../manuscripts/viola.ly" -\include "../manuscripts/cello.ly" -\include "../manuscripts/bass.ly" - -\book { - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { Horn in F } - } - \score { - << - \hornStaff \compressMMRests << \tempoMap \hornMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { trumpet in C } - } - \score { - << - \trumpetStaff \compressMMRests << \tempoMap \trumpetMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { trombone } - } - \score { - << - \tromboneStaff \compressMMRests << \tempoMap \tromboneMusic >> - >> - } - } -} diff --git a/parts/parts_tiny-cartel.ly b/parts/parts_tiny-cartel.ly new file mode 100644 index 0000000..5d97448 --- /dev/null +++ b/parts/parts_tiny-cartel.ly @@ -0,0 +1,298 @@ +\version "2.24.4" + +\include "../general/info.ly" +\include "../lib/load.ly" +\include "../general/partPaper.ly" +\include "../general/partLayout.ly" + +\include "../manuscripts/tempoMap.ly" +\include "../manuscripts/scorePages.ly" +\include "../manuscripts/clarinetSolo.ly" +\include "../manuscripts/flute.ly" +\include "../manuscripts/oboe.ly" +\include "../manuscripts/bassClarinet.ly" +\include "../manuscripts/bassoon.ly" +\include "../manuscripts/horn.ly" +\include "../manuscripts/trumpet.ly" +\include "../manuscripts/trombone.ly" +\include "../manuscripts/perc1.ly" +\include "../manuscripts/perc2.ly" +\include "../manuscripts/pianoUp.ly" +\include "../manuscripts/pianoDown.ly" +\include "../manuscripts/violin1.ly" +\include "../manuscripts/violin2.ly" +\include "../manuscripts/viola.ly" +\include "../manuscripts/cello.ly" +\include "../manuscripts/bass.ly" + +#(define output-suffix "flute_picc") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { "flute/piccolo" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \fluteStaff \compressMMRests << \tempoMap \fluteMusic >> + >> + } + } +} + +#(define output-suffix "oboe") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { oboe } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \oboeStaff \compressMMRests << \tempoMap \oboeMusic >> + >> + } + } +} + +#(define output-suffix "bass clarinet") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { bass clarinet } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \bassClarinetStaff \compressMMRests << \tempoMap \bassClarinetMusic >> + >> + } + } +} + +#(define output-suffix "bassoon") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { bassoon } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \bassoonStaff \compressMMRests << \tempoMap \bassoonMusic >> + >> + } + } +} + +#(define output-suffix "horn") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { Horn in F } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \hornStaff \compressMMRests << \tempoMap \hornMusic >> + >> + } + } +} + +#(define output-suffix "trumpet") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { trumpet in C } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \trumpetStaff \compressMMRests << \tempoMap \trumpetMusic >> + >> + } + } +} + +#(define output-suffix "trombone") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { trombone } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \tromboneStaff \compressMMRests << \tempoMap \tromboneMusic >> + >> + } + } +} + +#(define output-suffix "percussionI") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { percussion I } + meter = \markup { \italic "(vibraphone, 3 toms, kick drum, caxixi)" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \percOneStaff \compressMMRests << \tempoMap \percOneMusic >> + >> + } + } +} + +#(define output-suffix "percussionII") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { percussion II } + meter = \markup { \italic "(marimba, tubular bells, hi-hat, snare drum, tambourine)" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \percTwoStaff \compressMMRests << \tempoMap \percTwoMusic >> + >> + } + } +} + +#(define output-suffix "piano") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { piano } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \pianoStaff \compressMMRests << \tempoMap \pianoUpMusic >> \compressMMRests \pianoDownMusic + >> + } + } +} + +#(define output-suffix "violinI") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { "violin I" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \violinOneStaff \compressMMRests << \tempoMap \violinOneMusic >> + >> + } + } +} + +#(define output-suffix "violinII") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { "violin II" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \violinTwoStaff \compressMMRests << \tempoMap \violinTwoMusic >> + >> + } + } +} + +#(define output-suffix "viola") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { "viola" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \violaStaff \compressMMRests << \tempoMap \violaMusic >> + >> + } + } +} + +#(define output-suffix "cello") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { "cello" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \celloStaff \compressMMRests << \tempoMap \celloMusic >> + >> + } + } +} + +#(define output-suffix "bass") +\book { + \bookpart { + \header { + title = \markup { \fontsize #1 \xtitle } + subtitle = \markup { \medium \italic \xsub } + composer = \xcomp + poet = \markup { "bass" } + arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } + } + \score { + << + \bassStaff \compressMMRests << \tempoMap \bassMusic >> + >> + } + } +} diff --git a/parts/percussionParts.ly b/parts/percussionParts.ly deleted file mode 100644 index 99da4b3..0000000 --- a/parts/percussionParts.ly +++ /dev/null @@ -1,55 +0,0 @@ -\version "2.24.4" - -\include "../general/info.ly" -\include "../general/aliases.ly" -\include "../general/scripts.ly" -\include "../general/umbel.ly" -\include "../general/partPaper.ly" - -\include "../manuscripts/tempoMap.ly" -\include "../manuscripts/clarinetSolo.ly" -\include "../manuscripts/flute.ly" -\include "../manuscripts/oboe.ly" -\include "../manuscripts/bassClarinet.ly" -\include "../manuscripts/bassoon.ly" -\include "../manuscripts/horn.ly" -\include "../manuscripts/trumpet.ly" -\include "../manuscripts/trombone.ly" -\include "../manuscripts/perc1.ly" -\include "../manuscripts/perc2.ly" -\include "../manuscripts/pianoUp.ly" -\include "../manuscripts/pianoDown.ly" -\include "../manuscripts/violin1.ly" -\include "../manuscripts/violin2.ly" -\include "../manuscripts/viola.ly" -\include "../manuscripts/cello.ly" -\include "../manuscripts/bass.ly" - -\book { - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { percussion I } - } - \score { - << - \percOneStaff \compressMMRests << \tempoMap \percOneMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { percussion II } - } - \score { - << - \percTwoStaff \compressMMRests << \tempoMap \percTwoMusic >> - >> - } - } -} diff --git a/parts/pianoPart.ly b/parts/pianoPart.ly deleted file mode 100644 index b2d34c6..0000000 --- a/parts/pianoPart.ly +++ /dev/null @@ -1,42 +0,0 @@ -\version "2.24.4" - -\include "../general/info.ly" -\include "../general/aliases.ly" -\include "../general/scripts.ly" -\include "../general/umbel.ly" -\include "../general/partPaper.ly" - -\include "../manuscripts/tempoMap.ly" -\include "../manuscripts/clarinetSolo.ly" -\include "../manuscripts/flute.ly" -\include "../manuscripts/oboe.ly" -\include "../manuscripts/bassClarinet.ly" -\include "../manuscripts/bassoon.ly" -\include "../manuscripts/horn.ly" -\include "../manuscripts/trumpet.ly" -\include "../manuscripts/trombone.ly" -\include "../manuscripts/perc1.ly" -\include "../manuscripts/perc2.ly" -\include "../manuscripts/pianoUp.ly" -\include "../manuscripts/pianoDown.ly" -\include "../manuscripts/violin1.ly" -\include "../manuscripts/violin2.ly" -\include "../manuscripts/viola.ly" -\include "../manuscripts/cello.ly" -\include "../manuscripts/bass.ly" - -\book { - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { piano } - } - \score { - << - \pianoStaff \compressMMRests << \tempoMap \pianoUpMusic >> \compressMMRests \pianoDownMusic - >> - } - } -} diff --git a/parts/stringParts.ly b/parts/stringParts.ly deleted file mode 100644 index d322668..0000000 --- a/parts/stringParts.ly +++ /dev/null @@ -1,94 +0,0 @@ -\version "2.24.4" - -\include "../general/info.ly" -\include "../general/aliases.ly" -\include "../general/scripts.ly" -\include "../general/umbel.ly" -\include "../general/partPaper.ly" - -\include "../manuscripts/tempoMap.ly" -\include "../manuscripts/clarinetSolo.ly" -\include "../manuscripts/flute.ly" -\include "../manuscripts/oboe.ly" -\include "../manuscripts/bassClarinet.ly" -\include "../manuscripts/bassoon.ly" -\include "../manuscripts/horn.ly" -\include "../manuscripts/trumpet.ly" -\include "../manuscripts/trombone.ly" -\include "../manuscripts/perc1.ly" -\include "../manuscripts/perc2.ly" -\include "../manuscripts/pianoUp.ly" -\include "../manuscripts/pianoDown.ly" -\include "../manuscripts/violin1.ly" -\include "../manuscripts/violin2.ly" -\include "../manuscripts/viola.ly" -\include "../manuscripts/cello.ly" -\include "../manuscripts/bass.ly" - -\book { - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { violin I } - } - \score { - << - \violinOneStaff \compressMMRests << \tempoMap \violinOneMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { violin II } - } - \score { - << - \violinTwoStaff \compressMMRests << \tempoMap \violinTwoMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { viola } - } - \score { - << - \violaStaff \compressMMRests << \tempoMap \violaMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { cello } - } - \score { - << - \celloStaff \compressMMRests << \tempoMap \celloMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { bass } - } - \score { - << - \bassStaff \compressMMRests << \tempoMap \bassMusic >> - >> - } - } -} diff --git a/parts/woodwindParts.ly b/parts/woodwindParts.ly deleted file mode 100644 index f83a415..0000000 --- a/parts/woodwindParts.ly +++ /dev/null @@ -1,81 +0,0 @@ -\version "2.24.4" - -\include "../general/info.ly" -\include "../general/aliases.ly" -\include "../general/scripts.ly" -\include "../general/umbel.ly" -\include "../general/partPaper.ly" - -\include "../manuscripts/tempoMap.ly" -\include "../manuscripts/clarinetSolo.ly" -\include "../manuscripts/flute.ly" -\include "../manuscripts/oboe.ly" -\include "../manuscripts/bassClarinet.ly" -\include "../manuscripts/bassoon.ly" -\include "../manuscripts/horn.ly" -\include "../manuscripts/trumpet.ly" -\include "../manuscripts/trombone.ly" -\include "../manuscripts/perc1.ly" -\include "../manuscripts/perc2.ly" -\include "../manuscripts/pianoUp.ly" -\include "../manuscripts/pianoDown.ly" -\include "../manuscripts/violin1.ly" -\include "../manuscripts/violin2.ly" -\include "../manuscripts/viola.ly" -\include "../manuscripts/cello.ly" -\include "../manuscripts/bass.ly" - -\book { - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { flute } - } - \score { - << - \fluteStaff \compressMMRests << \tempoMap \fluteMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { oboe } - } - \score { - << - \oboeStaff \compressMMRests << \tempoMap \oboeMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { bass clarinet } - } - \score { - << - \bassClarinetStaff \compressMMRests << \tempoMap \bassClarinetMusic >> - >> - } - } - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { bassoon } - } - \score { - << - \bassoonStaff \compressMMRests << \tempoMap \bassoonMusic >> - >> - } - } -} diff --git a/tiny-cartel.ly b/tiny-cartel.ly index f82908a..839fd5e 100644 --- a/tiny-cartel.ly +++ b/tiny-cartel.ly @@ -81,7 +81,7 @@ >> \new StaffGroup << - \percOneStaff << \tempoMap \percOnePitchedMusic >> + \percOneStaff << \tempoMap \percOneMusic >> \percTwoStaff \percTwoMusic >> \pianoStaff << \tempoMap \pianoUpMusic >> \pianoDownMusic -- 2.39.5