-

Signed-off-by: Hans Dijkema <hans@dijkewijk.nl>

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lilypond-hd"]
-	path = lilypond-hd
-	url = https://git.dijkewijk.nl/hans/lilypond-hd.git

Joseph-Haydn-Die-Sieben-Wörte-des-Erlösers.ly

@@ -7,10 +7,9 @@
   title = "Die Sieben Wörte des Erlösers"
   subtitle = "Streichquartett"
   composer = "Joseph Haydn"
-  piece = "Nr. 17"
-  opus = "Op. 51"
-  copyright = \markup { \fontsize #-8 "(p) 2026 - H.N.M. Dijkema - CC-BY-NC-SA-3.0" }
-  tagline = \markup { \fontsize #-8 "(p) 2026 - H.N.M. Dijkema - CC-BY-NC-SA-3.0" }
+  opus = "Op. 51, Nr. 17"
+  copyright = \markup { \fontsize #-8 "(p) 2026 - H.N.M. Dijkema - CC-BY-NC-SA-3.0 - Lilypond 2.24.3" }
+  tagline = \markup { \fontsize #-8 "(p) 2026 - H.N.M. Dijkema - CC-BY-NC-SA-3.0 - Lilypond 2.24.3" }
 }
 
 \paper {
@@ -33,11 +32,12 @@
 }
 
 \include "lilypond-hd/functions.ly"
+\include "lilypond-hd/string-quartet.ly"
 
 fig = #(define-music-function
         (a b c)
         (ly:music? ly:music? ly:music?)
-        #{ #(withDuration a 3 2) #(withDuration (flattenPitch a) 5 0) -. $b -. $c -. #}
+        #{ #(withDuration a 3 2) #(withDuration (flattenPitch a) 5 0) $b -. $c -. #}
         )
 
 fgg = #(define-music-function
@@ -46,24 +46,67 @@ fgg = #(define-music-function
        #{ #(withDuration a 4 1) #(withDuration b 5 0) #}
        )
 
+fggg = #(define-music-function
+         (a b c d)
+         (ly:music? ly:music? ly:music? ly:music?)
+         #{ #(withDuration a 4 1) #(withDuration b 5 0) #(withDuration c 4 1) #(withDuration d 5 0) #}
+         )
+
+fg = #(define-music-function
+       (a b c)
+       (ly:music? ly:music? ly:music?)
+       #{ #(withDuration a 3 2)( #(withDuration b 5 0)) #(withDuration c 3 0)-. #}
+       )
+       
+
+fgfz = #(define-music-function
+       (a b c)
+       (ly:music? ly:music? ly:music?)
+       #{ #(withDuration a 3 2)(\fz #(withDuration b 5 0)) #(withDuration c 3 0)-. #}
+       )
+
+tfg = #(define-music-function
+        (a b c)
+        (ly:music? ly:music? ly:music?)
+        #{ #(fgfz a b c) r8 r4 #}
+        )
+
 global = {
   \key f \major
   \time 4/4
-  \tempo "Maeestoso ed Adagio" 8=72
+  \tempo "Maestoso ed Adagio" 8=72
 }
 
 introduzione = { 
   \key f \major
   \time 4/4
-  \tempo "Maeestoso ed Adagio" 8=72
+  \tempo "Maestoso ed Adagio" 8=72
 }
