light work

diff --git a/book.ly b/book.ly
index 643b1c54f258d89a33afdf9fcfd01a43c8a271d6..1b4ffcce1874c3e0324b3c4b3d45fc96f9b70547 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -37,14 +37,14 @@
 %    }
 %  }
   \bookpart {
-    \tocItem \markup { "III. " \bold "Chiaro; calma" }
+    \tocItem \markup { "III. " \bold "Calma" }
     \score {
       \header {
         title = \markup { \fontsize #1 \xtitle }
         subtitle = \markup { \medium \italic \xsub }
         composer = \xcomp
         poet = \markup { \xinst }
-        piece = \markup { \large "III." \bold "Chiaro; calma" }
+        piece = \markup { \large "III." \bold "Calma" }
       }
       <<
         \include "manuscripts/III-clarinet.ly"
@@ -57,7 +57,7 @@
           \remove Text_mark_engraver
           \override RehearsalMark.break-visibility = #begin-of-line-invisible
           \override BarNumber.font-size = #1
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
           \override Hairpin.to-barline = ##f
           \override Staff.pedalSustainStyle = #'mixed
         }

diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly
index bfa1855b19fc6dfb28ba0aef3d3a3cec1957b972..b678543320065ea22d267ed578be134fb4adbbfd 100644 (file)
--- a/manuscripts/III-clarinet.ly
+++ b/manuscripts/III-clarinet.ly
@@ -72,8 +72,8 @@
   \sectionLabel \markup { \box \number 36 }
 
   bes,1-- |
-  R1 |
-  fis'2.--\f r4 |
+  r2 r4 \tuplet 3/2 { r8 r8 fis'8~\f } |
+  fis2. r4 |
   R1 |
   cis2.--\mf r4 |
   b8(\mp e,~ 2\< g4~ |
@@ -130,7 +130,7 @@
 
   \tuplet 3/2 { c8_(\p\<^\markup { \tiny \italic "fioritura" } b' e~ } 4)\mf \tuplet 3/2 { g,8(\> d a~ } 4~\p |
   8) fis4( g8~ 4 cis4~ |
-  \time 3/4 8)[ r16 cis16(]\< aes'4 c,4 |
+  \time 3/4 8)[ r16 des16(]\< aes'4 c,4 |
   \time 7/8 f bes d4.~\mf |
   \time 3/4 8) r8 b8(\> e, a,4~\! |
   \time 7/8 8)[ r8 aes'8(]\> des,[ ges,8~] 4~\p |

diff --git a/manuscripts/III-piano.ly b/manuscripts/III-piano.ly
index 278cb6ac3ee16154c48b2660d4d1609949118b82..dd7ff00ebcb20eb675820307e6b9a9e408be839c 100644 (file)
--- a/manuscripts/III-piano.ly
+++ b/manuscripts/III-piano.ly
@@ -28,7 +28,7 @@
         \time 3/4 r8 f8~\> <f bes,>4~ 8 dis8( |
         \time 7/8 gis4.)\p b,4(~ <b e>4) |
         \time 3/4 cis'4.(\< d,8~ 8)[ g]( |
-        \time 7/8 a4. ges,8~\mp <ges c>~ 4) |
+        \time 7/8 a4. ges,8~[\mp <ges c>~] 4) |
         \time 4/4 r8\p\<^\markup { "poco accel." }_\markup { \tiny \italic "quasi-waltz" } f8( fis cis') r8 bes( aes' ees~\mf |
         2)\mp\< r4 \tuplet 3/2 { r8 a,(\f\> e') } \bar "||"
 
@@ -74,9 +74,9 @@
         \sectionLabel \markup { \box \number 36 }
         \set PianoStaff.connectArpeggios = ##f
 
-        ais,2.--\f_\markup { \italic \tiny "maestoso" } <g, g'>8 <d' d'> |
-        <a' a'>4.\arpeggio <cis, cis'>8 <gis' gis'>4~\ff\arpeggio \tuplet 3/2 { 8 <dis dis'>8\> <e e'> } |
-        <fis fis'>2.\mf\arpeggio b8( c,~ |
+        ais,2.--\f_\markup { \italic \tiny "maestoso" } <g, g'>8\arpeggio <d' d'>\arpeggio |
+        <a' a'>4.\arpeggio <cis, cis'>8\arpeggio <gis' gis'>4\ff\>\arpeggio \tuplet 3/2 { <dis dis'>8 <e e'> <fis fis'>8~\mf } |
+        <fis fis'>2. b8( c,~ |
         4) f2~ 8 aes(\> |
         <ges des'>2. <ees bes'>4)\mp |
         r8 \clef bass <des,, aes'>8~\arpeggio 2. |
@@ -85,12 +85,12 @@
         4 <cis e b'>2.) |
         r8 <bes ges'>8~ 2 \ottava #0 r8 \clef bass <d,, a>8~\mf |
         <d a c,>1 |
-        g,4. \clef treble des''16(\> c \tuplet 3/2 { aes4)^\markup { "rit." } bes8( } g8) b8 |
+        g,4. \clef treble des''16(\> c \tuplet 3/2 { aes4)^\markup { "rit." } bes8( } g8) b8 \bar "||"
 
         \sectionLabel \markup { \box \number 48 }
 
         \tempo 4 = 50
-        r2\mp \tuplet 3/2 { r8 fis\ppp\< dis' } \tuplet 3/2 { fis, dis' fis, } |
+        r2\mp \tuplet 3/2 { r8 fis\ppp\< dis' } \tuplet 3/2 { fis, dis' fis, } \bar "||"
         \tempo \markup {
           \concat {
             \rhythm { \tuplet 3/2 { 8 } }
@@ -161,32 +161,36 @@
         <<
           \relative {
             \voiceOne
-            \time 5/4 r8 g8_~ <g d'>4~ 2. |
-            \time 4/4 r8 e8~ <e b'>4~ 2 |
+            \time 5/4 r4 d'4~ 2. |
+            \time 4/4 r4 b2. |
             \time 5/4 r2 gis2. |
-            r8 bes,4~ <bes f'>8~ 2. |
-            r8 g'4~ <g d'>8~ <g d'~>2 d'4 |
-            \time 4/4 r8 e,8~ <e b'>4~ 2 |
-            \time 3/4 r8 cis8~ <cis gis'>2 |
-            \time 4/4 r8 bes8~ <bes f'>4~ 2 |
+            r4 r8 f8~ 2. |
+            r4 r8 d'8~ 2. |
+            \time 4/4 r4 b2. |
+            \time 3/4 r4 gis2 |
+            \time 4/4 r4 f4~ 2 |
+            \time 3/4 r4 d'2 |
+            \time 7/8 r8 cis,8_~[ <cis fis>8~] 2 |
+            \time 3/4 r4 e'2 |
+            \time 7/8 r8 r8 f8~ 2 |
           }
           \new Voice \relative {
             \voiceTwo
-            \time 5/4 c2~ c2. |
-            \time 4/4 a1 |
+            \time 5/4 c8~ <c g'>8~ 4~ 2. |
+            \time 4/4 a8~ <a e'>8~ 2. |
             \time 5/4 fis4. cis'8~ 2. |
-            ees,2~ ees2. |
-            c'2~ 2 r4 |
-            \time 4/4 a1 |
-            \time 3/4 fis2. |
-            \time 4/4 ees1 |
+            ees,8~ <ees bes'>8~ 4~ 2. |
+            c'8~ <c g'>8~ 4~ 2 r4 |
+            \time 4/4 a8~ <a e'>8~ 2. |
+            \time 3/4 fis8~ <fis cis'>8~ 2 |
+            \time 4/4 ees8 <ees bes'>8~ 2. |
+            \time 3/4 c'8~ <c g'>8~ 2 |
+            \time 7/8 a4. r2 |
+            \time 3/4 b8~ <b gis'>~ 2 |
+            \time 7/8 bes8~ <bes ees>4~ 2 |
           }
         >>
         \oneVoice
-        \time 3/4 c'8~( <c g'>8~ <c g' d'>2) |
-        \time 7/8 a8~([ <a cis>~ <a cis~ fis~>] <cis fis>2) |
-        \time 3/4 b8~( <b gis'>~ <b gis' e'>2) |
-        \time 7/8 bes8~([ <bes ees>~ <bes ees f'>~] 2) |
         \time 4/4 \once \offset staff-padding 1 TupletBracket \tuplet 3/2 { d,8 <b' g'>4~ } \tuplet 3/2 { 8 4 } \tuplet 3/2 { c,8 <a' e'>4~ } \tuplet 3/2 { 8 4 } |
         \tuplet 3/2 { des,8 <aes' f'>4~ } \tuplet 3/2 { 8 4 } \once \offset staff-padding 1 TupletBracket \tuplet 3/2 { ees8 <bes' ges'>4~ } \tuplet 3/2 { 8 4 } |
 
@@ -200,14 +204,29 @@
         1~ |
         4 d,2.~ |
         4~ <d b''>2.
-        \time 3/4 b'8~( <b e'>8~ 2) |
-        c'8~( <c g'>~ <c g' d'>2) |
-        ees,8~( <ees bes'>~ <ees bes' f'>2) |
-        gis8( fis'~ <fis cis'>2) |
-        \time 4/4 a,8~( <a d>~ <a d b'>2.) |
-        g8~( <g e'>4.~ 8) c'4. |
-        \tuplet 3/2 { r8^\pp^\<\sustainOn bes8 ges } \tuplet 3/2 { bes ges bes } \tuplet 3/2 { ges^\!^\> bes ges } \tuplet 3/2 { bes ges bes } |
-        \tuplet 3/2 { r8^\p^\<\sustainOff\sustainOn aes8 f } \tuplet 3/2 { aes f aes } \tuplet 3/2 { f aes f } \tuplet 3/2 { aes f aes } |
+        \time 3/4 b'8~ <b e'>8~ 2 |
+        <<
+          \relative {
+            \voiceOne
+            r4 d'2 |
+            r4 f,2 |
+            r8 fis8_~ <fis cis'>2 |
+            \time 4/4 r4 b2. |
+          }
+          \new Voice \relative {
+            \voiceTwo
+            c8~ <c g'>~ 2 |
+            ees,8~ <ees bes'>~ 2 |
+            gis4 r4 r4 |
+            \time 4/4 a8~ <a d>~ 2. |
+          }
+        >>
+        \oneVoice
+        g'8~ <g e'>8~ 4~ 8 c'8~ 4 |
+        \tuplet 3/2 { r8^\pp^\<\sustainOn bes8 ges } \tuplet 3/2 { bes ges bes }
+        \tuplet 3/2 { ges^\!^\> bes ges } \tuplet 3/2 { bes ges bes } |
+        \tuplet 3/2 { r8^\p^\<\sustainOff\sustainOn aes8 f } \tuplet 3/2 { aes f aes }
+        \tuplet 3/2 { f aes f } \tuplet 3/2 { aes f aes } |
 
         \omit Score.BarNumber
         \sectionLabel \markup { \box \number 30 }
@@ -225,7 +244,7 @@
             \voiceTwo
             \time 7/4 e,2.~-> 8 8->~ 2. |
             d2.-> d1~-> |
-            d8 ees8->~ 2.~ 4 2-> |
+            d8 ees8->~ 2.~ 8 8~-> 2 |
             des2.->~ 8 8->~ 2. |
           }
         >>
@@ -236,7 +255,7 @@
         \omit Score.BarNumber
         \sectionLabel \markup { \box \number 36 }
 
-        \tuplet 5/4 { dis'8~_\markup { \parenthesize { \concat { \italic "con " \musicglyph #"pedal.Ped" } } } <dis fis,>~ <dis fis, b,>4.~ } 2 |
+        \tuplet 5/4 { dis'8~ <dis fis,>~ <dis fis, b,>4.~ } 2 |
         \undo \omit Score.BarNumber
         <c, e'>2\arpeggio \tuplet 3/2 { d8~ <d bes'>~ <d bes' f'>~ } 4 |
         <d a'>2.~ 8 des8~ |
@@ -244,7 +263,7 @@
         <a e' b'>1\arpeggio |
         \ottava #-1 fis1 |
         ees1 |
-        g2~ 8 \ottava #0 r8 r4 |
+        g2 r8 \ottava #0 r8 r4 |
         R1 |
         R1 |
         \tuplet 3/2 { r8 r8 \ottava #-1 f8~ } 2. |

diff --git a/variables/a version number.ly b/variables/a version number.ly
index 36c9bed4c7e6173ecaf3409e63173828e9aca863..b5cc4738726a07241adbf48bfd422d868469682d 100644 (file)
--- a/variables/a version number.ly
+++ b/variables/a version number.ly
@@ -1 +1 @@
-\version "2.24.0"
+\version "2.24.3"

diff --git a/variables/program notes.ly b/variables/program notes.ly
index b0706b13f2907470be287a94afa204a9c05be4f5..73127798ac077d98764f01bbe72067e9e384a603 100644 (file)
--- a/variables/program notes.ly
+++ b/variables/program notes.ly
@@ -3,7 +3,7 @@
 xpnote = \markup {
   \center-column {
     \override #'(line-width . 100) \justify {
-      for Amber Lucas
+      incomplete
     }
   }
 }

diff --git a/variables/variables.ly b/variables/variables.ly
index cec1144e1078348e37b14f6a0774089b76815b53..3b4ecbd98a8d302952cbff0d7979178a6c6faab1 100644 (file)
--- a/variables/variables.ly
+++ b/variables/variables.ly
@@ -1,9 +1,9 @@
 % river project
 %texts
 xtitle = \markup { Net Clarity }
-xsub = \markup { for Amber Lucas }
+xsub = \markup { " " }
 xcomp = \markup { Tucker Johnson }
-xinst = \markup  { Clarinet and Piano }
+xinst = \markup  { clarinet and piano }
 xdur = \markup { \null }
 xcr = \markup \tiny { Copyright Tucker Johnson MMXXIII. All Rights Reserved }
 oddfoot = \markup { \fill-line { \null \center-column { \concat { " - " \fromproperty #'page:page-number-string " - " } \small { \xcomp } } \null } }