J.S. Bach: Partiten: merge the six partitas into a single document

Signed-off-by: Davide Madrisan <[email protected]>

CHANGELOG.md

@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - J.S. Bach: Suite Anglaise 5 BWV810: add index page
 - J.S. Bach: Suite Anglaise 6 BWV811: add index page
 - J.S. Bach: Suite Anglaise BWV806-811: merge the six suites into a single document
+- J.S. Bach: Partiten: merge the six partitas into a single document
 - Change license to C-BY-NC-SA 4.0 (https://spdx.org/licenses/CC-BY-NC-SA-4.0.html)
 
 ## [v59] - 2024-12-08

DEVELOPERS.md

@@ -61,12 +61,7 @@ make -C src/johann-sebastian-bach/italienisches-konzert-BWV971
 make -C src/johann-sebastian-bach/musikalisches-opfer-BWV1079
 make -C src/johann-sebastian-bach/organ-sonata-4-andante-BWV528-stradal
 make -C src/johann-sebastian-bach/ouverture-nach-franzosischer-art-BWV831
-make -C src/johann-sebastian-bach/partitas/BWV825
-make -C src/johann-sebastian-bach/partitas/BWV826
-make -C src/johann-sebastian-bach/partitas/BWV827
-make -C src/johann-sebastian-bach/partitas/BWV828
-make -C src/johann-sebastian-bach/partitas/BWV829
-make -C src/johann-sebastian-bach/partitas/BWV830
+make -C src/johann-sebastian-bach/partitas
 make -C src/johann-sebastian-bach/praeludium-fuge-und-allegro-BWV998
 make -C src/johann-sebastian-bach/praeludium-und-fughetta-BWV900
 make -C src/johann-sebastian-bach/praeludium-und-fughetta-BWV901

configure.ac

@@ -140,12 +140,6 @@ AC_CONFIG_FILES([\
   src/johann-sebastian-bach/organ-sonata-4-andante-BWV528-stradal/Makefile \
   src/johann-sebastian-bach/ouverture-nach-franzosischer-art-BWV831/Makefile \
   src/johann-sebastian-bach/partitas/Makefile \
-  src/johann-sebastian-bach/partitas/BWV825/Makefile \
-  src/johann-sebastian-bach/partitas/BWV826/Makefile \
-  src/johann-sebastian-bach/partitas/BWV827/Makefile \
-  src/johann-sebastian-bach/partitas/BWV828/Makefile \
-  src/johann-sebastian-bach/partitas/BWV829/Makefile \
-  src/johann-sebastian-bach/partitas/BWV830/Makefile \
   src/johann-sebastian-bach/praludien/Makefile \
   src/johann-sebastian-bach/praludien/neun-kleine-praludien-BWV924-932/Makefile
   src/johann-sebastian-bach/praludien/sechs-kleine-praludien-BWV933-938/Makefile \

src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly

@@ -1,7 +1,7 @@
 Global = {
   \key bes \major
   \time 4/4
-  \include "../global.ly"
+  \include "../../global.ly"
 }
 
 greyTextColor = #(x11-color "dimgray")
@@ -13,6 +13,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \voiceOne
   \stemNeutral
   \showStaffSwitch
+  \label #'PartitaIPraeludium
   %1
   | r16 bes[ bes32 \prall a bes16] c bes d bes es[ bes bes32 \prall a bes16] d bes es bes
   | f'[ bes, bes32 \prall a bes16] g' bes, a' bes, bes'[ a32 g f16 bes] c,32[ d es8 d32 c]
@@ -48,6 +49,7 @@ Alto = \context Voice = "two" \relative c' {
   \stemDown
   \override Rest.staff-position = #0
   \override VoiceFollower.color = \greyTextColor
+  \override VoiceFollower.style = #'dashed-line
   \showStaffSwitch\tieUp
   %1
   | \staffLower\stemUp
@@ -151,8 +153,8 @@ Bass = \context Voice = "four" \relative c' {
   \header {
     composer = ##f % "Johann Sebastian @composer_lastnam@"
     opus = ##f % "BWV 825"
-    title = \markup { "Praeludium" }
-    subtitle = ##f
+    title = \markup { "Partita I" }
+    subtitle = \markup { "Praeludium" }
   }
   \layout {
     \context {

src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-2-allemande.ly

@@ -1,7 +1,7 @@
 Global = {
   \key bes \major
   \time 4/4
-  \include "../global.ly"
+  \include "../../global.ly"
 }
 
 staffLower = { \change Staff = "lower" }
@@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'PartitaIAllemande
   %1
   \repeat volta 4 {
   \partial 16 f16
@@ -101,8 +102,10 @@ Tenor = \context Voice = "three" \relative c' {
   \override Rest.staff-position = #0
   \partial 16 s16
   %1
-  | s1*16
-  | e16\rest d c8 a'16\rest c, d8 f16\rest a, bes8 e16\rest f, g8
+  | s1*3
+  | s2. bes8 a
+  | s1*12
+  | e'16\rest d c8 a'16\rest c, d8 f16\rest a, bes8 e16\rest f, g8
   | e'16\rest g, aes8~ aes g s4..
     \partial 16 s16
   | s1*8
@@ -121,12 +124,12 @@ Bass = \context Voice = "four" \relative c {
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
   \repeat volta 4 {
-  \partial 16 s16
+  \partial 16 r16
   %1
   | bes4 r r2
   | bes4 r a'2\rest
-  | \clef bass bes4 r a2\rest
-  | \clef bass bes,4 r r2
+  | \clef bass bes,4 r a2\rest
+  | \clef bass bes4 r r2
   %5
   | <bes g'>4 r <a fis'> r
   | <g g'> r a'2\rest

src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-3-corrente.ly

@@ -1,14 +1,15 @@
 Global = {
   \key bes \major
   \time 3/4
-  \include "../global.ly"
+  \include "../../global.ly"
 }
 
 Soprano = \context Voice = "one" \relative c'' {
   \voiceOne
   \stemNeutral\tieNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'PartitaICorrente
   \repeat volta 4 {
   \partial 8 bes8
   %1

src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-4-sarabande.ly

@@ -1,14 +1,15 @@
 Global = {
   \key bes \major
   \time 3/4
-  \include "../global.ly"
+  \include "../../global.ly"
 }
 
 Soprano = \context Voice = "one" \relative c'' {
   \voiceOne
   \stemUp\tieUp
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'PartitaISarabande
   \set baseMoment = #(ly:make-moment 1/8)
   \repeat volta 4 {
   %1

src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-1.ly

@@ -1,7 +1,7 @@
 Global = {
   \key bes \major
   \time 3/4
-  \include "../global.ly"
+  \include "../../global.ly"
 }
 
 staffLower = { \change Staff = "lower" }
@@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'PartitaIMenuetI
   %1
   \repeat volta 2 {
   | d8 bes a bes f bes

src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-2.ly

@@ -1,7 +1,7 @@
 Global = {
   \key bes \major
   \time 3/4
-  \include "../global.ly"
+  \include "../../global.ly"
 }
 
 staffLower = { \change Staff = "lower" }
@@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' {
   \stemNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'PartitaIMenuetII
   %1
   \repeat volta 2 {
   | bes2 f4

src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-6-giga.ly

@@ -1,14 +1,15 @@
 Global = {
   \key bes \major
   \time 4/4
-  \include "../global.ly"
+  \include "../../global.ly"
 }
 
 Soprano = \context Voice = "one" \relative c' {
   \voiceOne
   \stemNeutral
   \override MultiMeasureRest.staff-position = #0
   \override Rest.staff-position = #0
+  \label #'PartitaIGigue
   %1
   \repeat volta 2 {
   | \repeat unfold 4 { r8*2/3 d bes' }
@@ -190,7 +191,7 @@ Bass = \context Voice = "four" \relative c' {
   \header {
     composer = ##f % "Johann Sebastian @composer_lastnam@"
     opus = ##f % "BWV 825"
-    title = \markup { "Giga" }
+    title = \markup { "Gigue" }
     subtitle = ##f
   }
   \layout {