From: Tucker Johnson <tucker@newer.systems>
Date: Sun, 17 Aug 2025 22:21:35 +0000 (-0400)
Subject: finish mvm 1 format, start parts
X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=fc74bb5755995914d01b4ae345db523b2d7971ad;p=net-clarity.git

finish mvm 1 format, start parts
---

diff --git a/general/partPaper.ly b/general/partPaper.ly
new file mode 100644
index 0000000..8774e1c
--- /dev/null
+++ b/general/partPaper.ly
@@ -0,0 +1,145 @@
+\paper {
+  line-width = 120
+  #(include-special-characters)
+  footnote-separator-markup = \markup { \left-column { \vspace #0.5 \draw-line #'(6 . 0) } }
+  print-page-number = ##f
+  #(set-paper-size "arch a")
+  print-all-headers = ##f
+  top-margin = 0.5\in
+  bottom-margin = 0.5\in
+  left-margin = 0.9\in
+  right-margin = 0.9\in
+  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))
+  tocTitleMarkup = \markup {  }
+  tocItemMarkup = \markup \fill-line {
+    \fill-with-pattern #1.5 #CENTER .
+    \line {
+      \fromproperty #'toc:indent \fromproperty #'toc:text
+    }
+    \sans \fromproperty #'toc:page
+  }
+
+  oddHeaderMarkup = \markup {
+    \concat { \if \on-page #5 \oddhead }
+    \concat { \if \on-page #7 \oddhead }
+    \concat { \if \on-page #9 \oddhead }
+    \concat { \if \on-page #11 \oddhead }
+    \concat { \if \on-page #13 \oddhead }
+    \concat { \if \on-page #15 \oddhead }
+    \concat { \if \on-page #17 \oddhead }
+    \concat { \if \on-page #19 \oddhead }
+    \concat { \if \on-page #21 \oddhead }
+    \concat { \if \on-page #23 \oddhead }
+    \concat { \if \on-page #25 \oddhead }
+    \concat { \if \on-page #27 \oddhead }
+    \concat { \if \on-page #29 \oddhead }
+    \concat { \if \on-page #31 \oddhead }
+    \concat { \if \on-page #33 \oddhead }
+    \concat { \if \on-page #35 \oddhead }
+    \concat { \if \on-page #37 \oddhead }
+    \concat { \if \on-page #39 \oddhead }
+
+  }
+  evenHeaderMarkup = \markup {
+    \concat { \if \on-page #4 \evhead }
+    \concat { \if \on-page #6 \evhead }
+    \concat { \if \on-page #8 \evhead }
+    \concat { \if \on-page #10 \evhead }
+    \concat { \if \on-page #12 \evhead }
+    \concat { \if \on-page #14 \evhead }
+    \concat { \if \on-page #16 \evhead }
+    \concat { \if \on-page #18 \evhead }
+    \concat { \if \on-page #20 \evhead }
+    \concat { \if \on-page #22 \evhead }
+    \concat { \if \on-page #24 \evhead }
+    \concat { \if \on-page #26 \evhead }
+    \concat { \if \on-page #28 \evhead }
+    \concat { \if \on-page #30 \evhead }
+    \concat { \if \on-page #32 \evhead }
+    \concat { \if \on-page #34 \evhead }
+    \concat { \if \on-page #36 \evhead }
+    \concat { \if \on-page #38 \evhead }
+  }
+  oddFooterMarkup = \markup {
+    \concat { \if \on-page #3 \fill-line { \null \xcr \null } }
+    \concat { \if \on-page #5 \oddfoot }
+    \concat { \if \on-page #7 \oddfoot }
+    \concat { \if \on-page #9 \oddfoot }
+    \concat { \if \on-page #11 \oddfoot }
+    \concat { \if \on-page #13 \oddfoot }
+    \concat { \if \on-page #15 \oddfoot }
+    \concat { \if \on-page #17 \oddfoot }
+    \concat { \if \on-page #19 \oddfoot }
+    \concat { \if \on-page #21 \oddfoot }
+    \concat { \if \on-page #23 \oddfoot }
+    \concat { \if \on-page #25 \oddfoot }
+    \concat { \if \on-page #27 \oddfoot }
+    \concat { \if \on-page #29 \oddfoot }
+    \concat { \if \on-page #31 \oddfoot }
+    \concat { \if \on-page #33 \oddfoot }
+    \concat { \if \on-page #35 \oddfoot }
+    \concat { \if \on-page #37 \oddfoot }
+    \concat { \if \on-page #39 \oddfoot }
+  }
+  evenFooterMarkup = \markup {
+    \concat { \if \on-page #2 \evfoot }
+    \concat { \if \on-page #4 \evfoot }
+    \concat { \if \on-page #6 \evfoot }
+    \concat { \if \on-page #8 \evfoot }
+    \concat { \if \on-page #10 \evfoot }
+    \concat { \if \on-page #12 \evfoot }
+    \concat { \if \on-page #14 \evfoot }
+    \concat { \if \on-page #16 \evfoot }
+    \concat { \if \on-page #18 \evfoot }
+    \concat { \if \on-page #20 \evfoot }
+    \concat { \if \on-page #22 \evfoot }
+    \concat { \if \on-page #24 \evfoot }
+    \concat { \if \on-page #26 \evfoot }
+    \concat { \if \on-page #28 \evfoot }
+    \concat { \if \on-page #30 \evfoot }
+    \concat { \if \on-page #32 \evfoot }
+    \concat { \if \on-page #34 \evfoot }
+    \concat { \if \on-page #36 \evfoot }
+    \concat { \if \on-page #38 \evfoot }
+    \concat { \if \on-page #40 \fill-line { \null \concat { \char ##x2767 " " \tiny \typewriter \longHash " " \char ##x2619 } \null } }
+  }
+}
+
+
+\layout {
+  \context {
+    \Score
+      \override InstrumentName.self-alignment-X = 1
+      \override RehearsalMark.break-visibility = #begin-of-line-invisible
+      \override Hairpin.to-barline = ##f
+      \overrideTimeSignatureSettings 4/4 1/4 1,1,1,1 #'()
+      \overrideTimeSignatureSettings 3/4 1/4 1,1,1 #'()
+      \overrideTimeSignatureSettings 5/8 1/8 2,3 #'()
+      \override BarNumber.font-name = "classico"
+      \phrasingSlurDashPattern #0.5 #2.0
+      \override PhrasingSlur.thickness = 0.5
+      \override StaffSymbol.layer = #4
+      \override Stem.layer = #4
+      \override Beam.layer = #4
+      \override Hairpin.layer = #4
+      \override TimeSignature.layer = #2
+      \override Tie.layer = #1
+      \override TupletBracket.layer = #2
+      \override StringNumber.layer = #2
+      \override TextSpanner.layer = #3
+      \override NoteHead.layer = #4
+      \override Accidental.layer = #4
+      \override TimeSignature.whiteout = 2
+      \override TextScript.padding = 1
+      \override TextScript.layer = #4
+      \numericTimeSignature
+      \override TupletNumber.layer = 4
+      \override TupletNumber.font-shape = #'upright
+  }
+}
diff --git a/manuscripts/I-clarinet.ly b/manuscripts/I-clarinet.ly
index 4a1e5ec..55845a0 100644
--- a/manuscripts/I-clarinet.ly
+++ b/manuscripts/I-clarinet.ly
@@ -14,40 +14,52 @@
 \relative {
   \clef treble
   \numericTimeSignature
-  \tempo "Grave" 2 = 36
+  \tempo "Grave, molto rubato" 2 = 36
   \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~ | %003
-  d1) \breathe d4~ d16 cis''8.~ | %004
-  \time 5/4 cis8 b'8~ b4~ b8 b8( c4 g4~ | %005
-  g2) \tuplet 3/2 { aes4( ees bes) } r4 | %006
-  \time 2/2 r4 f4( e4 fis | %007
-  a,1)\shortfermata | %008
+  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
+  \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
   a2( d,2~ | %009
   d1)\shortfermata | %010
-  \time 5/4 \grace s8 r4 cis''4( b'4 bes2) | %011
-  \time 2/2 \tuplet 3/2 { r4 c4( g4~ } g2) | %012
-  \time 5/4 aes2( ees2.~ | %013
+
+  \sectionLabel \markup { \huge \box \sans \bold 11 }
+  \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 2/2 ees8) r8 r4 r2 | %014
   R1 | %015
   R1\fermata  | %016
-  r2 d2~ | %017
-  \time 7/4 d4 e4( fis4 a,2.)\shortfermata r4 | %018
-  \time 2/2 \grace s8 des4( ees bes f'4~ | %019
+
+  \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 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. c4( g'4 f4~ | %022
-  \time 2/2 \tuplet 3/2 { f4) e( fis } a,2)\shortfermata | %023
-  \time 5/4 g,4( b des bes'2) | %024
-  d4( c ees4~ ees2)\fermata \breathe | %025
-  d,4( e2 ees4) g8( c, | %026
-  \time 2/2 aes'4) ges2( bes4 | %027
-  a2) cis4( e) | %028
-  \time 3/2 \grace s8 g1. \breathe | %029
-  \time 5/4 cis,4( dis fis2) c4( | %030
-  \time 2/2 g2.)\shortfermata a4( | %031
-  \time 3/2 aes4 bes8) f8( e1) | %032
-  \time 2/2 d2-- d2-- | %033
-  b1\fermata \bar "|." %034
+  \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
+
+  \sectionLabel \markup { \huge \box \sans \bold 24 }
+  \omit Score.BarNumber
+  \time 5/4 g,4(\f\> b des bes'2) | \undo \omit Score.BarNumber %024
+  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
+  \time 3/2 \grace s8 g2~\mf g1\fermata \breathe | %029
+
+  \sectionLabel \markup { \huge \box \sans \bold 30 }
+  \omit Score.BarNumber
+  \time 5/4 cis,4(\< dis fis2)\f c4(\> | \undo \omit Score.BarNumber %030
+  \time 2/2 g2.)\mf\shortfermata \breathe a4(\> | %031
+  \time 3/2 aes4 bes8) f8( e1)\p | %032
+  \time 2/2 d2--\> d2-- | %033
+  b1\pp\fermata \bar "|." %034
 
   }
diff --git a/manuscripts/I-piano.ly b/manuscripts/I-piano.ly
index 59ed6b7..df025a2 100644
--- a/manuscripts/I-piano.ly
+++ b/manuscripts/I-piano.ly
@@ -4,6 +4,7 @@
   instrumentName = \markup { "piano " }
   shortInstrumentName = \markup { "pno " }
   \consists Text_mark_engraver
+  \consists Metronome_mark_engraver
 
 }
 <<
@@ -16,15 +17,15 @@
       R1 | %002
       \time 3/2 R1*3/2 | %003
       R1*3/2 | %004
-      \time 5/4 r4 a''4( e f2) | %005
+      \time 5/4 r4 a''4(\mf e f2) | %005
       R1*5/4 | %006
       \time 2/2 R1 | %007
       r1\shortfermata | %008
       R1 | %009
       r1\shortfermata | %010
       \time 5/4 \grace s8 R1*5/4 | %011
-      \time 2/2 <b, fis'>2 r2 | %012
-      \time 5/4 des2~ des2.~ | %013
+      \time 2/2 <b, fis'>2->\mf r2 | %012
+      \time 5/4 des2~\mp des2.~ | %013
       \time 2/2 des8 r8 r4 r2 | %014
       R1 | %015
       r1\fermata | %016
@@ -33,56 +34,49 @@
       \time 2/2 \grace s8 R1 | %019
       \time 3/2 R1*3/2 | %020
       \time 2/2 r1\shortfermata | %021
-      \time 3/2 r2. r4 r4 <bes' des,>4~ | %022
+      \time 3/2 r2. r4 r4 <bes' des,>4~\mp | %022
       \time 2/2 2 r2\shortfermata | %023
-      \time 5/4 r4 ges,4 <aes f'> ees'2 | %024
-      <bes f'>2 <fis b>4 <gis a,>2\fermata | %025
+      \time 5/4 r4 ges,4(\f\> <aes f'> ees'2)\mf | %024
+      <bes f'>2_(\> <fis b>4 <gis a,>2\pp)\shortfermata \breathe | %025
       r2.
-      <<
-        {
-          \voiceOne
-          r4 des'4 | %026
-        }
-        \new Voice {
-          \voiceTwo
-          aes2 | %026(b)
-        }
-      >>
-      \oneVoice
-      \time 2/2 r2 \tuplet 3/2 { r4 f4( ees) } | %027
-      r4 r4 <fis ais>4( gis) | %028
-      \time 3/2 \grace s8 r2 f1 | %029
-      \time 5/4 gis1 bes4 | %030
-      \time 2/2 R1 | %031
-      \time 3/2 r2 \tuplet 3/2 { r4 r4 ges4( } \tuplet 3/2 { ees' des aes) } | %032
+      aes4(\< des4)\! | %026
+      \time 2/2 r2 \tuplet 3/2 { r4 f,4(\mp\< ees)\! } | %027
+      r4 r4 <fis ais>4(\< gis)\! | %028
+      \time 3/2 \grace s8 r2 f1\p\fermata \breathe | %029
+      \time 5/4 gis1\< bes4\! | %030
+      \time 2/2 r2\shortfermata r2 | %031
+      \time 3/2 r2 \tuplet 3/2 { r4 r4 ges4(\mp\> } \tuplet 3/2 { ees' des aes)\! } | %032
       \time 2/2 R1 | %033
       R1\fermata \bar "|." %034
 
     }
   }
 
-  \new Staff = "u" \with { \consists "Merge_rests_engraver" }
+  \new Staff = "u" \with {
+    \consists "Merge_rests_engraver"
+    \override DynamicLineSpanner.staff-padding = \phds
+  }
   {
     \relative { \numericTimeSignature
       \clef bass
-      \tempo "Grave" 2=36
+      \tempo "Grave, molto rubato" 2=36
       \time 2/2 <c c'>2\(\p <ees c'> | %001
-      <ees g> <d g> | %002
-      \time 3/2 <des g>1~ 4\) r4 | %003
-      \grace g8~ <g c>2\( <f c'> \grace ges8( <f c'>2) | %004
-      \time 5/4 <ees c'>2~ 2.\)  | %005
-      \grace d8~ <d b'>1\( <e cis'>4 | %006
-      \time 2/2 <ees g c>2 <gis b>~ | %007
+      <ees g>\> <d g> | %002
+      \time 3/2 <des g>1~ 4\)\pp r4 | %003
+      \grace g8~ <g c>2\(\p\< <f c'> \grace ges8( <f c'>2) | %004
+      \time 5/4 <ees c'>2~\mp 2.\)  | %005
+      \grace d8~ <d b'>1\( <e cis'>4\> | %006
+      \time 2/2 <ees g c>2 <gis b>~\p | %007
       1\)\shortfermata | %008
-      \grace ees'8~ <ees g,>1\( | %009
-      <g, bes>1\)\shortfermata | %010
-      \time 5/4 \grace c8~ <c aes>2.\( <ees, c'>2~ | %011
-      \time 2/2 2 <e c'>~ | %012
+      \grace ees'8~ <ees g,>1\(\pp | %009
+      <g, bes>1\)\shortfermata \breathe | %010
+      \time 5/4 \grace c8~ <c aes>2.\( <ees, c'>2~\< | %011
+      \time 2/2 2 <e c'>~\mf | %012
       \time 5/4 4\) r4 r2. | %013
       <<
         {
           \voiceOne
-          \time 2/2 c'4(\( bes) aes2 | %014
+          \time 2/2 c'4(\(\> bes) aes2 | %014
         }
         \new Voice {
           \voiceTwo
@@ -102,17 +96,17 @@
         }
       >>
       \oneVoice
-      <c' ees,>1\)\fermata | %016
-      <c ees,>1\( | %017
-      \time 7/4 <c ees,>2. <c ees,>2.~\)\shortfermata 4 | %018
+      <c' ees,>1\)\p\fermata \breathe | %016
+      <c ees,>1\(\mp\> | %017
+      \time 7/4 <c ees,>2. <c ees,>2.~\)\p\shortfermata 4 | %018
       <<
         {
           \voiceOne
-          \time 2/2 \grace s8 e1\( | %019
+          \time 2/2 \grace s8 e1\(\< | %019
         }
         \new Voice {
           \voiceTwo
-          \time 2/2 \grace g,8^~ g4( gis2.) | %019
+          \time 2/2 \grace g,8^~ g4( gis2.) | %019(b)
         }
       >>
       \oneVoice
@@ -120,7 +114,7 @@
       <<
         {
           \voiceOne
-          \grace d8~ d2 c4
+          \grace d8~ d2\mf\> c4
         }
         \new Voice{
           \voiceTwo
@@ -129,15 +123,15 @@
       >>
       \oneVoice
       <e c'>4 | %20
-      \time 2/2 <d b' cis>1\)\shortfermata | %021
-      \time 3/2 <g ees'>2.\( \grace f8~ <f d'>4 <ees c'>2~ | %022
-      \time 2/2 2 <d b'>2~\)\shortfermata | %023
+      \time 2/2 <d b' cis>1\)\mp\shortfermata \breathe | %021
+      \time 3/2 <g ees'>2.\(\pp\< \grace f8~ <f d'>4 <ees c'>2~\mp\> | %022
+      \time 2/2 2 <d b'>2~\)\p\shortfermata | %023
       \time 5/4 1 r4 | %024
-      r2. r2\fermata | %025
+      r2. r2\shortfermata | %025
       <<
         {
           \voiceOne
-          c'2.\( c2~ | %026
+          c'2.\pp\<\( c2~ | %026
           \time 2/2 c4 d
         }
         \new Voice {
@@ -148,10 +142,10 @@
       >>
       \oneVoice
       <e cis'>2 | %027
-      <d c'>1 | %028
-      \time 3/2 \grace e8~ <e c'>2 <d c'>1\) | %029
-      \time 5/4 <d b'>2\( <d a'>2 <ees aes>4 | %030
-      \time 2/2 <d b'>2.\)\shortfermata <d cis'>4\( | %31
+      <d c'>1\mp | %028
+      \time 3/2 \grace e8~ <e c'>2 <d c'>1\)\pp\fermata \breathe | %029
+      \time 5/4 <d b'>2\(\< <d a'>2\f\> <ees aes>4 | %030
+      \time 2/2 <d b'>2.\)\mf\shortfermata \breathe <d cis'>4\(\> | %31
       <<
         {
           \voiceOne
@@ -163,9 +157,9 @@
         }
       >>
       \oneVoice
-      \grace g'8~ <g b,>1 | %032
-      \time 2/2 <g a,>2 <f a,>2 | %033
-      <e g,>1\)\fermata \bar "|." | %034
+      \grace g'8~ <g b,>1\mp | %032
+      \time 2/2 <g a,>2\> <f a,>2 | %033
+      <e g,>1\)\pp\fermata \bar "|." | %034
 
     }
   }
@@ -183,7 +177,7 @@
       \time 2/2 bes2 d~ | %007
       d1\)\shortfermata | %008
       f,1\( | %009
-      e1\)\shortfermata | %010
+      e1\)\shortfermata \breathe | %010
       \time 5/4 \grace s8 ges2.\( f2~ | %011
       \time 2/2 f2 d2~ | %012
       \time 5/4 d4\) r4 r2. | %013
@@ -200,22 +194,22 @@
       >>
       \oneVoice
       fis4( e) bes'2~ | %015
-      bes1\)\fermata | %016
+      bes1\)\fermata \breathe | %016
       bes1~\( | %017
       \time 7/4 bes2. des,2.\)(\shortfermata d4) | %018
       \time 2/2 \grace s8 b'2\( fis4( a4 | %019
       \time 3/2 b2) bes4( ges4 a4) gis4( | %020
-      \time 2/2 fis1)\)\shortfermata | %021
+      \time 2/2 fis1)\)\shortfermata \breathe | %021
       \time 3/2 bes2.\( \grace a8~ a4 aes2~ | %022
       \time 2/2 aes2\) r2\shortfermata | %023
       \time 5/4 R1*5/4 | %024
-      r2. r2\fermata | %025
-      b2\( a4 bes2 | %026
+      r2. r2\shortfermata | %025
+      b2 a4 bes2\( | %026
       \time 2/2 b2 a2 | %027
       g1 | %028
-      \time 3/2 \grace s8 a2 bes1\) | %029\
+      \time 3/2 \grace s8 a2 bes1\)\fermata \breathe | %029\
       \time 5/4 fis4\( e2. f4 | %030
-      \time 2/2 e2.\)\shortfermata fis4\( | %031
+      \time 2/2 e2.\)\shortfermata \breathe fis4\( | %031
       \time 3/2 ees4( d4~ d2.) bes'4 | %032
       \time 2/2 bes2 bes2 | %033
       c1\)\fermata \bar "|." %034
@@ -240,7 +234,7 @@
       R1 | %009
       R1 | %010
       \time 5/4 \grace s8 R1*5/4 | %011
-      \time 2/2 a,,2 r2 | %012
+      \time 2/2 a,,2->^\mp r2 | %012
       \time 5/4 R1*5/4 | %013
       \time 2/2 R1 | %014
       R1 | %015
@@ -252,12 +246,12 @@
       \time 2/2 r1\shortfermata | %021
       \time 3/2 R1*3/2 | %022
       \time 2/2 R1 | %023
-      \time 5/4 c2.~ \tuplet 3/2 { c4 e4 a4 } | %024
-      g2. <e cis'>2\fermata | %025
+      \time 5/4 c2.~^\f^\> \tuplet 3/2 { c4 e4( a4 } | %024
+      g2.)^\mp <e cis'>2^\p\shortfermata \breathe | %025
       R1*5/4 | %026
       \time 2/2 R1 | %027
-      r4 b2. | %028
-      \time 3/2 \grace s8 R1*3/2 | %029
+      r4 b2.^\mp | %028
+      \time 3/2 \grace s8 r2 r1\fermata | %029
       \time 5/4 R1*5/4 | %030
       \time 2/2 R1*2/2 | %031
       \time 3/2 R1*3/2 | %032
diff --git a/manuscripts/II-clarinet.ly b/manuscripts/II-clarinet.ly
index c6ab0a3..f5bc8fa 100644
--- a/manuscripts/II-clarinet.ly
+++ b/manuscripts/II-clarinet.ly
@@ -8,7 +8,6 @@
   \override StaffSymbol.staff-space = \clarinetMagstep
   \consists Text_mark_engraver
   \consists Mark_engraver
-  \RemoveEmptyStaves
  }
 \transpose bes c'
 \relative {
diff --git a/net-clarity.ly b/net-clarity.ly
index 1867b95..3e185e6 100644
--- a/net-clarity.ly
+++ b/net-clarity.ly
@@ -173,7 +173,7 @@ clarinetMagstep = #(magstep -2)
       poet = \markup { \xinst }
       piece = \markup { \large \bold "I. " }
     }
-    \tocItem \markup { "I. " \bold "Grave" }
+    \tocItem \markup { "I. " \bold "Grave, molto rubato" }
     \score {
       <<
         \include "manuscripts/I-clarinet.ly"
@@ -186,7 +186,7 @@ clarinetMagstep = #(magstep -2)
           \RemoveEmptyStaves
           \remove Text_mark_engraver
           \remove Mark_engraver
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/20)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/35)
           \override Hairpin.to-barline = ##f
         }
         \context {
@@ -194,8 +194,8 @@ clarinetMagstep = #(magstep -2)
           \override OttavaBracket.outside-staff-priority = 200
           $(remove-grace-property 'Voice 'Stem 'direction)
           \override VerticalAxisGroup.default-staff-staff-spacing =
-            #'((basic-distance . 10)
-               (minimum-distance . 9)
+            #'((basic-distance . 6)
+               (minimum-distance . 5)
                (padding . 2)
                (stretchability . 10))
           \override StaffGrouper.staff-staff-spacing =
@@ -213,116 +213,117 @@ 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
-          \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
+%         \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 { "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 7994475..18a28e4 100644
--- a/parts.ly
+++ b/parts.ly
@@ -4,144 +4,76 @@
 \include "general/aliases.ly"
 \include "general/scripts.ly"
 \include "general/umbel.ly"
+\include "general/partPaper.ly"
 
 clarinetFont = #0
 clarinetMagstep = #(magstep 0)
 
-\paper {
-  line-width = 120
-  footnote-separator-markup = \markup { \left-column { \vspace #0.5 \draw-line #'(6 . 0) } }
-  print-all-headers = ##t
-  #(set-paper-size "arch a")
-  top-margin = 0.5\in
-  bottom-margin = 0.5\in
-  left-margin = 0.9\in
-  right-margin = 0.9\in
-  indent = 0.75\in
-  short-indent = 0\cm
-  #(define fonts (set-global-fonts #:music "scorlatti" #:brace "scorlatti" #:roman "Junicode" #:sans "syne"))
-  max-systems-per-page = #7
-  tocTitleMarkup = \markup { \hbracket \sans \bold " contents " }
-  tocItemMarkup = \markup \fill-line {
-    \fill-with-pattern #1.5 #CENTER .
-    \line {
-      \fromproperty #'toc:indent \fromproperty #'toc:text
-    }
-    \tiny \number \fromproperty #'toc:page
-  }
-
-  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 }
-    \concat { \if \on-page #11 \oddhead }
-    \concat { \if \on-page #15 \oddhead }
-    \concat { \if \on-page #17 \oddhead }
-    \concat { \if \on-page #19 \oddhead }
-    \concat { \if \on-page #21 \oddhead }
+\book {
 
+  \bookpart {
+    \header {
+      title = \markup { \fontsize #1 \xtitle }
+      subtitle = \markup { \medium \italic \xsub }
+      composer = \xcomp
+      poet = \markup { \xinst }
+      piece = \markup { \large \bold "I. " }
+    }
+    \tocItem \markup { "I. " }
+    \score {
+      <<
+        \include "manuscripts/I-clarinet.ly"
+      >>
+      %\midi { }
+      \layout {
+        \context {
+          \Score
+          \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 Hairpin.to-barline = ##f
+        }
+        \context {
+          \Staff
+          \remove Instrument_name_engraver
+        }
+      }
+    }
   }
-  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 }
-    \concat { \if \on-page #10 \evhead }
-    \concat { \if \on-page #14 \evhead }
-    \concat { \if \on-page #16 \evhead }
-    \concat { \if \on-page #18 \evhead }
-    \concat { \if \on-page #20 \evhead }
-    \concat { \if \on-page #22 \evhead }
 
+  \bookpart {
+    \header {
+      title = ##f subtitle = ##f composer = ##f poet = ##f
+      piece = \markup { \large \bold "II. " }
+    }
+    \tocItem \markup { "II. " }
+    \score {
+      <<
+        \include "manuscripts/II-clarinet.ly"
+      >>
+      %\midi { }
+      \layout {
+        \context {
+          \Score
+          \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 Hairpin.to-barline = ##f
+        }
+        \context {
+          \Staff
+          \remove Instrument_name_engraver
+        }
+      }
+    }
   }
-  oddFooterMarkup = \markup {
-    \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 }
-    \concat { \if \on-page #13 \oddfoot }
-    \concat { \if \on-page #15 \oddfoot }
-    \concat { \if \on-page #17 \oddfoot }
-    \concat { \if \on-page #19 \oddfoot }
-    \concat { \if \on-page #21 \oddfoot }
-    \concat { \if \on-page #23 \oddfoot }
-  }
-  evenFooterMarkup = \markup {
-    \concat { \if \on-page #2 \evfoot }
-    \concat { \if \on-page #4 \evfoot }
-    \concat { \if \on-page #6 \evfoot }
-    \concat { \if \on-page #8 \evfoot }
-    \concat { \if \on-page #10 \evfoot }
-    \concat { \if \on-page #12 \evfoot }
-    \concat { \if \on-page #14 \evfoot }
-    \concat { \if \on-page #16 \evfoot }
-    \concat { \if \on-page #18 \evfoot }
-    \concat { \if \on-page #20 \evfoot }
-    \concat { \if \on-page #22 \evfoot }
-  }
-
-}
-
-\book {
-
-%  \bookpart {
-%    \header {
-%      title = \markup { \fontsize #1 \xtitle }
-%      subtitle = \markup { \medium \italic \xsub }
-%      composer = \xcomp
-%      poet = \markup { \xinst }
-%      piece = \markup { \large \bold "I. " }
-%    }
-%    \tocItem \markup { "I. " }
-%    \score {
-%      <<
-%        \include "manuscripts/I-clarinet.ly"
-%      >>
-%      %\midi { }
-%      \layout {
-%        \context {
-%          \Score
-%          \override RehearsalMark.break-visibility = #begin-of-line-invisible
-%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/8)
-%          \override Hairpin.to-barline = ##f
-%        }
-%      }
-%    }
-%  }
-
-%  \bookpart {
-%    \header {
-%      title = ##f subtitle = ##f composer = ##f poet = ##f
-%      piece = \markup { \large \bold "II. " }
-%    }
-%    \tocItem \markup { "II. " }
-%    \score {
-%      <<
-%        \include "manuscripts/II-clarinet.ly"
-%      >>
-%      %\midi { }
-%      \layout {
-%        \context {
-%          \Score
-%          \override RehearsalMark.break-visibility = #begin-of-line-invisible
-%          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
-%          \override Hairpin.to-barline = ##f
-%        }
-%      }
-%    }
-%  }
 
   \bookpart {
     \tocItem \markup { "III." \bold "Lento, poco rubato" \parenthesize \italic "to Amber Lucas" }
     \score {
       \header {
-        title = \markup { \fontsize #1 \xtitle }
-        arranger = \markup \typewriter \medium \fontsize #-4 { \shortHash }
-        subtitle = \markup { \medium \italic \xsub }
-        composer = \xcomp
-        poet = \markup { clarinet in \concat { \bold "B" \tiny \flat } }
         piece = \markup { \large \bold "III. " \parenthesize \italic "to Amber Lucas"  }
       }
       <<