re-bar

diff --git a/manuscripts/bass.ly b/manuscripts/bass.ly
index ba6964d975612c5d46267e78d011ca9262a80205..6e23e0aad6f853555bc14b03743b0381281f9f87 100644 (file)
--- a/manuscripts/bass.ly
+++ b/manuscripts/bass.ly
@@ -8,27 +8,22 @@ bassMusic =
   R1*11 | %004-14
   R1*3/2 | %015-16
   R1*26 | %016-42
-  R1*3/4*2 | %043-44
-  r4 r8 ees8->~\mf ees4~ | %045
+  R1*3/2 | %043-44
+  r4 r8 ees8->~\mf
   <<
     {
-      ees2. | %046
+      ees1 | %046
     }
     {
-      s4\> s4 s4\!
+      s4 s4\> s4 s4\!
     }
   >>
-  r4 fis'8\f^\markup { "pizz" \italic "(resonant)" } c8 g4 | %047
-  e'4. bes4\> f8 | %048
-  cis4 gis'4 fis8 b,8-.\mf | %049
-  r8 c8\< d8-. r8 bes8 e8-. | %050
-  r4 r8 ees8-.^\markup { "arco" } a,4~(\f | %051
-  a4 aes2) | %052
-  g8( c8~ c2) | %053
-  f2.~-> | %054
-  f4 r4 e4~\mf\< | %055
-  e8 fis8-. d'8-.\f r8 r4 | %056
-  r4 r4 r8 fis,8-.\mp^\markup { "pizz" } r8 cis8-.\p r4 r4 | %057
+  r4 fis'8\f^\markup { "pizz" \italic "(resonant)" } c8 g4 e'4 r8 bes4\> f8 | %048
+  cis4 gis'4 fis8 b,8-.\mf r8 c8\< d8-. r8 bes8 e8-. | %050
+  r4 r8 ees8-.^\markup { "arco" } a,2(\f aes2) | %052
+  g8( c8~ c4~ c4) f4~-> f2~ | %054
+  f4 r4 e4.\mf\< fis8-. d'8-.\f r8 r4 | %056
+  r2 r8 fis,8-.\mp^\markup { "pizz" } r8 cis8-.\p r2 |
   r2 r4 bes2\mf | %058
   f4->\ff\>^\markup { "arco" } d'4-> | %059
   <<

diff --git a/manuscripts/bassClarinet.ly b/manuscripts/bassClarinet.ly
index de95d601951cbe4c4f910c97c93e1bb784078ad8..24eefd31fd653bd27e0dbaa302f8892156436332 100644 (file)
--- a/manuscripts/bassClarinet.ly
+++ b/manuscripts/bassClarinet.ly
@@ -6,14 +6,26 @@ bassClarinetMusic =
   R1 | %001
   R1*3/2 | %002-3
   R1*11 | %004-14
-  R1*3/2 | %015-16
+  \transposedCueDuring "flute" #UP c {
+    \tag #'part { <>^\markup \tiny { "fl (8va)" } }
+    R1*3/2 | %015-16
+  }
   R1*8 | %017-24
-  r2 r4 r8 d''8-.\mp | %025
+  r2
+  \transposedCueDuring "bassoon" #DOWN c'  {
+    \tag #'part { <>^\markup \tiny { "bsn" } }
+    r4 r8
+  }
+  d''8-.\mp | %025
   a8-. r8 r4 r4 bes8-. r8 | %026
   c8-. r8 r4 r4 a,8-. r8 | %027
   r8 bes,8-.\< c8-. r8 r8 d8-. ees8-. f8-.\mf | %028
-  R1*3 | %029-31
-  r8 bes8-. r4 r2 | %032
+  R1*2 | %029-31
+  \transposedCueDuring "oboe" #UP c {
+    \tag #'part { <>^\markup \tiny { "ob (8va)" } }
+    R1 r8
+  }
+  bes8-.\mf r4 r2 | %032
   R1*3 | %033-35
   r2 r4 bes,8-.\mp\< e8-. | %036
   r8 ges8-. r8 c,8-.\mf r4 r8 des8-. | %037
@@ -22,22 +34,34 @@ bassClarinetMusic =
   f8) r8 r4 r4 r8 fis,8-.\p\< | %040
   g8-. c8-. d8-. e8-.\mf r2 | %041
   r2 gis8-.\< r8 r8 b8-. | %042
-  cis8-.->\ff r8 r4 r4 | %043
-  r4 b,8(\mp cis8~ cis4) | %044
-  d4.--\< ees,8~->\mf ees4~ | %045
+  cis8-.->\ff r8 r4
+  \transposedCueDuring "bassoon" #UP c'  {
+    \tag #'part { <>^\markup \tiny { "bsn" } }
+    r2
+  }
+  b,8(\mp cis8~ cis4) | %044
+  d4.--\< ees,8~->\mf
   <<
     {
-      ees2. | %046
+      ees1 | %046
     }
     {
-      s4\> s4 s4\!
+      s4 s4\> s4 s4\!
     }
   >>
-  R1*3/4*3 | %047-49
+  \transposedCueDuring "cello" #DOWN c'  {
+    \tag #'part { <>^\markup \tiny { "vc" } }
+    R1*3/2 | %047-49
+    r2 r4
+  }
   r8 c8(\< d8-.) r8 bes8-. e8-. | %050
-  r8 g8-.\f r4 r4 | %051
-  R1*3/4*5 | %052-56
-  r4 r4 r8 fis8-.\p R1*3/4 | %057
+  r8 g8-.\f r4 r2 r2 | %051
+  R1*3/2 | %052-56
+  \transposedCueDuring "trumpet" #UP c {
+    \tag #'part { <>^\markup \tiny { "tpt (8va)" } }
+    R1*3/2 | %052-56
+  }
+  r8 fis8-.\p r4 r2 r2 | %057
   c8(\mf ees8~ ees2) bes2 | %058
   f'4->\ff\> d4-> | %059
   <<
@@ -48,7 +72,7 @@ bassClarinetMusic =
       s4\mf\> s2 s4\!
     }
   >>
-  r8 f'8~\p f2.~ | %061
+  r8 f'8~\p f4~ f2~ | %061
   f4 ges2 bes8( des,8 | %062
   c2.) b'4~(\< | %063
   b8 gis8~ gis4 e4.) ees8( | %064
@@ -62,8 +86,12 @@ bassClarinetMusic =
       s4\mp\> s4 s4 s4\!
     }
   >>
-  R1*3/4 | %068
-  r2 r4 r8 f8-.\p | %069
+  \transposedCueDuring "cello" #DOWN c'  {
+    \tag #'part { <>^\markup \tiny { "vc" } }
+    R1*3/4 | %068
+    r2
+  }
+  r4 r8 f8-.\p | %069
   ees8(\< aes8) g8( c8) fis2~\mf\> | %070
   fis1\mp | %071
   R1*3 | %072-74
@@ -73,16 +101,28 @@ bassClarinetMusic =
   e2.)\mp g4~ | %078
   g2.~ g2 | %079
   R1 | %080
-  r2 d''4--\f \tuplet 3/2 { d8-.-> bes8-.-> ges8-.-> } | %081
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    r2
+  }
+  d''4--\f \tuplet 3/2 { d8-.-> bes8-.-> ges8-.-> } | %081
   r8 aes8-.-> r4 r2 r2 | %082
   r2 r2\fermata | %083
-  r4 cis,,8\mf dis8 e8 fis8 gis4 | %084
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    r4
+  }
+  cis,,8\mf dis8 e8 fis8 gis4 | %084
   g4.\< d8~->\f d4 ees4~-> | %085
   \after 2 \! ees2.\> r2 | %086
   R1*2 | %087-88
   \tuplet 3/2 { b''2(\mp\> dis4~ } \after 4 \p dis2) | %089
   R1*2 | %090-91
-  r2 r4 ges,4~\mp | %092
+  \transposedCueDuring "bassoon" #UP c'  {
+    \tag #'part { <>^\markup \tiny { "bsn" } }
+    r2
+  }
+  r4 ges,4~\mp | %092
   ges8 ees8~\mf ees2~ ees8 des8~ | %093
   des2. r4 | %094
   R1 | %095
@@ -90,22 +130,32 @@ bassClarinetMusic =
   f'4\> a,4 c,4)\mp | %097
   R1 | %098
   r8 d''4->\f\> fis8~( fis8 cis4)\mf r8 | %099
