i2-eng

diff --git a/lilypond-files/eng-files/pp-document-structure.ly b/lilypond-files/eng-files/pp-document-structure.ly
index c2e2c724509fa6d6bfd91ebce953af3d8e73480c..755de9703efb4466d8170954a0b306b7a939e1c8 100644 (file)
--- a/lilypond-files/eng-files/pp-document-structure.ly
+++ b/lilypond-files/eng-files/pp-document-structure.ly
@@ -61,7 +61,7 @@
                                         \relative \voiceAitwo
                                         >>
                                 }
-                                \new Staff = "di4" { \clef bass
+                                \new Staff = "di2" { \clef bass
                                         \accidentalStyle modern
                                         <<
                                         \relative \voiceBitwo
@@ -72,7 +72,8 @@
                         \context { 
                                 \Score 
                                         \override BarNumber.font-size = #1
-                                        \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
+                                        \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
+                                        \override TimeSignature.stencil = ##f
                         }
                 }
         }

diff --git a/lilypond-files/eng-files/pp-variables.ly b/lilypond-files/eng-files/pp-variables.ly
index ad08c0628b5c37e198c5714a61c6bc608c5fa0db..9af1095673f765c38d2aad6920b4590a14cdaa2f 100644 (file)
--- a/lilypond-files/eng-files/pp-variables.ly
+++ b/lilypond-files/eng-files/pp-variables.ly
@@ -3,7 +3,7 @@
 %------variables------
 
 %texts
-xtitle = \markup { twenty-one inventions }
+xtitle = \markup { Twenty-One Inventions }
 xsub = \markup { in seven sequences }
 xcomp = \markup { Tucker Johnson }
 xinst = \markup  { piano }

diff --git a/lilypond-files/front-matter/pp-front-matter.ly b/lilypond-files/front-matter/pp-front-matter.ly
index 2225c9119c5d37ce01a5e3a65076b12f273b278f..f2ee585c1e3b74ad3bf760e9382ef216d26b46cd 100644 (file)
--- a/lilypond-files/front-matter/pp-front-matter.ly
+++ b/lilypond-files/front-matter/pp-front-matter.ly
@@ -18,7 +18,8 @@ front-matter = \markuplist {
       \vspace #0.5
       \line { ================================= }
       \vspace #0.5
-      \line { \left-column { \line { \italic "sequence 1" }
+      \fill-line { \column { \null }
+                \left-column { \line { \italic "sequence 1" }
                              \line { \bold "1       prelude" }
                              \line { \bold "2       panicle" }
                              \line { \bold "3       circumnutation" }
@@ -38,6 +39,8 @@ front-matter = \markuplist {
                              \line { \bold "11      composite" }
                              \line { \bold "12      circumnutation" } 
                              \vspace #0.2
+                        }
+                        \left-column {
                              \line { \italic "sequence 5" }
                              \line { \bold "13      composite" }
                              \line { \bold "14      polar" }
@@ -53,11 +56,13 @@ front-matter = \markuplist {
                              \line { \bold "20      cyme" }
                              \line { \bold "21      circumnutation" } 
                 }
+                \column { \null }
         }
       \vspace #0.5
       \line { ================================= }
       \vspace #1.5
-   }
+       } 
+  }
    \column { \null }
   }
-}
+

diff --git a/lilypond-files/manuscripts/pp-i1.ly b/lilypond-files/manuscripts/pp-i1.ly
index bdc914e209f8c7c89f310cc3b0a19d78f680eec7..0d320e587da6cb079024132ab56954c04b5325ad 100644 (file)
--- a/lilypond-files/manuscripts/pp-i1.ly
+++ b/lilypond-files/manuscripts/pp-i1.ly
@@ -1,7 +1,7 @@
 \version "2.20.0" %invention 1 manuscript:
   
