Skip to content

Commit

Permalink
J.S. Bach: Partita 2 BWV826 - Allemande
Browse files Browse the repository at this point in the history
Signed-off-by: Davide Madrisan <[email protected]>
  • Loading branch information
madrisan committed Feb 24, 2024
1 parent 116b80f commit ddba73f
Show file tree
Hide file tree
Showing 19 changed files with 874 additions and 18 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [v49] - unreleased

### Added

- J.S. Bach: Partita 2 BWV826

## [v48] - 2024-02-24

### Added
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,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/partitas/BWV825
make -C src/johann-sebastian-bach/partitas/BWV826
make -C src/johann-sebastian-bach/partitas/BWV830
make -C src/johann-sebastian-bach/praeludium-fuge-und-allegro-BWV998
make -C src/johann-sebastian-bach/praeludium-und-fughetta-BWV902
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ AC_CONFIG_FILES([\
src/johann-sebastian-bach/organ-sonata-4-andante-BWV528-stradal/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/BWV830/Makefile \
src/johann-sebastian-bach/praludien/Makefile \
src/johann-sebastian-bach/praludien/neun-kleine-praludien-BWV924-932/Makefile
Expand Down
2 changes: 1 addition & 1 deletion lyinit/data/jsbach
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
composer_firstname='Johann Sebastian'
composer_lastname="Bach"
instruments="For Piano or Harpsichord"
instruments="For Piano, Harpsichord, Clavichord"
header_composer="Johann Sebastian Bach (1685-1750)"
header_style="Baroque"
mutopiacomposer="BachJS"
Expand Down
51 changes: 36 additions & 15 deletions lyinit/lyscaffold.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ Example:
--pdfname JS-Bach-BWV830-Partita-1.pdf \\
--source 'Muzgiz, Moscow' \\
--year "between 1725 and 1726" \\
--part4 bach-partita-1-1-praeludium.ly \\
--part4 bach-partita-1-2-allemande.ly \\
--part4 bach-partita-1-3-corrente.ly \\
--part4 bach-partita-1-4-sarabande.ly \\
--part4 bach-partita-1-5-menuet-1.ly \\
--part4 bach-partita-1-5-menuet-2.ly \\
--part4 bach-partita-1-6-giga.ly
--part4 bach-partita-1-1-praeludium.ly Praeludium \\
--part4 bach-partita-1-2-allemande.ly Allemande \\
--part4 bach-partita-1-3-corrente.ly Corrente \\
--part4 bach-partita-1-4-sarabande.ly Sarabande \\
--part4 bach-partita-1-5-menuet-1.ly "Menuet I" \\
--part4 bach-partita-1-5-menuet-2.ly "Menuet II" \\
--part4 bach-partita-1-6-giga.ly Giga
__EOF
}
Expand Down Expand Up @@ -85,6 +85,7 @@ ly_sed () {
s^@mutopiacomposer@^${mutopiacomposer}^;
s^@mutopiainstrument@^${mutopiainstrument}^;
s^@opus@^${ly_opus}^g;
s^@partfile_title@^${partfile_title}^g;
s^@source@^${ly_source}^g;
s^@title@^${ly_title}^g;
" < "${1:-/dev/stdin}"
Expand All @@ -106,7 +107,9 @@ while test -n "$1"; do
--parts|-p)
ly_parts="true" ;;
--part4)
ly_parts4_files+=("$2"); shift ;;
ly_parts4_files+=("$2")
ly_parts4_titles+=("$3")
shift; shift ;;
--pdfname|-n)
ly_pdfname="$2"; shift ;;
--source|-s)
Expand Down Expand Up @@ -170,6 +173,21 @@ echo "creating the makefile '$ly_targetdir/Makefile.am' ..."
cat $PROGPATH/templates/makefile-head
echo
echo "EXTRA_DIST = ${ly_mainfile}.ly \\"
echo -e "\t covercolor.ly.in \\"
echo -e "\t header.ily \\"
echo -e "\t global.ly \\"

nparts="${#ly_parts4_files[@]}"

if [[ "${!ly_parts4_files[@]}" != "0" ]]; then
echo -e "\t logo.ly \\"
for i in ${!ly_parts4_files[@]}; do
echo -en "\t parts/${ly_parts4_files[$i]}"
[ "$i" != "$(( $nparts - 1 ))" ] && echo " \\" || echo ""
done
else
echo -e "\t logo.ly"
fi