-  r8 des,8[(\p\< c8 e8] a,8[ d8 b8 f'8] | %100
+  r8
+  \tag #'part { <>^\markup \tiny { "w/ s cl" } }
+  des,8[(\p\< c8 e8] a,8[ d8 b8 f'8] | %100
   ees8 aes8 g8 ges8 bes,8)\mf c8(\p\< des8 ees8 | %101
   d8 e8 f8 g8~ g8)\mf r8 r4 | %102
   R1 | %103
-  R1*3/4 | %104
-  R1*2 | %105-106
-  r8 ges'8-.\mf r8 a,,8( g8-.) r8 r4 | %107
+  \transposedCueDuring "clarinetSolo" #UP c {
+    \tag #'part { <>^\markup \tiny { "s cl (8va)" } }
+    R1*3/4 | %104
+    R1*2 | %105-106
+    r8
+  }
+  ges'8-.\mf r8 a,,8( g8-.) r8 r4 | %107
   R1*3/4*2 | %108-109
   R1*2/4 | %110
   R1*3/4*2 | %111-112
-  r4 r4 r8 fis''8(\f | %113
+  \transposedCueDuring "clarinetSolo" #UP c {
+    \tag #'part { <>^\markup \tiny { "s cl (8va)" } }
+    r4 r4 r8
+  }
+  fis''8(\f | %113
   cis8 d a4~ a8) c8(\> f8) fis( | %114
   cis4.) dis,8~\mf\> dis4. g8 | %115
   fis4 gis2 d4~\p | %116
-  d4.~\shortfermata d4. | %117
-  R1*12/8 | %117
+  d4.~\shortfermata d4.( | %117
+  d8) r8 r8 r4. r2. | %117
   r4. r8 g4(\mf | %118
   f2.~ f4.~ f8) f4(\> | %119
   \after 4 \p a2) | %120
@@ -127,11 +177,24 @@ bassClarinetMusic =
   e'8-. r8 r8 c,8-. d'8-. r8 r8 ees8-. | %137
   des,4(\f f4) g'8-. r8 | %138
   \tuplet 3/2 { r8 c,8-.\< des8-. } bes,4->\ff r2 | %139
-  r4 bes''4~\mf bes8 r8 r4 | %140
-  r4 r8 aes8-.\mp des8-. d8-. b8-. r8 | %141
-  R1 | %142
-  r4 g8-. fis8-. c'8-. a8-. r4 | %143
-  r2 r4 f8-. r8 | %144
+  r4 bes''4~\mf bes8 r8
+  \transposedCueDuring "clarinetSolo" #UP c {
+    \tag #'part { <>^\markup \tiny { "s cl (8va)" } }
+    r4 | %140
+    r4
+  }
+  r8 aes8-.\mp des8-. d8-. b8-. r8 | %141
+  \transposedCueDuring "clarinetSolo" #UP c {
+    \tag #'part { <>^\markup \tiny { "s cl (8va)" } }
+    R1 | %142
+    r4
+  }
+  g8-. fis8-. c'8-. a8-. r4 | %143
+  \transposedCueDuring "clarinetSolo" #UP c {
+    \tag #'part { <>^\markup \tiny { "s cl (8va)" } }
+    r2 r4
+  }
+  f8-. r8 | %144
   r4 r8 ees8-.->\mf r4 r8 f8(\> | %145
   \after 4. \! ges2) r2 | %146
   R1*2 | %147-148
@@ -140,16 +203,19 @@ bassClarinetMusic =
   r4 e,2.~( | %152
   e2~ e4.\< fis8-.)\f | %153
   R1*2 | %154-155
-  r2 r4 r8 a'8-.\> | %156
+  \transposedCueDuring "clarinetSolo" #UP c {
+    \tag #'part { <>^\markup \tiny { "s cl (8va)" } }
+    r2 r4
+  }
+  r8 a'8-.\> | %156
   g8-. r8 r4 b8-. r8 bes8-.\mp r8 | %157
   R1*4 | %158
   R1*7/8 | %161
   R1*4 | %162
   \tag #'score { s1*36 }
-  s2 s4 s8
+  s1
   \transposedCueDuring "clarinetSolo" #UP c {
-    \tag #'part { <>^\markup \tiny { clarinet } }
-    s8 | %167
+    \tag #'part { <>^\markup \tiny { "s cl (8va)" } }
     R1*4 | %168-171
     r2 r4
   }
@@ -159,12 +225,28 @@ bassClarinetMusic =
   c8 r8 des'2\f r4 |
   r2 r4 r8 d!8( |
   e,1) |
-  R1*3 |
-  r4 r8 a8\mp f8( bes,8) |
-  R1 |
+  R1*2 |
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1
+    r4
+  }
+  r8 a8\mp f8( bes,8) |
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1 |
+  }
   bes'4(\p f'4) r2 |
-  r4 ees'4\mf r4 |
-  r4 r8 ees,,8~ ees4 a'4 |
+  \transposedCueDuring "trumpet" #UP c {
+    \tag #'part { <>^\markup \tiny { "tpt (8va)" } }
+    r4
+  }
+  ees'4\mf r4 |
+  \transposedCueDuring "horn" #UP c' {
+    \tag #'part { <>^\markup \tiny { "hn" } }
+    r4
+  }
+  r8 ees,,8~ ees4 a'4 |
   r2 bes2 |
   \tuplet 3/2 { ees,4(\< ges4 des4) } fes2 |
   fes2~\f\fermata fes2 |

diff --git a/manuscripts/bassoon.ly b/manuscripts/bassoon.ly
index a3f3b1cd2c7750c743bffaff0b9cadd401ae1559..670c4ed34e262f83994da7885befc75183143f7e 100644 (file)
--- a/manuscripts/bassoon.ly
+++ b/manuscripts/bassoon.ly
@@ -15,16 +15,26 @@ bassoonMusic =
   cis8-.\< r8 r8 d8-. c8-. r8 r4 \clef tenor | %011
   ees8-. f8-. r8 ges8-.\mf aes8-. r8 r4 | %012
   R1*2 | %013-14
-  R1*3/2 | %015-16
+  \cueDuringWithClef "flute" #UP treble {
+    \tag #'part { <>^\markup \tiny { "fl" } }
+    R1*3/2 | %015
+  }
   R1*8 \clef bass | %017-24
-  r2 cis,,8-.\mf gis'8-. fis8-. r8 | %025
+  r2 cis,,8[-.\mf gis'8-. fis8]-. r8 | %025
   r2 e'8(\mp\< ees8~ ees4~ | %026
   ees8 f4 g8\mf\> d8-.)\! r8 r4 | %027
-  R1 | %028
+  \cueDuring "bassClarinet" #DOWN {
+    \tag #'part { <>^\markup \tiny { "b cl" } }
+    R1 | %028
+  }
   ges,8-.\mf aes8-. r4 r4 r8 b8-.\< | %029
   e8-. c8-. r8 d8-.\f r2 | %030
   R1 %031
-  r2 r8 g,8-.\mf r4 | %032
+  \cueDuring "bassClarinet" #UP {
+    \tag #'part { <>^\markup \tiny { "b cl" } }
+    r2
+  }
+  r8 g,8-.\mf r4 | %032
   R1*3 | %033-35
   r2 r4 bes,8-.\mp\< e8-. | %036
   r8 ges8-. r8 c,8-.\mf r2 | %037
@@ -32,24 +42,34 @@ bassoonMusic =
   r2 r8 bes''8~\mp bes4~ | %039
   bes8 r8 r4  r4 r8 \clef bass fis,,8-.\p\< | %40
   g8-. c8-. d8-. e8-.\mf r2 | %041
-  r2 r4 r8 b'8-.\< | %042
-  cis8-.\ff r8 r4 a8-.\mp aes8-. | %043
-  f8-. r8 b,8( cis8~ cis4) | %044
-  d4.--\< ees8~\mf ees4~ | %045
+  \cueDuring "trombone" #UP {
+    \tag #'part { <>^\markup \tiny { "tbn" } }
+    r2 r4
+  }
+  r8 b'8-.\< | %042
+  cis8-.\ff r8 r4 a8-.\mp aes8-. f4-. b,8( cis8~ cis4) | %044
+  d4.--\< ees8~\mf
   <<
     {
-      ees2. | %046
+      ees1 | %046
     }
     {
-      s4\> s4 s4\!
+      s4 s4\> s4 s4\!
     }
   >>
