reformat

diff --git a/book.ly b/book.ly
index bcd3344e59d37c8c25b43c02637ec72a15caf780..1b3c5aa6b3dd386b7f5e95293047af0a5357e366 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -12,99 +12,71 @@
        tagline = ##f
 }
 
+\tocItem \markup { "1.   Vivace" }
 \score {
 \header {
 title = \markup { \fontsize #1 \xtitle }
 subtitle = \markup { \medium \italic \xsub }
 composer = \xcomp
-poet = \markup { \xinst }
-piece = \markup { \large { \bold "pappus" } }
 }
 \include "manuscripts/1i.ly"
 }
 
 
+\tocItem \markup { "2.   Presto" }
 \score {
-\header {
-piece = \markup { \large { \bold "panicle" \number 1 } }
-}
 \include "manuscripts/2i.ly"
 }
 
+\tocItem \markup { "3.   Allegro moderato" }
 \score {
-\header {
-piece = \markup { \large { \bold "pinnate" \number 1 } }
-}
 \include "manuscripts/3i.ly"
 }
 
+\tocItem \markup { "4.   Largo" }
 \score {
-\header {
-piece = \markup { \large { \bold "anisomery" \number 1 } }
-}
 \include "manuscripts/4i.ly"
 }
 
+\tocItem \markup { "6.   Tempo giusto" }
 \score {
-\header {
-piece = \markup { \large { \bold "cyme" \number 1 } }
-}
 \include "manuscripts/6i.ly"
 }
 
+\tocItem \markup { "7.   Allegro moderato" }
 \score {
-\header {
-piece = \markup { \large { \bold "pinnate" \number 2 } }
-}
 \include "manuscripts/7i.ly"
 }
 
+\tocItem \markup { "8.   Presto" }
 \score {
-\header {
-piece = \markup { \large { \bold "panicle" \number 3 } }
-}
 \include "manuscripts/8i.ly"
 }
 
+
+\tocItem \markup { "9.   Largo" }
 \score {
-\header {
-piece = \markup { \large { \bold "anisomery" \number 2 } }
-}
 \include "manuscripts/9i.ly"
 }
 
+\tocItem \markup { "11.   Tempo giusto" }
 \score {
-\header {
-piece = \markup { \large { \bold "cyme" \number 2 } }
-}
 \include "manuscripts/11i.ly"
 }
 
+\tocItem \markup { "12.   Tempo giusto" }
 \score {
-\header {
-piece = \markup { \large { \bold "cyme" \number 3 } }
-}
 \include "manuscripts/12i.ly"
 }
 
+\tocItem \markup { "13.   Con moto" }
 \score {
-\header {
-piece = \markup { \large { \bold "pinnate" \number 3 } }
-}
 \include "manuscripts/13i.ly"
 }
 
-\score {
-\header {
-piece = \markup { \large { \bold "umbel" } }
-}
-\include "manuscripts/14i.ly"
-}
 
+\tocItem \markup { "15.   Poco rubato" }
 \score {
-\header {
-piece = \markup { \large { \bold "circumnutation" } }
-}
 \include "manuscripts/15i.ly"
 }
   \markup { \null }

diff --git a/eng-files/paper.ly b/eng-files/paper.ly
index 89c4df8b541a9c945ddbd49bd60fd80a9f394afb..e459b0683a4c0d3e5a7c53489f3da36c3081dd0f 100644 (file)
--- a/eng-files/paper.ly
+++ b/eng-files/paper.ly
@@ -1,6 +1,7 @@
 %fifteen inventions project
 %------paper-block------
 \paper {
+  #(include-special-characters)
   first-page-number = -1
   print-page-number = ##f
        oddHeaderMarkup = \markup { \tiny { "  " } }
@@ -11,7 +12,7 @@
       \concat { \if \on-page #7 \oddfoot }
       \concat { \if \on-page #9 \oddfoot }
       \concat { \if \on-page #11 \oddfoot }
-      \concat { \if \on-page #13 \null }
+      \concat { \if \on-page #13 \oddfoot }
           }
   evenFooterMarkup = \markup {
       \concat { \if \on-page #2 \evfoot }
@@ -19,8 +20,8 @@
       \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 }
+      \concat { \if \on-page #12 \evfoot }
+      \concat { \if \on-page #14 \evfoot }
           }
 #(set-paper-size "letter")
         print-all-headers = ##t

diff --git a/front-matter/front matter.ly b/front-matter/front matter.ly
index fdbde3af3258950132efa8ef49d3e43373ee716b..f6e58fc874133e0acd43dc79c40d88d9d3ed13a2 100644 (file)
--- a/front-matter/front matter.ly
+++ b/front-matter/front matter.ly
@@ -2,44 +2,34 @@
 front-matter = \markuplist {
  \fill-line {
    \left-column {
-     \line { \bold \xtitle " [2022]" }
+     \line { \bold \xtitle \concat { " [" \xyear "]" } }
      \line { \xinst " | " \xdur }
      \line { \xcomp }
      \vspace #25
 
    }
    \center-column {
+     \fill-line {
+       \column {\null}
+       \center-column {
+         \vspace #7
+         \line { \hbracket \bold "program notes" }
+         \vspace #0.2
+         \xpnote
+         \vspace #0.5
+         \line { ================================= }
+         \vspace #0.5
+         \line { \hbracket \bold "inventions" }
+         \vspace #0.2
+         \table-of-contents
+         \null
+         \line { ================================= }
+         \vspace #1.5
+       }
 
-     \vspace #7
-     \line { \hbracket \bold "program notes" }
-      \vspace #0.2
-      \xpnote
-      \vspace #0.5
-      \line { ================================= }
-      \fill-line { \column { \null }
-                \left-column {
-                             \line { \bold "pappus" }
-                             \line { \bold "panicle 1" }
-                             \line { \bold "pinnate 1" }
-                             \line { \bold "anisomery 1" }
-                             \line { \bold "panicle 2" }
-                             \line { \bold "cyme 1" }
-                             \line { \bold "pinnate 2" }
-                             \line { \bold "panicle 3" }
-                             \line { \bold "anisomery 2" }
-                             \line { \bold "panicle 4" }
-                             \line { \bold "cyme 2" }
-                             \line { \bold "cyme 3" }
-                             \line { \bold "pinnate 3" }
-                             \line { \bold "umbel" }
-                             \line { \bold "circumnutation" }
-                }
-                \column { \null }
-        }
-      \vspace #0.5
-      \line { ================================= }
-      \vspace #1.5
+      \column {\null}
        }
   }
-   \column { \null }
+   \right-column { \vspace #2 }
   }
+}

diff --git a/front-matter/inside cover.ly b/front-matter/inside cover.ly
index 6fe3e27a4cc191018202f6988e11c12b8e8f3ba1..ec95afc458880bf75394075ee76d1edda23adf0f 100644 (file)
--- a/front-matter/inside cover.ly
+++ b/front-matter/inside cover.ly
@@ -5,13 +5,13 @@ cover =  \markuplist {
         \line { \null }
         \center-column {
             \vspace #10
-            \line { \hbracket \fontsize #10 \number 2022 }
-            \vspace #4
+            \line { \hbracket \fontsize #10 \number \xyear }
+            \vspace #4.5
             \line { \xcomp  }
             \vspace #1
             \line { \fontsize #5 \bold  \xtitle }
             \line { \italic \xsub }
-            \vspace #4
+            \vspace #8
           }
         \right-column {
             \line { \null }

diff --git a/front-matter/outside cover.ly b/front-matter/outside cover.ly
index 350ac740db76d22a3eecda4405ed45b706e93ccf..f8eafd57948eb099c3f55ad27dff5e4b9e094f75 100644 (file)
--- a/front-matter/outside cover.ly
+++ b/front-matter/outside cover.ly
@@ -22,7 +22,7 @@ outcover = \markuplist {
            \vspace #-0.1
             \line { \fontsize #3 \sans \xcomp }
            \vspace #3
-           \line { \fontsize #2 \sans \concat { "for " \xinst } }
+           \line { \fontsize #2 \sans \concat { \xsub } }
       }
     }
     \vspace #23
@@ -32,37 +32,9 @@ outcover = \markuplist {
       \line { \null }
       \line { \null }
       \center-column {
-       \path #0.1
-       #'((moveto 0 0)
-          (curveto 1 0.3 3.6 1 4.2 1.6)
-          (moveto 0 0)
-          (curveto -1 0.3 -3.6 1 -4.2 1.6)
-          (moveto 0 0)
-          (curveto 0.9 0.3 2.9 1 3.5 1.7)
-          (moveto 0 0)
-          (curveto -0.9 0.3 -2.9 1 -3.5 1.7)
-          (moveto 0 0)
-          (curveto 0.8 0.3 2.2 1 2.8 1.8)
-          (moveto 0 0)
-          (curveto -0.8 0.3 -2.2 1 -2.8 1.8)
-          (moveto 0 0)
-          (curveto 0.6 0.3 1.5 1 2.1 1.9)
-          (moveto 0 0)
-          (curveto -0.6 0.3 -1.5 1 -2.1 1.9)
-          (moveto 0 0)
-          (curveto 0.4 0.3 0.8 1 1.4 2)
-          (moveto 0 0)
-          (curveto -0.4 0.3 -0.8 1 -1.4 2)
-          (moveto 0 0)
-          (curveto 0.2 0.3 0.5 1 0.7 2.1)
-          (moveto 0 0)
-          (curveto -0.2 0.3 -0.5 1 -0.7 2.1)
-          (moveto 0 0)
-          (lineto 0 2.2))
-       \vspace #-0.035
-       \override #'(height . 0.25) \draw-squiggle-line #1 #'(0 . 5) ##f
-       \vspace #-0.275
-         \line { \fontsize #1 \hbracket \sans \bold "  umbel press  " }
+       \xumbel
+       \vspace #0.3
+         \line { \fontsize #1 \hbracket \sans \bold "  umbel press " \char ##x00A9 }
       }
       \line { \null }
     }

diff --git a/manuscripts/11i.ly b/manuscripts/11i.ly
index 9d2f042930eb6f8b9b30b36924a5d24d9c19cff1..43dcfe01d5acfe690e3e75f967b3b407adcb60db 100644 (file)
--- a/manuscripts/11i.ly
+++ b/manuscripts/11i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 11 }
+}
+  <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "ui6" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
 \time 3/4 a''2.~^\markup { \smaller \italic "spianato" } |
@@ -70,7 +73,7 @@ d4~(\p\< d8 a8~ a4 |
 >>
 }
 \new Staff = "di6" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
 \override DynamicLineSpanner.staff-padding = \phds

diff --git a/manuscripts/12i.ly b/manuscripts/12i.ly
index 492bdfd867832fb0ffaf16dd279f8ceee22a78b7..87ea29e547274f97cb8d061abcfcb5da7c97e7ef 100644 (file)
--- a/manuscripts/12i.ly
+++ b/manuscripts/12i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 12 }
+}
+  <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "ui6" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktfourb \numericTimeSignature \override Hairpin.to-barline = ##f
 \time 2/4 s2^\markup { \smaller \italic "spianato; piu enfatico" } |
@@ -70,7 +73,7 @@ fis2.( |
 >>
 }
 \new Staff = "di6" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktfourb \numericTimeSignature \override Hairpin.to-barline = ##f
 \override DynamicLineSpanner.staff-padding = \phds

diff --git a/manuscripts/13i.ly b/manuscripts/13i.ly
index 885609025595d471b0ec38c9dcefe71b578971f0..bf649884020dfaa73119bc35f1f941c7771fe2ec 100644 (file)
--- a/manuscripts/13i.ly
+++ b/manuscripts/13i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 13 }
+}
+<<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "u3" \with { \consists "Merge_rests_engraver" } {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tempo "Con moto" 4=98 \numericTimeSignature
 \override Hairpin.to-barline = ##f
@@ -12,7 +15,7 @@
 ees''16(\ff\>^\markup { \smaller \italic "feroce" } bes aes g fis e d) des-. c-. b-. a-. f-. r4\mp |
 r4 r8. cis'''16(\f\> b gis fis f ees d bes e,) \clef bass |
 c-. a-. g-. r16 gis'16-. dis-. cis-. a( bes f c bes g e d b)\p \clef treble |
-\tempo "Meno mosso" 4=66 r2 r4\tempo "Molto accel." c''''16-. aes-. g-. f-. b,-.\< a( d, c
+\tempo "Meno mosso" 4=66 r2 r4^"Molto accel." c''''16-. aes-. g-. f-. b,-.\< a( d, c
 \tempo "A tempo" 4=98 cis dis e fis)\f r2\fermata |
 g'16(\ff\> ees des ges, a fis e) gis,-.f-.\mf b-. c-. d-. r8. cis''16(\p\> |
 \time 3/16 b[ gis fis] |
@@ -20,13 +23,13 @@ g'16(\ff\> ees des ges, a fis e) gis,-.f-.\mf b-. c-. d-. r8. cis''16(\p\> |
 c4 a2 g4~ |
 \time 5/16 g4 e16) \clef bass |
 \time 4/4 bes16-.\fsubito f-. d-. r16 cis-. dis-. gis-. a( \clef treble c f ges bes b d f g) |
-r4 \tempo "Molto accel." f,16-.\> g-. aes-. bes-. b-. d( a' c \tempo "Presto possible" cis dis e fis)\mp \bar "|."
+r4^"Molto accel." f,16-.\> g-. aes-. bes-. b-. d( a' c \tempo "Presto possible" cis dis e fis)\mp \bar "|."
 }
 >>
 }
 \new Staff = "d3" \with { \consists "Merge_rests_engraver" } { \clef bass
 \set Staff.pedalSustainStyle = #'mixed
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \numericTimeSignature
 \time 4/4

diff --git a/manuscripts/14i.ly b/manuscripts/14i.ly
index e82ddabda53b5e3757d13fc94ba19aad550ad54d..34bed26a4f338692eff12bf54bafa63d953564fa 100644 (file)
--- a/manuscripts/14i.ly
+++ b/manuscripts/14i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 14 }
+}
+  <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "u" \with { \consists "Merge_rests_engraver" } {
-\accidentalStyle modern
+\accidentalStyle piano
 \relative { \tempo Allegro 4=132 \numericTimeSignature
 \time 4/4
 r2 cis''8( a4 fis'8 |
@@ -57,7 +60,7 @@ R1 |
 }
 }
 \new Staff = "d" \with { \consists "Merge_rests_engraver" } { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 \relative { \numericTimeSignature
 \time 4/4
 <<

diff --git a/manuscripts/15i.ly b/manuscripts/15i.ly
index 7500cc4bdfb2a418f018592c8e2e1043db3644bc..875bf17a74d04e9dfd490a6c7f168fed29f126a0 100644 (file)
--- a/manuscripts/15i.ly
+++ b/manuscripts/15i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 15 }
+}
+  <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "ui7" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarksev \dtim \override TextSpanner.bound-details.left.text = "poco rit."
 \time 7/4 s1*7/4^\markup { \smaller \italic "semplicemente; sotto voce" } |
@@ -75,7 +78,7 @@
 >>
 }
 \new Staff = "di7" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarksev \dtim
 \time 7/4 s1*7/4 |

diff --git a/manuscripts/1i.ly b/manuscripts/1i.ly
index fe6bc2e5986494ff3ecc397302e12e9f0e23926d..01d0c6e6a6fd655064744959ddd8aa50f796bbd2 100644 (file)
--- a/manuscripts/1i.ly
+++ b/manuscripts/1i.ly
@@ -1,10 +1,13 @@
 %fifteen inventions project
 
-\new PianoStaff \with { \consists "Merge_rests_engraver" } <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 1 }
+  \consists "Merge_rests_engraver" }
+<<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "ui1" {
-  \accidentalStyle modern
+  \accidentalStyle forget
   <<
     \relative { \tempo Vivace 4=136
     \omit Staff.BarLine
@@ -26,7 +29,7 @@
   >>
 }
 \new Staff = "di1" { \clef bass
-  \accidentalStyle modern
+  \accidentalStyle forget
   <<
   \relative { \tmarkione
   \omit Staff.BarLine

diff --git a/manuscripts/2i.ly b/manuscripts/2i.ly
index bc877d0040f3af62af3aa61f32aec70fa0179d1d..86424f6a12ceed1f23b1ae321d75d5e2ba76cd6e 100644 (file)
--- a/manuscripts/2i.ly
+++ b/manuscripts/2i.ly
@@ -1,9 +1,11 @@
 %fifteen inventions project
-\new PianoStaff \with { \consists "Merge_rests_engraver" } <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 2 }
+  \consists "Merge_rests_engraver" } <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "ui2" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \override Score.MetronomeMark.padding = #2.2 \tempo Presto 4=168
 \override DynamicLineSpanner.staff-padding = \phds
@@ -35,7 +37,7 @@ d[ c) \change Staff = "di2" bes,( a) \change Staff = "ui2" g'( f) \change Staff
 >>
 }
 \new Staff = "di2" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktthree \set tieWaitForNote = ##t
 \override DynamicLineSpanner.staff-padding = #7

diff --git a/manuscripts/3i.ly b/manuscripts/3i.ly
index 37b33754a07441e94a998f8bae18c26705bd4204..e2110ec193f5a2e88ca95bbe52209458fc71f991 100644 (file)
--- a/manuscripts/3i.ly
+++ b/manuscripts/3i.ly
@@ -1,9 +1,11 @@
 %fifteen inventions project
-\new PianoStaff \with { \consists "Merge_rests_engraver" } <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 3 }
+  \consists "Merge_rests_engraver" } <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "u3" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktwo \numericTimeSignature
 \time 4/4 r8^\markup { \smaller \italic "giocoso" } g''8(\mp a,4~ a8) d16( f16 c4) |
@@ -29,7 +31,7 @@ bes4(\mp\< c4.)
 >>
 }
 \new Staff = "d3" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktwo \numericTimeSignature
 \time 4/4 R1 |

diff --git a/manuscripts/4i.ly b/manuscripts/4i.ly
index 316d443748e18a5cb3c2e14b03ba83fa84c6c80c..cb1dedc973dd7149e61bd4addc30c8d1b88f0159 100644 (file)
--- a/manuscripts/4i.ly
+++ b/manuscripts/4i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 4 }
+}
+  <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "ui4" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarkfi
 \time 3/8 g'16([\mp^\markup { \smaller \italic "dolce; espr." } f] \tuplet 3/2 { e8 g f } |
@@ -11,7 +14,7 @@
 \time 3/8 b8( \tuplet 3/2 { ees8[ c d] } |
 \time 2/4 fis8 gis4) \override TextSpanner.bound-details.left.text = "molto accel." a8(\startTextSpan |
 \time 4/4 aes16\< g bes8) \tuplet 3/2 { r16 a16_( b16 } c8)^\markup { \smaller \italic "intenso" } \stemNeutral f16( ges ees8) cis16( e d8~\ff |
-\time 2/4 d4)\stopTextSpan\fermata \stemUp ees,8(^"a Tempo"\mp c16 d |
+\time 2/4 d4)\stopTextSpan\fermata \stemUp \tempo "A tempo" ees,8(\mp c16 d |
 \time 3/4 fis8 gis8 a4 f4~ |
 \time 2/4 \tuplet 3/2 { f8) g( e } b8 des8 |
 bes2)\fermata |
@@ -31,7 +34,7 @@ bes2)\fermata |
 >>
 }
 \new Staff = "di4" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { %\tmarkfi
 \time 3/8 r8 <d, a' c>4\pp |

diff --git a/manuscripts/6i.ly b/manuscripts/6i.ly
index c6721ea058628cdf954175776f011d13e21e58ce..ee488ec9473d228f52bb2ba1b5f61247c6451430 100644 (file)
--- a/manuscripts/6i.ly
+++ b/manuscripts/6i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 6 }
+}
+  <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "ui6" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
 \time 1/4 s4^\markup { \smaller \italic "spianato" } |
@@ -70,7 +73,7 @@ s2 |
 >>
 }
 \new Staff = "di6" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarktfour \numericTimeSignature \override Hairpin.to-barline = ##f
 \override DynamicLineSpanner.staff-padding = \phds

diff --git a/manuscripts/7i.ly b/manuscripts/7i.ly
index 9e6729482693ac20e4e0da43764d5ed75be38773..b1000a74de893e8d38b0f39a6b8e51496ec729d8 100644 (file)
--- a/manuscripts/7i.ly
+++ b/manuscripts/7i.ly
@@ -1,11 +1,13 @@
 %fifteen inventions project
-\new PianoStaff \with { \consists "Merge_rests_engraver" } <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 7 }
+  \consists "Merge_rests_engraver" } <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "u3" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
-\relative { \tempo Allegro 4.=104 \numericTimeSignature
+\relative { \tempo "Allegro moderato" 4.=104 \numericTimeSignature
 \time 6/8
 \partial 16
 r16^\markup { \smaller \italic "semplice; secco" } |
@@ -26,9 +28,9 @@ d2.\fermata \bar "|."
 >>
 }
 \new Staff = "d3" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
-\relative { \tempo Allegro 4.=104 \numericTimeSignature
+\relative { \numericTimeSignature
 \time 6/8
 \partial 16
 gis16~\p |

diff --git a/manuscripts/8i.ly b/manuscripts/8i.ly
index 30943e1b2d3e8aaf94734b66656c701376ad56e6..837a2d5d78ef3ada5a6306c6f4b9ff16ea20cad8 100644 (file)
--- a/manuscripts/8i.ly
+++ b/manuscripts/8i.ly
@@ -1,9 +1,11 @@
 %fifteen inventions project
-\new PianoStaff \with { \consists "Merge_rests_engraver" } <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 8 }
+  \consists "Merge_rests_engraver" } <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "u" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \override Score.MetronomeMark.padding = #2.2 \tempo Presto 4=154
 \override DynamicLineSpanner.staff-padding = \phds
@@ -39,7 +41,7 @@ r4 r4 r4 ces8^.^> |
 >>
 }
 \new Staff = "d" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \override Score.MetronomeMark.padding = #2.2
 \override DynamicLineSpanner.staff-padding = \phds

diff --git a/manuscripts/9i.ly b/manuscripts/9i.ly
index 7394036061dd17080cc92ed7b0c983d6ab4ba05b..ca145c26ffb8acf0e68ae1ba312d028d7533059c 100644 (file)
--- a/manuscripts/9i.ly
+++ b/manuscripts/9i.ly
@@ -1,9 +1,12 @@
 %fifteen inventions project
-\new PianoStaff <<
+\new PianoStaff \with {
+  instrumentName = \markup { \large "&numero;" \number 9 }
+}
+  <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
 \new Staff = "u" {
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { \tmarkfi \override Hairpin.to-barline = ##f %\tempo Lento 4=40
 \override DynamicLineSpanner.staff-padding = \phds
@@ -16,7 +19,7 @@
 >>
 }
 \new Staff = "d" { \clef bass
-\accidentalStyle modern
+\accidentalStyle piano
 <<
 \relative { %\tmarkfi
 \time 6/4

diff --git a/variables/program notes.ly b/variables/program notes.ly
index ebe1f3065a7173a219d3938c0902a48e6826ed64..7ac2a435904c4ddaab4154120647f82e3b548cb8 100644 (file)
--- a/variables/program notes.ly
+++ b/variables/program notes.ly
@@ -5,8 +5,5 @@ At the start of 2022, I composed a short piece for piano constructed from descen
 diatonic scales and the 15 partitions of the 7-pitch diatonic set. This invention
 would inspire me to write more inventions. These \bold \italic "Fifteen Inventions"
 correspond to one of the 15 partitions and, as such, have between 1 and 7 strands or
-voices. Inventions with the same number of strands or voices share titles and musical
-characters. I borrowed terms from plant morphology I felt describe these musical
-characters for the titles. Pappus is the fluffy hair-like material which carries
-seeds through the air, Panicle is an inflorescence with many branches thrusting out
-in different directions, and Pinnate describes a two-rowed leaflet structure. }}
+voices.
+}}

diff --git a/variables/umbel.ly b/variables/umbel.ly
new file mode 100644 (file)
index 0000000..ad08921
--- /dev/null
+++ b/variables/umbel.ly
@@ -0,0 +1,35 @@
+%fifteen inventions project
+xumbel = \markup {
+  \center-column {
+           \path #0.1
+           #'((moveto 0 0)
+           (curveto 1 0.3 3.6 3 4.2 1.6)
+           (moveto 0 0)
+           (curveto -1 0.3 -3.6 3 -4.2 1.6)
+           (moveto 0 0)
+           (curveto 0.9 0.3 2.9 3 3.5 1.7)
+           (moveto 0 0)
+           (curveto -0.9 0.3 -2.9 3 -3.5 1.7)
+           (moveto 0 0)
+           (curveto 0.8 0.3 2.2 3 2.8 1.8)
+           (moveto 0 0)
+           (curveto -0.8 0.3 -2.2 3 -2.8 1.8)
+           (moveto 0 0)
+           (curveto 0.6 0.3 1.5 3 2.1 1.9)
+           (moveto 0 0)
+           (curveto -0.6 0.3 -1.5 3 -2.1 1.9)
+           (moveto 0 0)
+           (curveto 0.4 0.3 0.8 3 1.4 2)
+           (moveto 0 0)
+           (curveto -0.4 0.3 -0.8 3 -1.4 2)
+           (moveto 0 0)
+           (curveto 0.2 0.3 0.5 3 0.7 2.1)
+           (moveto 0 0)
+           (curveto -0.2 0.3 -0.5 3 -0.7 2.1)
+           (moveto 0 0)
+           (lineto 0 2.2))
+           \vspace #-0.035
+           \override #'(height . 0.25) \draw-squiggle-line #1 #'(0 . 5) ##f
+           \vspace #-0.275
+         }
+       }

diff --git a/variables/variables.ly b/variables/variables.ly
index 5c50bd0212b0852a82388bf1f1c2570ea831f4b9..d4b1f482a999f76b0b203eed072be77b8a6098af 100644 (file)
--- a/variables/variables.ly
+++ b/variables/variables.ly
@@ -1,11 +1,12 @@
 %fifteen inventions project
 %texts
-xtitle = \markup { Fifteen Inventions }
-xsub = \markup { for keyboard }
+xyear = \markup { 2022-23 }
+xtitle = \markup { Circumnutation }
+xsub = \markup { fifteen inventions for keyboard instruments }
 xcomp = \markup { Tucker Johnson }
 xinst = \markup  { keyboard }
-xdur = \markup { \null }
-xcr = \markup \tiny { Copyright Tucker Johnson MMXXII. All Rights Reserved }
+xdur = \markup { "30\" - 15\'" }
+xcr = \markup \tiny { Copyright \char ##x00A9 MMXXIII Umbel Press. }
 oddfoot = \markup { \fill-line { \null \center-column { \concat { " - " \fromproperty #'page:page-number-string " - " } \small { \xcomp } } \null } }
 evfoot = \markup { \fill-line { \null \center-column { \concat { " - " \fromproperty #'page:page-number-string " - " } \small { \xtitle } } \null } }
 finfoot = \markup { \fill-line { \null \center-column { \concat { " - " \fromproperty #'page:page-number-string " - " } \small \typewriter { "February 1st, 2022 - Rochester, New York" } } \null } }