From: Tucker Johnson Date: Sat, 10 Jan 2026 04:36:09 +0000 (-0500) Subject: work X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=7e9c2de2785823e955713d0a50cfb19bfc7ec1c8;p=tiny-cartel.git work --- diff --git a/general/aliases.ly b/general/aliases.ly index 7bc46ea..d5f0e23 100644 --- a/general/aliases.ly +++ b/general/aliases.ly @@ -6,22 +6,6 @@ ds = #2.5 sods = #3.4 phds = #3.9 -%notation marks -lsp = \override TextSpanner.bound-details.left.text = "sp" -rsp = \override TextSpanner.bound-details.right.text = " sp" -lst = \override TextSpanner.bound-details.left.text = "st" -rst = \override TextSpanner.bound-details.right.text = " st" -lord = \override TextSpanner.bound-details.left.text = "ord" -rord = \override TextSpanner.bound-details.right.text = " ord" -rit = \override TextSpanner.bound-details.left.text = \markup { \upright "rit. " } -ritPoc = \override TextSpanner.bound-details.left.text = \markup { \upright "ritardando poco a poco " } -molRit = \override TextSpanner.bound-details.left.text = \markup { \upright "molto rit. " } -pocRit = \override TextSpanner.bound-details.left.text = \markup { \upright "poco rit. " } -ace = \override TextSpanner.bound-details.left.text = \markup { \upright "accel. " } -pocAce = \override TextSpanner.bound-details.left.text = \markup { \upright "poco accel. " } -acePoc = \override TextSpanner.bound-details.left.text = \markup { \upright "accelerando poco a poco " } -molAce = \override TextSpanner.bound-details.left.text = \markup { \upright "molto accel. " } - sD = \stemDown sU = \stemUp sN = \stemNeutral diff --git a/general/partPaper.ly b/general/partPaper.ly index b5728cf..48d4ccb 100644 --- a/general/partPaper.ly +++ b/general/partPaper.ly @@ -143,4 +143,13 @@ \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/scorePaper.ly b/general/scorePaper.ly index 98ad282..fc3944b 100644 --- a/general/scorePaper.ly +++ b/general/scorePaper.ly @@ -10,6 +10,7 @@ bottom-margin = 0.5\in left-margin = 0.9\in right-margin = 0.9\in + ragged-last = ##t indent = 0.75\in short-indent = 0\cm #(define fonts (set-global-fonts #:music "scorlatti" #:brace "scorlatti" #:roman "Junicode" #:sans "sans")) diff --git a/manuscripts/bass.ly b/manuscripts/bass.ly index f70c315..ccd7add 100644 --- a/manuscripts/bass.ly +++ b/manuscripts/bass.ly @@ -6,7 +6,8 @@ bassMusic = \relative { \time 6/4 R1*6/4 | %002 \time 4/4 R1*11 | %003-13 \time 6/4 R1*6/4 | %014 + \time 4/4 R1*12 } bassStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "bass" \with { instrumentName = \markup { bass } shortInstrumentName = \markup { cb } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "bass" \with { instrumentName = \markup { "bass " } shortInstrumentName = \markup { "cb " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/bassClarinet.ly b/manuscripts/bassClarinet.ly index 6e637e1..7f2a26d 100644 --- a/manuscripts/bassClarinet.ly +++ b/manuscripts/bassClarinet.ly @@ -1,12 +1,28 @@ % root = ../tiny-cartel.ly -bassClarinetMusic = \relative { +bassClarinetMusic = \transpose bes c'' \relative { \clef treble \time 4/4 R1 | %001 \time 6/4 R1*6/4 | %002 \time 4/4 R1*11 | %003-13 \time 6/4 R1*6/4 | %014 + \time 4/4 R1*8 | %015-22 + r2 r4 r8 d''8-. | %023 + a8-. r8 r4 r4 bes8-. r8 | %024 + c8-. r8 r4 r4 a,8-. r8 | %025 + r8 bes,8-. c8-. r8 r8 d8-. ees8-. f8-. | %026 + R1*3 | %027-29 + r8 bes8-. r4 r2 | %030 + R1*3 | %031-33 + r2 r4 bes,8-. e8-. | %034 + r8 ges8-. r8 c,8-. r4 r8 des8-. | %035 + ees,1~ | %036 + ees4. a8( d4 f4~ | %037 + f8) r8 r4 r4 r8 fis,8-. | %038 + g8-. c8-. d8-. e8-. r2 | %039 + r2 gis8-. r8 r8 b8-. | %040 + cis8-. } bassClarinetStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "bassClarinet" \with { instrumentName = \markup { bass clarinet } shortInstrumentName = \markup { b cl } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "bassClarinet" \with { instrumentName = \markup { "bass clarinet " } shortInstrumentName = \markup { "b cl " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/bassoon.ly b/manuscripts/bassoon.ly index 828e3af..70e8b06 100644 --- a/manuscripts/bassoon.ly +++ b/manuscripts/bassoon.ly @@ -15,7 +15,25 @@ bassoonMusic = \relative { ees8-. f8-. r8 ges8-. aes8-. r8 r4 | %011 R1*2 | %012-13 \time 6/4 R1*6/4 | %014 + \time 4/4 R1*8 \clef bass | %015-22 + r2 cis,,8-. gis'8-. fis8-. r8 | %023 + r2 e'8( ees8~ ees4~ | %024 + ees8 f4 g8 d8-.) r8 r4 | %025 + R1 | %026 + ges,8-. aes8-. r4 r4 r8 b8-. | %027 + e8-. c8-. r8 d8-. r2 | %028 + R1 %029 + r2 r8 g,8-. r4 | %030 + R1*3 | %031-33 + r2 r4 bes,8-. e8-. | %034 + r8 ges8-. r8 c,8-. r2 | %035 + R1 \clef tenor | %036 + r2 r8 bes''8~ bes4~ | %037 + bes8 r8 r4 r4 r8 \clef bass fis,,8-. | + g8-. c8-. d8-. e8-. r2 | %039 + r2 r4 r8 b8-. | %040 + dis8-. } 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 ec34166..7a2d7fa 100644 --- a/manuscripts/cello.ly +++ b/manuscripts/cello.ly @@ -1,6 +1,7 @@ % root = ../tiny-cartel.ly -celloMusic = \relative { +celloMusic = +\relative { \clef bass \time 4/4 R1 | %001 \time 6/4 R1*6/4 | %002 @@ -11,10 +12,16 @@ celloMusic = \relative { b!4-. r4 r2 | %012 R1 \clef bass | %013 << - { \time 6/4 1. | } %014 + { \time 6/4 1.^\markup { "arco" } | } %014 { s1\p\< s4 s4\mf } >> + \time 4/4 R1 | %015 + r8 a'8-.^\markup { "pizz" } r8 b8-. r8 d8-. r4 | %016 + fis,8(^\markup { "arco" } aes8~ aes4 g8-.) r8 r4 | %017 + c,8^\markup { "pizz" } bes8 r4 r2 | %018 + R1*7 | %019-25 + r2 r8 des8^\markup { "pizz" } ees8 f8 } celloStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "cello" \with { instrumentName = \markup { cello } shortInstrumentName = \markup { vc } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "cello" \with { instrumentName = \markup { "cello " } shortInstrumentName = \markup { "vc " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/clarinetSolo.ly b/manuscripts/clarinetSolo.ly new file mode 100644 index 0000000..58327c9 --- /dev/null +++ b/manuscripts/clarinetSolo.ly @@ -0,0 +1,14 @@ +% root = ../tiny-cartel.ly + +clarinetMusic = +\transpose bes c' \relative { + \clef treble + \time 4/4 R1 | %001 + \time 6/4 R1*6/4 | %002 + \time 4/4 R1*11 | %003-13 + \time 6/4 R1*6/4 | %014 + R1*26 +} + +clarinetStaff = +#(define-music-function (music) (ly:music?) #{ \new Staff = "clarinetSolo" \with { instrumentName = \markup { \concat { "clarinet in B" \flat " " } } shortInstrumentName = \markup { "cl " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/flute.ly b/manuscripts/flute.ly index db45742..c3a70ec 100644 --- a/manuscripts/flute.ly +++ b/manuscripts/flute.ly @@ -16,7 +16,26 @@ fluteMusic = \relative { des1~ | %012 des2~\p des8 c8~(\mf c4~ | %013 \time 6/4 c8 g'8~ g2~\> \after 4. \p g2) r4 | %014 + \time 4/4 R1*3 | %015-17 + r2 r8 d8~( d4 | %018 + b1~ | %019 + b1~ | %020 + b2.) b4~ | %021 + b1~ | %022 + b2 r2^\markup { "take piccolo" } | %023 + R1*3 | %024-25 + r2 g2~(^\markup { "piccolo" } | %026 + g2 f4 e4~ | %027 + e4 fis4-.) r2^\markup { "take flute" } | %028 + R1*5 | %029-33 + r2 a'8(^\markup { "flute" } gis8~ gis4~ | %034 + gis2) g4-- e4-- | %035 + c2 r8 bes8~ bes4~ | %036 + bes8 r8 r4 r2 | %037 + r2 r8 fis'8~ fis4~ | %038 + fis2~ fis4 fis4-- | %039 + fis8-.-> } fluteStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "flute" \with { instrumentName = \markup { flute } shortInstrumentName = \markup { fl } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "flute" \with { instrumentName = \markup { "flute " } shortInstrumentName = \markup { "fl " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly index d63707a..d96807f 100644 --- a/manuscripts/horn.ly +++ b/manuscripts/horn.ly @@ -1,6 +1,6 @@ % root = ../tiny-cartel.ly -hornMusic = \relative { +hornMusic = \transpose f c' \relative { \clef treble \time 4/4 R1 | %001 \time 6/4 R1*6/4 | %002 @@ -8,7 +8,13 @@ hornMusic = \relative { bes8-.\mf r8 r4 ges8-.\mp r8 r4 | %008 R1*5 | %009-13 \time 6/4 R1*6/4 | %014 + \time 4/4 R1*2 | %015-16 + fis8( aes8~ aes4 g8)-. r8 ees8-. r8 | %017 + R1*6 | %018-23 + r8 b8(~ b4 e8 ees8~ ees4~ | %024 + ees8 f4 g8 d8-.) r8 r4 | %025 + R1 | %026 } hornStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "horn" \with { instrumentName = \markup { horn } shortInstrumentName = \markup { hn } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "horn" \with { instrumentName = \markup { "horn in F " } shortInstrumentName = \markup { "hn " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/oboe.ly b/manuscripts/oboe.ly index 38b3637..050baed 100644 --- a/manuscripts/oboe.ly +++ b/manuscripts/oboe.ly @@ -10,7 +10,26 @@ oboeMusic = \relative { des1~ | %012 des2~\mf des8 r8 r4 | %013 \time 6/4 R1*6/4 | %014 + \time 4/4 R1*6 | %015-20 + r2 r4 b4~ | %021 + b4. a8~ a2~ | %022 + a2 r4 r8 d8( | %023 + a2. bes4 | %024 + c1~ | %025 + c1) | %026 + R1*2 | %027-28 + r4 fis8( dis8 b4) gis'4( | %029 + cis,1~ | %030 + cis1) | %031 + r2 r4 b4~( | %032 + b4. cis8 f4) d4~( | %033 + d4 ees2.~ | %034 + ees4) r4 r2 | %035 + R1*3 | %036-38 + r2 r8 fis8~ fis4~ | %039 + fis2~ fis4 fis4-- | %040 + fis8-.-> } oboeStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "oboe" \with { instrumentName = \markup { oboe } shortInstrumentName = \markup { ob } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "oboe" \with { instrumentName = \markup { "oboe " } shortInstrumentName = \markup { "ob " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/perc1.ly b/manuscripts/perc1.ly index 61c015c..91bdc1d 100644 --- a/manuscripts/perc1.ly +++ b/manuscripts/perc1.ly @@ -13,7 +13,17 @@ percOneMusic = \relative { r4 c'8( d8~ d8 e8 a,8 g8~ | %012 g4) r4 r4 f4~\sustainOn | \time 6/4 f8 g'8~ g2~ g2 r4\sustainOff | %014 + r4 cis,,8 dis8 r8 ais8 r8 gis8 | %015 + R1*2 | %016-17 + r2 r8 d''8\mf e4 | %018 + b1:32~\> | %019 + b1:32~ | %020 + b4:32\niente r4 r2 | %021 + R1*2 | %022-23 + r8 b,8(~ b4 e8 ees8~ ees4~ | %024 + ees8 f4 g8 d8) r8 r4 | %025 + R1 | %025 } 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 >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "perc1" \with { instrumentName = \markup { "percussion I " } shortInstrumentName = \markup { "pc I " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/perc2.ly b/manuscripts/perc2.ly index 679dd9b..7161015 100644 --- a/manuscripts/perc2.ly +++ b/manuscripts/perc2.ly @@ -16,7 +16,16 @@ percTwoMusic = \relative { des1:32~ | %012 des2:32~\mp des8:32 c8 f,4:32~ | %013 f8:32 8:32~ 2:32~ 2:32 r4 | %014 + \time 4/4 R1*3 \clef bass | %015 + r2 a,,2:32~\niente\< | %016 + a2:32~ a8:32\f des8 g8 ges8 | %017 + bes,4 r4 r2 | %018 + R1 | %019 + r2 r4 e4 | %020 + r4 r8 f8 r4 fis4 | %021 + R1*2 | %022-23 + r8 bes,8 c4 r2 | %024 } 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 >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "perc2" \with { instrumentName = \markup { "percussion II " } shortInstrumentName = \markup { "pc II " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/pianoDown.ly b/manuscripts/pianoDown.ly index 9770353..0c3813d 100644 --- a/manuscripts/pianoDown.ly +++ b/manuscripts/pianoDown.ly @@ -6,6 +6,14 @@ pianoDownMusic = \relative { \time 6/4 R1*6/4 | %002 \time 4/4 b8-.^\mp^\< r8 r4 r4 c,8-. r8 | %003 r4 e8-.\f d8-. r2 | %004 - \time 4/4 R1*9 | %005-13 + R1*9 | %005-13 \time 6/4 R1*6/4 | %014 + R1*3 | %015-17 + r4 r8 a8~->^\mf a2~ | %018 + a1 | %019 + r4 ees'4( d4. c8~ | %020 + c8 b8~ b2.) | %021 + R1 | %022 + r2 cis8-. gis'8-. r4 | %023 + R1*3 } diff --git a/manuscripts/pianoUp.ly b/manuscripts/pianoUp.ly index 3510e36..6fc64fc 100644 --- a/manuscripts/pianoUp.ly +++ b/manuscripts/pianoUp.ly @@ -4,11 +4,15 @@ pianoUpMusic = \relative { \clef bass \time 4/4 R1 | %001 \time 6/4 R1*6/4 | %002 - \time 4/4 \makeClusters 1~^\markup { "mute strings inside piano" } | %003 - \makeClusters { 4.~ 8~ 8 } s4. | %004 - \time 4/4 R1*9 | %005-13 + \time 4/4 \makeClusters 1^\markup { "mute strings inside piano" } | %003 + \makeClusters { 4. 8 8 } s4. | %004 + R1*9 | %005-13 \time 6/4 R1*6/4 | %014 + \time 4/4 R1*7 \clef treble | %015-21 + r4 r8 \repeat tremolo 2 { a''32( b } \repeat tremolo 8 { a32 b } | %022 + \repeat tremolo 8 { a32 b) } r2 | %023 + R1*3 } pianoStaff = -#(define-music-function (up down) (ly:music? ly:music?) #{ \new GrandStaff = "piano" \with { instrumentName = \markup { piano } shortInstrumentName = \markup { pno } \override DynamicLineSpanner.staff-padding = \phds } << \new Staff = "u" \with { \consists "Merge_rests_engraver" } { $up } \new Staff = "d" \with { \consists "Merge_rests_engraver" } { $down } >> #}) +#(define-music-function (up down) (ly:music? ly:music?) #{ \new GrandStaff = "piano" \with { instrumentName = \markup { "piano " } shortInstrumentName = \markup { "pno " } \override DynamicLineSpanner.staff-padding = \phds } << \new Staff = "u" \with { \consists "Merge_rests_engraver" } { $up } \new Staff = "d" \with { \consists "Merge_rests_engraver" } { $down } >> #}) diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly index 1e45ef3..b5a65ce 100644 --- a/manuscripts/tempoMap.ly +++ b/manuscripts/tempoMap.ly @@ -4,16 +4,6 @@ tempoMap = \relative { \tempo "Allegro energico" 4=208 \time 4/4 s1 | %001 \time 6/4 s1*6/4 | %002 - \time 4/4 s1 | %003 - s1 | %004 - s1 | %005 - s1 | %006 - s1 | %007 - s1 | %008 - s1 | %009 - s1 | %010 - s1 | %011 - s1 | %012 - s1 | %013 + \time 4/4 s1*11 | %003 \time 6/4 s1*6/4 | %014 } diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly index 008dd67..1b6f558 100644 --- a/manuscripts/trombone.ly +++ b/manuscripts/trombone.ly @@ -11,7 +11,16 @@ tromboneMusic = \relative { r4 f,8-.\> r8 ges8-.\mp r8 r4 | %008 R1*5 | %009-13 \time 6/4 R1*6/4 | %014 + \time 4/4 R1 | %015 + r4 r8 b8-. e,8-. d'8-. r8 cis8-. | %016 + fis,8-. r8 r4 r8 f8-. ees8-. r8 | %017 + c8-. bes8-. r8 a8-. r2 | %018 + r2 r4 g'8-. r8 | %019 + bes,8-. r8 ees4( d4. c8~ | %020 + c8 b8~ b2.) | %021 + r4 gis8-. r8 r4 e'8-. r8 | %022 + R1*5 | } tromboneStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "trombone" \with { instrumentName = \markup { trombone } shortInstrumentName = \markup { tbn } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "trombone" \with { instrumentName = \markup { "trombone " } shortInstrumentName = \markup { "tbn " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/trumpet.ly b/manuscripts/trumpet.ly index 9e6d3c4..ae8c91e 100644 --- a/manuscripts/trumpet.ly +++ b/manuscripts/trumpet.ly @@ -6,7 +6,12 @@ trumpetMusic = \relative { \time 6/4 R1*6/4 | %002 \time 4/4 R1*11 | %003-13 \time 6/4 R1*6/4 | %014 + \time 4/4 R1*8 | %015-22 + r2 r4 r8 d''8( | %023 + a2. bes4 | %024 + c1~ | %025 + c1) | %026 } trumpetStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "trumpet" \with { instrumentName = \markup { trumpet } shortInstrumentName = \markup { tpt } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "trumpet" \with { instrumentName = \markup { "trumpet in C " } shortInstrumentName = \markup { "tpt " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly index 04da1f1..5f2229e 100644 --- a/manuscripts/viola.ly +++ b/manuscripts/viola.ly @@ -11,7 +11,11 @@ violaMusic = \relative { b!4-. r4 r2 | %012 R1 | %013 \time 6/4 r4 r4 4~\p\<^\markup { "arco" } \after 2 \mf 2. | %014 + \time 4/4 r2 r8 ais8-.^\markup { "pizz" } r8 gis8-. | %015 + r8 a8-. r8 b8-. r8 d8-. r4 | %016 + fis,8(^\markup { "arco" } aes8~ aes4 g8-.) r8 r4 | %017 + R1*9 } 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 ee84368..099e8fd 100644 --- a/manuscripts/violin1.ly +++ b/manuscripts/violin1.ly @@ -9,7 +9,10 @@ violinOneMusic = \relative { b4-.) c8( d8~ d8 e8 a,8 g8~ | %012 g4.) ges8~( ges4 f4~ | %013 \time 6/4 f1~ f4) r4 | %014 + \time 4/4 r4 cis8-.^\markup { "pizz" } dis8-. r8 ais8-. r8 gis8-. | %015 + r2 r8 d'8-. r8 cis8-. | %016 + R1*10 } violinOneStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "violin1" \with { instrumentName = \markup { violin I } shortInstrumentName = \markup { vl I } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "violin1" \with { instrumentName = \markup { "violin I " } shortInstrumentName = \markup { "vl I " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly index a90bd9b..3c5371d 100644 --- a/manuscripts/violin2.ly +++ b/manuscripts/violin2.ly @@ -9,7 +9,10 @@ violinTwoMusic = \relative { b4-.) c8( d8~ d8 e8 a,8 g8~ | %012 g4.) ges8~( ges4 f4~ | %013 \time 6/4 f1~ f4) r4 | %014 + \time 4/4 r4 cis8-.^\markup { "pizz" } dis8-. r8 ais8-. r8 gis8-. | %015 + r8 a8-. r4 r4 r8 cis8-. | %016 + R1*10 } violinTwoStaff = -#(define-music-function (music) (ly:music?) #{ \new Staff = "violin2" \with { instrumentName = \markup { violin II } shortInstrumentName = \markup { vl II } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) +#(define-music-function (music) (ly:music?) #{ \new Staff = "violin2" \with { instrumentName = \markup { "violin II " } shortInstrumentName = \markup { "vl II " } \override DynamicLineSpanner.staff-padding = \sods } << $music >> #}) diff --git a/parts.ly b/parts.ly deleted file mode 100644 index e4665fd..0000000 --- a/parts.ly +++ /dev/null @@ -1,179 +0,0 @@ -\version "2.24.3" - -\include "general/info.ly" -\include "general/aliases.ly" -\include "general/scripts.ly" -\include "general/umbel.ly" -\include "general/partPaper.ly" -clarinetFont = #0 -clarinetMagstep = #(magstep 0) - -\book { - - \bookpart { - \header { - title = \markup { \fontsize #1 \xtitle } - subtitle = \markup { \medium \italic \xsub } - composer = \xcomp - poet = \markup { \xinst } - piece = \markup { \bold "I. " } - arranger = \markup { \tiny \typewriter { \shortHash - \branchName } } - } - \tocItem \markup { "I. " } - \score { - << - \include "manuscripts/I-clarinet.ly" - >> - %\midi { } - \layout { - \context { - \Score - \remove Mark_engraver - \remove Text_mark_engraver - \override RehearsalMark.break-visibility = #begin-of-line-invisible - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4) - \override Hairpin.to-barline = ##f - \override VerticalAxisGroup.default-staff-staff-spacing = - #'((basic-distance . 4) - (minimum-distance . 2) - (padding . 4) - (stretchability . 0)) - } - \context { - \Staff - \remove Instrument_name_engraver - ottavationMarkups = #ottavation-ordinals - } - } - } - } - - \pageBreak - \markuplist { - \fill-line { - \line { \null } - \line { \vspace #20 - \huge "page blank to facilitate page turns" - } - \line { \null } - } - } - \pageBreak - - \bookpart { - \header { - piece = \markup { \bold "II. " } - } - \tocItem \markup { "II. " } - \score { - << - \include "manuscripts/II-clarinet.ly" - >> - %\midi { } - \layout { - \context { - \Score - \remove Mark_engraver - \remove Text_mark_engraver - \override RehearsalMark.break-visibility = #begin-of-line-invisible - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4) - \override Hairpin.to-barline = ##f - \override VerticalAxisGroup.default-staff-staff-spacing = - #'((basic-distance . 4) - (minimum-distance . 2) - (padding . 4) - (stretchability . 0)) - - } - \context { - \Staff - \remove Instrument_name_engraver - ottavationMarkups = #ottavation-ordinals - } - } - } - } - - \bookpart { - \tocItem \markup { "III." \bold "Lento, poco rubato" \parenthesize \italic "to Amber Lucas" } - \score { - \header { - piece = \markup { \bold "III. " \parenthesize \italic "to Amber Lucas" } - } - << - \include "manuscripts/III-clarinet.ly" - >> - %\midi { } - \layout { - \context { - \Score - \remove Mark_engraver - \remove Text_mark_engraver - \remove Tempo_mark_engraver - \override RehearsalMark.break-visibility = #begin-of-line-invisible - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4) - \override Hairpin.to-barline = ##f - \override VerticalAxisGroup.default-staff-staff-spacing = - #'((basic-distance . 4) - (minimum-distance . 2) - (padding . 4) - (stretchability . 0)) - } - \context { - \Staff - \remove Instrument_name_engraver - ottavationMarkups = #ottavation-ordinals - } - } - } - } - - \pageBreak - \markuplist { - \fill-line { - \line { \null } - \line { \vspace #20 - \huge "page blank to facilitate page turns" - } - \line { \null } - } - } - \pageBreak - - \bookpart { - \tocItem \markup { "IV. " } - \score { - \header { - piece = \markup { \bold "IV." } - } - << - \include "manuscripts/IV-clarinet.ly" - >> - %\midi { } - \layout { - \context { - \Score - \remove Text_mark_engraver - \remove Mark_engraver - \override TextSpanner.bound-details.left-broken.text = " " - \override RehearsalMark.break-visibility = #begin-of-line-invisible - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4) - \override Hairpin.to-barline = ##f - \override Stem.stemlet-length = #0.75 - \override VerticalAxisGroup.default-staff-staff-spacing = - #'((basic-distance . 4) - (minimum-distance . 2) - (padding . 4) - (stretchability . 0)) - - } - \context { - \Staff - \remove Instrument_name_engraver - \consists Mark_engraver - ottavationMarkups = #ottavation-ordinals - } - } - } - } -} diff --git a/parts/brassParts.ly b/parts/brassParts.ly new file mode 100644 index 0000000..6ce5799 --- /dev/null +++ b/parts/brassParts.ly @@ -0,0 +1,68 @@ +\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/percussionParts.ly b/parts/percussionParts.ly new file mode 100644 index 0000000..99da4b3 --- /dev/null +++ b/parts/percussionParts.ly @@ -0,0 +1,55 @@ +\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 new file mode 100644 index 0000000..b2d34c6 --- /dev/null +++ b/parts/pianoPart.ly @@ -0,0 +1,42 @@ +\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 new file mode 100644 index 0000000..d322668 --- /dev/null +++ b/parts/stringParts.ly @@ -0,0 +1,94 @@ +\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 new file mode 100644 index 0000000..f83a415 --- /dev/null +++ b/parts/woodwindParts.ly @@ -0,0 +1,81 @@ +\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 7e33164..3808eef 100644 --- a/tiny-cartel.ly +++ b/tiny-cartel.ly @@ -7,6 +7,7 @@ \include "general/scorePaper.ly" \include "manuscripts/tempoMap.ly" +\include "manuscripts/clarinetSolo.ly" \include "manuscripts/flute.ly" \include "manuscripts/oboe.ly" \include "manuscripts/bassClarinet.ly" @@ -185,6 +186,14 @@ } \score { << + \new StaffGroup \with { + systemStartDelimiter = #'SystemStartSquare + } + << + \override StaffGroup.SystemStartSquare.collapse-height = 4 + \override Score.SystemStartBar.collapse-height = 4 + \clarinetStaff << \tempoMap \clarinetMusic >> + >> \new StaffGroup << \fluteStaff << \tempoMap \fluteMusic >> @@ -194,16 +203,16 @@ >> \new StaffGroup << - \hornStaff \hornMusic + \hornStaff << \tempoMap \hornMusic >> \trumpetStaff \trumpetMusic \tromboneStaff \tromboneMusic >> \new StaffGroup << - \percOneStaff \percOneMusic + \percOneStaff << \tempoMap \percOneMusic >> \percTwoStaff \percTwoMusic >> - \pianoStaff \pianoUpMusic \pianoDownMusic + \pianoStaff << \tempoMap \pianoUpMusic >> \pianoDownMusic \new StaffGroup << \violinOneStaff << \tempoMap \violinOneMusic >>