-  R1*3/4*2 | %047-48
-  r4 r4 fis,8(\mf\< b,8-.) | %049
-  r8 c8( d8-.) r8 bes8-. e8-. | %050
-  r8 g8-.\f r4 r4 | %051
-  R1*3/4*5 | %052-56
-  r4 r4 b8-.\p r8 r8 cis,8-. r4 r4 | %057
+  \cueDuring "cello" #DOWN {
+    \tag #'part { <>^\markup \tiny { "vc" } }
+    R1*3/2 | %047-48
+    r2
+  }
+  fis,8(\mf\< b,8-.) r8 c8( d8-.) r8 bes8-. e8-. | %050
+  r8 g8-.\f r4 r2 r2 | %051
+  R1*3/2*2 | %052-56
+  \cueDuring "bassClarinet" #DOWN {
+    \tag #'part { <>^\markup \tiny { "b cl" } }
+    r2
+  }
+  b8-.\p r8 r8 cis,8-. r2 | %057
   c8(\mf ees8~ ees2) bes2 | %058
   f'4->\ff\> d4-> | %059
   <<
@@ -60,12 +80,21 @@ bassoonMusic =
       s4\mf\> s2 s4\!
     }
   >>
-  R1*4 | %061-064
-  r2 r4 c,2.(\mp\< | %065
+  R1*3 | %061-064
+  \cueDuring "bassClarinet" #UP {
+    \tag #'part { <>^\markup \tiny { "b cl" } }
+    R1
+    r2
+  }
+  r4 c,2.(\mp\< | %065
   bes8-.)\mf r8 r4 r2 | %066
   R1 | %067
-  R1*3/4 | %068
-  r2 r4 r8 f''8-.\p | %069
+  \cueDuring "cello" #UP {
+    \tag #'part { <>^\markup \tiny { "vc" } }
+    R1*3/4 | %068
+    r2
+  }
+  r4 r8 f''8-.\p | %069
   ees8(\< aes8) g8( c8) \clef tenor fis8( b8~\mf\> b4~ | %070
   b1)\mp | %071
   R1*3 | %072-74
@@ -75,9 +104,13 @@ bassoonMusic =
   e2.)\mp r4 | %078
   R1*5/4 | %079
   R1*2 | %080-81
-  R1*6/4 | %082
+  R1*3/2 | %082
   r2 r2\fermata | %083
-  r4 cis8\mf dis8 e8 fis8 gis4 | %084
+  \cueDuringWithClef "clarinetSolo" #UP treble {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    r4
+  }
+  cis8\mf dis8 e8 fis8 gis4 | %084
   g4.\< d8~->\f d4 ees4~ | %085
   \after 2 \! ees2.\> r2 | %086
   R1*2 \clef tenor | %087-88
@@ -94,9 +127,13 @@ bassoonMusic =
   r4 e8-.\< e8-. r8 f8-. fis8-.-> r8 | %101
   b,8-.->\mf r8 r4 r8 des'8-.-> r4 | %102
   R1 | %103