+piece_introduzione = \makePiece "Introduzione" 
+scriptum_introduzione = \makeScriptum ""
+
+sonataI = { 
+  \key bf \major
+  \time 3/4
+  \tempo "Largo" 8=80
+}
+piece_sonataI = \makePiece "Sonata I"
+scriptum_sonataI = \makeScriptum "Pater, dimitte illis, non enum sciunt, quid faciunt."
+
+sonataII = {
+  \key ef \major
+  \time 4/4
+  \tempo "Grave e cantabile" 4=63
+}
+piece_sonataII = \makePiece "Sonata II"
+scriptum_sonataII = \makeScriptum "Amen dieo tibi: hodie mecum eris in paradiso."
 
 scoreAViolinI_introduzione = \relative c'' {
   \introduzione
   % Muziek volgt hier.
   \relative c' {
     d4\ff \fig d' cs8 bf' r4 |  a,, \fig g'' f8 d' r4 | 
-    f,,2\p( e4. \fgg fs g) | g4 r8 \fgg bf( a) a8-. r r \fgg bf'( a) | a8-. r r \fgg b,\fz( a) a16-.\p r g-. r f-. r e-. r |
+    f,,2\p( e4. \fgg fs g) | g4 r8 \fgg bf( a) a8-. r r \fgg bf'( a) | a8-. r r \fgg bf,\fz( a) a16-.\p r g-. r f-. r e-. r |
     d4\f \fig d' cs8 bf' r4 | 
     
     %7 
@@ -82,11 +125,11 @@ scoreAViolinI_introduzione = \relative c'' {
     
     %16
     b8-. c-. r4 bf8\p( a) r4 | <f d'>8-.\f <f c'>-. r4 b2\p( | 
-    bf4.)( \stemDown a8) \stemNeutral fs( g b d) | f,!4( \acciaccatura a8 g8. f16) f4 r8. bf16\f |
+    bf4.)( \stemDown a8) \stemNeutral fs( g bf d) | f,!4( \acciaccatura a8 g8. f16) f4 r8. bf16\f |
     bf8 g16. bf'32 bf16-. g-. e-. bf-.  a8-. a'-. r8. f16-.\p | f8\(( g,16-.) r32 d'-.\) d8\(( d,16-.) r32 bf'-.\) bf4( g8 e) |  
     
     %22
-    f\f <g bf>4\fz <f a>8 g <e d'>4\fz <f c'>8 | <g bf> b'4\sf a8 <bf, g'> r <g bf e> r | <f a f'>4 r4 r2 |
+    f\f <g bf>4\fz <f a>8 g <e d'>4\fz <f c'>8 | <g bf> bf'4\sf a8 <bf, g'> r <g bf e> r | <f a f'>4 r4 r2 |
     af4\p df8..( c32)  c8-.\f gf'-. r4 |
     af,4\p( a8.. bf32) bf8( f'-.) r8 bf,16.( a32) | a8( f'-.) r c16.( bf!32) bf8( f'-.) r8 bf,16.( a32) | 
     
@@ -114,7 +157,7 @@ scoreAViolinI_introduzione = \relative c'' {
     d8-. gs,16.( a32) a8-.  e16.( f32) f8-. r r  cs,16.( d32) |
     
     %47
-    d8-.  r r8.. d'32 d8( e,16.) b'32 b8( a16.) cs,32 |
+    d8-.  r r8.. d'32 d8( e,16.) bf'32 bf8( a16.) cs,32 |
     d8\f g4\fz f8 e <g bf>4\fz <f a>8 | g <a g'>4\fz  f'8 <g, bf! e> r <e cs'> r |
     r4 r8 cs'16.(\p d32) d8-. r r cs,16.( d32) | 
     d8-.(\pp d d d) d2\fermata 
@@ -124,6 +167,81 @@ scoreAViolinI_introduzione = \relative c'' {
   \pageBreak 
 }
 
+scoreAViolinI_sonataI = \relative c' {
+  \sonataI
+  % music here
+  R2._"1" | 
+  \fg f'\f d bf r8 r4 | \fgfz bf' g ef8-. ef-.(\p ef-. ef-.) |
+  \fgfz cs d d8-. r r d\p | c!4 ef4.\fz a,8\p | c4( bf8-.) r r4 |
+  \tfg bf' g ef |
+  \fgfz f d bf bf8[(\p a bf]) | b( c) r c( b c) | cs( d) r d( ef f) | f\fz( fs) g16( b, c d) \grace f!16( ef8)( c16 a) |
+  
+  c4( bf!8-.) r8 r4 | d4\f d,8\p \acciaccatura f ef8( d cs) | cs4( \fggg d)( cs d cs) d8-. r |
+  d'4\f d,8\p( f! af b,!) | d4( \fggg c)( b c b) \fggg c( d c bf) |
+  a!8( c) f4( f16) (e32 f g16[ f]) | \grace f16( e8)( d16 c) c4 r |
+  
+  \tfg bf' g e | \tfg g' e bf | bf'4.\f \grace { c32( bf a) } bf8( c df) | f,4\fz( e8-.) r r f\p | 
+  f4( e8-.) r8 r d-. | d[( cs)] c-. r r bf |
+  bf4 a8( g bf e,) | f r g r e r | 
+  
+  \mark A
+  f4 r8 c''8( a f) | \grace { e32( f g) } f4( e!8-.) r d16( a') g32([ f e! d]) | d8( cs) c-. r r16 bf-.( bf-. bf-.) | 
+  %30
+  \grace { a32( bf c) } bf4 a8( g d' e,) | f8 r g r e r | f2.~^\cresc f2\!~f8\< g\! |
+  af2.\f f8([ af)] df(\p f df bf) | ef,2~\<\( ef16 f gf af\)\! | f8[(\f af)] df(\p f df bf) |
+  af2~ af16( g! gf ef) | df2.~\pp df2 r4 | R2.^"1" |
+  \tfg af'' f d!8 | \tfg bf' g ef8 | \tfg g f d | \tfg g ef c |
+  
+  %46
+  c'4~\f c16(\p d32 ef d16[ c]) bf!( af g fs) | fs4( g8-.) r r c | c4( b8-.) r r af | \grace { g16( bf) } af4( g8-.) r r f |
+  f4( e8) g( c, bf') | af( g f ef! df c) | 
+  
+  %52
+  bf-. r af-. r e-. r | f4 r4 r4
+  \tfg gf ef c8 | \tfg f df bf | \fgfz df' bf gf8-. \slurUp gf-.(\p gf-. f-.) \slurNeutral | e4( ef d!) | c g'4.( bf,8) |
+  
+  %59
+  \acciaccatura c bf4(\trill a8) c[( d ef]) | f4 r r | 
+  \tfg f' d bf 
+  \fgfz bf' g ef ef8-.\p( ef-. ef-.) |
+  \fgfz cs d d r8 r d\p | c4 ef4.\fz a,8\p | c8( bf) r bf( a bf) | b( c) r c( b c)
+  
+  %67
+  cs8( d) r d( c d) | f( ef) r ef( d ef) | g4( f) e8 ef~\f | ef16( d c g') bf,4 \acciaccatura d8 c8. bf16 | bf4 r r8 bf'8\p |
+  bf4( a8-.) r r g-. | g( fs f) r r ef |
+  
+  %74
+  ef4 d8( c ef a,) | bf r c r a r |
+  \mark B
+  bf4 r8 f'( d' bf) |
+  \grace { a32( bf c) } bf4( a8-.) r8 \stemDown \tupletUp \times 4/6 { r16 g( a bf a g) } \stemNeutral \tupletNeutral | 
+  g8( fs f-.) r8 r16 ef-.( ef-. ef-.) |
+  \grace { d32( ef f) } ef4 d8([ c)] g'\fz([ a,)] |
+  
+  %80
+  bf8\p r c r a r | bf8[\cresc bf bf bf bf bf]\! | bf2~\< bf8 c8-.\! | df2.~\f df4( c8.) c32( d) d8.\trill\fz( c32 d) |
+  ef2.~ ef4( d8.) d32( e) e8.\trill\fz( d32 e) | f4 r8 f8\p( e f) |
+  
+  %88
+  fs8( g) r g( fs g) | gs( a) r a(\cresc gs a)\! | bf( b c d ef16) c( a ef) |
+  \grace { d32( ef f) } ef2\f\fermata r4 |
+  d2\p\fermata r4 | c8 r ef r a, r | \rep 4 bf'2.:8 | 
+  
+  %98
+  bf4~\< bf16.( g32)\! bf16.\f( g32) f8 a, | bf4 r4 r4 |
+  r4 af'16.\p( f32) d8-. r4 | r4 gf16.( ef32) a,!8-. r4 | f'16( d) bf-. bf-. d( bf) f-. f-. bf( f) d-. d-. | d8\pp r d r d r | 
+  <bf d>2\fermata r4 
+  \bar "|."
+}
+
+scoreViolinI_sonataII = {
+  \sonataII
+  %muziek volgt hier
+  \relative c' {
+    c'2.\p( ef4) | d8( b) c4-. r2 | 
+  }
+}
+
 scoreAViolinII_introduzione = \relative c'' {
   \introduzione
   % Muziek volgt hier.
@@ -150,8 +268,8 @@ scoreAViolinII_introduzione = \relative c'' {
     
     %19 
     a4( bf a) r |
-    \rep 8 <g' b>16\f \stemUp <f a>8 <a f'> \stemNeutral r4 | d,4\p r4 e2 | 
-    <a, f'>8\f <g e'>4\fz <a f'>8 e' bf'4\fz a8 | g e'4\fz f8 d8 r <g, b e> r |  
+    \rep 8 <g' bf>16\f \stemUp <f a>8 <a f'> \stemNeutral r4 | d,4\p r4 e2 | 
+    <a, f'>8\f <g e'>4\fz <a f'>8 e' bf'4\fz a8 | g e'4\fz f8 d8 r <g, bf e> r |  
     \stemUp <f a f'>16\> \rep 7 f16 f\! \rep 7 f \stemNeutral
     
     %25 
@@ -167,7 +285,7 @@ scoreAViolinII_introduzione = \relative c'' {
     
     \mark B
     
-    d4\f \fig <f a> <g b>8 cs, r4 | a4 \fig <a' e'> <a f'>8 f r4 |
+    d4\f \fig <f a> <g bf>8 cs, r4 | a4 \fig <a' e'> <a f'>8 f r4 |
     d2.\p( cs4 | c!2) d8( c bf c) | d2( cs16) \rep 7 a'-.\f | 
     \rep 4 <e cs>-. <e cs>-. bf'-. a-. g-.  <a, f'>-. \rep 4 <a f'>-. f'-. g-. a-. |
     
@@ -185,14 +303,101 @@ scoreAViolinII_introduzione = \relative c'' {
   } 
   
   \pageBreak
-  
 }
 
+sonpI = #(define-scheme-function
+          (n)
+          (ly:music?)
+          (let ((m (withDuration n 2 1))
+                (nn (withDuration (flattenPitch (rmtext n)) 3 0)))
+            #{ $m \fz $nn -.\p( $nn -. $nn -.) #}
+            )
+          )
+
+stemRoom = { \once \override Stem.X-extent = #'(1 . 2) }
+
+scoreAViolinII_sonataI = \relative c'' {
+  \sonataI
+  % Muziek volgt hier.
+  \relative c' {
+    R2._"1" | \rep 3 <d f>8\f \rep 3 <d f>\p | \rep 3 <g, ef'>\f g'\p c[ a] | \fgfz a bf bf d,\p d f | g4 <g, ef'>\fz <a ef'>8 <a ef'>\p |
+    \set doubleSlurs = ##t
+    <a ef'>4( <bf d>8) 
+    \set doubleSlurs = ##f
+    d( ef f) | 
+    \set doubleSlurs = ##t
+    <g, ef'>4\fz( <bf g'>8)
+    \set doubleSlurs = ##f
+    g'8(\p bf g) |
+    \set doubleSlurs = ##t
+    <bf, d>4\fz( <d f>8)
+    \set doubleSlurs = ##f
+    d(\p c d) |
+    ef4 r8 ef( d ef) | e( f) r bf( a af) | af4\fz( g8-.) r a,8( c16 ef) | ef4( d8-.) r8 r4 |
+    a4.\f bf8\p bf bf | a2:8 a8-. r | af\f af \rep 4 af\p | g2.:8 |
+    
+    %17
+    a!8 c c c b[ b] | c4 r r | <g e'>\fz r r | <bf! e>\fz r r | df8-.\f f-. f-. f( ef! df) | <bf g'>4 r8 c'-.\p c-. c-. |
+    \rep 4 bf8 a! a | \rep 4 g f f | \rep 3 e d d c |
+    
+    %26
+    c8 r d r bf r | 
+    
+    \mark A
+    a \rep 5 c' | bf2:8 a8 a | g2:8 f8 f | \rep 3 e8 d d c | c r d r bf r | af r r g(^\cresc af\! a) | bf bf bf(\< c df) df\! |
+    
+    %34
+    <df ef>2:8\f <c ef>8 <c ef> | <df f>4 r4 r8 <df ef>\p | <df ef>2:8\< <c ef>8 <c ef>\! | <df f>4\f r4 r8 <df ef>8\p |
+    <df ef>2:8 <c ef>8 <c ef> |
+    <df f>8-.\pp bf( af bf af bf) | af2 r4 | 
+    R2.^"1" | 
+    \sonpI <f'd'> | \sonpI <g ef'>
+    
+    %44
+    \sonpI <f d'> | \sonpI <ef c'> | fs8\f fs fs r r c'\p |
+    c4( b8) g'-. g-. g-. | f2:8 ef8 ef | d2:8 c8 c8 | bf bf bf e,( f g) | 
+    c( bf af gf f ef!) | f-. r f-. r a,-. r |
+    
+    %53
+    af4 r r | \sonpI <a ef'> | \sonpI df | bf4.\fz bf8\p(-. bf-. c-.) | df4( c bf) | bf2. |
+    \acciaccatura c8 bf4\trill( a8) a[( bf c]) | d4 r r | \rep 3 <d f>8\fz \rep 3 <d f>\p |
+    \rep 3 <g, ef'>\fz g'\p c[ a] |
+    
+    %63
+    \fgfz a bf bf d,\p d( f) | g4  \stemRoom <g, ef'>\fz \rep 2 <a ef'>8\p |
+    ef'( d) r d( c d) | ef4 r8 ef( d ef) | e( f) r bf( a b) | d( c) r c( b c) | 
+    \slurDown a4( bf8 b c) f,\f~ | \slurNeutral
+    f( g) d4 \acciaccatura f8 ef8.( d16) |
+    
+    %71
+    d4 r8 \rep 3 f'-.\p | ef2:8 d8 d8 | c2:8 bf8 bf | a a a g g f | f r g r ef r |
+    \mark B
+    d f' f2:8 | ef2:8 d8 d | c2:8 bf8 bf | a4. g8 g f | f r g r ef r |
+    
+    %81
+    df8-.^\cresc bf(\! cf c df d) | ef-.\< ef-. ef( f gf) gf\! | 
+    gf4\f( f8.) f32( g!) g8.^\trill\fz( f32 g32) |
+    af2.~ af4( g8.) (g32 a) a8.^\trill\fz( g32 a) |
+    bf2.~ bf8( a) r a(\p g a) | bf4 r8 bf( a bf) |
+    
+    %89
+    b8( c) r c(\cresc b\! c) | df( d ef d a) a | a2\fermata\f r4 | bf2\fermata\p r4 |
+    g8 r g r ef r | d4 r8 ef( d ef) | e( f) r f( e f) | fs( g) r g( f g) |
+    
+    %97
+    g8( af) r af( g af) | fs( g) r g16.\f( ef32) d8 c | bf4 r8 bf'8\p( c bf) |
+    a!( af) r af( bf af) | g( gf) r8 gf( f gf) | f r f r d r | bf\pp r bf r bf r | 
+    bf2\fermata r4
+    \bar "|."
+  }
+}
+
+
 scoreAViola_introduzione = \relative c' {
   \introduzione
   % Muziek volgt hier.
-  <a f>4\ff \fig d  e8 g r4 | a4 cs8.. cs32 d8 d, r4 | 
-  r8 d\p( bf f g gs a d) | g,4 r8 e'16.( f32) f8-. r r g16.( f32) | g8 r r e16.(\fz f32) f16\p r g r a r a, r |
+  <a f>4\ff \fig d  e8 g r4 | a,4 cs'8.. cs32 d8 d, r4 | 
+  r8 d\p( bf f g gs a d) | g,4 r8 e'16.( f32) f8-. r r g16.( f32) | f8 r r e16.(\fz f32) f16\p r g r a r a, r |
   
   %6
   <f a>4\f d'8.. d32 e8-. g-. r4 | c,!4  c'8.. c32  bf16 \rep 7 <g bf>-.\ff | \rep 8 <g bf>-. \rep 4 ef'\fz  \rep 4 a, | 
@@ -249,6 +454,68 @@ scoreAViola_introduzione = \relative c' {
   \pageBreak 
 }
 
+scoreAViola_sonataI = \relative c'' {
+  \sonataI
+  % Muziek volgt hier.
+  \relative c' {
+    \rep 6 bf8-.\p | \rep 3 d\f \rep 3 d\p | ef\f g g g\p g c | f,4.\fz f8\p f d |
+    g4 c,4.\fz c8\p | a4( bf8) bf( c d) | 
+    
+    %7 
+    ef4.\f ef8\p( g ef) | d4\f r r | r8 f,8\p( gf\fz f8) r4 | r8 bf( a\fz bf\p c d) |
+    ef4\sf r4 c8 a8 | a4( bf8-.) bf([\p a g)] | fs8\f fs fs\p g g g | fs8[ fs fs fs] fs-. r |
+    
+    %15
+    b8\f b b\p b b d | g,[ g] e e e e | f( g a) a d d | g,4 r8 c c c | <g'bf>4\fz r8 c,,8( df\fz c) |
+    e4\fz r8 c( df\f c) | df\f df'!-. df-. df( c bf) |
+    
+    %22
+    c4 r8 a'!-.\p a-. a-. | g2:8 f8[ f] | e2:8 d8[ d] | c c c bf bf bf | a r bf r g r |
+    \mark A
+    a8 \rep 5 a' | \rep 4 g f f | \rep 4 e d d | 
+    
+    %30
+    \rep 3 c \rep 3 bf | a r bf r g r | f\cresc f(\! gf g af a) |
+    bf\< bf bf( c df) df\! | ef2.:8\f | \rep 2 { f4 r r8 ef\p | ef2.:8 | }
+    df8\pp gf,( f gf f gf) | f2 r4 | R2.^"1" | af'4.\f af8-.\p( af-. af-.) |
+    \repeat unfold 3 { g4.\f g8-.\p( g8-. g-.) | }
+    af8\f af af r r af,\p | g4 r8 ef''-. ef-. ef-. |
+    
+    %48
+    d8 d d d c c | b b bf bf af af | g g g df'( c e,) | 
+    af( bf c) c( bf a) | bf-. r c-. r g-. r | \rep 6 f,8-. | c'4.\f c8-.\p( c-. c-.) |
+    
+    %55
+    bf4.\f bf8-.\p( bf-. bf-.) | bf4.\f df8-.\p( df-. c-.) | bf4( f) f | g2. | f4 r r | 
+    R2.^"1" | 
+    bf8\f d d d\p d d | ef\f g g g\p g c | f,4.\fz f8\p f d | 
+    g4 c,4.\fz c8\p | a8( bf) r4 r4 |
+    
+    %66
+    r8 f( gf\fz f) r4 | r8 bf( a\fz bf) r4 | r8 f'8( gf\fz f) r4 |
+    r8 ef\p( d df c) c'\f | bf( g) f4 a,8.( bf16) | bf4 r8 d'8-.\p d-. d-. |
+    c2:8 bf8[ bf] | a2:8 g8[ g] | f8 f f ef ef ef | 
+    
+    %75
+    d r ef r c r | 
+    \mark B
+    d \rep 5 d' | c2:8 bf8 bf | a2:8 g8 g8 | f4. ef8 ef ef | d r ef r c r |
+    r df,^\cresc( d\! ef e f) | gf4 r r | af2\f bf8 e | 
+    
+    %84
+    ef2 f8 bf | bf2 c8 f, | f2 g8 c | c f,\p f2:8 | f2.:8 |
+    f8\cresc f\! f f f f | f f( a bf c) c | c2\f\fermata r4 | bf2\p\fermata r4 |
+    g8 r ef r c r | bf bf'-. \rep 4 bf-. |
+    
+    %95
+    \rep 3 { bf2.:8 | } bf4 r8 ef,\f f f | d4 r8 d8\p( ef d) | 
+    c( d) r d(\p c d) | ef( a,!) r ef'( d ef) | d8 r f, r f r | f\pp r f r f r | 
+    f2\fermata r4 
+    \bar "|."
+  }
+}
+
+
 scoreACello_introduzione = \relative c {
   \introduzione
   % Muziek volgt hier.
@@ -256,114 +523,189 @@ scoreACello_introduzione = \relative c {
     d4\ff \fig d' e8 e, r4 | a,4 \fig cs' d8 d, r4 | r8 d( bf f g gs a4) | bf r8 \fgg g'( f) f8 r8 r4 |
     
     %5
-    r4 r8 \fgg g\fz( f) f16-.\p r g-. r a-. r a,-. r | d4\f  \fig d' e8 e, r4 | c! c'8.. c32 bf!4 r16\ff g,-. bf-. d-. |
+    r4 r8 \fgg g\fz( f) f16-.\p r g-. r a-. r a,-. r | d4\f  \fig d' e8 e, r4 | 
+    
+    %7 
+    c! c'8.. c32 bf!4 r16\ff g,-. bf-. d-. |
     \rep 8 g \rep 8 g\fz | 
     
     %9
-    \rep 8 g g16-. r f-. r cs-. r d-. r | \rep 8 a' a2:16 | a16 \rep 7 a, a2:16 |
+    \rep 8 g g16-. r f-. r cs-. r d-. r | \rep 8 a' a2:16 | 
+    %11
+    a16 \rep 7 a, a2:16 |
     \rep 4 a8-. a2\fermata
     
     \mark A
     f4\p r4 r8 fs'8( g e) | c r e r f f,-. a-. c-. | \rep 16 f16\f | 
-    f8-. e-. r4 r2 bf'8-.\f a-. r4 r8 af8\p( g f) | r8 e( f) f,-. bf4 r4 | c2( d4) r4
+    f8-. e-. r4 r2 |
+    
+    %17 
+    bf'8-.\f a-. r4 r8 af8\p( g f) | r8 e( f) f,-. bf4 r4 | c2( d4) r4 |
+    
+    \rep 8 e16\f f8 f, r4 | bf4\p r c2 | \rep 8 f16\f f2:16 | \rep 8 f16 bf,8 r8 c r |
+    
+    %24 
+    f,4 r4 r2 | \rep 8 df'16\p  ef8-.\f c-. r4 | \rep 8 c'16\p df8 r8 r4 |
+    \compressMMRests { R1*4 } |
+    \rep 8 bf,16\f \rep 8 a | 
+    
+    %32
+    \rep 4 a a4:16 a2:16 | \rep 8 a16 \rep 4 a8-.  a1\fermata |
+    
+    \mark B
+    d4\f \fig d' e8 e,  r4 | a,4 \fig cs' d8 d,8 r4 | 
+    r8 d\p( bf f) g bf'( a e) | 
+    
+    %38
+    r8 ef( d a) bf( a g a) | bf2( a4) r |
+    \rep 4 a'16-.\f a-. g-. f-. e-. \rep 6 d-.\fz e-. f-. |
+    \rep 4 g\fz \rep 4 a\fz bf4\fz r | 
+    g4\p r g8-. f-. r4 | cs8-.\f d r4 g,\p( a) | 
+    
+    %44
+    bf4\fermata r8\fermata r8 r2 | R1^"1" |
+    r2 r4 r8 e16.\p( f32) f8-. r r fs16.( g32) g8-. r a-. r | 
+    \rep 4 d,16\f d4:16 d2:16 | d2:16 g8 r a r | \rep 4 d,16\p d4:16 d2:16 | d8-.(\pp d-. d-. d-.) d2\fermata 
+    
+    \bar "|."
+    \pageBreak 
+  }
+}
+
+scoreACello_sonataI = \relative c'' {
+  \sonataI
+  % Muziek volgt hier.
+  \relative c' {
+    R2.^"1" | \rep 6 bf,8-.\p | \rep 2 { bf\f bf bf bf\p bf bf | } |
+    \stemDown ef ef a,\fz a f' f\p  \stemUp | bf,2.:8 | bf8\f bf bf bf\p bf bf |
+    bf\f bf' bf, r r4 |
+    
+    %9 
+    r8 f\p( gf\fz f) r4 | r8 bf( a\fz bf c\p d) | ef4\sf r4 f | 
+    bf,4. bf8\p( a g) | fs8\f fs'! fs\p g g g | 
+    fs2:8 fs8 r8 | f!8\f f f\p f f f | e2.:8 | f8( e d) d g, g |
+    
+    %18
+    c2.:8 | c8\fz c c c( df\fz c) | c,\fz c' c c[( df\fz c)] | bf4\f r r | c r r |
+    \compressMMRests { R2.*2 } | r4 r8 bf\p bf bf | a r bf r c r |
+    
+    \mark A
+    f,4 r r | 
+    \compressMMRests { R2.*2 } |
+    r4 r8 bf\p bf bf | 
+    
+    %31
+    a r bf r c r | f, (af\cresc a\! bf b c) | 
+    df df (df\< c bf) bf\! | af2.:8\f | df4 r r8 g,!\p | af8\< \rep 4 af af\! | bf4\f r4 r8 g!\p |
+    af2.:8 | df8\pp df df df df df |
+    
+    %40
+    df2 r4 | \rep 6 bf8-.\p | \repeat unfold 2 { bf\f bf bf bf\p bf bf | } 
+    b\f b b b\p b b | c\f c c c\p c c |
+    
+    af8\f af af r r af\p | g4( g8) r8 r4 | 
+    \compressMMRests { R2.*2 } |
+    
+    %50 
+    r8 df''(\p c bf af g) | f( g af a bf c) | \stemDown df8-. r c-. \stemNeutral r c,-. r |
+    f,2.:8 | \repeat unfold 2 { f8\f f f f\p f f } | gf\f gf gf gf\p gf gf | 
+    
+    %57 
+    g g a a bf bf | ef ef ef ef e e | f f f ef!( d c) | bf2.:8 | 
+    \repeat unfold 3 { bf8\f bf bf bf\p bf bf | }
+    ef ef c\fz c f f\p |
+    
+    %65
+    bf,4( bf'8-.) r8 r4 | 
+    r8 f,( gf\fz f) r4 | r8 bf( a\fz bf) r4 | R2.^"1" |
+    r4 r r8 a'\f | bf8 ef, f f f f | g4 r r |
+    \compressMMRests { R2.*2 } |
+    r4 r4 r8 ef\p | d r ef r f r |
+    
+    \mark B
+    bf,4 r r |
+    
+    %77 
+    \compressMMRests { R2.*2 } | r4 r r8 ef\p | d r ef r f r |
+    r8 df(\cresc d\! ef e f) | gf\< gf gf( f ef) ef\! | 
+    df-.\f df-. df-. df-. bf-. bf-. | af-. af'-. af-. af-. f-. f-. | \rep 4 ef-. c-. c-. |
+    
+    %86
+    bf-. bf'-. bf-. bf-. g-. g-. | f4 r r | R2.^"1" |
+    r4 r8 f8\cresc f\! f | f2.:8 | f2\f\fermata r4 | f2\p\fermata r4 |
+    ef8 r c r f r | bf,4 r8 g'8( f g) | af4 r8 af( g af) | a!( bf) \clef tenor r8 ef( d ef) |
+    
+    %97 
+    e!( f) r f( e f) | d( ef!) \clef bass r8 ef,\f f f |
+    bf,\f bf\p \rep 4 bf | bf2.:8 | bf 2.:8 | bf8 r bf r bf r | bf\pp r bf r bf r | 
+    bf2\fermata r4
+    \bar "|."
     
     
   }
 }
 
-scoreAViolinIPart_introduzione = \new Staff \with {
-  instrumentName = "Vl. I"
-} \scoreAViolinI_introduzione
 
-scoreAViolinIIPart_introduzione = \new Staff \with {
-  instrumentName = "Vl. II"
-} \scoreAViolinII_introduzione
-
-scoreAViolaPart_introduzione = \new Staff \with {
-  instrumentName = "Avl."
-} { \clef alto \scoreAViola_introduzione }
-
-scoreACelloPart_introduzione = \new Staff \with {
-  instrumentName = "Cl."
-} { \clef bass \scoreACello_introduzione }
+% Violin I score of all pieces
 
 
 \bookpart {
-  \header {
-    subsubtitle = "Introduzione"
-  }
-  \score {
-    \scoreAViolinIPart_introduzione
-    \layout { 
-      \context {
-        \Score
-        \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3)
-      }
-      %#(layout-set-staff-size 16) 
-    }
-  }
+  \makeHdr \piece_introduzione \scriptum_introduzione
+  \makeScoreVI \scoreAViolinI_introduzione
 }
 
 \bookpart {
-  \header {
-    subsubtitle = "Introduzione"
-  }
-  \score {
-    \scoreAViolinIIPart_introduzione
-    \layout { 
-      \context {
-        \Score
-        \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3)
-      }
-      %#(layout-set-staff-size 16) 
-    }
-  }
+  \makeHdr \piece_sonataI \scriptum_sonataI
+  \makeScoreVI \scoreAViolinI_sonataI
 }
 
 \bookpart {
-  \header {
-    subsubtitle = "Introduzione"
-  }
-  \score {
-    \scoreAViolaPart_introduzione
-    \layout { 
-      \context {
-        \Score
-        \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3)
-      }
-      %#(layout-set-staff-size 16) 
-    }
+  \makeHdr \piece_sonataII \scriptum_sonataII
+  \makeScoreVI \scoreViolinI_sonataII
 }
