completo

diff --git a/book.ly b/book.ly
index 5370b26891845182f0cde9286534e763b953352e..beddd7a58511113d85c61c651ceee0be83f88712 100644 (file)
--- a/book.ly
+++ b/book.ly
@@ -54,6 +54,7 @@
           \override BarNumber.font-size = #1
           \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
           \override Hairpin.to-barline = ##f
+          \override Staff.pedalSustainStyle = #'mixed
         }
       }
     }

diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly
index 4669e3c763543fe23c711b71e129bcbd79c71b91..d28bae175923e38c71e0870122dacc9569c0eeb7 100644 (file)
--- a/manuscripts/III-clarinet.ly
+++ b/manuscripts/III-clarinet.ly
@@ -1,43 +1,59 @@
-% river project
+% net-clarity project
 
 \new Staff \with {
   instrumentName = \markup { clarinet in \concat { \bold "B" \tiny \flat " " } }
   shortInstrumentName = \markup { cl }
   \override DynamicLineSpanner.staff-padding = \sods
+  fontSize = #-2
+  \override StaffSymbol.staff-space = #(magstep -2)
 }
 \transpose bes c' \relative {
   \numericTimeSignature
   \clef treble
   \tempo \markup { "Lento, poco rubato;" \italic "calma" } 4=50
-  \time 5/4 R1*5/4 |
-  \time 4/4 R1 |
-  \time 5/4 R1*5/4 |
-  R1*5/4 |
-  R1*5/4 |
-  \time 4/4 R1 |
-  \time 3/4 R1*3/4 |
-  \time 4/4 d'4(\pp\< c2.~ |
-  \time 3/4 c8)\mp r8 r4 r8 ees8~-> |
+  \time 5/4 R1*5/4 | %1
+  \time 4/4 R1 | %2
+  \time 5/4 R1*5/4 | %3
+  R1*5/4 | %4
+  R1*5/4 | %5
+  \time 4/4 R1 | %6
+  \time 3/4 R1*3/4 | %7
+
+  \sectionLabel \markup { \box \number 8 }
+
+  \time 4/4 d'4(\pp\< c2.~ | %8
+  \time 3/4 c8)\mp r8 r4 r8 ees8~-> | %9
   \time 7/8 4. b4(\> e |
   \time 3/4 cis'2)\p r8 g8(\< |
-  \time 7/8 a4. ges,2)\mp | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel " }
-  \time 4/4 r8\startTextSpan f4.~ 8 ges8_( aes'4~ |
-  aes8) r8 c,4~-> c8 b8~-> \tuplet 3/2 { 8 d8_( g8\stopTextSpan } | \tempo "Piu Mosso" 4=65
-  fis'2~ 8) r8 r8 des8( |
+  \time 7/8 a4. ges,2)\mp |
+  \time 4/4 r8^\markup { "poco accel." } f4.~\p\< 8 ges8_( aes'4~ |
+  aes8) r8 c,4~-> c8 b8~->\f \tuplet 3/2 { 8 d8_(\> g8 } \bar "||"
+
+  \sectionLabel \markup { \box \number 15 }
+
+  \tempo "Piu Mosso" 4=65
+  fis'2~\mf 8) r8 r8 des8(\> |
   ees,1 |
-  aes2.) r16 f'8.~( |
-  1 |
-  bes,1) |
-  r2 a'2~( |
-  a4 e,2.) | \override TextSpanner.bound-details.left.text = \markup { \upright "Rit " }
-  \time 3/4 gis,4.(\startTextSpan fis'8 cis'4)\stopTextSpan | \tempo "A tempo" 4=50
-  r8 f,,4( ees8 bes'4~ |
-  8) a4( d8 g,[ c8~] |
+  aes2.)\mp r8. f'16~(\mf |
+  1\> |
+  bes,1)\p |
+  r2 a'2~(\mp |
+  a4 e,2.) |
+  \time 3/4 gis,4.(\<^\markup { "rit." } fis'8 cis'4)\f \bar "||"
+
+  \sectionLabel \markup { \box \number 23 }
+
+  \tempo "A tempo" 4=50
+  r8 f,,4(\p ees8 bes'4~\< |
+  8) a4( d8 g,[ c8~]\mf |
   8) r8 r8 b8( e,4~ |
-  \time 4/4 e4) fis4.( cis'8~ 8.[ ees16] |
-  bes2) aes4( f4~ |
+  \time 4/4 e4) fis4.(\f cis'8~\> 8.[ ees16] |
+  bes2)\mf aes4(\mp f4~ |
   2) r4 d'4~ |