-  R1*3/4 | %104
-  R1 | %105
-  r2 r8 b,8-.\f\> r4 | %106
+  \cueDuringWithClef "clarinetSolo" #UP treble {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1*3/4 | %104
+    R1 | %105
+    r2
+  }
+  r8 b,8-.\f\> r4 | %106
   f'''8-. r8 r8 a,,8( g8-.)\mf r8 r4 | %107
   R1*3/4*2 | %108-109
   R1*2/4 | %110
@@ -104,25 +141,32 @@ bassoonMusic =
   b,2\mf bes2 | %114
   e'4. dis8~\> dis4. g8 | %115
   fis4 a,4 a4 d4~\p | %116
-  d4.~\shortfermata d4. | %117
-  R1*12/8 | %117
-  R1*6/8 | %118
-  R1*12/8 | %119
-  R1*2/4 | %120
-  R1*6/8 | %121
-  R1*12/8 | %122
-  R1*6/8 | %123
-  R1*7/8 | %124
-  R1*12/8 | %125
-  R1*7/8 | %126
-  R1*12/8 | %127
-  R1*3/16 | %128
-  R1*6/8 | %129
-  R1*15/8 | %130
+  d4.~\shortfermata d4.( | %117
+  d8) r8 r8 r4. r2. | %117
+  \cueDuringWithClef "clarinetSolo" #DOWN treble {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1*6/8 | %118
+    R1*12/8 | %119
+    R1*2/4 | %120
+    R1*6/8 | %121
+    R1*12/8 | %122
+    R1*6/8 | %123
+    R1*7/8 | %124
+    R1*12/8 | %125
+    R1*7/8 | %126
+    R1*12/8 | %127
+    R1*3/16 | %128
+    R1*6/8 | %129
+    R1*15/8 | %130
+  }
   R1*2/4\fermata | %131
-  R1 | %132
-  R1*5/8 | %133
-  r2 r4 r8 fis,8-.\mp | %134
+  \cueDuringWithClef "oboe" #UP treble {
+    \tag #'part { <>^\markup \tiny { "ob" } }
+    R1 | %132
+    R1*5/8 | %133
+    r2 r4 r8
+  }
+  fis,8-.\mp | %134
   g4( b'2) e,,4 | %135
   b''8-.\mp r8 dis,,8-. r8 f'8-. r8 r8 b,,8-. | %136
   fis''8-. r8 r8 c,8-. d'8-. r8 r8 bes'8-. | %137
@@ -130,8 +174,12 @@ bassoonMusic =
   \tuplet 3/2 { r8 c8-.\< des8-. } bes,4->\ff r2 | %139
   r4 bes''8(\mf g,8~ g8) r8 e''8-.\> fis8-. | %140
   bes,8-.\mp r8 r4 r2 | %141
-  g8-. f8-. r4 r2 | %142
-  R1 | %143
+  g8-. f8-. r4
+  \cueDuringWithClef "clarinetSolo" #UP treble {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    r2 | %142
+    R1 | %143
+  }
   ais8-. cis8-. b8-. dis8-. d8-. r8 c,4~\mf | %144
   c4 r4 r2 | %145
   R1*3 | %146-148
@@ -142,20 +190,20 @@ bassoonMusic =
   e2 r8 g''8-.\f d8-. fis,,8-. | %153
   R1 | %154
   r4 r8 a8-.\mf cis8-. r8 r4 | %155
-  R1 | %156
+  \cueDuring "cello" #UP {
+    \tag #'part { <>^\markup \tiny { "vc" } }
+    R1 | %156
+  }
   r8 d'8-. r8 ees8-. r2 | %157
   R1*4 | %158
   R1*7/8 | %161
   R1*4 | %162
   \tag #'score { s1*36 }
-  s2 s4 s8
-  \tag #'part { \clef treble }
-  \transposedCueDuring "clarinetSolo" #UP bes {
-    \tag #'part { <>^\markup \tiny { clarinet } }
-    s8 | %167
+  s1
+  \cueDuringWithClef "clarinetSolo" #UP treble {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
     R1*4 | %168-171
     r2 r4
-  \tag #'part { \clef bass }
   }
   r8 g,,8-.\f\> |
   ees8-.\! r8 r4 r8 b'8(\< |
@@ -165,10 +213,21 @@ bassoonMusic =
   e,1) |
   R1*3 |
   R1*3/4 |
-  R1 |
+  \cueDuringWithClef "clarinetSolo" #DOWN treble {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1 |
+  }
   d''4(\p ees4) r2 |
-  r4 f4\mf r4 |
-  r4 r8 ees,,8~ ees4 a'4 |
+  \cueDuringWithClef "trumpet" #UP treble {
+    \tag #'part { <>^\markup \tiny { "tpt" } }
+    r4
+  }
+  f4\mf r4 |
+  \cueDuringWithClef "horn" #DOWN treble {
+    \tag #'part { <>^\markup \tiny { "hn" } }
+    r4
+  }
+  r8 ees,,8~ ees4 a'4 |
   r2 f'2 |
   r2 d,,2\< |
   c2~\f\fermata c2 |

diff --git a/manuscripts/cello.ly b/manuscripts/cello.ly
index 26800e5e1eb12a275b709605bcb1b44758f33322..59932b613e9a089787dc69c645374cc10328a6c0 100644 (file)
--- a/manuscripts/cello.ly
+++ b/manuscripts/cello.ly
@@ -30,28 +30,22 @@ celloMusic =
   ees4. \markSpanner "" "msp" a8(\mp\startTextSpan d4 f4~ | %039
   f8) b8-.->\f\stopTextSpan r4 r2 | %040
   R1*2 | %041-42
-  R1*3/4 | %043
-  r4 b,8(\mp^\markup { \italic "ord" } cis8~ cis4) | %044
-  d4.--\< ees,8->~\mf ees4~ | %045
+  r2 r2 b,8(\mp^\markup { \italic "ord" } cis8~ cis4) | %044
+  d4.--\< ees,8->~\mf
   <<
     {
-      ees2. | %046
+      ees1 | %046
     }
     {
-      s4\> s4 s4\!
+      s4 s4\> s4 s4\!
     }
   >>
-  r4 fis'8(\f c8 g4~ | %047
-  <g e'>4.) bes4(\> f8 | %048
-  cis4) gis'4( fis8 b8-.)\mf | %049
-  R1*3/4 | %050
-  r4 r8 ees8-.\mf a,4~( | %051
-  a4 aes2) | %052
-  g8(\f c,8~ c2) | %053
-  f2.~-> | %054
-  f4 r4 e4~\mf\< | %055
-  e8 fis8-. d'8-.\f r8 r4 | %056
-  r4 r4 b8-.\mp^\markup { "pizz" } r8 r4 r4 r4 | %057
+  r4 fis'8(\f c8 g4~ <g e'>4~ 8) bes4(\> f8 | %048
+  cis4) gis'4( fis8 b8-.)\mf r4 r2 | %050
+  r4 r8 ees8-.\mf a,2( aes2) | %052
+  g8(\f c,8~ c4~ c4) f4~-> f2~ | %054
+  f4 r4 e4.\mf\< fis8-. d'8-.\f r8 r4 | %056
+  r2 b8-.\mp^\markup { "pizz" } r8 r4 r2 | %057
   c,8(\mf^\markup { "arco" } ees8~ ees2) bes'2 | %058
   f4->\ff\> d4-> | %059
   <<

diff --git a/manuscripts/clarinetSolo.ly b/manuscripts/clarinetSolo.ly
index fb7b18ae423f11269acfffe34c65d972e82f17e9..83040a862ba265320a39ff1a5ee9857c94c379f6 100644 (file)
--- a/manuscripts/clarinetSolo.ly
+++ b/manuscripts/clarinetSolo.ly
@@ -8,8 +8,7 @@ clarinetMusic =
   R1*11 | %004-14
   R1*3/2 | %015-16
   R1*26 | %017-042
-  R1*3/4*14 | %043-56
-  R1*3/4*2 | %057-58
+  R1*3/2*8 | %043-56
   \cueDuring "flute" #UP {
     \tag #'part { <>^\markup \tiny { "fl" } }
     R1*5/4
@@ -38,7 +37,7 @@ clarinetMusic =
   bes4 b2.)\mf | %076
   r2 c8-.\f g8-. a4~ | %077
   a4. d,8~(\> d4  aes4) | %078
-  bes1\mp\> aes'8(\pp ges8 | %079
+  bes1\mp\> aes'8(\pp fes8 | %079
   ees2.) r4 | %080
   f8-.->\f r8 f8-.-> des8-.-> r4 des4~\> | %081
   \after 2 \mp des2. r4 r2 | %082
@@ -47,7 +46,7 @@ clarinetMusic =
   r8 ces'8~->\f ces2~ ces8 bes8-. | %084
   a8-. b8-. c2. | %085
   ges8-. aes8-. f1~\> | %086
-  f4 g8-. e8~\mp e4 f4->\f | %087
+  f4 g8-. e8~\mp e4 ees4->\f | %087
   d2~\> d8 cis8~ cis4~ | %088
   \after 2. \p cis1 | %089
   \cueDuring "flute" #UP {
@@ -68,7 +67,7 @@ clarinetMusic =
   ees8 aes8 g8 ges8 bes,8)\f c8(\mf\< des8 ees8 | %101
   d8 e8 f8 g8~ g8) r8 aes8-. ges8-. | %102
   ces8(\f bes8 a8)-. r8 \tuplet 3/2 { g4(\< c4 e4) } | %103
-  aes16( bes16 ces16 des16 ees16 f16 ges8~ ges8.) a,16( | %0104
+  aes16( bes16 ces16 des16 eeses16 f16 ges8~ ges8.) a,16( | %0104
   ees'2)\ff r8 e8( fis8 b,8) | %105
   g8(\> f8 ees8 bes'8~ bes8) a8( aes4 | %106
   des4-.)\f r8 d8(\> c4-.) r8 e8(\mf | %107
@@ -85,7 +84,7 @@ clarinetMusic =
   \after 1 \! gis1.)\> | %117
   r4. r8 r8 b16(\< e,16 | %118
   g2.~\mf g4.) r8 d4~( | %119
-  d8\> fis8 b,4)\p | %120
+  d8\> fis8 cis4)\p | %120
   R1*6/8 | %121
   r8 r8 c8~\< c4.~ c4 c8~( c8 ees4~ | %122
   ees8) f8( bes,8~\mf bes4 a8~ | %123

diff --git a/manuscripts/flute.ly b/manuscripts/flute.ly
index 6f1553b0daadae2eac907f683e9e90d735086e4e..e5a27a57a324392e2e2237bae055df360d426ad0 100644 (file)
--- a/manuscripts/flute.ly
+++ b/manuscripts/flute.ly
@@ -8,7 +8,7 @@ fluteMusic =
     R1 | %001
     R1*3/2 | %002
   }
-  <>^\markup { \bold \box "flute" } r8 bes'8~->\mf\> bes2.~ | %003
+  <>^\markup { \bold \box "flute" } r8 bes'8~->\mf\> bes4~ bes2~ | %003
   \after 2 \! bes2. f'4~->\mf\> | %004
   f1~ | %005
   f4\! \after 2 \! ges2.->\mf\> | %006
@@ -52,11 +52,11 @@ fluteMusic =
   bes8 r8 r4 r2 | %038
   r2 r8 fis'8~\mp fis4~ | %039
   fis2~\< fis4 fis4--\f | %040
-  fis8-.->\ff r8 r4 r4 | %041
-  R1*3/4*13 | %042-56
+  fis8-.->\ff r8 r4 r2 r2 | %041
+  R1*3/2*6 | %042-56
   \cueDuringWithClef "bassoon" #DOWN "bass" {
     \tag #'part { <>^\markup \tiny { "bsn" } }
-    R1*3/4*2 |
+    R1*3/2 |
   }
   f8(\mf bes,8~ bes4) g'8(\< d'8 fis8 e8 cis'8 a) | %058
   \tuplet 3/2 { ees4\ff\> aes,4 b4 } | %059
@@ -99,8 +99,8 @@ fluteMusic =
   r8 des'8(\mp f,4) des'2 | %091
   d2 r2 | %092
   r4 b,8(->\mf c8 aes'2) | %093
-  \transposedCueDuring "clarinetSolo" #UP bes {
-    \tag #'part { <>^\markup \tiny { clarinet } }
+  \cueDuring "clarinetSolo" #UP {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
     R1 | %094-95
     R1 | %094-95
   }
@@ -112,8 +112,8 @@ fluteMusic =
   r2 r4 gis8-.-> r8 | %101
   a8-.-> r8 r4 r8 e'8-.->\f r4 | %102
   r4 d8-.-> r8 r2 | %103
-  \transposedCueDuring "clarinetSolo" #UP bes {
-    \tag #'part { <>^\markup \tiny { clarinet } }
+  \cueDuring "clarinetSolo" #UP {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
     R1*3/4 | %104
     R1 | %105
     r2
@@ -121,10 +121,10 @@ fluteMusic =
   c'8-.\f\> r8 r4 | %106
   r8 bes8-. r4 ees,8-.\mf r8 r4 | %107
   R1*3/4*2 | %108-109
-  R1*2/4 | %110
-  R1*3/4 | %111-112
-  \transposedCueDuring "clarinetSolo" #UP bes {
-    \tag #'part { <>^\markup \tiny { clarinet } }
+  \cueDuring "clarinetSolo" #UP {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1*2/4 | %110
+    R1*3/4 | %111-112
     R1*3/4
     r4 r4
   }
@@ -132,17 +132,17 @@ fluteMusic =
   cis8 d8 a4~ a8) r8 r8 fis8( | %114
   b4.)\> gis8 \tuplet 3/2 { a4( d,4 e4)\mp } | %115
   r2 r4 b4~\p | %116
-  b4.~\shortfermata b4. | %117
-  <>^\markup { "take piccolo" } R1*12/8 | %117
-  R1*6/8 | %118
-  R1*12/8 | %119
-  R1*2/4 | %120
-  R1*6/8 | %121
-  R1*12/8 | %122
-  R1*6/8 | %123
-  R1*7/8 | %124
-  \transposedCueDuring "clarinetSolo" #UP bes {
-    \tag #'part { <>^\markup \tiny { clarinet } }
+  b4.~\shortfermata b4.( | %117
+  b8) r8 <>^\markup { "take piccolo" } r8 r4. r2. | %117
+  \cueDuring "clarinetSolo" #DOWN {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1*6/8 | %118
+    R1*12/8 | %119
+    R1*2/4 | %120
+    R1*6/8 | %121
+    R1*12/8 | %122
+    R1*6/8 | %123
+    R1*7/8 | %124
     R1*12/8 | %125
     r4.
   }
@@ -155,21 +155,30 @@ fluteMusic =
   R1 | %132
   R1*5/8 | %133
   R1*4 | %134-137
-  \transposedCueDuring "clarinetSolo" #UP bes {
-    \tag #'part { <>^\markup \tiny { clarinet } }
+  \cueDuring "clarinetSolo" #UP {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
     R1*3/4 | %138-139
     R1*2 | %140
   }
   dis8(\mf gis4.~\> \after 4 \! gis2) | %141
   r2 aes4(\< f8 aes8) | %142
-  ees'4--\mf r4 r2 | %143
-  R1 | %144
+  ees'4--\mf
+  \cueDuring "clarinetSolo" #UP {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    r4 r2 | %143
+    R1 | %144
+  }
   a,8(\f b c8-.) r8 r2 | %145
   R1 | %146
   bes2~(\mf bes8 d,4 g8~ | %147
   g4) r4^\markup { "take flute" } r2 | %148
-  R1*3 | %148-150
-  r2 r4 ees'4(\< | %151
+  R1*2 | %148-150
+  \cueDuring "oboe" #DOWN {
+    \tag #'part { <>^\markup \tiny { "ob" } }
+    R1
+    r2
+  }
+  r4 ees'4(\< | %151
   f2 e!8-.)\f g,8-. d8-. r8 | %152
   r2 des''8-. r8 r8 ees8-. | %153
   R1*3 | %154-156
@@ -179,8 +188,8 @@ fluteMusic =
   R1*4 | %162
   \tag #'score { s1*36 }
   s1
-  \transposedCueDuring "clarinetSolo" #UP bes {
-    \tag #'part { <>^\markup \tiny { clarinet } }
+  \cueDuring "clarinetSolo" #UP {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
     R1*4 | %168-171
     r2 r4
   }
@@ -190,11 +199,34 @@ fluteMusic =
   r4 ees8(\mf g8 aes,8 c4.) | %175
   r8 ges8(\< des'8 aes'8) ees'8( f8\ff\> b,8 c8) | %176
   a1\f |
-  <>^\markup { "take piccolo" } R1*3 |
+  <>^\markup { "take piccolo" } R1*2 |
+  \cueDuring "clarinetSolo" #DOWN {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1
+  }
   r8 des,8~\mp^\markup { \bold \box "piccolo" } des2 |
-  R1*2 |
-  r4 \tuplet 3/2 { r8 a8(\mf bes8-.) } r4 | %184
-  r2 \tuplet 3/2 { bes4\< e4 f4 } | %185
+  \cueDuring "trumpet" #UP {
+    \tag #'part { <>^\markup \tiny { "tpt" } }
+    R1 |
+  }
+    \cueDuring "violin1" #UP {
+    \tag #'part { <>^\markup \tiny { "vl I" } }
+    R1 |
+  }
+  \cueDuring "trumpet" #UP {
+    \tag #'part { <>^\markup \tiny { "tpt" } }
+    r4
+  }
+  \tuplet 3/2 { r8 a8(\mf bes8-.) }
+  \cueDuringWithClef "cello" #DOWN bass {
+    \tag #'part { <>^\markup \tiny { "vc" } }
+    r4 | %184
+  }
+  \cueDuring "horn" #DOWN {
+    \tag #'part { <>^\markup \tiny { "hn" } }
+    r2
+  }
+  \tuplet 3/2 { bes4\< e4 f4 } | %185
   ges2\f ees2 | %186
   R1 | %187
   r2\fermata r2 | %188

diff --git a/manuscripts/horn.ly b/manuscripts/horn.ly
index 807af590223955efd4541f2072e7007a00507dcd..71e629f193719974c3896ec2ad3c8807916ed92f 100644 (file)
--- a/manuscripts/horn.ly
+++ b/manuscripts/horn.ly
@@ -5,22 +5,48 @@ hornMusic =
   \clef treble
   <>^\markup { "take straight mute" } R1 | %001
   R1*3/2 | %002-3
-  R1*5 | %004-8
+  \transposedCueDuring "bassoon" #DOWN c' {
+    \tag #'part { <>^\markup \tiny { "bsn" } }
+    R1*3 | %004-8
+  }
+  \transposedCueDuring "trombone" #DOWN c' {
+    \tag #'part { <>^\markup \tiny { "tbn" } }
+    R1
+  }
+  \transposedCueDuring "bassoon" #DOWN c' {
+    \tag #'part { <>^\markup \tiny { "bsn" } }
+    R1
+  }
   bes8-.\mf r8 r4 ges8-.\mp r8 r4 | %009
   R1*5 | %0010-14
   R1*3/2 | %015-16
-  R1*2 | %017-18
+  R1 | %017-18
+  \transposedCueDuring "trombone" #DOWN c' {
+    \tag #'part { <>^\markup \tiny { "tbn" } }
+    R1
+  }
   fis8(\p\< aes8~ aes4 g8)-.\mp r8 ees8-. r8 | %019
-  R1*6 | %020-25
+  R1*5 | %020-25
+  \transposedCueDuring "bassoon" #DOWN c' {
+    \tag #'part { <>^\markup \tiny { "bsn" } }
+    R1
+  }
   r8 b'8(~\mp\< b4 e8 ees8~ ees4~ | %026
   ees8 f4 g8\mf\> d8-.)\! r8 r4 | %027
-  R1*14 | %028-41
+  <>^\markup { "open" } R1*13 | %028-41
+  \transposedCueDuring "trombone" #DOWN c' {
+    \tag #'part { <>^\markup \tiny { "tbn" } }
+    R1
+  }
   r8 ees,8-.\mf r8 f8-. aes8-. r8 r4 | %042
-  R1*3/4*11 | %043-53
-  r8 a8~->\f a2~ | %054
-  a4 r4 r4 | %055
-  R1*3/4 | %056
-  r8 e8-.\mp r4 r4 R1*3/4 | %057
+  R1*3/2*5 | %043-53
+  r2 f4 r8 a8~->\f a2~ | %054
+  a4 r4
+  \transposedCueDuring "trumpet" #UP c' {
+    \tag #'part { <>^\markup \tiny { "tpt" } }
+    r2 r2 | %055
+  }
+  r8 e8-.\mp r4 r2 r2 | %057
   R1*5/4 | %058
   \tuplet 3/2 { ees'4\ff\> aes4 b4 } | %059
   <<
@@ -37,7 +63,11 @@ hornMusic =
   R1*3/4 | %068
   R1*6 | %069-74
   R1*5/4 | %075
-  R1*2 | %076-77
+  R1 | %076-77
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1
+  }
   e,,2.\mf r4 | %078
   r8 ees'8( des2~\> des2)\mp | %079
   R1*2 | %080-81
@@ -46,16 +76,23 @@ hornMusic =
   R1*2 | %084-85
   R1*5/4 | %086
   R1*9 | %087-95
-  R1*3/4 | %096
+  \transposedCueDuring "trumpet" #UP c' {
+    \tag #'part { <>^\markup \tiny { "tpt" } }
+    R1*3/4 | %096
+  }
   f,2.-+\mf | %097
   R1*2 | %098
   r4 r8 aes8-.\p r4 g8-. r8 | %100
   r4 cis8-.\< d8-.\! r2 | %101
   r2 bes8(\< ees8-.->)\f r4 | %102
   r4 f8-.-> r8 r2 | %103
-  R1*3/4 | %104
-  R1 | %105
-  r2 r4 r8 e8(\f | %106
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1*3/4 | %104
+    R1 | %105
+    r2 r4
+  }
+  r8 e8(\f | %106
   f8-.) ges8-. r4 r2 | %107
   r4 r8 c,8(\p bes4~ | %108
   bes4) r8 bes8~\mp bes4~ | %109
@@ -64,28 +101,37 @@ hornMusic =
   e4~ e8 r8 ees4~\f | %112
   ees2. | %113
   <>^\markup { "take straight mute" } R1*3 | %114-116
-  r4.\shortfermata r4. | %117
-  R1*12/8 | %117
-  R1*6/8 | %118
-  R1*12/8 | %119
-  R1*2/4 | %120
-  R1*6/8 | %121
-  R1*12/8 | %122
-  R1*6/8 | %123
-  R1*7/8 | %124
-  R1*12/8 | %125
-  R1*7/8 | %126
-  R1*12/8 | %127
-  R1*3/16 | %128
-  R1*6/8 | %129
+  r4.\shortfermata
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    r4. | %117
+    R1*12/8 | %117
+    R1*6/8 | %118
+    R1*12/8 | %119
+    R1*2/4 | %120
+    R1*6/8 | %121
+    R1*12/8 | %122
+    R1*6/8 | %123
+    R1*7/8 | %124
+    R1*12/8 | %125
+    R1*7/8 | %126
+    R1*12/8 | %127
+    R1*3/16 | %128
+    R1*6/8 | %129
+  }
   r8 b'4~\mp\> \after 1 \p b1. | %130
-  R1*2/4\fermata | %131
-  <>^\markup { "open" } R1 | %132
+  <>^\markup { "open" } R1*2/4\fermata | %131
+  R1 | %132
   R1*5/8 | %133
   R1*4 | %134
   R1*3/4 | %138-139
-  R1*6 | %140
-  r2 r4 fis4->\fp | %145
+  R1*5 | %140
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
+    R1
+    r2
+  }
+  r4 fis4->\fp | %145
   g2->\fp cis,4(\mf\< fis,8 g8) | %146
   c8( f,!4) d'8~ d8 bes4\f bes8~ | %147
   bes8 a8(\< b8 dis8~ dis4) gis4~->\ff | %148
@@ -97,8 +143,8 @@ hornMusic =
   R1*4 | %162
   \tag #'score { s1*36 }
   s1
-  \transposedCueDuring "clarinetSolo" #UP ees {
-    \tag #'part { <>^\markup \tiny { clarinet } }
+  \transposedCueDuring "clarinetSolo" #UP c' {
+    \tag #'part { <>^\markup \tiny { "s cl" } }
     R1*4 | %168-171
     r2 r4
   }
@@ -114,7 +160,10 @@ hornMusic =
   R1*3/4 |
   cis2.-+\p r4 |
   R1 |
-  R1*3/4 |
+  \transposedCueDuring "cello" #DOWN c' {
+    \tag #'part { <>^\markup \tiny { "vc" } }
+    R1*3/4 |
+  }
   fis2->\f r2 |
   R1*2 |
   r2\fermata r2 |

diff --git a/manuscripts/oboe.ly b/manuscripts/oboe.ly
index 0610af80990ec9f72458c0aafb307abeaadd7d24..fca3684fc61d1a556ff8faeee7cd764a1c439288 100644 (file)
--- a/manuscripts/oboe.ly
+++ b/manuscripts/oboe.ly
@@ -47,11 +47,11 @@ oboeMusic =
   }
   r8 fis8~\mp\< fis4~ | %041
   fis2~ fis4 fis4--\f | %042
-  fis8-.->\ff r8 r4 r4 | %043
-  R1*3/4*13 | %044-56
+  fis8-.->\ff r8 r4 r2 r2 | %043
+  R1*3/2*6 | %044-56
   \cueDuringWithClef "bassoon" #DOWN bass {
     \tag #'part { <>^\markup \tiny { "bsn" } }
-    R1*3/4*2
+    R1*3/2
   }
   f8(\mf bes,8~ bes4) g8(\< d'8 fis8 e8 cis'8 a) | %058
   \tuplet 3/2 { ees'4\ff\> aes,4 b4 } | %059
@@ -221,13 +221,17 @@ oboeMusic =
     r4
   }
   \tuplet 3/2 { r8 a8(\mf fis8-.) } r4 |
-  r2 \tuplet 3/2 { bes,4\< g'4 f4 } |
+  \cueDuring "horn" #DOWN {
+    \tag #'part { <>^\markup \tiny { "hn" } }
+    r2
+  }
+  \tuplet 3/2 { bes,4\< g'4 f4 } |
   aes4.\f a8~-> a2 |
   R1 |
   r2\fermata r2 |
   r4 b2.->\ff\fermata |
-
 }
+\addQuote "oboe" { \removeWithTag #'score \oboeMusic }
 
 oboeStaff =
 #(define-music-function (music) (ly:music?)

diff --git a/manuscripts/perc1.ly b/manuscripts/perc1.ly
index fbbdbef80ef480f0f365a1293eae10b1aad3527c..9d46c42b0efd8bcfa05d311ed4f65e5e0bac21fa 100644 (file)
--- a/manuscripts/perc1.ly
+++ b/manuscripts/perc1.ly
@@ -62,18 +62,13 @@ percOneMusic =
     R1*13 | %027-40
     r2 a8-+\mf bes8~ bes4 | %041
     r4 r8 f8-+ aes8-+ r8 r4 | %042
-    R1*3/4*2 | %043-44
-    fis'4.\mf g8:32~ g4:32 | %045
-    r4 r4 r8 cis8->-+ | %046
-    R1*3/4 | %047
-    r4 r4 ees,4:32~\> | %048
-    ees2:32 ees4\mp | %049
-    r4 f4-+ r8 f8-+ | %050
-    r4 a4-+-> r8 cis8\< | %051
-    e,4 b'4. fis8 | %052
-    bes8 ees8~\mf ees2 | %053
-    d2. | %054
-    R1*3/4*4 | %055-56
+    R1*3/2 | %043-44
+    fis'4.\mf g8:32~ g4:32 r4 r4 r8 cis8->-+ | %046
+    r2 r2 r4 ees,4:32~\> | %048
+    ees2:32 ees4\mp r4 f4-+ r8 f8-+ | %050
+    r4 a4-+-> r8 cis8\< e,4 b'4. fis8 | %052
+    bes8 ees8~\mf ees4 r4 d4 r2 | %054
+    R1*3/2*2 | %055-56
     R1*5/4 | %057-58
     R1*2/4 | %059
     \override Voice.Clef.stencil = ##f

diff --git a/manuscripts/perc2.ly b/manuscripts/perc2.ly
index 5508600f0f1bc3d9227a61fc7c3f283d1e68af07..4b594a4f31618122a79cc1397c91c96035297da2 100644 (file)
--- a/manuscripts/perc2.ly
+++ b/manuscripts/perc2.ly
@@ -72,18 +72,14 @@ percTwoMusic =
     R1 | %040
     r4 d8\p\< e8 a8 bes8:32~\mf bes4:32 | %041
     r8 ees,8-+ r8 f8-+ aes8-+ r8 r4 | %042
-    R1*3/4*2 \clef treble | %043-44
-    fis'4.\mf g8:32~ g4:32 | %045
-    r4 r4 r8 cis8->-+ | %046
-    R1*3/4 | %047
-    r4 r4 ees,4:32~\> | %048
-    ees2:32 ees4\mp | %049
-    r4 f4-+ r8 f8-+ | %050
-    r4 a4-+-> r4 | %051
-    R1*3/4*3 | %052-54
-    r4 r4 aes4:32~\mp\< | %055
-    aes4:32 f'8\f r8 r8 g,8\> \clef bass | %056
-    a,8 e8 r4 b8\mp r8 R1*3/4 | %057
+    R1*3/2 \clef treble | %043-44
+    fis'4.\mf g8:32~ g4:32 r4 r4 r8 cis8->-+ | %046
+    r2 r2 r4 ees,4:32~\> | %048
+    ees2:32 ees4\mp r4 f4-+ r8 f8-+ | %050
+    r4 a4-+-> r2 r2 | %051
+    R1*3/2 | %052-54
+    r2 aes4:32~\mp\< aes4:32 f'8\f r8 r8 g,8\> \clef bass | %056
+    a,8 e8 r4 b8\mp r8 r4 r2 | %057
     R1*5/4 | %058
     R1*2/4 \clef treble | %059
     <>^\markup { \bold \box "tubular bells" } <c' g'>1\f\fermata | %60

diff --git a/manuscripts/pianoDown.ly b/manuscripts/pianoDown.ly
index 63064129105851fc86a2137fa2b9f158c3ba2503..22a92fdcb4e5dbce6729974495511816d6d226f1 100644 (file)
--- a/manuscripts/pianoDown.ly
+++ b/manuscripts/pianoDown.ly
@@ -38,10 +38,10 @@ pianoDownMusic =
   R1 | %040
   g8-.^\p^\< c8-. d8-. e8-. a8-. bes8~^\mf bes4 | %041
   R1 | %042
-  R1*3/4*5 | %043-47
-  r4 r4 r8 f,8(^\mf^\> | %048
-  cis4 gis'4 fis8 b,8-.)^\mp | %049
-  R1*3/4*9 | %050-56
+  R1*3/2*2 | %043-47
+  r2 r2 r4 r8 f,8(^\mf^\> | %048
+  cis4 gis'4 fis8 b,8-.)^\mp r4 r2 | %049
+  R1*3/2*4 | %050-56
   c8( ees8~ ees4) \clef treble g''8( d'8 fis8 e8 cis'8) r8 \clef bass | %058
   <f,,, f,>4 <d d,>4 | %059
   <g, g,>1\fermata | %060
@@ -153,5 +153,4 @@ pianoDownMusic =
   R1*3 |
   r2\fermata r2 |
   <c g'>8(\sustainOn <e' c'>8 <c' e g>2.)\fermata |
-
 }

diff --git a/manuscripts/pianoUp.ly b/manuscripts/pianoUp.ly
index 85a28194eaf07bcc283f5c21a8e740c4fdccb763..9be96e77f15a83cfacfe74e0fa2489cc0006c005 100644 (file)
--- a/manuscripts/pianoUp.ly
+++ b/manuscripts/pianoUp.ly
@@ -13,11 +13,10 @@ pianoUpMusic =
   r4 r8 \repeat tremolo 2 { a'32(\< b } \repeat tremolo 8 { a32\mf\> b } | %024
   \after 4 \p \repeat tremolo 8 { a32 b) } r2 | %025
   R1*17 | %26-42
-  R1*3/4*8 | %043-50
-  r4 r4 r8 cis8-+\mf\< | %051
-  e,4-+ b'4.-+ fis8-+ | %052
-  bes8-+ ees8-+\f r4 r4 | %053
-  R1*3/4*5 | %054-56
+  R1*3/2*4 | %043-50
+  r2 r8 cis8-+\mf\< e,4-+ b'4.-+ fis8-+ | %052
+  bes8-+ ees8-+\f r4 r2 r2 | %053
+  R1*3/2*2 | %054-56
   f8(\mf bes,8~ bes4) \ottava #1 g'8(\< d'8 fis8 e8 cis'8 a8) \ottava #0 | %058
   \tuplet 3/2 { <ees ees,>4\ff\> <aes, aes,>4 <b b,>4 } | %059
   <c c,>1\mf\fermata | %060

diff --git a/manuscripts/tempoMap.ly b/manuscripts/tempoMap.ly
index bf0a05a253fda0b523bd9a4acf4ea7f8b71d1927..94b1df03234eacfe0c39b7e7ec88277cd97b6dee 100644 (file)
--- a/manuscripts/tempoMap.ly
+++ b/manuscripts/tempoMap.ly
@@ -13,7 +13,7 @@ tempoMap =
   \mark \default
   \time 2/2 s1*26 | %016-42
   \mark \default
-  \time 3/4 s1*3/4*16 | %043-56
+  \time 3/2 s1*3/2*8 | %043-56
   \time 5/4 \timeSpanner "molto rit." s2\startTextSpan s2. | %058
   \time 2/4 s4.. s16\stopTextSpan | %059
   \time 2/2 s1 \bar "||" | %060

diff --git a/manuscripts/trombone.ly b/manuscripts/trombone.ly
index 121076e5d1a4c657aa5cdf138e556ff2ce143d8e..b3371d4aa2b1038d59684c877c988e36e3289c86 100644 (file)
--- a/manuscripts/trombone.ly
+++ b/manuscripts/trombone.ly
@@ -29,25 +29,21 @@ tromboneMusic =
   R1*6 | %035-40
   r8 c8-.\p\< d8-. e8-. a8-. bes8~\mf bes4 | %041
   r8 ees,8-. r8 f8-. aes8-. r8 r4^\markup { "open" } | %042
-  R1*3/4 | %043
-  r4 b,8(\mp cis8~ cis4) | %044
-  d4.--\< ees8~->\mf ees4~ | %045
+  r2 r2 b,8(\mp cis8~ cis4) | %044
+  d4.--\< ees8~->\mf
   <<
     {
-      ees2. | %046
+      ees1 | %046
     }
     {
-      s4\> s4 s4\!
+      s4 s4\> s4 s4\!
     }
   >>
-  R1*3/4*4 | %047-50
-  r8 g,8-.\mf r8 ees'8-. a,4~( | %051
-  a4 aes2) | %052
-  R1*3/4 | %053
-  r4 r8 bes8~->\f bes4~ | %054
-  bes4\> des8( ees8~\mf ees4~ | %055
-  ees8) r8 r4 r4 | %056
-  R1*3/4*2 | %057
+  R1*3/2*2 | %047-50
+  r8 g,8-.\mf r8 ees'8-. a,2( aes2) | %052
+  r2 r2 r8 bes8~->\f bes4~ | %054
+  bes4\> des8( ees8~\mf ees4~ ees8) r8 r2 | %056
+  R1*3/2 | %057
   c8(\mf ees8~ ees2) bes2 | %058
   f4\ff\> d'4 | %059
   <<

diff --git a/manuscripts/trumpet.ly b/manuscripts/trumpet.ly
index b2d65019bad83f9ef50984e7981bc0fec67751bd..49bb081cc40137b0692bbd47f4a369b5eb6d8b66 100644 (file)
--- a/manuscripts/trumpet.ly
+++ b/manuscripts/trumpet.ly
@@ -18,14 +18,11 @@ trumpetMusic =
   cis,1~\mf | %032
   cis1) | %033
   <>^\markup { "open" } R1*9 | %034-42
-  R1*3/4*8 | %043-050
-  r4 a8-.\mf r8 r8 cis8(\< | %051
-  e,4 b'4.) fis8( | %052
-  bes8 ees8~\f ees2 | %053
-  d2.~ | %054
-  d4) r4 aes4~-> | %055
-  aes4 f'8-.\> r8 c8-. g8-.\mp | %056
-  R1*3/4*2 | %057
+  R1*3/2*4 | %043-050
+  r4 a8-.\mf r8 r8 cis8(\< e,4 b'4.) fis8( | %052
+  bes8 ees8~\f ees4~ ees4 d4~ d2~ | %054
+  d4) r4 aes2-> f'8-.\> r8 c8-. g8-.\mp | %056
+  R1*3/2 | %057
   f'8(\mf bes,8~ bes2) bes,2 | %058
   \tuplet 3/2 { ees'4\ff\> aes,4 b4 } | %059
   <<

diff --git a/manuscripts/viola.ly b/manuscripts/viola.ly
index 7364391c6d7a0b6f649a387ab902c457738d1d51..713d36612e40ad83588be5414420c81d1d2abfd4 100644 (file)
--- a/manuscripts/viola.ly
+++ b/manuscripts/viola.ly
@@ -24,19 +24,14 @@ violaMusic =
   r2 \markSpanner "" "msp" d4(\mp\<\startTextSpan f4~ | %039
   f8) b8-.->\f\stopTextSpan r4 r2 | %040
   R1*2 | %041-42
-  r4 r4 a8-.\mp\<^\markup { "pizz" } aes8-. | %043
-  f8-.\! r8 r4 r4 | %044
-  fis'4.--\mp\<^\markup { "arco" } g8~->\mf g4 | %045
-  bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046
-  r4 d8(\f a8 b4~ | %047
-  b2) ees,4~\> | %048
-  ees2 ees4--\mf | %049
-  r4 f4.\p^\markup { "pizz" } f8\laissezVibrer | %050
-  R1*3/4*3 | %051-53
-  r8 a,8~->\f^\markup { "arco" } a2~ | %054
-  a4\> cis,8( dis8~\mf dis4~ | %055
-  dis8)\< fis8-. d8-.\f r8 r4 | %056
-  R1*3/4*2 | %057
+  r2 a8-.\mp\<^\markup { "pizz" } aes8-.f4-.\! r2 | %044
+  fis'4.--\mp\<^\markup { "arco" } g8~->\mf g4 bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046
+  r4 d8(\f a8 b2~ b4) ees,4~\> | %048
+  ees2 ees4--\mf r4 f4.\p^\markup { "pizz" } f8\laissezVibrer | %050
+  R1*3/2 | %051-53
+  r2 r4 r8 a,8~->\f^\markup { "arco" } a2~ | %054
+  a4\> cis,8( dis8~\mf dis4.)\< fis8-. d8-.\f r8 r4 | %056
+  R1*3/2 | %057
   c8(\mf ees8~ ees2) bes'2 | %058
   f4->\ff\> d4-> | %059
   <<

diff --git a/manuscripts/violin1.ly b/manuscripts/violin1.ly
index b650d35e4bd874a60d36f7c208a1c6b3210e383f..f0316f89147feec0f871b353d19cb17f9d5dd238 100644 (file)
--- a/manuscripts/violin1.ly
+++ b/manuscripts/violin1.ly
@@ -24,15 +24,12 @@ violinOneMusic =
   bes8 bes8-.->\f\stopTextSpan r4 r2 | %040
   r2 r8 fis'8~\mp\<^\markup { \italic "ord" } fis4~ | %041
   fis2.~ fis8\mf r8 | %042
-  R1*3/4*2 | %043-44
-  fis,4.--\mp\< g8~->\mf g4 | %045
-  bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046
-  r4 d8(\f a8 b4~ | %047
-  b2) ees,4~\> | %048
-  ees2 ees4--\mf | %049
-  r4 f4.\p^\markup { "pizz" } f8\laissezVibrer | %050
-  R1*3/4*6 | %051-56
-  a,8-.\mf^\markup { "pizz" } r8 r4 r4 R1*3/4 | %057
+  R1*3/2 | %043-44
+  fis,4.--\mp\< g8~->\mf g4 bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046
+  r4 d8(\f a8 b2~ b4) ees,4~\> | %048
+  ees2 ees4--\mf r4 f4.\p^\markup { "pizz" } f8\laissezVibrer | %050
+  R1*3/2*3 | %051-56
+  a,8-.\mf^\markup { "pizz" } r8 r4 r2 r2 | %057
   f''8(^\markup { "arco" } bes,8~ bes4) g'8(\< d'8 fis8 e8 cis'8 a8) | %058
   \tuplet 3/2 { ees4\ff\> aes,4 b4 } | %059
   <<

diff --git a/manuscripts/violin2.ly b/manuscripts/violin2.ly
index 35e7d8e7529f928d877c8ef99f9d693fee1654ea..d276314042c21bdec2230d7a4679c43a246d2972 100644 (file)
--- a/manuscripts/violin2.ly
+++ b/manuscripts/violin2.ly
@@ -24,15 +24,12 @@ violinTwoMusic =
   bes8 bes8-.->\f\stopTextSpan r4 r2 | %040
   r2 r8 fis'8~\mp\<^\markup { \italic "ord" } fis4~ | %041
   fis2.~ fis8\mf r8 | %042
-  R1*3/4*2 | %043-44
-  fis,4.--\mp\< g8~->\mf g4 | %045
-  bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046
-  r4 d8(\f a8 b4~ | %047
-  b2) ees,4~\> | %048
-  ees2 ees4--\mf | %049
-  r4 f4.\p^\markup { "pizz" } f8\laissezVibrer | %050
-  R1*3/4*6 | %051-56
-  a,8-.\mf^\markup { "pizz" } r8 r4 r4 R1*3/4 | %057
+  R1*3/2 | %043-44
+  fis,4.--\mp\< g8~->\mf g4 bes8-. c8-. e,8-. gis4(\glissando cis8-.) | %046
+  r4 d8(\f a8 b2~ b4) ees,4~\> | %048
+  ees2 ees4--\mf r4 f4.\p^\markup { "pizz" } f8\laissezVibrer | %050
+  R1*3/2*3 | %051-56
+  a,8-.\mf^\markup { "pizz" } r8 r4 r2 r2 | %057
   f''8(^\markup { "arco" } bes,8~ bes4) g8(\< d'8 fis8 e8 cis'8 a8) | %058
   \tuplet 3/2 { ees4\ff\> aes,4 b4 } | %059
   <<

diff --git a/parts/parts_tiny-cartel.ly b/parts/parts_tiny-cartel.ly
index 38ad5d7302c9f9dddaf28f2600143669fd693bc5..dc910f277939c24b47574ebd19e65095b4064972 100644 (file)
--- a/parts/parts_tiny-cartel.ly
+++ b/parts/parts_tiny-cartel.ly
@@ -25,294 +25,294 @@
 \include "../manuscripts/cello.ly"
 \include "../manuscripts/bass.ly"
 
-%#(define output-suffix "flute_picc")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { "flute/piccolo" }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \fluteStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \fluteMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "flute_picc")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { "flute/piccolo" }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \fluteStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \fluteMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "oboe")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { oboe }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \oboeStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \oboeMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "oboe")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { oboe }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \oboeStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \oboeMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "bass clarinet")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { bass clarinet }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \bassClarinetStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \bassClarinetMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "bass clarinet")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { bass clarinet }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \bassClarinetStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \bassClarinetMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "bassoon")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { bassoon }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \bassoonStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \bassoonMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "bassoon")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { bassoon }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \bassoonStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \bassoonMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "horn")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { Horn in F }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \hornStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \hornMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "horn")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { Horn in F }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \hornStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \hornMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "trumpet")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { trumpet in C }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \trumpetStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \trumpetMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "trumpet")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { trumpet in C }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \trumpetStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \trumpetMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "trombone")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { trombone }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \tromboneStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \tromboneMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "trombone")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { trombone }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \tromboneStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \tromboneMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "percussionI")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { percussion I }
-%      meter = \percOneSetup
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \percOneStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \percOneMusic >>
-%      >>
-%      \layout {
-%        \context {
-%          \Score
-%          \remove Clef_engraver
-%        }
-%        \context {
-%          \Staff
-%          \remove Clef_engraver
-%        }
-%      }
-%    }
-%  }
-%}
+#(define output-suffix "percussionI")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { percussion I }
+      meter = \percOneSetup
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \percOneStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \percOneMusic >>
+      >>
+      \layout {
+        \context {
+          \Score
+          \remove Clef_engraver
+        }
+        \context {
+          \Staff
+          \remove Clef_engraver
+        }
+      }
+    }
+  }
+}
 
-%#(define output-suffix "percussionII")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { percussion II }
-%      meter = \percTwoSetup
-%     arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \percTwoStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \percTwoMusic >>
-%      >>
-%      \layout {
-%        \context {
-%          \Score
-%          \remove Clef_engraver
-%        }
-%        \context {
-%          \Staff
-%          \remove Clef_engraver
-%        }
-%      }
-%    }
-%  }
-%}
+#(define output-suffix "percussionII")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { percussion II }
+      meter = \percTwoSetup
+     arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \percTwoStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \percTwoMusic >>
+      >>
+      \layout {
+        \context {
+          \Score
+          \remove Clef_engraver
+        }
+        \context {
+          \Staff
+          \remove Clef_engraver
+        }
+      }
+    }
+  }
+}
 
-%#(define output-suffix "piano")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { piano }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \pianoStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \pianoUpMusic >> \compressMMRests { \removeWithTag #'score \pianoDownMusic }
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "piano")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { piano }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \pianoStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \pianoUpMusic >> \compressMMRests { \removeWithTag #'score \pianoDownMusic }
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "violinI")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { "violin I" }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \violinOneStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \violinOneMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "violinI")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { "violin I" }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \violinOneStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \violinOneMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "violinII")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { "violin II" }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \violinTwoStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \violinTwoMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "violinII")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { "violin II" }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \violinTwoStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \violinTwoMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "viola")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { "viola" }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \violaStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \violaMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "viola")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { "viola" }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \violaStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \violaMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "cello")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { "cello" }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \celloStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \celloMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "cello")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { "cello" }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \celloStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \celloMusic >>
+      >>
+    }
+  }
+}
 
-%#(define output-suffix "bass")
-%\book {
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { "bass" }
-%      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
-%    }
-%    \score {
-%      <<
-%        \bassStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \bassMusic >>
-%      >>
-%    }
-%  }
-%}
+#(define output-suffix "bass")
+\book {
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { "bass" }
+      arranger = \markup { \tiny \typewriter { \shortHash - \branchName } }
+    }
+    \score {
+      <<
+        \bassStaff \compressMMRests << \removeWithTag #'score \tempoMap \removeWithTag #'score \bassMusic >>
+      >>
+    }
+  }
+}