diff --git a/src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV830-Partita-1.ly b/src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV830-Partita-1.ly index 8d295f1e..513b2c98 100644 --- a/src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV830-Partita-1.ly +++ b/src/johann-sebastian-bach/partitas/BWV825/JS-Bach-BWV830-Partita-1.ly @@ -101,6 +101,7 @@ \include "./parts/bach-partita-1-3-corrente.ly" \pageBreak \include "./parts/bach-partita-1-4-sarabande.ly" -%\include "./parts/bach-partita-1-5-menuet-1.ly" -%\include "./parts/bach-partita-1-5-menuet-2.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/parts/bach-partita-1-5-menuet-1.ly b/src/johann-sebastian-bach/partitas/BWV825/parts/bach-partita-1-5-menuet-1.ly index cde7f8d8..4680aa23 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,20 +1,80 @@ Global = { - \key c \major - \time 4/4 + \key bes \major + \time 3/4 \include "../global.ly" } staffLower = { \change Staff = "lower" } staffUpper = { \change Staff = "upper" } -Soprano = \context Voice = "one" \relative c' { +Soprano = \context Voice = "one" \relative c'' { \voiceOne \stemNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 %1 - | R1 - \fine + \repeat volta 2 { + | d8 bes a bes f bes + | d bes es bes f' bes, + | c a g a f a + | c f, d' f, es' f, + %5 + | d' aes es' g, f' f, + | g' f a! es bes' d, + | c es d c d bes + | c a g a f es' + \break + | d bes a bes f bes + %10 + | d bes es bes f' bes, + | c a g a f a + | c f, d' f, es' f, + | d' c e bes f' a, + | g bes f bes e, bes' + %15 + | a c a f c e + | \alternative { + { f4. g16 a bes a bes c } + { f,2. } + } + } + \break + \repeat volta 2 { + | a'8 f e f c f + | a f bes f a f + %20 + | g es! d es c es + | f d f c f b, + | c es fis c a' c, + | a c fis, c' d, c' + | bes! es d bes c a + %25 + | g4. a16 bes a g f! es + \break + | d8 bes' a bes f' bes, + | aes' bes, g' bes, f' bes, + | es, bes' a! bes g' bes, + | es, bes' f bes g bes + \pageBreak + %30 + | c bes d aes es' g, + | f' es g d a'! c, + | bes' a g f es d + | c bes a g f es + \break + | \staffLower\stemUp d \staffUpper\stemNeutral f' g f c f + %35 + | b, f' a, f' g, f' + | \staffLower\stemUp c, \staffUpper\stemNeutral es' f es bes es + \break + | a, es' g, es' f, es' + | d f d bes f a + | \alternative { + { bes4~ bes16 c d es f e f g } + { bes,2. } + } + } + \fine } Alto = \context Voice = "two" \relative c' { @@ -31,14 +91,65 @@ Tenor = \context Voice = "three" \relative c { %1 } -Bass = \context Voice = "four" \relative c { +Bass = \context Voice = "four" \relative c' { \voiceFour - \stemDown\tieNeutral + \stemNeutral\tieNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 %1 - | R1 - \fine + \repeat volta 2 { + %1 + | bes4 f d + | bes c d + | a c f + | a bes8 a g f + %5 + | bes4 \clef treble c d + | es f g + | a bes bes, + | f' \clef bass f, a + | bes f d + %10 + | bes c d + | a c f + | a bes8 a g f + | bes4 c d + | e, d c + %15 + | f bes, c + | \alternative { + { f,8 a c f g a } + { f4 c a } + } + } + \repeat volta 2 { + | f c' f + | es! d bes + | es g aes + | d, g g, + | c a'! g + | fis d fis + | g bes, d + | g,8 a bes c d es + | f4 es d + | f es d + | g f es + | g f es + | aes bes c + | \clef treble d es f + | g a! bes + | f \clef bass f, a + | d d, f + | g a b + | c c, es + | f g a + | bes es, f + | \alternative { + { bes,8 d c bes a g } + { bes2. } + } + } + \fine } \score { 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 34df25d1..55233576 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,44 +1,124 @@ Global = { - \key c \major - \time 4/4 + \key bes \major + \time 3/4 \include "../global.ly" } staffLower = { \change Staff = "lower" } staffUpper = { \change Staff = "upper" } -Soprano = \context Voice = "one" \relative c' { +Soprano = \context Voice = "one" \relative c'' { \voiceOne \stemNeutral \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 %1 - | R1 - \fine + \repeat volta 2 { + | bes2 f4 + | g aes r + | \stemUp g es' d + | c4 bes8 a g f + \break + %5 + | 2 f4 + | g aes r + | \stemUp g ees' d + | \slurDown\grace d8 c2. + } + \break + \repeat volta 2 { + | f2 c4 + %10 + | d ees e\rest + | fis, d' c + \break + | bes\parenthesize\prall a8 bes g4 + | \stemNeutral 2 4 + | \stemUp g'4 f f\rest + %15 + | \grace bes,8 2 4 + | 2. + } + \fine } -Alto = \context Voice = "two" \relative c' { +Alto = \context Voice = "two" \relative c'' { \voiceTwo \stemDown \override Rest.staff-position = #0 %1 + | s2.*2 + | g4 a bes + | a s2 + | s2.*2 + | g4 a bes + | a2. + | a4 bes c + %10 + | bes a g + | fis d a' + | g fis g + | s2. + | g4 a bes } -Tenor = \context Voice = "three" \relative c { +Tenor = \context Voice = "three" \relative c' { \voiceThree \stemUp \override Rest.staff-position = #0 %1 + | f4\rest c d + | ees f2 + | ees2 f4~ + | f c ees~ + %5 + | ees c d + | ees f2 + | ees2 f4 + | s2. + | c2 f4~ + %10 + | f c2~ + | c4 bes8 a g fis + | g4 s2 + | d'4\rest a bes~ + | bes c d~ + %15 + | d c ees + + } -Bass = \context Voice = "four" \relative c { +Bass = \context Voice = "four" \relative c' { \voiceFour - \stemDown\tieNeutral + \stemDown\tieDown \override MultiMeasureRest.staff-position = #0 \override Rest.staff-position = #0 %1 - | R1 - \fine + \repeat volta 2 { + | bes2.~ + | bes2 d4~ + | d c bes + | f2 c4\rest + %5 + | bes'2.~ + | bes2 d4~ + | d c bes + | 2. + } + \repeat volta 2 { + | f4 g a + %10 + | bes2 bes4 + | a fis d + | g2.^~ + | g2 f!4 + | ees2 d4 + %15 + | f2. + | 2. + } + \fine } \score {