-voiceApre = { \tmarkione \override Beam.auto-knee-gap = #6
-\time 15/8 \change Staff = "di1" \stemUp gis8[\laissezVibrer\sustainOn a\laissezVibrer cis\laissezVibrer \change Staff = "ui1" fis\laissezVibrer \change Staff = "di1" b,\laissezVibrer dis,\laissezVibrer e,\laissezVibrer] \change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b''1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata^\markup { \tiny \italic "go on when it should" } \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f |
+voiceApre = { \tmarkione \override Beam.auto-knee-gap = #6 \override Flag.stroke-style = #"grace"
+\time 15/8 \change Staff = "di1" \stemUp gis8[\laissezVibrer\sustainOn_\markup { \bold "(" \dynamic pp \bold "-" \dynamic mf \bold ")" } a\laissezVibrer cis\laissezVibrer \change Staff = "ui1" fis\laissezVibrer \change Staff = "di1" b,\laissezVibrer dis,\laissezVibrer e,\laissezVibrer] \change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b''1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata^\markup { \tiny \italic "a piacere" } \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f |
 \change Staff = "di1" \stemDown bes8[\laissezVibrer a\laissezVibrer \change Staff = "ui1" g'\laissezVibrer d'\laissezVibrer c\laissezVibrer f,\laissezVibrer e'\laissezVibrer] \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f |
 \change Staff = "di1" \stemUp d,8[\laissezVibrer b'\laissezVibrer cis,\laissezVibrer fis,\laissezVibrer a\laissezVibrer e\laissezVibrer gis'\laissezVibrer] \change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f |
 \change Staff = "di1" g,8[\laissezVibrer e'\laissezVibrer fis\laissezVibrer d\laissezVibrer b'\laissezVibrer \change Staff = "ui1" a'8\laissezVibrer cis\laissezVibrer] \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f |
@@ -10,10 +10,10 @@ voiceApre = { \tmarkione \override Beam.auto-knee-gap = #6
 \time 7/8 \stemUp \change Staff = "di1" c,8[\laissezVibrer\sustainOff\sustainOn d\laissezVibrer e\laissezVibrer f\laissezVibrer g\laissezVibrer a\laissezVibrer b\laissezVibrer] \bar "|." }
 
 voiceBpre = { \tmarkione \override NoteHead #'no-ledgers = ##t \override Score.SustainPedalLineSpanner #'padding = #'3  
-\time 15/8 \set Staff.pedalSustainStyle = #'bracket \override NoteHead.transparent = ##t \change Staff = "ui1" s4. \offset Y-offset #1 ^\markup { \tiny \italic "ad lib" } \change Staff = "di1" s4 s4 d'1*1/2_~ 1*1/2 |
+\time 15/8 \set Staff.pedalSustainStyle = #'bracket \override NoteHead.transparent = ##t \change Staff = "ui1" s4. \offset Y-offset #1  \change Staff = "di1" s4 s4 d'1*1/2_~ 1*1/2 |
 s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 |
 s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 |
 s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 |
 s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 |
 s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 |
-\time 7/8 \override TextSpanner.bound-details.left.text = "poco accel." \change Staff = "ui1" s8\startTextSpan s8 s8 s8 s8 s8 s8\stopTextSpan \offset X-offset 0 ^\markup {"attacca"} | }
+\time 7/8 \change Staff = "ui1" s8^\markup { \italic "poco rit." } s8 s8 s8 s8 s8 s8 \offset X-offset -2 ^\markup { "attacca" } | }

diff --git a/lilypond-files/manuscripts/pp-i2.ly b/lilypond-files/manuscripts/pp-i2.ly
index 3341bf153a4fccefcad3b78f14b2695d11ef2ad3..1fb43c9c11356d9f37f38d92cedb4b0a65c605a9 100644 (file)
--- a/lilypond-files/manuscripts/pp-i2.ly
+++ b/lilypond-files/manuscripts/pp-i2.ly
@@ -1,21 +1,24 @@
 \version "2.20.0" %Cor Anglais Settle the Score manuscript:
   
-voiceAitwo = { \tmarktthree
-\time 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 |
-s1*7/8 |
-s1*7/8 |
-s1*7/8 |
-s1*7/8 |
-s1*7/8 |
-s1*7/8 |
+utwo = \change Staff = "ui2"
+dtwo = \change Staff = "di2"
+
+voiceAitwo = { \tmarktthree \override Staff.BarLine.stencil = ##f \override Staff.BarLine.allow-span-bar = ##f
+\time 7/8 c'8[\mp d e-. f->-. \change Staff = "di2" g,-. a-. b-.] |
+b8[-. \change Staff = "ui2" c-. d-. e-. f-. g-. a->-.] |
+e[-.-> f-. g a-. \change Staff = "di2" bes,, \change Staff = "ui2" c''-. \change Staff = "di2" d,,-.] |
+\change Staff = "ui2" c''-.[ \change Staff = "di2" d,,-. \utwo ees''-. \dtwo f,,-. g-. \utwo aes''-. bes,-.->]  |
+\dtwo e,,-.[ \utwo f''-. g,-.-> \dtwo a,-. \utwo bes''-. \dtwo c,, \utwo d''-.] |
+\dtwo b,,-.[ \utwo cis d-. e-. fis-. g-.-> a-.]   |
+a-.[ b-. c-.-> d-. e-. f-. g-.] |
+\dtwo g,,,[ \utwo aes'''-. bes,-.-> \dtwo c,,-. des-. \utwo ees''' f-.] |
+\dtwo bes,,,,-.[ \utwo c'''-. des-. \dtwo ees,,,-. f-. \utwo ges''-.-> aes-.] |
+fis-.[ \dtwo gis,,-. \utwo ais''-. \dtwo b,,,, cis' \utwo dis''-.-> \dtwo e,,-.] |
+cis,-.[ \utwo dis'''-.-> \dtwo e,,-. fis,-. gis'-. a,-. b'-.] |
+a,-.[ b'-. \utwo cis'-> d,-. \dtwo e,,-. \utwo fis''-. \dtwo g,,-.] |
+g-.[ \utwo a''-. b-.-> \dtwo c,, d,-. \utwo e''' \dtwo f,,-.] |
+\utwo f''-.[ \dtwo g,,-. \utwo a''-. bes,-.-> c'-. \dtwo d,,,-. ees-.] |
+aes-.[ bes-. \utwo c''-. d-. ees,-.-> \dtwo f,,, \utwo \ottava 1 g''''-.] \ottava 0 |
 s1*7/8 |
 s1*7/8 |
 s1*7/8 |
@@ -23,7 +26,7 @@ s1*7/8 |
 s1*7/8 |
 s1*7/8 \bar "|." }
 
-voiceBitwo = { \tmarktthree
+voiceBitwo = { \tmarktthree \override TimeSignature.stencil = ##f \override Staff.BarLine.stencil = ##f
 \time 7/8 s1*7/8 |
 s1*7/8 |
 s1*7/8 |