mvm3

diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly
index 96846cf26ca2d9f5ba1740afda1efcda46f932b0..1e69d1f90069375fd0d839740747143e41539ab4 100644 (file)
--- a/manuscripts/II-clarinet.ly
+++ b/manuscripts/II-clarinet.ly
@@ -175,7 +175,7 @@
   a8 cis4 f4.)\f | %072
   <<
     {
-      aes,8-.-> r8 r4 \voiceOne r4 | %073
+      aes,8-.-> r8 r4 \tag #'part { \voiceOne } r4 | %073
       r8
     }
     \tag #'part {
@@ -185,7 +185,7 @@
         }
     }
   >>
-  \oneVoice \cueClefUnset b'8( dis,8) e,,8( c') d'8-.-> | %074
+  \tag #'part { \oneVoice } \cueClefUnset b'8( dis,8) e,,8( c') d'8-.-> | %074
   \tag #'part { \break \noPageBreak }
   d2.\pp | %075
   g8-.-> d8~ d4~ d8 d8-. | %076

diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly
index e8ead63c8922e065f3c142cc24784233b7053616..d58a7eee4db174da5f1aa4b04568bcc5f44d798b 100644 (file)
--- a/manuscripts/III-clarinet.ly
+++ b/manuscripts/III-clarinet.ly
@@ -1,6 +1,6 @@
 % root = ../net-clarity.ly
 
