J.S. Bach: Die Kunst der Fuge (BWV 1080) - mark and colourize subject…

…s in Fugue VII Signed-off-by: Davide Madrisan <d.madrisan@proton.me>
madrisan · Mar 10, 2024 · 491d440 · 491d440
1 parent 6057401
commit 491d440
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 65 deletions.
diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/index.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/index.ly
@@ -52,10 +52,10 @@
 \markup { \indexItem #26 "Contrapunctus VI [per Diminutionem] in Stylo Francese" "25"
     "fugue with many stretto entries a 4 in Stylo Francese"
 }
-\markup { \indexItem #32 "Contrapunctus VII per per Augmentationem et Diminutionem" "31"
+\markup { \indexItem #33 "Contrapunctus VII per per Augmentationem et Diminutionem" "32"
   "fugue that uses augmented (doubling all note lengths) and diminished versions of the main subject and its inversion"
 }
-\markup { \indexItem #37 "Contrapunctus VIII" "36"
+\markup { \indexItem #39 "Contrapunctus VIII" "38"
   "triple fugue with three subjects, having independent expositions"
 }
 \markup { \indexItem #44 "Contrapunctus IX alla Duodecima" "43"

diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/list-of-subjects.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/list-of-subjects.ly
@@ -48,8 +48,8 @@ CommonSubjectV = {
 CommonSubjectVI = {
   \commonSettings
   | a'2^\markup \abs-fontsize #8 \italic  {
-      "dotted rhythm of V, also present in halving note lengths,"
-      "in recto and inversus forms"
+      "dotted rhythm of V, recto and inversus, also present in halving note lengths"
+      "without final dotted rhythm"
     }
     \once\override Stem.length = #5 d,4. e8
   | f4. g8 a2 | bes a4. g8 | f2~ f8. e16 f8. g16 | a8 s4.

diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/macros.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/macros.ly
@@ -24,7 +24,6 @@ unHighlightSubject = {
   \revert Tie.color
   \revert Stem.color
   \revert Beam.color
-  \revert Accidental.color
 }
 
 markWithColorExtended =
@@ -45,25 +44,29 @@ markWithColorExtended =
      %\revert Staff.LedgerLineSpanner.color
      \revert NoteHead.color
      \revert Dots.color
+     \revert Accidental.color
      \unHighlightSubject
      %\stopStaff
      %\startStaff
    #})
 
+subjectColor = #(x11-color 'darkblue)
+subjectInvColor = #(x11-color 'darkgreen)
+
 highlightSubject =
 #(define-music-function (music)
    (ly:music?)
    "Colour the given note(s) in dark blue"
    #{
-     \markWithColorExtended #(x11-color 'darkblue) #music
+     \markWithColorExtended \subjectColor #music
    #})
 
 highlightSubjectInv =
 #(define-music-function (music)
    (ly:music?)
    "Colour the given note(s) in dark green"
    #{
-     \markWithColorExtended #(x11-color 'darkgreen) #music
+     \markWithColorExtended \subjectInvColor #music
    #})
 
 highlightBACH =