From: Tucker Johnson Date: Tue, 27 Jan 2026 02:52:38 +0000 (-0500) Subject: weekend X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=cb118d77ec032512959ed33c80e71d204008af5a;p=tiny-cartel.git weekend --- diff --git a/general/scoreLayout.ly b/general/scoreLayout.ly index 220a0fd..233e1e0 100644 --- a/general/scoreLayout.ly +++ b/general/scoreLayout.ly @@ -41,8 +41,8 @@ %\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 + %\override PaperColumn.show-horizontal-skylines = ##t + %\override VerticalAlignment.show-vertical-skylines = ##t } \context { diff --git a/manuscripts/bassClarinet.ly b/manuscripts/bassClarinet.ly index 0dfc838..5b0db92 100644 --- a/manuscripts/bassClarinet.ly +++ b/manuscripts/bassClarinet.ly @@ -45,7 +45,16 @@ bassClarinetMusic = r2 r4 r8 f8-. | %069 ees8( aes8) g8( c8) fis2~ | %070 fis1 | %071 - R1*2 + 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 + g2.~ g2 | %079 + R1 | %080 + r2 d''4-- \tuplet 3/2 { d8-.-> bes8-.-> ges8-.-> } | %081 + R1*6/4 | %082 + r2 r2\fermata | %083 } bassClarinetStaff = diff --git a/manuscripts/bassoon.ly b/manuscripts/bassoon.ly index 7fd23d4..a236b22 100644 --- a/manuscripts/bassoon.ly +++ b/manuscripts/bassoon.ly @@ -54,7 +54,15 @@ bassoonMusic = r2 r4 r8 f''8-. | %069 ees8( aes8) g8( c8) \clef tenor fis8( b8~ b4~ | %070 b1) | %071 - R1*2 | + 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 + R1*5/4 | %079 + R1*2 | %080-81 + R1*6/4 | %082 + r2 r2\fermata | %083 } bassoonStaff = diff --git a/manuscripts/clarinetSolo.ly b/manuscripts/clarinetSolo.ly index 3d3e0ea..d60787d 100644 --- a/manuscripts/clarinetSolo.ly +++ b/manuscripts/clarinetSolo.ly @@ -26,6 +26,15 @@ clarinetMusic = 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 + ees2.) r4 | %080 + f8-.-> r8 f8-.-> des8-.-> r4 des4~ | %081 + des2. r2. | %082 + r2 r2\fermata | %083 } clarinetStaff = diff --git a/manuscripts/flute.ly b/manuscripts/flute.ly index a57cdd2..0fdf145 100644 --- a/manuscripts/flute.ly +++ b/manuscripts/flute.ly @@ -48,7 +48,14 @@ fluteMusic = R1 | %069 r2 r4 \tuplet 3/2 { r8 r8 a,8~^\markup { "piccolo" } } | %070 a1 | %071 - R1*2 | %072 + R1*2 | %072-073 + r4 r8 c8-. g8-. bes8-. r4 | %074 + r8 b8-. r4 r8 ees,8-. r2 | %075 + R1*3 | %076-78 + R1*5/4 | %079 + R1*2 | %080-81 + R1*6/4 | %082 + r2 r2\fermata | %083 } fluteStaff = diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly index b01392d..9c07878 100644 --- a/manuscripts/horn.ly +++ b/manuscripts/horn.ly @@ -28,8 +28,14 @@ hornMusic = R1*6/4 | %065 R1*2 |%066-067 R1*3/4 | %068 - R1*5 | %069 - + R1*6 | %069-74 + R1*5/4 | %075 + R1*2 | %076-77 + e,,2. r4 | %078 + r8 ees'8( des2~ des4) r4 | %079 + R1*2 | %080-81 + R1*6/4 | %082 + r2 r2\fermata | %083 } hornStaff = diff --git a/manuscripts/oboe.ly b/manuscripts/oboe.ly index 18d3753..bc160f7 100644 --- a/manuscripts/oboe.ly +++ b/manuscripts/oboe.ly @@ -38,7 +38,16 @@ oboeMusic = R1*6/4 | %065 R1*2 |%066-067 R1*3/4 | %068 - R1*5 | %069 + 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 + R1*2 | %077-78 + R1*5/4 | %079 + R1*2 | %080-81 + R1*6/4 | %082 + r2 r2\fermata | %083 + } oboeStaff = diff --git a/manuscripts/perc1.ly b/manuscripts/perc1.ly index b9a3a6b..d880af4 100644 --- a/manuscripts/perc1.ly +++ b/manuscripts/perc1.ly @@ -1,31 +1,25 @@ % root = ../tiny-cartel.ly -drumPitchNames.tt = #'tt -drumPitchNames.bdr = #'bdr -drumPitchNames.rtl = #'rtl -drumPitchNames.rtm = #'rtm -drumPitchNames.rth = #'rth -drumPitchNames.tbr = #'tbr +drumPitchNames.kdr = #'kdr +drumPitchNames.tml = #'tml +drumPitchNames.tmm = #'tmm +drumPitchNames.tmh = #'tmh drumPitchNames.cxl = #'cxl drumPitchNames.cxh = #'cxh #(define perc1-drum-style - '((tt default #f -7) - (bdr default #f -3) - (rtl default #f -1) - (rtm default #f 1) - (rth default #f 3) + '((kdr default #f -3) + (tml default #f -1) + (tmm default #f 1) + (tmh default #f 3) (cxl default #f 2) - (csh default #f 4) - (tbr default #f 5))) + (cxh default #f 4))) -midiDrumPitches.tt = c -midiDrumPitches.bdr = des -midiDrumPitches.rtl = d -midiDrumPitches.rtm = ees -midiDrumPitches.rth = e -midiDrumPitches.cxl = f -midiDrumPitches.cxh = ges -midiDrumPitches.tbr = g +midiDrumPitches.kdr = c +midiDrumPitches.tml = des +midiDrumPitches.tmm = d +midiDrumPitches.tmh = ees +midiDrumPitches.cxl = e +midiDrumPitches.cxh = f percOnePitchedMusic = { @@ -81,16 +75,29 @@ percOnePitchedMusic = drumPitchTable = #(alist->hash-table midiDrumPitches) } \drummode { - <>^\markup { \bold \box "bass drum" } bdr1:32\fermata | %060 - bdr8 r8 r4 r8 bdr8 r4 | %061 - bdr8 r8 r4 r8 bdr8 r4 | %062 - bdr8 r8 r4 r8 bdr8 bdr8 r8 | %063 - r8 bdr8 r4 bdr8 r8 r8 bdr8-+ | %064 + <>^\markup { \bold \box "low tom" } tml1:32\fermata | %060 + <>^\markup { \bold \box "kick drum" } kdr4 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 - r8 bdr8 r4 r2 | %066 - r8 bdr8 r4 r8 bdr8 r4 | %067 - bdr8 r8 r8 bdr8 r4 | %068 - bdr8 r8 r4 r2 | %069 + R1 | %066 + r2 r8 tml8-+ 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 + R1 | %073 + kdr4 r4 r8 kdr8 r4 | %074 + kdr4 r4 r8 kdr8 r2 | %075 + kdr4 r8 kdr8 r4 tmm4 | %076 + kdr4 r8 kdr8 r2 | %077 + R1 | %078 + R1*5/4 | %079 + r2 r4 kdr4 | %080 + r8 kdr8 r4 r2 | %081 + R1*6/4 | %082 + r2 r2\fermata | %083 } } diff --git a/manuscripts/perc2.ly b/manuscripts/perc2.ly index ed036df..ef478fa 100644 --- a/manuscripts/perc2.ly +++ b/manuscripts/perc2.ly @@ -1,46 +1,31 @@ % root = ../tiny-cartel.ly -drumPitchNames.sd = #'sd -drumPitchNames.sdc = #'sdc +drumPitchNames.htp = #'htp drumPitchNames.sdr = #'sdr -drumPitchNames.ccy = #'ccy -drumPitchNames.htc = #'htc +drumPitchNames.sds = #'sds +drumPitchNames.tbr = #'tbr +drumPitchNames.rcy = #'rcy drumPitchNames.hto = #'hto drumPitchNames.hth = #'hth -drumPitchNames.htp = #'htp -drumPitchNames.tbc = #'tbc -drumPitchNames.tbd = #'tbd -drumPitchNames.tbe = #'tbe -drumPitchNames.tbg = #'tbg -drumPitchNames.tba = #'tba +drumPitchNames.htc = #'htc #(define perc2-drum-style - '((sd default #f 1) - (sdc xcircle #f 1) - (sdr diamond #f 1) - (tbc default #f -4) - (tbd default #f -2) - (tbe default #f 0) - (tbg default #f 2) - (tba default #f 4) - (htp cross #f -5) + '((htp cross #f -5) + (sdr default #f 1) + (sds xcircle #f 1) + (tbr default #f 2) + (rcy cross #f 4) (hto cross open 5) (hth cross halfopen 5) - (htc cross #f 5) - (ccy cross #f 6))) + (htc cross #f 5))) -midiDrumPitches.sd = c' -midiDrumPitches.sdc = des' -midiDrumPitches.sdr = d' -midiDrumPitches.ccy = ees' -midiDrumPitches.htc = e' +midiDrumPitches.htp = c' +midiDrumPitches.sdr = des' +midiDrumPitches.sds = d' +midiDrumPitches.tbr = ees' +midiDrumPitches.rcy = e' midiDrumPitches.hto = f' midiDrumPitches.hth = ges' -midiDrumPitches.htp = g' -midiDrumPitches.tbc = aes' -midiDrumPitches.tbd = a' -midiDrumPitches.tbe = bes' -midiDrumPitches.tbg = b' -midiDrumPitches.tba = c'' +midiDrumPitches.htc = g' percTwoMusic = { @@ -109,23 +94,42 @@ percTwoMusic = } \drummode { R1 | %061 - r2 r4 r16 <>^\markup { \bold \box "hi-hat" } htc16 \parenthesize -+ htc8 | %062 - r4 htc4 r4 r8. htc16 | %063 - htc4 htc16 htc16 htc8 r8 htc16 htc16 htc8 hth8~ | %064 - << - { - \voiceOne - htc8-+ - } - \new DrumVoice { - \voiceTwo - <>_\markup { \bold \box "snare drum" } sd8 - } - >> - \oneVoice - r8 r4 r4 r4 htc4 r4 | %065 - r2 r8. htc16 htc8 hth8~ | %066 - htc-+ r8 r4 r2 | %067 + r2 r4 r8 <>^\markup { \bold \box "hi-hat" } htc8 \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 + 8 r8 r4 r2 | %067 + R1*3/4 | %068 + R1 | %069 + \override Voice.Clef.stencil = ##f + } + \new Staff \with { + \remove Time_signature_engraver + } + \relative { + r2 r4 <>^\markup { \bold \box "marimba" } e''4:32~ | %070 + e1:32~ | %071 + e4:32 cis,2.:32 | %072 + R1 | %073 + \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 { + r2 r4 htc8 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 + R1 | %078 + R1*5/4 | %079 + r2 r4 r8 hhc8 | %080 + r4 r8 rcy8\laissezVibrer r4 4 | %081 + R1*6/4 | %082 + r2 r2\fermata | %083 } } diff --git a/manuscripts/pianoDown.ly b/manuscripts/pianoDown.ly index 2555388..5d1736f 100644 --- a/manuscripts/pianoDown.ly +++ b/manuscripts/pianoDown.ly @@ -4,8 +4,8 @@ pianoDownMusic = \clef bass R1 | %001 R1*3/4*2 | %002-3 - b8-.^\mp^\< r8 r4 r4 c,8-. r8 | %004 - r4 e8-.\f d8-. r2 | %005 + b8-.-+^\mp^\< r8 r4 r4 c,8-.-+ r8 | %004 + r4 e8-.-+\f d8-.-+ r2 | %005 R1*9 | %006-14 R1*3/4*2 | %015-16 R1*3 | %017-19 @@ -44,7 +44,7 @@ pianoDownMusic = R1 | %064 a8-. r8 r4 r4 r2. | %065 R1 | %066 - r2 r8 c'8-+ c4 | %067 + r2 r8 c'8-+ r4 | %067 R1*3/4 | %068 R1*4 | %069 } diff --git a/manuscripts/pianoUp.ly b/manuscripts/pianoUp.ly index 8e246d6..b623137 100644 --- a/manuscripts/pianoUp.ly +++ b/manuscripts/pianoUp.ly @@ -1,15 +1,15 @@ % root = ../tiny-cartel.ly pianoUpMusic = \relative { - \clef bass + \clef treble R1 | %001 R1*3/4*2 | %002-3 - \makeClusters 1^\markup { "mute strings inside piano" } | %004 - \makeClusters { 4. 8 8 } s4. | %005 + R1 | %004 + R1 | %005 R1*9 | %006-14 R1*3/4*2 | %015-16 - R1*7 \clef treble | %017-23 - r4 r8 \repeat tremolo 2 { a''32( b } \repeat tremolo 8 { a32 b } | %024 + R1*7 | %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 | %26-42 R1*3/4*8 | %043-50 @@ -26,7 +26,13 @@ pianoUpMusic = d,,,8-. r8 r4 r4 r2. | %065 R1*2 | %066-067 R1*3/4 | %068 - R1*5 | %069 + R1*6 | %069-74 + R1*5/4 | %075 + R1*3 | %076-78 + R1*5/4 | %079 + R1*2 | %080-81 + R1*6/4 | %082 + r2 r2\fermata | %083 } pianoStaff = diff --git a/manuscripts/scorePages.ly b/manuscripts/scorePages.ly new file mode 100644 index 0000000..9865e83 --- /dev/null +++ b/manuscripts/scorePages.ly @@ -0,0 +1,12 @@ +% root = ../tiny-cartel.ly +scorePages = +\new Voice \with { + \remove Mark_engraver + \remove Clef_engraver +} +{ + \time 4/4 s1 | %001 + \time 3/4 s1*3/4*2 | %002-3 + \time 4/4 s1*5 | %004-14 + \pageBreak +} diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly index bb60512..70204f4 100644 --- a/manuscripts/tempoMap.ly +++ b/manuscripts/tempoMap.ly @@ -24,5 +24,11 @@ tempoMap = \time 6/4 s1*6/4 | %065 \time 4/4 s1*2 | %066-67 \time 3/4 s1*3/4 | %068 - \time 4/4 s1*6 + \time 4/4 s1*6 | %069-074 + \time 5/4 s1*5/4 | %075 + \time 4/4 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 } diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly index d2e0599..9296bb3 100644 --- a/manuscripts/trombone.ly +++ b/manuscripts/trombone.ly @@ -48,7 +48,15 @@ tromboneMusic = R1 | %066 r2 r8 c8-. r4 | %067 R1*3/4 | %068 - R1*5 | %069 + 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 + R1*2 | %080-81 + R1*6/4 | %082 + r2 r2\fermata | %083 } diff --git a/manuscripts/trumpet.ly b/manuscripts/trumpet.ly index c78e682..0799556 100644 --- a/manuscripts/trumpet.ly +++ b/manuscripts/trumpet.ly @@ -34,7 +34,15 @@ trumpetMusic = R1*6/4 | %065 R1*2 |%066-067 R1*3/4 | %068 - R1*5 | %069 + R1*6 | %069-74 + r2 r4 des8-. f8-. aes8-. r8 | %075 + r2 e8-. a,8-. fis8-. d8-. | %076 + R1 | %077 + r8 f8-. gis,8-. a8~ a2 | %078 + c2.~ c2 | %079 + R1*2 | %080-81 + R1*6/4 | %082 + r2 r2\fermata | %083 } diff --git a/tiny-cartel.ly b/tiny-cartel.ly index 35033f3..f82908a 100644 --- a/tiny-cartel.ly +++ b/tiny-cartel.ly @@ -6,6 +6,7 @@ \include "general/scoreLayout.ly" \include "manuscripts/tempoMap.ly" +\include "manuscripts/scorePages.ly" \include "manuscripts/clarinetSolo.ly" \include "manuscripts/flute.ly" \include "manuscripts/oboe.ly"