set -- $LY_COMMON_FILES
while test -n "$1"; do
Expand All @@ -190,16 +208,19 @@ echo "creating the makefile '$ly_targetdir/Makefile.am' ..."
fi
) > "$ly_targetdir/Makefile.am"

for p in ${ly_parts4_files[@]}; do
if [ -s "$ly_targetdir/parts/$p" ]; then
echo "WARNING: skip non empty file: $ly_targetdir/parts/$p"
for i in ${!ly_parts4_files[@]}; do
partfile="${ly_parts4_files[$i]}"
title="${ly_parts4_titles[$i]}"
if [ -s "$ly_targetdir/parts/$partfile" ]; then
echo "WARNING: skip non empty file: $ly_targetdir/parts/$partfile"
else
echo "creating $ly_targetdir/parts/$p ..."
( ly_sed < $PROGPATH/templates/part-four-voices.ly ) \
> "$ly_targetdir/parts/$p"
echo "creating $ly_targetdir/parts/$partfile ..."
( partfile_title="$title"
ly_sed < $PROGPATH/templates/part-four-voices.ly ) \
> "$ly_targetdir/parts/$partfile"
fi
echo "updating $ly_targetdir/${ly_mainfile}.ly"
echo "\\include \"./parts/$p\"" >> $ly_targetdir/${ly_mainfile}.ly
echo "\\include \"./parts/$partfile\"" >> $ly_targetdir/${ly_mainfile}.ly
done

echo "
Expand Down
4 changes: 2 additions & 2 deletions lyinit/templates/part-four-voices.ly
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ Bass = \context Voice = "four" \relative c {
>>
>>
\header {
composer = ##f # "@composer_firstname@ @composer_lastnam@"
composer = ##f # "@composer_firstname@ @composer_lastname@"
opus = ##f # "@opus@"
title = \markup { "MISSING TITLE" }
title = \markup { "@partfile_title@" }
subtitle = ##f
}
\layout {
Expand Down
102 changes: 102 additions & 0 deletions src/johann-sebastian-bach/partitas/BWV826/JS-Bach-BWV826-Partita-2.ly
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
\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 = "[email protected]"
}

\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\null\null
\fill-line { \abs-fontsize #20 "For Piano or Harpsichord" }
\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"
}
\null\null
}
}
}
}

%\include "./parts/bach-partita-2-1-sinfonia.ly"
\include "./parts/bach-partita-2-2-allemande.ly"
%\include "./parts/bach-partita-2-3-courante.ly"
%\include "./parts/bach-partita-2-4-sarabande.ly"
%\include "./parts/bach-partita-2-5-rondeau.ly"
%\include "./parts/bach-partita-2-6-capriccio.ly"
39 changes: 39 additions & 0 deletions src/johann-sebastian-bach/partitas/BWV826/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
## 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 <http://www.gnu.org/licenses/>.

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
1 change: 1 addition & 0 deletions src/johann-sebastian-bach/partitas/BWV826/covercolor.ly.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
coverColor = #(rgb-color @rgb_color@) % lavender blue
3 changes: 3 additions & 0 deletions src/johann-sebastian-bach/partitas/BWV826/global.ly
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
% Draw a box round the bar number(s)
\override Score.BarNumber.stencil
= #(make-stencil-boxer 0.1 0.25 ly:text-interface::print)
65 changes: 65 additions & 0 deletions src/johann-sebastian-bach/partitas/BWV826/header.ily
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
\header {
composer = "Johann Sebastian Bach (1685-1750)"
date = ""

footer = "Mutopia-2024/02/24"

lastupdated = "2024 February 24"
license = "Creative Commons Attribution-ShareAlike 4.0"
maintainerEmail = "[email protected]"
maintainerWeb = "https://github.com/madrisan/open-scores"

% Extra Mutopia Information
mutopiacomposer = "BachJS"
mutopiacopyright = "Creative Commons Attribution-ShareAlike 4.0"
mutopiainstrument = "Harpsichord, Piano"
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 #"http://creativecommons.org/licenses/by-sa/40/"
"Creative Commons Attribution ShareAlike 4.0 International License"
" — free to distribute, modify, and perform"
}
}
\abs-fontsize #13 \with-color \coverColor "ǀ"
}
}
}
tagline = ##f
}
24 changes: 24 additions & 0 deletions src/johann-sebastian-bach/partitas/BWV826/logo.ly
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
\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/"
}
}
}
}
}
Loading

0 comments on commit ddba73f

Please sign in to comment.