more part work

diff --git a/general/partPaper.ly b/general/partPaper.ly
index 8774e1c12b1a5da03a25fc7f2420f9ce34745653..c6f49860e055012760f2300c77f7176c41868b96 100644 (file)
--- a/general/partPaper.ly
+++ b/general/partPaper.ly
@@ -12,10 +12,13 @@
   indent = 0.75\in
   short-indent = 0\cm
   #(define fonts (set-global-fonts #:music "scorlatti" #:brace "scorlatti" #:roman "Junicode" #:sans "sans"))
-  max-systems-per-page = #10
-  system-system-spacing = #'((basic-distance . 10) (minimum-distance . 8) (padding . 12))
-  score-system-spacing = #'((basic-distance . 2) (minimum-distance . 1) (padding . 0))
-  last-bottom-spacing = #'((basic-distance . 5) (minimum-distance . 5) (padding . 0))
+  max-systems-per-page = #8
+  min-systems-per-page = #4
+  markup-system-spacing = #'((basic-distance . 2) (minimum-distance . 1) (padding . 2))
+  system-system-spacing = #'((basic-distance . 5) (minimum-distance . 3) (padding . 8))
+  score-markup-spacing = #'((basic-distance . 4) (minimum-distance . 3) (padding . 4))
+  score-system-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 0))
+  last-bottom-spacing = #'((basic-distance . 4) (minimum-distance . 2) (padding . 5))
   tocTitleMarkup = \markup {  }
   tocItemMarkup = \markup \fill-line {
     \fill-with-pattern #1.5 #CENTER .
@@ -26,6 +29,7 @@
   }
 
   oddHeaderMarkup = \markup {
+    \concat { \if \on-page #3 \oddhead }
     \concat { \if \on-page #5 \oddhead }
     \concat { \if \on-page #7 \oddhead }
     \concat { \if \on-page #9 \oddhead }
@@ -47,6 +51,7 @@
 
   }
   evenHeaderMarkup = \markup {
+    \concat { \if \on-page #2 \evhead }
     \concat { \if \on-page #4 \evhead }
     \concat { \if \on-page #6 \evhead }
     \concat { \if \on-page #8 \evhead }
@@ -67,7 +72,8 @@
     \concat { \if \on-page #38 \evhead }
   }
   oddFooterMarkup = \markup {
-    \concat { \if \on-page #3 \fill-line { \null \xcr \null } }
+    \concat { \if \on-page #1 \fill-line { \null \xcr \null } }
+    \concat { \if \on-page #3 \oddfoot }
     \concat { \if \on-page #5 \oddfoot }
     \concat { \if \on-page #7 \oddfoot }
     \concat { \if \on-page #9 \oddfoot }

diff --git a/manuscripts/I-clarinet.ly b/manuscripts/I-clarinet.ly
index 55845a02e225d6ba76c419b02c39fa5b0fbcf51b..b760203dd45d839d7887847a8619cbcffe8c21e1 100644 (file)
--- a/manuscripts/I-clarinet.ly
+++ b/manuscripts/I-clarinet.ly
@@ -18,11 +18,11 @@
   \time 2/2 f'2--\pp f2-- | %001
   f2-- f2--\> | %002
   \time 3/2 f2--\! \breathe \tuplet 3/2 { e4(\< fis a,~ } a4 d,4~\mp | %003
-  d1) \breathe d4~\p\< d16 cis''8.~ | %004
+  d1) \breathe d4~\p\< d16 cis''8.~ | \tag #'part { \break }    %004
   \time 5/4 cis8 b'8~\mp b4~ b8 b8(\mf c4 g4~ | %005
   g2) \tuplet 3/2 { aes4(\> ees bes)\! } r4 | %006
   \time 2/2 r4 f4(\p\> e4 fis | %007
-  a,1)\pp\shortfermata | %008
+  a,1)\pp\shortfermata | \tag #'part { \break } %008
   a2( d,2~ | %009
   d1)\shortfermata | %010
 
@@ -30,7 +30,7 @@
   \omit Score.BarNumber
   \time 5/4 \grace s8 r4 cis''4(\p\< b'4 bes2)\! | \undo \omit Score.BarNumber %011
   \time 2/2 \tuplet 3/2 { r4 c4(\f\> g4~ } g2) | %012
-  \time 5/4 aes2( ees2.~\p | %013
+  \time 5/4 aes2( ees2.~\p \tag #'part { \break } | %013
   \time 2/2 ees8) r8 r4 r2 | %014
   R1 | %015
   R1\fermata  | %016
@@ -38,12 +38,12 @@
   \sectionLabel \markup { \huge \box \sans \bold 17 }
   \omit Score.BarNumber
   r2 d2~\mp | \undo \omit Score.BarNumber %017
-  \time 7/4 d4 e4(\> fis4 a,2.)\p\shortfermata r4 | %018
+  \time 7/4 d4 e4(\> fis4 a,2.)\p\shortfermata r4 | \tag #'part { \break } %018
   \time 2/2 \grace s8 des4(\< ees bes f'4~\mf | %019
   \time 3/2 f2.) r4 r2 | %020
   \time 2/2 R1\shortfermata | %021
   \time 3/2 c2.\pp c4(\< g'4 f4~\mp | %022
-  \time 2/2 \tuplet 3/2 { f4) e(\> fis } a,2)\p\fermata \breathe | %023
+  \time 2/2 \tuplet 3/2 { f4) e(\> fis } a,2)\p\fermata \breathe | \tag #'part { \break } %023
 
   \sectionLabel \markup { \huge \box \sans \bold 24 }
   \omit Score.BarNumber
@@ -51,7 +51,7 @@
   d4(\mf\> c ees4~\p ees2)\shortfermata \breathe | %025
   d,4(\pp e2 ees4) g8(\< c, | %026
   \time 2/2 aes'4)\p ges2(\< bes4 | %027
-  a2)\mp cis4(\< e) | %028
+  a2)\mp cis4(\< e) | \tag #'part { \break } %028
   \time 3/2 \grace s8 g2~\mf g1\fermata \breathe | %029
 
   \sectionLabel \markup { \huge \box \sans \bold 30 }

diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly
index f5bc8fac65938f0fba5d9f2e1dad57e23f0cf971..7d749c6827aefaaad936f6ea2d0ff2d5a22e9184 100644 (file)
--- a/manuscripts/II-clarinet.ly
+++ b/manuscripts/II-clarinet.ly
@@ -11,37 +11,38 @@
  }
 \transpose bes c'
 \relative {
+  \compressEmptyMeasures
   \tempo "Vivace" 4=168 \time 2/4 ces'4.\f ees8 | %001
   \time 6/8 bes'8-. r8 r8 c,4. | %002
   \time 3,2,2 7/8 d'4.\> a'8( cis8~\mp 4~ | %003
-  \time 4/4 cis8) e,,,8 g'8-. r8 r8 aes,8~ aes4 | %004
+  \time 4/4 cis8) e,,,8 g'8-. r8 r8 aes,8~ aes4 | \tag #'part { \break } %004
   f''4. ges8 a,,4.\f bes8( | %005
   \time 6/8 f'8 d8-.) r8 c'4 e'8-. | %006
   \time 9/8 \grace s8 fis,,,4.(\p cis'4.) ees'8-. r8 r8 | %007
-  \time 3/4 g-. r8 b4( aes8-.) c,,->~\f | %008
+  \time 3/4 g-. r8 b4( aes8-.) c,,->~\f | \tag #'part { \break } %008
   \time 4/4 c8 des'8~ des4 bes'8-. r8 r8 a,~ | %009
   a8 e4 d''8-. aes,4\p ges' |%010
   \time 3,2 5/8 f'8-. r8 r8 ees,,,8(\< g8~ | %011
-  \time 3/4 g8) b'8 f,4->\f ges'4 | %012
+  \time 3/4 g8) b'8 f,4->\f ges'4 | \tag #'part { \break } %012
   g''8 bes,,,4 a'4 aes'8-. | %013
   \time 4/4 d,,,8\mp  e''4 c'8-. r8 cis,,4\< b'8 | %014
   ees'8--\f r8 f,,2\niente\< f4->\ff | %015
 
   \sectionLabel \markup { \huge \box \sans \bold 16 }
   \omit Score.BarNumber
-  \time 3/4 des4(\psempre aes4) d8 c'8~ | \undo \omit Score.BarNumber %016
+  \time 3/4 des4(\psempre aes4) d8 c'8~ | \undo \omit Score.BarNumber \tag #'part { \break } %016
   c8 b'4 bes,,8 a''4~ | %017
   a8 ees4 ges,,4 g''8 | %018
   e'4 \breathe d,4( f8) des'8 | %019
-  c,,4 bes'4 ges'4 | %020
+  c,,4 bes'4 ges'4 | \tag #'part { \break \noPageBreak } %020
   aes,,8 g'4 a'4 b,,8( | %021
   e,4) \breathe ees'8 d,4 b''8~ | %022
   b8 c'8 bes,,4 des4~ | %023
-  des8 f'4 \breathe ges,,8 aes'4 | %024
+  des8 f'4 \breathe ges,,8 aes'4 | \tag #'part { \break } %024
   ees''4 f,,,8 a4 e''8~ | %025
   e4. ees,,8\< b'8 fis''8 | %026
   e,,8 cis''8 a8 gis,4.\f | %027
-  r8 f'8 r8 bes8( d4~ | %028
+  r8 f'8 r8 bes8( d4~ | \tag #'part { \break } %028
   d4~ d8) r8 r8 aes'8~\mp | %029
 
   \sectionLabel \markup { \huge \box \sans \bold 30 }
@@ -49,12 +50,12 @@
   aes2. | \undo \omit Score.BarNumber %030
   e8( g8-.) r8 d,8--\f fis,8-.\mp\< a8-. | %031
   d8( des f)\f bes,8-. fis'8->-- b'8(\p | %032
-  ees,2.) | %033
+  ees,2.) | \tag #'part { \break } %033
   f,,8-. c''8~\< c2~\f\> | %034
   c4 d,8-.\mp\< bes8( a4) | %035
   des8-.->\f g8-.->  des''8 ees,,,8( c'8) aes'-.-> | %036
   R1*3/4 | %037
-  r4 r4 r8 e8-.-> | %038
+  r4 r4 r8 e8-.-> | \tag #'part { \break } %038
   a'4(\p fis8) b,,8~(\< b8 g8~ | %039
   g4) ees'8-.->\mf cis''8-- e,,,8(\< gis8) | %040
   b'8-.->\f r8 r4 r4 | %041
@@ -62,20 +63,19 @@
   \sectionLabel \markup { \huge \box \sans \bold 42 }
   \omit Score.BarNumber
   d'8(\> f,8~ f2~\pp\< | \undo \omit Score.BarNumber %042
-  f8)\f c,8~\p\< c8 b'8-.->\mf e4 | %043
+  f8)\f c,8~\p\< c8 b'8-.->\mf e4 | \tag #'part { \break } %043
   bes8-.->\f\< des,8-.-> ges,8-.-> c8-.->\! ees'4(\p | %044
   f2.~ | %045
   f4~ f8) r8 a,8(\f\< e8) | %046
   aes,8-.->\! r8 r8 b''4.\p | %047
-  ees,,8\f\< g,8-.-> d8-.->\! bes'''4.~(\p | %048
+  ees,,8\f\< g,8-.-> d8-.->\! bes'''4.~(\p | \tag #'part { \break } %048
   bes4. a8) f,8-> r8 | %049
   a2.~(\pp\< | %050
   a2.~ | %051
   a4.\mf bes,8-.) r4 | %052
   ees4 ees8-. r8 b'8-. e,8~( | %053
-  e4 f,8-.) r8 r4 | %054
-  R1*3/4 | %055
-  R1*3/4 | %056
+  e4 f,8-.) r8 r4 | \tag #'part { \break } %054
+  R1*3/4*2 | %055-056
 
   \sectionLabel \markup { \huge \box \sans \bold 57 }
   \omit Score.BarNumber
@@ -83,12 +83,12 @@
   bes''8-.\mf bes8~\p bes2 | %058
   ees,->(\mf des'8-.) r8 | %059
   r8 des8-.\p r8 b8-.\mf b4~\p | %060
-  b4 fis'2~->( | %061
+  b4 fis'2~->( | \tag #'part { \break } %061
   fis2~ fis8 a,8-.)\> | %062
   r8 a8-. r4 ees8-. r8 | %063
   ees8-.\p  r8 r4 r4 | %064
   r8 c'8~\< c4~ c8 c8( | %065
-  f,8-.)\f bes8-.\mp r8 aes'4(\f des,8-.) | %066
+  f,8-.)\f bes8-.\mp r8 aes'4(\f des,8-.) | \tag #'part { \break } %066
   r8 g,,8--\p g8-. r8 r4 | %067
   g8-. r8 d4->--\< b''8-. d,,( | %068
   e'8-.) r8 fis'8(\f a,8-.) r4 | %069
@@ -96,47 +96,47 @@
   \sectionLabel \markup { \huge \box \sans \bold 70 }
   \omit Score.BarNumber
   a8-.-> r8 a,4~\niente\< a8 c'8-.->\f | \undo \omit Score.BarNumber %070
-  a,2\niente\< e'8-.->\f a,~(\mp\< | %071
+  a,2\niente\< e'8-.->\f a,~(\mp\< | \tag #'part { \break } %071
   a8 cis4 f4.)\f | %072
   aes,8-.-> r8 r4 r4 | %073
   r8 b'8( dis,8) e,,8( c') d'8-.-> | %074
   d2.\pp | %075
-  g8-.-> d8~ d4~ d8 d8-. | %076
+  g8-.-> d8~ d4~ d8 d8-. | \tag #'part { \break } %076
   aes,8--\mf\< d'8-. fis-. bes-.\f b,,8-- c'-- | %077
   r4 ees,,8->-- des''8-. f8-.-> g,,8---> | %078
   e''8-.-> f8~\pp\< f4~ f8 f8-. | %079
-  f8-.\mf gis8-. a2\> | %080
+  f8-.\mf gis8-. a2\> | \tag #'part { \break } %080
   a8-.\p\< a8-. a8( b,8-.)\f d8-. des,8---> | %081
   b'4 b8-. f8 ees'8-- fis8-.-> | %082
   ees8-. ees8-. a,8( f'4\> bes,8-.)\mp | %083
 
   \sectionLabel \markup { \huge \box \sans \bold 84 }
   \omit Score.BarNumber
-  \time 4/4 bes8-.\mf\< ces8( des ees)\f c8-.\p r8 r4 | \undo \omit Score.BarNumber %084
+  \time 4/4 bes8-.\mf\< ces8( des ees)\f c8-.\p r8 r4 | \undo \omit Score.BarNumber \tag #'part { \break } %084
   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
-  r8 \slashedGrace ces'8^( des,8\p ees8-.) ees8-. \grace d8^( e4->)\f | %088
+  r8 \slashedGrace ces'8^( des,8\p ees8-.) ees8-. \grace d8^( e4->)\f | \tag #'part { \break } %088
   \slashedGrace a8^( fis8)\p\< fis8-. fis( gis8) gis8( ais8~ | %089
   ais4) r8 ais8(\f b8-.) r8 | %090
   b8( cis8~ cis4)\> r8 des( | %091
-  ees8) ees8-.\mf \slashedGrace e,8^( f'4.)\ff f8-.\> | %092
-  f8-. f8-. f8-. ges8--\mf\< ges8-. ges( | %093
+  ees8) ees8-.\mf \slashedGrace e,8^( f'4.)\ff f8-.\> | \tag #'part { \break } %092
+  f8-. f8-. f8-. ges8--\mf\< ges8-. ges( |%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
-  bes8-. bes8-. bes8-. bes8-. bes8-.\mp \slashedGrace ees8^( c8\f | %096
+  bes8-. bes8-. bes8-. bes8-. bes8-.\mp \slashedGrace ees8^( c8\f | \tag #'part { \break } %096
   d8-.) r8 d8-. d8-. d8( e8-.) | %097
   \slashedGrace bes8^( f8)\mf f'8-. f8( g8-.) g8-.\< g8( | %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
-  \bar "||" %100
+  \bar "||" \tag #'part { \break } %100
 
   \sectionLabel \markup { \huge \box \sans \bold 101 }
   \tweak self-alignment-X #CENTER \textEndMark \markup { \concat { \rhythm { \tuplet 3/2 { 8 } } " = " \rhythm { { 8 } } } }
   \omit Score.BarNumber
   \tempo "Prestissimo" 4=232
   \time 4/4 R1*6 | \undo \omit Score.BarNumber
-  \rit \after 4. \startTextSpan R1
+  \rit \after 4. \startTextSpan R1 | \tag #'part { \pageTurn }
   r2 r4 r8 f,,,8~\niente\<\stopTextSpan | %108
 
   \sectionLabel \markup { \huge \box \sans \bold 109 }
@@ -145,18 +145,18 @@
   \time 3/4 f2~ f8 des'8->~\f | \undo \omit Score.BarNumber %109
   des4 bes2->~ | %110
   bes2\> d,4~\mp | %111
-  2.~\> | %112
+  2.~\> | \tag #'part { \break } %112
   \after 4 \< 2.\niente | %113
   c'2.->~\f | %114
   \rit c4.\startTextSpan b4.->\> | %115
   ees,2.~\p\< | %116
   2 f4~\f | %117
-  \after 2 \stopTextSpan f2. \tempo "Tempo primo" 4=168 \bar "||" %118
+  \after 2 \stopTextSpan f2. \tempo "Tempo primo" 4=168 \bar "||"  \tag #'part { \break } %118
   fis4-> a2->~ | %119
   4. g4.~-> | %120
   g4\startTextSpan aes4->~ aes8 e8~-> | %121
   2.~\> | %122
-  4\p r4 \after 8 \stopTextSpan r4 \bar "||" %123
+  4\p r4 \after 8 \stopTextSpan r4 \bar "||" \tag #'part { \break } %123
 
   \sectionLabel \markup { \huge \box \sans \bold 124 }
   \omit Score.BarNumber
@@ -164,15 +164,15 @@
   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
+  d2\< fis4~\mp | \tag #'part { \break \noPageBreak } %127
   fis4) \breathe des'4->\f bes8-> \slashedGrace f8^( d'8~\> | %128
   d8 a8~ \after 4. \mp a2) | %129
   \slashedGrace b8^( f8->)\startTextSpan ees'8~ ees4~\< ees8 \slashedGrace f,8^( b8~->\f\> | %130
-  b8) c8~ \after 8 \p c4 \slashedGrace b8^( \after 8 \stopTextSpan e4~->\f \tempo 4=144 | %131
+  b8) c8~ \after 8 \p c4 \slashedGrace b8^( \after 8 \stopTextSpan e4~->\f \tempo 4=144 | \tag #'part { \break \noPageBreak } %131
   e8) aes8-> g,2~\> | %132
   8\mp \breathe g8~( g4~ g8 b,8~ | %133
   b8) \slashedGrace gis''8^( dis4)\mf e,8( gis,4~ | %134
-  gis4)\startTextSpan \slashedGrace e''8( g,2~\> | %135
+  gis4)\startTextSpan \slashedGrace e''8^( g,2~\> | \tag #'part { \break \noPageBreak } %135
   g2) c4~ | %136
   c4 r8 \after 4 \stopTextSpan g4.\p \tempo 4=132 | %137
 
@@ -180,17 +180,17 @@
   \omit Score.BarNumber
   fis8 d4 f( c'8~ | \undo \omit Score.BarNumber %138
   c2) r4 | %139
-  r8 a,8~(\mf a2 | %140
+  r8 a,8~(\mf a2 | \tag #'part { \break } %140
   gis4.) e''4.\p | %141
   ees,,4.\mf b''4(\p bes8~ | %142
   bes2) des,4-> | %143
   a'2 bes'8(\< c,8~ | %144
-  c2)\mf r8 b,8~ | %145
+  c2)\mf r8 b,8~ | \tag #'part { \break } %145
   \ace b8\startTextSpan d4 f'8 e,,4( | %146
   fis4) ees'4( aes8 g~ | %147
   g4) c,8\p\< des'4 ces'8-. | %148
   r8 bes,,8 fes''2~( | %149
-  fes8 ges8-.) \after 4. \stopTextSpan f,,2\f \bar "||" %150
+  fes8 ges8-.) \after 4. \stopTextSpan f,,2\f \bar "||" \tag #'part { \pageTurn } %150
 
   \sectionLabel \markup { \huge \box \sans \bold 151 }
   \omit Score.BarNumber
@@ -198,11 +198,11 @@
   r4 r4 r8 g8\> | \undo \omit Score.BarNumber %151
   d'8 cis'8-.\mp r8 ges,4\f\> fes'8 | %152
   ees'-.\mp\startTextSpan r8 f,4\mf c'4~\< | %153
-  c8 a,8\f r8 f8 g'4~\mf | %154
+  c8 a,8\f r8 f8 g'4~\mf | \tag #'part { \break } %154
   g8 r8 e,8\f\> fis'4 \after 16 \stopTextSpan gis'8\mp \tempo "Tempo primo" 4=168 \bar "||" %155
   d,,4.\f d8-. r8 a''8~\mp | %156
   a8 b'4(\< bes8-.) ees,4~ | %157
-  ees4 ces,8-.\f r8 r4 | %158
+  ees4 ces,8-.\f r8 r4 | \tag #'part { \break } %158
   bes8\> c'8-.\p r4 r8 aes,8\mf\> | %159
   des'8-. e'4(\p f d8-.) | %160
   r8 ees,,,8(\f\> c'4 b'8-.)\p r8 | %161

diff --git a/manuscripts/III-clarinet.ly b/manuscripts/III-clarinet.ly
index c685cb817c7afa656d3bceebb957c9b2aed2f6cf..a39ccc7477df90031dc947a08e7ac4c3b86838ce 100644 (file)
--- a/manuscripts/III-clarinet.ly
+++ b/manuscripts/III-clarinet.ly
@@ -20,7 +20,7 @@
   \time 4/4 R1 | %6
   <<
     { \time 3/4 R1*3/4 \cueClefUnset | } %7
-    \tag #'part  {
+    \tag #'part {
         \new CueVoice \relative {
           \cueClef "bass" \stemUp fis,8[\laissezVibrer cis']\laissezVibrer <gis'\laissezVibrer a>[ <b e,>]~ 4 \stemNeutral  |
         }

diff --git a/net-clarity.ly b/net-clarity.ly
index 3e185e685711de1ae0af179fc854a2f23a81bb39..c25808f018bddf43ad22b62f1542141c885e19d0 100644 (file)
--- a/net-clarity.ly
+++ b/net-clarity.ly
@@ -176,7 +176,7 @@ clarinetMagstep = #(magstep -2)
     \tocItem \markup { "I. " \bold "Grave, molto rubato" }
     \score {
       <<
-        \include "manuscripts/I-clarinet.ly"
+        \removeWithTag #'part \include "manuscripts/I-clarinet.ly"
         \include "manuscripts/I-piano.ly"
       >>
       %\midi { }
@@ -213,117 +213,116 @@ clarinetMagstep = #(magstep -2)
     }
   }
 
-%  \bookpart {
-%    \tocItem \markup { "II. " \bold "Vivace" }
-%    \score {
-%      \header {
-%        piece = \markup { \large \bold "II. " }
-%      }
-%      <<
-%        \removeWithTag #'part \include "manuscripts/II-clarinet.ly"
-%        \removeWithTag #'part \include "manuscripts/II-piano.ly"
-%      >>
-%      %\midi { }
-%      \layout {
-%        \context {
-%          \Score
-%         \RemoveEmptyStaves
-%          \remove Text_mark_engraver
-%          \remove Mark_engraver
-%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/20)
-%        }
-%        \context {
-%          \Staff
-%          \override OttavaBracket.outside-staff-priority = 200
-%          $(remove-grace-property 'Voice 'Stem 'direction)
-%          \override VerticalAxisGroup.default-staff-staff-spacing =
-%            #'((basic-distance . 10)
-%               (minimum-distance . 9)
-%               (padding . 2)
-%               (stretchability . 10))
-%          \override StaffGrouper.staff-staff-spacing =
-%            #'((basic-distance . 9)
-%               (minimum-distance . 5)
-%               (padding . 1)
-%               (stretchability . 1))
-%        }
-%      }
-%    }
-%  }
+  \bookpart {
+    \tocItem \markup { "II. " \bold "Vivace" }
+    \score {
+      \header {
+        piece = \markup { \large \bold "II. " }
+      }
+      <<
+        \removeWithTag #'part \include "manuscripts/II-clarinet.ly"
+        \removeWithTag #'part \include "manuscripts/II-piano.ly"
+      >>
+      %\midi { }
+      \layout {
+        \context {
+          \Score
+          \remove Text_mark_engraver
+          \remove Mark_engraver
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/20)
+        }
+        \context {
+          \Staff
+          \override OttavaBracket.outside-staff-priority = 200
+          $(remove-grace-property 'Voice 'Stem 'direction)
+          \override VerticalAxisGroup.default-staff-staff-spacing =
+            #'((basic-distance . 10)
+               (minimum-distance . 9)
+               (padding . 2)
+               (stretchability . 10))
+          \override StaffGrouper.staff-staff-spacing =
+            #'((basic-distance . 9)
+               (minimum-distance . 5)
+               (padding . 1)
+               (stretchability . 1))
+        }
+      }
+    }
+  }
 