-\new Staff \with {
+\new Staff = "cl3" \with {
   instrumentName = \markup { clarinet in \concat { \bold "B" \tiny \flat " " } }
   shortInstrumentName = \markup { cl }
   \override DynamicLineSpanner.staff-padding = \sods
@@ -18,18 +18,21 @@
     {
       \time 5/4 R1*5/4 | %001
       \time 4/4 R1 | %002
-      \time 5/4 R1*5/4*3 | %003
-      \time 4/4 R1 | \tag #'part { \break \noPageBreak } %006
+      \time 5/4 R1*5/4 | %003
+      \tag #'part { \break \noPageBreak }
+      R1*5/4 | %004
+      R1*5/4 | %005
+      \time 4/4 R1 | %006
       \time 3/4 R1*3/4 \cueClefUnset | %007
     }
     \tag #'part {
         \new CueVoice \relative {
-          \cueClef "bass" c8\laissezVibrer <g' f>\laissezVibrer d'4\laissezVibrer r4 r8 gis,8( |
-          <cis fis, a,>8\laissezVibrer e,8\laissezVibrer b4\laissezVibrer <ais dis'>4->\laissezVibrer |
-          fis4\laissezVibrer b'8( <e, cis>8)\laissezVibrer gis2. |
+          \cueClef "bass" c8\laissezVibrer <g' f>8\laissezVibrer d'2\laissezVibrer r4 r8 gis,8 |
+          <cis fis, a,>8\laissezVibrer e,8\laissezVibrer b'2\laissezVibrer <ais dis>4->\laissezVibrer |
+          fis,4\laissezVibrer b'8 <e, cis>8\laissezVibrer gis2. |
           ees,8\laissezVibrer bes'\laissezVibrer <g' d'>8\laissezVibrer f8~ 2. |
-          c8\laissezVibrer g'8\laissezVibrer <f bes>8\laissezVibrer d'8~ 4\laissezVibrer r4 r8 cis8( |
-          <gis fis a,>8\laissezVibrer e8\laissezVibrer <b' dis>2.) |
+          c8\laissezVibrer g'8\laissezVibrer <f bes>8\laissezVibrer d'8~ 4\laissezVibrer r4 r8 cis8 |
+          <gis fis a,>8\laissezVibrer e8\laissezVibrer <b' dis>2. |
           fis,8[\laissezVibrer cis']\laissezVibrer <gis'\laissezVibrer a>[ <b e,>]~ 4 |
         }
     }
@@ -39,41 +42,73 @@
   \sectionLabel \markup { \huge \box \sans \bold 8 }
 
   \omit Score.BarNumber
-  \time 4/4 \clef treble d'4(\pp\< c2.~ | %8
+  \tag #'part { \break \noPageBreak }
+  \time 4/4 \clef treble d'4(\pp\< c2.~ | %008
   \undo \omit Score.BarNumber
-  \time 3/4 c8)\mp r8 r4 r8 ees8~-> | %9
+  \time 3/4 c8)\mp r8 r4 r8 ees8~-> | %009
   \time 7/8 4. b4(\p\< e | %010
-  \time 3/4 cis'2)\! r8 g8(\< | \tag #'part { \break \noPageBreak } %011
+  \time 3/4 cis'2)\! r8 g8(\< | %011
+  \tag #'part { \break \noPageBreak }
   \time 7/8 a4. ges,2)\mp | %012
-  \time 4/4 \pocAce r8\startTextSpan f4.~\p\< 8 ges8_( aes'4~ |
-  aes8) r8 c,4~-> c8 b8~->\f \tuplet 3/2 { 8 d8_(\> g8\stopTextSpan } \bar "||"
+  \time 4/4 \timeSpanner "poco accel." r8\startTextSpan f4.~\p\< 8 ges8_( aes'4~ | %013
+  aes8) r8 c,4~-> c8 b8~->\f \tuplet 3/2 { 8 d8_(\> g8\stopTextSpan } \bar "||" %014
 
   \sectionLabel \markup { \huge \box \sans \bold 15 }
 
   \omit Score.BarNumber
   \tempo "Piu Mosso" 4=65
-  fis'2~\mf 8) r8 r8 des8(\> |
+  fis'2~\mf 8) r8 r8 des8(\> | %015
   \undo \omit Score.BarNumber
-  ees,1 | \tag #'part { \break \noPageBreak }
-  aes2.)\mp r8. f'16~(\mf |
-  1\> |
-  bes,1)\p |
-  r2 a'2~(\mp |
-  a4 e,2.) |
-  \time 3/4 \rit gis,4.(\<\startTextSpan fis'8 \after 8 \stopTextSpan cis'4)\f \bar "||" \tag #'part { \break \noPageBreak }
-
-  \sectionLabel \markup { \huge \box \sans \bold 23 }
-
-  \omit Score.BarNumber
-  \tempo "A tempo" 4=50
-  r8 f,,4(\p ees8 bes'4~\< |
-  \undo \omit Score.BarNumber
-  8) a4( d8 g,[ c8~]\mf |
-  8) r8 r8 b8( e,4~ |
-  \time 4/4 e4) fis4.(\f cis'8~\> 8.[ ees16] | \tag #'part { \break \noPageBreak }
-  bes2)\mf aes4(\mp f4~ |
-  2) r4 d'4~ |
-  4 e,8[(\< g] a[ b] c4~\f \bar "||"
+  \tag #'part { \break \noPageBreak }
+  ees,1 | %016
+  aes2.)\mp r8. f'16~(\mf | %017
+  <<
+    {
+      1\> | %018
+      bes,1)\p | %019
+      r2 a'2~(\mp | %020
+      \tag #'part { \break \noPageBreak }
+      a4 e,2.) | %021
+      \time 3/4 \rit gis,4.(\<\startTextSpan fis'8 \after 8 \stopTextSpan cis'4)\f \bar "||" %022
+
+      \sectionLabel \markup { \huge \box \sans \bold 23 }
+
+      \omit Score.BarNumber
+      \tempo "A tempo" 4=50
+      r8 f,,4(\p ees8 bes'4~\< | %023
+      \undo \omit Score.BarNumber
+      8) a4( d8 g,[ c8~]\mf | %024
+      \tag #'part { \pageTurn }
+      8) r8 r8 b8( e,4~ | %025
+      \time 4/4 e4) fis4.(\f cis'8~\> 8.[ ees16] | %026
+      bes2)\mf aes4(\mp f4~ | %027
+      2) r4 d'4~ | %028
+      \tag #'part { \break \noPageBreak }
+      4 e,8[(\< g] a[ b] c4~\f \bar "||" %030
+    }
+    \tag #'part \new Staff \with {
+      alignAboveContext = "cl3"
+      \magnifyStaff #2/3
+      \consists Mark_engraver
+    }
+    \tag #'part {
+      \override Staff.SectionLabel.font-size = #2.5
+      \transpose c bes, \relative {
+        \once \omit Staff.TimeSignature \clef "bass" r2 \tuplet 3/2 { c,16~ <c g'>8~ } 4.~ |
+        2\laissezVibrer ees'2~ |
+        4 <d,, fis'' cis' gis'>2.~\arpeggio |
+        4\laissezVibrer b''2. |
+        b,8\laissezVibrer e'8\laissezVibrer a'2\laissezVibrer |
+        c,,8\laissezVibrer g'8\laissezVibrer d'2\laissezVibrer |
+        ees,,8\laissezVibrer bes'8\laissezVibrer f'2\laissezVibrer |
+        gis,8\laissezVibrer fis'8\laissezVibrer cis'2\laissezVibrer |
+        a,8\laissezVibrer d8\laissezVibrer b'2.\laissezVibrer |
+        g,8\laissezVibrer e'~ e4~ e8 c'8~ 4 |
+        \tuplet 3/2 { ees8\laissezVibrer bes ges } \tuplet 3/2 { bes ges bes } \tuplet 3/2 { ges bes ges } \tuplet 3/2 { bes ges bes } |
+        \tuplet 3/2 { des8\laissezVibrer aes f_\markup { \italic "sim." } }
+      }
+    }
+  >>
 
   \sectionLabel \markup { \huge \box \sans \bold 30 }
 
