J.S. Bach: Suite Anglaise 1-6 BWV806-811: add index page

Signed-off-by: Davide Madrisan <[email protected]>
madrisan · Dec 17, 2024 · 33046bb · 33046bb
1 parent 57757fc
commit 33046bb
Show file tree

Hide file tree

Showing 66 changed files with 377 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Jan Pieterszoon Sweelinck: Fantasia Cromatica SwWV 258
 - J.S. Bach: Suite Anglaise 2 BWV807: Add Sarabande with agréments
 
+### Changed
+
+- J.S. Bach: Suite Anglaise 1 BWV806: add index page
+- J.S. Bach: Suite Anglaise 2 BWV807: add index page
+- J.S. Bach: Suite Anglaise 3 BWV808: add index page
+- J.S. Bach: Suite Anglaise 4 BWV809: add index page
+- J.S. Bach: Suite Anglaise 5 BWV810: add index page
+- J.S. Bach: Suite Anglaise 6 BWV811: add index page
+
 ## [v59] - 2024-12-08
 
 ### Added
@@ -23,8 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 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
-- J.S. Bach: Ouverture nach Französischer Art (BWV831) - add and index page
-- Arnold Schoenberg: Sechs kleine Klavierstücke op.19 - add and index page
+- J.S. Bach: Ouverture nach Französischer Art (BWV831) - add an index page
+- Arnold Schoenberg: Sechs kleine Klavierstücke op.19 - add an index page
 - J.S. Bach: Goldberg Variationen - Add a foreword page (in english)
 - J.S. Bach: Suite Anglaise 2 BWV807: Add A B repetition marks to Prelude
 

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/JS-Bach-BWV806-Suite-Anglaise-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/JS-Bach-BWV806-Suite-Anglaise-1.ly
@@ -98,6 +98,9 @@
   }
 }
 
+\include "./index.ly"
+\pageBreak
+
 \include "./parts/bach-suite-anglaise-1-1-prelude.ly"
 \pageBreak
 \include "./parts/bach-suite-anglaise-1-2-allemande.ly"

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/Makefile.am b/src/johann-sebastian-bach/suites-anglaises/BWV806/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = JS-Bach-BWV806-Suite-Anglaise-1.ly \
 	     covercolor.ly.in \
 	     header.ily \
 	     global.ly \
