J.S. Bach: Die Kunst der Fuge (BWV1080) - fix some "too many collidin…

…g rests" warnings Signed-off-by: Davide Madrisan <[email protected]>
madrisan · Sep 4, 2024 · 963f719 · 963f719
1 parent 3224cdc
commit 963f719
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - J.S. Bach: Das wohltemperierte Klavier – number of voices of the fugues as in Bach's manuscript
 - J.S. Bach: Die Kunst der Fuge (BWV1080) - automatic page number in the index using \page-ref
 
+### Fixed
+
+- J.S. Bach: Die Kunst der Fuge (BWV1080) - fix some "too many colliding rests" warnings
+
 ## [v56] - 2024-09-01
 
 ### Added

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
@@ -214,14 +214,14 @@ CanonI = {
 CanonII = {
   \commonSettings
   \time 12/8
-  | a'4.^\markup \abs-fontsize #8 \italic {
+  | \red a'4.^\markup \abs-fontsize #8 \italic {
       "subject of Canon II alla Decima is based again on the inverted main theme (red notes)"
     }
-    d,2. f4.~
-  | f a2. bes4.~
-  | bes a2. g4.~
-  | g f~ f4 e8 f4 g8
-  | a8 s4
+    \red d,2. \red f4.~
+  | f \red a2. \red bes4.~
+  | bes \red a2. \red g4.~
+  | g \red f~ f4 \red e8 \red f4 \red g8
+  | \red a8 s4
 }
 CanonIII = {
   \commonSettings

diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/08-contrapunctus-VIII.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/08-contrapunctus-VIII.ly
@@ -570,12 +570,12 @@ Alto = \context Voice = "two" \relative c' {
   | g4. f!8 e4 ees~
   | ees8 d c ees d4 d~
   | d
-    \staffLower
+    \staffLower \voiceThree
     \stemUp\tieUp
     bes8 bes bes4 g8 g
   | g4 bes8 bes e,4 a\rest
   %180
-  | \staffUpper
+  | \staffUpper \voiceTwo
     \stemDown\tieDown
     r8 f' f e e g g fis
   | fis a a g g4 bes!
@@ -585,7 +585,7 @@ Alto = \context Voice = "two" \relative c' {
   %185
   | \unHighlightSubject d } f e! d cis d b cis
   | d bes! a g a[ d16 c] bes a g8
-  | \staffLower
+  | \staffLower \voiceThree
     \stemUp\tieUp
     f4 e8 d e f g4~
   | g fis^\fermata f2\rest

diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/13-contrapunctus-XIII-II.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/13-contrapunctus-XIII-II.ly
@@ -244,7 +244,7 @@ Alto = \context Voice = "two" \relative c' {
     a
   | g8.*8/9[ e16*4/3 cis8.*8/9 e16*4/3] g8.*8/9[ bes16*4/3 a8.*8/9 g16*4/3]
   | e'2\fermata
-    \staffLower
+    \staffLower \voiceThree
     \stemUp\tieUp
     e,4\rest e
   %60