@@ -82,17 +117,19 @@
   \tempo "   " 4 = 75
   \time 7/4 1) r4 r2 |
   \undo \omit Score.BarNumber
-  R1*7/4*3 | \tag #'part  { \break \pageTurn }
+  R1*7/4*3 |
+  \tag #'part { \break \noPageBreak }
   <<
-    { \override Rest.staff-position = #0 \time 4/4 r2 r4 \tuplet 5/4 { r8. ees'16(\< aes) } | }
+    {
+      \time 4/4 r2 r4 \tuplet 5/4 { r8. ees'16(\< aes) } |
+    }
     \tag #'part  {
       \new CueVoice \relative {
-        \stemUp \tuplet 3/2 { f'8 bes4~ } bes16 a cis d e8 fis16 g b8 \stemNeutral s8 |
+        \tuplet 3/2 { f'8 bes4~ } bes16 a cis d e8 fis16 g b8 s8 |
       }
     }
   >>
   \resetRelativeOctave c''
-  \revert Rest.staff-position
   f'2.~\f 8 r8 |
 
   \sectionLabel \markup { \huge \box \sans \bold 36 }
@@ -101,16 +138,16 @@
   bes,1-- |
   \undo \omit Score.BarNumber
   r2 r4 \tuplet 3/2 { r8 r8 fis'8~\f } |
-  fis2. r4 | \tag #'part { \break \noPageBreak }
+  fis2. r4 |
   R1 |
   cis2.--\mf r4 |
   b8(\mp e,~ 2\< g4~ |
   4) \tuplet 3/2 { c4( a d~\f\> } 4) |
-  fis,2\! r8 f(\p bes,4~ | \tag #'part { \break \noPageBreak }
+  fis,2\! r8 f(\p bes,4~ |
   8)[\< c8]( a' d,~\> 2) |
   g8( ees~\mp 2) e4~ |
   e4. cis'8(\f gis8 b8~ 4) |
-  fis16( a d,8~ 4) f(\startTextSpan ees8.) fes,16(\stopTextSpan | \tag #'part { \break \noPageBreak }
+  fis16( a d,8~ 4) f(\startTextSpan ees8.) fes,16(\stopTextSpan |
 
   \sectionLabel \markup { \huge \box \sans \bold 48 }
 
@@ -124,7 +161,7 @@
   bes2~\> 8)\p r8 r4 |
   \time 3/4 r4 r4 r8 c8~\f |
   \time 4/4 c2.\> g4(\mp |
-  \time 3/4 b2.~\< | \tag #'part { \break \noPageBreak }
+  \time 3/4 b2.~\< |
   \time 4/4 8)\mf r8 \molRit r4 \after 4. \stopTextSpan r2\startTextSpan |
 
   \sectionLabel \markup { \huge \box \sans \bold 55 }
@@ -135,7 +172,7 @@
   \undo \omit Score.BarNumber
   des'2. ees4~ |
   8) r8 r4 r2 |
-  R1 | \tag #'part { \break \noPageBreak }
+  R1 |
   \time 3/4 r4 bes2( |
   ges4 aes2) |
   R1*3/4 |
@@ -147,12 +184,12 @@
     {
       R1*3/4
       \undo \omit Score.BarNumber
-      \time 4/4 R1 \tag #'part { \break \pageTurn }
+      \time 4/4 R1
       \time 3/4 R1*3/4
       \time 4/4 R1
       \time 3/4 R1*3/4
       \time 4/4 R1
-      \time 3/4 R1*3/4 \tag #'part { \break \noPageBreak }
+      \time 3/4 R1*3/4
       \time 4/4 R1
       \time 3/4 R1*3/4
       \time 4/4 R1 |
@@ -179,18 +216,18 @@
   \sectionLabel \markup { \huge \box \sans \bold 72 }
 
   \omit Score.BarNumber
-  \tuplet 3/2 { c8_(\p\< b' e~ } 4)\mf \tuplet 3/2 { g,8(\> d a~ } 4~\p | \tag #'part { \break \noPageBreak }
+  \tuplet 3/2 { c8_(\p\< b' e~ } 4)\mf \tuplet 3/2 { g,8(\> d a~ } 4~\p |
   \undo \omit Score.BarNumber
   8) fis4( g8~ 4 cis4~ |
   \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~\! | \tag #'part { \break \noPageBreak }
+  \time 3/4 8) r8 b8(\> e, a,4~\! |
   \time 7/8 8) r8 aes'8([\> des,] ges,4.~\p |
   \time 3/4 8) r8 r4 r4 |
   \time 4/4 r8 d'8(\mf g,2) r4 |
-  \time 5/4 r8 a8~ 2 r2 | \tag #'part { \break \noPageBreak }
+  \time 5/4 r8 a8~ 2 r2 |
   ees'2~\p 8 r8 r2 |
   \time 4/4 r4 r8 bes8~(\mp\> 8 f4.~ |
   \time 5/4 8 c'8~\p 4) r4 r2 |
-  r4 r4 e8_(\pp b'8~ b2)\fermata \bar "|." \tag #'part { \break \noPageBreak }
+  r4 r4 e8_(\pp b'8~ b2)\fermata \bar "|."
 }

diff --git a/parts.ly b/parts.ly
index 202c5e24ba65691adf8ff824ac454472ce84507f..84e2a45020d6c0d6eee76737e4d35f34cbcb6a65 100644 (file)
--- a/parts.ly
+++ b/parts.ly
@@ -112,6 +112,11 @@ clarinetMagstep = #(magstep 0)
           \override RehearsalMark.break-visibility = #begin-of-line-invisible
           \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4)
           \override Hairpin.to-barline = ##f
+          \override VerticalAxisGroup.default-staff-staff-spacing =
+            #'((basic-distance . 4)
+               (minimum-distance . 2)
+               (padding . 4)
+               (stretchability . 0))
         }
         \context {
           \Staff