more mvm 2

diff --git a/general/scripts.ly b/general/scripts.ly
index 69efd0e2fa8016a5b72baad92fb86c9dfd18ab46..b06de2894a751c9825106be36d5f1f6a2c882f7b 100644 (file)
--- a/general/scripts.ly
+++ b/general/scripts.ly
@@ -1,3 +1,22 @@
+
+timeSpanner =
+  #(define-music-function (left) (string?)
+    #{
+      \once {
+        \override TextSpanner.staff-padding = 5
+        \override TextSpanner.outside-staff-priority = 1000
+        \override TextSpanner.style = #'dashed-line
+        \override TextSpanner.dash-period = 3
+        \override TextSpanner.dash-fraction = 0.25
+        \override TextSpanner.font-size = #1
+        \override TextSpanner.font-shape = #'upright
+        \override TextSpanner.bound-details.left.text = \markup { \magnify #1 \bold \roman $left }
+        \override TextSpanner.bound-details.left-broken.text = ##f
+        \override TextSpanner.bound-details.right-broken.text = ##f
+        \override TextSpanner.bound-details.right.padding = #-1
+      }
+    #})
+
 to-internal-ts =
 #(define-scheme-function
   (top partial bottom)

diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly
index a982baf9e187b19575dbbba513e8c335588b86b4..dbac8a7ce55baa654331f0c16cae4a8cff217d53 100644 (file)
--- a/manuscripts/II-clarinet.ly
+++ b/manuscripts/II-clarinet.ly
@@ -203,6 +203,7 @@
   \time 4/4 bes8-.\mf\< ces8( des ees)\f c8-.\p r8 r4 | \undo \omit Score.BarNumber \tag #'part { \break \pageTurn } %084
   <<
     {
+      \tag #'part { \omit Staff.TextSpanner }
       c8-. c8(\< d8 e8)\mf r4 r8 e8-. | %085
       \time 3/4 r8 e8-. f8( g8) g8( a~ | %086
       a8) \slashedGrace e8^( b'8)--\mp \grace ees,8^( c8\f d8-.) r8 d8-.-> | %087
@@ -213,12 +214,15 @@
       ees8) ees8-.\mf \slashedGrace e,8^( f'4.)\ff f8-.\> | %092
       f8-. f8-. f8-. ges8--\mf\< ges8-. ges( | \tag #'part { \break \noPageBreak } %093
       \time 3 3/8 aes8) \slashedGrace f8^( g8\ff a,8~ | %094
-      \time 3/4 \pocAce a8)\startTextSpan \slashedGrace aes'8^( bes,8~ bes4.) bes8-.\> | %095
+      \time 3/4 \timeSpanner "poco accel." a8)\startTextSpan \slashedGrace aes'8^( bes,8~ bes4.) bes8-.\> | %095
       bes8-. bes8-. bes8-. bes8-. bes8-.\mp \slashedGrace ees8^( c8\f |  %096
       d8-.) r8 d8-. d8-. d8( e8-.) | %097
       \slashedGrace bes8^( f8)\mf f'8-. f8( g8-.) g8-.\< g8( | \tag #'part { \break \noPageBreak } %098
-      \time 3 3/8 a8-.) a8-. a8-.\stopTextSpan \tempo 4=174 | %099
-      \time 3/4 \slashedGrace a,8^( ges'8\ff aes8-.) aes8-. aes8( bes-.) r8
+      \time 3 3/8 a8-.) a8-. a8-.\stopTextSpan | %099
+      \tempo 4=174
+      \time 3/4 \slashedGrace a,8^( ges'8\ff aes8-.) aes8-. aes8( bes-.)
+      \tag #'part { \undo \omit Staff.TextSpanner }
+      r8
       \bar "||"  %100
     }
     \tag #'part \new Staff \with {
@@ -239,14 +243,18 @@
         \ottava #1 <c ees, ees,>4 c8( d) d-. d( | %O-092
         e4) e8-. e8-. \tuplet 3/2 { <e, c> <e' d c> <fis, e d c>8 } | %O-093
         \time 3/8 <c' d e fis gis>8-. r8 r8 | %O-094
-        \time 3/4 e4 b8-. b8-. b( cis~ | %O-095
+        \time 3/4 \timeSpanner "poco accel." e4\startTextSpan b8-. b8-. b( cis~ | %O-095
         cis8) cis8( dis) dis-. dis-. <d c c, c,>8-. | %O-096
-        <e d d, d,>8-. ees8-. <d d, d,>8-. 8-. 8-. <e e, e,>8-. | %O-098
-        r4 \tuplet 3/2 { r8 r8 d8 } \tuplet 3/2 { <d, e> <d' e f> <d, e f g> } | %O-099
-        \time 3/8 <d' e f g a>8-. r8 r8 | %O-100
+        <e d d, d,>8-. ees8-. <d d, d,>8-. 8-. 8-. <e e, e,>8-. | %O-097
+        r4 \tuplet 3/2 { r8 r8 d8 } \tuplet 3/2 { <d, e> <d' e f> <d, e f g> } | %O-098
+        \time 3/8 <d' e f g a>8-. r8 r8\stopTextSpan | %O-099
+        \once \override Score.MetronomeMark.padding = #4
+        \tempo 4=174
         <<
           {
-            \time 3/4 \grace s8 \tuplet 3/2 { r8 ges,8 <ges' aes>8 } \tuplet 3/2 { <ges, f aes> <aes'! f>8 <a, f>8 } <f' bes>8-.
+            \time 3/4 \grace s8
+            \tuplet 3/2 { r8 ges,8 <ges' aes>8 } \tuplet 3/2 { <ges, f aes> <aes'! f>8 <a, f>8 }
+            <f' bes>8-.
           }
           \new Voice {
             \override ClusterSpanner.style = #'centered-stairs
@@ -270,32 +278,65 @@
   \omit Score.BarNumber
   \tempo \markup { \hspace #3.5 "Prestissimo" } 4=232
   \time 4/4 R1*6 | \undo \omit Score.BarNumber
-  \rit \after 4. \startTextSpan R1 |
-  r2 r4 r8 f,,,8~\niente\<\stopTextSpan | \tag #'part { \break \noPageBreak } %108
+  <<
+    {
+      \voiceOne \rit \after 4. \startTextSpan R1 |
+      r2 r4 r8
+    }
+    \tag #'part {
+        \new CueVoice \relative {
+          \cueClef "bass" r4 r8 \ottava #-1 <g, g,>8( <fis fis,>) <b b,,>8-. <cis, cis,>8-. <d d,>8
+          <a-. a,>8 e8---> <c' c,,>8 aes,8---> <bes bes,>8-. g8---> <ees'' ees,,>8 \ottava #0
+        }
+    }
+  >>
+  \oneVoice \cueClefUnset
+  f,,,8~\niente\<\stopTextSpan | \tag #'part { \break \noPageBreak } %108
 
   \sectionLabel \markup { \huge \box \sans \bold 109 }
   \omit Score.BarNumber
   \tempo 4=200
-  \time 3/4 f2~ f8 des'8->~\f | \undo \omit Score.BarNumber %109
-  des4 bes2->~ | %110
-  bes2\> d,4~\mp | %111
-  2.~\> | %112
-  2.\niente\< | %113
-  c'2.->~\f | %114
-  \rit c4.\startTextSpan b4.->\> | %115
-  ees,2.~\p\< | \tag #'part { \break \noPageBreak } %116
-  2 f4~\f | %117
-  \after 2 \stopTextSpan f2. \tempo "Tempo primo" 4=168 \bar "||"  %118
-  fis4-> a2->~ | %119
-  4. g4.~-> |   %120
-  g4\startTextSpan aes4->~ aes8 e8~-> | %121
-  2.~\> | %122
-  4\p r4 \after 8 \stopTextSpan r4 \bar "||" \tag #'part { \pageTurn } %123
+  \time 3/4 f2~ f8
+  <<
+    {
+      des'8->~\f | \undo \omit Score.BarNumber %109
+      des4 bes2->~ | %110
+      bes2\> d,4~\mp | %111
+      2.~\> | %112
+      2.\niente\< | %113
+      c'2.->~\f | %114
+      \rit c4.\startTextSpan b4.->\> | %115
+      ees,2.~\p\< | \tag #'part { \break \noPageBreak } %116
+      2 f4~\f | %117
+      \after 2 \stopTextSpan f2. \tempo "Tempo primo" 4=168 \bar "||"  %118
+      fis4-> a2->~ | %119
+      4. g4.~-> |   %120
+      g4\startTextSpan aes4->~ aes8 e8~-> | %121
+      2.~\> | %122
+      4\p r4 \after 8 \stopTextSpan r4 \bar "||" \tag #'part { \pageTurn } %123
+
+      \sectionLabel \markup { \huge \box \sans \bold 124 }
+      \omit Score.BarNumber
+      \tempo "Poco rubato" 4=152
+      R1*3/4 | \undo \omit Score.BarNumber %124
+    }
+    \tag #'part \new Staff \with {
+      alignAboveContext = "cl2"
+      \magnifyStaff #2/3
+      \consists Mark_engraver
+    }
+    \tag #'part {
+      \override Staff.SectionLabel.font-size = #2.5
+      \transpose c bes, \relative {
+        \clef "bass"
+        <cis cis'>8-- |
+        <f, f,>8-. <e' e,,>8-. <bes' bes,>4 r4 |
+        r4 <g g,>8 c,,,8--->\laissezVibrer <d' d'>8\laissezVibrer <a a,>8-. |
+        r8 dis,8--->
+      }
+    }
+  >>
 
-  \sectionLabel \markup { \huge \box \sans \bold 124 }
-  \omit Score.BarNumber
-  \tempo "Poco rubato" 4=152
-  R1*3/4 | \undo \omit Score.BarNumber %124
   r8 a'4(\mp\< fis) bes8~-> | %125
   bes8 f4-> des4->\f \slashedGrace fis8( d8~\p | %126
   d2\< fis4~\mp | %127