do

diff --git a/book.ly b/book.ly
index 441149a09bcbf4b047355f84647f15bc6e1575df..572fd3f96335edb23610961938cd4a225306040b 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -23,6 +23,7 @@ piece = \markup { \large { \bold "pappus" } }
 \include "manuscripts/1i.ly"
 }
 
+\pageBreak
 \score {
 \header {
 piece = \markup { \large { \bold "panicle" \number 1 } }
@@ -30,6 +31,7 @@ piece = \markup { \large { \bold "panicle" \number 1 } }
 \include "manuscripts/2i.ly"
 }
 
+\pageBreak
 \score {
 \header {
 piece = \markup { \large { \bold "pinnate" \number 1 } }
@@ -37,12 +39,21 @@ piece = \markup { \large { \bold "pinnate" \number 1 } }
 \include "manuscripts/3i.ly"
 }
 
-%\score {
-%\header {
-%piece = \markup { \large { \bold "circumnutation" } }
-%}
-%\include "manuscripts/15i.ly"
-%}
+\pageBreak
+\score {
+\header {
+piece = \markup { \large { \bold "composite" \number 1 } }
+}
+\include "manuscripts/4i.ly"
+}
+
+\pageBreak
+\score {
+\header {
+piece = \markup { \large { \bold "circumnutation" } }
+}
+\include "manuscripts/15i.ly"
+}
 \pageBreak
   \markup { \null }
   \pageBreak

diff --git a/manuscripts/13i.ly b/manuscripts/13i.ly
deleted file mode 100644 (file)
index c80688d..0000000
--- a/manuscripts/13i.ly
+++ /dev/null
@@ -1,57 +0,0 @@
-%fifteen inventions project
-\new PianoStaff \with { \consists "Merge_rests_engraver" } <<
-\set PianoStaff.connectArpeggios = ##t
-\override PianoStaff.Arpeggio.arpeggio-direction = #UP
-\new Staff = "ut4" {
-\accidentalStyle modern
-<<
-\relative { \tmarktfour
-\time 4/4 s4 \clef bass \tuplet 3/2 { r8 dis8-.-> r8 } s2 |
-s4 fis'8-.\p r8 s2 |
-r16 b,16-.\p r8 s4 r16 ges16-.->\f s8 s4 |
-s4 r8. b16-.->\f s2 |
-s4 r16 des16-.->^\f s8 s2 |
-s1 |
-s2. s4 \offset Y-offset 2 \fermata \bar "|." }
-\\
-\relative { \tmarktfour
-\time 4/4 s4 cis4(\mf e4~ e16 gis8.~ |
-gis4) s8 r8 \tuplet 3/2 { gis8~^(\mf <gis ais>8~ <gis~ ais~ b^~>8 } <gis ais b>4) |
-r16 s16 r8 ees8^(\mf des16~ <des~ f^~>16 <des f>2) |
-\tuplet 3/2 { fis16^(\mf gis16~ <gis~ ais^~>16 } <gis~ ais^~>8  <gis ais>2.) \clef treble |
-r8 c8~(\mf c4 ees4~ <ees g>4) |
-\stemNeutral a4~-> a8.. b32( cis2) |
-\tuplet 3/2 { d4~^( <d~ e>4 <d~ fis^~>4 } <d~ fis^~>4 <d\laissezVibrer fis^\laissezVibrer>4) \offset X-offset 4 ^\markup {"attacca"}  }
->>
-}
-\new Staff = "dt4" { \clef bass
-\accidentalStyle modern
-<<
-\relative { \tmarktfour
-\time 4/4 s1 |
-s2 s4 r8 cis8_._>\f |
-s1 |
-s2 s4 \tuplet 3/2 { r8 e8_.\p r8 } |
-s2. r8 aes,8_.\p |
-r2 s4 r16 s8. |
-s4 r8 s8 s4 s4 \offset Y-offset 2 \fermata | }
-\\
-\relative { \tmarktfour
-\time 4/4 \change Staff = "ut4" \stemUp a'16-. \offset Y-offset -2 \p \change Staff = "dt4" b,,8.~(\mp \stemNeutral b4~ b8 fis8~ fis4) |
-\tuplet 3/2 { dis8^( e4~ } e2) r8 s8 |
-bes'2.(\mp aes4~ |
-aes2) \stemDown \tuplet 3/2 { cis4~^( <cis~ dis^~>8 } <cis dis>4) |
-\tuplet 5/4 { bes8^~^(\mp <bes^~ f~>8. } <bes f>2.) |
-r2 \tuplet 3/2 { r8 d,8^. \change Staff = "ut4" e''8^.^> \offset Y-offset 2.6 ^\f } \change Staff = "dt4" r16 \stemNeutral fis,,8(\mp gis16~ |
-gis4) r8 g,8_.\p a''16^.^>^\f b,16(\mp cis8~ cis4\laissezVibrer) | }
->>
-}
->>
-%\midi { }
-\layout {
-\context {
-\Score
-\override BarNumber.font-size = #1
-\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
-}
-}

diff --git a/manuscripts/4i.ly b/manuscripts/4i.ly
index 6aba5503008945d3f198789ab92d26c6c0573d4a..04a0e8e47a7957fdebe0ed5b576525584821e27e 100644 (file)
--- a/manuscripts/4i.ly
+++ b/manuscripts/4i.ly
@@ -2,46 +2,39 @@
 \new PianoStaff <<
 \set PianoStaff.connectArpeggios = ##t
 \override PianoStaff.Arpeggio.arpeggio-direction = #UP
-\new Staff = "u4" {
+\new Staff = "ui4" {
 \accidentalStyle modern
 <<
-\relative { \tmarkfive
-\time 2/4 c'''2 |
-c2 |
-\time 7/16 g4. g16 |
-\time 7/8 gis4. dis2 |
-}
-\\
-\relative { \tmarkfive
-\time 2/4 e''2 |
-d2 |
-\time 7/16 b4. c16 |
-\time 7/8 a4. fis2 |
+\relative { \tmarkfi
+\time 5/4 r2. <ees' d'>2 |
+\time 3/4 <cis gis' e'>2. |
+\time 2/4 r4 <b' a'>4 |
+\time 7/8 c4.~ <c ees, bes''>2 |
+\time 4/4 <g'c>1 |
+<f ees'>2. r4 |
 }
 >>
 }
-\new Staff = "d4" { \clef bass
+\new Staff = "di4" { \clef bass
 \accidentalStyle modern
 <<
-\relative { \tmarkfive
-\time 2/4 <g f>2 |
-<a f>2 |
-\time 7/16 <f e>4. <e d>16 |
-\time 7/8 b'4. b2 |
-}
-\\
-\relative { \tmarkfive
-\time 2/4 s2 |
-s2 |
-\time 7/16 s4. s16 |
-\time 7/8 s4. s2
+\relative { \tmarkfi
+\time 5/4 bes2~( bes8 c8 g2) |
+\time 3/4 b,4.( ais8 dis4) |
+\time 2/4 \change Staff = "ui4" \stemDown \tuplet 3/2 { fis'4( e d) } |
+\time 7/8 \change Staff = "di4" \stemUp f,4( aes8 ges2) |
+\time 4/4 \change Staff = "ui4" \stemDown a'4._( b8 f2)|
+\change Staff = "di4" \stemUp r8 <aes, d,>8~ 2 c,8( g'8) |
+
 }
 \\
-\relative { \tmarkfive
-\time 2/4 \stemDown b,2 |
-b2 |
-\time 7/16 a4. a16 |
-\time 7/8 <cis e>4. <cis e>2 |
+\relative { \tmarkfi
+\time 5/4 r2. <f, a>2 |
+\time 3/4 fis2. |
+\time 2/4 r4 <cis' g>4 |
+\time 7/8 r4. r8 r16 cis,16~-> cis4 |
+\time 4/4 <d e'>1 |
+bes2. r4 |
 }
 >>
 }
@@ -52,6 +45,5 @@ b2 |
 \Score
 \override BarNumber.font-size = #1
 \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
-\override TimeSignature.stencil = ##f
 }
 }

diff --git a/variables/variables.ly b/variables/variables.ly
index cf483cc90960e30df0b88de6e99415fda1c35d89..16a881c50cbb3c130b48cb7654b2205ffb3c9042 100644 (file)
--- a/variables/variables.ly
+++ b/variables/variables.ly
@@ -16,7 +16,7 @@ tmarksev = \tempo "Poco rubato" 4 = 46-52
 tmarktfour = \tempo "Tempo giusto" 4 = 60
 tmarktthree = \tempo "Presto" 4 = 165
 tmarktwo = \tempo "Allegro moderato" 4 = 103
-tmarkfive = \tempo "largo" 8 = 40
+tmarkfi = \tempo "Moderato" 4 = 80
 bh = \break
 ds = #2.5
 sods = #3.4