J.S. Bach: Suite Anglaise 1 BWV806 - sparse fixes

Signed-off-by: Davide Madrisan <[email protected]>
madrisan · Aug 13, 2024 · 523b15e · 523b15e
1 parent bfe826d
commit 523b15e
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - J.S. Bach: Das wohltemperierte Klavier – sparse fixes
 - J.S. Bach: Suite Anglaise n.2 BWV807 - fix two "too many colliding rests" warnings
 - J.S. Bach: Suite Anglaise n.3 BWV808 - minor fixes
+- J.S. Bach: Suite Anglaise 1 BWV806 - sparse fixes
 
 ## [v54] - 2024-08-01
 

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
@@ -86,7 +86,7 @@
   \include "./logo.ly"
 
   \markup {
-    \fill-line {
+    \fill-line {s
       \center-column {
         \null\null\null\null
         \fill-line {
@@ -103,7 +103,7 @@
 \include "./parts/bach-suite-anglaise-1-2-allemande.ly"
 \pageBreak
 \include "./parts/bach-suite-anglaise-1-3-courante-1.ly"
-\pageBreak
+%\pageBreak
 \include "./parts/bach-suite-anglaise-1-3-courante-2.ly"
 \pageBreak
 \include "./parts/bach-suite-anglaise-1-4-double-1.ly"

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
@@ -22,6 +22,7 @@ Soprano = \context Voice = "one" \relative c {
   %5
   | b cis d cis d b \grace b8 cis4.~ cis4 d8
   | e fis g fis g e fis4\mordent e8 d4 e8
+  \break
   | fis gis a b gis a gis4.~\parenthesize\prall gis4 a8\mordent
   | b a gis fis gis e dis e fis~ fis4.~
   | fis8 b, e~ e e dis e dis cis b cis a
@@ -55,6 +56,7 @@ Soprano = \context Voice = "one" \relative c {
   | e'' d cis b d cis d2.~
   | d4. cis~ cis8 d cis b c a
   | gis!4.~ gis8 b gis e e' a,~ a b gis
+  \break
   %35
   | a' gis fis e fis d cis4 d8 cis4\prall b8
   << {
@@ -125,7 +127,10 @@ Alto = \context Voice = "two" \relative c'' {
   %30
   | b8 a g fis g e fis2.
   | e8 d cis s4. s s
-  | gis4 a8 b e fis gis4.~ gis4 a8
+  | \change Staff = "lower" \stemUp
+    gis4 a8 b
+    \change Staff = "upper" \stemDown
+    e fis gis4.~ gis4 a8
   | b4.~ b8 a g fis4. f~
   | f8 e d s4. e d
   %35
@@ -183,7 +188,7 @@ Tenor = \context Voice = "three" \relative c' {
   | s1*12/8*4
   %31
   | s4. b8 cis a gis4 a8 gis4 fis8
-  | e4 fis8 gis4 a8 b4 r8 r4.
+  | \stemDown e4 fis8 gis4 \stemUp a8 b4 r8 r4.
   | s1*12/8
   | s4. cis!8 d b cis4. b
   %35
@@ -241,7 +246,7 @@ Bass = \context Voice = "four" \relative c' {
   %30
   | a8 cis e a a, cis d,4. dis\upmordent
   | e4 r8 b'4.\rest g2.\rest
-  | \stemDown g\rest e'8 d cis b cis a
+  | \stemDown \once\override Voice.Rest.X-offset = #0.4 g\rest e'8 d cis b cis a
   | \stemNeutral gis fis e a b cis d cis e d e f
   | \stemDown\tieDown e2.~ e
   %35

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
@@ -340,7 +340,7 @@ Bass = \context Voice = "four" \relative c' {
   \partial 16 r16
   | r16 e'8.~ e4~ \stemNeutral e16 g cis, e ais, cis fis, e'
   | \stemDown d4~ d8 d cis4 fis8 fis,
-  | \stemNeutral\tieNeutral b2~ b16 d gis, b eis, gis cis, b'
+  | \stemNeutral\tieNeutral b2~ b16 d gis,! b eis, gis cis, b'
   %20
   | \stemDown\tieDown a4~ a8 a \stemNeutral gis16 cis dis! eis fis eis fis gis
   | a gis a b cis8 cis, fis4 r8 fis
@@ -349,7 +349,7 @@ Bass = \context Voice = "four" \relative c' {
   | cis4 c\rest ais'16 b ais gis! fis e d cis
   %25
   | b4 r gis'16 a gis fis e d cis b
-  | a4 a\rest \stemNeutral fis'16 gis fis e d cis b a
+  | a4 a\rest \stemNeutral fis'16 g fis e d cis b a
   | e'8. d16 cis a cis e a8. g16 fis d fis a
   | d8 cis b a b a gis fis
   | \stemDown\tieDown e4~ e~ e2~

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
@@ -38,6 +38,7 @@ Soprano = \context Voice = "one" \relative c'' {
   | fis2~\arpeggio \stemNeutral fis8 fis' e d cis4.\prall d8
   | e( d cis b) b'4.\mordent gis8 \once\stemUp \grace gis8 a4.\mordent b8
   | \stemUp \grace a8 gis4. fis8 e( d cis b) \stemNeutral a( gis) a( fis)
+  \break
   | d'4.\mordent e8 \stemUp cis4.\prall b8 b4.\prallprall a8
   | a2~ a d4\rest a8 gis
   %20
@@ -165,7 +166,8 @@ Bass = \context Voice = "four" \relative c' {
    % << { \stemDown fis4 gis } \\ { \stemUp a b } >>
   | \stemNeutral a4. b8 gis4 fis cis' cis,
   %15
-  | \stemDown fis,2 fis'4 gis ais fis
+  | << { \stemDown fis,2 } \\ { \stemUp d'8\rest cis d e! } >>
+    \stemDown fis4 gis ais fis
   | b4. cis8 d fis e d
     << { cis4 dis }
     \new Voice = "slides" { \slideNotes d e }

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
@@ -51,7 +51,7 @@ Soprano = \context Voice = "one" \relative c'' {
   %20
   | \grace d8 cis4.\prall b8 a cis fis,4 gis4.\arpeggio a8
   | gis4.\prall fis8 e4 \stemNeutral b'8( cis16 d) cis4.\prall b8
-  | \once\stemUp \appoggiatura b8 e4. fis8 g e \stemUp a4 gis4.\prall a8
+  | \once\stemUp \appoggiatura b8 e4. fis8 g e \stemUp a4 g4.\prall a8
   | \grace g8 fis4. gis8 a d, cis b
     \once\override Staff.Script.extra-offset = #'(0.5 . 0)
     b4.\upmordent a8

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
@@ -57,9 +57,8 @@ Soprano = \context Voice = "one" \relative c'' {
   %20
   | cis( d cis b) a( gis fis gis) a( cis b a)
   | gis( fis e fis) gis( a b cis) d( cis b\prall a)
-  \break
   | e'( d cis d) e( fis g fis) g( b a g)
-  | fis( e fis gis) a d, cis\prall b \stemUp b4. a8
+  | fis( e fis gis) a d, cis\prall b \stemUp b4.\downmordent a8
   | \once\override Tie.extra-offset = #'(0 . 1)
     a2.~
     \once\override Tie.extra-offset = #'(0 . 0.4)
@@ -146,7 +145,8 @@ Alto = \context Voice = "two" \relative c' {
       \once\override Voice.Rest.X-offset = #0.6 g,4\rest d'2
     } >>
     s2.
-  | s1*3/2*4
+  | s1*3/2*3
+  | s1 gis2
   | << {
       d8\rest e~
       \once\shape #'((0 . -0.5) (0 . -0.5) (-0.5 . -0.5) (-1 . -0.5)) Tie

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
@@ -47,7 +47,7 @@ Soprano = \context Voice = "one" \relative c'' {
   | d2. \stemNeutral fis4\mordent \once\stemUp \grace fis8 g4.\mordent fis8
   | \once\stemUp \grace fis8 e4.\prall d8
     \once\stemUp \grace d8 cis4\parenthesize\prall b8 ais
-    \once\stemUp \grace a8 b4.\mordent cis8
+    \once\stemUp \grace ais8 b4.\mordent cis8
   | ais4.\prall gis8 fis cis' fis4 \stemUp e4.\prall fis8
   | d4.\prall cis8 b ais b cis cis4.\downprall b8
   | b2. \schleifer b4 e4. d8
@@ -57,7 +57,7 @@ Soprano = \context Voice = "one" \relative c'' {
   | \stemUp e4. fis8 g e a4\arpeggio g4.\downmordent a8
   | \once\override Staff.Script.extra-offset = #'(3 . -1)
     fis4.^\turn
-    gis8 \slurUp a( d,) cis( b)
+    gis8 \slurUp a( d,) cis[( b)]
     \once\override Staff.Script.extra-offset = #'(0.5 . 0)
     b4.\downmordent a8
   | a2.~ a2~ a8
@@ -174,7 +174,7 @@ Bass = \context Voice = "four" \relative c' {
   | e'4. e'8[ fis a] gis[ b a gis fis e]
   | a b a gis fis gis a fis gis b ais cis
   %5
-  | b cis b a gis a b gis cis \change Staff = "upper" \stemDown d dis fis
+  | b cis b a gis a b gis cis \change Staff = "upper" \stemDown e dis fis
   | \change Staff = "lower" \stemNeutral
     s1*3/2
   | r8 b,, cis dis e fis gis a b a b b,

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
@@ -41,9 +41,9 @@ Soprano = \context Voice = "one" \relative c'' {
       b8\rest
       ais \grace ais8 b2
     } >>
-  | c8. d32 e \slurDown d8( cis)
+  | c8. d32 e \slurDown d8( c)
     \once\shape #'((0 . 0.2) (0 . 0.3) (0 . 0.3) (0 . 0.5)) Slur
-    \appoggiatura cis
+    \appoggiatura c
     b \appoggiatura cis ais
   | b2.~
   %15

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
@@ -25,7 +25,9 @@ Soprano = \context Voice = "one" \relative c'' {
   %10
   | a b cis dis e cis fis e dis cis b a
   | gis e' dis cis b a gis( a32 b) fis8.\parenthesize\prall[ e16]
-  | e fis gis a b gis cis b a gis fis e
+  | \once\override Staff.TextScript.extra-offset = #'(1 . -1)
+    e_\markup { "piano" }
+    fis gis a b gis cis b a gis fis e
   | dis e fis gis a fis b a gis fis e dis
   | cis dis e fis gis e a gis fis e dis cis
   %15
@@ -58,7 +60,9 @@ Soprano = \context Voice = "one" \relative c'' {
   | e d cis b a g fis e' d cis b a
   %35
   | gis e fis gis a gis a16( b) gis8.\trill( fis32 gis)
-  | a16 b cis d e cis fis e d cis b a
+  | \once\override Staff.TextScript.extra-offset = #'(1 . -2)
+    a16_\markup { "piano" }
+    b cis d e cis fis e d cis b a
   | gis a b cis d b e d cis b a gis
   | fis gis a b cis a d cis b a gis fis
   | e d' cis b a gis a( b) b8.\trill a16