From: tuckerjohnson Date: Sun, 25 Dec 2022 07:30:19 +0000 (-0500) Subject: more holiday work X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=bcf2ce54c093a224f9649424687d8dd96d799e5b;p=circumnutation.git more holiday work --- diff --git a/eng-files/paper.ly b/eng-files/paper.ly index ce5fef9..89c4df8 100644 --- a/eng-files/paper.ly +++ b/eng-files/paper.ly @@ -6,36 +6,22 @@ oddHeaderMarkup = \markup { \tiny { " " } } evenHeaderMarkup = \markup { \tiny { " " } } oddFooterMarkup = \markup { - \concat { \on-the-fly #(on-page 3) \fill-line { \null \xcr \null } } - \concat { \on-the-fly #(on-page 5) \oddfoot } - \concat { \on-the-fly #(on-page 7) \oddfoot } - \concat { \on-the-fly #(on-page 9) \oddfoot } - \concat { \on-the-fly #(on-page 11) \oddfoot } - \concat { \on-the-fly #(on-page 13) \null } - \concat { \on-the-fly #(on-page 15) \oddfoot } - \concat { \on-the-fly #(on-page 17) \oddfoot } - \concat { \on-the-fly #(on-page 19) \oddfoot } - \concat { \on-the-fly #(on-page 21) \oddfoot } - \concat { \on-the-fly #(on-page 23) \oddfoot } - \concat { \on-the-fly #(on-page 25) \oddfoot } - \concat { \on-the-fly #(on-page 27) \oddfoot } - } + \concat { \if \on-page #3 \fill-line { \null \xcr \null } } + \concat { \if \on-page #5 \oddfoot } + \concat { \if \on-page #7 \oddfoot } + \concat { \if \on-page #9 \oddfoot } + \concat { \if \on-page #11 \oddfoot } + \concat { \if \on-page #13 \null } + } evenFooterMarkup = \markup { - \concat { \on-the-fly #(on-page 2) \evfoot } - \concat { \on-the-fly #(on-page 4) \evfoot } - \concat { \on-the-fly #(on-page 6) \evfoot } - \concat { \on-the-fly #(on-page 8) \evfoot } - \concat { \on-the-fly #(on-page 10) \evfoot } - \concat { \on-the-fly #(on-page 12) \null } - \concat { \on-the-fly #(on-page 14) \null } - \concat { \on-the-fly #(on-page 16) \evfoot } - \concat { \on-the-fly #(on-page 18) \evfoot } - \concat { \on-the-fly #(on-page 20) \evfoot } - \concat { \on-the-fly #(on-page 22) \evfoot } - \concat { \on-the-fly #(on-page 24) \evfoot } - \concat { \on-the-fly #(on-page 26) \evfoot } - \concat { \on-the-fly #(on-page 28) \evfoot } - } + \concat { \if \on-page #2 \evfoot } + \concat { \if \on-page #4 \evfoot } + \concat { \if \on-page #6 \evfoot } + \concat { \if \on-page #8 \evfoot } + \concat { \if \on-page #10 \evfoot } + \concat { \if \on-page #12 \null } + \concat { \if \on-page #14 \null } + } #(set-paper-size "letter") print-all-headers = ##t top-margin = 0.8\cm diff --git a/manuscripts/1i.ly b/manuscripts/1i.ly index 10a4f8a..fe6bc2e 100644 --- a/manuscripts/1i.ly +++ b/manuscripts/1i.ly @@ -6,7 +6,7 @@ \new Staff = "ui1" { \accidentalStyle modern << - \relative { \tmarkione + \relative { \tempo Vivace 4=136 \omit Staff.BarLine \override Staff.BarLine.allow-span-bar = ##f \time 28/16 s16^\markup { \smaller \italic "volante; non legato" } s16 s16 s16 s16 s16 s16 diff --git a/manuscripts/2i.ly b/manuscripts/2i.ly index a7f061e..bc877d0 100644 --- a/manuscripts/2i.ly +++ b/manuscripts/2i.ly @@ -5,7 +5,7 @@ \new Staff = "ui2" { \accidentalStyle modern << -\relative { \override Score.MetronomeMark.padding = #2.2 \tmarktthree +\relative { \override Score.MetronomeMark.padding = #2.2 \tempo Presto 4=168 \override DynamicLineSpanner.staff-padding = \phds \time 7/8 d'8[\offset Y-offset 2^\markup { \smaller \italic "bruscamente" } e-- \change Staff = "di2" fis,-.-> \change Staff = "ui2" g'( a) \change Staff = "di2" b,-- \change Staff = "ui2" cis']( | ees[ f) \change Staff = "di2" aes,,-- \change Staff = "ui2" bes''( c) \change Staff = "di2" g,,-- d-.->] | diff --git a/manuscripts/8i.ly b/manuscripts/8i.ly index 67cceab..cad6bc5 100644 --- a/manuscripts/8i.ly +++ b/manuscripts/8i.ly @@ -5,15 +5,24 @@ \new Staff = "u" { \accidentalStyle modern << -\relative { \override Score.MetronomeMark.padding = #2.2 \tmarktthree +\relative { \override Score.MetronomeMark.padding = #2.2 \tempo Presto 4=154 \override DynamicLineSpanner.staff-padding = \phds -\time 7/8 \stemUp r4 r4 r4 f''8-.-> | -r4 r4 r8 c8-.-> r8 | -a'8-.-> r8 r4 r4. | -s8 r8 r8 d,-.-> s4. | -s2 r8 e8-.-> r8 | -r8 g-.-> r4 r4. | -r4 r4 r8 cis-.-> r8 | +\time 7/8 \stemUp r4 r4 r4 f''8^.^> | +r4 r4 r8 c8^.^> r8 | +a'8^.^> r8 r4 r4. | +s8 r8 r8 d,^.^> s4. | +s2 r8 e8^.^> r8 | +r8 g^.^> r4 r4. | +r4 r4 r8 cis^.^> r8 | +r8 bes8^.^> r4 r4. | +aes8^.^> r8 r4 r4. | +r4 r4 r4 ees8^.^> | +r8 fis8^.^> r8^"poco rit." s4. r8 | +b8^.^> r8 r8 s8 s4. | +\bar "||" +\tempo "Poco meno mosso" 4=144 +f8^.^> s8 s4 s4. | +s4 s4 s4 c8^.^> | \bar "|." } >> @@ -21,7 +30,7 @@ r4 r4 r8 cis-.-> r8 | \new Staff = "d" { \clef bass \accidentalStyle modern << -\relative { \override Score.MetronomeMark.padding = #2.2 \tmarktthree +\relative { \override Score.MetronomeMark.padding = #2.2 \override DynamicLineSpanner.staff-padding = \phds \time 7/8 \stemUp a4^( e8[ g8)] s4. | r8 aes4( ges4. f8)-. | @@ -29,10 +38,18 @@ s4 s4 s4. | s4 s8 s8 \stemDown \change Staff = "u" c'4. | dis2^( \change Staff = "d" gis,4 fis8) | g4( e8[) f-.] s4. | +\stemUp s4 s4 s4 cis,8_. | +\change Staff = "u" \stemDown c''4_( d2 \change Staff = "d" \stemUp a8) | +r4 fis4( e8-.) s4 | +f8[_. c,_. aes''_. d,,_. g'_. bes,_.] r8 | +\stemDown b'8-. \change Staff = "u" \stemUp s8 s8 c4_( d8) s8 | +s8 s8 s8 des8_( bes4 ees8)\fermata | +\change Staff = "d" s8 \stemDown a,,[^. c'^. e,,^. b''^. g,^. \change Staff = "u" d'']^. | +des[^. \change Staff = "d" aes,^. \change Staff = "u" ees''^. \change Staff = "d" ges,,^. bes'^. f,]^. s8 | \bar "|." } \\ -\relative { \tmarktthree \set tieWaitForNote = ##t \override TimeSignature.stencil = ##f +\relative { \set tieWaitForNote = ##t \override TimeSignature.stencil = ##f \override DynamicLineSpanner.staff-padding = #7 \time 7/8 \stemDown r8 c,4._( d8[ b'8]) r8 | des,4( ees4 bes8) s4 | @@ -40,6 +57,13 @@ r8 \stemNeutral e8[^. cis''^. gis,^. d''^. fis,,^. b'^.] | \change Staff = "u" ees8[^. \change Staff = "d" g,,-. bes'-.] \stemDown r4 a,8([ f]) | r8 ais8[_( b cis,]) s4. | s4 s4 bes'8[^. c,^. d^.] | +fis'8^.[ b,^. dis'^. ais,^. gis']^. r8 s8 | +r4 r8 f,8([ g e)] r8 | +r8 dis4( b'4 cis,8-.[) a''8^.] | +s4 s4 s4. | +s8 r8 e,4^( a g8) | +r8 aes8^( f4. ges8) s8 | +r8 s8 s4 s4. | } >> } diff --git a/variables/a version number.ly b/variables/a version number.ly index 7ab9f28..36c9bed 100644 --- a/variables/a version number.ly +++ b/variables/a version number.ly @@ -1 +1 @@ -\version "2.22.2" +\version "2.24.0"