From: Tucker Johnson <tucker@newer.systems>
Date: Thu, 24 Oct 2024 17:51:38 +0000 (-0400)
Subject: lesson
X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=b35c66cca793ff29a557ee03aed10d742b3bd7b0;p=net-clarity.git

lesson
---

diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly
index 1d47573..e73b422 100644
--- a/manuscripts/II-clarinet.ly
+++ b/manuscripts/II-clarinet.ly
@@ -48,7 +48,7 @@
   ees'2.\p
   \time 4/4 f,,8-.-> c''8( 2.)
   \time 4/4 d,8(\< bes)-. a'4\f des,8-.-> ees( g) aes,-.
-  c'4 r4 r2 |
+  c'2~\p\< c8\f r8 r4 |
   r2 r8 e,,8-.-> a''4(\p |
   \time 9/8 fis8[) b,,-.-> d''-- g,,,]-.-> b''4 dis,,,8-.-> ais'''( cis)
   gis,8\f( e b'4) r2 |
@@ -58,7 +58,13 @@
   \time 3/4 r4 r4 a,8(\f\< e) |
   \time 6/8 aes,-.->\! r8 r8 b''4.\p |
   ees,,8\f\< g,-.-> d-.->\! bes'''4.(~\p |
-  \time 2/4 bes4. a8) |
-  f,->
+  \time 3/4 bes4. a8) f,-> r8
+  r4 r4 r8 fis8~(\mp |
+  fis2. |
+  aes2 g8-.) r8 |
+  r4 c4( des,4~ |
+  2.~
+  2.
+  d,2) r4
 
 }
diff --git a/manuscripts/II-piano.ly b/manuscripts/II-piano.ly
index 7a583f3..1ce1df2 100644
--- a/manuscripts/II-piano.ly
+++ b/manuscripts/II-piano.ly
@@ -5,6 +5,7 @@
   shortInstrumentName = \markup { "pno " }
   \consists Text_mark_engraver
   \consists Metronome_mark_engraver
+  \consists "Merge_rests_engraver"
 }
 <<
   \numericTimeSignature
@@ -46,19 +47,48 @@
         r8 bes8-.-> des-.-> f-.-> r8 fis-.->\f |
         R1*6/8
         \time 4/4 R1 |
-        d8-.-> bes a'-.-> r8 des,8 ees-.-> g-.-> aes, |
+        d8-.->\mf\< bes a'-.-> r8 des,8 ees-.-> g-.->\f aes, |
         c'8-.-> r8 r4 r2 |
         R1 |
         \time 9/8 R1*9/8 |
         \time 4/4 gis8-.-> e-.-> b'-.-> r8 r2 |
         R1 |
-        \time 7/8 b4.( bes2~
-        \time 4/4 bes1~ |
-        \time 3/4 bes2 a8) e8~ |
-        \time 6/8 e2.( |
-        ees2.~
-        \time 2/4 ees2 |
-        f8) r8
+        <<
+          \relative {
+            \voiceOne
+            g''8-. r8 r8 g8-. r8 g8[-. aes]~ |
+            aes1 |
+            r4 r4 d8( des8-.) |
+            r8 r8 des8-. ges,4. |
+            ges4 ges8-. r4. |
+            r4 c8-. r8 c,8-. r8 |
+            c'2.(^\mf |
+            cis,2) d,4~ |
+            \voiceTwo
+            2.~
+            2.~ |
+            d8 aes'4(\f fis4.~ |
+            fis4 g2~ |
+            g2.) |
+          }
+          \new Voice
+            \relative {
+            \voiceTwo
+            \time 7/8 b'8-. r8 r8 bes8-. r8 bes[-. bes]~
+            \time 4/4 bes1 |
+            \time 3/4 r4 r4 a8( e8-.) |
+            \time 6/8 r8 r8 e8-. e4. |
+            ees4 ees8-. r4.
+            \time 3/4 r4 ees8-. r8 f8-. r8 |
+            r8 f'4(\p e4) r8 |
+            s2. |
+            \voiceOne
+            r4 b8-.^\p r8 r4 |
+            s2. |
+            s2. r4 r8 a4(^\mp ees'8~ |
+            ees8) r8 bes8-. r8
+          }
+      >>
 
       }
     >>
@@ -98,22 +128,29 @@
         gis2~ gis8 r8 r4 r4 ees,4~\p |
         \time 6/8  ees2. |
         g8( c,8-.) r8 d'~\mp\< <d fis>~ <d fis a>~ |
-        8 r8 r8\f r8 \override Staff.DynamicText.stencil = ##t b,8-.^\p r8 |
+        8 r8 r8\f r8 b,8-. r8 |
         r8 gis'4~( gis4. |
         f'8-.) r8 r4 r2 |
-        r4 e,8-. r8 r4 bes8( f'8~ |
-        f1~ |
+        r4 e,8-. r8 r4 bes4~ |
+        bes8 r8 r4 r4 r8 f'8~(-> |
         f2~ f8 des8-.) r4 |
         R1*9/8 |
         r4 fis4~( fis4. d8 |
         a8) r8 r4 r2 |
-        g4.~( g4~ g8 aes8~ |
-        aes1~ |
-        aes2 d8) des8~( |
-        des4. ges4.~ |
-        ges2.~ |
-        ges4. c8~ |
-        c8) r8
+        s1*7/8
+        s1
+        s1*3/4
+        s1*6/8
+        s1*6/8
+        s1*3/4
+        s1*3/4
+        r4 ees''8-.^\mp r8 r4 |
+        r4 r4 r8 a8-.
+        r8 bes,8-. r4 r4 |
+        r4 r4 e8-. r8 |
+        f,-. r8 r4 r4 |
+        r4 r8 b8-.
+
 
 
       }
diff --git a/net-clarity.ly b/net-clarity.ly
index e2a3c10..91b90fa 100644
--- a/net-clarity.ly
+++ b/net-clarity.ly
@@ -220,31 +220,31 @@ clarinetMagstep = #(magstep -2)
     tagline = "test"
   }
 
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { \xinst }
-%      piece = \markup { \large \bold "I. " }
-%    }
-%    \tocItem \markup { "I. " \bold "Largo - Allegro moderato" }
-%    \score {
-%      <<
-%        \include "manuscripts/I-clarinet.ly"
-%        \include "manuscripts/I-piano.ly"
-%      >>
-%      %\midi { }
-%      \layout {
-%        \context {
-%          \Score
-%          \override RehearsalMark.break-visibility = #begin-of-line-invisible
-%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
-%          \override Hairpin.to-barline = ##f
-%        }
-%      }
-%    }
-%  }
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { \xinst }
+      piece = \markup { \large \bold "I. " }
+    }
+    \tocItem \markup { "I. " \bold "Largo - Allegro moderato" }
+    \score {
+      <<
+        \include "manuscripts/I-clarinet.ly"
+        \include "manuscripts/I-piano.ly"
+      >>
+      %\midi { }
+      \layout {
+        \context {
+          \Score
+          \override RehearsalMark.break-visibility = #begin-of-line-invisible
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
+          \override Hairpin.to-barline = ##f
+        }
+      }
+    }
+  }
 
   \bookpart {
     \tocItem \markup { "II. " \bold "Vivace" }