J.S. Bach: Suite Anglaise BWV806-811: minor changes in pagination and…

… index Signed-off-by: Davide Madrisan <[email protected]>
madrisan · Dec 20, 2024 · 849bf63 · 849bf63
1 parent aab416e
commit 849bf63
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 63 deletions.
diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-5-gavotte-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-5-gavotte-2.ly
@@ -81,7 +81,7 @@ Tenor = \context Voice = "three" \relative c' {
   | b d\rest d d\rest
   %15
   | b d\rest
-    \once\override Staff.TextScript.extra-offset = #'(2 . -2)
+    \once\override Staff.TextScript.extra-offset = #'(-3 . -2)
     d_\markup {
       "Repetatur Gavotte I"
     } d\rest

diff --git a/...ohann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-2.ly b/...ohann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-2.ly
@@ -125,7 +125,9 @@ Bass = \context Voice = "four" \relative c' {
   | dis8 e a,
   | b4.~
   | b8 cis dis
-  | e a,_\markup { \hspace #1 "Repetatur Passepied I" } b
+  | e
+    \once\override Staff.TextScript.extra-offset = #'(-3 . -2)
+    a,_\markup { \hspace #1 "Repetatur Passepied I" } b
   | e,4
     \tweak direction #DOWN
     \textEndMark \markup { \musicglyph "scripts.dfermata" }

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-4-sarabande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-4-sarabande.ly
@@ -21,6 +21,7 @@ Soprano = \context Voice = "one" \relative c'' {
   | cis2. b4 a2
   %5
   | c! b2. cis4
+  \break
   | d e cis2.\prall d4
   | e8 f e f f2.\prall e4
   | e1.

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-5-double.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-5-double.ly
@@ -38,6 +38,7 @@ Soprano = \context Voice = "one" \relative c'' {
   | f2 g8\rest c, f g a2~
   %15
   | a4 g g8\rest d g a bes f g e
+  \break
   | f2 g8\rest c, e f g d e4
   | a,8\prall g a c f2~ f
   | r2 g8\rest d fis g \stemNeutral a bes c a

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-6-gavotte-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-6-gavotte-1.ly
@@ -47,10 +47,12 @@ Soprano = \context Voice = "one" \relative c'' {
   | g8 a bes g bes a g fis
   %20
   | g2 d4 d
+  \break
   | d4. e16 d cis8 d e cis
   | d e f d e f g e
   | f e f a g f e d
   | cis a b cis d e f4
+  \break
   %25
   | f1~
   | f2 e~

diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-6-gavotte-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-6-gavotte-2.ly
@@ -112,6 +112,7 @@ Bass = \context Voice = "four" \relative c'' {
   | cis' d, b' d, a' d, g d
     \alternative {
       { fis
+        \once\override Staff.TextScript.extra-offset = #'(0 . -2)
         d_\markup { \hspace #0.5 "(Gavotte I da capo)" }
         e d
       }

diff --git a/src/johann-sebastian-bach/suites-anglaises/header.ily b/src/johann-sebastian-bach/suites-anglaises/header.ily
@@ -2,9 +2,9 @@
   composer = "Johann Sebastian Bach (1685-1750)"
   date = "between 1725 and 1726"
 
-  footer = "Mutopia-2024/07/16"
+  footer = "Mutopia-2024/12/20"
 
-  lastupdated = "2024 July 16"
+  lastupdated = "2024 December 20"
   license = "Creative Commons Attribution-ShareAlike 4.0"
   maintainerEmail = "[email protected]"
   maintainerWeb = "https://github.com/madrisan/open-scores"

diff --git a/src/johann-sebastian-bach/suites-anglaises/index.ly b/src/johann-sebastian-bach/suites-anglaises/index.ly
@@ -16,13 +16,14 @@ middleGrey = #(x11-color 'grey45)
          \pad-around #1
          \abs-fontsize #11 \bold {
            \concat {
-             \char ##x23AF " " #title "  ("  #bwv ")"
+             \char ##x23AF " Suite Anglaise " #title " avec Prélude"
+             \normal-text { "  (BWV "  #bwv ")" }
            }
          }
        } #}))
 
-#(define-markup-command (indexItem layout props title pagelabel infos)
-  (string? symbol? string?)
+#(define-markup-command (indexItem layout props title pagelabel)
+  (string? symbol?)
   "Format a block of the index"
   (interpret-markup layout props
     #{ \markup \column \abs-fontsize #10 {
@@ -32,50 +33,48 @@ middleGrey = #(x11-color 'grey45)
            \hspace #3.2
            \with-link #pagelabel {
              \fill-with-pattern #1 #RIGHT .
-               \concat {
-                 #title " " \italic \with-color #middleGrey #infos
-               }
+               #title
                \page-ref #pagelabel "000" "?"
            }
          }
        } #}))
 
-\markup { \indexSection "Suite Anglaise I" "BWV 806" }
-\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 "" }
+\markup { \indexSection "I" "806" }
+\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 }
 \markup {
   \vspace #1
 }
 
-\markup { \indexSection "Suite Anglaise II" "BWV 807" }
-\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 "" }
+\markup { \indexSection "II" "807" }
+\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 }
 \markup {
   \vspace #1
 }
 
-\markup { \indexSection "Suite Anglaise III" "BWV 808" }
-\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 "" }
+\markup { \indexSection "III" "808" }
+\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 }
 \markup {
   \vspace #1
 }