-  4 e,8[( g] a[ b] c4~ |
+  4 e,8[(\< g] a[ b] c4~\f \bar "||"
+
+  \sectionLabel \markup { \box \number 30 }
+
   \tempo \markup {
     \concat {
       \rhythm { \tuplet 3/2 { 8 } }
@@ -62,7 +78,7 @@
   8)[ c8]( a' d,~ 2) |
   g8( ees~ 2) e4~ |
   e4. cis'8( gis8 b8~ 4) |
-  fis16(\startTextSpan a d,8~ 4) f( dis8.) e,16(\stopTextSpan | \tempo 4=50
+  fis16( a d,8~ 4) f(^\markup { "rit." } dis8.) e,16( | \tempo 4=50
   cis'1) |
   \tempo \markup {
     \concat {
@@ -76,8 +92,8 @@
   \time 3/4 r4 r4 r8 c8~ |
   \time 4/4 c2. g4( |
   \time 3/4 b2.~ |
-  \time 4/4 8) r8 r4 r2\startTextSpan | \tempo 4=50
-  r8\stopTextSpan f,8~( 2. |
+  \time 4/4 8) r8 r4 r2^\markup { "rit." } | \tempo 4=50
+  r8 f,8~( 2. |
   cis'2. ees4~ |
   8) r8 r4 r2 |
   R1 |

diff --git a/manuscripts/III-piano.ly b/manuscripts/III-piano.ly
index 0f47d46e4ad85847b683a82fac57cca1c2994a71..6b3659f25c018958cfb0484d2a650e3789ce36e8 100644 (file)
--- a/manuscripts/III-piano.ly
+++ b/manuscripts/III-piano.ly
@@ -16,7 +16,7 @@
       \relative {
         \numericTimeSignature
         \tempo \markup { "Lento, poco rubato;" \italic "calma" } 4=50
-        \time 5/4 r8\p f8~^\markup { \italic "piu" \dynamic f } 2~ f4. gis8( |
+        \time 5/4 r8\p_\markup { \tiny \italic "legato" } f8~^\markup { \tiny \italic "piu" \dynamic f } 2~ f4. gis8( |
         \time 4/4 <fis cis'>2.) <ais dis>4~-> |
         \time 5/4 4\mp\> b8( e,~ e2.)\p |
         r4 <g d'>4( <a c>2.) |
@@ -24,35 +24,50 @@
         \time 4/4 <fis, gis~>4 <gis dis'>2.)\p |
         \time 3/4 r4 a8( <e b'>~ 4) |
         \clef treble \time 4/4 d'4(\mp <c g'>2.) |
-        \time 3/4 r8 f8~ <f bes,>4~ 8 dis8( |
-        \time 7/8 gis4.) b,4(~ <b e>4) |
-        \time 3/4 cis'4.( d,8~ 8)[ g]( |
-        \time 7/8 a4. ges,8~ <ges c>~ 4) | \override TextSpanner.bound-details.left.text = \markup { \upright "Accel " }
-        \time 4/4 r8\startTextSpan f8( fis cis') r8 bes( aes' ees~ |
-        2) r4 \tuplet 3/2 { r8 a,( e')\stopTextSpan } \bar "||" \tempo "Piu Mosso" 4=65
-        r2 \tuplet 3/2 { r8 c'4~-> } 8 \clef bass e,,8 |
+        \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 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 "||"
+
+        \sectionLabel \markup { \box \number 15 }
+
+        \tempo "Piu Mosso" 4=65
+        r2\mf \tuplet 3/2 { r8 c'4~-> } 8 \clef bass e,,8 |
         <d g>1~\arpeggio |
         1 |
         R1 |
-        r2 ees2~ |
-        4 \clef treble <fis cis' gis'>2.~\arpeggio |
-        1 |\override TextSpanner.bound-details.left.text = \markup { \upright "Rit " }
-        \time 3/4 r4 a'2 \bar "||" \tempo "A tempo" 4=50
-        R1*3/4 |
+        r2 ees2~\p |
+        4 \clef treble <fis cis' gis'>2.~\mp\arpeggio |
+        1 |
+        \time 3/4 r4\mf^\markup { "rit." } a'2 \bar "||"
+
+        \sectionLabel \markup { \box \number 23 }
+
+        \tempo "A tempo" 4=50
+        R1*3/4\p |
         R1*3/4 |
         R1*3/4 |
         \time 4/4 R1 |
         R1 |
         ees1 |
         des1 \bar "||"
-        \time 7/4 r2. \tuplet 3/2 { r4 f'8~( } \tuplet 3/2 { 4 bes,8 } \tuplet 3/2 { ees4) aes,4( des4 } |
+
+        \sectionLabel \markup { \box \number 30 }
+
+        \time 7/4 r2 r4 \tuplet 3/2 { r4 f'8~(^\markup { \tiny \italic "piu" \dynamic f \tiny \italic "misterioso" } } \tuplet 3/2 { 4 bes,8 } \tuplet 3/2 { ees4) aes,4( des4 } |
         fis,1~ 4) \tuplet 3/2 { r8 fis4->(~ } 4 |
         b1) r4 \tuplet 3/2 { r4 e4( d } |
-        c2~ \tuplet 3/2 { 4 a8 } g2.) g4->( |
-        \time 4/4 \tuplet 3/2 { f8 bes4~ } 16) a( cis d e8) fis16( g \tuplet 5/4 { b8) c16( ees aes,) } |
+        c2~ \tuplet 3/2 { 4 a8 } g2.) g4-> |
+        \time 4/4 \tuplet 3/2 { f8( bes4~ } 16) a( cis d e8) fis16( g \tuplet 5/4 { b8) c,16( ees aes) } |
         f'2.~ 8 r8 |
+
+        \sectionLabel \markup { \box \number 36 }
+
+
         ais,2. <g, g'>8 <d' d'> |
-        <a' a'>4. <cis, cis'>8 <gis' gis'>4 <dis dis'>8 <e e'> |
+        <a' a'>4. <cis, cis'>8 <gis' gis'>4~ \tuplet 3/2 { 8 <dis dis'>8 <e e'> } |
         <fis fis'>2. b8( c,~ |
         4) f2~ 8 aes( |
         <ges des'>2. <ees bes'>4) |
@@ -61,9 +76,11 @@
         r2 r8 \clef treble \ottava #1 <ees''' aes>4.~( |
         4 <cis e b'>2.) |
         r8 <bes ges'>8~ 2 \ottava #0 r8 <d,, a>8~ |
-        1 |
-        \stemUp \D <bes, g'>4. \U \stemNeutral des''16(\startTextSpan c \tuplet 3/2 { aes'4) bes,8( } g8) b8\stopTextSpan | \tempo 4 = 50
+        1 \clef bass |
+        \stemUp <bes, g'>4. \clef treble \stemNeutral des''16( c \tuplet 3/2 { aes4)^\markup { "rit." } bes8( } g8) b8 | \tempo 4 = 50
         r2 \tuplet 3/2 { dis8 fis, dis' } \tuplet 3/2 { fis, dis' fis, } |
+
+
         \tempo \markup {
           \concat {
             \rhythm { \tuplet 3/2 { 8 } }
@@ -113,9 +130,10 @@
   \new Staff = "d" \with { \consists "Merge_rests_engraver" }
   {
     \clef bass
-    \set Staff.pedalSustainStyle = #'bracket
+    \set Staff.pedalSustainStyle = #'mixed
     \accidentalStyle piano
     \override Score.SpacingSpanner.strict-grace-spacing = ##t
+    \override DynamicLineSpanner.staff-padding = \phds
     \relative {
         \numericTimeSignature
         \tempo \markup { "Lento, poco rubato;" \italic "calma" } 4=50
@@ -131,12 +149,16 @@
         \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 \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 } \tuplet 3/2 { ees8 <bes' ges'>4~ } \tuplet 3/2 { 8 4 } |
-        \tempo "Piu Mosso" 4=65 b,2~->^\mf \tuplet 3/2 { 8 a'4~-> } 8 r8 |
+        \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 } |
+
+        \sectionLabel \markup { \box \number 15 }
+
+        \tempo "Piu Mosso" 4=65
+        b,2~-> \tuplet 3/2 { 8 a'4~-> } 8 r8 |
         <bes, f'>1~\arpeggio |
         1 |
-        r2 <c g'>2~\arpeggio |
+        r2 <c g'>2~^\mp\arpeggio |
         1~ |
         4 d,2.~ |
         4~ <d b''>2.
@@ -145,29 +167,35 @@
         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.\pp |
-        \U \tuplet 3/2 { ees8( \D bes\< ges } \tuplet 3/2 { bes ges bes } \tuplet 3/2 { ges\p\> bes ges } \tuplet 3/2 { bes ges bes)\pp } |
-        \U \tuplet 3/2 { des8( \D aes\< f } \tuplet 3/2 { aes f aes } \tuplet 3/2 { f aes f } \tuplet 3/2 { aes f aes)\mp } |
+        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 } |
+
+        \sectionLabel \markup { \box \number 30 }
+
         <<
           \relative {
             \voiceOne
-            \time 7/4 a8[(\f c, a' c, a' c, a' c,] a'[ c, a' c, a' c,]) |
-            g'8[( b, g' b, g' b, g' b,] g'[ b, g' b, g' b,]) |
-            ges'8[( aes, ges' aes, ges' aes, ges' aes,] ges'[ aes, ges' aes, ges' aes,]) |
-            f'8[( bes, f' bes, f' bes, f' bes,] f'[ bes, f']) r8 r4 |
+            \time 7/4 a8[^\mf^\>\sustainOff\sustainOn c, a' c, a' c,^\!^\< a' c,] a'[ c, a' c, a' c,] |
+            g'8[^\mf^\>\sustainOff\sustainOn b, g' b, g' b,^\!^\< g' b,] g'[ b, g' b, g' b,] |
+            ges'8[ aes,^\f^\>\sustainOff\sustainOn ges' aes, ges' aes, ges' aes,] ges'[^\!^\< aes, ges' aes, ges' aes,] |
+            f'8[^\f^\>\sustainOff\sustainOn bes, f' bes, f' bes, f' bes,] f'[ bes, f']^\mp r8 r4 |
           }
           \new Voice \relative {
             \voiceTwo
-            \time 7/4 e,2.~ 8 8->~ 2. |
+            \time 7/4 e,2.~-> 8 8->~ 2. |
             d2.-> d1~-> |
             d8 ees8->~ 2.~ 4 2-> |
             des2.->~ 8 8->~ 2. |
           }
         >>
         \oneVoice
-        \time 4/4 \tuplet 3/2 { b,,8( fis'4~ } 16) g( aes ees' c8) bes16( d \tuplet 5/4 { f8) e16( a cis,) } |
-        gis'2.~ 8 r8 |
-        \tuplet 5/4 { dis8~ <dis fis,>~ <dis fis, b,>4.~ } 2 |
+        \time 4/4 \tuplet 3/2 { b,,8(\sustainOff fis'4~ } 16) g( aes ees' c8) bes16( d \tuplet 5/4 { f8) e16( a cis,) } |
+        gis2.~ 8 r8 |
+
+        \sectionLabel \markup { \box \number 36 }
+
+        \tuplet 5/4 { dis'8~ <dis fis,>~ <dis fis, b,>4.~ } 2 |
         <c, e'>2\arpeggio \tuplet 3/2 { d8~ <d bes'>~ <d bes' f'>~ } 4 |
         <d a'>2.~ 8 des8~ |
         4 <c g' d'>2.\arpeggio |

diff --git a/variables/program notes.ly b/variables/program notes.ly
index bc1de6bad509a8b19999f79c29ce7a04a58eff46..b0706b13f2907470be287a94afa204a9c05be4f5 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 {
-      river sonata
+      for Amber Lucas
     }
   }
 }