-%  \bookpart {
-%    \tocItem \markup { "III." \bold "Lento, poco rubato" \parenthesize \italic "to Amber Lucas" }
-%    \score {
-%      \header {
-%        piece = \markup { \large \bold "III. " \parenthesize \italic "to Amber Lucas"  }
-%      }
-%      <<
-%        \removeWithTag #'part \include "manuscripts/III-clarinet.ly"
-%        \removeWithTag #'part \include "manuscripts/III-piano.ly"
-%      >>
-%      %\midi { }
-%      \layout {
-%        \context {
-%          \Score
-%          \remove Mark_engraver
-%          \remove Text_mark_engraver
-%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
-%        }
-%        \context {
-%          \Staff
-%          \override VerticalAxisGroup.default-staff-staff-spacing =
-%            #'((basic-distance . 10)
-%               (minimum-distance . 9)
-%               (padding . 2)
-%               (stretchability . 10))
-%          \override StaffGrouper.staff-staff-spacing =
-%            #'((basic-distance . 9)
-%               (minimum-distance . 5)
-%               (padding . 1)
-%               (stretchability . 1))
-%        }
-%      }
-%    }
-% }
+  \bookpart {
+    \tocItem \markup { "III." \bold "Lento, poco rubato" \parenthesize \italic "to Amber Lucas" }
+    \score {
+      \header {
+        piece = \markup { \large \bold "III. " \parenthesize \italic "to Amber Lucas"  }
+      }
+      <<
+        \removeWithTag #'part \include "manuscripts/III-clarinet.ly"
+        \removeWithTag #'part \include "manuscripts/III-piano.ly"
+      >>
+      %\midi { }
+      \layout {
+        \context {
+          \Score
+          \remove Mark_engraver
+          \remove Text_mark_engraver
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
+        }
+        \context {
+          \Staff
+          \override VerticalAxisGroup.default-staff-staff-spacing =
+            #'((basic-distance . 10)
+               (minimum-distance . 9)
+               (padding . 2)
+               (stretchability . 10))
+          \override StaffGrouper.staff-staff-spacing =
+            #'((basic-distance . 9)
+               (minimum-distance . 5)
+               (padding . 1)
+               (stretchability . 1))
+        }
+      }
+    }
+ }
 
