J.S. Bach: Goldberg Variationen - Mark with colors the Aria bass theme and the folksongs in 988/30

Signed-off-by: Davide Madrisan <d.madrisan@proton.me>

Author: madrisan

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - J.S. Bach: Goldberg Variationen - Integrate Bach's annotations of his personal printed copy
 - J.S. Bach: Goldberg Variationen - Add Bach's manuscript image of BWV1087
 - J.S. Bach: Goldberg Variationen - Add an index page
+- J.S. Bach: Goldberg Variationen - Mark with colors the Aria bass theme and the folksongs in 988/30
 
 ### Fixed
 

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

@@ -137,7 +137,7 @@ BassLine = \relative {
           "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"
+          "and on the Source gallica.bnf.fr / Bibliothèque nationale de France"
         }
         \null\null
       }

src/johann-sebastian-bach/goldberg-variationen-BWV988/Makefile.am

@@ -31,6 +31,7 @@ EXTRA_DIST = JS-Bach-BWV988-Goldberg-Variationen.ly \
 	     index.ly \
 	     last-page-jsbach-manuscript-bwv1087.png \
 	     logo.ly \
+	     macros.ly \
 	     parts/bach-goldberg-variationen-00-aria.ly \
 	     parts/bach-goldberg-variationen-01-variatio.ly \
 	     parts/bach-goldberg-variationen-02-variatio.ly \

src/johann-sebastian-bach/goldberg-variationen-BWV988/parts/bach-goldberg-variationen-00-aria.ly

@@ -4,6 +4,8 @@ Global = {
   \include "../global.ly"
 }
 
+\include "../macros.ly"
+
 staffLower = \change Staff = "lower"
 staffUpper = \change Staff = "upper"
 
@@ -131,10 +133,10 @@ Tenor = \context Voice = "three" \relative c' {
   | g8\rest e g4 fis8^\prall e
   %20
   | dis e fis2
-  | c8\rest a g^\prallprall fis g4
-  | b8\rest a g^\prallprall fis g b
+  | c8\rest a g^\prallprall fis \highlightTheme { g4 }
+  | b8\rest \highlightTheme { \revert Beam.color a } g^\prallprall fis g b
   | g4\rest g\rest g8\rest dis
-  | e4 s2
+  | \highlightTheme { \unHighlightColor e4 } s2
   %25
   | b'4\rest c\rest a~
   | a8 fis \grace e16 d8[ e16 fis] g[ fis g8~]
