From 8dcca5947949a8d788879378bbfd724b15a4bd91 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Thu, 2 Jan 2025 21:18:51 +0200 Subject: [PATCH] J.S. Bach: Partiten: merge the six partitas into a single document Signed-off-by: Davide Madrisan --- CHANGELOG.md | 1 + DEVELOPERS.md | 7 +- configure.ac | 6 - .../BWV825/JS-Bach-BWV825-Partita-1.ly | 106 ---------- .../partitas/BWV825/Makefile.am | 40 ---- .../parts/bach-partita-1-1-praeludium.ly | 8 +- .../parts/bach-partita-1-2-allemande.ly | 15 +- .../BWV825/parts/bach-partita-1-3-corrente.ly | 3 +- .../parts/bach-partita-1-4-sarabande.ly | 3 +- .../BWV825/parts/bach-partita-1-5-menuet-1.ly | 3 +- .../BWV825/parts/bach-partita-1-5-menuet-2.ly | 3 +- .../BWV825/parts/bach-partita-1-6-giga.ly | 5 +- .../BWV826/JS-Bach-BWV826-Partita-2.ly | 106 ---------- .../partitas/BWV826/Makefile.am | 39 ---- .../partitas/BWV826/covercolor.ly.in | 1 - .../partitas/BWV826/global.ly | 3 - .../partitas/BWV826/header.ily | 65 ------ .../partitas/BWV826/logo.ly | 24 --- .../BWV826/parts/bach-partita-2-1-sinfonia.ly | 9 +- .../parts/bach-partita-2-2-allemande.ly | 3 +- .../BWV826/parts/bach-partita-2-3-courante.ly | 3 +- .../parts/bach-partita-2-4-sarabande.ly | 3 +- .../BWV826/parts/bach-partita-2-5-rondeau.ly | 3 +- .../parts/bach-partita-2-6-capriccio.ly | 3 +- .../BWV827/JS-Bach-BWV827-Partita-3.ly | 108 ---------- .../partitas/BWV827/Makefile.am | 40 ---- .../partitas/BWV827/covercolor.ly.in | 1 - .../partitas/BWV827/global.ly | 3 - .../partitas/BWV827/header.ily | 65 ------ .../partitas/BWV827/logo.ly | 24 --- .../BWV827/parts/bach-partita-3-1-fantasia.ly | 7 +- .../parts/bach-partita-3-2-allemande.ly | 3 +- .../BWV827/parts/bach-partita-3-3-corrente.ly | 3 +- .../parts/bach-partita-3-4-sarabande.ly | 3 +- .../BWV827/parts/bach-partita-3-5-burlesca.ly | 3 +- .../BWV827/parts/bach-partita-3-6-scherzo.ly | 3 +- .../BWV827/parts/bach-partita-3-7-gigue.ly | 3 +- .../BWV828/JS-Bach-BWV828-Partita-4.ly | 108 ---------- .../partitas/BWV828/Makefile.am | 40 ---- .../partitas/BWV828/covercolor.ly.in | 1 - .../partitas/BWV828/global.ly | 3 - .../partitas/BWV828/header.ily | 65 ------ .../partitas/BWV828/logo.ly | 24 --- .../parts/bach-partita-4-1-ouverture.ly | 54 ++--- .../parts/bach-partita-4-2-allemande.ly | 3 +- .../BWV828/parts/bach-partita-4-3-courante.ly | 3 +- .../BWV828/parts/bach-partita-4-4-aria.ly | 3 +- .../parts/bach-partita-4-5-sarabande.ly | 3 +- .../BWV828/parts/bach-partita-4-6-menuet.ly | 3 +- .../BWV828/parts/bach-partita-4-7-gigue.ly | 3 +- .../BWV829/JS-Bach-BWV829-Partita-5.ly | 108 ---------- .../partitas/BWV829/Makefile.am | 40 ---- .../partitas/BWV829/covercolor.ly.in | 1 - .../partitas/BWV829/global.ly | 3 - .../partitas/BWV829/header.ily | 65 ------ .../partitas/BWV829/logo.ly | 24 --- .../parts/bach-partita-5-1-praeludium.ly | 7 +- .../parts/bach-partita-5-2-allemande.ly | 3 +- ...urante.ly => bach-partita-5-3-corrente.ly} | 5 +- .../parts/bach-partita-5-4-sarabande.ly | 3 +- .../BWV829/parts/bach-partita-5-5-minuetto.ly | 5 +- .../parts/bach-partita-5-6-passepied.ly | 3 +- .../BWV829/parts/bach-partita-5-7-gigue.ly | 3 +- .../BWV830/JS-Bach-BWV830-Partita-6.ly | 101 --------- .../partitas/BWV830/Makefile.am | 45 ---- .../partitas/BWV830/covercolor.ly.in | 1 - .../partitas/BWV830/global.ly | 3 - .../partitas/BWV830/header.ily | 65 ------ .../partitas/BWV830/logo.ly | 24 --- .../BWV830/parts/bach-partita-6-1-toccata.ly | 13 +- .../parts/bach-partita-6-2-allemanda.ly | 5 +- .../BWV830/parts/bach-partita-6-3-corrente.ly | 3 +- .../BWV830/parts/bach-partita-6-4-air.ly | 3 +- .../parts/bach-partita-6-5-sarabande.ly | 3 +- .../BWV830/parts/bach-partita-6-6-gavotta.ly | 3 +- .../BWV830/parts/bach-partita-6-7-gigue.ly | 3 +- .../partitas/JS-Bach-BWV825-830-Partiten.ly | 200 ++++++++++++++++++ .../partitas/Makefile.am | 87 +++++++- .../partitas/{BWV825 => }/covercolor.ly.in | 0 .../partitas/{BWV825 => }/global.ly | 0 .../partitas/{BWV825 => }/header.ily | 14 +- src/johann-sebastian-bach/partitas/index.ly | 117 ++++++++++ .../partitas/{BWV825 => }/logo.ly | 0 .../partitas/{BWV826 => }/ossiasetup.ly | 0 84 files changed, 540 insertions(+), 1461 deletions(-) delete mode 100644 src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV825-Partita-1.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV825/Makefile.am delete mode 100644 src/johann-sebastian-bach/partitas/BWV826/JS-Bach-BWV826-Partita-2.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV826/Makefile.am delete mode 100644 src/johann-sebastian-bach/partitas/BWV826/covercolor.ly.in delete mode 100644 src/johann-sebastian-bach/partitas/BWV826/global.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV826/header.ily delete mode 100644 src/johann-sebastian-bach/partitas/BWV826/logo.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV827/JS-Bach-BWV827-Partita-3.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV827/Makefile.am delete mode 100644 src/johann-sebastian-bach/partitas/BWV827/covercolor.ly.in delete mode 100644 src/johann-sebastian-bach/partitas/BWV827/global.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV827/header.ily delete mode 100644 src/johann-sebastian-bach/partitas/BWV827/logo.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV828/JS-Bach-BWV828-Partita-4.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV828/Makefile.am delete mode 100644 src/johann-sebastian-bach/partitas/BWV828/covercolor.ly.in delete mode 100644 src/johann-sebastian-bach/partitas/BWV828/global.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV828/header.ily delete mode 100644 src/johann-sebastian-bach/partitas/BWV828/logo.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV829/JS-Bach-BWV829-Partita-5.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV829/Makefile.am delete mode 100644 src/johann-sebastian-bach/partitas/BWV829/covercolor.ly.in delete mode 100644 src/johann-sebastian-bach/partitas/BWV829/global.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV829/header.ily delete mode 100644 src/johann-sebastian-bach/partitas/BWV829/logo.ly rename src/johann-sebastian-bach/partitas/BWV829/parts/{bach-partita-5-3-courante.ly => bach-partita-5-3-corrente.ly} (97%) delete mode 100644 src/johann-sebastian-bach/partitas/BWV830/JS-Bach-BWV830-Partita-6.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV830/Makefile.am delete mode 100644 src/johann-sebastian-bach/partitas/BWV830/covercolor.ly.in delete mode 100644 src/johann-sebastian-bach/partitas/BWV830/global.ly delete mode 100644 src/johann-sebastian-bach/partitas/BWV830/header.ily delete mode 100644 src/johann-sebastian-bach/partitas/BWV830/logo.ly create mode 100644 src/johann-sebastian-bach/partitas/JS-Bach-BWV825-830-Partiten.ly rename src/johann-sebastian-bach/partitas/{BWV825 => }/covercolor.ly.in (100%) rename src/johann-sebastian-bach/partitas/{BWV825 => }/global.ly (100%) rename src/johann-sebastian-bach/partitas/{BWV825 => }/header.ily (89%) create mode 100644 src/johann-sebastian-bach/partitas/index.ly rename src/johann-sebastian-bach/partitas/{BWV825 => }/logo.ly (100%) rename src/johann-sebastian-bach/partitas/{BWV826 => }/ossiasetup.ly (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c3832c2..ed8b84b8 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 95b915f1..5c44e7b6 100644 --- a/DEVELOPERS.md +++ b/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 diff --git a/configure.ac b/configure.ac index f4d19e36..c79ec06c 100644 --- a/configure.ac +++ b/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 \ diff --git a/src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV825-Partita-1.ly b/src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV825-Partita-1.ly deleted file mode 100644 index 623d1587..00000000 --- a/src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV825-Partita-1.ly +++ /dev/null @@ -1,106 +0,0 @@ -\version "2.25.12" - -#(ly:set-option 'relative-includes #t) - -\include "./covercolor.ly" - -\header { - tagline = ##f -} - -\paper { - #(set-paper-size "a4") - annotate-spacing = ##f - binding-offset = 0\mm - bottom-margin = 5\mm - first-page-number = 0 - indent = 0.0 - inner-margin = 10\mm -% last-bottom-spacing.padding = #2 - left-margin = 10\mm - line-width = 18.4\cm - markup-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - outer-margin = 20\mm - print-all-headers = ##t - ragged-last-bottom = ##f - ragged-bottom = ##f - right-margin = 10\mm - system-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 28)) - top-margin = 10\mm - top-markup-spacing.basic-distance = 0 - top-system-spacing.basic-distance = 1 -} - -\bookpart { - \header { - maintainer = "Davide Madrisan" - maintainerEmail = "d.madrisan@proton.me" - } - - \include "./header.ily" - \header { - title = ##f - composer = ##f - } - - \markup { - \with-dimensions #'(0 . 0) #'(0 . 0) - \with-color \coverColor - \filled-box #'(-200 . 200) #'(-200 . 200) #0 - } - \markup { - \fill-line { - \center-column { - \null\null\null\null - \null\null\null\null - \line { \abs-fontsize #30 \bold "Johann Sebastian" } - \null - \line { \abs-fontsize #80 \bold "Bach" } - \null - \fill-line { \draw-hline } - \null\null\null - \line { \abs-fontsize #40 \bold "Partita I" } - \null\null - \line { \abs-fontsize #20 "BWV 825" } - \null\null\null\null - \fill-line \italic { \abs-fontsize #14 "For Piano, Harpsichord, Clavichord" } - \null\null\null - \null\null\null - } - } - } - - \include "./logo.ly" - - \markup { - \fill-line { - \center-column { - \null\null\null\null - \fill-line { - \abs-fontsize #10 "Based on: Muzgiz, Moscow" - } - \null\null - } - } - } -} - -\include "./parts/bach-partita-1-1-praeludium.ly" -\pageBreak -\include "./parts/bach-partita-1-2-allemande.ly" -\pageBreak -\include "./parts/bach-partita-1-3-corrente.ly" -\pageBreak -\include "./parts/bach-partita-1-4-sarabande.ly" -\pageBreak -\include "./parts/bach-partita-1-5-menuet-1.ly" -\include "./parts/bach-partita-1-5-menuet-2.ly" -\include "./parts/bach-partita-1-6-giga.ly" diff --git a/src/johann-sebastian-bach/partitas/BWV825/Makefile.am b/src/johann-sebastian-bach/partitas/BWV825/Makefile.am deleted file mode 100644 index 9de87301..00000000 --- a/src/johann-sebastian-bach/partitas/BWV825/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -SUFFIXES = .in -.in:; @echo "Generating $@...";\ - sed "s,@rgb_color@,$(RGB_COLOR),g;" \ - $< > $@ - -%: %.ly - $(LILYPOND) --pdf --output $@ $< - -BUILT_SOURCES = covercolor.ly - -EXTRA_DIST = JS-Bach-BWV825-Partita-1.ly \ - covercolor.ly.in \ - header.ily \ - global.ly \ - logo.ly \ - parts/bach-partita-1-1-praeludium.ly \ - parts/bach-partita-1-2-allemande.ly \ - parts/bach-partita-1-3-corrente.ly \ - parts/bach-partita-1-4-sarabande.ly \ - parts/bach-partita-1-5-menuet-1.ly \ - parts/bach-partita-1-5-menuet-2.ly \ - parts/bach-partita-1-6-giga.ly - -all: $(BUILT_SOURCES) JS-Bach-BWV825-Partita-1 - -clean-local: - -rm -f $(BUILT_SOURCES) - -rm -f *.midi parts/*.midi - -rm -f *.pdf parts/*.pdf diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly index 2ea721e6..2a30c2f0 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-1-praeludium.ly +++ b/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 { diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-2-allemande.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-2-allemande.ly index 16fe0471..240e0551 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-2-allemande.ly +++ b/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 | 4 r r | r a'2\rest diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-3-corrente.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-3-corrente.ly index 88be2613..acfdc11e 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-3-corrente.ly +++ b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-3-corrente.ly @@ -1,7 +1,7 @@ Global = { \key bes \major \time 3/4 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaICorrente \repeat volta 4 { \partial 8 bes8 %1 diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-4-sarabande.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-4-sarabande.ly index d6571607..102fb82d 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-4-sarabande.ly +++ b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-4-sarabande.ly @@ -1,7 +1,7 @@ Global = { \key bes \major \time 3/4 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \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 diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-1.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-1.ly index 87e71f53..0e1b709e 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-1.ly +++ b/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 diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-2.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-2.ly index 87f13064..a1c02be6 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-2.ly +++ b/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 diff --git a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-6-giga.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-6-giga.ly index aa516b01..1be93833 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-6-giga.ly +++ b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-6-giga.ly @@ -1,7 +1,7 @@ Global = { \key bes \major \time 4/4 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c' { \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 { diff --git a/src/johann-sebastian-bach/partitas/BWV826/JS-Bach-BWV826-Partita-2.ly b/src/johann-sebastian-bach/partitas/BWV826/JS-Bach-BWV826-Partita-2.ly deleted file mode 100644 index 80c20682..00000000 --- a/src/johann-sebastian-bach/partitas/BWV826/JS-Bach-BWV826-Partita-2.ly +++ /dev/null @@ -1,106 +0,0 @@ -\version "2.25.12" - -#(ly:set-option 'relative-includes #t) - -\include "./covercolor.ly" - -\header { - tagline = ##f -} - -\paper { - #(set-paper-size "a4") - annotate-spacing = ##f - binding-offset = 0\mm - bottom-margin = 5\mm - first-page-number = 0 - indent = 0.0 - inner-margin = 10\mm -% last-bottom-spacing.padding = #2 - left-margin = 10\mm - line-width = 18.4\cm - markup-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - outer-margin = 20\mm - print-all-headers = ##t - ragged-last-bottom = ##f - ragged-bottom = ##f - right-margin = 10\mm - system-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - top-margin = 10\mm - top-markup-spacing.basic-distance = 0 - top-system-spacing.basic-distance = 1 -} - -\bookpart { - \header { - maintainer = "Davide Madrisan" - maintainerEmail = "d.madrisan@proton.me" - } - - \include "./header.ily" - \header { - title = ##f - composer = ##f - } - - \markup { - \with-dimensions #'(0 . 0) #'(0 . 0) - \with-color \coverColor - \filled-box #'(-200 . 200) #'(-200 . 200) #0 - } - \markup { - \fill-line { - \center-column { - \null\null\null\null - \null\null\null\null - \line { \abs-fontsize #30 \bold "Johann Sebastian" } - \null - \line { \abs-fontsize #80 \bold "Bach" } - \null - \fill-line { \draw-hline } - \null\null\null - \line { \abs-fontsize #40 \bold "Partita II" } - \null\null - \line { \abs-fontsize #20 "BWV 826" } - \null\null\null\null - \fill-line \italic { \abs-fontsize #14 "For Piano, Harpsichord, Clavichord" } - \null\null\null - \null\null\null - } - } - } - - \include "./logo.ly" - - \markup { - \fill-line { - \center-column { - \null\null\null\null - \fill-line { - \abs-fontsize #10 "Based on: Bach-Gesellschaft Ausgabe, Leipzig (1853)" - } - \null\null - } - } - } -} - -\include "./parts/bach-partita-2-1-sinfonia.ly" -\pageBreak -\include "./parts/bach-partita-2-2-allemande.ly" -\pageBreak -\include "./parts/bach-partita-2-3-courante.ly" -\pageBreak -\include "./parts/bach-partita-2-4-sarabande.ly" -\pageBreak -\include "./parts/bach-partita-2-5-rondeau.ly" -\pageBreak -\include "./parts/bach-partita-2-6-capriccio.ly" diff --git a/src/johann-sebastian-bach/partitas/BWV826/Makefile.am b/src/johann-sebastian-bach/partitas/BWV826/Makefile.am deleted file mode 100644 index 246b5bd1..00000000 --- a/src/johann-sebastian-bach/partitas/BWV826/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -SUFFIXES = .in -.in:; @echo "Generating $@...";\ - sed "s,@rgb_color@,$(RGB_COLOR),g;" \ - $< > $@ - -%: %.ly - $(LILYPOND) --pdf --output $@ $< - -BUILT_SOURCES = covercolor.ly - -EXTRA_DIST = JS-Bach-BWV826-Partita-2.ly \ - covercolor.ly.in \ - header.ily \ - global.ly \ - logo.ly \ - parts/bach-partita-2-1-sinfonia.ly \ - parts/bach-partita-2-2-allemande.ly \ - parts/bach-partita-2-3-courante.ly \ - parts/bach-partita-2-4-sarabande.ly \ - parts/bach-partita-2-5-rondeau.ly \ - parts/bach-partita-2-6-capriccio.ly - -all: $(BUILT_SOURCES) JS-Bach-BWV826-Partita-2 - -clean-local: - -rm -f $(BUILT_SOURCES) - -rm -f *.midi parts/*.midi - -rm -f *.pdf parts/*.pdf diff --git a/src/johann-sebastian-bach/partitas/BWV826/covercolor.ly.in b/src/johann-sebastian-bach/partitas/BWV826/covercolor.ly.in deleted file mode 100644 index 1276805b..00000000 --- a/src/johann-sebastian-bach/partitas/BWV826/covercolor.ly.in +++ /dev/null @@ -1 +0,0 @@ -coverColor = #(rgb-color @rgb_color@) % lavender blue diff --git a/src/johann-sebastian-bach/partitas/BWV826/global.ly b/src/johann-sebastian-bach/partitas/BWV826/global.ly deleted file mode 100644 index f0b84c09..00000000 --- a/src/johann-sebastian-bach/partitas/BWV826/global.ly +++ /dev/null @@ -1,3 +0,0 @@ -% Draw a box round the bar number(s) -\override Score.BarNumber.stencil - = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) diff --git a/src/johann-sebastian-bach/partitas/BWV826/header.ily b/src/johann-sebastian-bach/partitas/BWV826/header.ily deleted file mode 100644 index b890bc95..00000000 --- a/src/johann-sebastian-bach/partitas/BWV826/header.ily +++ /dev/null @@ -1,65 +0,0 @@ -\header { - composer = "Johann Sebastian Bach (1685-1750)" - date = "1727" - - footer = "Mutopia-2024/02/28" - - lastupdated = "2024 February 28" - license = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - maintainerEmail = "d.madrisan@proton.me" - maintainerWeb = "https://github.com/madrisan/open-scores" - - % Extra Mutopia Information - mutopiacomposer = "BachJS" - mutopiacopyright = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - mutopiainstrument = "Piano, Harpsichord, Clavicord" - mutopiamaintainer = "Davide Madrisan" - mutopiaopus = "BWV 826" - mutopiatitle = "Partita II" - - opus = "BWV 826" - title = "Partita II" - source = "Bach-Gesellschaft" - style = "Baroque" - - copyright = \markup { - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0) - \right-column { - \with-url #"http://www.MutopiaProject.org" { - \abs-fontsize #9 "Mutopia " - \concat { - \abs-fontsize #12 - \with-color \coverColor "ǀ" - \abs-fontsize #9 "Project " - } - } - } - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0 ) - \center-column { - \abs-fontsize #11.9 - \with-color #grey - \bold { "ǀ" "ǀ" } - } - \override #'(font-name . "DejaVu Sans,sans-serif") - \override #'(baseline-skip . 0) - \column { - \abs-fontsize #8 - \concat { - "Typeset using " \with-url #"http://www.lilypond.org" "LilyPond " ©" 2022-2024 ""by " \maintainer " — " \footer - } - \concat { - \concat { - \abs-fontsize #8 { - \with-url #"https://spdx.org/licenses/CC-BY-NC-SA-4.0.html" - "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - " — free to distribute, modify, and perform" - } - } - \abs-fontsize #13 \with-color \coverColor "ǀ" - } - } - } - tagline = ##f -} diff --git a/src/johann-sebastian-bach/partitas/BWV826/logo.ly b/src/johann-sebastian-bach/partitas/BWV826/logo.ly deleted file mode 100644 index 72be42ea..00000000 --- a/src/johann-sebastian-bach/partitas/BWV826/logo.ly +++ /dev/null @@ -1,24 +0,0 @@ -\markup { - \fill-line { - \center-column { - \fill-line { \abs-fontsize #20 \smallCaps "lavender" } - \fill-line { - \abs-fontsize #12 - \concat { - \draw-line #'(-3 . 0) - \smallCaps " b l u e " - \draw-line #'(-3 . 0) - } - } - \fill-line { \abs-fontsize #9 \smallCaps "Open Scores" } - \null - \fill-line { \abs-fontsize #10 "Engraved by Davide Madrisan" } - \fill-line { - \with-url #"https://github.com/madrisan/open-scores/" { - \abs-fontsize #10 - \typewriter "https://github.com/madrisan/open-scores/" - } - } - } - } -} diff --git a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-1-sinfonia.ly b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-1-sinfonia.ly index 22b37305..58d86673 100644 --- a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-1-sinfonia.ly +++ b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-1-sinfonia.ly @@ -1,7 +1,7 @@ Global = { \key c \minor \time 4/4 - \include "../global.ly" + \include "../../global.ly" } voiceOneOssia = \relative c'' { @@ -21,6 +21,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIISinfonia \tempo "Grave. Adagio" %1 | 4 g'16\rest ees16 d16. ees32 f4 g16\rest f16 f16. g32 @@ -301,7 +302,7 @@ Bass = \context Voice = "four" \relative c { << \new Staff = "ossia" \with { fontSize = #-3 - \include "./ossiasetup.ly" + \include "../../ossiasetup.ly" \hide Clef \remove Time_signature_engraver } @@ -329,8 +330,8 @@ Bass = \context Voice = "four" \relative c { \header { composer = ##f % "Johann Sebastian Bach" opus = ##f % "BWV 826" - title = \markup { "Sinfonia" } - subtitle = ##f + title = \markup { "Partita II" } + subtitle = \markup { "Sinfonia" } } \layout { \context { diff --git a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-2-allemande.ly b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-2-allemande.ly index 27c68065..28580aef 100644 --- a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-2-allemande.ly +++ b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-2-allemande.ly @@ -1,7 +1,7 @@ Global = { \key c \minor \time 2/2 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral\slurNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIAllemande \set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = 1,1,1,1 \repeat volta 2 { diff --git a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-3-courante.ly b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-3-courante.ly index 7253a7ac..4909d0c1 100644 --- a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-3-courante.ly +++ b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-3-courante.ly @@ -1,7 +1,7 @@ Global = { \key c \minor \time 3/2 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIICourante \repeat volta 2 { \partial 8 c8 %1 diff --git a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-4-sarabande.ly b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-4-sarabande.ly index ac7df063..7f3013e5 100644 --- a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-4-sarabande.ly +++ b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-4-sarabande.ly @@ -1,7 +1,7 @@ Global = { \key c \minor \time 3/4 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIISarabande %1 \repeat volta 2 { | g16 c d ees f, ees' d8~ d16 f, g aes diff --git a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-5-rondeau.ly b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-5-rondeau.ly index 097cb2c1..003b6ba6 100644 --- a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-5-rondeau.ly +++ b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-5-rondeau.ly @@ -1,7 +1,7 @@ Global = { \key c \minor \time 3/8 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIRondeau \omit TupletBracket %1 | c'8 c, d\prall diff --git a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-6-capriccio.ly b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-6-capriccio.ly index 26d812ff..6770b613 100644 --- a/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-6-capriccio.ly +++ b/src/johann-sebastian-bach/partitas/BWV826/parts/bach-partita-2-6-capriccio.ly @@ -1,7 +1,7 @@ Global = { \key c \minor \time 2/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIICapriccio \repeat volta 2 { %1 | r8 g c4~ diff --git a/src/johann-sebastian-bach/partitas/BWV827/JS-Bach-BWV827-Partita-3.ly b/src/johann-sebastian-bach/partitas/BWV827/JS-Bach-BWV827-Partita-3.ly deleted file mode 100644 index 163abfa4..00000000 --- a/src/johann-sebastian-bach/partitas/BWV827/JS-Bach-BWV827-Partita-3.ly +++ /dev/null @@ -1,108 +0,0 @@ -\version "2.25.12" - -#(ly:set-option 'relative-includes #t) - -\include "./covercolor.ly" - -\header { - tagline = ##f -} - -\paper { - #(set-paper-size "a4") - annotate-spacing = ##f - binding-offset = 0\mm - bottom-margin = 5\mm - first-page-number = 0 - indent = 0.0 - %inner-margin = 10\mm -% last-bottom-spacing.padding = #2 - %left-margin = 10\mm - line-width = 19\cm - markup-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - %outer-margin = 20\mm - print-all-headers = ##t - ragged-last-bottom = ##f - ragged-bottom = ##f - %right-margin = 10\mm - system-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - top-margin = 10\mm - top-markup-spacing.basic-distance = 0 - top-system-spacing.basic-distance = 1 -} - -\bookpart { - \header { - maintainer = "Davide Madrisan" - maintainerEmail = "d.madrisan@proton.me" - } - - \include "./header.ily" - \header { - title = ##f - composer = ##f - } - - \markup { - \with-dimensions #'(0 . 0) #'(0 . 0) - \with-color \coverColor - \filled-box #'(-200 . 200) #'(-200 . 200) #0 - } - \markup { - \fill-line { - \center-column { - \null\null\null\null - \null\null\null\null - \line { \abs-fontsize #30 \bold "Johann Sebastian" } - \null - \line { \abs-fontsize #80 \bold "Bach" } - \null - \fill-line { \draw-hline } - \null\null\null - \line { \abs-fontsize #40 \bold "Partita III" } - \null\null - \line { \abs-fontsize #20 "BWV 827" } - \null\null\null\null - \fill-line \italic { \abs-fontsize #14 "For Piano, Harpsichord, Clavichord" } - \null\null\null - \null\null\null - } - } - } - - \include "./logo.ly" - - \markup { - \fill-line { - \center-column { - \null\null\null\null - \fill-line { - \abs-fontsize #10 "Based on: Bach-Gesellschaft Ausgabe, Leipzig (1853)" - } - \null\null - } - } - } -} - -\include "./parts/bach-partita-3-1-fantasia.ly" -\pageBreak -\include "./parts/bach-partita-3-2-allemande.ly" -\pageBreak -\include "./parts/bach-partita-3-3-corrente.ly" -\pageBreak -\include "./parts/bach-partita-3-4-sarabande.ly" -\pageBreak -\include "./parts/bach-partita-3-5-burlesca.ly" -\pageBreak -\include "./parts/bach-partita-3-6-scherzo.ly" -\pageBreak -\include "./parts/bach-partita-3-7-gigue.ly" diff --git a/src/johann-sebastian-bach/partitas/BWV827/Makefile.am b/src/johann-sebastian-bach/partitas/BWV827/Makefile.am deleted file mode 100644 index be52ae6d..00000000 --- a/src/johann-sebastian-bach/partitas/BWV827/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -SUFFIXES = .in -.in:; @echo "Generating $@...";\ - sed "s,@rgb_color@,$(RGB_COLOR),g;" \ - $< > $@ - -%: %.ly - $(LILYPOND) --pdf --output $@ $< - -BUILT_SOURCES = covercolor.ly - -EXTRA_DIST = JS-Bach-BWV827-Partita-3.ly \ - covercolor.ly.in \ - header.ily \ - global.ly \ - logo.ly \ - parts/bach-partita-3-1-fantasia.ly \ - parts/bach-partita-3-2-allemande.ly \ - parts/bach-partita-3-3-corrente.ly \ - parts/bach-partita-3-4-sarabande.ly \ - parts/bach-partita-3-5-burlesca.ly \ - parts/bach-partita-3-6-scherzo.ly \ - parts/bach-partita-3-7-gigue.ly - -all: $(BUILT_SOURCES) JS-Bach-BWV827-Partita-3 - -clean-local: - -rm -f $(BUILT_SOURCES) - -rm -f *.midi parts/*.midi - -rm -f *.pdf parts/*.pdf diff --git a/src/johann-sebastian-bach/partitas/BWV827/covercolor.ly.in b/src/johann-sebastian-bach/partitas/BWV827/covercolor.ly.in deleted file mode 100644 index 1276805b..00000000 --- a/src/johann-sebastian-bach/partitas/BWV827/covercolor.ly.in +++ /dev/null @@ -1 +0,0 @@ -coverColor = #(rgb-color @rgb_color@) % lavender blue diff --git a/src/johann-sebastian-bach/partitas/BWV827/global.ly b/src/johann-sebastian-bach/partitas/BWV827/global.ly deleted file mode 100644 index f0b84c09..00000000 --- a/src/johann-sebastian-bach/partitas/BWV827/global.ly +++ /dev/null @@ -1,3 +0,0 @@ -% Draw a box round the bar number(s) -\override Score.BarNumber.stencil - = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) diff --git a/src/johann-sebastian-bach/partitas/BWV827/header.ily b/src/johann-sebastian-bach/partitas/BWV827/header.ily deleted file mode 100644 index cd20e944..00000000 --- a/src/johann-sebastian-bach/partitas/BWV827/header.ily +++ /dev/null @@ -1,65 +0,0 @@ -\header { - composer = "Johann Sebastian Bach (1685-1750)" - date = "between 1725 and 1731" - - footer = "Mutopia-2024/04/17" - - lastupdated = "2024 April 17" - license = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - maintainerEmail = "d.madrisan@proton.me" - maintainerWeb = "https://github.com/madrisan/open-scores" - - % Extra Mutopia Information - mutopiacomposer = "BachJS" - mutopiacopyright = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - mutopiainstrument = "Harpsichord, Piano" - mutopiamaintainer = "Davide Madrisan" - mutopiaopus = "BWV 827" - mutopiatitle = "Partita III" - - opus = "BWV 827" - title = "Partita III" - source = "Bach-Gesellschaft Ausgabe, Leipzig (1853)" - style = "Baroque" - - copyright = \markup { - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0) - \right-column { - \with-url #"http://www.MutopiaProject.org" { - \abs-fontsize #9 "Mutopia " - \concat { - \abs-fontsize #12 - \with-color \coverColor "ǀ" - \abs-fontsize #9 "Project " - } - } - } - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0 ) - \center-column { - \abs-fontsize #11.9 - \with-color #grey - \bold { "ǀ" "ǀ" } - } - \override #'(font-name . "DejaVu Sans,sans-serif") - \override #'(baseline-skip . 0) - \column { - \abs-fontsize #8 - \concat { - "Typeset using " \with-url #"http://www.lilypond.org" "LilyPond " ©" 2022-2024 ""by " \maintainer " — " \footer - } - \concat { - \concat { - \abs-fontsize #8 { - \with-url #"https://spdx.org/licenses/CC-BY-NC-SA-4.0.html" - "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - " — free to distribute, modify, and perform" - } - } - \abs-fontsize #13 \with-color \coverColor "ǀ" - } - } - } - tagline = ##f -} diff --git a/src/johann-sebastian-bach/partitas/BWV827/logo.ly b/src/johann-sebastian-bach/partitas/BWV827/logo.ly deleted file mode 100644 index 72be42ea..00000000 --- a/src/johann-sebastian-bach/partitas/BWV827/logo.ly +++ /dev/null @@ -1,24 +0,0 @@ -\markup { - \fill-line { - \center-column { - \fill-line { \abs-fontsize #20 \smallCaps "lavender" } - \fill-line { - \abs-fontsize #12 - \concat { - \draw-line #'(-3 . 0) - \smallCaps " b l u e " - \draw-line #'(-3 . 0) - } - } - \fill-line { \abs-fontsize #9 \smallCaps "Open Scores" } - \null - \fill-line { \abs-fontsize #10 "Engraved by Davide Madrisan" } - \fill-line { - \with-url #"https://github.com/madrisan/open-scores/" { - \abs-fontsize #10 - \typewriter "https://github.com/madrisan/open-scores/" - } - } - } - } -} diff --git a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-1-fantasia.ly b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-1-fantasia.ly index 9e498c70..0fdc76fc 100644 --- a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-1-fantasia.ly +++ b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-1-fantasia.ly @@ -1,7 +1,7 @@ Global = { \key a \minor \time 3/8 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral\slurNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIIFantasia %1 | r16 a b gis a c | d, b' e, d c b @@ -346,8 +347,8 @@ Bass = \context Voice = "four" \relative c' { \header { composer = ##f % "Johann Sebastian Bach" opus = ##f % "BWV 827" - title = \markup { "Fantasia" } - subtitle = ##f + title = \markup { "Partita III" } + subtitle = \markup { "Fantasia" } } \layout { \context { diff --git a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-2-allemande.ly b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-2-allemande.ly index 7155c587..1cd30f54 100644 --- a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-2-allemande.ly +++ b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-2-allemande.ly @@ -1,7 +1,7 @@ Global = { \key a \minor \time 4/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIIAllemande \set minimumBeamSubdivisionInterval = \musicLength 8 \repeat volta 2 { \partial 4 e8~ e32 d c b diff --git a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-3-corrente.ly b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-3-corrente.ly index 3386b832..3ff91fb6 100644 --- a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-3-corrente.ly +++ b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-3-corrente.ly @@ -1,7 +1,7 @@ Global = { \key a \minor \time 3/4 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIICorrente \repeat volta 2 { \partial 4 r16 d c b %1 diff --git a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-4-sarabande.ly b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-4-sarabande.ly index 9a56ee21..4d580914 100644 --- a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-4-sarabande.ly +++ b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-4-sarabande.ly @@ -1,7 +1,7 @@ Global = { \key a \minor \time 3/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIISarabande \omit TupletBracket \repeat volta 2 { \partial 4. a8 gis\prallmordent a diff --git a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-5-burlesca.ly b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-5-burlesca.ly index 97d0c387..94e450ac 100644 --- a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-5-burlesca.ly +++ b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-5-burlesca.ly @@ -1,7 +1,7 @@ Global = { \key a \minor \time 3/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIIBurlesca %1 \repeat volta 2 { | a8 b b\prall a16 b c8 gis diff --git a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-6-scherzo.ly b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-6-scherzo.ly index 6e2673ba..3f02e390 100644 --- a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-6-scherzo.ly +++ b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-6-scherzo.ly @@ -1,7 +1,7 @@ Global = { \key a \minor \time 2/4 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIIScherzo \repeat volta 2 { \partial 4 e16 c a8~ %1 diff --git a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-7-gigue.ly b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-7-gigue.ly index 54fc478e..957a3e6f 100644 --- a/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-7-gigue.ly +++ b/src/johann-sebastian-bach/partitas/BWV827/parts/bach-partita-3-7-gigue.ly @@ -1,7 +1,7 @@ Global = { \key a \minor \time 12/8 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIIIGigue \mergeDifferentlyDottedOn \repeat volta 2 { \partial 8 e8 diff --git a/src/johann-sebastian-bach/partitas/BWV828/JS-Bach-BWV828-Partita-4.ly b/src/johann-sebastian-bach/partitas/BWV828/JS-Bach-BWV828-Partita-4.ly deleted file mode 100644 index 3e4813ce..00000000 --- a/src/johann-sebastian-bach/partitas/BWV828/JS-Bach-BWV828-Partita-4.ly +++ /dev/null @@ -1,108 +0,0 @@ -\version "2.25.12" - -#(ly:set-option 'relative-includes #t) - -\include "./covercolor.ly" - -\header { - tagline = ##f -} - -\paper { - #(set-paper-size "a4") - annotate-spacing = ##f - binding-offset = 0\mm - bottom-margin = 5\mm - first-page-number = 0 - indent = 0.0 - inner-margin = 10\mm -% last-bottom-spacing.padding = #2 - left-margin = 10\mm - line-width = 18.4\cm - markup-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - outer-margin = 20\mm - print-all-headers = ##t - ragged-last-bottom = ##f - ragged-bottom = ##f - right-margin = 10\mm - system-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - top-margin = 10\mm - top-markup-spacing.basic-distance = 0 - top-system-spacing.basic-distance = 1 -} - -\bookpart { - \header { - maintainer = "Davide Madrisan" - maintainerEmail = "d.madrisan@proton.me" - } - - \include "./header.ily" - \header { - title = ##f - composer = ##f - } - - \markup { - \with-dimensions #'(0 . 0) #'(0 . 0) - \with-color \coverColor - \filled-box #'(-200 . 200) #'(-200 . 200) #0 - } - \markup { - \fill-line { - \center-column { - \null\null\null\null - \null\null\null\null - \line { \abs-fontsize #30 \bold "Johann Sebastian" } - \null - \line { \abs-fontsize #80 \bold "Bach" } - \null - \fill-line { \draw-hline } - \null\null\null - \line { \abs-fontsize #40 \bold "Partita IV" } - \null\null - \line { \abs-fontsize #20 "BWV 828" } - \null\null\null\null - \fill-line \italic { \abs-fontsize #14 "For Piano, Harpsichord, Clavichord" } - \null\null\null - \null\null\null - } - } - } - - \include "./logo.ly" - - \markup { - \fill-line { - \center-column { - \null\null\null\null - \fill-line { - \abs-fontsize #10 "Based on: Bach-Gesellschaft Ausgabe, Leipzig (1853)" - } - \null\null - } - } - } -} - -\include "./parts/bach-partita-4-1-ouverture.ly" -\pageBreak -\include "./parts/bach-partita-4-2-allemande.ly" -\pageBreak -\include "./parts/bach-partita-4-3-courante.ly" -\pageBreak -\include "./parts/bach-partita-4-4-aria.ly" -\pageBreak -\include "./parts/bach-partita-4-5-sarabande.ly" -\pageBreak -\include "./parts/bach-partita-4-6-menuet.ly" -\pageBreak -\include "./parts/bach-partita-4-7-gigue.ly" diff --git a/src/johann-sebastian-bach/partitas/BWV828/Makefile.am b/src/johann-sebastian-bach/partitas/BWV828/Makefile.am deleted file mode 100644 index c07270b5..00000000 --- a/src/johann-sebastian-bach/partitas/BWV828/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -SUFFIXES = .in -.in:; @echo "Generating $@...";\ - sed "s,@rgb_color@,$(RGB_COLOR),g;" \ - $< > $@ - -%: %.ly - $(LILYPOND) --pdf --output $@ $< - -BUILT_SOURCES = covercolor.ly - -EXTRA_DIST = JS-Bach-BWV828-Partita-4.ly \ - covercolor.ly.in \ - header.ily \ - global.ly \ - logo.ly \ - parts/bach-partita-4-1-ouverture.ly \ - parts/bach-partita-4-2-allemande.ly \ - parts/bach-partita-4-3-courante.ly \ - parts/bach-partita-4-4-aria.ly \ - parts/bach-partita-4-5-sarabande.ly \ - parts/bach-partita-4-6-menuet.ly \ - parts/bach-partita-4-7-gigue.ly - -all: $(BUILT_SOURCES) JS-Bach-BWV828-Partita-4 - -clean-local: - -rm -f $(BUILT_SOURCES) - -rm -f *.midi parts/*.midi - -rm -f *.pdf parts/*.pdf diff --git a/src/johann-sebastian-bach/partitas/BWV828/covercolor.ly.in b/src/johann-sebastian-bach/partitas/BWV828/covercolor.ly.in deleted file mode 100644 index 1276805b..00000000 --- a/src/johann-sebastian-bach/partitas/BWV828/covercolor.ly.in +++ /dev/null @@ -1 +0,0 @@ -coverColor = #(rgb-color @rgb_color@) % lavender blue diff --git a/src/johann-sebastian-bach/partitas/BWV828/global.ly b/src/johann-sebastian-bach/partitas/BWV828/global.ly deleted file mode 100644 index f0b84c09..00000000 --- a/src/johann-sebastian-bach/partitas/BWV828/global.ly +++ /dev/null @@ -1,3 +0,0 @@ -% Draw a box round the bar number(s) -\override Score.BarNumber.stencil - = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) diff --git a/src/johann-sebastian-bach/partitas/BWV828/header.ily b/src/johann-sebastian-bach/partitas/BWV828/header.ily deleted file mode 100644 index ec1bc55e..00000000 --- a/src/johann-sebastian-bach/partitas/BWV828/header.ily +++ /dev/null @@ -1,65 +0,0 @@ -\header { - composer = "Johann Sebastian Bach (1685-1750)" - date = "between 1726 and 1731" - - footer = "Mutopia-2024/03/01" - - lastupdated = "2024 March 01" - license = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - maintainerEmail = "d.madrisan@proton.me" - maintainerWeb = "https://github.com/madrisan/open-scores" - - % Extra Mutopia Information - mutopiacomposer = "BachJS" - mutopiacopyright = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - mutopiainstrument = "Harpsichord, Piano" - mutopiamaintainer = "Davide Madrisan" - mutopiaopus = "BWV 828" - mutopiatitle = "Partita IV" - - opus = "BWV 828" - title = "Partita IV" - source = "Bach-Gesellschaft Ausgabe, Leipzig (1853)" - style = "Baroque" - - copyright = \markup { - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0) - \right-column { - \with-url #"http://www.MutopiaProject.org" { - \abs-fontsize #9 "Mutopia " - \concat { - \abs-fontsize #12 - \with-color \coverColor "ǀ" - \abs-fontsize #9 "Project " - } - } - } - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0 ) - \center-column { - \abs-fontsize #11.9 - \with-color #grey - \bold { "ǀ" "ǀ" } - } - \override #'(font-name . "DejaVu Sans,sans-serif") - \override #'(baseline-skip . 0) - \column { - \abs-fontsize #8 - \concat { - "Typeset using " \with-url #"http://www.lilypond.org" "LilyPond " ©" 2022-2024 ""by " \maintainer " — " \footer - } - \concat { - \concat { - \abs-fontsize #8 { - \with-url #"https://spdx.org/licenses/CC-BY-NC-SA-4.0.html" - "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - " — free to distribute, modify, and perform" - } - } - \abs-fontsize #13 \with-color \coverColor "ǀ" - } - } - } - tagline = ##f -} diff --git a/src/johann-sebastian-bach/partitas/BWV828/logo.ly b/src/johann-sebastian-bach/partitas/BWV828/logo.ly deleted file mode 100644 index 72be42ea..00000000 --- a/src/johann-sebastian-bach/partitas/BWV828/logo.ly +++ /dev/null @@ -1,24 +0,0 @@ -\markup { - \fill-line { - \center-column { - \fill-line { \abs-fontsize #20 \smallCaps "lavender" } - \fill-line { - \abs-fontsize #12 - \concat { - \draw-line #'(-3 . 0) - \smallCaps " b l u e " - \draw-line #'(-3 . 0) - } - } - \fill-line { \abs-fontsize #9 \smallCaps "Open Scores" } - \null - \fill-line { \abs-fontsize #10 "Engraved by Davide Madrisan" } - \fill-line { - \with-url #"https://github.com/madrisan/open-scores/" { - \abs-fontsize #10 - \typewriter "https://github.com/madrisan/open-scores/" - } - } - } - } -} diff --git a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-1-ouverture.ly b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-1-ouverture.ly index cec2bf0f..021a10a5 100644 --- a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-1-ouverture.ly +++ b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-1-ouverture.ly @@ -1,7 +1,7 @@ Global = { \key d \major \time 2/2 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -13,6 +13,7 @@ Soprano = \context Voice = "one" \relative c'' { \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 \set minimumBeamSubdivisionInterval = \musicLength 8 + \label #'PartitaIVOuverture \stemUp \repeat volta 2 { %1 @@ -251,13 +252,14 @@ Alto = \context Voice = "two" \relative c'' { | s1*9/8*4 %38 | \stemUp a'4 r8 \override Stem.details.beamed-lengths = #'(4.5) - \staffLower\stemUp + \staffLower\voiceThree\stemUp \once\override NoteColumn.force-hshift = #0.4 e fis g \revert Stem.details.beamed-lengths \once\override NoteColumn.force-hshift = #0.4 e fis g - | \staffUpper\stemDown fis4 \staffLower\stemUp e8\rest \stemUp g4 e8\rest fis4 e8\rest + | \staffUpper\voiceTwo\stemDown fis4 + \staffLower\voiceThree\stemUp e8\rest \stemUp g4 e8\rest fis4 e8\rest %40 - | \staffUpper\stemDown e4 b8\rest fis'4 c8\rest e4 e8\rest + | \staffUpper\voiceTwo\stemDown e4 b8\rest fis'4 c8\rest e4 e8\rest | d4 e8\rest s2. | s1*9/8*4 %46 @@ -293,21 +295,21 @@ Alto = \context Voice = "two" \relative c'' { | d4 c8\rest s2. | s1*9/8*17 %91 - | \staffLower\stemUp s2. cis4 d8\rest + | \staffLower\voiceThree\stemUp s2. cis4 d8\rest | d4 d8\rest d4.\rest 4 d8\rest | 4 d8\rest d4.\rest 4 d8\rest | 4 d8\rest s2. | s1*9/8*6 %101 - | \staffUpper\stemDown s2. a''16 g fis e dis cis + | \staffUpper\voiceTwo\stemDown s2. a''16 g fis e dis cis | b4. r16 b cis d e fis g fis e d cis b | a4. \stemUp fis'16 fis, g a b cis d cis b a g fis~ | \stemDown fis4. e d8 e4~ %105 | e8. g16 fis e d8. fis16 e d cis4 a8 | b4. cis8. e16 d cis b8. d16 cis b - | \staffLower\stemUp\tieUp a4.~ a16 g a g fis \tieDown g~ g g a g fis g~ - | g fis gis ais b cis \staffUpper\stemDown d4. e~ + | \staffLower\voiceThree\stemUp\tieUp a4.~ a16 g a g fis \tieDown g~ g g a g fis g~ + | g fis gis ais b cis \staffUpper\voiceTwo\stemDown d4. e~ | e8 cis d~ d cis d~ d cis d~ %110 | d4 c8\rest s2. @@ -324,29 +326,30 @@ Tenor = \context Voice = "three" \relative c'' { \mergeDifferentlyHeadedOn \repeat volta 2 { %1 - | \staffUpper\stemDown\tieDown + | \staffUpper\voiceTwo\stemDown\tieDown \once\override NoteColumn.force-hshift = #0.5 a2~ \shiftOff a8. d,16 e8. fis16 | g4~ \set subdivideBeams = ##t g32 e fis g a b cis d \set subdivideBeams = ##f - \staffLower\stemUp\tieUp + \staffLower\voiceThree\stemUp\tieUp b8\rest g16\rest e d8. cis16 | d2~ d8. s8. s8 - | \staffLower\stemUp\tieUp e8\rest e16\rest b cis8. d16 e8. \staffUpper\stemDown e16\rest a4\arpeggio + | \stemUp\tieUp e8\rest e16\rest b cis8. d16 e8. + \staffUpper\voiceTwo\stemDown e16\rest a4\arpeggio %5 | a2 a4. a8 | \once\override Voice.Rest.X-offset = #0.5 b,8\rest b16\rest d e8. fis16 g8. d16\rest c4\rest - | \staffLower\stemUp a8\rest a16\rest fis16 gis8. ais16 b8 b\rest b4\rest + | \staffLower\voiceThree\stemUp a8\rest a16\rest fis16 gis8. ais16 b8 b\rest b4\rest | s1 - | s2 \staffUpper\stemDown\tieDown e4\rest d'~ + | s2 \staffUpper\voiceTwo\stemDown\tieDown e4\rest d'~ %10 | 16 s8. s2 cis4~ | cis8. s16 s2. | s1*5 %17 - | \staffLower\stemUp\tieUp s4 cis, b e~ + | \staffLower\voiceThree\stemUp\tieUp s4 cis, b e~ | \alternative { { e2 s } { e4\repeatTie s2 s4. } @@ -354,23 +357,24 @@ Tenor = \context Voice = "three" \relative c'' { } | s1*9/8*3 %23 - | \staffUpper\stemDown d8 e16 fis g a b8 g\rest g\rest a g\rest g\rest + | \staffUpper\voiceTwo\stemDown d8 e16 fis g a b8 g\rest g\rest a g\rest g\rest | \once\override NoteColumn.force-hshift = #0.8 gis a16 gis fis e a8 e\rest e\rest gis e\rest e\rest | \once\override NoteColumn.force-hshift = #0 fis8 gis16 fis e fis gis8 a16 gis fis gis a8 gis16 fis e d - | \staffLower\stemUp s1*9/8*8 + | \staffLower\voiceThree\stemUp s1*9/8*8 %34 | a4 a8\rest b cis d b cis d | 4 b'8\rest d4 d8\rest cis4 d8\rest - | \staffUpper\stemDown 4 \staffLower\stemUp b8\rest cis4 c8\rest b4 c8\rest - | \staffUpper\stemDown a4 b8\rest s2. + | \staffUpper\voiceTwo\stemDown 4 + \staffLower\voiceThree\stemUp b8\rest cis4 c8\rest b4 c8\rest + | \staffUpper\voiceTwo\stemDown a4 b8\rest s2. | fis'4 b8\rest - \staffLower\stemDown + \staffLower\voiceThree\stemDown \once\override NoteColumn.force-hshift = #0.4 e,4. \once\override NoteColumn.force-hshift = #0.4 e | \stemUp d4 s8 s2. %40 - | \staffLower\stemUp cis4 c8\rest s2. + | \stemUp cis4 c8\rest s2. | s1*9/8 | d4 d8\rest d4.\rest d4 d8\rest | cis4 d8\rest d4.\rest cis4 d8\rest @@ -384,9 +388,9 @@ Tenor = \context Voice = "three" \relative c'' { \set subdivideBeams = ##t \staffUpper e'16[ d c b a g fis e dis cis \staffLower b a g fis e d cis! b] \set subdivideBeams = ##f - | \staffUpper\stemDown\tieDown r8 a''16 b cis d e fis e d cis b a4.~ + | \staffUpper\voiceTwo\stemDown\tieDown r8 a''16 b cis d e fis e d cis b a4.~ | a8 e\rest e\rest s2. - | \staffLower\stemUp s1*9/8*5 + | \staffLower\voiceThree\stemUp s1*9/8*5 %63 | s4. \mergeDifferentlyHeadedOff fis,8 b d e ais, cis | d e16 d cis b e8 ais, cis d gis, b @@ -404,7 +408,7 @@ Tenor = \context Voice = "three" \relative c'' { g fis g %70 | e8 g\rest b\rest s2. - | \staffLower\stemUp\tieUp s1*9/8*2 + | \stemUp\tieUp s1*9/8*2 | s2. b,4.~ | b8 fis16 gis a b cis4 c8\rest 4 c8\rest | 4 r8 s4. a4.~ @@ -630,8 +634,8 @@ Bass = \context Voice = "four" \relative c { \header { composer = ##f % "Johann Sebastian Bach" opus = ##f % "BWV 828" - title = \markup { "Ouverture" } - subtitle = ##f + title = \markup { "Partita IV" } + subtitle = \markup { "Ouverture" } } \layout { \context { diff --git a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-2-allemande.ly b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-2-allemande.ly index 9b5e1764..6f128d2c 100644 --- a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-2-allemande.ly +++ b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-2-allemande.ly @@ -1,7 +1,7 @@ Global = { \key d \major \time 4/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIVAllemande \set minimumBeamSubdivisionInterval = \musicLength 8 \omit TupletBracket \repeat volta 2 { diff --git a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-3-courante.ly b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-3-courante.ly index c5a443bb..80deb6e6 100644 --- a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-3-courante.ly +++ b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-3-courante.ly @@ -1,7 +1,7 @@ Global = { \key d \major \time 3/2 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c' { \stemUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIVCourante \repeat volta 2 { \partial 8 fis8 %1 diff --git a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-4-aria.ly b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-4-aria.ly index f0a4e835..4abfaea3 100644 --- a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-4-aria.ly +++ b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-4-aria.ly @@ -1,7 +1,7 @@ Global = { \key d \major \time 2/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieDown \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIVAria \repeat volta 2 { \partial 8 a8 %1 diff --git a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-5-sarabande.ly b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-5-sarabande.ly index 654e8a2b..de09e4b9 100644 --- a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-5-sarabande.ly +++ b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-5-sarabande.ly @@ -1,7 +1,7 @@ Global = { \key d \major \time 3/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIVSarabande \set minimumBeamSubdivisionInterval = \musicLength 8 \omit TupletBracket \repeat volta 2 { diff --git a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-6-menuet.ly b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-6-menuet.ly index 4c1b9fd8..a788b1ef 100644 --- a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-6-menuet.ly +++ b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-6-menuet.ly @@ -1,7 +1,7 @@ Global = { \key d \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 #'PartitaIVMenuet \omit TupletBracket %1 \repeat volta 2 { diff --git a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-7-gigue.ly b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-7-gigue.ly index bd35ef6e..e0592116 100644 --- a/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-7-gigue.ly +++ b/src/johann-sebastian-bach/partitas/BWV828/parts/bach-partita-4-7-gigue.ly @@ -1,7 +1,7 @@ Global = { \key d \major \time 9/16 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaIVGigue %1 \repeat volta 2 { | d8.~ d16 fis a d a fis diff --git a/src/johann-sebastian-bach/partitas/BWV829/JS-Bach-BWV829-Partita-5.ly b/src/johann-sebastian-bach/partitas/BWV829/JS-Bach-BWV829-Partita-5.ly deleted file mode 100644 index 4bd30374..00000000 --- a/src/johann-sebastian-bach/partitas/BWV829/JS-Bach-BWV829-Partita-5.ly +++ /dev/null @@ -1,108 +0,0 @@ -\version "2.25.12" - -#(ly:set-option 'relative-includes #t) - -\include "./covercolor.ly" - -\header { - tagline = ##f -} - -\paper { - #(set-paper-size "a4") - annotate-spacing = ##f - binding-offset = 0\mm - bottom-margin = 5\mm - first-page-number = 0 - indent = 0.0 - %inner-margin = 10\mm -% last-bottom-spacing.padding = #2 - %left-margin = 10\mm - line-width = 19\cm - markup-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - %outer-margin = 20\mmx - print-all-headers = ##t - ragged-last-bottom = ##f - ragged-bottom = ##f - %right-margin = 10\mm - system-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 2) - (stretchability . 24)) - top-margin = 10\mm - top-markup-spacing.basic-distance = 0 - top-system-spacing.basic-distance = 1 -} - -\bookpart { - \header { - maintainer = "Davide Madrisan" - maintainerEmail = "d.madrisan@proton.me" - } - - \include "./header.ily" - \header { - title = ##f - composer = ##f - } - - \markup { - \with-dimensions #'(0 . 0) #'(0 . 0) - \with-color \coverColor - \filled-box #'(-200 . 200) #'(-200 . 200) #0 - } - \markup { - \fill-line { - \center-column { - \null\null\null\null - \null\null\null\null - \line { \abs-fontsize #30 \bold "Johann Sebastian" } - \null - \line { \abs-fontsize #80 \bold "Bach" } - \null - \fill-line { \draw-hline } - \null\null\null - \line { \abs-fontsize #40 \bold "Partita V" } - \null\null - \line { \abs-fontsize #20 "BWV 829" } - \null\null\null\null - \fill-line \italic { \abs-fontsize #14 "For Piano, Harpsichord, Clavichord" } - \null\null\null - \null\null\null - } - } - } - - \include "./logo.ly" - - \markup { - \fill-line { - \center-column { - \null\null\null\null - \fill-line { - \abs-fontsize #10 "Based on: Bach-Gesellschaft Ausgabe, Leipzig (1853)" - } - \null\null - } - } - } -} - -\include "./parts/bach-partita-5-1-praeludium.ly" -\pageBreak -\include "./parts/bach-partita-5-2-allemande.ly" -\pageBreak -\include "./parts/bach-partita-5-3-courante.ly" -\pageBreak -\include "./parts/bach-partita-5-4-sarabande.ly" -\pageBreak -\include "./parts/bach-partita-5-5-minuetto.ly" -\pageBreak -\include "./parts/bach-partita-5-6-passepied.ly" -\pageBreak -\include "./parts/bach-partita-5-7-gigue.ly" diff --git a/src/johann-sebastian-bach/partitas/BWV829/Makefile.am b/src/johann-sebastian-bach/partitas/BWV829/Makefile.am deleted file mode 100644 index 1638a59f..00000000 --- a/src/johann-sebastian-bach/partitas/BWV829/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -SUFFIXES = .in -.in:; @echo "Generating $@...";\ - sed "s,@rgb_color@,$(RGB_COLOR),g;" \ - $< > $@ - -%: %.ly - $(LILYPOND) --pdf --output $@ $< - -BUILT_SOURCES = covercolor.ly - -EXTRA_DIST = JS-Bach-BWV829-Partita-5.ly \ - covercolor.ly.in \ - header.ily \ - global.ly \ - logo.ly \ - parts/bach-partita-5-1-praeludium.ly \ - parts/bach-partita-5-2-allemande.ly \ - parts/bach-partita-5-3-courante.ly \ - parts/bach-partita-5-4-sarabande.ly \ - parts/bach-partita-5-5-minuetto.ly \ - parts/bach-partita-5-6-passepied.ly \ - parts/bach-partita-5-7-gigue.ly - -all: $(BUILT_SOURCES) JS-Bach-BWV829-Partita-5 - -clean-local: - -rm -f $(BUILT_SOURCES) - -rm -f *.midi parts/*.midi - -rm -f *.pdf parts/*.pdf diff --git a/src/johann-sebastian-bach/partitas/BWV829/covercolor.ly.in b/src/johann-sebastian-bach/partitas/BWV829/covercolor.ly.in deleted file mode 100644 index 1276805b..00000000 --- a/src/johann-sebastian-bach/partitas/BWV829/covercolor.ly.in +++ /dev/null @@ -1 +0,0 @@ -coverColor = #(rgb-color @rgb_color@) % lavender blue diff --git a/src/johann-sebastian-bach/partitas/BWV829/global.ly b/src/johann-sebastian-bach/partitas/BWV829/global.ly deleted file mode 100644 index f0b84c09..00000000 --- a/src/johann-sebastian-bach/partitas/BWV829/global.ly +++ /dev/null @@ -1,3 +0,0 @@ -% Draw a box round the bar number(s) -\override Score.BarNumber.stencil - = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) diff --git a/src/johann-sebastian-bach/partitas/BWV829/header.ily b/src/johann-sebastian-bach/partitas/BWV829/header.ily deleted file mode 100644 index 1ac989e4..00000000 --- a/src/johann-sebastian-bach/partitas/BWV829/header.ily +++ /dev/null @@ -1,65 +0,0 @@ -\header { - composer = "Johann Sebastian Bach (1685-1750)" - date = "between 1725 and 1730 or 1731" - - footer = "Mutopia-2024/04/04" - - lastupdated = "2024 April 04" - license = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - maintainerEmail = "d.madrisan@proton.me" - maintainerWeb = "https://github.com/madrisan/open-scores" - - % Extra Mutopia Information - mutopiacomposer = "BachJS" - mutopiacopyright = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - mutopiainstrument = "Harpsichord, Piano" - mutopiamaintainer = "Davide Madrisan" - mutopiaopus = "BWV 829" - mutopiatitle = "Partita V" - - opus = "BWV 829" - title = "Partita V" - source = "Bach-Gesellschaft Ausgabe, Leipzig (1853)" - style = "Baroque" - - copyright = \markup { - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0) - \right-column { - \with-url #"http://www.MutopiaProject.org" { - \abs-fontsize #9 "Mutopia " - \concat { - \abs-fontsize #12 - \with-color \coverColor "ǀ" - \abs-fontsize #9 "Project " - } - } - } - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0 ) - \center-column { - \abs-fontsize #11.9 - \with-color #grey - \bold { "ǀ" "ǀ" } - } - \override #'(font-name . "DejaVu Sans,sans-serif") - \override #'(baseline-skip . 0) - \column { - \abs-fontsize #8 - \concat { - "Typeset using " \with-url #"http://www.lilypond.org" "LilyPond " ©" 2022-2024 ""by " \maintainer " — " \footer - } - \concat { - \concat { - \abs-fontsize #8 { - \with-url #"https://spdx.org/licenses/CC-BY-NC-SA-4.0.html" - "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - " — free to distribute, modify, and perform" - } - } - \abs-fontsize #13 \with-color \coverColor "ǀ" - } - } - } - tagline = ##f -} diff --git a/src/johann-sebastian-bach/partitas/BWV829/logo.ly b/src/johann-sebastian-bach/partitas/BWV829/logo.ly deleted file mode 100644 index 72be42ea..00000000 --- a/src/johann-sebastian-bach/partitas/BWV829/logo.ly +++ /dev/null @@ -1,24 +0,0 @@ -\markup { - \fill-line { - \center-column { - \fill-line { \abs-fontsize #20 \smallCaps "lavender" } - \fill-line { - \abs-fontsize #12 - \concat { - \draw-line #'(-3 . 0) - \smallCaps " b l u e " - \draw-line #'(-3 . 0) - } - } - \fill-line { \abs-fontsize #9 \smallCaps "Open Scores" } - \null - \fill-line { \abs-fontsize #10 "Engraved by Davide Madrisan" } - \fill-line { - \with-url #"https://github.com/madrisan/open-scores/" { - \abs-fontsize #10 - \typewriter "https://github.com/madrisan/open-scores/" - } - } - } - } -} diff --git a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-1-praeludium.ly b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-1-praeludium.ly index d4003bd6..70ee05b5 100644 --- a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-1-praeludium.ly +++ b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-1-praeludium.ly @@ -1,7 +1,7 @@ Global = { \key g \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\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaVPraeambulum %1 | d16 c b a g8 r r | r r r4 @@ -308,8 +309,8 @@ Bass = \context Voice = "four" \relative c' { \header { composer = ##f % "Johann Sebastian Bach" opus = ##f % "BWV 829" - title = \markup { "Praeambulum" } - subtitle = ##f + title = \markup { "Partita V" } + subtitle = \markup { "Praeambulum" } } \layout { \context { diff --git a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-2-allemande.ly b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-2-allemande.ly index c92b54d5..bf0f16d7 100644 --- a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-2-allemande.ly +++ b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-2-allemande.ly @@ -1,7 +1,7 @@ Global = { \key g \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\tieNeutral\stemNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaVAllemande \set minimumBeamSubdivisionInterval = \musicLength 8 \omit TupletBracket \omit TupletNumber \repeat volta 2 { diff --git a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-3-courante.ly b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-3-corrente.ly similarity index 97% rename from src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-3-courante.ly rename to src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-3-corrente.ly index a480f271..15b31705 100644 --- a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-3-courante.ly +++ b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-3-corrente.ly @@ -1,7 +1,7 @@ Global = { \key g \major \time 3/8 - \include "../global.ly" + \include "../../global.ly" } Soprano = \context Voice = "one" \relative c'' { @@ -9,6 +9,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaVCorrente \repeat volta 2 { \partial 16*3 d16 e fis %1 @@ -238,7 +239,7 @@ Bass = \context Voice = "four" \relative c { \header { composer = ##f % "Johann Sebastian Bach" opus = ##f % "BWV 829" - title = \markup { "Courante" } + title = \markup { "Corrente" } subtitle = ##f } \layout { diff --git a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-4-sarabande.ly b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-4-sarabande.ly index 2b1a3c5f..2ca9f010 100644 --- a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-4-sarabande.ly +++ b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-4-sarabande.ly @@ -1,7 +1,7 @@ Global = { \key g \major \time 3/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaVSarabande \repeat volta 2 { \partial 16*5 d16[ \appoggiatura c16 b8. c16] %1 diff --git a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-5-minuetto.ly b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-5-minuetto.ly index 756afc6e..e0d51b0c 100644 --- a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-5-minuetto.ly +++ b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-5-minuetto.ly @@ -1,7 +1,7 @@ Global = { \key g \major \time 3/4 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaVMinuetto \repeat volta 2 { %1 | d8 s s g s s @@ -220,7 +221,7 @@ Bass = \context Voice = "four" \relative c { \header { composer = ##f % "Johann Sebastian Bach" opus = ##f % "BWV 829" - title = \markup { "Tempo di Minuetta" } + title = \markup { "Tempo di Menuetto" } subtitle = ##f } \layout { diff --git a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-6-passepied.ly b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-6-passepied.ly index 3fdc36aa..da3c89e6 100644 --- a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-6-passepied.ly +++ b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-6-passepied.ly @@ -1,7 +1,7 @@ Global = { \key g \major \time 3/8 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaVPassepied \repeat volta 2 { \partial 8 d8 %1 diff --git a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-7-gigue.ly b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-7-gigue.ly index 3de10893..e4c03345 100644 --- a/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-7-gigue.ly +++ b/src/johann-sebastian-bach/partitas/BWV829/parts/bach-partita-5-7-gigue.ly @@ -1,7 +1,7 @@ Global = { \key g \major \time 6/8 - \include "../global.ly" + \include "../../global.ly" } staffLower = { \change Staff = "lower" } @@ -12,6 +12,7 @@ Soprano = \context Voice = "one" \relative c'' { \stemUp\tieUp \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 + \label #'PartitaVGigue \mergeDifferentlyDottedOn \repeat volta 2 { \partial 8 s8 diff --git a/src/johann-sebastian-bach/partitas/BWV830/JS-Bach-BWV830-Partita-6.ly b/src/johann-sebastian-bach/partitas/BWV830/JS-Bach-BWV830-Partita-6.ly deleted file mode 100644 index 0baf43c4..00000000 --- a/src/johann-sebastian-bach/partitas/BWV830/JS-Bach-BWV830-Partita-6.ly +++ /dev/null @@ -1,101 +0,0 @@ -\version "2.23.80" - -#(ly:set-option 'relative-includes #t) - -\include "./covercolor.ly" - -\header { - tagline = ##f -} - -\paper { - #(set-paper-size "a4") - annotate-spacing = ##f - bottom-margin = 8\mm - first-page-number = 0 - indent = 0.0 -% last-bottom-spacing.padding = #2 - line-width = 18.6\cm - markup-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 1.5) - (stretchability . 20)) - print-all-headers = ##t - ragged-last-bottom = ##f - ragged-bottom = ##f - system-system-spacing = - #'((basic-distance . 2) - (minimum-distance . 1) - (padding . 1.5) - (stretchability . 25)) - top-margin = 10\mm -} - -\bookpart { - \header { - maintainer = "Davide Madrisan" - maintainerEmail = "d.madrisan@proton.me" - } - - \include "./header.ily" - \header { - title = ##f - composer = ##f - } - - \markup { - \with-dimensions #'(0 . 0) #'(0 . 0) - \with-color \coverColor - \filled-box #'(-200 . 200) #'(-200 . 200) #0 - } - \markup { - \fill-line { - \center-column { - \null\null\null\null - \null\null\null\null - \line { \abs-fontsize #30 \bold "Johann Sebastian" } - \null - \line { \abs-fontsize #80 \bold "Bach" } - \null - \fill-line { \draw-hline } - \null\null\null - \line { \abs-fontsize #40 \bold "Partita VI" } - \null\null - \line { \abs-fontsize #20 "BWV 830" } - \null\null\null\null - \fill-line \italic { \abs-fontsize #14 "For Piano, Harpsichord, Clavichord" } - \null\null\null - \null\null\null - } - } - } - - \include "./logo.ly" - - \markup { - \fill-line { - \center-column { - \null\null\null\null - \fill-line { - \abs-fontsize #10 "Based on the score: Moscow, Muzyka n.d. (1968)" - } - \null\null - } - } - } -} - -\include "./parts/bach-partita-6-1-toccata.ly" -\pageBreak -\include "./parts/bach-partita-6-2-allemanda.ly" -\pageBreak -\include "./parts/bach-partita-6-3-corrente.ly" -\pageBreak -\include "./parts/bach-partita-6-4-air.ly" -\pageBreak -\include "./parts/bach-partita-6-5-sarabande.ly" -\pageBreak -\include "./parts/bach-partita-6-6-gavotta.ly" -\pageBreak -\include "./parts/bach-partita-6-7-gigue.ly" diff --git a/src/johann-sebastian-bach/partitas/BWV830/Makefile.am b/src/johann-sebastian-bach/partitas/BWV830/Makefile.am deleted file mode 100644 index c7af0f1e..00000000 --- a/src/johann-sebastian-bach/partitas/BWV830/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (c) 2023 Davide Madrisan -## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -SUFFIXES = .in -.in:; @echo "Generating $@...";\ - sed "s,@rgb_color@,$(RGB_COLOR),g;" \ - $< > $@ - -%: %.ly - $(LILYPOND) --pdf --output $@ $< - -BUILT_SOURCES = covercolor.ly -EXTRA_DIST = JS-Bach-BWV830-Partita-6.ly \ - covercolor.ly.in \ - header.ily \ - global.ly \ - logo.ly \ - parts/bach-partita-6-1-toccata.ly \ - parts/bach-partita-6-2-allemanda.ly \ - parts/bach-partita-6-3-corrente.ly \ - parts/bach-partita-6-4-air.ly \ - parts/bach-partita-6-5-sarabande.ly \ - parts/bach-partita-6-6-gavotta.ly \ - parts/bach-partita-6-7-gigue.ly - -all: $(BUILT_SOURCES) JS-Bach-BWV830-Partita-6 - -clean-local: - -rm -f $(BUILT_SOURCES) - -rm -f *.midi parts/*.midi - -rm -f *.pdf parts/*.pdf diff --git a/src/johann-sebastian-bach/partitas/BWV830/covercolor.ly.in b/src/johann-sebastian-bach/partitas/BWV830/covercolor.ly.in deleted file mode 100644 index 1276805b..00000000 --- a/src/johann-sebastian-bach/partitas/BWV830/covercolor.ly.in +++ /dev/null @@ -1 +0,0 @@ -coverColor = #(rgb-color @rgb_color@) % lavender blue diff --git a/src/johann-sebastian-bach/partitas/BWV830/global.ly b/src/johann-sebastian-bach/partitas/BWV830/global.ly deleted file mode 100644 index f0b84c09..00000000 --- a/src/johann-sebastian-bach/partitas/BWV830/global.ly +++ /dev/null @@ -1,3 +0,0 @@ -% Draw a box round the bar number(s) -\override Score.BarNumber.stencil - = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print) diff --git a/src/johann-sebastian-bach/partitas/BWV830/header.ily b/src/johann-sebastian-bach/partitas/BWV830/header.ily deleted file mode 100644 index 7f255b61..00000000 --- a/src/johann-sebastian-bach/partitas/BWV830/header.ily +++ /dev/null @@ -1,65 +0,0 @@ -\header { - composer = "Johann Sebastian Bach (1685-1750)" - date = "1731" - - footer = "Mutopia-2023/04/15" - - lastupdated = "2023 April 15" - license = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - maintainerEmail = "d.madrisan@proton.me" - maintainerWeb = "https://github.com/madrisan/open-scores" - - % Extra Mutopia Information - mutopiacomposer = "BachJS" - mutopiacopyright = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - mutopiainstrument = "Harpsichord, Piano" - mutopiamaintainer = "Davide Madrisan" - mutopiaopus = "BWV 830" - mutopiatitle = "Partita VI e Moll" - - opus = "BWV 830" - title = "Partita VI e Moll" - source = "Moscow: Muzyka" - style = "Baroque" - - copyright = \markup { - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0) - \right-column { - \with-url #"http://www.MutopiaProject.org" { - \abs-fontsize #9 "Mutopia " - \concat { - \abs-fontsize #12 - \with-color \coverColor "ǀ" - \abs-fontsize #9 "Project " - } - } - } - \override #'(font-name . "DejaVu Sans, Bold") - \override #'(baseline-skip . 0 ) - \center-column { - \abs-fontsize #11.9 - \with-color #grey - \bold { "ǀ" "ǀ" } - } - \override #'(font-name . "DejaVu Sans,sans-serif") - \override #'(baseline-skip . 0) - \column { - \abs-fontsize #8 - \concat { - "Typeset using " \with-url #"http://www.lilypond.org" "LilyPond " ©" 2022 ""by " \maintainer " — " \footer - } - \concat { - \concat { - \abs-fontsize #8 { - \with-url #"https://spdx.org/licenses/CC-BY-NC-SA-4.0.html" - "Creative Commons Attribution Non Commercial Share Alike 4.0 International" - " — free to distribute, modify, and perform" - } - } - \abs-fontsize #13 \with-color \coverColor "ǀ" - } - } - } - tagline = ##f -} diff --git a/src/johann-sebastian-bach/partitas/BWV830/logo.ly b/src/johann-sebastian-bach/partitas/BWV830/logo.ly deleted file mode 100644 index 72be42ea..00000000 --- a/src/johann-sebastian-bach/partitas/BWV830/logo.ly +++ /dev/null @@ -1,24 +0,0 @@ -\markup { - \fill-line { - \center-column { - \fill-line { \abs-fontsize #20 \smallCaps "lavender" } - \fill-line { - \abs-fontsize #12 - \concat { - \draw-line #'(-3 . 0) - \smallCaps " b l u e " - \draw-line #'(-3 . 0) - } - } - \fill-line { \abs-fontsize #9 \smallCaps "Open Scores" } - \null - \fill-line { \abs-fontsize #10 "Engraved by Davide Madrisan" } - \fill-line { - \with-url #"https://github.com/madrisan/open-scores/" { - \abs-fontsize #10 - \typewriter "https://github.com/madrisan/open-scores/" - } - } - } - } -} diff --git a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-1-toccata.ly b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-1-toccata.ly index fa5adaac..6aed2e85 100644 --- a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-1-toccata.ly +++ b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-1-toccata.ly @@ -1,7 +1,7 @@ Global = { \key e \minor \time 2/2 - \include "../global.ly" + \include "../../global.ly" } bottom = { \change Staff = "lower" \stemUp } @@ -11,6 +11,7 @@ Sopran = \context Voice = "one" \relative c'' { \voiceOne \override MultiMeasureRest.staff-position = #-2 \override Rest.staff-position = #0 + \label #'PartitaVIToccata \set baseMoment = #(ly:make-moment 1/8) \set subdivideBeams = ##t \stemNeutral @@ -547,14 +548,10 @@ Bass = \context Voice = "four" \relative c { >> >> \header { - composer = "Johann Sebastian Bach" - opus = "BWV 830" + composer = ##f % "Johann Sebastian Bach" + opus = ##f % "BWV 830" + title = \markup { "Partita VI" } subtitle = "Toccata" - title = \markup { - %\override #'(font-name . "TeX Gyre Schola") { - "Partita VI" - %} - } } \layout { \context { diff --git a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-2-allemanda.ly b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-2-allemanda.ly index 5ed0952f..9329355d 100644 --- a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-2-allemanda.ly +++ b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-2-allemanda.ly @@ -1,7 +1,7 @@ Global = { \key e \minor \time 4/4 - \include "../global.ly" + \include "../../global.ly" } bottom = { \change Staff = "lower" \stemUp } @@ -11,6 +11,7 @@ Sopran = \context Voice = "one" \relative c'' { \voiceOne \override MultiMeasureRest.staff-position = #-2 \override Rest.staff-position = #0 + \label #'PartitaVIAllemande \set baseMoment = #(ly:make-moment 1/8) \stemNeutral\slurNeutral\tieNeutral \partial 8 r16 g' @@ -229,7 +230,7 @@ Bass = \context Voice = "four" \relative c { %opus = "BWV 830" title = \markup { %\override #'(font-name . "TeX Gyre Schola") { - "Allemanda" + "Allemande" %} } } diff --git a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-3-corrente.ly b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-3-corrente.ly index c8388483..3f482a5e 100644 --- a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-3-corrente.ly +++ b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-3-corrente.ly @@ -1,7 +1,7 @@ Global = { \key e \minor \time 3/8 - \include "../global.ly" + \include "../../global.ly" } bottom = { \change Staff = "lower" \stemUp } @@ -11,6 +11,7 @@ Sopran = \context Voice = "one" \relative c'' { \voiceOne \override MultiMeasureRest.staff-position = #-2 \override Rest.staff-position = #0 + \label #'PartitaVICorrente \set baseMoment = #(ly:make-moment 1/8) \stemNeutral\slurNeutral\tieNeutral \repeat volta 2 { diff --git a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-4-air.ly b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-4-air.ly index d9bbf619..c842d713 100644 --- a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-4-air.ly +++ b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-4-air.ly @@ -1,7 +1,7 @@ Global = { \key e \minor \time 2/2 - \include "../global.ly" + \include "../../global.ly" } bottom = { \change Staff = "lower" \stemUp } @@ -11,6 +11,7 @@ Sopran = \context Voice = "one" \relative c' { \voiceOne \override MultiMeasureRest.staff-position = #-2 \override Rest.staff-position = #0 + \label #'PartitaVIAir \stemNeutral\slurNeutral\tieNeutral \repeat volta 2 { \partial 2 { e8[ fis g a] } diff --git a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-5-sarabande.ly b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-5-sarabande.ly index 9ee076d1..5c90e9ed 100644 --- a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-5-sarabande.ly +++ b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-5-sarabande.ly @@ -1,7 +1,7 @@ Global = { \key e \minor \time 3/4 - \include "../global.ly" + \include "../../global.ly" } bottom = { \change Staff = "lower" \stemUp } @@ -11,6 +11,7 @@ Sopran = \context Voice = "one" \relative c'' { \voiceOne \override MultiMeasureRest.staff-position = #-2 \override Rest.staff-position = #0 + \label #'PartitaVISarabande \set baseMoment = #(ly:make-moment 1/8) \stemUp\slurNeutral\tieUp \repeat volta 2 { diff --git a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-6-gavotta.ly b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-6-gavotta.ly index bad641ee..c12744e8 100644 --- a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-6-gavotta.ly +++ b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-6-gavotta.ly @@ -1,13 +1,14 @@ Global = { \key e \minor \time 2/2 - \include "../global.ly" + \include "../../global.ly" } Sopran = \context Voice = "one" \relative c'' { \voiceOne \override MultiMeasureRest.staff-position = #-2 \override Rest.staff-position = #0 + \label #'PartitaVIGavotta \stemNeutral\slurNeutral\tieNeutral \repeat volta 2 { \partial 2 { e16[ fis g8] b,8.[ g'16] } diff --git a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-7-gigue.ly b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-7-gigue.ly index 9191c988..ee35de16 100644 --- a/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-7-gigue.ly +++ b/src/johann-sebastian-bach/partitas/BWV830/parts/bach-partita-6-7-gigue.ly @@ -1,7 +1,7 @@ Global = { \key e \minor \time 8/4 - \include "../global.ly" + \include "../../global.ly" } bottom = { \change Staff = "lower" \stemUp } @@ -98,6 +98,7 @@ Alto = \context Voice = "two" \relative c { \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 \override VoiceFollower.color = \greyTextColor + \label #'PartitaVIGigue \mergeDifferentlyDottedOn \showStaffSwitch \stemNeutral diff --git a/src/johann-sebastian-bach/partitas/JS-Bach-BWV825-830-Partiten.ly b/src/johann-sebastian-bach/partitas/JS-Bach-BWV825-830-Partiten.ly new file mode 100644 index 00000000..c0a27a50 --- /dev/null +++ b/src/johann-sebastian-bach/partitas/JS-Bach-BWV825-830-Partiten.ly @@ -0,0 +1,200 @@ +\version "2.25.16" + +#(ly:set-option 'relative-includes #t) + +\include "./covercolor.ly" + +\header { + tagline = ##f +} + +\paper { + #(set-paper-size "a4") + annotate-spacing = ##f + binding-offset = 0\mm + bottom-margin = 5\mm + first-page-number = 0 + indent = 0.0 + %inner-margin = 10\mm + %last-bottom-spacing.padding = #2 + %left-margin = 10\mm + line-width = 19\cm + markup-system-spacing = + #'((basic-distance . 2) + (minimum-distance . 1) + (padding . 2) + (stretchability . 24)) + %outer-margin = 20\mm + print-all-headers = ##t + ragged-last-bottom = ##f + ragged-bottom = ##f + %right-margin = 10\mm + score-markup-spacing = + #'((basic-distance . 10) + (minimum-distance . 8) + (padding . 2) + (stretchability . 24)) + system-system-spacing = + #'((basic-distance . 1) + (minimum-distance . 1) + (padding . 1) + (stretchability . 24)) + top-margin = 10\mm + top-markup-spacing.basic-distance = 0 + top-system-spacing.basic-distance = 1 +} + +\bookpart { + \header { + maintainer = "Davide Madrisan" + maintainerEmail = "d.madrisan@proton.me" + } + + \include "./header.ily" + \header { + title = ##f + composer = ##f + } + + \markup { + \with-dimensions #'(0 . 0) #'(0 . 0) + \with-color \coverColor + \filled-box #'(-200 . 200) #'(-200 . 200) #0 + } + \markup { + \fill-line { + \center-column { + \null\null\null\null + \null\null\null\null + \line { \abs-fontsize #30 \bold "Johann Sebastian" } + \null + \line { \abs-fontsize #80 \bold "Bach" } + \null + \fill-line { \draw-hline } + \null\null\null + \line { \abs-fontsize #40 \bold "Partiten" } + \null\null\null + \line \abs-fontsize #20 { "BWV 825" \char ##x2013 "830" } + \null\null\null\null + \fill-line \italic { \abs-fontsize #14 "For Piano, Harpsichord, Clavichord" } + \null\null\null + \null\null\null + } + } + } + + \include "./logo.ly" + + \markup { + \fill-line { + \center-column { + \null\null\null\null + \fill-line { + \abs-fontsize #10 "Based on the score published by Muzgiz, Moscow 1968" + } + \null\null + } + } + } +} + +\include "./index.ly" +\pageBreak + +%%% Partitas I + +\include "./BWV825/parts/bach-partita-1-1-praeludium.ly" +\pageBreak +\include "./BWV825/parts/bach-partita-1-2-allemande.ly" +\pageBreak +\include "./BWV825/parts/bach-partita-1-3-corrente.ly" +\pageBreak +\include "./BWV825/parts/bach-partita-1-4-sarabande.ly" +\pageBreak +\include "./BWV825/parts/bach-partita-1-5-menuet-1.ly" +\include "./BWV825/parts/bach-partita-1-5-menuet-2.ly" +\include "./BWV825/parts/bach-partita-1-6-giga.ly" +\pageBreak + +%%% Partitas II + +\include "./BWV826/parts/bach-partita-2-1-sinfonia.ly" +\pageBreak +\include "./BWV826/parts/bach-partita-2-2-allemande.ly" +\pageBreak +\include "./BWV826/parts/bach-partita-2-3-courante.ly" +\pageBreak +\include "./BWV826/parts/bach-partita-2-4-sarabande.ly" +\pageBreak +\include "./BWV826/parts/bach-partita-2-5-rondeau.ly" +\pageBreak +\include "./BWV826/parts/bach-partita-2-6-capriccio.ly" +\pageBreak + +%%% Partitas III + +\include "./BWV827/parts/bach-partita-3-1-fantasia.ly" +\pageBreak +\include "./BWV827/parts/bach-partita-3-2-allemande.ly" +\pageBreak +\include "./BWV827/parts/bach-partita-3-3-corrente.ly" +\pageBreak +\include "./BWV827/parts/bach-partita-3-4-sarabande.ly" +\pageBreak +\include "./BWV827/parts/bach-partita-3-5-burlesca.ly" +\pageBreak +\include "./BWV827/parts/bach-partita-3-6-scherzo.ly" +\pageBreak +\include "./BWV827/parts/bach-partita-3-7-gigue.ly" +\pageBreak + +%%% Partitas IV + +\include "./BWV828/parts/bach-partita-4-1-ouverture.ly" +\pageBreak +\include "./BWV828/parts/bach-partita-4-2-allemande.ly" +\pageBreak +\include "./BWV828/parts/bach-partita-4-3-courante.ly" +\pageBreak +\include "./BWV828/parts/bach-partita-4-4-aria.ly" +\pageBreak +\include "./BWV828/parts/bach-partita-4-5-sarabande.ly" +\pageBreak +\include "./BWV828/parts/bach-partita-4-6-menuet.ly" +\pageBreak +\include "./BWV828/parts/bach-partita-4-7-gigue.ly" +\pageBreak + +%%% Partitas V + +\include "./BWV829/parts/bach-partita-5-1-praeludium.ly" +\pageBreak +\include "./BWV829/parts/bach-partita-5-2-allemande.ly" +\pageBreak +\include "./BWV829/parts/bach-partita-5-3-corrente.ly" +\pageBreak +\include "./BWV829/parts/bach-partita-5-4-sarabande.ly" +\pageBreak +\include "./BWV829/parts/bach-partita-5-5-minuetto.ly" +\pageBreak +\include "./BWV829/parts/bach-partita-5-6-passepied.ly" +\pageBreak +\include "./BWV829/parts/bach-partita-5-7-gigue.ly" +\pageBreak + +%%% Partitas VI + +\include "./BWV830/parts/bach-partita-6-1-toccata.ly" +\pageBreak +\include "./BWV830/parts/bach-partita-6-2-allemanda.ly" +\pageBreak +\include "./BWV830/parts/bach-partita-6-3-corrente.ly" +\pageBreak +\include "./BWV830/parts/bach-partita-6-4-air.ly" +\pageBreak +\include "./BWV830/parts/bach-partita-6-5-sarabande.ly" +\pageBreak +\include "./BWV830/parts/bach-partita-6-6-gavotta.ly" +\pageBreak +\include "./BWV830/parts/bach-partita-6-7-gigue.ly" +\pageBreak diff --git a/src/johann-sebastian-bach/partitas/Makefile.am b/src/johann-sebastian-bach/partitas/Makefile.am index 934b5068..281cb0cc 100644 --- a/src/johann-sebastian-bach/partitas/Makefile.am +++ b/src/johann-sebastian-bach/partitas/Makefile.am @@ -1,6 +1,81 @@ -SUBDIRS = BWV825 \ - BWV826 \ - BWV827 \ - BWV828 \ - BWV829 \ - BWV830 +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . + +SUFFIXES = .in +.in:; @echo "Generating $@...";\ + sed "s,@rgb_color@,$(RGB_COLOR),g;" \ + $< > $@ + +%: %.ly + $(LILYPOND) --pdf --output $@ $< + +BUILT_SOURCES = covercolor.ly + +EXTRA_DIST = JS-Bach-BWV825-830-Partiten.ly \ + Makefile.am \ + covercolor.ly.in \ + header.ily \ + global.ly \ + index.ly \ + logo.ly \ + BWV825/parts/bach-partita-1-1-praeludium.ly \ + BWV825/parts/bach-partita-1-2-allemande.ly \ + BWV825/parts/bach-partita-1-3-corrente.ly \ + BWV825/parts/bach-partita-1-4-sarabande.ly \ + BWV825/parts/bach-partita-1-5-menuet-1.ly \ + BWV825/parts/bach-partita-1-5-menuet-2.ly \ + BWV825/parts/bach-partita-1-6-giga.ly \ + \ + BWV826/parts/bach-partita-2-2-allemande.ly \ + BWV826/parts/bach-partita-2-3-courante.ly \ + BWV826/parts/bach-partita-2-4-sarabande.ly \ + BWV826/parts/bach-partita-2-5-rondeau.ly \ + BWV826/parts/bach-partita-2-6-capriccio.ly \ + BWV826/parts/bach-partita-2-1-sinfonia.ly \ + \ + BWV827/parts/bach-partita-3-1-fantasia.ly \ + BWV827/parts/bach-partita-3-2-allemande.ly \ + BWV827/parts/bach-partita-3-3-corrente.ly \ + BWV827/parts/bach-partita-3-4-sarabande.ly \ + BWV827/parts/bach-partita-3-5-burlesca.ly \ + BWV827/parts/bach-partita-3-6-scherzo.ly \ + BWV827/parts/bach-partita-3-7-gigue.ly \ + \ + BWV828/parts/bach-partita-4-1-ouverture.ly \ + BWV828/parts/bach-partita-4-2-allemande.ly \ + BWV828/parts/bach-partita-4-3-courante.ly \ + BWV828/parts/bach-partita-4-4-aria.ly \ + BWV828/parts/bach-partita-4-5-sarabande.ly \ + BWV828/parts/bach-partita-4-6-menuet.ly \ + BWV828/parts/bach-partita-4-7-gigue.ly \ + \ + BWV829/parts/bach-partita-5-1-praeludium.ly \ + BWV829/parts/bach-partita-5-2-allemande.ly \ + BWV829/parts/bach-partita-5-3-courante.ly \ + BWV829/parts/bach-partita-5-4-sarabande.ly \ + BWV829/parts/bach-partita-5-5-minuetto.ly \ + BWV829/parts/bach-partita-5-6-passepied.ly \ + BWV829/parts/bach-partita-5-7-gigue.ly \ + \ + BWV830/parts/bach-partita-6-1-toccata.ly \ + BWV830/parts/bach-partita-6-2-allemanda.ly \ + BWV830/parts/bach-partita-6-3-corrente.ly \ + BWV830/parts/bach-partita-6-4-air.ly \ + BWV830/parts/bach-partita-6-5-sarabande.ly \ + BWV830/parts/bach-partita-6-6-gavotta.ly \ + BWV830/parts/bach-partita-6-7-gigue.ly + +all: $(BUILT_SOURCES) JS-Bach-BWV825-830-Partiten + +clean-local: + -rm -f $(BUILT_SOURCES) + -rm -f *.midi BWV*/parts/*.midi + -rm -f *.pdf BWV*/parts/*.pdf diff --git a/src/johann-sebastian-bach/partitas/BWV825/covercolor.ly.in b/src/johann-sebastian-bach/partitas/covercolor.ly.in similarity index 100% rename from src/johann-sebastian-bach/partitas/BWV825/covercolor.ly.in rename to src/johann-sebastian-bach/partitas/covercolor.ly.in diff --git a/src/johann-sebastian-bach/partitas/BWV825/global.ly b/src/johann-sebastian-bach/partitas/global.ly similarity index 100% rename from src/johann-sebastian-bach/partitas/BWV825/global.ly rename to src/johann-sebastian-bach/partitas/global.ly diff --git a/src/johann-sebastian-bach/partitas/BWV825/header.ily b/src/johann-sebastian-bach/partitas/header.ily similarity index 89% rename from src/johann-sebastian-bach/partitas/BWV825/header.ily rename to src/johann-sebastian-bach/partitas/header.ily index 24e01faf..d103ee1a 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/header.ily +++ b/src/johann-sebastian-bach/partitas/header.ily @@ -2,9 +2,9 @@ composer = "Johann Sebastian Bach (1685-1750)" date = "" - footer = "Mutopia-2024/02/17" + footer = "Mutopia-2024/12/30" - lastupdated = "2024 February 17" + lastupdated = "2024 December 30" license = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" maintainerEmail = "d.madrisan@proton.me" maintainerWeb = "https://github.com/madrisan/open-scores" @@ -14,12 +14,12 @@ mutopiacopyright = "Creative Commons Attribution Non Commercial Share Alike 4.0 International" mutopiainstrument = "Harpsichord, Piano" mutopiamaintainer = "Davide Madrisan" - mutopiaopus = "BWV 825" - mutopiatitle = "Partita I" + mutopiaopus = "BWV 825-830" + mutopiatitle = "Partitas" - opus = "BWV 825" - title = "Partita I" - source = "Muzgiz, Moscow" + opus = "BWV 825-830" + title = "Partitas" + source = "Muzgiz, Moscow 1968" style = "Baroque" copyright = \markup { diff --git a/src/johann-sebastian-bach/partitas/index.ly b/src/johann-sebastian-bach/partitas/index.ly new file mode 100644 index 00000000..9cc54ac5 --- /dev/null +++ b/src/johann-sebastian-bach/partitas/index.ly @@ -0,0 +1,117 @@ +\markup \fill-line { + \center-column \abs-fontsize #18 \bold\caps { + \null\null + "Index" + \null\null\null\null + } +} + +middleGrey = #(x11-color 'grey45) + +#(define-markup-command (indexSection layout props title tonality bwv) + (string? string? string?) + "Format a section title of the index" + (interpret-markup layout props + #{ \markup \column \abs-fontsize #11 { + \pad-around #1 + \abs-fontsize #11 \bold { + \concat { + \char ##x23AF " Partita " #title " " #tonality + \normal-text { " (BWV " #bwv ")" } + } + } + } #})) + +#(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 { + \override #'(line-width . 95) + \pad-around #1 + \line { + \hspace #3.2 + \with-link #pagelabel { + \fill-with-pattern #1 #RIGHT . + #title + \page-ref #pagelabel "000" "?" + } + } + } #})) + +\markup { \indexSection "I" "B-Dur / B flat major / Si bemolle maggiore" "825" } +\markup { \indexItem "Praeludium" #'PartitaIPraeludium } +\markup { \indexItem "Allemande" #'PartitaIAllemande } +\markup { \indexItem "Corrente" #'PartitaICorrente } +\markup { \indexItem "Sarabande" #'PartitaISarabande } +\markup { \indexItem "Menuet I" #'PartitaIMenuetI } +\markup { \indexItem "Menuet II" #'PartitaIMenuetII } +\markup { \indexItem "Gigue" #'PartitaIGigue } +\markup { + \vspace #1 +} + +\markup { \indexSection "II" "c-Moll / C minor / do minore" "826" } +\markup { \indexItem "Sinfonia" #'PartitaIISinfonia } +\markup { \indexItem "Allemande" #'PartitaIIAllemande } +\markup { \indexItem "Courante" #'PartitaIICourante } +\markup { \indexItem "Sarabande" #'PartitaIISarabande } +\markup { \indexItem "Rondeau" #'PartitaIIRondeau } +\markup { \indexItem "Capriccio" #'PartitaIICapriccio } +\markup { + \vspace #1 +} + +\markup { \indexSection "III" "a-Moll / A minor / la minore" "827" } +\markup { \indexItem "Fantasia" #'PartitaIIIFantasia } +\markup { \indexItem "Allemande" #'PartitaIIIAllemande } +\markup { \indexItem "Corrente" #'PartitaIIICorrente } +\markup { \indexItem "Sarabande" #'PartitaIIISarabande } +\markup { \indexItem "Burlesca" #'PartitaIIIBurlesca } +\markup { \indexItem "Scherzo" #'PartitaIIIScherzo } +\markup { \indexItem "Gigue" #'PartitaIIIGigue } +\markup { + \vspace #1 +} + +\pageBreak + +\markup { + \vspace #2 +} + +\markup { \indexSection "IV" "D-Dur / D major / Re maggiore" "828" } +\markup { \indexItem "Ouverture" #'PartitaIVOuverture } +\markup { \indexItem "Allemande" #'PartitaIVAllemande } +\markup { \indexItem "Courante" #'PartitaIVCourante } +\markup { \indexItem "Aria" #'PartitaIVAria } +\markup { \indexItem "Sarabande" #'PartitaIVSarabande } +\markup { \indexItem "Menuet" #'PartitaIVMenuet } +\markup { \indexItem "Gigue" #'PartitaIVGigue } +\markup { + \vspace #1 +} + +\markup { \indexSection "V" "G-Dur / G major / Sol maggiore" "829" } +\markup { \indexItem "Praeambulum" #'PartitaVPraeambulum } +\markup { \indexItem "Allemande" #'PartitaVAllemande } +\markup { \indexItem "Corrente" #'PartitaVCorrente } +\markup { \indexItem "Sarabande" #'PartitaVSarabande } +\markup { \indexItem "Tempo di Menuetto" #'PartitaVMinuetto } +\markup { \indexItem "Passepied" #'PartitaVPassepied } +\markup { \indexItem "Gigue" #'PartitaVGigue } +\markup { + \vspace #1 +} + +\markup { \indexSection "VI" "e-Moll / E minor / mi minore" "830" } +\markup { \indexItem "Toccata" #'PartitaVIToccata } +\markup { \indexItem "Allemande" #'PartitaVIAllemande } +\markup { \indexItem "Corrente" #'PartitaVICorrente } +\markup { \indexItem "Air" #'PartitaVIAir } +\markup { \indexItem "Sarabande" #'PartitaVISarabande } +\markup { \indexItem "Tempo di Gavotta" #'PartitaVIGavotta } +\markup { \indexItem "Gigue" #'PartitaVIGigue } +\markup { + \vspace #1 +} diff --git a/src/johann-sebastian-bach/partitas/BWV825/logo.ly b/src/johann-sebastian-bach/partitas/logo.ly similarity index 100% rename from src/johann-sebastian-bach/partitas/BWV825/logo.ly rename to src/johann-sebastian-bach/partitas/logo.ly diff --git a/src/johann-sebastian-bach/partitas/BWV826/ossiasetup.ly b/src/johann-sebastian-bach/partitas/ossiasetup.ly similarity index 100% rename from src/johann-sebastian-bach/partitas/BWV826/ossiasetup.ly rename to src/johann-sebastian-bach/partitas/ossiasetup.ly