From 33046bb95d7325c3f17bb30b5dd35ac79efa16c1 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Wed, 18 Dec 2024 00:09:27 +0100 Subject: [PATCH] J.S. Bach: Suite Anglaise 1-6 BWV806-811: add index page Signed-off-by: Davide Madrisan --- CHANGELOG.md | 13 ++++- .../BWV806/JS-Bach-BWV806-Suite-Anglaise-1.ly | 3 ++ .../suites-anglaises/BWV806/Makefile.am | 1 + .../suites-anglaises/BWV806/index.ly | 51 +++++++++++++++++++ .../parts/bach-suite-anglaise-1-1-prelude.ly | 1 + .../bach-suite-anglaise-1-2-allemande.ly | 1 + .../bach-suite-anglaise-1-3-courante-1.ly | 1 + .../bach-suite-anglaise-1-3-courante-2.ly | 1 + .../parts/bach-suite-anglaise-1-4-double-1.ly | 1 + .../parts/bach-suite-anglaise-1-4-double-2.ly | 1 + .../bach-suite-anglaise-1-5-sarabande.ly | 1 + .../bach-suite-anglaise-1-6-bourree-1.ly | 1 + .../bach-suite-anglaise-1-6-bourree-2.ly | 1 + .../parts/bach-suite-anglaise-1-7-gigue.ly | 1 + .../BWV807/JS-Bach-BWV807-Suite-Anglaise-2.ly | 3 ++ .../suites-anglaises/BWV807/Makefile.am | 1 + .../suites-anglaises/BWV807/index.ly | 49 ++++++++++++++++++ .../parts/bach-suite-anglaise-2-1-prelude.ly | 1 + .../bach-suite-anglaise-2-2-allemande.ly | 1 + .../parts/bach-suite-anglaise-2-3-courante.ly | 1 + .../bach-suite-anglaise-2-4-sarabande-1.ly | 1 + .../bach-suite-anglaise-2-4-sarabande-2.ly | 1 + .../bach-suite-anglaise-2-5-bourree-1.ly | 1 + .../bach-suite-anglaise-2-5-bourree-2.ly | 1 + .../parts/bach-suite-anglaise-2-6-gigue.ly | 1 + .../BWV808/JS-Bach-BWV808-Suite-Anglaise-3.ly | 3 ++ .../suites-anglaises/BWV808/Makefile.am | 1 + .../suites-anglaises/BWV808/index.ly | 48 +++++++++++++++++ .../parts/bach-suite-anglaise-3-1-prelude.ly | 1 + .../bach-suite-anglaise-3-2-allemande.ly | 1 + .../parts/bach-suite-anglaise-3-3-courante.ly | 1 + .../bach-suite-anglaise-3-4-sarabande.ly | 1 + .../bach-suite-anglaise-3-5-gavotte-1.ly | 1 + .../bach-suite-anglaise-3-5-gavotte-2.ly | 1 + .../parts/bach-suite-anglaise-3-6-gigue.ly | 1 + .../BWV809/JS-Bach-BWV809-Suite-Anglaise-4.ly | 3 ++ .../suites-anglaises/BWV809/Makefile.am | 1 + .../suites-anglaises/BWV809/index.ly | 48 +++++++++++++++++ .../parts/bach-suite-anglaise-4-1-prelude.ly | 1 + .../bach-suite-anglaise-4-2-allemande.ly | 2 +- .../parts/bach-suite-anglaise-4-3-courante.ly | 1 + .../bach-suite-anglaise-4-4-sarabande.ly | 1 + .../parts/bach-suite-anglaise-4-5-menuet-1.ly | 1 + .../parts/bach-suite-anglaise-4-5-menuet-2.ly | 1 + .../parts/bach-suite-anglaise-4-6-giga.ly | 1 + .../BWV810/JS-Bach-BWV810-Suite-Anglaise-5.ly | 3 ++ .../suites-anglaises/BWV810/Makefile.am | 1 + .../suites-anglaises/BWV810/index.ly | 48 +++++++++++++++++ .../parts/bach-suite-anglaise-5-1-prelude.ly | 1 + .../bach-suite-anglaise-5-2-allemande.ly | 1 + .../parts/bach-suite-anglaise-5-3-courante.ly | 1 + .../bach-suite-anglaise-5-4-sarabande.ly | 1 + .../bach-suite-anglaise-5-5-passepied-1.ly | 1 + .../bach-suite-anglaise-5-5-passepied-2.ly | 1 + .../parts/bach-suite-anglaise-5-6-gigue.ly | 13 ++--- .../BWV811/JS-Bach-BWV811-Suite-Anglaise-6.ly | 3 ++ .../suites-anglaises/BWV811/Makefile.am | 1 + .../suites-anglaises/BWV811/index.ly | 49 ++++++++++++++++++ .../parts/bach-suite-anglaise-6-1-prelude.ly | 1 + .../bach-suite-anglaise-6-2-allemande.ly | 1 + .../parts/bach-suite-anglaise-6-3-courante.ly | 1 + .../bach-suite-anglaise-6-4-sarabande.ly | 1 + .../parts/bach-suite-anglaise-6-5-double.ly | 1 + .../bach-suite-anglaise-6-6-gavotte-1.ly | 1 + .../bach-suite-anglaise-6-6-gavotte-2.ly | 1 + .../parts/bach-suite-anglaise-6-7-gigue.ly | 1 + 66 files changed, 377 insertions(+), 13 deletions(-) create mode 100644 src/johann-sebastian-bach/suites-anglaises/BWV806/index.ly create mode 100644 src/johann-sebastian-bach/suites-anglaises/BWV807/index.ly create mode 100644 src/johann-sebastian-bach/suites-anglaises/BWV808/index.ly create mode 100644 src/johann-sebastian-bach/suites-anglaises/BWV809/index.ly create mode 100644 src/johann-sebastian-bach/suites-anglaises/BWV810/index.ly create mode 100644 src/johann-sebastian-bach/suites-anglaises/BWV811/index.ly diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c1a27d5..5019d2c4 100644 --- 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 index 763ab357..d1c6cb78 100644 --- 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 index 86e39431..149ddc82 100644 --- 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 new file mode 100644 index 00000000..892ce806 --- /dev/null +++ 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 index d5dfb994..f167774f 100644 --- 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 index 11faba28..e3abc082 100644 --- 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/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-1.ly index 229806e1..8ed80d16 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-1.ly +++ b/src/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/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-2.ly index b2686b60..978b8404 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV806/parts/bach-suite-anglaise-1-3-courante-2.ly +++ b/src/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 index eb93523e..ac615971 100644 --- 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 index 13dc33e8..272de5a8 100644 --- 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 index b535ed4c..0b03c5d9 100644 --- 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 index 23818289..f07a2d7c 100644 --- 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 index 8bf1696f..c3736867 100644 --- 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 index fcf1e54f..1f9182c5 100644 --- 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 index 1be8f9cf..7757f253 100644 --- 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 index 8de1a57a..2ffc75ae 100644 --- 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 new file mode 100644 index 00000000..f58dfefd --- /dev/null +++ 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 index b8ef8bba..cccddf33 100644 --- 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 index aa608391..1d8be2da 100644 --- 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 index 09f9ead2..43005334 100644 --- 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/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-1.ly index 49e68580..b5c14455 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-1.ly +++ b/src/johann-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/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-2.ly index 794cffa3..cefbcf2e 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV807/parts/bach-suite-anglaise-2-4-sarabande-2.ly +++ b/src/johann-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 index 3e90c7ab..cf9cfbf5 100644 --- 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 index 83ecc6eb..f5c727a1 100644 --- 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 index 11dab878..6d8a171c 100644 --- 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 index 1e4b3602..fe55e3be 100644 --- 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 index ea1b5edd..ffb7b777 100644 --- 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 new file mode 100644 index 00000000..7e7f9714 --- /dev/null +++ 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 index 73cd642a..45e9ab9a 100644 --- 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 index 3a3918d9..4572098e 100644 --- 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 index c959c3eb..d031e903 100644 --- 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 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-4-sarabande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-4-sarabande.ly index f9655023..4c29a93e 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-4-sarabande.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-4-sarabande.ly @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteIIISarabande \repeat volta 2 { %1 | 8 a'4 . c16 bes diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-5-gavotte-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-5-gavotte-1.ly index 8f1ecd3a..8cce0fbb 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-5-gavotte-1.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-5-gavotte-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 #'SuiteIIIGavotteI \repeat volta 2 { \partial 2 g'4 bes8 a %1 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 index 92a4405d..b265aad1 100644 --- 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 @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' { \stemNeutral\tieNeutral\slurNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteIIIGavotteII \repeat volta 2 { \partial 2 d4 e8( c) %1 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-6-gigue.ly b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-6-gigue.ly index 385ea51c..edc4a0f9 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-6-gigue.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV808/parts/bach-suite-anglaise-3-6-gigue.ly @@ -10,6 +10,7 @@ Soprano = \context Voice = "one" \relative c'' { \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 \mergeDifferentlyDottedOn + \label #'SuiteIIIGigue \repeat volta 2 { \partial 8 d8 %1 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/JS-Bach-BWV809-Suite-Anglaise-4.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/JS-Bach-BWV809-Suite-Anglaise-4.ly index d8139631..ae52ef90 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/JS-Bach-BWV809-Suite-Anglaise-4.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/JS-Bach-BWV809-Suite-Anglaise-4.ly @@ -98,6 +98,9 @@ } } +\include "./index.ly" +\pageBreak + \include "./parts/bach-suite-anglaise-4-1-prelude.ly" \pageBreak \include "./parts/bach-suite-anglaise-4-2-allemande.ly" diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/Makefile.am b/src/johann-sebastian-bach/suites-anglaises/BWV809/Makefile.am index a0846213..7b03b2a9 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/Makefile.am +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = JS-Bach-BWV809-Suite-Anglaise-4.ly \ covercolor.ly.in \ header.ily \ global.ly \ + index.ly \ logo.ly \ parts/bach-suite-anglaise-4-1-prelude.ly \ parts/bach-suite-anglaise-4-2-allemande.ly \ diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/index.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/index.ly new file mode 100644 index 00000000..9d2eccd0 --- /dev/null +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/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 IV" + } + } +} + +\markup { + \vspace #1 +} + +\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 "" } diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-1-prelude.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-1-prelude.ly index 37877fea..3827f062 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-1-prelude.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-1-prelude.ly @@ -5,6 +5,7 @@ Global = { } Upper = \relative c' { + \label #'SuiteIVPrelude \tempo \markup { \italic Vitement } %1 | r16 c-. d-. e-. f-. g-. a-. f-. bes-. c-. bes-. a-. g-. c-. bes-. c-. diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-2-allemande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-2-allemande.ly index 818c7088..51e2c7b9 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-2-allemande.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-2-allemande.ly @@ -7,9 +7,9 @@ Global = { Upper = \relative c'' { \clef treble \Global + \label #'SuiteIVAllemande \partial 16 \repeat volta 4 { - \stemUp f16 | << { f8~ f32 f e d } \\ c8 \\ a >> c16 d c bes \tupletUp \tuplet 3/2 8 { diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-3-courante.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-3-courante.ly index ee5ce266..98b3d413 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-3-courante.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-3-courante.ly @@ -7,6 +7,7 @@ Global = { Upper = \relative c'' { \clef treble \Global + \label #'SuiteIVCourante \partial 8 \repeat volta 4 { f8 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-4-sarabande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-4-sarabande.ly index 990d0038..bd227af1 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-4-sarabande.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-4-sarabande.ly @@ -7,6 +7,7 @@ Global = { Upper = \relative c'' { \clef treble \Global + \label #'SuiteIVSarabande \repeat volta 2 { << { c8. ees32 d ees2 } \\ { \once \stemUp \override NoteColumn.force-hshift = #0.4 a,4 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-1.ly index 55297545..c122c3c1 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-1.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-1.ly @@ -7,6 +7,7 @@ Global = { Upper = \relative c'' { \clef treble \Global + \label #'SuiteIVMenuetI f,8 g g4.\prall f16 g \repeat volta 2 { | a8 bes c4 f diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-2.ly index 87b6ef63..a4654988 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-2.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-5-menuet-2.ly @@ -7,6 +7,7 @@ Global = { Upper = \relative c'' { \clef treble \Global + \label #'SuiteIVMenuetII \repeat volta 2 { | f4 e d | cis\prall \appoggiatura cis8 d2 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-6-giga.ly b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-6-giga.ly index bd174c6a..1dbc3d5f 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-6-giga.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV809/parts/bach-suite-anglaise-4-6-giga.ly @@ -7,6 +7,7 @@ Global = { Upper = \relative c'' { \clef treble \Global + \label #'SuiteIVGigue \partial 8 \repeat volta 2 { c,8 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/JS-Bach-BWV810-Suite-Anglaise-5.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/JS-Bach-BWV810-Suite-Anglaise-5.ly index feaaf0fd..7a812dee 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/JS-Bach-BWV810-Suite-Anglaise-5.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/JS-Bach-BWV810-Suite-Anglaise-5.ly @@ -98,6 +98,9 @@ } } +\include "./index.ly" +\pageBreak + \include "./parts/bach-suite-anglaise-5-1-prelude.ly" \pageBreak \include "./parts/bach-suite-anglaise-5-2-allemande.ly" diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/Makefile.am b/src/johann-sebastian-bach/suites-anglaises/BWV810/Makefile.am index 493708f4..204ebbd2 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/Makefile.am +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = JS-Bach-BWV810-Suite-Anglaise-5.ly \ covercolor.ly.in \ header.ily \ global.ly \ + index.ly \ logo.ly \ parts/bach-suite-anglaise-5-1-prelude.ly \ parts/bach-suite-anglaise-5-2-allemande.ly \ diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/index.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/index.ly new file mode 100644 index 00000000..74fe00e4 --- /dev/null +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/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 V" + } + } +} + +\markup { + \vspace #1 +} + +\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 "" } diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-1-prelude.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-1-prelude.ly index 30a09900..02888dda 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-1-prelude.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-1-prelude.ly @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #2 \override Rest.staff-position = #0 + \label #'SuiteVPrelude %1 | R1*6/8*2 | f8\rest e8. e16 b8 g'16 fis g e diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-2-allemande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-2-allemande.ly index 95f13933..68ec15f9 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-2-allemande.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-2-allemande.ly @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVAllemande \partial 16 e16 \repeat volta 2 { %1 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-3-courante.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-3-courante.ly index 61be8de8..0e1f7911 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-3-courante.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-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 #'SuiteVCourante \repeat volta 2 { \partial 8 \once\stemNeutral b8 %1 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-4-sarabande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-4-sarabande.ly index 881db347..bf396bcd 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-4-sarabande.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-4-sarabande.ly @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVSarabande %1 \repeat volta 2 { | b8 a16 b c8^. b^. a^. g^. diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-1.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-1.ly index f3283744..89ba3f61 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-1.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-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 #'SuiteVPassepiedI \partial 8 b8 %1 | e16 fis g8 fis diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-2.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-2.ly index ee958f93..0094939b 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-2.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-5-passepied-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 #'SuiteVPassepiedII \repeat volta 2 { \partial 8 b'8 %1 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-6-gigue.ly b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-6-gigue.ly index 486d3d5f..94237b75 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-6-gigue.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV810/parts/bach-suite-anglaise-5-6-gigue.ly @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVGigue %1 \repeat volta 2 { | b16 c b a g fis @@ -174,11 +175,11 @@ Alto = \context Voice = "two" \relative c' { %42 | e,8. fis16 d8~ | d16 e cis4 - | b8 \change Staff = "lower" \stemUp a a\rest + | b8 \change Staff = "lower" \voiceThree \stemUp a a\rest %45 | a\rest g fis | a\rest e16 dis e8 - | \change Staff = "upper" \stemDown + | \change Staff = "upper" \voiceTwo \stemDown s1*3/8*2 | \magnifyMusic 0.8 { R1*3/8*4 } | b'16 ais b cis d e @@ -227,13 +228,6 @@ Alto = \context Voice = "two" \relative c' { | s fis } -Tenor = \context Voice = "three" \relative c { - \voiceThree - \stemUp\tieUp - \override Rest.staff-position = #0 - %1 -} - Bass = \context Voice = "four" \relative c' { \voiceFour \stemNeutral\tieNeutral @@ -366,7 +360,6 @@ Bass = \context Voice = "four" \relative c' { \set Staff.midiInstrument = #"acoustic grand" \Global \clef bass - \Tenor \Bass >> >> diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/JS-Bach-BWV811-Suite-Anglaise-6.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/JS-Bach-BWV811-Suite-Anglaise-6.ly index f1c08d2b..cbe21dc2 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV811/JS-Bach-BWV811-Suite-Anglaise-6.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV811/JS-Bach-BWV811-Suite-Anglaise-6.ly @@ -98,6 +98,9 @@ } } +\include "./index.ly" +\pageBreak + \include "./parts/bach-suite-anglaise-6-1-prelude.ly" \pageBreak \include "./parts/bach-suite-anglaise-6-2-allemande.ly" diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/Makefile.am b/src/johann-sebastian-bach/suites-anglaises/BWV811/Makefile.am index 1fac3939..eccfb749 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV811/Makefile.am +++ b/src/johann-sebastian-bach/suites-anglaises/BWV811/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = JS-Bach-BWV811-Suite-Anglaise-6.ly \ covercolor.ly.in \ header.ily \ global.ly \ + index.ly \ logo.ly \ parts/bach-suite-anglaise-6-1-prelude.ly \ parts/bach-suite-anglaise-6-2-allemande.ly \ diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/index.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/index.ly new file mode 100644 index 00000000..6bb92c4c --- /dev/null +++ b/src/johann-sebastian-bach/suites-anglaises/BWV811/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 VI" + } + } +} + +\markup { + \vspace #1 +} + +\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 "" } diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-1-prelude.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-1-prelude.ly index 23fa4cc5..2252c1da 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-1-prelude.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-1-prelude.ly @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVIPrelude %1 | r4 r8 d f a cis, g' bes | a4 d,8 f a d~ d e cis diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-2-allemande.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-2-allemande.ly index 8006879d..96bbc3ac 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-2-allemande.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-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 #'SuiteVIAllemande \repeat volta 2 { \partial 16 d16 %1 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-3-courante.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-3-courante.ly index abe674cf..9096df23 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-3-courante.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-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 #'SuiteVICourante \repeat volta 2 { \partial 8 d8 %1 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 index 4e377378..453c3f29 100644 --- 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 @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVISarabande \repeat volta 2 { %1 | f2 e2. f4 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 index fc2f158f..107d86ee 100644 --- 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 @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 \mergeDifferentlyDottedOn + \label #'SuiteVIDouble \repeat volta 2 { %1 | f2 e~ e8 g f 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 index 72f0d69f..c972b5da 100644 --- 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 @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVIGavotteI \repeat volta 2 { \partial 2 a'4 a %1 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 index 1d511508..738c6bd6 100644 --- 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 @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVIGavotteII \repeat volta 2 { \partial 2 fis4 fis %1 diff --git a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-7-gigue.ly b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-7-gigue.ly index 68ac3f2e..c5d91f1f 100644 --- a/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-7-gigue.ly +++ b/src/johann-sebastian-bach/suites-anglaises/BWV811/parts/bach-suite-anglaise-6-7-gigue.ly @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'SuiteVIGigue \repeat volta 2 { %1 | d16 cis d e cis d f cis d g cis, d