@@ -86,39 +85,39 @@ middleGrey = #(x11-color 'grey45)
   \vspace #2
 }
 
-\markup { \indexSection "Suite Anglaise IV" "BWV 809" }
-\markup { \indexItem "Prélude" #'SuiteIVPrelude "" }
-\markup { \indexItem "Allemande" #'SuiteIVAllemande "" }
-\markup { \indexItem "Courante" #'SuiteIVCourante "" }
-\markup { \indexItem "Sarabande" #'SuiteIVSarabande "" }
-\markup { \indexItem "Menuet I" #'SuiteIVMenuetI "" }
-\markup { \indexItem "Menuet II" #'SuiteIVMenuetII "" }
-\markup { \indexItem "Gigue" #'SuiteIVGigue "" }
+\markup { \indexSection "IV" "809" }
+\markup { \indexItem "Prélude" #'SuiteIVPrelude }
+\markup { \indexItem "Allemande" #'SuiteIVAllemande }
+\markup { \indexItem "Courante" #'SuiteIVCourante }
+\markup { \indexItem "Sarabande" #'SuiteIVSarabande }
+\markup { \indexItem "Menuet I" #'SuiteIVMenuetI }
+\markup { \indexItem "Menuet II" #'SuiteIVMenuetII }
+\markup { \indexItem "Gigue" #'SuiteIVGigue }
 \markup {
   \vspace #1
 }
 
-\markup { \indexSection "Suite Anglaise V" "BWV 810" }
-\markup { \indexItem "Prélude" #'SuiteVPrelude "" }
-\markup { \indexItem "Allemande" #'SuiteVAllemande "" }
-\markup { \indexItem "Courante" #'SuiteVCourante "" }
-\markup { \indexItem "Sarabande" #'SuiteVSarabande "" }
-\markup { \indexItem "Passepied I en Rondeau" #'SuiteVPassepiedI "" }
-\markup { \indexItem "Passepied II" #'SuiteVPassepiedII "" }
-\markup { \indexItem "Gigue" #'SuiteVGigue "" }
+\markup { \indexSection "V" "810" }
+\markup { \indexItem "Prélude" #'SuiteVPrelude }
+\markup { \indexItem "Allemande" #'SuiteVAllemande }
+\markup { \indexItem "Courante" #'SuiteVCourante }
+\markup { \indexItem "Sarabande" #'SuiteVSarabande }
+\markup { \indexItem "Passepied I en Rondeau" #'SuiteVPassepiedI }
+\markup { \indexItem "Passepied II" #'SuiteVPassepiedII }
+\markup { \indexItem "Gigue" #'SuiteVGigue }
 \markup {
   \vspace #1
 }
 
-\markup { \indexSection "Suite Anglaise VI" "BWV 811" }
-\markup { \indexItem "Prélude" #'SuiteVIPrelude "" }
-\markup { \indexItem "Allemande" #'SuiteVIAllemande "" }
-\markup { \indexItem "Courante" #'SuiteVICourante "" }
-\markup { \indexItem "Sarabande" #'SuiteVISarabande "" }
-\markup { \indexItem "Double" #'SuiteVIDouble "" }
-\markup { \indexItem "Gavotte I" #'SuiteVIGavotteI "" }
-\markup { \indexItem "Gavotte II" #'SuiteVIGavotteII "" }
-\markup { \indexItem "Gigue" #'SuiteVIGigue "" }
+\markup { \indexSection "VI" "811" }
+\markup { \indexItem "Prélude" #'SuiteVIPrelude }
+\markup { \indexItem "Allemande" #'SuiteVIAllemande }
+\markup { \indexItem "Courante" #'SuiteVICourante }
+\markup { \indexItem "Sarabande" #'SuiteVISarabande }
+\markup { \indexItem "Double" #'SuiteVIDouble }
+\markup { \indexItem "Gavotte I" #'SuiteVIGavotteI }
+\markup { \indexItem "Gavotte II" #'SuiteVIGavotteII }
+\markup { \indexItem "Gigue" #'SuiteVIGigue }
 \markup {
   \vspace #1
 }