-%  \bookpart {
-%    \tocItem \markup { "IV. " \bold "Allegro energico" }
-%    \score {
-%      \header {
-%        piece = \markup { \large \bold "IV." }
-%      }
-%      <<
-%        \removeWithTag #'part \include "manuscripts/IV-clarinet.ly"
-%        \include "manuscripts/IV-piano.ly"
-%      >>
-%      %\midi { }
-%     \layout {
-%        \context {
-%          \Score
-%          \remove Text_mark_engraver
-%          \remove Mark_engraver
-%          \override TextSpanner.bound-details.left-broken.text = " "
-%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
-%          \override Stem.stemlet-length = #0.75
-%        }
-%        \context {
-%          \Staff
-%          \RemoveEmptyStaves
-%          \consists Mark_engraver
-%          \override VerticalAxisGroup.default-staff-staff-spacing =
-%            #'((basic-distance . 10)
-%               (minimum-distance . 9)
-%               (padding . 2)
-%               (stretchability . 10))
-%          \override StaffGrouper.staff-staff-spacing =
-%            #'((basic-distance . 9)
-%               (minimum-distance . 5)
-%               (padding . 1)
-%               (stretchability . 1))
-%        }
-%      }
-%    }
-%  }
+  \bookpart {
+    \tocItem \markup { "IV. " \bold "Allegro energico" }
+    \score {
+      \header {
+        piece = \markup { \large \bold "IV." }
+      }
+      <<
+        \removeWithTag #'part \include "manuscripts/IV-clarinet.ly"
+        \include "manuscripts/IV-piano.ly"
+      >>
+      %\midi { }
+     \layout {
+        \context {
+          \Score
+          \remove Text_mark_engraver
+          \remove Mark_engraver
+          \override TextSpanner.bound-details.left-broken.text = " "
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/10)
+          \override Stem.stemlet-length = #0.75
+        }
+        \context {
+          \Staff
+          \RemoveEmptyStaves
+          \consists Mark_engraver
+          \override VerticalAxisGroup.default-staff-staff-spacing =
+            #'((basic-distance . 10)
+               (minimum-distance . 9)
+               (padding . 2)
+               (stretchability . 10))
+          \override StaffGrouper.staff-staff-spacing =
+            #'((basic-distance . 9)
+               (minimum-distance . 5)
+               (padding . 1)
+               (stretchability . 1))
+        }
+      }
+    }
+  }
   \pageBreak
   \markup {
     \fill-line {

diff --git a/parts.ly b/parts.ly
index 18a28e4f00c76464c136c1170a5d11b369754608..742055be25af1aa9f27a5888f03a77dbe8464c59 100644 (file)
--- a/parts.ly
+++ b/parts.ly
@@ -5,7 +5,6 @@
 \include "general/scripts.ly"
 \include "general/umbel.ly"
 \include "general/partPaper.ly"
-
 clarinetFont = #0
 clarinetMagstep = #(magstep 0)
 
@@ -17,7 +16,7 @@ clarinetMagstep = #(magstep 0)
       subtitle = \markup { \medium \italic \xsub }
       composer = \xcomp
       poet = \markup { \xinst }
-      piece = \markup { \large \bold "I. " }
+      piece = \markup { \bold "I. " }
     }
     \tocItem \markup { "I. " }
     \score {
@@ -31,7 +30,7 @@ clarinetMagstep = #(magstep 0)
           \remove Mark_engraver
           \remove Text_mark_engraver
           \override RehearsalMark.break-visibility = #begin-of-line-invisible
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/20)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4)
           \override Hairpin.to-barline = ##f
         }
         \context {
@@ -44,8 +43,7 @@ clarinetMagstep = #(magstep 0)
 
   \bookpart {
     \header {
-      title = ##f subtitle = ##f composer = ##f poet = ##f
-      piece = \markup { \large \bold "II. " }
+      piece = \markup { \bold "II. " }
     }
     \tocItem \markup { "II. " }
     \score {
@@ -59,7 +57,7 @@ clarinetMagstep = #(magstep 0)
           \remove Mark_engraver
           \remove Text_mark_engraver
           \override RehearsalMark.break-visibility = #begin-of-line-invisible
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/20)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4)
           \override Hairpin.to-barline = ##f
         }
         \context {
@@ -74,7 +72,7 @@ clarinetMagstep = #(magstep 0)
     \tocItem \markup { "III." \bold "Lento, poco rubato" \parenthesize \italic "to Amber Lucas" }
     \score {
       \header {
-        piece = \markup { \large \bold "III. " \parenthesize \italic "to Amber Lucas"  }
+        piece = \markup { \bold "III. " \parenthesize \italic "to Amber Lucas"  }
       }
       <<
         \include "manuscripts/III-clarinet.ly"
@@ -86,7 +84,7 @@ clarinetMagstep = #(magstep 0)
           \remove Mark_engraver
           \remove Text_mark_engraver
           \override RehearsalMark.break-visibility = #begin-of-line-invisible
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/20)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4)
           \override Hairpin.to-barline = ##f
         }
         \context {
@@ -105,21 +103,20 @@ clarinetMagstep = #(magstep 0)
         subtitle = ##f
         composer = ##f
         poet = ##f
-        piece = \markup { \large \bold "IV." }
+        piece = \markup { \bold "IV." }
       }
       <<
         \include "manuscripts/IV-clarinet.ly"
       >>
       %\midi { }
       \layout {
-        ragged-last = ##t
         \context {
           \Score
           \remove Text_mark_engraver
           \remove Mark_engraver
           \override TextSpanner.bound-details.left-broken.text = " "
           \override RehearsalMark.break-visibility = #begin-of-line-invisible
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4)
           \override Hairpin.to-barline = ##f
           \override Stem.stemlet-length = #0.75
         }