@@ -147,46 +149,54 @@ Bass = \context Voice = "four" \relative c' {
   \stemNeutral
   \repeat volta 2 {
   %1
-  |\stemDown g2.
+  | \once\override Staff.TextScript.extra-offset = #'(-0.4 . -0.6)
+    \stemDown \highlightTheme { g2.
+      _\markup \tiny \italic {
+        \line {
+          \concat {
+            " " \bulletTheme " Bass theme, known as " \italic "“Ruggiero's bass”."
+           }
+         }
+       }
   | fis
   | e
-  | d2_~ d8 c
+  | \revert Tie.color d2_~ } d8 c
   %5
-  | b2.
-  | c2~ c8 d
-  | e8 c8 d2
-  | g,4. d'8[ e8.\prallmordent fis16]
-  | g2._~
+  | \highlightTheme { b2.
+  | \revert Tie.color c2~ } c8 d
+  | e8 c8 \highlightTheme { d2
+  | g,4. } d'8[ e8.\prallmordent fis16]
+  | \highlightTheme { \revert Tie.color g2._~ }
   %10
-  | g4 fis8^\prallprall e fis b
-  | e,4. e8 fis g
-  | a4. b8 a g
-  | fis2.
+  | g4 \highlightTheme { \revert Beam.color \revert Script.color fis8^\prallprall } e fis b
+  | \highlightTheme { e,4. } e8 fis g
+  | \highlightTheme { a4. } b8 a g
+  | \highlightTheme { fis2.
   | g
   %15
   | a
-  | d,
+  | d, }
   }
   \repeat volta 2 {
-  | d'2 c4
-  | b4. a8 b4
-  | c4. b8 a4
+  | \highlightTheme { d'2 } c4
+  | \highlightTheme { b4. } a8 b4
+  | \highlightTheme { c4. } b8 a4
   %20
-  | b4. a8 g fis
+  | \highlightTheme { b4. } a8 g fis
   | e2 d4
   | c2 b4
-  | a8 c b a b4
-  | e8 b e, b' e d
+  | a8 c \highlightTheme { \revert Beam.color b } a b4
+  | \highlightTheme { \revert Beam.color e8 } b e, b' e d
   %25
-  | c2.
+  | \highlightTheme { c2.
   | b
-  | a4. g8 fis e
-  | \stemUp d8 a' d c b a
-  | \stemDown g8 d' g f e d
+  | a4. } g8 fis e
+  | \stemUp \highlightTheme { \revert Beam.color d8 } a' d c b a
+  | \stemDown \highlightTheme { \revert Beam.color g8 } d' g f e d
   %30
-  | c g' c b a g
-  | fis d g b d d,
-  | g4. d8 \stemUp \once\override Script.padding = #.8 g,4
+  | \highlightTheme { \revert Beam.color c } g' c b a g
+  | fis \highlightTheme { \revert Beam.color d } g b d d,
+  | \highlightTheme { g4. } d8 \stemUp \once\override Script.padding = #.8 g,4
     \tweak direction #DOWN
     \textEndMark \markup { \musicglyph "scripts.dfermata" }
   }

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

@@ -4,8 +4,7 @@ Global = {
   \include "../global.ly"
 }
 
-staffLower = \change Staff = "lower"
-staffUpper = \change Staff = "upper"
+\include "../macros.ly"
 
 Sopran = \context Voice = "one" \relative c'' {
   \voiceOne
@@ -16,7 +15,8 @@ Sopran = \context Voice = "one" \relative c'' {
     \partial 8 { d8\rest }
   %1
   | b2\rest d4\rest d8\rest d,
-  | g8[ a b c] d[ c16 b] a8 r
+  | \highlightMelodySecond { \unHighlightColor g8[ } a b c] d[ c16 b]
+    \highlightMelodySecond { \unHighlightColor a8 } r
   | d4 d e e
   | d8[ e d c] b\prall[ a] g4
   %5
@@ -52,8 +52,8 @@ Alto = \context Voice = "two" \relative c' {
     \partial 8 { e8\rest }
   %1
   | R1
-  | g4 g a a
-  | g8 a g f e d c b'
+  | \highlightMelodySecond { g4 g a a
+  | g8 a g f e d \unHighlightColor c } b'
   | a g a fis g4 g8 d
   %5
   | \stemUp g8 a b c d8 c16 b
@@ -95,21 +95,23 @@ Tenor = \context Voice = "three" \relative c {
   \override Rest.staff-position = #0
   \repeat volta 2 {
   %1
-    \partial 8 { d8 }
-  | g a b c d[ c16 b] a8[ g16 a]
+    \partial 8 { \highlightMelodyFirst d8 }
+  | \highlightMelodyFirst { g a b c d[ c16 b] \unHighlightColor a8[ } g16 a]
   | b8 a g2 fis8\prall[ e16 fis]
-  | g4 c8\rest d c b a g
-  | fis4~\prallprall fis16 e32 fis d8~ d4 c'\rest
+  | g4 c8\rest \highlightMelodyThird { d c b a g
+  | fis4~\prallprall fis16 e32 fis \unHighlightColor d8~ } d4 c'\rest
   %5
-  | \staffUpper\stemDown g'4 g a a
-  | \shiftOff g8[ a g fis] e[ \staffLower\stemUp d] cis d\rest
+  | \change Staff = "upper" \stemDown g'4 g a a
+  | \shiftOff g8[ a g fis] e[
+    \change Staff = "lower"
+    \stemUp d] cis d\rest
   | fis, g a fis g fis e d
   | cis d e cis d4 d8
   }
   \repeat volta 2 {
     \partial 8 { fis' }
   | d[ fis d fis] g[ d d g]
-  %10
+  %10s
   | e r r4 fis fis
   | g g fis8[g fis e]
   | dis[ e16 fis] \clef bass b,4~ b8[ a16 b] g8[a16 b]
@@ -127,12 +129,25 @@ Bass = \context Voice = "four" \relative c {
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
   \repeat volta 2 {
-    \partial 8 { g8\rest }
+    \partial 8 {
+      \once\override Staff.TextScript.extra-offset = #'(-4 . -0.6)
+      f,8\rest
+      _\markup \tiny \italic {
+        \line {
+          \concat {
+            " " \bulletTheme " Theme | German folksongs: "
+            " " \bulletMelodyFirst " Ich bin so lang nicht bei dir g’west "
+            " " \bulletMelodySecond " Kraut und Rüben"
+            " " \bulletMelodyThird " Mein junges Leben hat ein End"
+          }
+        }
+      }
+    }
   %1
-  | g'2 fis
+  | \highlightTheme { g'2 fis
   | e d4. c8
   | b2 c
-  | d g,4 b8\rest b'16[ a]
+  | d g,4 } b8\rest b'16[ a]
   %5
   | g8[ fis16 g] e8[ d16 e] fis4. b8
   | e,4. fis16[ g] a4~ a16[ g fis e]
@@ -158,6 +173,16 @@ Bass = \context Voice = "four" \relative c {
   \fine
 }
 
+forceBreaks = {
+  % page 1
+  \partial 8 { s8 }
+  \repeat unfold 2 { s1\noBreak } s1\break\noPageBreak
+  \repeat unfold 2 { s1\noBreak } s1\break\noPageBreak
+  s1 s2. s8\noBreak \partial 8 { s8 }\noBreak s1\noBreak s1\break\noPageBreak
+  \repeat unfold 2 { s1\noBreak } s1\break\noPageBreak
+  \repeat unfold 2 { s1\noBreak } s2 s4.\break\pageBreak
+}
+
 \score {
   \new PianoStaff
   <<
@@ -176,6 +201,7 @@ Bass = \context Voice = "four" \relative c {
       \Tenor
       \Bass
     >>
+    \new Devnull \forceBreaks
   >>
   \header {
     composer = ##f % "Johann Sebastian Bach"