time spanners

diff --git a/manuscripts/bassTrombone.ly b/manuscripts/bassTrombone.ly
index 44513e90b23f608bc3eb0e0e22292f786ee7d037..063a86a932fd277b7f44a758d2385891b0750fe4 100644 (file)
--- a/manuscripts/bassTrombone.ly
+++ b/manuscripts/bassTrombone.ly
@@ -7,6 +7,7 @@
   \consists Text_mark_engraver
 }
 \relative {
+  \tag #'score { \override Staff.TextSpanner.stencil = ##f }
   \clef bass
   \tempo Moderato 4=108
   \time 4/4
@@ -20,12 +21,12 @@
   des8-.\f ees'8-.-> r4 aes,4.\sfp ees'8~\sfp | %007
   ees4. a,,8\mf( f d' c4) | %008
   cis4(\> b4 ais2)\mp\shortfermata \breathe | %009
-  \time 5/4 \tuplet 3/2 { e4(\p^\markup { \italic semplicemente } b2~ } b4) f'2\fermata \bar "||" %010
+  \time 5/4 \tuplet 3/2 { \timeSpanner "rit." e4(\p^\markup { \italic semplicemente }\startTextSpan b2~ } b4)\stopTextSpan f'2\fermata \bar "||" %010
 
-  \tempo "Meno mosso; slighly swing 8ths" 4=84
-  \time 4/4 r4 d'4~\sfp d8 fis,8~\sfp fis4 | %011
-  e1~\sfp | %012
-  \tempo "A tempo" 4=108
+  \tempo "Meno mosso; swing 8ths" 4=84
+  \time 4/4 r4 d'4~\sfp d8 fis,8~\sfp \timeSpanner "accel." fis4\startTextSpan | %011
+  \after 2.. \stopTextSpan e1~\sfp | %012
+  \tempo "A tempo; cont. swing 8ths" 4=108
   e4~ e8 r8 r8 a'8~\sfp a4~ | %013
   a2 cis4~\sfp \tuplet 3/2 { cis4 ees8(\mp } | %014
   c2) ees8->\f\> c8~-> c4\mf | %015

diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly
index bfb7f64564968b651fd9d693d0077cc11be28519..82191a60dd2c1b08daa194b4b66e9a5042134aca 100644 (file)
--- a/manuscripts/horn.ly
+++ b/manuscripts/horn.ly
@@ -4,10 +4,10 @@
   instrumentName = \markup { horn in F }
   shortInstrumentName = \markup { hn }
   \override DynamicLineSpanner.staff-padding = \sods
-  \consists Text_mark_engraver
 }
 \transpose f c'
 \relative {
+  \tag #'score { \override Staff.TextSpanner.stencil = ##f }
   \clef treble
   \tempo Moderato 4=108
   \time 4/4
@@ -22,12 +22,12 @@
   r4 r8 fis'8~->\ff fis16 fis8.~\sfp fis4 | %007
   des2\sfp bes4.(\mf b16) e,16 | %008
   fis8(\> dis4. gis2)\p\shortfermata \breathe | %009
-  \time 5/4 \tuplet 3/2 { a,4(\p^\markup { \italic semplicemente } d4 g4 } d4) c2\fermata \caesura \bar "||" %010
+  \time 5/4 \tuplet 3/2 { \timeSpanner "rit." a,4(\p^\markup { \italic semplicemente }\startTextSpan d4 g4 } d4)\stopTextSpan c2\fermata \caesura \bar "||" %010
 
-  \tempo "Meno mosso; slighly swing 8ths" 4=84
-  \time 4/4 r8 b'8~\sfp b4~ b8 cis8 gis4~\sfp | %011
-  gis8 a8~\sfp a2.~ | %012
-  \tempo "A tempo" 4=108
+  \tempo "Meno mosso; swing 8ths" 4=84
+  \time 4/4 r8 b'8~\sfp b4~ b8 cis8 \timeSpanner "accel." gis4~\sfp\startTextSpan | %011
+  gis8 a8~\sfp \after 2 \stopTextSpan a2.~ | %012
+  \tempo "A tempo; cont. swing 8ths" 4=108
   a2 dis4\sfp e4~\sfp | %013
   e1 | %014
   \tuplet 3/2 { r8 d8(\mp g8 } \after 4. \! bes2)\> r4 | %015

diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly
index a1337d89e6634e122538452ecda26f5be19a953f..5bc57844f024819b7684cfeb52ad91454382a367 100644 (file)
--- a/manuscripts/trombone.ly
+++ b/manuscripts/trombone.ly
@@ -7,6 +7,7 @@
   \consists Text_mark_engraver
 }
 \relative {
+  \tag #'score { \override Staff.TextSpanner.stencil = ##f }
   \clef bass
   \tempo Moderato 4=108
   \time 4/4
@@ -21,12 +22,12 @@
   c16-.->\ff aes-.-> f8~-> f8 r8 r2 | %007
   r2 f8\f d8(\> ees4~ | %008
   ees2~\mp\> ees2)\p\shortfermata | %009
-  \time 5/4 r2. r2\fermata \bar "||" %010
+  \time 5/4 \timeSpanner "rit." \after 2 \stopTextSpan r2.\startTextSpan r2\fermata \bar "||" %010
 
-  \tempo "Meno mosso; slighly swing 8ths" 4=84
-  \time 4/4 r8 g8~\sfp g4 g4\sfp bes8 c,8~\sfp | %011
-  c4 d2.~\sfp | %012
-  \tempo "A tempo" 4=108
+  \tempo "Meno mosso; swing 8ths" 4=84
+  \time 4/4 r8 g8~\sfp g4 g4\sfp \timeSpanner "accel." bes8\startTextSpan c,8~\sfp | %011
+  c4 \after 2 \stopTextSpan d2.~\sfp | %012
+  \tempo "A tempo; cont. swing 8ths" 4=108
   d4 r8 b'8~\sfp b2 | %013
   dis4\sfp e2.\sfp | %014
   f4\mp\> \after 4.\! f2 \tuplet 3/2 { r8 a,8( fis } | %015

diff --git a/manuscripts/trumpetI.ly b/manuscripts/trumpetI.ly
index f5891a0f9f2605b390c45719f8073e6da766f40a..e3ad2d83da87b217f5c40357b73e40548f202191 100644 (file)
--- a/manuscripts/trumpetI.ly
+++ b/manuscripts/trumpetI.ly
@@ -22,12 +22,12 @@
   c'16-.->\f bes8. d2 r4 | %007
   R1 | %008
   r2 r2\shortfermata | %009
-  \time 5/4 r2. r2\fermata \bar "||" %010
+  \time 5/4 \timeSpanner "rit." \after 2 \stopTextSpan r2.\startTextSpan r2\fermata \bar "||" %010
 
-  \tempo "Meno mosso; slighly swing 8ths" 4=84
-  \time 4/4 a,4\mp r8 f'8\mf e ees8~ ees4 | %011
-  g8\< fis b bes aes bes c bes | %012
-  \tempo "A tempo" 4=108
+  \tempo "Meno mosso; swing 8ths" 4=84
+  \time 4/4 a,4\mp r8 f'8\mf e ees8~ \timeSpanner "accel." ees4\startTextSpan | %011
+  g8\< fis b bes aes bes c bes\stopTextSpan | %012
+  \tempo "A tempo; cont. swing 8ths" 4=108
   d4\f f4~-> f8 des8~\sfp des4 | %013
   r8 a'8 gis4\f a8( bes~\> bes4~ | %014
   bes8)\mf r8 r8 des,8~->\f\> des4 ces4->\mf | %015

diff --git a/manuscripts/trumpetII.ly b/manuscripts/trumpetII.ly
index 0151b9ac0505aeba32a47162af1e68f0d63a4233..7186f5c4d7bda936c0d4abe767aa200e3bfeaad6 100644 (file)
--- a/manuscripts/trumpetII.ly
+++ b/manuscripts/trumpetII.ly
@@ -4,10 +4,10 @@
   instrumentName = \markup { trumpet \bold II in \concat { B \flat } }
   shortInstrumentName = \markup { tpt \bold "II " }
   \override DynamicLineSpanner.staff-padding = \sods
-  \consists Text_mark_engraver
 }
 \transpose bes c'
 \relative {
+  \tag #'score { \override Staff.TextSpanner.stencil = ##f }
   \clef treble
   \tempo Moderato 4=108
   \time 4/4
@@ -22,12 +22,12 @@
   g8->\f b16 a16 e2 e4~\sfp | %007
   e8 r8 r4 r2 | %008
   r2 r2\shortfermata | %009
-  \time 5/4 r2. r2\fermata \bar "||" %010
+  \time 5/4 \timeSpanner "rit." \after 2 \stopTextSpan r2.\startTextSpan r2\fermata \bar "||" %010
 
-  \tempo "Meno mosso; slighly swing 8ths" 4=84
-  \time 4/4 r4 c2\sfp r8 f8~\mf | %011
-  f8 des8~\sfp des4  ees2\sfp | %012
-  \tempo "A tempo" 4=108
+  \tempo "Meno mosso; swing 8ths" 4=84
+  \time 4/4 r4 c2\sfp \timeSpanner "accel." r8\startTextSpan f8~\mf | %011
+  f8 des8~\sfp des4 \after 4. \stopTextSpan ees2\sfp | %012
+  \tempo "A tempo; cont. swing 8ths" 4=108
   r8 ees'4->\f aes8~->\> \after 8. \mp aes4. bes8(\f | %013
   ces4) r8 g8( fis g8) e8(\> d8 | %014
   e4)\mf a,4\mp\> \tuplet 3/2 { a4 fis8( } \tuplet 3/2 { gis8) e8_(\p d8 } | %015

diff --git a/parts.ly b/parts.ly
index 70d0f571c3f16a38b5a67854a4e2721ad8569dae..47366609e03514b9a1f86bc4069f367161b68c51 100644 (file)
--- a/parts.ly
+++ b/parts.ly
@@ -112,7 +112,7 @@
       poet = \markup { Trumpet \bold II in \concat { \bold "B" \tiny \flat } }
     }
     <<
-      \include "manuscripts/trumpetII.ly"
+      \removeWithTag #'score \include "manuscripts/trumpetII.ly"
     >>
     %\midi { }
     \layout {
@@ -167,7 +167,7 @@
       poet = \markup { Horn in F }
     }
     <<
-      \include "manuscripts/horn.ly"
+      \removeWithTag #'score \include "manuscripts/horn.ly"
     >>
     %\midi { }
     \layout {
@@ -222,7 +222,7 @@
       poet = \markup { Trombone }
     }
     <<
-      \include "manuscripts/trombone.ly"
+      \removeWithTag #'score \include "manuscripts/trombone.ly"
     >>
     %\midi { }
     \layout {
@@ -277,7 +277,7 @@
       poet = \markup { Bass Trombone }
     }
     <<
-      \include "manuscripts/bassTrombone.ly"
+      \removeWithTag #'score \include "manuscripts/bassTrombone.ly"
     >>
     %\midi { }
     \layout {