+
+
+% Violin II score of all pieces
+\bookpart {
+  \makeHdr \piece_introduzione \scriptum_introduzione
+  \makeScoreVII \scoreAViolinII_introduzione
 }
 
 \bookpart {
-  \header {
-    subsubtitle = "Introduzione"
+  \makeHdr \piece_sonataI \scriptum_sonataI
+  \makeScoreVII \scoreAViolinII_sonataI
 }
-  \score {
-    \scoreACelloPart_introduzione
-    \layout { 
-      \context {
-        \Score
-        \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3)
+
+% Viola score of all pieces
+\bookpart {
+  \makeHdr \piece_introduzione \scriptum_introduzione
+  \makeScoreVa \scoreAViola_introduzione
 }
-      %#(layout-set-staff-size 16) 
+
+\bookpart {
+  \makeHdr \piece_sonataI \scriptum_sonataI
+  \makeScoreVa \scoreAViola_sonataI
 }
+
+% Cello score of all pieces
+\bookpart {
+  \makeHdr \piece_introduzione \scriptum_introduzione
+  \makeScoreCl \scoreACello_introduzione
 }
+
+\bookpart {
+  \makeHdr \piece_sonataI \scriptum_sonataI
+  \makeScoreCl \scoreACello_sonataI
 }
 
 
-\score {
-  <<
-    \scoreAViolinIPart_introduzione
-    \scoreAViolinIIPart_introduzione
-    \scoreAViolaPart_introduzione
-    \scoreACelloPart_introduzione
-  >>
-  \layout { 
-      \context {
-        \Score
-        \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3)
-      }
+% Full score all pieces
+\bookpart {
+  \makeHdr \piece_introduzione \scriptum_introduzione
+  \makeScoreFull \scoreAViolinI_introduzione \scoreAViolinII_introduzione \scoreAViola_introduzione \scoreACello_introduzione
 }
+
+\bookpart {
+  \makeHdr \piece_sonataI \scriptum_sonataI
+  \makeScoreFull \scoreAViolinI_sonataI \scoreAViolinII_sonataI \scoreAViola_sonataI \scoreACello_sonataI
 }