upload

diff --git a/book.ly b/book.ly
index 1e06bf712c8477168bcd1982b831fa41b4423483..88b287333fd47bf8ce3bde3d5a4e3b860705ff7f 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -89,7 +89,7 @@ composer = \xcomp
 \include "manuscripts/14i.ly"
 }
 
-\tocItem \markup { "15. " \bold "Poco rubato," \italic "semplicemente; sotto voce" }
+\tocItem \markup { "14. " \bold "Poco rubato," \italic "semplicemente; sotto voce" }
 \score {
 \include "manuscripts/15i.ly"
 }

diff --git a/front-matter/front matter.ly b/front-matter/front matter.ly
index 84ca192a8cc611edb3eb7be22d5ff4e96e1d808e..feee4112a3d0f349413747f2e49c4cd9ea97ea2e 100644 (file)
--- a/front-matter/front matter.ly
+++ b/front-matter/front matter.ly
@@ -22,7 +22,7 @@ front-matter = \markuplist {
      \line { \hbracket \bold "performance notes"}
      \vspace #0.2
      \line { In invention one \italic "(Vivace)" accidentals apply only to the note they precede. }
-     \line { In inventions two through fifteen accidentals carry through the bar. }
+     \line { In inventions two through fourteen accidentals carry through the bar. }
   }
   }
    \right-column { \vspace #2 }

diff --git a/manuscripts/14i.ly b/manuscripts/14i.ly
index cfb60899ff6a34fa014909d38d204dc96930c07f..58b1327aa84fe973903c76cb76359dfe35b6892a 100644 (file)
--- a/manuscripts/14i.ly
+++ b/manuscripts/14i.ly
@@ -2,54 +2,38 @@
 \new PianoStaff \with {
   instrumentName = \markup { \large "№" \number 14 }
 }
-  <<
+<<
 \set PianoStaff.connectArpeggios = ##t
-\override PianoStaff.Arpeggio.arpeggio-direction = #UP
-\new Staff = "u" \with { \consists "Merge_rests_engraver" } {
+\new Staff = "u3" \with { \consists "Merge_rests_engraver" } {
 \accidentalStyle piano
-\relative { \tempo Moderato 4=82 \numericTimeSignature
 <<
-  \relative {
-    \voiceTwo
-    \partial 4 b'4~^>\f |
-    b1
-    b1(-> |
-    c4)
-  }
-  \new Voice \relative {
-    \voiceOne
-    \partial 4 s4 |
-    s1 |
-    r16 cis''8-.^\pp fis16-. r4 r8 a,8-. ees'-. r8 |
-    s4
-  }
->>
-\oneVoice
-r8. f'''16~^\p 8 r8 ees,,4~\mp |
-ees1 |
-ees4. f8~\< f8. b16~ b8. c,16~ |
-c8 a'8 fis16 cis8.~\f 4 c'4~ |
-c16 r8. r4 r2 |
-R1 |
-\time 3/4
-f'16
+\relative { \tempo "Molto" 4=75 \numericTimeSignature
+<a' b>4 <b cis>4 4 <b fis'>4 |
+<b dis>2. f''4 |
+f4 f4. f4.~\arpeggio |
+1 \clef bass |
+\tuplet 3/2 { ees,,,8( a, b } \tuplet 3/2 { c f ges } des4) r4 \clef treble |
+f'''2~(\arpeggio 8 \tuplet 7/4 { g16 fis e d cis b a } bes8) |
+\time 6/16
+r16 r16 <dis, ais'>16-. r16 r16 <e ais>16-. |
 }
+>>
 }
-\new Staff = "d" \with { \consists "Merge_rests_engraver" } { \clef treble
+\new Staff = "d3" \with { \consists "Merge_rests_engraver" } { \clef bass
+\set Staff.pedalSustainStyle = #'mixed
 \accidentalStyle piano
+<<
 \relative { \numericTimeSignature
-\partial 4 r4 |
-R1 |
-r2 e'4~\mp e16 aes8.~\< |
-aes16 bes8. d8 g,8~\mf g4 r4 |
-R1 \clef bass |
-r16 aes,16-.\p r8 r4 e16-. r16 r8 g16-. r16 r8 |
-r4 d16-. r16 r8 ais16-. r16 r8 r4 \clef treble |
-r16 c''8.~ c2. |
-ees1-> |
-\time 3/4
-aes,2.-> |
+gis4 4 e4 4 |
+e2. <bes' c>4 |
+<g c>4 <d c'>4. <aes ees' c'>4.~\arpeggio |
+1 |
+\tuplet 3/2 { r16 aes8( g e16~ } \tuplet 3/2 { 16 d8 } bes'8~ 4) c'8( ees |
+<bes, des' aes'>4~\arpeggio 8) r8 r2 |
+\time 6/16
+b,16-. fis'-. r16 cis16-. gis'16-. r16 |
 }
+>>
 }
 >>
 %\midi { }
@@ -57,6 +41,6 @@ aes,2.-> |
 \context {
 \Score
 \override BarNumber.font-size = #1
-\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
+\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/24)
 }
 }

diff --git a/variables/program notes.ly b/variables/program notes.ly
index 46cd5906c31e45216080124a5bee5b7d44012e21..7e8751752df8fe4e9112d7565f5e5e49f7bf6eb4 100644 (file)
--- a/variables/program notes.ly
+++ b/variables/program notes.ly
@@ -3,8 +3,8 @@
 xpnote = \markup \column { \override #'(line-width . 90) \justify {
 At the start of 2022, I composed a short piece for piano constructed from descending
 diatonic scales and the 15 partitions of the integer 7. 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
+would inspire me to write more inventions. These \bold \italic "Fourteen Inventions"
+correspond to most of the 15 partitions and, as such, have between 1 and 7 strands or
 voices. Each invention explores ways of permuting and separating the diatonic
 collection, creating many types of musical expression within a simple framework.
 }

diff --git a/variables/variables.ly b/variables/variables.ly
index d4b1f482a999f76b0b203eed072be77b8a6098af..f0c4c44daadba5b59fae69e7966e3f3d229246fc 100644 (file)
--- a/variables/variables.ly
+++ b/variables/variables.ly
@@ -2,7 +2,7 @@
 %texts
 xyear = \markup { 2022-23 }
 xtitle = \markup { Circumnutation }
-xsub = \markup { fifteen inventions for keyboard instruments }
+xsub = \markup { fourteen inventions for keyboard instruments }
 xcomp = \markup { Tucker Johnson }
 xinst = \markup  { keyboard }
 xdur = \markup { "30\" - 15\'" }