Sonata I of violin I done and begun with Sonata I of violin II

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

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

@@ -53,10 +53,23 @@ fggg = #(define-music-function
          )
 
 fg = #(define-music-function
-       (a b)
-       (ly:music? ly:music?)
-       #{ #(withDuration a 3 2)( #(withDuration b 5 0)) #}
+       (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
@@ -151,26 +164,67 @@ scoreAViolinI_sonataI = \relative c' {
   \sonataI
   % music here
   R2._"1" | 
-  \fg f'\f d bf8-. r r4 | \fg bf'\fz g e8-. ef-.(\p ef-. ef-.) |
-  \fg cs\fz d d8-. r r d\p | c!4 ef4.\fz a,8\p | c4( bf8-.) r r4 |
-  \fg bf'\fz g e8-. r r4 |
-  \fg f\fz d bf8-. bf(\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) |
+  \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( bf8-.) r8 r4 | d4\f d,8\p \acciaccatura f ef8( d cs) | cs4( \fggg d)( c d c) d8-. r |
+  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 |
+  a!8( c) f4( f16) (e32 f g16[ f]) | \grace f16( e8)( d16 c) c4 r |
   
-  \fg bf'\fz g e8-. r r4 | \fg g'\fz e bf8-. r r4 | 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 |
+  \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( e8-.) r d16( a') g32( f e d) | d8( cs) c-. r r16 bf-.( bf-. bf-.) | 
+  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\! |
+  \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 ef 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 e16) c( a e) |
+  \grace { d32( ef f) } ef2\f\fermata r4 |
+  d2\p\fermata r4 | c8 r e 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 "|."
 }
 
 scoreAViolinII_introduzione = \relative c'' {
@@ -234,9 +288,56 @@ scoreAViolinII_introduzione = \relative c'' {
   } 
   
   \pageBreak
-  
 }
 
+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, e'>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 e) | e4( d8-.) r8 r4 |
+    a4.\f bf8\p bf bf | a2:8 a8-. r | af\f af \rep 4 af\p | g2.:8 |
+    
+    %17
+    a8 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) | b b b(\< 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 f>8-.\pp bf( af bf af bf) | af2 r4 | R2.^"1" | 
+    <f' d'>4.\fz <f d'>8(\p <f d'>-. <f d'>-.) | <g ef'>4.\fz <g ef'>8-.(\p <g ef'>-. <g ef'>-.) 
+    
+    %44
+    <f d'>4.\fz <f d'>8(\p <f d'>-. <f d'>-.) | <ef c'>4.\fz <ef c'>8-.(\p <ef c'>-. <ef c'>-.) | fs\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
+    
+    
+    
+    
+  }
+}
+
+
 scoreAViola_introduzione = \relative c' {
   \introduzione
   % Muziek volgt hier.
@@ -356,6 +457,7 @@ scoreACello_introduzione = \relative c {
 
 % Violin I score of all pieces
 
+%{
 \bookpart {
   \makeHdr \piece_introduzione \scriptum_introduzione
   \makeScoreVI \scoreAViolinI_introduzione
@@ -371,7 +473,14 @@ scoreACello_introduzione = \relative c {
   \makeHdr \piece_introduzione \scriptum_introduzione
   \makeScoreVII \scoreAViolinII_introduzione
 }
+%}
 
+\bookpart {
+  \makeHdr \piece_sonataI \scriptum_sonataI
+  \makeScoreVII \scoreAViolinII_sonataI
+}
+
+%{
 % Viola score of all pieces
 \bookpart {
   \makeHdr \piece_introduzione \scriptum_introduzione
@@ -390,3 +499,4 @@ scoreACello_introduzione = \relative c {
   \makeHdr \piece_introduzione \scriptum_introduzione
   \makeScoreFull \scoreAViolinI_introduzione \scoreAViolinII_introduzione \scoreAViola_introduzione \scoreACello_introduzione
 }
+%}