diff --git a/CHANGELOG.md b/CHANGELOG.md index d723df5..511ac30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ 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 +- J.S. Bach: Die Kunst der Fuge (BWV1080) - use a dashed-line as VoiceFollower style ### Fixed diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly index 6e3664e..6ce8457 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/01-contrapunctus-I.ly @@ -339,7 +339,7 @@ Bass = \context Voice = "four" \relative c { \column { \concat { \normal-text { "[H.A.Kellner] " } - "158 = Die(18) + Kunst(80) + der(26) + Fuga(34) = Johann(58) + Sebastian(86) + Bach(14)" + "Die(18) + Kunst(80) + der(26) + Fuga(34) = Johann(58) + Sebastian(86) + Bach(14) = 158" } \raise #0.8 \concat { @@ -502,6 +502,7 @@ Bass = \context Voice = "four" \relative c { \override TextScript.font-shape = #'italic \override TextScript.font-size = #-2 \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line } } \midi { \tempo 4=84 } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/02-contrapunctus-II.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/02-contrapunctus-II.ly index e9e8628..f9db6a3 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/02-contrapunctus-II.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/02-contrapunctus-II.ly @@ -101,7 +101,7 @@ Soprano = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*8 + | s1*8 | \stemUp \highlightSubjectFirst { d2^\markup \subject #'(0 . 0) #1 a' %10 @@ -225,7 +225,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*4 %5 | \highlightSubjectFirst { a2-\markup \subject #'(0 . 0) #1 d @@ -495,6 +494,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=140 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/03-contrapunctus-III.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/03-contrapunctus-III.ly index 8fdb586..ad4fed3 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/03-contrapunctus-III.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/03-contrapunctus-III.ly @@ -182,7 +182,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor %1 | \stemDown \highlightSubjectFirstInv { d2^\markup \scale #'(1 . -1) \subject #'(0 . 0) #1 a @@ -398,6 +397,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=115 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/04-contrapunctus-IV.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/04-contrapunctus-IV.ly index 3b3fffe..4d9ec1f 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/04-contrapunctus-IV.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/04-contrapunctus-IV.ly @@ -174,7 +174,6 @@ Soprano = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*4 %5 | \staffLower @@ -350,7 +349,6 @@ Tenor = \context Voice = "three" \relative c' { \voiceThree \mergeDifferentlyDottedOn \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | R1*4 | s1*6 | \stemDown @@ -743,6 +741,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=180 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/05-contrapunctus-V.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/05-contrapunctus-V.ly index 7870918..1fd12a4 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/05-contrapunctus-V.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/05-contrapunctus-V.ly @@ -270,7 +270,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | \override MultiMeasureRest.staff-position = #0 R1*3 | s1*6 @@ -574,6 +573,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=120 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/06-contrapunctus-VI.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/06-contrapunctus-VI.ly index d7cb48b..18e7297 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/06-contrapunctus-VI.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/06-contrapunctus-VI.ly @@ -227,7 +227,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*6 | \highlightSubjectFirstInv { d4^\markup \scale #'(1 . -1) \subject #'(2.5 . 0) #1 a8. b16 c8. d16 e4 | f e8. d16 c4~ c16 b c d @@ -488,6 +487,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=100 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/07-contrapunctus-VII.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/07-contrapunctus-VII.ly index 2814659..1bdc1a8 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/07-contrapunctus-VII.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/07-contrapunctus-VII.ly @@ -108,7 +108,6 @@ Soprano = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*2 | \highlightSubjectFirstInv { d'4_\markup \scale #'(1 . -1) \subject #'(0.8 . 0) #1 a8. b16 c8. d16 e4 | f e8. d16 cis4~ cis16 a b cis @@ -206,7 +205,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor %1 | \staffUpper \stemDown @@ -440,6 +438,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=100 } } 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 index 12889a6..022872a 100644 --- 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 @@ -231,7 +231,6 @@ Soprano = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo - \override VoiceFollower.color = \greyTextColor %1 | \staffLower \stemUp @@ -878,6 +877,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=140 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/09-contrapunctus-IX.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/09-contrapunctus-IX.ly index d3798ae..12fe564 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/09-contrapunctus-IX.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/09-contrapunctus-IX.ly @@ -328,7 +328,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | \override MultiMeasureRest.staff-position = #0 R1*14 %15 @@ -637,6 +636,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=220 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/10-contrapunctus-X.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/10-contrapunctus-X.ly index 3bb2757..663c71f 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/10-contrapunctus-X.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/10-contrapunctus-X.ly @@ -161,7 +161,6 @@ Sopran = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor \stemDown\tieUp %1 | \highlightSubjectFirst { r4_\markup \subject #'(0 . 0) #1 cis d a @@ -321,7 +320,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | R1*2 | f,2\rest \highlightSubjectFirst { f4\rest^\markup \subject #'(1 . 0) #1 fis | g d r bes' @@ -673,6 +671,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4=90 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/11-contrapunctus-XI.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/11-contrapunctus-XI.ly index 924ea69..d2a0f07 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/11-contrapunctus-XI.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/11-contrapunctus-XI.ly @@ -243,7 +243,6 @@ Sopran = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor %1 | \highlightSubjectFirst { r4_\markup \subject #'(0 . 0) #1 d a' g | r f e d @@ -514,7 +513,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | \override MultiMeasureRest.staff-position = #0 R1*8 | \override MultiMeasureRest.staff-position = #6 @@ -1109,6 +1107,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4 = 75 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-I.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-I.ly index fed5175..74b5b40 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-I.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-I.ly @@ -79,7 +79,6 @@ Sopran = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*3/2*9 %10 | \stemUp \highlightSubjectFirst { d2^\markup \subject #'(0 . 0) #1 a'1 @@ -166,7 +165,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | \override MultiMeasureRest.staff-position = #6 R1*3/2*4 %5 @@ -385,6 +383,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4 = 140 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-II.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-II.ly index d72394b..59c784c 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-II.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/12-contrapunctus-XII-II.ly @@ -82,7 +82,6 @@ Sopran = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*3/2*4 %5 | \highlightSubjectFirstInv { d2_\markup \scale #'(1 . -1) \subject #'(1.3 . 0) #1 a1 @@ -212,7 +211,6 @@ Alto = \context Voice = "two" \relative c' { Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | \override MultiMeasureRest.staff-position = #0 R1*3/2*9 %10 @@ -399,6 +397,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4 = 144 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/13-contrapunctus-XIII-I.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/13-contrapunctus-XIII-I.ly index 8e41832..077fbc6 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/13-contrapunctus-XIII-I.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/13-contrapunctus-XIII-I.ly @@ -102,7 +102,6 @@ Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch \override TupletBracket.bracket-visibility = ##f - \override VoiceFollower.color = \greyTextColor \partial 4 \highlightSubjectFirstInv { a'4_\markup \scale #'(1 . -1) \subject #'(1.5 . 0) #1 %1 | d d,~ \tuplet 3/2 { d8 e f } \tuplet 3/2 { e f g } @@ -400,6 +399,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4 = 135 } } 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 index 440b5ac..90f18b7 100644 --- 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 @@ -109,7 +109,6 @@ Alto = \context Voice = "two" \relative c' { \showStaffSwitch \override TupletBracket.bracket-visibility = ##f \override TupletNumber.transparent = ##t - \override VoiceFollower.color = \greyTextColor \partial 4 r4 | R1*3 %1 to 3 | r2 r4 \highlightSubjectFirstInv { a'_\markup \scale #'(1 . -1) \subject #'(1.2 . 0) #1 @@ -285,7 +284,6 @@ Bass = \context Voice = "four" \relative c { \showStaffSwitch \override TupletBracket.bracket-visibility = ##f \override TupletNumber.transparent = ##t - \override VoiceFollower.color = \greyTextColor \partial 4 d4\rest | \override MultiMeasureRest.staff-position = #0 R1*7 @@ -420,6 +418,12 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4 = 144 } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/14-contrapunctus-XIV.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/14-contrapunctus-XIV.ly index 4a45710..fbc6ed7 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/14-contrapunctus-XIV.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/parts/14-contrapunctus-XIV.ly @@ -294,7 +294,6 @@ Sopran = \context Voice = "one" \relative c'' { Alto = \context Voice = "two" \relative c' { \voiceTwo \showStaffSwitch - \override VoiceFollower.color = \greyTextColor | s1*10 | s2 \stemUp \highlightSubjectFirst { d^\markup \subject #'(0 . 0) #1 | a'2. g4 @@ -582,14 +581,12 @@ Alto = \context Voice = "two" \relative c' { | f4 } s2. \bar "|" %250 - } Tenor = \context Voice = "three" \relative c' { \voiceThree \showStaffSwitch \override MultiMeasureRest.staff-position = #6 - \override VoiceFollower.color = \greyTextColor | R1*5 | r2 \highlightSubjectFirst { a^\markup \subject #'(0 . 0) #1 | \staffUpper\stemDown @@ -1239,7 +1236,13 @@ Bass = \context Voice = "four" \relative c { } } } - \layout { } + \layout { + \context { + \Voice + \override VoiceFollower.color = #greyTextColor + \override VoiceFollower.style = #'dashed-line + } + } \midi { \tempo 4 = 120 } }