From 215b2231888d624111400d9f523b4c8df0e2e6ac Mon Sep 17 00:00:00 2001 From: Tucker Johnson Date: Wed, 14 Aug 2024 14:20:24 -0400 Subject: [PATCH] prep for branch --- general/info.ly | 2 +- manuscripts/II-clarinet.ly | 55 ++++++++++++------ manuscripts/II-piano.ly | 114 +++++++++++++++++++++++++++---------- manuscripts/III-piano.ly | 2 +- manuscripts/IV-clarinet.ly | 2 +- net-clarity.ly | 15 +++-- 6 files changed, 136 insertions(+), 54 deletions(-) diff --git a/general/info.ly b/general/info.ly index 8bc6fd0..3202ff4 100644 --- a/general/info.ly +++ b/general/info.ly @@ -3,7 +3,7 @@ xsub = \markup { " " } xcomp = \markup { Tucker Johnson } xinst = \markup { clarinet and piano } xdur = \markup { \null } -xcr = \markup \tiny { Copyright Tucker Johnson MMXXIV. All Rights Reserved } +xcr = \markup \tiny { Copyright Tucker Johnson 2024. All Rights Reserved (ASCAP) } oddhead = \markup { \fill-line { \null \center-column { \bold { \xcomp } " " } \null } } evhead = \markup { \fill-line { \null \center-column { \bold { \xtitle } " " } \null } } oddfoot = \markup { \fill-line { \null \center-column { " " \concat { " - " \fromproperty #'page:page-number-string " - " } } \null } } diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly index 4af5df5..aac6271 100644 --- a/manuscripts/II-clarinet.ly +++ b/manuscripts/II-clarinet.ly @@ -4,25 +4,48 @@ instrumentName = \markup { clarinet in \concat { \bold "B" \tiny \flat " " } } shortInstrumentName = \markup { cl } \override DynamicLineSpanner.staff-padding = \sods - fontSize = #1 - \override StaffSymbol.staff-space = #(magstep 1) + fontSize = \clarinetFont + \override StaffSymbol.staff-space = \clarinetMagstep \consists Text_mark_engraver -} + \consists Mark_engraver + } %\transpose bes c' \relative { - \tempo 4=114 - \time 2/4 bes4(\mf d,8\> a'8~\p | - a8 cis'~ 8) r8 | - r4 ges8(\< f,8~ | - f16)[\mf r16 c'8](\> e'4\p\< | - \after 4 \mf ees,,2) | - \tuplet 3/2 { g''4(\> b, gis\p } | - ais16\< cis,16 a'8~ a8)\mf d,8~(\p | - d4. f'8\< | - ges,,4~\mf ges8) r8 | - \after 4. \< g''2~(\p | - g8 aes,,8~\mf aes4) | - e8(\> c''4\p\< b16\> dis16)\! | + \numericTimeSignature + \tempo "Vivace" 4=144 + \time 5/8 ces'4\f ees8[ bes'] r8 | + \time 4/4 \grace { ees,8( } c4) d' a'8( cis4.) | + \grace { b,,8( } e,8) g' r8 aes,8~ aes f''4 \grace { ees'8( } ges,8) | + \time 2/4 a,,4 \grace { g'8( } bes,8 f' + \time 5/8 d4) c' e'8 | + \time 3/4 \grace { a,,,8( } fis4 cis') ees'8 r8 | + \time 5/8 g4 b( aes8) | + \time 3/4 c,,4 des' bes' + \time 5/8 a, e d''8 | + \time 3/4 aes,4 \grace { a8( } ges'4) f' | + \time 2/4 ees,,,8( g4) b'8 | + \time 5/8 f,4 ges' g''8 | + bes,,,4 a' aes'8[ | + d,,,8] e''4 c' | + \grace { a,8( } cis,4) \grace { e'8( } b8) ees'4 | + \time 4/4 f,,2. r4 | + \time 7/8 f4 des( aes4) d8 | + \time 4/4 c'4 b'8 r8 bes,,8 a''4. | + \time 7/8 ees4 \grace { aes,,8( } ges4) \grace { ees''8( } g8) e'8 r8 | + \time 4/4 d,4( f8) cis' c,,4 \grace { f'8( } bes,4) | + \grace { cis'8( } fis,8) r8 aes,,8 g'4 a'8 r8 \grace { gis,,8( } b8 | + e,4) ees'8 d,8~ d8 b''4 c'8 | + bes,,4 \grace { ees8( } des4~ des8) g' r8 \grace { des,8( } ges,8) | + aes'4 ees''8 r8 f,,,8 a4 e''8~ | + \time 6/8 e4. ees,,8 b' fis'' | + \grace { b,,8( } e,8) cis'' a gis,4. | + \time 2/4 \grace { ees8( } c'8) f' g,, bes'' | + \time 4/4 d2\fermata r4 aes4( | + \time 6/8 b2. | + e,4.) d,,8( fis a~ | + \time 2/4 a) r8 r4 | + \time 5/4 ees''1 c8( f,,) | + \time 4/4 \tuplet 3/2 { bes4( g' bes, } \tuplet 3/2 { g' bes, g') } } diff --git a/manuscripts/II-piano.ly b/manuscripts/II-piano.ly index b4054d1..1ce7e53 100644 --- a/manuscripts/II-piano.ly +++ b/manuscripts/II-piano.ly @@ -1,44 +1,100 @@ % root = ../net-clarity.ly \new PianoStaff \with { - instrumentName = \markup { "piano " } + instrumentName = \markup { "piano" } shortInstrumentName = \markup { "pno " } \consists Text_mark_engraver + \consists Metronome_mark_engraver } << + \numericTimeSignature \set PianoStaff.connectArpeggios = ##t \override PianoStaff.Arpeggio.arpeggio-direction = #UP - \new Staff = "u" \with { \consists "Merge_rests_engraver" } - \relative { - \ottava #1 dis''''4.(\mf c,8~ | - c8) \ottava #0 r8 g4~ | - g4 r4 | - \ottava #1 \tuplet 3/2 { bes''8-.[ \ottava #0 r8 f,8(] } d,4) | - r2 | - r2 | - r2 | - \ottava #1 e''4. gis,8~ | - gis4 r8 b8( \ottava #0 | - \clef bass fis,,,2~ | - fis8 \clef treble a''8~ 4) | - d4.\p cis,8\mf | + \new Staff = "u" + { + << + \relative { + \tempo "Vivace" 4=144 + \time 5/8 s4\f ees'8[ bes'] r8 | + \override DynamicLineSpanner.staff-padding = \phds + s4 d a'8( cis4.) | + s4 r8 s4 f,4 ges8 | + \time 2/4 s2 + \time 5/8 s4 c,4 e'8 | + s4 s4 ees,8 r8 | + \time 5/8 g4 b( aes8) | + s4 des, bes' + \time 5/8 s4 s4 d8 | + \time 3/4 s4 ges,4 f' | + \time 2/4 s8 s4 b,,8 | + \time 5/8 s4 s4 g''8 | + s4 a,,4 aes'8 | + s8 e4 c' | + s4 s8 ees4 | + \time 4/4 R1 | + \time 7/8 f,,2~-> f4 r8 | + \time 4/4 c'4 b'4 r8 a4. | + \time 7/8 ees4 \D \once \stemUp fis,, \U g''8 e'4 | + \time 4/4 d,4 f8 cis' r4 bes,4 | + fis'8 r8 \D aes,,8 \U g'8~-> g2~ | + g4 ees2.~-> | + 4 r4 r8 f'8 r4 | + aes,4 ees''8 r8 r4 r8 e,8~ | + \time 6/8 e4. \D ees,,8[ \U r8 fis''8] | + r8 cis8 a r4. | + \D c,8 \U f' \D g,, \U bes'' | + d2\fermata r4 aes4 | + \time 6/8 R1*6/8 | + R1*6/8 + \time 2/4 r8 bes,,8( des f | + \time 5/4 fis1) r4 | + \time 4/4 d1 | + + + + } + >> } - \new Staff = "d" \with { \consists "Merge_rests_engraver" } - \relative { + \new Staff = "d" + { \clef bass - b,,2\p | - r4 \ottava #-1 e,4~( | - e4 gis | - a8-.) \ottava #0 r8 r4 | - des'8~ 8~ 4~ | - 8 r8 r4 | - c2 | - r2 | - r8 ees,8( g,-.) r8 | - f2~ | - 8 bes'8~ 4 | - r2 | + << + \relative { + \tempo "Vivace" 4=144 + b4 s4 r8 | + c4 s4 s2 | + e,8 \U g' \D r8 aes,8~ aes s4 s8 | + a4 bes8 f' | + d4 s4 s8 | + fis,4 cis' s8 r8 | + s4 s4. | + c4 s4 s4 | + a'4 e s8 | + aes4 s4 s4 | + ees,8 g4 s8 | + f4 ges'4 s8 | + bes,4 s4 s8 | + d,8 s4 s4 | + cis'4 b'8 s4 | + f1 | + r4 des4 aes d8~-> | + d2 bes2~-> | + bes~ bes4.~ | + bes2 c2~-> | + c4. r8 r8 \clef treble a''8 r8 \clef bass b,,8 | + e,4 r8 d8~ d8 \clef treble b''4 c'8 | + r4 \clef bass des,,4~-> des4. ges,8~-> | + ges2~ 8 a4.~-> | + \time 6/8 a2 b4-> | + e,4.-> gis~-> | + gis2~ gis2\fermata r4 ees,4~ + ees2. | g8( c,4~ c4.) | + R1*2/4 | + b4.~( 8~ 2.) | + R1 | + } + >> } >> diff --git a/manuscripts/III-piano.ly b/manuscripts/III-piano.ly index d91258c..f563f7e 100644 --- a/manuscripts/III-piano.ly +++ b/manuscripts/III-piano.ly @@ -8,7 +8,7 @@ } << \override PianoStaff.Arpeggio.arpeggio-direction = #UP - \new Staff = "u" \with { \consists "Merge_rests_engraver" } + \new Staff = "u" { \clef bass \set PianoStaff.connectArpeggios = ##t diff --git a/manuscripts/IV-clarinet.ly b/manuscripts/IV-clarinet.ly index d3b58d0..890ea6f 100644 --- a/manuscripts/IV-clarinet.ly +++ b/manuscripts/IV-clarinet.ly @@ -122,7 +122,7 @@ \time 12/8 g2.~\mf 4.) r8 d4~( | %091 \time 2/4 d8\> fis8 cis4)\p | %092 \time 6/8 R1*6/8 | %093 - \time 12/8 r8 r8 c!8~\< c4.~ c4 c4( ees~ | %094 + \time 12/8 r8 r8 c!8~\< c4.~ c4 c8~( c8 ees4~ | %094 \time 6/8 ees8) f8( bes,8~\mf 4 a8~ | %095 \time 7/8 \after 4. \! a4.)\> r8 fis'4(\p ees8\< | %096 \time 12/8 \after 2 \> g2.~\mp g8 e4~\pp e4.~ | %097 diff --git a/net-clarity.ly b/net-clarity.ly index df31177..a4e4c52 100644 --- a/net-clarity.ly +++ b/net-clarity.ly @@ -240,15 +240,18 @@ clarinetMagstep = #(magstep -2) % } % \bookpart { -% \header { -% title = ##f subtitle = ##f composer = ##f poet = ##f -% piece = \markup { \large \bold "II. " } -% } % \tocItem \markup { "II. " } % \score { +% \header { +% title = \markup { \fontsize #1 \xtitle } +% subtitle = \markup { \medium \italic \xsub } +% composer = \xcomp +% poet = \markup { \xinst } +% piece = \markup { \large \bold "II. " } +% } % << -% \include "manuscripts/II-clarinet.ly" -% \include "manuscripts/II-piano.ly" +% \removeWithTag #'part \include "manuscripts/II-clarinet.ly" +% \removeWithTag #'part \include "manuscripts/II-piano.ly" % >> % %\midi { } % \layout { -- 2.39.5