From 1a14153209f34a204e12953f1949720c8447a7a3 Mon Sep 17 00:00:00 2001 From: Tucker Johnson Date: Tue, 25 Nov 2025 19:08:15 -0500 Subject: [PATCH] format --- general/scripts.ly | 92 +++++++++++++ manuscripts/I-clarinet.ly | 88 ++++++++++-- manuscripts/I-piano.ly | 44 +++--- manuscripts/II-clarinet.ly | 268 +++++++++++++++++++++++++++---------- manuscripts/II-piano.ly | 2 +- net-clarity.ly | 3 +- parts.ly | 23 +++- 7 files changed, 418 insertions(+), 102 deletions(-) diff --git a/general/scripts.ly b/general/scripts.ly index 5d9b16e..69efd0e 100644 --- a/general/scripts.ly +++ b/general/scripts.ly @@ -23,3 +23,95 @@ fractionalTime = } \time #(to-internal-ts top partial bottom) #}) + +pseudoIndents = % inline alternative to a new \score, also with right-indent +#(define-music-function (name-tweaks left-indent right-indent) + ((markup-list? '()) number? number?) + (define (warn-stretched p1 p2) (ly:input-warning (*location*) (G_ + " pseudoIndents ~s ~s is stretching staff; expect distorted layout") p1 p2)) + (let* ( + (narrowing (+ left-indent right-indent)) ; of staff implied by args + + (set-staffsymbol! (lambda (staffsymbol-grob) ; change staff to new width + (let* ( + (left-bound (ly:spanner-bound staffsymbol-grob LEFT)) + (left-moment (ly:grob-property left-bound 'when)) + (capo? (moment<=? left-moment ZERO-MOMENT)) ; in first system of score + (layout (ly:grob-layout staffsymbol-grob)) + (lw (ly:output-def-lookup layout 'line-width)) ; debugging info + (indent (ly:output-def-lookup layout (if capo? 'indent 'short-indent))) + (old-stil (ly:staff-symbol::print staffsymbol-grob)) + (staffsymbol-x-ext (ly:stencil-extent old-stil X)) + ;; >=2.19.16's first system has old-stil already narrowed [2] + ;; compensate for this (ie being not pristine) when calculating + ;; - old leftmost-x (its value is needed when setting so-called 'width) + ;; - the new width and position (via local variable narrowing_) + (ss-t (ly:staff-symbol-line-thickness staffsymbol-grob)) + (pristine? (<= 0 (car staffsymbol-x-ext) ss-t)) ; would expect half + (leftmost-x (+ indent (if pristine? 0 narrowing))) + (narrowing_ (if pristine? narrowing 0)) ; uses 0 if already narrowed + (old-width (+ (interval-length staffsymbol-x-ext) ss-t)) + (new-width (- old-width narrowing_)) + (new-rightmost-x (+ leftmost-x new-width)) ; and set! this immediately + (junk (ly:grob-set-property! staffsymbol-grob 'width new-rightmost-x)) + (in-situ-stil (ly:staff-symbol::print staffsymbol-grob)) + (new-stil (ly:stencil-translate-axis in-situ-stil narrowing_ X)) + ;(new-stil (stencil-with-color new-stil red)) ; for when debugging + (new-x-ext (ly:stencil-extent new-stil X))) + (ly:grob-set-property! staffsymbol-grob 'stencil new-stil) + (ly:grob-set-property! staffsymbol-grob 'X-extent new-x-ext) + ))) + + (set-X-offset! (lambda (margin-grob) ; move grob across to line start + (let* ( + (old (ly:grob-property-data margin-grob 'X-offset)) + (new (lambda (grob) (+ (if (procedure? old) (old grob) old) narrowing)))) + (ly:grob-set-property! margin-grob 'X-offset new)))) + + (tweak-text! (lambda (i-name-grob mkup) ; tweak both instrumentname texts + (if (and (markup? mkup) (not (string=? (markup->string mkup) "*"))) + (begin + (ly:grob-set-property! i-name-grob 'long-text mkup) + (ly:grob-set-property! i-name-grob 'text mkup) + )))) ; else retain existing text + + (install-narrowing (lambda (leftedge-grob) ; on staves, + adapt left margin + (let* ( + (sys (ly:grob-system leftedge-grob)) + (all-grobs (ly:grob-array->list (ly:grob-object sys 'all-elements))) + (grobs-named (lambda (name) + (filter (lambda (x) (eq? name (grob::name x))) all-grobs))) + (first-leftedge-grob (list-ref (grobs-named 'LeftEdge) 0)) + (relsys-x-of (lambda (g) (ly:grob-relative-coordinate g sys X))) + (leftedge-x (relsys-x-of first-leftedge-grob)) + (leftedged? (lambda (g) (= (relsys-x-of g) leftedge-x))) + (leftedged-ss (filter leftedged? (grobs-named 'StaffSymbol)))) + (if (eq? leftedge-grob first-leftedge-grob) ; ignore other leftedges [1] + (begin + (for-each set-staffsymbol! leftedged-ss) + (for-each set-X-offset! (grobs-named 'SystemStartBar)) + (for-each set-X-offset! (grobs-named 'InstrumentName)) + (for-each tweak-text! (grobs-named 'InstrumentName) name-tweaks) + )))))) + + (if (negative? narrowing) (warn-stretched left-indent right-indent)) + #{ % and continue anyway + % ensure that these overrides are applied only at begin-of-line + \break % (but this does not exclude unsupported multiple application) + % give the spacing engine notice regarding the loss of width for music + \once \override Score.LeftEdge.X-extent = #(cons narrowing narrowing) + % discard line start region of staff and reassemble left-margin elements + \once \override Score.LeftEdge.after-line-breaking = #install-narrowing + % shift the system to partition the narrowing between left and right + \overrideProperty Score.NonMusicalPaperColumn.line-break-system-details + .X-offset #(- right-indent) + % prevent a leftmost barnumber entering a stretched staff + \once \override Score.BarNumber.horizon-padding = #(max 1 (- 1 narrowing)) + #})) + +pseudoIndent = % for changing just left-indent +#(define-music-function (name-tweaks left-indent) + ((markup-list? '()) number?) + #{ + \pseudoIndents $name-tweaks $left-indent 0 + #}) diff --git a/manuscripts/I-clarinet.ly b/manuscripts/I-clarinet.ly index 5c347d9..0821174 100644 --- a/manuscripts/I-clarinet.ly +++ b/manuscripts/I-clarinet.ly @@ -1,6 +1,6 @@ % root = ../net-clarity.ly -\new Staff \with { +\new Staff = "cl1" \with { instrumentName = \markup { clarinet in \concat { \bold "B" \tiny \flat " " } } shortInstrumentName = \markup { cl } \override DynamicLineSpanner.staff-padding = \sods @@ -28,7 +28,22 @@ \sectionLabel \markup { \huge \box \sans \bold 11 } \omit Score.BarNumber - \time 5/4 \grace s8 r4 cis''4(\p\< b'4 bes2)\! | \undo \omit Score.BarNumber %011 + \time 5/4 + << + { + \override Rest.staff-position = #0 + \grace s8 r4 cis''4(\p\< b'4 bes2)\! | \undo \omit Score.BarNumber %011 + } + \tag #'part { + \new CueVoice \relative { + \stemDown \slashedGrace { + \footnote \markup † #'(-1 . -1) \markup \tiny \left-column { + \line { † "In-staff cues are transposed to" \concat { B \flat } } \vspace #-0.4 + } + c'8~ } 4\laissezVibrer \stemNeutral + } + } + >> \time 2/2 \tuplet 3/2 { r4 c4(\f\> g4~ } g2) | %012 \time 5/4 aes2( ees2.~\p \tag #'part { \break \noPageBreak } | %013 \time 2/2 ees8) r8 r4 r2 | %014 @@ -37,28 +52,83 @@ \sectionLabel \markup { \huge \box \sans \bold 17 } \omit Score.BarNumber - r2 d2~\mp | \undo \omit Score.BarNumber %017 - \time 7/4 d4 e4(\> fis4 a,2.)\p\shortfermata r4 | \tag #'part { \break \noPageBreak } %018 + << + { + r2 d2~\mp | \undo \omit Score.BarNumber %017 + } + \tag #'part { + \new CueVoice \relative { + \stemDown 2\laissezVibrer \stemNeutral + } + } + >> + \time 7/4 + << + { + d4 e4(\> fis4 a,2.)\p\shortfermata r4 \cueClefUnset | \tag #'part { \break \noPageBreak } %018 + } + \tag #'part { + \new CueVoice \relative { + s1 s4 + \once \override NoteHead.transparent = ##t + \once \override Stem.transparent = ##t + \once \override NoteHead.no-ledgers = ##t + a4_( \cueClef "bass" \stemDown d,,4_) \stemNeutral + } + } + >> + \tag #'part { \pseudoIndents 0 42 } \time 2/2 \grace s8 des4(\< ees bes f'4~\mf | %019 - \time 3/2 f2.) r4 r2 | %020 - \time 2/2 R1\shortfermata | %021 + \time 3/2 f2.) r4 r2 \tag #'part -\markup { \halign #-8 V.S. } | %020 + \tag #'part { \pageTurn } + \time 2/2 R1\shortfermata | %021 \time 3/2 c2.\pp c4(\< g'4 f4~\mp | %022 - \time 2/2 \tuplet 3/2 { f4) e(\> fis } a,2)\p\shortfermata \breathe | \tag #'part { \break \noPageBreak } %023 + \time 2/2 \tuplet 3/2 { f4) e(\> fis } a,2)\p\shortfermata \breathe | %023 \sectionLabel \markup { \huge \box \sans \bold 24 } \omit Score.BarNumber \time 5/4 g,4(\f\> b des bes'2) | \undo \omit Score.BarNumber %024 + \tag #'part { \break } d4(\mf\> c ees4~\p ees2)\shortfermata \breathe | %025 d,4(\pp e2 ees4) g8(\< c, | %026 \time 2/2 aes'4)\p ges2(\< bes4 | %027 - a2)\mp cis4(\< e) | \tag #'part { \break \noPageBreak } %028 + a2)\mp cis4(\< e) | %028 + \tag #'part { \break } \time 3/2 \grace s8 g2~\mf g1\fermata \breathe | %029 \sectionLabel \markup { \huge \box \sans \bold 30 } \omit Score.BarNumber \time 5/4 cis,4(\< dis fis2)\f c4(\> | \undo \omit Score.BarNumber %030 \time 2/2 g2.)\mf\shortfermata \breathe a4(\> | %031 - \time 3/2 aes4 bes8) f8( e1)\p | %032 + \time 3/2 + << + { + aes4 bes8) f8( e1)\p | %032 + } + \tag #'part \new Staff \with { + alignAboveContext = "cl1" + \magnifyStaff #2/3 + } + \tag #'part { + \transpose c bes, \relative { + << + { + \voiceOne + \footnote \markup † #'(-1 . 1) \markup \tiny \left-column { + \line { † "Ossia cues in C" } \vspace #-0.4 + } + r2 \tuplet 3/2 { r4 r4 ges'4_( } \tuplet 3/2 { ees' des aes) } \once \omit Staff.TimeSignature | + } + \new Voice { + \voiceTwo + c,4 c4 \slashedGrace g'8~ 1 | + } + >> + } + } + >> + \tag #'part { \break } + \tag #'part { \pseudoIndents 0 65 } \time 2/2 d2--\> d2-- | %033 b1\pp\fermata \bar "|." %034 diff --git a/manuscripts/I-piano.ly b/manuscripts/I-piano.ly index 2e880f7..5790ddd 100644 --- a/manuscripts/I-piano.ly +++ b/manuscripts/I-piano.ly @@ -23,7 +23,7 @@ r1\shortfermata | %008 R1 | %009 r1\shortfermata | %010 - \time 5/4 \grace s8 R1*5/4 | %011 + \time 5/4 \slashedGrace s8 R1*5/4 | %011 \time 2/2 2->\mf r2 | %012 \time 5/4 des2~\mp des2.~ | %013 \time 2/2 des8 r8 r4 r2 | %014 @@ -31,7 +31,7 @@ r1\fermata | %016 R1 | %017 \time 7/4 r2. r2.\shortfermata r4 | %018 - \time 2/2 \grace s8 R1 | %019 + \time 2/2 \slashedGrace s8 R1 | %019 \time 3/2 R1*3/2 | %020 \time 2/2 r1\shortfermata | %021 \time 3/2 r2. r4 r4 4~\mp | %022 @@ -42,7 +42,7 @@ aes4(\< des4)\! | %026 \time 2/2 r2 \tuplet 3/2 { r4 f,4(\mp\< ees)\! } | %027 r4 r4 4(\< gis)\! | %028 - \time 3/2 \grace s8 r2 f1\p\fermata \breathe | %029 + \time 3/2 \slashedGrace s8 r2 f1\p\fermata \breathe | %029 \time 5/4 gis1\< bes4\! | %030 \time 2/2 r2\shortfermata r2 | %031 \time 3/2 r2 \tuplet 3/2 { r4 r4 ges4(\mp\> } \tuplet 3/2 { ees' des aes)\! } | %032 @@ -63,14 +63,14 @@ \time 2/2 2\(\p | %001 \> | %002 \time 3/2 1~ 4\)\pp r4 | %003 - \grace g8~ 2\(\p\< \grace ges8( 2) | %004 + \slashedGrace g8~ 2\(\p\< \slashedGrace ges8( 2) | %004 \time 5/4 2~\mp 2.\) | %005 - \grace d8~ 1\( 4\> | %006 + \slashedGrace d8~ 1\( 4\> | %006 \time 2/2 2 ~\p | %007 1\)\shortfermata | %008 - \grace ees'8~ 1\(\pp | %009 + \slashedGrace ees'8~ 1\(\pp | %009 1\)\shortfermata \breathe | %010 - \time 5/4 \grace c8~ 2.\( 2~\< | %011 + \time 5/4 \slashedGrace c8~ 2.\( 2~\< | %011 \time 2/2 2 ~\mf | %012 \time 5/4 4\) r4 r2. | %013 << @@ -80,11 +80,11 @@ } \new Voice { \voiceTwo - \time 2/2 e2 \grace f8~ f2 | %014(b) + \time 2/2 e2 \slashedGrace f8~ f2 | %014(b) } >> \oneVoice - \grace des'8~ 2 + \slashedGrace des'8~ 2 << { \voiceOne @@ -102,11 +102,11 @@ << { \voiceOne - \time 2/2 \grace s8 e1\(\< | %019 + \time 2/2 \slashedGrace s8 e1\(\< | %019 } \new Voice { \voiceTwo - \time 2/2 \grace g,8^~ g4( gis2.) | %019(b) + \time 2/2 \slashedGrace g,8^~ g4( gis2.) | %019(b) } >> \oneVoice @@ -114,7 +114,7 @@ << { \voiceOne - \grace d8~ d2\mf\> c4 + \slashedGrace d8~ d2\mf\> c4 } \new Voice{ \voiceTwo @@ -124,7 +124,7 @@ \oneVoice 4 | %20 \time 2/2 1\)\mp\shortfermata \breathe | %021 - \time 3/2 2.\(\pp\< \grace f8~ 4 2~\mp\> | %022 + \time 3/2 2.\(\pp\< \slashedGrace f8~ 4 2~\mp\> | %022 \time 2/2 2 2~\)\p\shortfermata | %023 \time 5/4 1 r4 | %024 r2. r2\shortfermata | %025 @@ -143,7 +143,7 @@ \oneVoice 2 | %027 1\mp | %028 - \time 3/2 \grace e8~ 2 1\)\pp\fermata \breathe | %029 + \time 3/2 \slashedGrace e8~ 2 1\)\pp\fermata \breathe | %029 \time 5/4 2\(\< 2\f\> 4 | %030 \time 2/2 2.\)\mf\shortfermata \breathe 4\(\> | %31 << @@ -157,7 +157,7 @@ } >> \oneVoice - \grace g'8~ 1\mp | %032 + \slashedGrace g'8~ 1\mp | %032 \time 2/2 2\> 2 | %033 1\)\pp\fermata \bar "|." | %034 @@ -178,7 +178,7 @@ d1\)\shortfermata | %008 f,1\( | %009 e1\)\shortfermata \breathe | %010 - \time 5/4 \grace s8 ges2.\( f2~ | %011 + \time 5/4 \slashedGrace s8 ges2.\( f2~ | %011 \time 2/2 f2 d2~ | %012 \time 5/4 d4\) r4 r2. | %013 \time 2/2 g2\( @@ -197,17 +197,17 @@ bes1\)\fermata \breathe | %016 bes1~\( | %017 \time 7/4 bes2. des,2.\)(\shortfermata d4) | %018 - \time 2/2 \grace s8 b'2\( fis4( a4 | %019 + \time 2/2 \slashedGrace s8 b'2\( fis4( a4 | %019 \time 3/2 b2) bes4( ges4 a4) gis4( | %020 \time 2/2 fis1)\)\shortfermata \breathe | %021 - \time 3/2 bes2.\( \grace a8~ a4 aes2~ | %022 + \time 3/2 bes2.\( \slashedGrace a8~ a4 aes2~ | %022 \time 2/2 aes2\) r2\shortfermata | %023 \time 5/4 R1*5/4 | %024 r2. r2\shortfermata | %025 b2\( a4 bes2 | %026 \time 2/2 b2 a2 | %027 g1 | %028 - \time 3/2 \grace s8 a2 bes1\)\fermata \breathe | %029\ + \time 3/2 \slashedGrace s8 a2 bes1\)\fermata \breathe | %029\ \time 5/4 fis4\( e2. f4 | %030 \time 2/2 e2.\)\shortfermata \breathe fis4\( | %031 \time 3/2 ees4( d4~ d2.) bes'4 | %032 @@ -233,7 +233,7 @@ R1 | %008 R1 | %009 R1 | %010 - \time 5/4 \grace s8 R1*5/4 | %011 + \time 5/4 \slashedGrace s8 R1*5/4 | %011 \time 2/2 a,,2->^\mp r2 | %012 \time 5/4 R1*5/4 | %013 \time 2/2 R1 | %014 @@ -241,7 +241,7 @@ r1\fermata | %016 R1 | %017 \time 7/4 r2. r2.\shortfermata r4 | %018 - \time 2/2 \grace s8 R1 | %019 + \time 2/2 \slashedGrace s8 R1 | %019 \time 3/2 R1*3/2 | %020 \time 2/2 r1\shortfermata | %021 \time 3/2 R1*3/2 | %022 @@ -251,7 +251,7 @@ R1*5/4 | %026 \time 2/2 R1 | %027 r4 b2.^\mp | %028 - \time 3/2 \grace s8 r2 r1\fermata | %029 + \time 3/2 \slashedGrace s8 r2 r1\fermata | %029 \time 5/4 R1*5/4 | %030 \time 2/2 R1*2/2 | %031 \time 3/2 R1*3/2 | %032 diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly index c7077dc..a982baf 100644 --- a/manuscripts/II-clarinet.ly +++ b/manuscripts/II-clarinet.ly @@ -1,6 +1,6 @@ % root = ../net-clarity.ly -\new Staff \with { +\new Staff = "cl2" \with { instrumentName = \markup { clarinet in \concat { \bold "B" \tiny \flat " " } } shortInstrumentName = \markup { cl } \override DynamicLineSpanner.staff-padding = \sods @@ -15,97 +15,185 @@ \tempo "Vivace" 4=168 \time 2/4 ces'4.\f ees8 | %001 \time 6/8 bes'8-. r8 r8 c,4. | %002 \time 3,2,2 7/8 d'4.\> a'8( cis8~\mp 4~ | %003 - \time 4/4 cis8) e,,,8 g'8-. r8 r8 aes,8~ aes4 | \tag #'part { \break \noPageBreak } %004 + \time 4/4 cis8) e,,,8 g'8-. r8 r8 aes,8~ aes4 | %004 + \tag #'part { \break \noPageBreak } f''4. ges8 a,,4.\f bes8( | %005 \time 6/8 f'8 d8-.) r8 c'4 e'8-. | %006 \time 9/8 \grace s8 fis,,,4.(\p cis'4.) ees'8-. r8 r8 | %007 - \time 3/4 g-. r8 b4( aes8-.) c,,->~\f | \tag #'part { \break \noPageBreak } %008 + \time 3/4 g-. r8 b4( aes8-.) c,,->~\f | %008 + \tag #'part { \break \noPageBreak } \time 4/4 c8 des'8~ des4 bes'8-. r8 r8 a,~ | %009 a8 e4 d''8-. aes,4\p ges' |%010 \time 3,2 5/8 f'8-. r8 r8 ees,,,8(\< g8~ | %011 - \time 3/4 g8) b'8 f,4->\f ges'4 | \tag #'part { \break \noPageBreak } %012 + \time 3/4 g8) b'8 f,4->\f ges'4 | %012 + \tag #'part { \break \noPageBreak } g''8 bes,,,4 a'4 aes'8-. | %013 \time 4/4 d,,,8\mp e''4 c'8-. r8 cis,,4\< b'8 | %014 ees'8--\f r8 f,,2\niente\< f4->\ff | %015 \sectionLabel \markup { \huge \box \sans \bold 16 } \omit Score.BarNumber - \time 3/4 des4(\psempre aes4) d8 c'8~ | \undo \omit Score.BarNumber \tag #'part { \break \noPageBreak } %016 + \time 3/4 des4(\psempre aes4) d8 c'8~ | \undo \omit Score.BarNumber %016 + \tag #'part { \break \noPageBreak } c8 b'4 bes,,8 a''4~ | %017 a8 ees4 ges,,4 g''8 | %018 e'4 \breathe d,4( f8) des'8 | %019 - c,,4 bes'4 ges'4 | \tag #'part { \break \noPageBreak } %020 + c,,4 bes'4 ges'4 | %020 + \tag #'part { \break \noPageBreak } aes,,8 g'4 a'4 b,,8( | %021 e,4) \breathe ees'8 d,4 b''8~ | %022 b8 c'8 bes,,4 des4~ | %023 - des8 f'4 \breathe ges,,8 aes'4 | \tag #'part { \break \pageTurn } %024 + des8 f'4 \breathe ges,,8 aes'4 | %024 + \tag #'part { \break \noPageBreak } ees''4 f,,,8 a4 e''8~ | %025 e4. ees,,8\< b'8 fis''8 | %026 e,,8 cis''8 a8 gis,4.\f | %027 - r8 f'8 r8 bes8( d4~ | \tag #'part { \break \noPageBreak } %028 - d4~ d8) r8 r8 aes'8~\mp | %029 + << + { + r8 f'8 r8 bes8( d4~ | %028 + \tag #'part { \break \pageTurn } + d4~ d8) r8 r8 aes'8~\mp | %029 - \sectionLabel \markup { \huge \box \sans \bold 30 } - \omit Score.BarNumber - aes2. | \undo \omit Score.BarNumber %030 - e8( g8-.) r8 d,8--\f fis,8-.\mp\< a8-. | %031 - d8( des f)\f bes,8-. fis'8->-- b'8(\p | %032 - ees,2.) | \tag #'part { \break \noPageBreak } %033 - f,,8-. c''8~\< c2~\f\> | %034 - c4 d,8-.\mp\< bes8( a4) | %035 - des8-.->\f g8-.-> des''8 ees,,,8( c'8) aes'-.-> | %036 - R1*3/4 | %037 - r4 r4 r8 e8-.-> | \tag #'part { \break \noPageBreak } %038 - a'4(\p fis8) b,,8~(\< b8 g8~ | %039 - g4) ees'8-.->\mf cis''8-- e,,,8(\< gis8) | %040 - b'8-.->\f r8 r4 r4 | %041 + \tag #'part { \once \override Staff.SectionLabel.stencil = ##f } + \sectionLabel \markup { \huge \box \sans \bold 30 } + \omit Score.BarNumber + aes2. | \undo \omit Score.BarNumber %030 + e8( g8-.) r8 d,8--\f fis,8-.\mp\< a8-. | %031 + d8( des f)\f bes,8-. fis'8->-- b'8(\p | %032 + ees,2.) | \tag #'part { \break \noPageBreak } %033 + f,,8-. c''8~\< c2~\f\> | %034 + c4 d,8-.\mp\< bes8( a4) | %035 + des8-.->\f g8-.-> des''8 ees,,,8( c'8) aes'-.-> | %036 + R1*3/4 | %037 + r4 r4 r8 e8-.-> | %038 + \tag #'part { \break \noPageBreak } + a'4(\p fis8) b,,8~(\< b8 g8~ | %039 + g4) ees'8-.->\mf cis''8-- e,,,8(\< gis8) | %040 + b'8-.->\f r8 r4 r4 | %041 - \sectionLabel \markup { \huge \box \sans \bold 42 } - \omit Score.BarNumber - d'8(\> f,8~ f2~\pp\< | \undo \omit Score.BarNumber %042 - f8)\f c,8~\p\< c8 b'8-.->\mf e4 | \tag #'part { \break \noPageBreak } %043 + \tag #'part { \once \override Staff.SectionLabel.stencil = ##f } + \sectionLabel \markup { \huge \box \sans \bold 42 } + \omit Score.BarNumber + d'8(\> f,8~ f2~\pp\< | \undo \omit Score.BarNumber %042 + f8)\f c,8~\p\< c8 b'8-.->\mf e4 | \tag #'part { \break \noPageBreak } %043 + } + \tag #'part \new Staff \with { + alignAboveContext = "cl2" + \magnifyStaff #2/3 + \consists Mark_engraver + } + \tag #'part { + \override Staff.SectionLabel.font-size = #2.5 + \transpose c bes, \relative { + \clef "bass" + c'8 r8 g8 r8 r4 | %O-028 + r4 r4 ees,4( | %O-029 + b2. | %O-030 + c4~ 8) d''8-. fis,8\laissezVibrer a8\laissezVibrer | %O-031 + r8 des8-. f-. bes,8\laissezVibrer ges'8-. r8 | %O-032 + r8 aes,,8~( 2 | %O-033 + f'8-.) r8 r4 r4 | %O-034 + \stopStaff s2. | %O-035 + s2 \startStaff c'8 8 | %O-036 + f2~ f8 f8-. | %O-037 + r4 r4 r8 des8-. | %O-038 + \omit Staff.Clef + \stopStaff s2. | %O-039 + s2. | %O-040 + s2. | %O-041 + \startStaff r8 \ottava #-1 a8~ a2~ | %O-042 + a8 \ottava #0 r8 r8 \undo \omit Staff.Clef \clef "treble" 8-. r4 | %O-043 + } + } + >> bes8-.->\f\< des,8-.-> ges,8-.-> c8-.->\! ees'4(\p | %044 f2.~ | %045 f4~ f8) r8 a,8(\f\< e8) | %046 aes,8-.->\! r8 r8 b''4.\p | %047 ees,,8\f\< g,8-.-> d8-.->\! bes'''4.~(\p | \tag #'part { \break \noPageBreak } %048 - bes4. a8) f,8-> r8 | %049 - a2.~(\pp\< | %050 - a2.~ | %051 - a4.\mf bes,8-.) r4 | %052 - ees4 ees8-. r8 b'8-. e,8~( | %053 - e4 f,8-.) r8 r4 | \tag #'part { \break \pageTurn } %054 - R1*3/4*2 | %055-056 + << + { + bes4. a8) f,8-> r8 | %049 + a2.~(\pp\< | %050 + a2.~ | %051 + a4.\mf bes,8-.) r4 | %052 + ees4 ees8-. r8 b'8-. e,8~( | %053 + e4 f,8-.) r8 r4 | \tag #'part { \break \pageTurn } %054 + R1*3/4*2 | %055-056 - \sectionLabel \markup { \huge \box \sans \bold 57 } - \omit Score.BarNumber - R1*3/4 | \undo \omit Score.BarNumber %057 - bes''8-.\mf bes8~\p bes2 | %058 - ees,->(\mf des'8-.) r8 | %059 - r8 des8-.\p r8 b8-.\mf b4~\p | %060 - b4 fis'2~->( | \tag #'part { \break \noPageBreak } %061 - fis2~ fis8 a,8-.)\> | %062 - r8 a8-. r4 ees8-. r8 | %063 + \tag #'part { \once \override Staff.SectionLabel.stencil = ##f } + \sectionLabel \markup { \huge \box \sans \bold 57 } + \omit Score.BarNumber + R1*3/4 | \undo \omit Score.BarNumber %057 + bes''8-.\mf bes8~\p bes2 | %058 + ees,->(\mf des'8-.) r8 | %059 + \tag #'part { \break \noPageBreak } + r8 des8-.\p r8 b8-.\mf b4~\p | %060 + b4 fis'2~->( | %061 + fis2~ fis8 a,8-.)\> | %062 + r8 a8-. r4 ees8-. r8 | %063 + } + \tag #'part \new Staff \with { + alignAboveContext = "cl2" + \magnifyStaff #2/3 + \consists Mark_engraver + } + \tag #'part { + \override Staff.SectionLabel.font-size = #2.5 + \transpose c bes, \relative { + \clef "treble" r4 8-. r8 8-. r8 | %O-049 + r4 \ottava #-1 e,( f,8-.) \ottava #0 c''''8~ | %O-050 + c8 \ottava #-1 b,,,8-. \ottava #0 c'''8 d,4 g,8~ | %O-051 + g8 cis'8-. g,4( fis'4~ | %O-052 + fis8) fis8( aes,8-.) r8 r4 | %O-053 + ees,8 r8 8 b4\laissezVibrer g''8\laissezVibrer | %O-054 + r8 \ottava #-1 bes,,,,8\laissezVibrer \ottava #0 aes'''4\laissezVibrer d,,4\laissezVibrer | %O-055 + r8 a8-. cis'8-. r8 fis'8-. r8 | %O-056 + \clef "bass" e,,,,8-. d'4( g,8-.) r8 \clef "treble" b''8-. | %O-057 + r8 f''8-. r8 ges,,4\laissezVibrer ees'8~ | %O-058 + 4 c'8-. r8 c8-. r8 | %O-059 + r8 8-. r4 cis,8-. r8 | %O-060 + \ottava #-1 dis,,8-. \ottava #0 r8 r8 gis''4\laissezVibrer e'8-. | %O-061 + ais,,8-. r8 8( f,8-.) r4 | %O-062 + r8 g''4( d'8) r4 | %O-063 + } + } + >> ees8-.\p r8 r4 r4 | %064 + \tag #'part { \break \noPageBreak } r8 c'8~\< c4~ c8 c8( | %065 - f,8-.)\f bes8-.\mp r8 aes'4(\f des,8-.) | \tag #'part { \break \noPageBreak } %066 + f,8-.)\f bes8-.\mp r8 aes'4(\f des,8-.) | %066 r8 g,,8--\p g8-. r8 r4 | %067 g8-. r8 d4->--\< b''8-. d,,( | %068 e'8-.) r8 fis'8(\f a,8-.) r4 | %069 + \tag #'part { \break \noPageBreak } \sectionLabel \markup { \huge \box \sans \bold 70 } \omit Score.BarNumber a8-.-> r8 a,4~\niente\< a8 c'8-.->\f | \undo \omit Score.BarNumber %070 - a,2\niente\< e'8-.->\f a,~(\mp\< | \tag #'part { \break \noPageBreak } %071 + a,2\niente\< e'8-.->\f a,~(\mp\< | %071 a8 cis4 f4.)\f | %072 - aes,8-.-> r8 r4 r4 | %073 - r8 b'8( dis,8) e,,8( c') d'8-.-> | %074 + << + { + aes,8-.-> r8 r4 \voiceOne r4 | %073 + r8 + } + \tag #'part { + \new CueVoice \relative { + s4 \cueClef "bass" bes4\laissezVibrer ees,8\laissezVibrer b\laissezVibrer | + des,8\laissezVibrer + } + } + >> + \oneVoice \cueClefUnset b'8( dis,8) e,,8( c') d'8-.-> | %074 + \tag #'part { \break \noPageBreak } d2.\pp | %075 - g8-.-> d8~ d4~ d8 d8-. | \tag #'part { \break \noPageBreak } %076 + g8-.-> d8~ d4~ d8 d8-. | %076 aes,8--\mf\< d'8-. fis-. bes-.\f b,,8-- c'-- | %077 r4 ees,,8->-- des''8-. f8-.-> g,,8---> | %078 e''8-.-> f8~\pp\< f4~ f8 f8-. | %079 - f8-.\mf gis8-. a2\> | \tag #'part { \break \noPageBreak } %080 + \tag #'part { \break \noPageBreak } + f8-.\mf gis8-. a2\> | %080 a8-.\p\< a8-. a8( b,8-.)\f d8-. des,8---> | %081 b'4 b8-. f8 ees'8-- fis8-.-> | %082 ees8-. ees8-. a,8( f'4\> bes,8-.)\mp | %083 @@ -113,28 +201,74 @@ \sectionLabel \markup { \huge \box \sans \bold 84 } \omit Score.BarNumber \time 4/4 bes8-.\mf\< ces8( des ees)\f c8-.\p r8 r4 | \undo \omit Score.BarNumber \tag #'part { \break \pageTurn } %084 - c8-. c8(\< d8 e8)\mf r4 r8 e8-. | %085 - \time 3/4 r8 e8-. f8( g8) g8( a~ | %086 - a8) \slashedGrace e8^( b'8)--\mp \grace ees,8^( c8\f d8-.) r8 d8-.-> | %087 - r8 \slashedGrace ces'8^( des,8\p ees8-.) ees8-. \grace d8^( e4->)\f | \tag #'part { \break \noPageBreak } %088 - \slashedGrace a8^( fis8)\p\< fis8-. fis( gis8) gis8( ais8~ | %089 - ais4) r8 ais8(\f b8-.) r8 | %090 - b8( cis8~ cis4)\> r8 des( | %091 - ees8) ees8-.\mf \slashedGrace e,8^( f'4.)\ff f8-.\> | %092 - f8-. f8-. f8-. ges8--\mf\< ges8-. ges( | \tag #'part { \break \noPageBreak } %093 - \time 3 3/8 aes8) \slashedGrace f8^( g8\ff a,8~ | %094 - \time 3/4 \pocAce a8)\startTextSpan \slashedGrace aes'8^( bes,8~ bes4.) bes8-.\> | %095 - bes8-. bes8-. bes8-. bes8-. bes8-.\mp \slashedGrace ees8^( c8\f | %096 - d8-.) r8 d8-. d8-. d8( e8-.) | %097 - \slashedGrace bes8^( f8)\mf f'8-. f8( g8-.) g8-.\< g8( | \tag #'part { \break \noPageBreak } %098 - \time 3 3/8 a8-.) a8-. a8-.\stopTextSpan \tempo 4=174 | %099 - \time 3/4 \slashedGrace a,8^( ges'8\ff aes8-.) aes8-. aes8( bes-.) r8 - \bar "||" %100 + << + { + c8-. c8(\< d8 e8)\mf r4 r8 e8-. | %085 + \time 3/4 r8 e8-. f8( g8) g8( a~ | %086 + a8) \slashedGrace e8^( b'8)--\mp \grace ees,8^( c8\f d8-.) r8 d8-.-> | %087 + r8 \slashedGrace ces'8^( des,8\p ees8-.) ees8-. \grace d8^( e4->)\f | \tag #'part { \break \noPageBreak } %088 + \slashedGrace a8^( fis8)\p\< fis8-. fis( gis8) gis8( ais8~ | %089 + ais4) r8 ais8(\f b8-.) r8 | %090 + b8( cis8~ cis4)\> r8 des( | %091 + ees8) ees8-.\mf \slashedGrace e,8^( f'4.)\ff f8-.\> | %092 + f8-. f8-. f8-. ges8--\mf\< ges8-. ges( | \tag #'part { \break \noPageBreak } %093 + \time 3 3/8 aes8) \slashedGrace f8^( g8\ff a,8~ | %094 + \time 3/4 \pocAce a8)\startTextSpan \slashedGrace aes'8^( bes,8~ bes4.) bes8-.\> | %095 + bes8-. bes8-. bes8-. bes8-. bes8-.\mp \slashedGrace ees8^( c8\f | %096 + d8-.) r8 d8-. d8-. d8( e8-.) | %097 + \slashedGrace bes8^( f8)\mf f'8-. f8( g8-.) g8-.\< g8( | \tag #'part { \break \noPageBreak } %098 + \time 3 3/8 a8-.) a8-. a8-.\stopTextSpan \tempo 4=174 | %099 + \time 3/4 \slashedGrace a,8^( ges'8\ff aes8-.) aes8-. aes8( bes-.) r8 + \bar "||" %100 + } + \tag #'part \new Staff \with { + alignAboveContext = "cl2" + \magnifyStaff #2/3 + \consists Mark_engraver + } + \tag #'part { + \override Staff.SectionLabel.font-size = #2.5 + \transpose c bes, \relative { + 8-. r8 8-. r8 r8 ges'8( aes8) aes( | %O-085 + bes) r8 8-. 8-. r8 8-. | %O-086 + r4 r8 bes8-. r8 f'8~ | %O-087 + f2.\laissezVibrer | %O-088 + 8-. r8 r8 8-. f'8 bes,8-. | %O-089 + f'8( g8 a8) 8-. 8-. r8 | %O-090 + r8 4 a8( c) r8 | %O-091 + \ottava #1 4 c8( d) d-. d( | %O-092 + e4) e8-. e8-. \tuplet 3/2 { 8 } | %O-093 + \time 3/8 8-. r8 r8 | %O-094 + \time 3/4 e4 b8-. b8-. b( cis~ | %O-095 + cis8) cis8( dis) dis-. dis-. 8-. | %O-096 + 8-. ees8-. 8-. 8-. 8-. 8-. | %O-098 + r4 \tuplet 3/2 { r8 r8 d8 } \tuplet 3/2 { } | %O-099 + \time 3/8 8-. r8 r8 | %O-100 + << + { + \time 3/4 \grace s8 \tuplet 3/2 { r8 ges,8 8 } \tuplet 3/2 { 8 8 } 8-. + } + \new Voice { + \override ClusterSpanner.style = #'centered-stairs + \grace s8 s4 \tuplet 3/2 { s8 \makeClusters { 32 32 s32 } s8 } + } + \new Voice { + \override ClusterSpanner.style = #'centered-stairs + \grace s8 s4 \tuplet 3/2 { s8 s8 \makeClusters { 32 g32 32 s32 } } + } + \new Voice { + \override ClusterSpanner.style = #'centered-stairs + \grace s8 s4 \tuplet 3/2 { s8 s8 s } \makeClusters { 32 32 } + } + >> + } + } + >> \sectionLabel \markup { \huge \box \sans \bold 101 } \tweak self-alignment-X #CENTER \textEndMark \markup { \concat { \rhythm { \tuplet 3/2 { 8 } } " = " \rhythm { { 8 } } } } \omit Score.BarNumber - \tempo "Prestissimo" 4=232 + \tempo \markup { \hspace #3.5 "Prestissimo" } 4=232 \time 4/4 R1*6 | \undo \omit Score.BarNumber \rit \after 4. \startTextSpan R1 | r2 r4 r8 f,,,8~\niente\<\stopTextSpan | \tag #'part { \break \noPageBreak } %108 diff --git a/manuscripts/II-piano.ly b/manuscripts/II-piano.ly index d88457d..a5ccbd6 100644 --- a/manuscripts/II-piano.ly +++ b/manuscripts/II-piano.ly @@ -186,7 +186,7 @@ \sectionLabel \markup { \huge \box \sans \bold 101 } \tweak self-alignment-X #CENTER \textEndMark \markup { \concat { \rhythm { \tuplet 3/2 { 8 } } " = " \rhythm { { 8 } } } } \omit Score.BarNumber - \tempo "Prestissimo" 4=232 + \tempo \markup { \hspace #3.5 "Prestissimo" } 4=232 \time 4/4 \stemNeutral g,,,,,8-.\ff r8 ees8( c8) r8 a'8( f'8-.) r8 | \undo \omit Score.BarNumber %101 b,,8-- gis'8-. e8-. fis'8 r8 a,,8-. d8( des8 | %102 bes8) r8 aes''8 r8 f,8 ges8-. r4 | %103 diff --git a/net-clarity.ly b/net-clarity.ly index de9e3cc..1ef1ddb 100644 --- a/net-clarity.ly +++ b/net-clarity.ly @@ -163,7 +163,7 @@ clarinetMagstep = #(magstep -2) \left-column { \override #'(line-width . 90) \line { \hspace #90 } - \justify { \sans \italic 1. \hspace #1 Accidentals carry through each bar – cautionary accidentals are not supplied. } + \justify { \sans \italic 1. \hspace #1 Accidentals carry through each bar – cautionary accidentals added for clarification. } \override #'(line-width . 90) \justify { \sans \italic 2. \hspace #1 Two fermata notations are used: a \italic short fermata ( \musicglyph "scripts.ushortfermata" ) and a \italic long fermata ( \musicglyph "scripts.ufermata" ). } \override #'(line-width . 90) @@ -207,6 +207,7 @@ clarinetMagstep = #(magstep -2) composer = \xcomp poet = \markup { \xinst } piece = \markup { \large \bold "I. " } + arranger = \markup { \tiny \typewriter \shortHash } } \tocItem \markup { "I. " \bold "Grave, molto rubato" } \score { diff --git a/parts.ly b/parts.ly index dc5a38d..677c36a 100644 --- a/parts.ly +++ b/parts.ly @@ -17,7 +17,7 @@ clarinetMagstep = #(magstep 0) composer = \xcomp poet = \markup { \xinst } piece = \markup { \bold "I. " } - arranger = \markup { \typewriter \shortHash } + arranger = \markup { \tiny \typewriter \shortHash } } \tocItem \markup { "I. " } \score { @@ -29,8 +29,15 @@ clarinetMagstep = #(magstep 0) \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) + \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 @@ -40,6 +47,10 @@ clarinetMagstep = #(magstep 0) } } + \pageBreak + \markup { \vspace #2 } + \pageBreak + \bookpart { \header { piece = \markup { \bold "II. " } @@ -58,10 +69,17 @@ clarinetMagstep = #(magstep 0) \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 } } } @@ -82,6 +100,7 @@ clarinetMagstep = #(magstep 0) \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 -- 2.39.5