J.S. Bach: Goldberg Variationen - Integrate Bach's annotations of his…

… personal printed copy

Signed-off-by: Davide Madrisan <[email protected]>

CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 - J.S. Bach: Goldberg Variationen - Update pagination (again)
+- J.S. Bach: Goldberg Variationen - Integrate Bach's annotations of his personal printed copy
 
 ### Fixed
 

src/johann-sebastian-bach/goldberg-variationen-BWV988/JS-Bach-BWV988-Goldberg-Variationen.ly

@@ -130,11 +130,14 @@ BassLine = \relative {
   \include "./logo.ly"
 
   \markup {
-    \fill-line {
+    \fill-line \abs-fontsize #10 {
       \center-column {
         \null\null
         \fill-line {
-          \abs-fontsize #10 "Based on a previous work of Martin Straeten, J.D. Erickson, and Hajo Dezelski"
+          "Based on a previous work of Martin Straeten, J.D. Erickson, and Hajo Dezelski"
+        }
+        \fill-line {
+           "and on the Source gallica.bnf.fr / Bibliothèque nationale de France"
         }
         \null\null
       }

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-04-variatio.ly

@@ -91,7 +91,10 @@ Alto = \context Voice = "two" \relative c' {
   }
   \alternative {
     { g16[ e fis8] f\rest }
-    { g16\repeatTie[ e fis8] f\rest }
+    {
+      \shape #'((-1.5 . 0) (-0.8 . -0.5) (0 . 0) (0 . 0)) RepeatTie
+      g16\repeatTie[ e fis8] f\rest
+    }
   }
   \repeat volta 2 {
   | R1*3/8

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-06-variatio.ly

@@ -19,9 +19,9 @@ Sopran = \context Voice = "one" \relative c'' {
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
   %1
-  | s4.
+  | d'4.\rest
   \repeat volta 2 {
-  | a'4.~
+  | a~
   | a8[ g16 fis e d]
   | c4.~
   %5
@@ -47,7 +47,7 @@ Sopran = \context Voice = "one" \relative c'' {
     }
     {
   |   d,
-  |   \stemDown a''
+  |   << { \stemDown a'' } \\ { e'\rest } >>
     }
   }
   \break

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-10-variatio.ly

@@ -91,9 +91,12 @@ Tenor = \context Voice = "three" \relative c' {
   \override Rest.staff-position = #0
   \repeat volta 2 {
   %1
-  | s1*4
+  | \change Staff = "upper" \voiceTwo
+    \override MultiMeasureRest.staff-position = #-6
+    R1*4
   %5
-  | d2^\mordent d4.^\prallprall c16[ d ]
+  | \change Staff = "lower" \voiceThree
+    d2^\mordent d4.^\prallprall c16[ d ]
   | e4 c a c
   | a4 d d, c'
   | b4 ^\prall a8[ b] g[ b a c]

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-13-variatio.ly

@@ -4,6 +4,8 @@ Global = {
   \include "../global.ly"
 }
 
+greyTextColor = #(x11-color "dimgray")
+
 Sopran = \context Voice = "one" \relative c'' {
   \voiceOne
   \override MultiMeasureRest.staff-position = #0
@@ -28,8 +30,18 @@ Sopran = \context Voice = "one" \relative c'' {
   | a32-.[ d,( cis d e d cis d )] a[ d g, d' fis, d' e, d'] fis,[ d' a d fis, d' d, c']
   | b32-.[ d ( cis d e d cis d )] b[ d a d g, d' fis, d'] g,[ d' b d g, d' e, d']
   %15
-  | cis32-.[ g( fis g a g fis g)] e'-.[ cis( b cis d cis b cis)] g'-.[ e( d e a g fis e)]
-  | << { fis16[( cis) cis( d)] d[( g,) g( fis)] fis4 } \\ { r4 r8 cis d4 } >>
+  | \override Slur.color = \greyTextColor
+    cis32-.[ g( fis g a g fis g)] e'-.[ cis( b cis d cis b cis)]
+    g'-.[
+    \once\override Slur.extra-offset = #'(0 . 0.5)
+    e( d e a g fis e)]
+  | << {
+      \override Slur.color = \greyTextColor
+      fis16[( cis) cis( d)] d[( g,) g( fis)] fis4
+    } \\ {
+      r4 r8 cis d4
+    } >>
+    \revert Slur.color
   }
   \repeat volta 2 {
   | \slurDown
@@ -43,7 +55,7 @@ Sopran = \context Voice = "one" \relative c'' {
   | dis32-.[ a' ( g a b a g a )] b,-.[ g' ( fis g a g fis g )] a,-.[ fis'( e fis g a g fis )]
   | g16[( dis) dis( e)] e[( a,) a( g )] g8^~\mordent[ g32 b c d]
   %25
-  | \slurDown e'32[ f e dis e8~] e16[ a, \once\stemUp \appoggiatura b32 a16 g]
+  | \slurDown e32[ f e dis e8~] e16[ a, \once\stemUp \appoggiatura b32 a16 g]
     \once\stemUp \appoggiatura a32 g16[ fis! fis e']
   | d32[ e d cis d8~] d16[ g, \once\stemUp \appoggiatura a32 g16 f]
     \once\stemUp \appoggiatura g32 f16[ e e d'] \slurNeutral
@@ -54,6 +66,8 @@ Sopran = \context Voice = "one" \relative c'' {
   | e32-.[ c( b c d c b c )] d-.[ b( a b c b a b )] cis-.[ bes( a bes c bes a g)]
   | fis32-.[ c'( b c d c b c )] fis-.[ c( b c d c b c )] a'-.[ c,( b c d c b a)]
   | b16[( fis) fis( g)] g[( c,) c( b)] b4
+    \override Score.TextMark.self-alignment-X = #CENTER
+    \textEndMark \markup { \musicglyph "scripts.ufermata" }
   }
   \fine
 }
@@ -160,6 +174,8 @@ Bass = \context Voice = "four" \relative c' {
   | c,8[ e f fis] g[ fis16 e]
   | d4. fis8[ e d]
   | g,4 e\rest g
+    \tweak direction #DOWN
+    \textEndMark \markup { \musicglyph "scripts.dfermata" }
   }
   \fine
 }

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-14-variatio.ly

@@ -19,17 +19,17 @@ Sopran = \context Voice = "one" \relative c {
   | b8[ g b d g b,]
   | c[ e g c e, g]
   | fis[ a d, fis a c]
-  | b[ g b d] g r
-  | \clef "treble" r16 b'32[ a b16] r r e,32[ d e16] r r a,32[ g a16] r
+  | b[ g b d] \clef "treble" g r
+  | r16 b'32[ a b16^.] r r e,32[ d e16^.] r r a,32[ g a16^.] r
   %10
-  | r a'32[ g a16] r r d,32[ cis d16] r r g,32[ fis g16] r
-  | r g'32[ fis g16] r r b,32[ a b16] r r e,32[ d e16] r
-  | r \clef "bass" g,32[ fis g16] r r cis,32[ b cis16] r r g32[ fis g16] r \clef "treble"
+  | r a'32[ g a16^.] r r d,32[ cis d16^.] r r g,32[ fis g16^.] r
+  | r g'32[ fis g16^.] r r b,32[ a b16^.] r r e,32[ d e16^.] r
+  | r \clef "bass" g,32[ fis g16^.] r r cis,32[ b cis16^.] r r g32[ fis g16^.] r \clef "treble"
   | r32 d''[ e fis a fis e d] r d[ e fis a fis e d] r d[ e fis a fis e d]
   | b'8-. r \clef "bass" f,-. r e-. r \clef "treble"
   %15
-  | r16 e'32[ d e16 a32 g] a16[ d,32 cis d16 g32 fis] g16[ cis,32 b cis16 fis32 e]
-  | fis16[ d cis d] fis32[ e d16 a'32 g fis16] d'8 r
+  | r16 e'32[ d e16^. a32 g] a16^.[ d,32 cis d16^. g32 fis] g16^.[ cis,32 b cis16^. fis32 e]
+  | fis16^.[ d cis d] fis32[ e d16 a'32 g fis16] d'8 r
   }
   \repeat volta 2 {
   | fis16[ a d a] fis[ a d, fis] a[ fis g a]
@@ -72,15 +72,15 @@ Bass = \context Voice = "four" \relative c' {
   | e[ c g c] e[ c g' e] c[ d c b]
   | a[ fis d fis] a[ fis d' a] fis[ a g fis]
   | g[ d b d] g[ d b' g] d'[ c b a]
-  | g8 r16 g'32[ fis g16] r r cis,32[ b cis16] r r fis,32[ e]
+  | g8 r16 g'32[ fis g16^.] r r cis,32[ b cis16^.] r r fis,32[ e]
   %10
-  | fis16 r r fis'32[ e fis16] r r b,32[ a b16] r r e,32[ d]
-  | e16 r r e'32[ d e16] r r g,32[ fis g16] r r cis,32[ b]
-  | cis16 r r \clef "bass" e,32[ d e16] r r a,32[ g a16] r r fis32[ e]
+  | fis16^. r r fis'32[ e fis16^.] r r b,32[ a b16^.] r r e,32[ d]
+  | e16^.	 r r e'32[ d e16^.] r r g,32[ fis g16^.] r r cis,32[ b]
+  | cis16^. r r \clef "bass" e,32[ d e16^.] r r a,32[ g a16^.] r r fis32[ e]
   | fis8-. r \clef "treble" d'''^. r c^. r \clef "bass"
   | r32 g,[ a b d b a g] r g[ a bes d bes a g] r gis[ a b d b a gis]
   %15
-  | a16[ cis32 b cis16 fis,32 e] fis16[ b32 a b16 e,32 d] e16[ a32 g a16 d,32 cis]
+  | a16^.[ cis32 b cis16^. fis,32 e] fis16^.[ b32 a b16^. e,32 d] e16^.[ a32 g a16^. d,32 cis]
   | d32[ e fis g  a g fis e] d16[ fis a, d] d,8 r
   }
   \repeat volta 2 {

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-18-variatio.ly

@@ -181,7 +181,7 @@ Bass = \context Voice = "four" \relative c' {
     composer = ##f % "Johann Sebastian Bach"
     opus = ##f % "BWV 988"
     title = \markup { \smallCaps "Variatio 18 a 1 Clav." }
-    subtitle = \markup { "Canone alla Sesta" }
+    subtitle = \markup { "Canone alla Sexta" }
     subsubtitle = ##f
   }
   \layout { }

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-25-variatio.ly

@@ -14,12 +14,15 @@ Sopran = \context Voice = "one" \relative c'' {
   %1
   | r16 d[ \once\stemUp \grace es d32 cis d16] \once\stemUp \appoggiatura d bes'8~[ bes32 a g f]
     es16[ d8 cis!16~]
-  | cis[ c \once\stemUp \grace d! c32 b c16] \once\stemUp \appoggiatura f as8~[ as32 g f es] des16[ c8 b!16~]
-  | b[ bes \once\stemUp \appoggiatura c bes32 a bes16] fis'[ g8 cis,16~] cis[ d8 g,16]
+  | cis[ c \once\stemUp \grace d! c32 b c16]
+    \once\stemUp \once\slurDown \appoggiatura c as'8~[ as32 g f es] des16[ c8 b!16~]
+  | b[ bes \once\stemUp \grace c bes32 a bes16] fis'[ g8 cis,16~] cis[ d8 g,16]
   | g[ a32 bes a8] r4 r
   %5
-  | r16 d,[ \grace ees d32 cis d16] d'8~[ d32 c! bes a] g[ f as16~ as32 d, f16~]
-  | f[ es \appoggiatura f es32 d es16] es'8~[ es32 d c bes] a[ g bes16~ bes32 e, g16~]
+  | r16 d,[ \grace ees d32 cis d16]
+    \once\stemUp \once\slurUp \appoggiatura d16 d'8~[ d32 c! bes a] g[ f as16~ as32 d, f16~]
+  | f[ es \grace f es32 d es16]
+    \once\stemUp \once\slurUp \appoggiatura es16 es'8~[ es32 d c bes] a[ g bes16~ bes32 e, g16~]
   | g[ fis \grace g16 fis32 e fis16]
     \tuplet 3/2 { b[ c es!] } \tuplet 3/2 { cis[d fis,!] }
     \tuplet 3/2 { bes[ a d,] } \tuplet 3/2 { es[ b c~] }
@@ -30,8 +33,9 @@ Sopran = \context Voice = "one" \relative c'' {
   | b[ bes~ bes32 a gis16~] gis[ a~ a32 d, c bes] c[ a bes g! f e f d']
   | f,\prallprall[ e f16 e8] r32 d[ cis d e f g a] bes[ a d16~ d32 cis e16~]
   | e[ a, \once\stemUp \grace bes a32 gis a16] \once\stemUp \appoggiatura a a'8~[ a32 bes (a gis )]
-    a-.[ d, c bes c-. c (bes a )]
-  | a16[ bes \once\stemUp \grace c bes32 a bes16] bes'8~[ bes32 es,! d cis] d[ c'! b8 d,16]
+    a-.[ d,( c bes) c-. c (bes a )]
+  | a16[ bes \once\stemUp \grace c bes32 a bes16]
+    \once\stemUp \appoggiatura bes bes'8~[ bes32 es,! d cis] d[ c'! b8 d,16]
   %15
   | cis[ bes!8 a16] es'![ d~ d32 cis! e g] bes16[ a~ a64 g f e d32 cis]
   }
@@ -41,23 +45,23 @@ Sopran = \context Voice = "one" \relative c'' {
   }
   \break
   \repeat volta 2 {
-  | r16 a'[ \once\stemUp \appoggiatura bes a32 gis a16] es![ d~ d32 e fis g] a[ c, es8 d16~]
-  | d[ f \once\stemUp \appoggiatura g f32 es f16] as,[ g~ g32 a b c] d[ f, as8 g16~]
+  | r16 a'[ \once\stemUp \grace bes a32 gis a16] es![ d~ d32 e fis g] a[ c, es8 d16~]
+  | d[ f \once\stemUp \grace g f32 es f16] as,[ g~ g32 a b c] d[ f, as8 g16~]
   %20
   | g[ c8 b16] c32[ es des8 c16~] c32[ f es16~ es32 f es d]
   | es[ a! ( bes16 es, d )] r4 r
-  | r16 bes[ \once\stemUp \appoggiatura ces bes32 as bes16] bes[ bes'~ bes32 ces bes as]
+  | r16 bes[ \once\stemUp \grace ces bes32 as bes16] bes[ bes'~ bes32 ces bes as]
     bes16[ des,~ des32 ces bes16~]
-  | bes[ ces \once\stemUp \appoggiatura des16 ces32 bes ces16] ces[ ces'~ ces32 fes, es d] es[ des' c8 es,16]
+  | bes[ ces \once\stemUp \grace des16 ces32 bes ces16] ces[ ces'~ ces32 fes, es d] es[ des' c8 es,16]
   | d![ ces8 bes16] fes'[ es~ es32 d f as] ces16[ bes~ bes64 as ges f es32 d]
   %25
   | d8([ es)] r4 r
-  | r16 g,[ \appoggiatura as g32 fis g16] \appoggiatura g16 es'8~[ es32 d c bes] as!16[ g8 fis!16]~
+  | r16 g,[ \grace as g32 fis g16] \appoggiatura g16 es'8~[ es32 d c bes] as!16[ g8 fis!16]~
   | fis[ f \grace g16 f32 e f16] des'8~[ des32 c bes as] ges16[ f8 e!16~]
-  | e[ es \appoggiatura f es32 d es16] c'8~[ c32 bes as g] fis16[ es'~ es32 d cis16]
+  | e[ es \grace f es32 d es16] c'8~[ c32 bes as g] fis16[ es'~ es32 d cis16]
   | \slurNeutral cis[(d ) es,( d)] r32 e[ fis g a bes c d] es![ d g16~ g32 fis a16~]
   %30
-  | a[ d, \once\stemUp \appoggiatura es d32 cis d16] d'8~[ d32 c! bes a] g[ d' f,16~ f32 es d c]
+  | a[ d, \once\stemUp \grace es d32 cis d16] d'8~[ d32 c! bes a] g[ d' f,16~ f32 es d c]
   | d32[ as' g f es d c b] c[ f es d c bes a! g] a[ d c bes a g fis e]
   | fis[ bes a g fis e d cis] d[ g fis e d c bes a] bes[ es d c bes a g fis]
   }

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-29-variatio.ly

@@ -21,9 +21,9 @@ Sopran = \context Voice = "one" \relative c'' {
   | g8\rest \repeat unfold 5 { a16\rest e }
   | g8\rest \repeat unfold 4 { a16\rest d, } a'\rest c,!
   | b16 f'\rest f8\rest \stemNeutral
-    \undo\omit TupletNumber \tupletDown\tuplet 3/2 { b,16\rest a[ b ] } \tuplet 3/2 { c[ b a] }
+    \undo\omit TupletNumber \tuplet 3/2 { b,16\rest a[ b ] } \tuplet 3/2 { c[ b a] }
     \omit TupletNumber \tuplet 3/2 { b[ a g ]} \tuplet 3/2 { e'[ d c] }
-  | \tuplet 3/2 { d r g, } \tuplet 3/2 { fis[ c ] r }
+  | \undo\omit TupletNumber \tupletUp \tuplet 3/2 { d r g, } \omit TupletNumber \tuplet 3/2 { fis[ c ] r }
     \tuplet 3/2 { r r g' } \tuplet 3/2 { a[ fis ] r }
     \tuplet 3/2 { r r b } \tuplet 3/2 { cis[ a] r }
   %10
@@ -51,7 +51,8 @@ Sopran = \context Voice = "one" \relative c'' {
   }
   \break
   \repeat volta 2 {
-  | \stemNeutral \tuplet 3/2 { r16 r b'' } \tuplet 3/2 { a[ fis] r }
+  | \stemNeutral
+    \undo\omit TupletNumber\tupletUp \tuplet 3/2 { r16 r b'' } \omit TupletNumber  \tuplet 3/2 { a[ fis] r }
     \tuplet 3/2 { r r g } \tuplet 3/2 { fis[ d] r }
     \tuplet 3/2 { r r e } \tuplet 3/2 { d[ b] r }
   | \tuplet 3/2 { r r e } \tuplet 3/2 { d[ b] r }
@@ -73,8 +74,9 @@ Sopran = \context Voice = "one" \relative c'' {
     \tuplet 3/2 { dis[ c! b] } \tuplet 3/2 { a[g fis] }
   | \stemUp e[ e'] f\rest e f\rest c f\rest c f\rest g, f'\rest g, \clef "bass"
   %25
-  | \stemNeutral \tuplet 3/2 { r e,[ f] } \tuplet 3/2 { fis[ g gis] }
-    \tuplet 3/2 { r b[ c] } \tuplet 3/2 { d c b ] } \clef "treble"
+  | \stemNeutral
+    \undo\omit TupletNumber \tuplet 3/2 { r e,[ f] } \tuplet 3/2 { fis[ g gis] }
+    \omit TupletNumber \tuplet 3/2 { r b[ c] } \tuplet 3/2 { d c b ] } \clef "treble"
     \tuplet 3/2 { c[ d e] } \tuplet 3/2 { fis[ g a] } \clef "bass"
   | \tuplet 3/2 { r d,,[ es] } \tuplet 3/2 { e[ f fis] }
     \tuplet 3/2 { r a[ b] } \tuplet 3/2 { c[ b a] } \clef "treble"