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 6ce8457..25df3e7 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 @@ -5,6 +5,7 @@ Global = { } \include "../macros.ly" +\include "../macros-fugues-structure.ly" Soprano = \context Voice = "one" \relative c'' { \voiceOne @@ -476,16 +477,7 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "Four-voice fugue on principal subject" } - \line \normal-text \tiny \with-color #(rgb-color 1.0 1.0 1.0) { - \on-color \expositionColor \pad-markup #0.8 "Exposition ASBT" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition ASBT" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "S" - \on-color \subjectPresentationColor \pad-markup #0.8 "B" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \endColor \pad-markup #0.8 "T" - } + \fugueStructureBoxesI } } } 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 35b63bf..4d9ff88 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 @@ -525,19 +525,7 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "Four-voice fugue on principal subject, accompanied by a “French” style dotted rhythm" } - \line \normal-text \tiny \with-color #(rgb-color 1.0 1.0 1.0) { - \on-color \expositionColor \pad-markup #0.8 "Exposition BTAS" % bars 1-17 - \on-color \episodeColor \pad-markup #1 "1" % bars 17-22 - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition ASBT" % bars 23-42 - \on-color \episodeColor \pad-markup #1 "2" % bars 42-44 - \on-color \subjectPresentationColor \pad-markup #0.8 "SAB" % bars 45-57 - \on-color \episodeColor \pad-markup #1 "3" % bars 57-60 - \on-color \subjectPresentationColor \pad-markup #0.8 "B" % bars 61-65 - \on-color \episodeColor \pad-markup #1 "4" % bars 65-68 - \on-color \subjectPresentationColor \pad-markup #0.8 "T" % bars 69-73 - \on-color \episodeColor \pad-markup #1 "5" % bars 73-78 - \on-color \endColor \pad-markup #0.8 "S" % bars 79- - } + \fugueStructureBoxesII } } } 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 ad4fed3..2f0a688 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 @@ -380,20 +380,7 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "Four-voice fugue on principal subject in inversion, employing intense chromaticism" } - \line \normal-text \tiny \with-color #(rgb-color 1.0 1.0 1.0) { - \on-color \expositionColor \pad-markup #0.8 "Exposition TASB" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "S" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "T" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "T" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "S" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "BAST" - \on-color \endColor \pad-markup #0.8 "Coda" - } + \fugueStructureBoxesIII } } } 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 4d9ec1f..e358d4f 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 @@ -725,19 +725,7 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "Four-voice fugue on principal subject in inversion, employing counter-subjects" } - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition SATB" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition SATB" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "BT" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "AS" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "T•B•SA" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "TA" - } + \fugueStructureBoxesIV } } } 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 1fd12a4..47fd0b5 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 @@ -555,21 +555,7 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "Four-voice fugue with many stretto entries" } - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition ABST" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition STBA" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto BS" - \on-color \subjectStrettoColor \pad-markup #0.8 "TA" - \on-color \subjectStrettoColor \pad-markup #0.8 "BT" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectStrettoColor \pad-markup #0.8 "SA" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectStrettoColor \pad-markup #0.8 "ST" - \on-color \subjectStrettoColor \pad-markup #0.8 "TA" - \on-color \endColor \pad-markup #0.8 "BA" - } + \fugueStructureBoxesV } } } 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 18e7297..239e329 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 @@ -465,25 +465,7 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "[per Diminutionem] in Stilo Francese" } - \line \normal-text \tiny \with-color \white { - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto BSA" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "TAS" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectStrettoColor \pad-markup #0.8 "BTS" - \on-color \subjectPresentationColor \pad-markup #0.8 "T" - \on-color \subjectStrettoColor \pad-markup #0.8 "AT" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectStrettoColor \pad-markup #0.8 "TASBT" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "A" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectStrettoColor \pad-markup #0.8 "BT" - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectStrettoColor \pad-markup #0.8 "SAT" - \on-color \episodeColor \pad-markup #1 "7" - \on-color \subjectStrettoColor \pad-markup #0.8 "TSA" - } + \fugueStructureBoxesVI } } } 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 1bdc1a8..a44bc9d 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 @@ -425,16 +425,7 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "per Augmentationem et Diminutionem" } - \line \normal-text \tiny \with-color \white { - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto TSABAT" - \on-color \subjectStrettoColor \pad-markup #0.8 "SAT" - \on-color \subjectStrettoColor \pad-markup #0.8 "TB" - \on-color \subjectStrettoColor \pad-markup #0.8 "ATSBA" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "ATSSAATB" - \on-color \subjectStrettoColor \pad-markup #0.8 "SAAT" - \on-color \endColor \pad-markup #0.8 "Coda" - } + \fugueStructureBoxesVII } } } 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 022872a..7d2fc5a 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 @@ -224,7 +224,8 @@ Soprano = \context Voice = "one" \relative c'' { | a d g,2%\prallmordent %185 | f4 g a8 g a4 - | \unHighlightSubject d,1~ } + | \once\override Tie.staff-position = #-3 + \unHighlightSubject d,1~ } | d16[ b cis d] e f g e cis4.\trill d8 | d2\fermata b'\rest } @@ -846,34 +847,9 @@ Bass = \context Voice = "four" \relative c { subsubtitle = \markup { \center-column { \line { "[Triple Fugue]" } - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 A1 B1 S1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto A1 B1" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" - } - \line \normal-text \tiny \with-color \white { - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 S1 A2 B1 S2 A1 B2" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 S2" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2" - } - \line \normal-text \tiny \with-color \white { - \on-color \thirdExpositionColor \pad-markup #0.8 "Exposition 3 A3 B3 S3" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2 B3" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1 B2 S3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 S2 A3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 S2 A3" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 S1 B3" - } + \fugueStructureBoxesVIII_lineone + \fugueStructureBoxesVIII_linetwo + \fugueStructureBoxesVIII_linethree } } } 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 12fe564..05f0749 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 @@ -614,26 +614,7 @@ Bass = \context Voice = "four" \relative c { Contrapunctus IX } subsubtitle = \markup { - \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition A1 S1 B1 T1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 T1" - \on-color \episodeColor \pad-markup #1 "2" % F major - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A1" % bar 45 - \on-color \episodeColor \pad-markup #1 "3" % D minor - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 B1" % bar 59 - \on-color \episodeColor \pad-markup #1 "4" % A minor - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A1" % bar 73 - \on-color \episodeColor \pad-markup #1 "5" % D minor - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 S1" % bar 89 - \on-color \episodeColor \pad-markup #1 "6" % G minor - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A1" % bar 99 - \on-color \episodeColor \pad-markup #1 "7" % D minor - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 T1" % bar 119 - \on-color \endColor \pad-markup #0.8 "Coda" - } - } + \fugueStructureBoxesIX } } \layout { 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 663c71f..2a259ed 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 @@ -646,28 +646,8 @@ Bass = \context Voice = "four" \relative c { } subsubtitle = \markup { \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 A1 T1 B1 S1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto A1 T1" % bar 14-17 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 S2 T2 B3 A2" % bar 23-38 - \on-color \episodeColor \pad-markup #1 "2" - } - \line \normal-text \tiny \with-color \white { - \on-color \subjectPresentationColor \pad-markup #0.8 "T1 A2" % bar 44 - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1 B2" % bar 52 - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 S1" % bar 66 - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 A1 B1" % bar 75 - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 A1 S1" % bar 84 - \on-color \episodeColor \pad-markup #1 "7" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 T1 S2" % bar 103 - \on-color \episodeColor \pad-markup #1 "8" - \on-color \subjectPresentationColor \pad-markup #0.8 "T1 A1" % bar 115 - } + \fugueStructureBoxesX_lineone + \fugueStructureBoxesX_linetwo } } } 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 d2a0f07..5e7f29f 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 @@ -1075,35 +1075,9 @@ Bass = \context Voice = "four" \relative c { } subsubtitle = \markup { \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1/a A1 S1 B1 T1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1" % bar 22 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 A2 T2 B2 S2" % bar 27 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2" % bar 67 - } - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1/b T1 S1 B1 A1" % bar 71 - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 T3" % bar 89 - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 S3" % bar 93 - \on-color \subjectPresentationColor \pad-markup #0.8 "A1" % bar 101 - \on-color \subjectPresentationColor \pad-markup #0.8 "A3 T2" % bar 105 - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 A3" % bar 113 - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" % bar 132 - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A3" % bar 136 - \on-color \episodeColor \pad-markup #1 "4" - } - \line \normal-text \tiny \with-color \white { - \on-color \subjectPresentationColor \pad-markup #0.8 "A3 T1 S2" % bar 145 - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1 S1" % bar 158 - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 T1" % bar 164 - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 T3 A1" % bar 174 - \on-color \subjectPresentationColor \pad-markup #0.8 "B3 T2 S2" % bar 179 - } + \fugueStructureBoxesXI_lineone + \fugueStructureBoxesXI_linetwo + \fugueStructureBoxesXI_linethree } } } 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 74b5b40..2fc30bb 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 @@ -371,15 +371,7 @@ Bass = \context Voice = "four" \relative c { } subsubtitle = \markup { \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 B1 T1 A1 S1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 S2 A2 T2 B2" % bar 21-45 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2" % bar 50 - \on-color \subjectPresentationColor \pad-markup #0.8 "S2" % bar 54 (incomplete subject) - \on-color \endColor \pad-markup #0.8 "Coda" - } + \fugueStructureBoxesXII_I } } } 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 59c784c..808c16f 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 @@ -385,15 +385,7 @@ Bass = \context Voice = "four" \relative c { } subsubtitle = \markup { \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 S1 A1 T1 B1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 B2 T2 A2 S2" % bar 21-45 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "T2" % bar 50 - \on-color \subjectPresentationColor \pad-markup #0.8 "B2" % bar 54 (incomplete subject) - \on-color \endColor \pad-markup #0.8 "Coda" - } + \fugueStructureBoxesXII_II } } } 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 077fbc6..fd08de6 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 @@ -385,17 +385,7 @@ Bass = \context Voice = "four" \relative c { } subsubtitle = \markup { \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 A B S" - \on-color \episodeColor \pad-markup #1 "1" % bar 13-19 - \on-color \subjectPresentationColor \pad-markup #0.8 "A" % bar 20 - \on-color \episodeColor \pad-markup #1 "2" % bar 24 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 B S A" % bar 29-41 - \on-color \episodeColor \pad-markup #1 "3" % bar 41-47 - \on-color \subjectPresentationColor \pad-markup #0.8 "A" % bar 47-52 - \on-color \episodeColor \pad-markup #1 "4" % bar 52-61 - \on-color \endColor \pad-markup #0.8 "Final presentation B S" - } + \fugueStructureBoxesXIII_I } } } 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 90f18b7..c46fe0c 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 @@ -275,7 +275,7 @@ Alto = \context Voice = "two" \relative c' { d' %70 | a_~ \tuplet 3/2 { a8 fis e } \tuplet 3/2 { d c bes! } a8.*8/9 a'16*4/3 - | a2.\fermata + | a2._\fermata \bar "|." } @@ -404,17 +404,7 @@ Bass = \context Voice = "four" \relative c { } subsubtitle = \markup { \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 S A B" - \on-color \episodeColor \pad-markup #1 "1" % bar 13-19 - \on-color \subjectPresentationColor \pad-markup #0.8 "S" % bar 20 - \on-color \episodeColor \pad-markup #1 "2" % bar 24 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 A B S" % bar 29-41 - \on-color \episodeColor \pad-markup #1 "3" % bar 41-47 - \on-color \subjectPresentationColor \pad-markup #0.8 "S" % bar 47-52 - \on-color \episodeColor \pad-markup #1 "4" % bar 52-61 - \on-color \endColor \pad-markup #0.8 "Final presentation A B" - } + \fugueStructureBoxesXIII_II } } } 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 fbc6ed7..9799296 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 @@ -1195,44 +1195,9 @@ Bass = \context Voice = "four" \relative c { } subsubtitle = \markup { % ASIS \center-column { - \line \normal-text \tiny \with-color \white { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 B1 A1 T1 S1" % bars 1-21 - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto B1 T1" % bars 21-29 - \on-color \subjectPresentationColor \pad-markup #0.8 "A1" % bars 30-35 - \on-color \subjectStrettoColor \pad-markup #0.8 "S1 A1" % bars 37-43 - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" % bars 43-48 - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "T1" % bars 55-60 - \on-color \subjectStrettoColor \pad-markup #0.8 "B1 S1" % bars 61-67 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectStrettoColor \pad-markup #0.8 "A1 T1" % bars 71-77 - \on-color \subjectPresentationColor \pad-markup #0.8 "S1" % bars 79-84 - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 A1 T1 S1 A1" % bars 89-104 - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" % bars 105-110 - \on-color \episodeColor \pad-markup #1 "4" - } - \line \normal-text \tiny \with-color \white { - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 A2 S2 B2 T2" % bars 114-141 - \on-color \episodeColor \pad-markup #1 "5" % bars 141-147 - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 B1" % bars 147-153 - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 T1" % bars 156-161 - \on-color \episodeColor \pad-markup #1 "7" - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 S1" % bars 167-174 - \on-color \episodeColor \pad-markup #1 "8" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 A1 S1" % bars 180-188 - \on-color \episodeColor \pad-markup #1 "9" - } - \line \normal-text \tiny \with-color \white { - \on-color \thirdExpositionColor \pad-markup #0.8 "Exposition 3/a T3 A3 S3 B3" % bars 193-207 - \on-color \episodeColor \pad-markup #1 "10" - \on-color \thirdExpositionColor \pad-markup #0.8 "Exposition 3/b T3 A3 S3 B3" % bars 210-222 - \on-color \subjectPresentationColor \pad-markup #0.8 "B3 T3 A3" % bars 222-229 - \on-color \episodeColor \pad-markup #1 "11" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 B1 T3" % bars 233-239 - \on-color \episodeColor \pad-markup #1 "?" - } + \fugueStructureBoxesXIV_lineone + \fugueStructureBoxesXIV_linetwo + \fugueStructureBoxesXIV_linethree } } } diff --git a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/structure-of-the-fugues.ly b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/structure-of-the-fugues.ly index 887401d..eea781a 100644 --- a/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/structure-of-the-fugues.ly +++ b/src/johann-sebastian-bach/die-kunst-der-fuge-BWV1080/structure-of-the-fugues.ly @@ -1,29 +1,5 @@ \include "./macros.ly" - -#(define-markup-command (fugueStructureTitle layout props roman descr) - (string? string?) - "Prints colored boxes with description to show the structure of a fugue" - (interpret-markup layout props - #{ - \markup - \column { - \vspace #0.4 - \line \abs-fontsize #8 { - \concat { - \smallCaps \bold { "Contrapunctus " #roman " " } - \italic { #descr } - } - } - } - #})) -#(define-markup-command (fugueStructureBoxes layout props boxes) - (markup-list?) - "Prints colored boxes with description to show the structure of a fugue" - (interpret-markup layout props - #{ \markup { - \line \normal-text \tiny \with-color \white - #boxes - } #})) +\include "./macros-fugues-structure.ly" \markup \fill-line { @@ -34,307 +10,61 @@ } } + \markup \fugueStructureTitle "I" "" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition ASBT" % bars 1-17 - \on-color \episodeColor \pad-markup #1 "1" % bars 17-22 - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition ASBT" % bars 23-44 - \on-color \episodeColor \pad-markup #1 "2" % bars 44-60 - \on-color \subjectPresentationColor \pad-markup #0.8 "S" - \on-color \subjectPresentationColor \pad-markup #0.8 "B" - \on-color \episodeColor \pad-markup #1 "3" % bars 60- - \on-color \endColor \pad-markup #0.8 "T" - } +\fugueStructureBoxesI \markup \fugueStructureTitle "II" "" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition BTAS" % bars 1-17 - \on-color \episodeColor \pad-markup #1 "1" % bars 17-22 - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition ASBT" % bars 23-42 - \on-color \episodeColor \pad-markup #1 "2" % bars 42-44 - \on-color \subjectPresentationColor \pad-markup #0.8 "SAB" % bars 45-57 - \on-color \episodeColor \pad-markup #1 "3" % bars 57-60 - \on-color \subjectPresentationColor \pad-markup #0.8 "B" % bars 61-65 - \on-color \episodeColor \pad-markup #1 "4" % bars 65-68 - \on-color \subjectPresentationColor \pad-markup #0.8 "T" % bars 69-73 - \on-color \episodeColor \pad-markup #1 "5" % bars 73-78 - \on-color \endColor \pad-markup #0.8 "S" % bars 79- - } +\fugueStructureBoxesII \markup \fugueStructureTitle "III" "" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition TASB" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "S" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "T" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "T" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "S" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "BAST" - \on-color \endColor \pad-markup #0.8 "Coda" - } +\fugueStructureBoxesIII \markup \fugueStructureTitle "IV" "" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition SATB" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition SATB" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "BT" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "AS" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "T•B•SA" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "TA" - } +\fugueStructureBoxesIV \markup \fugueStructureTitle "V" "" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition ABST" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Second exposition STBA" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto BS" - \on-color \subjectStrettoColor \pad-markup #0.8 "TA" - \on-color \subjectStrettoColor \pad-markup #0.8 "BT" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectStrettoColor \pad-markup #0.8 "SA" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectStrettoColor \pad-markup #0.8 "ST" - \on-color \subjectStrettoColor \pad-markup #0.8 "TA" - \on-color \endColor \pad-markup #0.8 "BA" - } +\fugueStructureBoxesV \markup \fugueStructureTitle "VI" "[per Diminutionem] in Stilo Francese" -\markup \fugueStructureBoxes { - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto BSA" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "TAS" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectStrettoColor \pad-markup #0.8 "BTS" - \on-color \subjectPresentationColor \pad-markup #0.8 "T" - \on-color \subjectStrettoColor \pad-markup #0.8 "AT" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectStrettoColor \pad-markup #0.8 "TASBT" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "A" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectStrettoColor \pad-markup #0.8 "BT" - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectStrettoColor \pad-markup #0.8 "SAT" - \on-color \episodeColor \pad-markup #1 "7" - \on-color \subjectStrettoColor \pad-markup #0.8 "TSA" - } +\fugueStructureBoxesVI \markup \fugueStructureTitle "VII" "per Augmentationem et Diminutionem" -\markup \fugueStructureBoxes { - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto TSABAT" - \on-color \subjectStrettoColor \pad-markup #0.8 "SAT" - \on-color \subjectStrettoColor \pad-markup #0.8 "TB" - \on-color \subjectStrettoColor \pad-markup #0.8 "ATSBA" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "ATSSAATB" - \on-color \subjectStrettoColor \pad-markup #0.8 "SAAT" - \on-color \endColor \pad-markup #0.8 "Coda" - } +\fugueStructureBoxesVII \markup \fugueStructureTitle "VIII" "[Triple Fugue]" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 A1 B1 S1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto A1 B1" - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" - } -\markup \fugueStructureBoxes { - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 S1 A2 B1 S2 A1 B2" - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 S2" - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2" - } -\markup \fugueStructureBoxes { - \on-color \thirdExpositionColor \pad-markup #0.8 "Exposition 3 A3 B3 S3" - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1 A2 B3" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1 B2 S3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 S2 A3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 S2 A3" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 S1 B3" - } - +\fugueStructureBoxesVIII_lineone +\fugueStructureBoxesVIII_linetwo +\fugueStructureBoxesVIII_linethree \markup \fugueStructureTitle "IX" "alla Duodecima" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition A1 S1 B1 T1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 T1" - \on-color \episodeColor \pad-markup #1 "2" % F major - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A1" % bar 45 - \on-color \episodeColor \pad-markup #1 "3" % D minor - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 B1" % bar 59 - \on-color \episodeColor \pad-markup #1 "4" % A minor - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A1" % bar 73 - \on-color \episodeColor \pad-markup #1 "5" % D minor - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 S1" % bar 89 - \on-color \episodeColor \pad-markup #1 "6" % G minor - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A1" % bar 99 - \on-color \episodeColor \pad-markup #1 "7" % D minor - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 T1" % bar 119 - \on-color \endColor \pad-markup #0.8 "Coda" - } +\fugueStructureBoxesIX \markup \fugueStructureTitle "X" "alla Decima" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 A1 T1 B1 S1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto A1 T1" % bar 14-17 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 S2 T2 B3 A2" % bar 23-38 - \on-color \episodeColor \pad-markup #1 "2" - } -\markup \fugueStructureBoxes { - \on-color \subjectPresentationColor \pad-markup #0.8 "T1 A2" % bar 44 - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1 B2" % bar 52 - \on-color \episodeColor \pad-markup #1 "4" - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 S1" % bar 66 - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 A1 B1" % bar 75 - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 A1 S1" % bar 84 - \on-color \episodeColor \pad-markup #1 "7" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 T1 S2" % bar 103 - \on-color \episodeColor \pad-markup #1 "8" - \on-color \subjectPresentationColor \pad-markup #0.8 "T1 A1" % bar 115 - } +\fugueStructureBoxesX_lineone +\fugueStructureBoxesX_linetwo \markup \fugueStructureTitle "XI" "" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1/a A1 S1 B1 T1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "S1" % bar 22 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 A2 T2 B2 S2" % bar 27 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2" % bar 67 - } -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1/b T1 S1 B1 A1" % bar 71 - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 T3" % bar 89 - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 S3" % bar 93 - \on-color \subjectPresentationColor \pad-markup #0.8 "A1" % bar 101 - \on-color \subjectPresentationColor \pad-markup #0.8 "A3 T2" % bar 105 - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 A3" % bar 113 - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" % bar 132 - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 A3" % bar 136 - \on-color \episodeColor \pad-markup #1 "4" - } -\markup \fugueStructureBoxes { - \on-color \subjectPresentationColor \pad-markup #0.8 "A3 T1 S2" % bar 145 - \on-color \episodeColor \pad-markup #1 "5" - \on-color \subjectPresentationColor \pad-markup #0.8 "A1 S1" % bar 158 - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 T1" % bar 164 - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 T3 A1" % bar 174 - \on-color \subjectPresentationColor \pad-markup #0.8 "B3 T2 S2" % bar 179 - } +\fugueStructureBoxesXI_lineone +\fugueStructureBoxesXI_linetwo +\fugueStructureBoxesXI_linethree \markup \fugueStructureTitle "XII.I" "[rectus]" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 B1 T1 A1 S1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 S2 A2 T2 B2" % bar 21-45 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2" % bar 50 - \on-color \subjectPresentationColor \pad-markup #0.8 "S2" % bar 54 (incomplete subject) - \on-color \endColor \pad-markup #0.8 "Coda" - } +\fugueStructureBoxesXII_I \markup \fugueStructureTitle "XII.II" "inversus" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 S1 A1 T1 B1" - \on-color \episodeColor \pad-markup #1 "1" - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 B2 T2 A2 S2" % bar 21-45 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectPresentationColor \pad-markup #0.8 "T2" % bar 50 - \on-color \subjectPresentationColor \pad-markup #0.8 "B2" % bar 54 (incomplete subject) - \on-color \endColor \pad-markup #0.8 "Coda" - } +\fugueStructureBoxesXII_II \markup \fugueStructureTitle "XIII.I" "[rectus]" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 A B S" - \on-color \episodeColor \pad-markup #1 "1" % bar 13-19 - \on-color \subjectPresentationColor \pad-markup #0.8 "A" % bar 20 - \on-color \episodeColor \pad-markup #1 "2" % bar 24 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 B S A" % bar 29-41 - \on-color \episodeColor \pad-markup #1 "3" % bar 41-47 - \on-color \subjectPresentationColor \pad-markup #0.8 "A" % bar 47-52 - \on-color \episodeColor \pad-markup #1 "4" % bar 52-61 - \on-color \endColor \pad-markup #0.8 "Final presentation B S" - } +\fugueStructureBoxesXIII_I \markup \fugueStructureTitle "XIII.II" "inversus" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 S A B" - \on-color \episodeColor \pad-markup #1 "1" % bar 13-19 - \on-color \subjectPresentationColor \pad-markup #0.8 "S" % bar 20 - \on-color \episodeColor \pad-markup #1 "2" % bar 24 - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 A B S" % bar 29-41 - \on-color \episodeColor \pad-markup #1 "3" % bar 41-47 - \on-color \subjectPresentationColor \pad-markup #0.8 "S" % bar 47-52 - \on-color \episodeColor \pad-markup #1 "4" % bar 52-61 - \on-color \endColor \pad-markup #0.8 "Final presentation A B" - } +\fugueStructureBoxesXIII_II \markup \fugueStructureTitle "XIV" "" -\markup \fugueStructureBoxes { - \on-color \expositionColor \pad-markup #0.8 "Exposition 1 B1 A1 T1 S1" % bars 1-21 - \on-color \subjectStrettoColor \pad-markup #0.8 "Stretto B1 T1" % bars 21-29 - \on-color \subjectPresentationColor \pad-markup #0.8 "A1" % bars 30-35 - \on-color \subjectStrettoColor \pad-markup #0.8 "S1 A1" % bars 37-43 - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" % bars 43-48 - \on-color \episodeColor \pad-markup #1 "1" - \on-color \subjectPresentationColor \pad-markup #0.8 "T1" % bars 55-60 - \on-color \subjectStrettoColor \pad-markup #0.8 "B1 S1" % bars 61-67 - \on-color \episodeColor \pad-markup #1 "2" - \on-color \subjectStrettoColor \pad-markup #0.8 "A1 T1" % bars 71-77 - \on-color \subjectPresentationColor \pad-markup #0.8 "S1" % bars 79-84 - \on-color \episodeColor \pad-markup #1 "3" - \on-color \subjectPresentationColor \pad-markup #0.8 "B1 A1 T1 S1 A1" % bars 89-104 - \on-color \subjectPresentationColor \pad-markup #0.8 "B1" % bars 105-110 - \on-color \episodeColor \pad-markup #1 "4" - } -\markup \fugueStructureBoxes { - \on-color \secondExpositionColor \pad-markup #0.8 "Exposition 2 A2 S2 B2 T2" % bars 114-141 - \on-color \episodeColor \pad-markup #1 "5" % bars 141-147 - \on-color \subjectPresentationColor \pad-markup #0.8 "S2 B1" % bars 147-153 - \on-color \episodeColor \pad-markup #1 "6" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 T1" % bars 156-161 - \on-color \episodeColor \pad-markup #1 "7" - \on-color \subjectPresentationColor \pad-markup #0.8 "T2 S1" % bars 167-174 - \on-color \episodeColor \pad-markup #1 "8" - \on-color \subjectPresentationColor \pad-markup #0.8 "B2 A1 S1" % bars 180-188 - \on-color \episodeColor \pad-markup #1 "9" - } -\markup \fugueStructureBoxes { - \on-color \thirdExpositionColor \pad-markup #0.8 "Exposition 3/a T3 A3 S3 B3" % bars 193-207 - \on-color \episodeColor \pad-markup #1 "10" - \on-color \thirdExpositionColor \pad-markup #0.8 "Exposition 3/b T3 A3 S3 B3" % bars 210-222 - \on-color \subjectPresentationColor \pad-markup #0.8 "B3 T3 A3" % bars 222-229 - \on-color \episodeColor \pad-markup #1 "11" - \on-color \subjectPresentationColor \pad-markup #0.8 "A2 B1 T3" % bars 233-239 - \on-color \episodeColor \pad-markup #1 "?" - } +\fugueStructureBoxesXIV_lineone +\fugueStructureBoxesXIV_linetwo +\fugueStructureBoxesXIV_linethree \markup { \fill-line {