big ups

diff --git a/front-matter/front matter.ly b/front-matter/front matter.ly
index 0ca363fa88df5c4cdcedd17a4ad158b83ab19fb9..0c0dd767454288aa19f7aec57e3b8ce334786bd9 100644 (file)
--- a/front-matter/front matter.ly
+++ b/front-matter/front matter.ly
@@ -30,7 +30,7 @@ front-matter = \markuplist {
                              \line { \bold "panicle 4" }
                              \line { \bold "cyme 2" }
                              \line { \bold "cyme 3" }
-                             \line { \bold "polar 4" }
+                             \line { \bold "polar 3" }
                              \line { \bold "umbel" }
                              \line { \bold "circumnutation" }
                 }

diff --git a/manuscripts/3i.ly b/manuscripts/3i.ly
index b7e10a54a4d9a27101ceee6e55d4b1b40988f326..1874448ad12f2a097ba4c32403aeaef3ab37ef57 100644 (file)
--- a/manuscripts/3i.ly
+++ b/manuscripts/3i.ly
@@ -5,52 +5,52 @@
 \new Staff = "u3" {
 \accidentalStyle modern
 <<
-\relative { \tmarktwo
+\relative { \tmarktwo \numericTimeSignature
 \time 4/4 r8 g''8(\mp a,4~ a8) d16( f16 c4) |
 bes2( ees2) |
 r8 b'8(\mf cis,)[ e~]( e8. fis16 gis,4) |
 r2 r8 b8( e4) |
 c8-.[\> f8-.] a,( d) g,2\mp |
-r2 ais4(->\mf\> dis4) |
-bes2(\p ees2) |
-fis8-. cis8-. gis'4-. e4( b4) |
-\time 5/8 des8( ees, ges aes bes) |
-g( f' d c a) |
-ais( fis' dis b cis) |
-\time 4/4 g'4--\fermata aes,4~ aes8 d16( f c4) |
-a2-> e'4~-> e4\fermata |
-r8 dis8( cis4~ cis8) fis16( g a,4)
-\time 3/4 r8 aes8( d2) |
-\time 5/8 r8 b4( e,4) |
-e8( f4~ f4) |
-bes4( c4.)
-\time 4/4 s1 \bar "|."
+\time 5/4 r2 ais4(->\mf\> dis2) |
+\time 4/4 bes2(\p ees2) |
+\time 5/4 fis8-. cis8-. gis'4-. e4(->\f\> b2) |
+\time 5/8 des8(\mp\< ees, ges aes bes) |
+g(\mf\> f' d c^"rit." a) |
+ais(\mp\< fis' dis b cis) |
+\time 4/4 g'4--\f\fermata aes,4~\mp^"Meno mosso" aes8 d16( f c4) |
+a2(^"poco rit." e'4~ e4)\fermata |
+r8^"Tempo primo" dis8-.-> cis4~-> cis8 fis16( g a,4)
+\time 3/4 r8\f\> aes8( d2) |
+\time 5/8 r8\mp\< b4( e,4) |
+e8(\mf\> f4~ f4) |
+bes4(\mp\< c4.)
+\time 2/4 r4\f r4\fermata \bar "|."
 }
 >>
 }
 \new Staff = "d3" { \clef bass
 \accidentalStyle modern
 <<
-\relative { \tmarktwo
-\time 4/4 r1 |
-r8 fis8(\mp gis,4~ gis8) cis16( e16 b4) |
+\relative { \tmarktwo \numericTimeSignature
+\time 4/4 R1 |
+r8 fis8( gis,4~ gis8) cis16( e16 b4) |
 ais2( dis2) |
 c'8(->^\f d,8) f8.[( g16] a,2) |
 bes2-> ees2-> |
-fis8-. cis8-. gis'4-. e4(-> b4) |
-r8 c'8(\mp d,8)[ f8~]( f8. g16 a,4) |
-r2 a4( d4) |
+\time 5/4 fis8-. cis8-. gis'4-. e4(-> b2) |
+\time 4/4 r8 c'8( d,8)[ f8~]( f8. g16 a,4) |
+\time 5/4 r2 a4(-> d2) |
 \time 5/8 r8 c4( f~ |
 f8) b,4( e) |
 e4.( gis,4) |
-\time 4/4 r2 r8 bes8( ees4) |
-r8 dis8( cis4~ cis8) fis16( g b,4)\fermata |
-b2-> e2-> |
-\time 3/4 bes'8( c,) f4 g8( ees) |
+\time 4/4 r4\fermata r4 r8 bes8( ees4) |
+r8 dis8-.->^\mf cis4~-> cis8 fis16( g b,4)\fermata |
+b2( e2) |
+\time 3/4 bes'8(-> c,) f4 g8( ees) |
 \time 5/8 cis8( d fis gis a) |
 c( bes a g d) |
 ges( f ees aes, des) |
-\time 4/4 b16( e8.~ e2.) \bar "|."
+\time 2/4 b8( e8~ e4)\fermata \bar "|."
 }
 >>
 }