i2 done

diff --git a/book.ly b/book.ly
index 0b6295c31ca89c5754e8ed0ea172a4c3a25f2a71..a647cdcf3bd82537445da8a41d27fdde2639007c 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -25,32 +25,11 @@ piece = \markup { \large { \bold "pappus" } }
 
 \score {
 \header {
-piece = \markup { \large { \bold "panicle" } }
+piece = \markup { \large { \bold "panicle 1" } }
 }
 \include "manuscripts/2i.ly"
 }
 
-\score {
-\header {
-piece = \markup { \large { \bold "polar" } }
-}
-\include "manuscripts/3i.ly"
-}
-
-\score {
-\header {
-piece = \markup { \large { \bold "composite" } }
-}
-\include "manuscripts/4i.ly"
-}
-
-\score {
-\header {
-piece = \markup { \large { \bold "cyme" } }
-}
-\include "manuscripts/13i.ly"
-}
-
 \score {
 \header {
 piece = \markup { \large { \bold "circumnutation" } }

diff --git a/manuscripts/15i.ly b/manuscripts/15i.ly
index 06881f3ef47a38708cdc715247b3a41df0bb07e9..55b1e842d3dbd09783164ee0170f80a7715f2e92 100644 (file)
--- a/manuscripts/15i.ly
+++ b/manuscripts/15i.ly
@@ -9,8 +9,8 @@
 \time 7/4 s1*7/4 |
 \time 4/4 s1 |
 \time 5/4 s1*5/4 |
-\time 3/4 \stemDown s2 \ottava 1 d''''4 |
-\time 5/4 d( c bes a g) \ottava 0 |
+\time 3/4 s2 \ottava 1 d''''4 |
+\time 5/4 \stemDown d( c bes a g) \ottava 0 |
 \time 4/4 f1 |
 \time 6/4 s1*6/4 |
 \time 3/4 \stemUp e4 d( cis) |
@@ -25,8 +25,8 @@
 \relative { \tmarksev \dtim
 \time 7/4 s1*7/4 |
 \time 4/4 \stemUp fis''4^( e d cis) |
-\time 5/4 b1^( a4) |
-\time 3/4 s4 f'2 |
+\time 5/4 \stemDown b1^( a4) |
+\time 3/4 s4 <f' ees>2 |
 \time 5/4 s1*5/4 |
 \time 4/4 \stemDown g1 |
 \time 6/4 \stemNeutral bes,1. |
@@ -41,9 +41,9 @@
 \\
 \relative { \tmarksev \dtim
 \time 7/4 \stemDown ais''4^(\mp gis fis e dis cis b) |
-\time 4/4 \stemUp b2. \stemDown a4 |
+\time 4/4 b2. a4 |
 \time 5/4 s1*5/4 |
-\time 3/4 s4 ees'2 |
+\time 3/4 s1*3/4 |
 \time 5/4 s1*5/4 |
 \time 4/4 s1 |
 \time 6/4 s1*6/4 |
@@ -51,22 +51,22 @@
 \time 2/4 s1*2/4 |
 \time 4/4 s1 |
 \time 3/4 s1*3/4 |
-\time 2/4 f,4_( ees) |
+\time 2/4 f4_( ees) |
 \time 4/4 s1 |
 \time 2/4 s1*2/4 |
 \time 4/4 c1 \arpeggio \bar "|." }
 \\
 \relative { \tmarksev \dtim
 \time 7/4 s1*7/4 |
-\time 4/4 g'1 |
-\time 5/4 \stemDown g4( f e d c) |
-\time 3/4 g'2. |
+\time 4/4 s1 |
+\time 5/4 s1*5/4 |
+\time 3/4 s1*3/4 |
 \time 5/4 s1*5/4 |
 \time 4/4 s1 |
 \time 6/4 s1*6/4 |
 \time 3/4 s1*3/4 |
 \time 2/4 s1*2/4 |
-\time 4/4 ees4( d c2) |
+\time 4/4 \stemDown ees'4( d c2) |
 \time 3/4 s1*3/4 |
 \time 2/4 s1*2/4 |
 \time 4/4 s1 |
@@ -114,7 +114,7 @@
 \relative { \tmarksev \dtim
 \time 7/4 s1*7/4 |
 \time 4/4 g1 |
-\time 5/4 g4( f e d c) |
+\time 5/4 \stemNeutral g4( f e d c) |
 \time 3/4 c4_( bes a) |
 \time 5/4 s1*5/4 |
 \time 4/4 s1 |

diff --git a/manuscripts/1i.ly b/manuscripts/1i.ly
index df847d03b316760cec79fc14d32169974117f6b2..1c8ea9923912b1c367ceb519b0791483032190ca 100644 (file)
--- a/manuscripts/1i.ly
+++ b/manuscripts/1i.ly
@@ -6,7 +6,7 @@
 \new Staff = "ui1" {
   \accidentalStyle modern-cautionary
   <<
-    \relative { \tempo "Presto"
+    \relative { \tempo "Prestissimo"
     \time 7/16 s16 s16 s16 s16 s16 s16 s16 |
     s16 s16 s16 s16 s16 s16 s16 |
     s16 s16 s16 s16 s16 s16 s16 |
@@ -25,7 +25,7 @@
 \new Staff = "di1" { \clef bass
   \accidentalStyle modern-cautionary
   <<
-  \relative { \tempo "Presto"
+  \relative { \tempo "Prestissimo"
   \time 7/16 e,16[\p fis g a b c d] |
   ees16[ f aes bes \change Staff = "ui1" des ces \change Staff = "di1" ges] |
   f16[ ees d c bes aes g] |

diff --git a/manuscripts/2i.ly b/manuscripts/2i.ly
index f7f22a2d06fd0b3f8826a7440562d3aada1c38b3..a82642061d2d5ca06bd165148796c01158a32ef7 100644 (file)
--- a/manuscripts/2i.ly
+++ b/manuscripts/2i.ly
@@ -9,13 +9,19 @@
 \omit Staff.BarLine
 \override Staff.BarLine.allow-span-bar = ##f
 \override DynamicLineSpanner.staff-padding = \phds
-\time 7/8 d'8[ \change Staff = "di2" e,8 fis,8 g'8 \change Staff = "ui2" a'8( b8 cis8] |
-ees8[ f aes) \change Staff = "di2" bes,,, c' \change Staff = "ui2" ges'' des,] |
-\change Staff = "di2" a8[ \change Staff = "ui2" bes''( g) \change Staff = "di2" f,, \change Staff = "ui2" e'' \change Staff = "di2" d,,, \change Staff = "ui2" c'''] |
-\stemUp \change Staff = "di2" ais,,[ \change Staff = "ui2" dis'( \change Staff = "di2" gis,) cis, \change Staff = "ui2" b''( e) \change Staff = "di2" fis,,] |
-\change Staff = "ui2" \stemNeutral g''[ \change Staff = "di2" a,,, \change Staff = "ui2" bes'''( c) d,,( ees) f''] |
-gis,,[ fis' \change Staff = "di2" e,,, \change Staff = "ui2" d'''( cis) \change Staff = "di2" b, \change Staff = "ui2" a'] |
-s1*7/8 \override Staff.BarLine.allow-span-bar = ##t | \revert Staff.BarLine.stencil }
+\time 7/8 d'8[ 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-.->] |
+cis'[ \change Staff = "ui2" b'' \change Staff = "di2" a,,,-.-> \change Staff = "ui2" gis'''( fis e) dis,] |
+c'[ \change Staff = "di2" bes, \change Staff = "ui2" f'' \change Staff = "di2" g,,,-.-> \change Staff = "ui2" a''' d,, e'] |
+f,[( ges) aes'( bes) \change Staff = "di2" ces,,,-.-> \change Staff = "ui2" des'''( ees)] |
+\change Staff = "di2" c,,[ \change Staff = "ui2" b'' \change Staff = "di2" a,, \change Staff = "ui2" g''( fis) \change Staff = "di2" e,,,-.-> \change Staff = "ui2" d'''] |
+des[( c) \change Staff = "di2" bes,,,-.-> \change Staff = "ui2" aes'''( f) \change Staff = "di2" ees,( ges)] \change Staff = "ui2" |
+g'[( a) \change Staff = "di2" b,( c) \change Staff = "ui2" d'( e) \change Staff = "di2" f,,,-.->] |
+gis'[ \change Staff = "ui2" ais' \change Staff = "di2" cis,,,-.-> \change Staff = "ui2" dis'''( b fis) \change Staff = "di2" e,] |
+\change Staff = "ui2" d'[( c  \change Staff = "di2" bes) a( g) f ees,-.->] |
+cis'[ gis-.-> fis'( a b) d, \change Staff = "ui2" e'] |
+\change Staff = "di2" f,[ \change Staff = "ui2" g'( aes) \change Staff = "di2" bes, c,,-.-> \change Staff = "ui2" des'''( ees)]
+\override Staff.BarLine.allow-span-bar = ##t \bar "|." \revert Staff.BarLine.stencil }
 >>
 }
 \new Staff = "di2" { \clef bass
@@ -28,6 +34,11 @@ s1*7/8 |
 s1*7/8 |
 s1*7/8 |
 s1*7/8 |
+s1*7/8 |
+s1*7/8 |
+s1*7/8 |
+s1*7/8 |
+s1*7/8 |
 s1*7/8 | \revert Staff.BarLine.stencil }
 >>
 }