+	     index.ly \
 	     logo.ly \
 	     macros-schleifer.ly \
 	     macros-slidenotes.ly \

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/index.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/index.ly
@@ -0,0 +1,51 @@
+\markup \fill-line {
+  \center-column \abs-fontsize #18 \bold {
+    "INDEX"
+    \null\null\null\null
+  }
+}
+
+middleGrey = #(x11-color 'grey45)
+
+#(define-markup-command (indexItem layout props title pagelabel infos)
+  (string? symbol? string?)
+  "Format a block of the index"
+  (interpret-markup layout props
+    #{ \markup \column \abs-fontsize #11 {
+         \override #'(line-width . 95)
+         \pad-around #1
+         \line {
+           \hspace #3.2
+           \with-link #pagelabel {
+             \fill-with-pattern #1 #RIGHT .
+               \concat {
+                 #title " " \italic \with-color #middleGrey #infos
+               }
+               \page-ref #pagelabel "000" "?"
+           }
+         }
+       } #}))
+
+\markup \column \abs-fontsize #11 {
+  \pad-around #1
+  \abs-fontsize #12 \bold {
+    \concat {
+      \char ##x23AF " Suite Anglaise I"
+    }
+  }
+}
+
+\markup {
+  \vspace #1
+}
+
+\markup { \indexItem "Prélude" #'SuiteIPrelude "" }
+\markup { \indexItem "Allemande" #'SuiteIAllemande "" }
+\markup { \indexItem "Courante I" #'SuiteICouranteI "" }
+\markup { \indexItem "Courante II avec Deux Doubles" #'SuiteICouranteII "" }
+\markup { \indexItem "Double I" #'SuiteIDoubleI "" }
+\markup { \indexItem "Double II" #'SuiteIDoubleII "" }
+\markup { \indexItem "Sarabande" #'SuiteISarabande "" }
+\markup { \indexItem "Bourree I" #'SuiteIBourreeI "" }
+\markup { \indexItem "Bourree II" #'SuiteIBourreeII "" }
+\markup { \indexItem "Gigue" #'SuiteIGigue "" }
diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-1-prelude.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-1-prelude.ly
@@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c {
   %\set Timing.beamExceptions = #'()
   %\set Timing.baseMoment = #(ly:make-moment 3/16)
   %\set Timing.beatStructure = 1,1,1,1,1,1,1,1
+  \label #'SuiteIPrelude
   %1
   | \change Staff = "lower"
     \stemDown a16[ cis e] \stemUp a[ gis fis] \stemDown e[ gis b] \stemUp d[ cis b]

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-2-allemande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-2-allemande.ly
@@ -11,6 +11,7 @@ Soprano = \context Voice = "one" \relative c''' {
   \voiceOne
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
+  \label #'SuiteIAllemande
   \repeat volta 2 {
   \partial 16 a16
   %1

diff --git a/...johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-1.ly b/...johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-1.ly
@@ -11,6 +11,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteICouranteI
   \repeat volta 2 {
   \partial 8 a'8
   %1

diff --git a/...johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-2.ly b/...johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-2.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteICouranteII
   \repeat volta 2 {
   \partial 8 a8
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-4-double-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-4-double-1.ly
@@ -11,6 +11,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIDoubleI
   \repeat volta 2 {
   \partial 8 a8
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-4-double-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-4-double-2.ly
@@ -11,6 +11,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp\slurNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIDoubleII
   \repeat volta 2 {
   \partial 8 a8
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-5-sarabande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-5-sarabande.ly
@@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp\slurDown
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteISarabande
   \repeat volta 2 {
   %1
   | \once\override Dots.staff-position = #1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-6-bourree-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-6-bourree-1.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' {
   \stemNeutral\tieNeutral\slurNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIBoureeI
   \partial 4 e4
   %1
   | a8( gis) b( a) cis( b a gis)

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-6-bourree-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-6-bourree-2.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' {
   \stemNeutral\tieNeutral\slurNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIBoureeII
   \repeat volta 2 {
   \partial 4 c8 d
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-7-gigue.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-7-gigue.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemNeutral\tieNeutral\slurNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIGigue
   \repeat volta 2 {
   \partial 8 e8
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/JS-Bach-BWV807-Suite-Anglaise-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/JS-Bach-BWV807-Suite-Anglaise-2.ly
@@ -98,6 +98,9 @@
   }
 }
 
+\include "./index.ly"
+\pageBreak
+
 \include "./parts/bach-suite-anglaise-2-1-prelude.ly"
 \pageBreak
 \include "./parts/bach-suite-anglaise-2-2-allemande.ly"

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/Makefile.am b/src/johann-sebastian-bach/suites-anglaises/BWV807/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = JS-Bach-BWV807-Suite-Anglaise-2.ly \
 	     covercolor.ly.in \
 	     header.ily \
 	     global.ly \
+	     index.ly \
 	     logo.ly \
 	     parts/bach-suite-anglaise-2-1-prelude.ly \
 	     parts/bach-suite-anglaise-2-2-allemande.ly \

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/index.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/index.ly
@@ -0,0 +1,49 @@
+\markup \fill-line {
+  \center-column \abs-fontsize #18 \bold {
+    "INDEX"
+    \null\null\null\null
+  }
+}
+
+middleGrey = #(x11-color 'grey45)
+
+#(define-markup-command (indexItem layout props title pagelabel infos)
+  (string? symbol? string?)
+  "Format a block of the index"
+  (interpret-markup layout props
+    #{ \markup \column \abs-fontsize #11 {
+         \override #'(line-width . 95)
+         \pad-around #1
+         \line {
+           \hspace #3.2
+           \with-link #pagelabel {
+             \fill-with-pattern #1 #RIGHT .
+               \concat {
+                 #title " " \italic \with-color #middleGrey #infos
+               }
+               \page-ref #pagelabel "000" "?"
+           }
+         }
+       } #}))
+
+\markup \column \abs-fontsize #11 {
+  \pad-around #1
+  \abs-fontsize #12 \bold {
+    \concat {
+      \char ##x23AF " Suite Anglaise II"
+    }
+  }
+}
+
+\markup {
+  \vspace #1
+}
+
+\markup { \indexItem "Prélude" #'SuiteIIPrelude "" }
+\markup { \indexItem "Allemande" #'SuiteIIAllemande "" }
+\markup { \indexItem "Courante" #'SuiteIICourante "" }
+\markup { \indexItem "Sarabande" #'SuiteIISarabande "" }
+\markup { \indexItem "Les agréments de la même Sarabande" #'SuiteIISarabandeAgrements "" }
+\markup { \indexItem "Bourree I" #'SuiteIIBourreeI "" }
+\markup { \indexItem "Bourree II" #'SuiteIIBourreeII "" }
+\markup { \indexItem "Gigue" #'SuiteIIGigue "" }
diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-1-prelude.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-1-prelude.ly
@@ -13,6 +13,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \set Timing.baseMoment = #(ly:make-moment 1/4)
   \set Timing.beatStructure = 1,1,1,1
   \set Score.rehearsalMarkFormatter = #format-mark-box-alphabet
+  \label #'SuiteIIPrelude
   %1
   | r8\mark #1 e[ a, a'] g16 e f d
   | \stemUp e d c b c b c f b, e a, d

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-2-allemande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-2-allemande.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIIAllemande
   \repeat volta 2 {
   \partial 16 e16
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-3-courante.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-3-courante.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemNeutral\tieNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIICourante
   \repeat volta 2 {
   \partial 8 a8
   %1

diff --git a/...ohann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-1.ly b/...ohann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-1.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIISarabande
   \repeat volta 2 {
   %1
   | c4 c8 b a gis

diff --git a/...ohann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-2.ly b/...ohann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-2.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIISarabandeAgrements
   \repeat volta 2 {
   %1
   | c4 c8 b a gis\prall

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-5-bourree-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-5-bourree-1.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemNeutral\tieNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIIBourreeI
   \repeat volta 2 {
   \partial 4 a'4
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-5-bourree-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-5-bourree-2.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIIBourreeII
   \repeat volta 2 {
   \partial 4 e4
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-6-gigue.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-6-gigue.ly
@@ -10,6 +10,7 @@ Soprano = \context Voice = "one" \relative c' {
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
   \override Script.direction = #UP
+  \label #'SuiteIIGigue
   \partial 8 e8
   %1
   \repeat volta 2 {

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/JS-Bach-BWV808-Suite-Anglaise-3.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/JS-Bach-BWV808-Suite-Anglaise-3.ly
@@ -98,6 +98,9 @@
   }
 }
 
+\include "./index.ly"
+\pageBreak
+
 \include "./parts/bach-suite-anglaise-3-1-prelude.ly"
 \pageBreak
 \include "./parts/bach-suite-anglaise-3-2-allemande.ly"

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/Makefile.am b/src/johann-sebastian-bach/suites-anglaises/BWV808/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = JS-Bach-BWV808-Suite-Anglaise-3.ly \
 	     covercolor.ly.in \
 	     header.ily \
 	     global.ly \
+	     index.ly \
 	     logo.ly \
 	     parts/bach-suite-anglaise-3-1-prelude.ly \
 	     parts/bach-suite-anglaise-3-2-allemande.ly \

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/index.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/index.ly
@@ -0,0 +1,48 @@
+\markup \fill-line {
+  \center-column \abs-fontsize #18 \bold {
+    "INDEX"
+    \null\null\null\null
+  }
+}
+
+middleGrey = #(x11-color 'grey45)
+
+#(define-markup-command (indexItem layout props title pagelabel infos)
+  (string? symbol? string?)
+  "Format a block of the index"
+  (interpret-markup layout props
+    #{ \markup \column \abs-fontsize #11 {
+         \override #'(line-width . 95)
+         \pad-around #1
+         \line {
+           \hspace #3.2
+           \with-link #pagelabel {
+             \fill-with-pattern #1 #RIGHT .
+               \concat {
+                 #title " " \italic \with-color #middleGrey #infos
+               }
+               \page-ref #pagelabel "000" "?"
+           }
+         }
+       } #}))
+
+\markup \column \abs-fontsize #11 {
+  \pad-around #1
+  \abs-fontsize #12 \bold {
+    \concat {
+      \char ##x23AF " Suite Anglaise III"
+    }
+  }
+}
+
+\markup {
+  \vspace #1
+}
+
+\markup { \indexItem "Prélude" #'SuiteIIIPrelude "" }
+\markup { \indexItem "Allemande" #'SuiteIIIAllemande "" }
+\markup { \indexItem "Courante" #'SuiteIIICourante "" }
+\markup { \indexItem "Sarabande" #'SuiteIIISarabande "" }
+\markup { \indexItem "Gavotte I" #'SuiteIIIGavotteI "" }
+\markup { \indexItem "Gavotte II ou la Musette" #'SuiteIIIGavotteII "" }
+\markup { \indexItem "Gigue" #'SuiteIIIGigue "" }
diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-1-prelude.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-1-prelude.ly
@@ -8,6 +8,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \voiceOne
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
+  \label #'SuiteIIIPrelude
   %1
   | r8 d d
   | bes bes bes

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-2-allemande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-2-allemande.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIIIAllemande
   \repeat volta 2 {
   \partial 16 bes16
   %1

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-3-courante.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-3-courante.ly
@@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' {
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'SuiteIIICourante
   \repeat volta 2 {
   \partial 8 d8
   %1