From: Tucker Johnson Date: Thu, 22 Jan 2026 13:10:54 +0000 (-0500) Subject: perc X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=0865cd565e7eaa8452188ad9ea592a0a4dd99f0d;p=tiny-cartel.git perc --- diff --git a/general/scoreLayout.ly b/general/scoreLayout.ly index e16d2e7..220a0fd 100644 --- a/general/scoreLayout.ly +++ b/general/scoreLayout.ly @@ -24,6 +24,7 @@ \override TimeSignature.whiteout = 2 \override TextScript.padding = 1 \override TextScript.layer = #4 + \override TextScript.whiteout = 2 \numericTimeSignature \override TupletNumber.layer = 4 \override TupletNumber.font-shape = #'upright @@ -35,10 +36,28 @@ \remove Text_mark_engraver \remove Mark_engraver \remove Metronome_mark_engraver + + %\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 Text_mark_engraver \consists Metronome_mark_engraver + \consists Text_mark_engraver + \remove Clef_engraver + } + \context { + \OneStaff + \consists Instrument_name_engraver + \consists Time_signature_engraver + } + \context { + \Voice + \consists Clef_engraver } } diff --git a/lib/notes.ly b/lib/notes.ly index 239580b..ec824ae 100644 --- a/lib/notes.ly +++ b/lib/notes.ly @@ -14,3 +14,30 @@ glissandoSkipOff = \undo \hide NoteHead \revert NoteHead.no-ledgers } + +circle = \tweak NoteHead.stencil + #(lambda (grob) + (let* ((note (ly:note-head::print grob)) + (combo-stencil (ly:stencil-add + note + (circle-stencil note 0.1 0.8)))) + (ly:make-stencil (ly:stencil-expr combo-stencil) + (ly:stencil-extent note X) + (ly:stencil-extent note Y)))) + \etc + +#(define (circular-arrow-script grob) + (let* ((circle + (ly:stencil-circle 0.7 0.12 #f)) + (arrow + (ly:stencil-rotate + (ly:make-stencil + '((moveto 0 0) + (lineto 0.35 0.18) + (lineto 0.35 -0.18) + (closepath)) + '(0 . 0) '(0 . 0)) + (* pi 1.25)))) + (ly:stencil-add + circle + (ly:stencil-translate arrow '(0.35 . 0.35))))) diff --git a/manuscripts/bass.ly b/manuscripts/bass.ly index 0fc8437..e8932c4 100644 --- a/manuscripts/bass.ly +++ b/manuscripts/bass.ly @@ -22,8 +22,17 @@ bassMusic = 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 + f4->^\markup { "arco" } d'4-> | %059 g,1\fermata | %060 + b4^\markup { "pizz" } r4 r8 d8 g4 | %061 + e8 f8 r4 r8 ees8 r4 | %062 + r2 g8 bes,4 des8 | %063 + R1 | %064 + 8-. r8 r4 r4 r2. | %065 + r8 f''8 e8 d8 cis8 b8 a8 gis8 | %066 + r2 r8 c8-. r4 | %067 + R1*3/4 | %068 + R1*4 } bassStaff = diff --git a/manuscripts/bassClarinet.ly b/manuscripts/bassClarinet.ly index 27f3b18..0dfc838 100644 --- a/manuscripts/bassClarinet.ly +++ b/manuscripts/bassClarinet.ly @@ -1,6 +1,7 @@ % root = ../tiny-cartel.ly bassClarinetMusic = -\transpose bes c'' \relative { +\transpose bes c'' +\relative { \clef treble R1 | %001 R1*3/4*2 | %002-3 @@ -33,6 +34,18 @@ bassClarinetMusic = c8( ees8~ ees2) bes2 | %058 f'4-> d4-> | %059 g1\fermata | %060 + r8 f'8~ f2.~ | %061 + f4 ges2 bes8( des,8 | %062 + 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 + R1*3/4 | %068 + r2 r4 r8 f8-. | %069 + ees8( aes8) g8( c8) fis2~ | %070 + fis1 | %071 + R1*2 } bassClarinetStaff = diff --git a/manuscripts/bassoon.ly b/manuscripts/bassoon.ly index d630067..7fd23d4 100644 --- a/manuscripts/bassoon.ly +++ b/manuscripts/bassoon.ly @@ -46,7 +46,15 @@ bassoonMusic = c8( ees8~ ees2) bes2 | %058 f'4-> d4-> | %059 g1\fermata | %060 - + R1*4 | %061-064 + r2. c,2.( | %065 + bes8-.) 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 + R1*2 | } bassoonStaff = diff --git a/manuscripts/cello.ly b/manuscripts/cello.ly index 038ed09..86503fa 100644 --- a/manuscripts/cello.ly +++ b/manuscripts/cello.ly @@ -45,9 +45,21 @@ celloMusic = 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 + c,8(^\markup { "arco" } ees8~ ees2) bes'2 | %058 f4-> d4-> | %059 g1\fermata | %060 + r8 f'8~^\markup { "pizz" } f2. | %061 + r4 ges2 bes8 des,8 | %062 + c2. 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 + R1 | %067 + ees'8-.^\markup { "arco" } f8-. fis8( g8) e8-. d8-. | %068 + cis1 | %069 + R1*2 | %070-071 + r2 gis'2~ | %072 + gis2. r4 | %073 } celloStaff = diff --git a/manuscripts/clarinetSolo.ly b/manuscripts/clarinetSolo.ly index 37cac61..3d3e0ea 100644 --- a/manuscripts/clarinetSolo.ly +++ b/manuscripts/clarinetSolo.ly @@ -1,12 +1,31 @@ % root = ../tiny-cartel.ly clarinetMusic = -\transpose bes c' \relative { +\transpose bes c' +\relative { \clef treble R1 | %001 R1*3/4*2 | %002-3 R1*11 | %004-14 R1*3/4*2 | %015-16 - R1*26 + R1*26 | %017-042 + R1*3/4*14 | %043-56 + R1*5/4*2 | %057-58 + R1*2/4 | %059 + c'1~\niente\<\fermata | %060 + c2.~\p c8 c8~->\mf\> | %061 + c2.~ c8\pp r8 | %062 + r4 f2.~(\< | %063 + f1 | %064 + 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 } clarinetStaff = diff --git a/manuscripts/flute.ly b/manuscripts/flute.ly index 11b78a9..a57cdd2 100644 --- a/manuscripts/flute.ly +++ b/manuscripts/flute.ly @@ -41,6 +41,14 @@ fluteMusic = 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 + R1*4^\markup { "take piccolo" } | %061-064 + R1*6/4 | %065 + R1*2 |%066-067 + R1*3/4 | %068 + R1 | %069 + r2 r4 \tuplet 3/2 { r8 r8 a,8~^\markup { "piccolo" } } | %070 + a1 | %071 + R1*2 | %072 } fluteStaff = diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly index fc4b801..b01392d 100644 --- a/manuscripts/horn.ly +++ b/manuscripts/horn.ly @@ -1,6 +1,7 @@ % root = ../tiny-cartel.ly hornMusic = -\transpose f c' \relative { +\transpose f c' +\relative { \clef treble R1 | %001 R1*3/4*2 | %002-3 @@ -23,6 +24,12 @@ hornMusic = R1*5/4 | %058 \tuplet 3/2 { ees'4 aes4 b4 } | %059 c1\fermata | %060 + R1*4 | %061-064 + R1*6/4 | %065 + R1*2 |%066-067 + R1*3/4 | %068 + R1*5 | %069 + } hornStaff = diff --git a/manuscripts/oboe.ly b/manuscripts/oboe.ly index 9747492..18d3753 100644 --- a/manuscripts/oboe.ly +++ b/manuscripts/oboe.ly @@ -34,7 +34,11 @@ oboeMusic = 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 - + R1*4 | %061-064 + R1*6/4 | %065 + R1*2 |%066-067 + R1*3/4 | %068 + R1*5 | %069 } oboeStaff = diff --git a/manuscripts/perc1.ly b/manuscripts/perc1.ly index 955324f..b9a3a6b 100644 --- a/manuscripts/perc1.ly +++ b/manuscripts/perc1.ly @@ -1,57 +1,108 @@ % root = ../tiny-cartel.ly -percOneMusic = -\relative { - \set Staff.pedalSustainStyle = #'bracket - \clef treble - <>^\markup { \bold \box "vibraphone" } R1 | %001 - ees'8-+\f r8 r8 \once \omit Staff.PianoPedalBracket des8-+\sustainOn - \once \override Staff.PianoPedalBracket.bracket-flare = #'(10 . 0.5) - des4:32~\niente\<\sustainOff\sustainOn^\markup { "gradually depress pedal" } | %002 - \after 2 \! des2.:32 | %003 - r2\sustainOff a8-+ r8 r4 | %004 - g8-+ r8 r4 r2 | %005 - R1*7 | %006-12 - r4 c'8( d8~ d8 e8 a,8 g8~ | %013 - g4) r4 r4 f4~\sustainOn | %14 - f8 g'8~ g2~ | %015 - g2 r4\sustainOff | %016 - r4 \xNotesOn cis,,8 dis8 r8 ais8 r8 gis8 \xNotesOff | %017 - R1*2 | %017-18 - r2 r8 d''8\mf e4 | %019 - b1:32~\> | %020 - b1:32~ | %021 - b4:32\niente r4 r2 | %022 - R1*2 | %023-24 - r8 b,8(~ b4 e8 ees8~ ees4~ | %025 - ees8 f4 g8 d8) r8 r4 | %026 - 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 +drumPitchNames.tt = #'tt +drumPitchNames.bdr = #'bdr +drumPitchNames.rtl = #'rtl +drumPitchNames.rtm = #'rtm +drumPitchNames.rth = #'rth +drumPitchNames.tbr = #'tbr +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) + (cxl default #f 2) + (csh default #f 4) + (tbr default #f 5))) + +midiDrumPitches.tt = c +midiDrumPitches.bdr = des +midiDrumPitches.rtl = d +midiDrumPitches.rtm = ees +midiDrumPitches.rth = e +midiDrumPitches.cxl = f +midiDrumPitches.cxh = ges +midiDrumPitches.tbr = g + +percOnePitchedMusic = +{ + \new Staff \with { + \remove Time_signature_engraver + } + \relative { + \set Staff.pedalSustainStyle = #'bracket + \clef treble + <>^\markup { \bold \box "vibraphone" } R1 | %001 + ees'8-+\f r8 r8 \once \omit Staff.PianoPedalBracket des8-+\sustainOn + \once \override Staff.PianoPedalBracket.bracket-flare = #'(10 . 0.5) + des4:32~\niente\<\sustainOff\sustainOn^\markup { "gradually depress pedal" } | %002 + \after 2 \! des2.:32 | %003 + r2\sustainOff a8-+ r8 r4 | %004 + g8-+ r8 r4 r2 | %005 + R1*7 | %006-12 + r4 c'8( d8~ d8 e8 a,8 g8~ | %013 + g4) r4 r4 f4~\sustainOn | %14 + f8 g'8~ g2~ | %015 + g2 r4\sustainOff | %016 + r4 \xNotesOn cis,,8 dis8 r8 ais8 r8 gis8 \xNotesOff | %017 + R1*2 | %017-18 + r2 r8 d''8\mf e4 | %019 + b1:32~\> | %020 + b1:32~ | %021 + b4:32\niente r4 r2 | %022 + R1*2 | %023-24 + r8 b,8(~ b4 e8 ees8~ ees4~ | %025 + ees8 f4 g8 d8) r8 r4 | %026 + 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 + \override Voice.Clef.stencil = ##f + } + \new DrumStaff \with { + \remove Time_signature_engraver + drumStyleTable = #(alist->hash-table perc1-drum-style) + 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 + 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 + } } percOneStaff = #(define-music-function (music) (ly:music?) #{ - \new Staff = "perc1" - \with { - instrumentName = \markup { "percussion I " } - shortInstrumentName = \markup { "pc I " } - \override DynamicLineSpanner.staff-padding = \sods - } - << $music >> + \new OneStaff = "perc1" + \with { + instrumentName = \markup { "percussion I " } + shortInstrumentName = \markup { "pc I " } + \override DynamicLineSpanner.staff-padding = \sods + \remove Clef_engraver + } + << $music >> #}) diff --git a/manuscripts/perc2.ly b/manuscripts/perc2.ly index eb4b621..ed036df 100644 --- a/manuscripts/perc2.ly +++ b/manuscripts/perc2.ly @@ -1,68 +1,143 @@ % root = ../tiny-cartel.ly +drumPitchNames.sd = #'sd +drumPitchNames.sdc = #'sdc +drumPitchNames.sdr = #'sdr +drumPitchNames.ccy = #'ccy +drumPitchNames.htc = #'htc +drumPitchNames.hto = #'hto +drumPitchNames.hth = #'hth +drumPitchNames.htp = #'htp +drumPitchNames.tbc = #'tbc +drumPitchNames.tbd = #'tbd +drumPitchNames.tbe = #'tbe +drumPitchNames.tbg = #'tbg +drumPitchNames.tba = #'tba + +#(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) + (hto cross open 5) + (hth cross halfopen 5) + (htc cross #f 5) + (ccy cross #f 6))) + +midiDrumPitches.sd = c' +midiDrumPitches.sdc = des' +midiDrumPitches.sdr = d' +midiDrumPitches.ccy = ees' +midiDrumPitches.htc = 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'' + percTwoMusic = -\relative { - \clef treble - <>^\markup { \bold \box "marimba" } R1 | %001 - R1*3/4*2 | %002-3 - b8->\f bes'8:32~\niente\< bes2.:32~ | %004 - \after 2 \mf bes2.:32 f'4:32~\niente\< | %005 - f1:32~ | %006 - f4:32\mf \after 2 \mf ges2.:32\niente\< | %007 - ees2.:32~\niente\< ees8:32\mf aes,8:32~\niente\< | %008 - aes1:32~ | %009 - aes4:32\mf r4 r2 | %010 - r2 r8 des8:32~\niente\< des4:32~ | %011 - des1:32~ | %012 - des1:32~ | %013 - des2:32~\mp des8:32 c8 f,4:32~ | %014 - f8:32 8:32~ 2:32~ | %015 - 2:32 r4 | %016 - R1*3 \clef bass | %017-19 - r2 a,,2:32~\niente\< | %020 - a2:32~ a8:32\f des8 g8 ges8 | %021 - bes,4 r4 r2 | %022 - R1 | %023 - r2 r4 e4 | %024 - r4 r8 f8 r4 fis4 | %025 - R1*2 | %026-27 - r8 bes,8 c4 r2 | %028 - R1*3 | %029-31 - r2 r4 \xNotesOn aes'8 bes | %032 - r8 c,8 des8 f8 ees8 \xNotesOff r8 r4 | %033 - r2 r8 g8~ g4 | %034 - a,1:32 | %035 - r2 r4 bes8 ees8 | %036 - r8 ges8 r8 c,8 r2 | %037 - R1 | %038 - r4 r8 a8 d4 f4 | %039 - 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 +{ + \new Staff \with { + \remove Time_signature_engraver + } + \relative { + \clef treble + <>^\markup { \bold \box "marimba" } R1 | %001 + R1*3/4*2 | %002-3 + b8->\f bes'8:32~\niente\< bes2.:32~ | %004 + \after 2 \mf bes2.:32 f'4:32~\niente\< | %005 + f1:32~ | %006 + f4:32\mf \after 2 \mf ges2.:32\niente\< | %007 + ees2.:32~\niente\< ees8:32\mf aes,8:32~\niente\< | %008 + aes1:32~ | %009 + aes4:32\mf r4 r2 | %010 + r2 r8 des8:32~\niente\< des4:32~ | %011 + des1:32~ | %012 + des1:32~ | %013 + des2:32~\mp des8:32 c8 f,4:32~ | %014 + f8:32 8:32~ 2:32~ | %015 + 2:32 r4 | %016 + R1*3 \clef bass | %017-19 + r2 a,,2:32~\niente\< | %020 + a2:32~ a8:32\f des8 g8 ges8 | %021 + bes,4 r4 r2 | %022 + R1 | %023 + r2 r4 e4 | %024 + r4 r8 f8 r4 fis4 | %025 + R1*2 | %026-27 + r8 bes,8 c4 r2 | %028 + R1*3 | %029-31 + r2 r4 \xNotesOn aes'8 bes | %032 + r8 c,8 des8 f8 ees8 \xNotesOff r8 r4 | %033 + r2 r8 g8~ g4 | %034 + a,1:32 | %035 + r2 r4 bes8 ees8 | %036 + r8 ges8 r8 c,8 r2 | %037 + R1 | %038 + r4 r8 a8 d4 f4 | %039 + 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 \clef treble | %059 + <>^\markup { \bold \box "tubular bells" } 1\fermata | %60 + \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 { + 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 + } } percTwoStaff = #(define-music-function (music) (ly:music?) #{ - \new Staff = "perc2" - \with { - instrumentName = \markup { "percussion II " } - shortInstrumentName = \markup { "pc II " } - \override DynamicLineSpanner.staff-padding = \sods - } - << $music >> + \new OneStaff = "perc2" + \with { + instrumentName = \markup { "percussion II " } + shortInstrumentName = \markup { "pc II " } + \override DynamicLineSpanner.staff-padding = \sods + \remove Clef_engraver + } + << $music >> #}) diff --git a/manuscripts/pianoDown.ly b/manuscripts/pianoDown.ly index 5829160..2555388 100644 --- a/manuscripts/pianoDown.ly +++ b/manuscripts/pianoDown.ly @@ -38,4 +38,13 @@ 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 + e8-. f8-. r4 r8 ees8-. r4 | %062 + r2 g8-. bes,8-. r8 des8-. | %063 + R1 | %064 + a8-. r8 r4 r4 r2. | %065 + R1 | %066 + r2 r8 c'8-+ c4 | %067 + R1*3/4 | %068 + R1*4 | %069 } diff --git a/manuscripts/pianoUp.ly b/manuscripts/pianoUp.ly index b4d71a8..8e246d6 100644 --- a/manuscripts/pianoUp.ly +++ b/manuscripts/pianoUp.ly @@ -22,6 +22,11 @@ pianoUpMusic = 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 + R1*4 \clef bass | %061-64 + d,,,8-. r8 r4 r4 r2. | %065 + R1*2 | %066-067 + R1*3/4 | %068 + R1*5 | %069 } pianoStaff = diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly index 1c20a80..bb60512 100644 --- a/manuscripts/tempoMap.ly +++ b/manuscripts/tempoMap.ly @@ -2,8 +2,9 @@ tempoMap = \new Voice \with { \consists Mark_engraver + \remove Clef_engraver } -\relative { +{ \tempo "Allegro energico" 4=208 \time 4/4 s1 | %001 \time 3/4 s1*3/4*2 | %002-3 @@ -19,5 +20,9 @@ tempoMap = \time 4/4 s1 \bar "||" | %060 \mark \default \tempo "Poco Meno Mosso" 4=19 - \time 4/4 s1 | + \time 4/4 s1*4 | %061-64 + \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 } diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly index 427c766..d2e0599 100644 --- a/manuscripts/trombone.ly +++ b/manuscripts/trombone.ly @@ -43,6 +43,13 @@ tromboneMusic = c8( ees8~ ees2) bes2 | %058 f4 d'4 | %059 g,1\fermata | %060 + R1*4 | %061-064 + R1*6/4 | %065 + R1 | %066 + r2 r8 c8-. r4 | %067 + R1*3/4 | %068 + R1*5 | %069 + } tromboneStaff = diff --git a/manuscripts/trumpet.ly b/manuscripts/trumpet.ly index 427bea7..c78e682 100644 --- a/manuscripts/trumpet.ly +++ b/manuscripts/trumpet.ly @@ -30,6 +30,12 @@ trumpetMusic = f'8( bes,8~ bes2) bes,2 | %058 \tuplet 3/2 { ees'4 aes,4 b4 } | %059 c1\fermata | %060 + R1*4 | %061-064 + R1*6/4 | %065 + R1*2 |%066-067 + R1*3/4 | %068 + R1*5 | %069 + } trumpetStaff = diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly index 2868b13..d5b51a6 100644 --- a/manuscripts/viola.ly +++ b/manuscripts/viola.ly @@ -40,6 +40,18 @@ violaMusic = c8( ees8~ ees2) bes'2 | %058 f4-> d4-> | %059 g1\fermata | %060 + r8 f8~ f2.~ | %061 + f4 ges2 aes8( des,8 | %062 + c2.) b'4~ | %063 + b8 gis8~ gis4 e4. ees8( | %064 + d8-.) r8 r4 r4 r2. | %065 + r8 f8~ f2. | %066 + R1 | %067 + ees8-. f8-. fis8( g8) e8-. d8-. | %068 + cis1 | %069 + R1*2 | %070 + r2 r4 \tuplet 3/2 { r8 dis4~ } | %071 + dis2. r4 | } violaStaff = diff --git a/manuscripts/violin1.ly b/manuscripts/violin1.ly index cb7b251..c4d64d9 100644 --- a/manuscripts/violin1.ly +++ b/manuscripts/violin1.ly @@ -36,6 +36,13 @@ violinOneMusic = 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 + R1*4 | %061-064 + R1*6/4 | %065 + R1 | %066 + g,,1-> | %067 + bes8-. des8-. b4( a4~ | %068 + a1) | %069 + R1*4 } violinOneStaff = diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly index 8e82663..49c3b99 100644 --- a/manuscripts/violin2.ly +++ b/manuscripts/violin2.ly @@ -36,6 +36,13 @@ violinTwoMusic = 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 + R1*4 | %061-064 + R1*6/4 | %065 + R1 | %066 + g,1-> | %067 + bes8-. des8-. b4( a4~ | %068 + a1) | %069 + R1*4 } violinTwoStaff = diff --git a/tiny-cartel.ly b/tiny-cartel.ly index d4d5498..35033f3 100644 --- a/tiny-cartel.ly +++ b/tiny-cartel.ly @@ -63,7 +63,7 @@ << \override StaffGroup.SystemStartSquare.collapse-height = 4 \override Score.SystemStartBar.collapse-height = 4 - \clarinetStaff << \tempoMap \clarinetMusic >> + \clarinetStaff << \clarinetMusic \tempoMap >> >> \new StaffGroup << @@ -80,7 +80,7 @@ >> \new StaffGroup << - \percOneStaff << \tempoMap \percOneMusic >> + \percOneStaff << \tempoMap \percOnePitchedMusic >> \percTwoStaff \percTwoMusic >> \pianoStaff << \tempoMap \pianoUpMusic >> \pianoDownMusic