From f23cc33200f1d3c0ff720331a8d41e9e31954548 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 23 Aug 2003 13:40:22 +0000 Subject: [PATCH] * input/mutopia/J.S.Bach/bwv940.ly: add 1 petite prelude * input/mutopia/J.S.Bach/GNUmakefile (EXTRA_DIST_FILES): remove Petites-Preludes --- ChangeLog | 5 + input/mutopia/J.S.Bach/GNUmakefile | 1 - .../J.S.Bach/Petites-Preludes/GNUmakefile | 15 -- .../J.S.Bach/Petites-Preludes/header.ly | 42 ---- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 133 ----------- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 101 --------- .../J.S.Bach/Petites-Preludes/preludes-3.ly | 162 -------------- .../J.S.Bach/Petites-Preludes/preludes-4.ly | 208 ------------------ .../J.S.Bach/Petites-Preludes/preludes-5.ly | 208 ------------------ .../Petites-Preludes/preludes-score.ly | 15 -- .../preludes-6.ly => bwv940.ly} | 83 ++++--- input/mutopia/J.S.Bach/wtk1-fugue1.ly | 205 ----------------- 12 files changed, 62 insertions(+), 1116 deletions(-) delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/header.ly delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly delete mode 100644 input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly rename input/mutopia/J.S.Bach/{Petites-Preludes/preludes-6.ly => bwv940.ly} (50%) delete mode 100644 input/mutopia/J.S.Bach/wtk1-fugue1.ly diff --git a/ChangeLog b/ChangeLog index 675402963e..362474ee43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-08-23 Han-Wen Nienhuys + * input/mutopia/J.S.Bach/bwv940.ly: add 1 petite prelude + + * input/mutopia/J.S.Bach/GNUmakefile (EXTRA_DIST_FILES): remove + Petites-Preludes + * input/test/partial-blank.ly (quickmeasure): syntax * lily/slur.cc (get_attachment): bugfix: don't crash on non-cons diff --git a/input/mutopia/J.S.Bach/GNUmakefile b/input/mutopia/J.S.Bach/GNUmakefile index e752a4ace6..e65ceefe04 100644 --- a/input/mutopia/J.S.Bach/GNUmakefile +++ b/input/mutopia/J.S.Bach/GNUmakefile @@ -2,7 +2,6 @@ depth = ../../.. -SUBDIRS = Petites-Preludes EXTRA_DIST_FILES= LOCALSTEPMAKE_TEMPLATES=ly mutopia diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile b/input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile deleted file mode 100644 index c8c885df92..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile +++ /dev/null @@ -1,15 +0,0 @@ -# mutopia/J.S.Bach/Petites-Preludes/Makefile - -depth = ../../../.. - -EXTRA_DIST_FILES= - -LILYINCLUDE:=$(LILYINCLUDE):out -export LILYINCLUDE - -examples=preludes-2 -LOCALSTEPMAKE_TEMPLATES=ly mutopia - -mutopia-examples=preludes-score - -include $(depth)/make/stepmake.make diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly b/input/mutopia/J.S.Bach/Petites-Preludes/header.ly deleted file mode 100644 index 08709160a1..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly +++ /dev/null @@ -1,42 +0,0 @@ -\version "1.7.18" -%{ - Header for Petites Preludes. - - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 - - Kellner was a student of Bach's that copied some 90 works of his master. -%} - -instrument = "Piano" - -\header{ - title = "Petites Pr\\'eludes" - subtitle = "Clavierbuechlein" - composer = "Johann Sebastian Bach (1685-1750)" - enteredby = "JCN,HWN" - instrument = \instrument - - % mutopia headers. - mutopiatitle = "Petites Préluedes" - mutopiacomposer = "J.S.Bach (1685-1750)" - mutopiaopus = "BWV924,939,999,925,926,940" - mutopiainstrument = \instrument - date = "1700s" - source = "Ed. Henry Lemoine Urtext" - style = "Baroque" - copyright = "Public Domain" - maintainer = "Jan Nieuwenhuizen" - maintainerEmail = "janneke@gnu.org" - lastupdated = "2001/Feb/25" - mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small - \\\\This music is part of the Mutopia project, - \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset - and placed in the public domain by " + \maintainer + - ".\\\\Unrestricted modification and redistribution is permitted - and encouraged---copy this music and share it.}" - tagline = \mutopiapublicdomain - footer = "pre-Mutopia-200y/mm/dd-nr" -} - diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly deleted file mode 100644 index 23ef8f62b0..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ /dev/null @@ -1,133 +0,0 @@ -% #(ly:set-point-and-click 'line-column) - -opus = "BWV 924" -piece = "1" - - -%{ - -TODO: this file needs additional layouting: the trills look -differently in Lemoine, and the sharps should be below the trill. - -Additionally, the performance of trills should be explained. - -FIXME (Bach sure didn't)? -Lemoine puts fermatas on ending bar lines everywhere. - -%} - - - -\version "1.7.18" - - -lowstaff = \translator "Staff" = "lower" -upstaff = \translator "Staff" = "upper" - -% upper = \context Staff \notes\relative c { -upper = \context Staff=upper \notes\relative c { - \property Voice.TextScript \set #'font-style = #'italic - - r16 g'' c e r g, c e - r g, c d r b d g | - r16 a, d g r a, d f - r a, d e r c e a | - r16 b, e a r b, e g - r c, e f r g, d' f | - - r g, d' e r g, c e - r a, c d r e, b' d | - r e, b' c r e, a c - r f, a bes r c, g' bes | - r c, g' a r c, f a - r d, f b r e, g c | - r d, g c r d, g b - r c, g' b r c, fis a | - r b, d a' r b, d g - r a, c g' r a, c f! | - - % ugh arpeggio FIXME: is that so? - <>4 - r4 - - \lowstaff - \stemUp - r16 g,, b d - f-[ \upstaff \stemDown g16 b d ] | - \stemUp b - \lowstaff \stemDown - g-[ b d ] f - \upstaff - g16-[ b d ] b - g-[ b d ] - \stemUp - - % urg, below translator change affects previous beam too!? - % howto separate translator command from previous beam end? - \upstaff f g b f | - \stemBoth - e c' g f e c' g e - d c' f, e d b' f d | - c b' e, d c a' e c - b a' d, c b g' d b | - a g' c, b a fis' c a - b f' d c b f' d b | - g e' c b a e' c a - fis d' b a g d' b g | - e c' a g fis c' a fis - d c' b a b g d' f, | - g e f d' c b a g - f' d es c fis, es' d c | - b d b g as f g d - es fis a c - < - { r c8 b16 } \\ - { d,8 f } - > - <>1 - \bar "|." -} - -lower = \context Staff=lower \notes\relative c{ - \property Voice.TextScript \set #'font-style = #'roman - c4 e g^\markup { \musicglyph #"accidentals-1" } -\mordent g,4 | - d'4-\mordent f a-\mordent^\markup { \musicglyph #"accidentals-1" } a,4 | - e' e'-\mordent a, b-\upprall | - c4 e, fis gis-\upprall | - a4 c, d e-\upprall | - f4 e d-\prall c | - g'-\mordent^\markup { \musicglyph #"accidentals-1" } g, g'-\mordent g, | - g'-\mordent g, g'-\mordent g, | - g' r s s | s s s s \clef "bass" | - < { g1 ~ g ~ g ~ g ~ g ~ g ~ g } \\ - { g,1 ~ g ~ g ~ g ~ g ~ g ~ g } - > - <>1 - \bar "|." -} - -global = \notes{ - \time 4/4 -} - -\score{ - % Moderato - \context PianoStaff < - \context Staff = upper < - \global - \upper - > - \context Staff = lower < - \global - \clef "bass" - \lower - > - > - \paper { linewidth = 18.0 \cm } - \midi{ \tempo 4 = 80 } - \header { - opus = \opus - piece = \piece - } -} - diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly deleted file mode 100644 index 221859bab2..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ /dev/null @@ -1,101 +0,0 @@ -% #(ly:set-point-and-click 'line-column) - -opus= "BWV 939" -piece = "2" - - -\version "1.7.18" -upper = \context Staff \notes\relative c{ - \context Voice=i - \property Voice.TextScript \set #'font-style = #'italic - r8 c' e g e c bes' g | - a c, f a f c c' a | - b g b d b g f' d | - <>2 - r4 - <> - <>2 - r4 - <> - < { d8-[ g, 8 b d] } \\ - { << b g >> } - > - - <>4 - <> - c2 - r4 - < - { c ~ c8} \\ - % We get a warning: No ties created! - % but they are too! - { <>4 ~ <>8 } - > - \stemBoth - d, fis a fis d c' a | - b g b d b g f'! d | - e g, c e c g g' e | - fis a, c fis c a a' fis | - <>2 - r4 b,4 | - c8 e g c g e bes' g | - a16 g f e d c b ! a - b g a b c d e f | - g4 - <>2 - <>4 - <>1 - \bar "|." -} - -lower = \context Staff \notes\relative c{ - < - { c1 ~ | c ~ | c } \\ - { c,1 ~ | c ~ | c } - > - \stemBoth | - r8 c e g e c c' e, | - fis d fis a fis d d' fis, | - g2 r4 g | - a8 a, c e c a g' e | - fis2 r4 d | - g-\mordent-\markup { \musicglyph #"accidentals-1" } g, 4 g'-\mordent g, | - % mordents in brackets... - g'-\mordent g, g'-\mordent g, | - g'-\mordent g, g'-\mordent g, | - g'8 g, b d b g f'! d | - e c e g e c c' e, | - - f1 ~ | - f8 d e c g'4 g, | - c,1 - \bar "|." -} - -global = \notes{ - \time 4/4 -} - -\score{ - \context GrandStaff < - \context Staff = upper < - \global - \upper - > - \context Staff = lower < - \global - \clef "bass" - \lower - > - > - \paper{ - linewidth = 18.0 \cm - } - \midi{ \tempo 4 = 100 } - \header { - opus = \opus - piece = \piece - } -} - - diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly deleted file mode 100644 index 7196554644..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ /dev/null @@ -1,162 +0,0 @@ -%#(ly:set-point-and-click 'line-column) - -opus= "BWV 999" -piece = "3" - -%{ - -TODO: this file needs additional layouting: the upper voice should -switch staffs to avoid leger lines. - -Not all editions agree on the last note: ed. Lemoine has a quarter -note, some have dotted half notes. - -This file was partly generated using m4. -%} - -\version "1.7.18" - - -upper = \notes \transpose c c' { - r16 c-[ es g] es-[ c es c] r c r c | - r16 c-[ es g] es-[ c es c] r c r c | - r16 c-[ f as] f-[ c f c] r c r c | - r16 c-[ f as] f-[ c f c] r c r c | - r16 b,-[ d f] d-[ b, d b,] r b, r b, | - r16 b,-[ d f] d-[ b, d b,] r b, r b, | - r16 g,-[ c es] c-[ g, c g,] r g, r g, | - r16 g,-[ c es] c-[ g, c g,] r g, r g, | - r16 g,-[ c es] c-[ g, c g,] r g, r g, | - r16 g,-[ c es] c-[ g, c g,] r g, r g, | - r16 a,-[ c es] c-[ a, c a,] r a, r a, | - r16 a,-[ c es] c-[ a, c a,] r a, r a, | - r16 a,-[ bes, d] bes,-[ a, bes, a,] r a, r a, | - r16 g,-[ bes, d] bes,-[ g, bes, g,] r g, r g, | - r16 bes,-[ d g] d-[ bes, d bes,] r bes, r bes, | - r16 a,-[ es g] es-[ a, es a,] r a, r a, | - r16 a,-[ c fis] c-[ a, c a,] r a, r a, | - r16 a,-[ c fis] c-[ a, c a,] r a, r a, | - r16 bes,-[ d g] d-[ bes, d bes,] r bes, r bes, | - - r16 c-[ fis a] fis-[ c fis c] r c r c | - r16 d-[ g bes] g-[ d g d] r d r d | - r16 d-[ fis c'] fis-[ d fis d] r d r d | - - r16 cis-[ g bes] g-[ cis g cis] r cis r cis | - r16 c!-[ es a] es-[ c es c] r c r c | - r16 bes,-[ e g] e-[ bes, e bes,] r bes, r bes, | - r16 a,-[ c g] c-[ a, c a,] r a, r a, | - - r16 a,-[ c fis] c-[ a, c a,] r a, r a, | - r16 g,-[ bes, e] bes,-[ g, bes, g,] r g, r g, | - r16 fis,-[ a, es] a,-[ fis, a, fis,] r fis, r fis, | - r16 g,-[ bes, d] bes,-[ g, bes, g,] r g, r g, | - r16 g,-[ a, c] a,-[ g, a, g,] r g, r g, | - r16 fis,-[ a, c] a,-[ fis, a, fis,] r fis, r fis, | - r16 fis,-[ a, c] a,-[ fis, a, fis,] r fis, r fis, | - r16 g,-[ a, c] b,-[ g, b, g,] r g, r g, - r16 a,-[ c fis] c-[ a, c a,] r a, r a, | - r16 c-[ fis a] fis-[ c fis c] r c r c | - r16 b,-[ d g] d-[ b, d b,] r b, r b, | - r16 b,-[ d f] d-[ b, d b,] r b, r b, | - r16 g,-[ c es] c-[ g, c g,] r g, r g, | - r16 fis,-[ c es] c-[ fis, c fis,] r fis, r fis, | - r16 fis,-[ c es] c-[ fis, c fis,] r fis, r fis, | - r16 g,-[ b, d] b,-[ g, b, d] es-[ c a, fis] | - - - <>4 - \bar "|." -} - -lower = \notes{ - c4 r g8-[ es] | - c4 r g8-[ es] | - c4 r as8-[ f] | - - c4 r as8-[ f] | - c4 r as8-[ f] | - c4 r as8-[ f] | - - c4 r es8-[ c] | - bes,!4 r es8-[ c] | - as,!4 r es8-[ c] | - - g,4 r es8-[ c] | - fis,4 r es8-[ c] | - fis,4 r fis8-[ d] | - - g,4 r d8-[ bes,] | - g,4 r bes,8-[ g,] | - es,4 r g8-[ es] | - - c4 r c8-[ a,] | - d,4 r d8-[ a,] | - d,4 r d8-[ a,] | - d,4 r d8-[ bes,] | - - - d,4 r es8-[ c] | - d,4 r g8-[ d] | - d,4 r a8-[ fis] | - - d,4 r g8-[ es] | - d,4 r fis8-[ d] | - d,4 r e8-[ cis] | - d,4 r es8-[ c] | - - d,4 r d8-[ a,] | - d,4 r cis8-[ bes,] | - d,4 r c!8-[ a,] | - - d,4 r bes,8-[ g,] | - d,4 r es8-[ c] | - d,4 r d8-[ a,] | - - g,4 r es8-[ c] | - g,4 r d8-[ b,] | - g,4 r es8-[ c] | - - g,4 r es8-[ c] | - g,4 r g8-[ d] | - g,4 r as8-[ f] | - g,4 r es8-[ c] | - - g,4 r es8-[ c] | - g,4 r es8-[ c] | - g,4 r r | - %% FIXME: \fermata? - g,4_\fermata - \bar "|." -} - -global = \notes{ - \time 3/4 - \key es \major -} - -\score{ - \context PianoStaff < - \context Staff = up < - \global - \upper - > - \context Staff = down < - \global - \clef "bass" - \lower - > - > - \paper{ - \translator {\PianoStaffContext - VerticalAlignment \set #'forced-distance = #10 - } - - } - \midi{ \tempo 4 = 100 } - \header{ - opus = \opus - piece = \piece - } -} - diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly deleted file mode 100644 index 20ab6fe71e..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ /dev/null @@ -1,208 +0,0 @@ -%#(ly:set-point-and-click 'line-column) - -opus = "BWV 925" -piece = "4" - -\version "1.7.18" - - -one = \context Staff \notes\relative c { - \context Voice=i - r16 - d' fis d a' b cis a - d cis d e d fis e d | - \stemUp\tieUp - cis4 fis ~ fis8 fis e4 ~ | - e16 \stemBoth\tieBoth a,16 cis a d e fis d - g fis g a g b a g | - \stemUp - - fis4 e8 a <>4 <> | - %5 - <>4 <> << g! d>>16 fis g a - \stemBoth - g b a g | - fis e fis g fis a g fis - e4 ~ e16 e, fis g | - - a g a b a c b a - g fis g a g b a g | - \stemUp\tieUp - fis4 - \skip 4*7 | - %10 - d'4. cis8 ~ cis b4 a8 ~ | - a g4 fis8 ~ fis16 fis e d - e4 ~ | - e16 e d cis d4 ~ d16 d cis b cis4 | - \stemBoth - fis,16 a d c b d g fis - d b' a g fis e d c! | - b d g a fis8-\prall e16 d - d8. e16~ e d8 cis16 | - %15 - \stemUp\tieUp - r16 d fis d g a b g c b c d c e d c | - b4 a ~ a8 g ~ g16 fis8 e16 | - fis8 e~ e d~ d4 cis | - - d2 ~ d16 a b cis d4 | - \bar "|." -} - -two = \context Staff \notes\relative c - \context Voice=ii -{ - - \stemUp - fis4 e8 a4 a4 gis8 | - a8 - \translator Staff=upper \stemDown\tieDown - - a'4 a8 b4. cis8 ~ | - cis8 - \translator Staff=lower \stemUp\tieUp - a,8 ~ a d ~ d d4-> cis8 | - d8 - \translator Staff=upper \stemDown\tieDown - d'4-> cis8 ~ cis b4 b8 | - %5 - r8 a4 a8 - \translator Staff=lower \stemUp\tieUp - g8 fis e4 ~ | - e4 d ~ d16 d cis b cis4 ~ | - cis8 a d4. d4^> cis8 | - \translator Staff=upper \stemDown\tieDown - d4 \stemBoth\tieBoth r16 b d b~ <>4 - r16 cis, e cis~ | - <>4 r16 d, fis d~ <>4 - r16 fis a fis~ | - %10 - \stemDown - fis4 e d cis | - b a b4. b8 | - a4 - \translator Staff=lower \stemUp - r16 b fis a g4 r16 a e g | - \skip 1*1 - s16 - \translator Staff=upper \stemDown\tieDown - d'8. ~ d8 c d4 a8 g | - %15 - fis8 \translator Staff=lower \stemUp c' b4 \stemDown - \translator Staff=upper <>4. - \stemDown\tieDown - a'8~ | - a g~ g16 e fis8~ fis16 d8.~ d8. cis!16 | -% \translator Staff=lower \stemUp - \context Staff < - { - \translator Staff = lower - a8 g fis16 e fis d - }\\ - { - \translator Staff = upper - d8 a~ a4 - } - > - \translator Staff=lower - \stemUp\tieUp - g16 fis g a g b a g ~ | - g g fis e fis4 ~ fis2 - \bar "|." -} - -three = \notes\relative c \context Voice=iii -{ - \stemDown - d4 cis b e | - a16 a, cis a d e fis d - g fis g a g b a g | - fis4 fis e a | - d16 \stemBoth d, fis d a' b cis a - d cis d e d fis e d | - %5 - cis b cis d c e d c - \stemDown b4 cis8 b | - a fis b a gis e a g | - fis4. d8 e4 a4 | - \stemBoth - r16 d, fis d g8 g, - r16 e' g e a8 a, | - r16 fis' a fis b8 b, r16 g' b g d'8 d, | - %10 - r16 d,16 fis d a' b cis a d b d b - fis' g a fis | - fis16 g, b g d' e fis d g8 g, r16 cis e cis | - fis8 fis, \stemDown r16 b d b e8 e, - r16 a cis a | - \stemBoth - d e fis d g fis e d cis! a b cis - d e fis d | - g8 e \stemDown\tieDown a a, b8. g16 a4 | - %15 - d8 a'~ a g~ g g fis4 | - \stemUp - r16 g b g d'8. c16 b8. bes16 a8 g | - \stemDown - r16 a, cis! a' d, e fis d e8 d e a, | - d a~ a16 a b cis d2 | -} - -four = \context Staff \notes\relative c{ - \skip 1*9 - \context Voice=iv - \stemUp - \property Voice.NoteColumn \override #'horizontal-shift = #1 - %10 - a''2 fis | - d s | - \skip 1*2 | - s4 - \translator Staff=lower \stemUp\tieUp - a4 ~ a16 d, g8 fis e | - %15 - \stemDown\tieDown - d1 ~ | - % we'll get some warnings, but it looks better - \property Voice.NoteColumn \override #'horizontal-shift = #0 - d | - d, ~ | - d2 d2 -} - -global = \notes{ - \time 4/4 - \key d \major -} - -\score{ - % Allegretto - \context PianoStaff < - \context Staff = upper < - \global - \one - \four - > - \context Staff = lower < - \global - \clef "bass" - \two - \three - > - > - \paper{ - linewidth = 18.0 \cm - \translator{ - \VoiceContext - % consider ending beam at every 1 2 note - autoBeamSettings \override #'(end 1 8 * *) = #(ly:make-moment 1 4) - } - } - \midi{ \tempo 4 = 70 } - \header{ - opus = \opus - piece = \piece - } -} - diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly deleted file mode 100644 index 2be246fa2c..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ /dev/null @@ -1,208 +0,0 @@ -%#(ly:set-point-and-click 'line-column) - -piece = "5" -opus = "BWV 926" - -\version "1.7.18" - -upper = \context Staff \notes\relative c - \context Voice=i { - \property Voice.TextScript \set #'font-style = #'italic - - - d'8-[ a' f d a' f] | - d a' f d a' f | - d bes' g d bes' g | - d bes' g d bes' g | - %5 - cis, g' e cis g' e | - cis bes' g e a g | - f d f a f a | - d a d f d f | - b f e d c b | - %10 - a gis fis e d' b | - < - { - - \property Voice.TextScript \set #'font-style = #'roman - c4-\mordent^\markup { \musicglyph #"accidentals-1" } r r | - c4-\mordent^\markup { \musicglyph #"accidentals-1" } r r - \property Voice.TextScript \set #'font-style = #'italic - } \\ - { a4 r r | a4 r r } - > | - a'8 es d c bes a | - g fis e! d c' a | - %15 - bes8-\mordent d8 bes g g'4 | - r8 d c bes a-\prall g | - a c a f f'4 | - r8 c bes a g-\prall f | - g bes a g f e | - %20 - f d f a d g, | - < - { - % ... textnatural - cis8-\prall e8 cis a e' cis - }\\ - { \stemDown a4 } - > - a8 e' cis a bes! a | - g e' cis g e' cis | - g e' cis g a g | - - f d' bes f d' bes | - %25 - f d' bes f d' bes | - - fis c' a fis c' a | - fis c' a fis c' a | - bes g fis g d g | - bes g d bes' g d | - %30 - e g fis g bes g | - es bes' g es bes' g | - cis, bes' g cis, bes' g | - cis, bes' g cis, a' g | - f a f d a' f | - %35 - d a' f d cis d | - e g e bes g' e | - bes g' e cis a g' | - f16 d c bes \stemUp a s16 s8 s4 | -% ugh -% s1 | - s4 s4 s4 | - %40 - s4 s16 d16-[ f a] \stemDown d,-[ f a] \stemBoth \stemUp d | - \stemBoth - f a f d f d b d gis, b a gis | - - % arpeggio - <>4. a8 - << f d a >>4 ~ - f8-[ e] - < { - e4.^\prall d8 - } \\ - { cis2 } - > - d8 c! a d bes g | - %45 - c a fis bes g e | - - a fis d g e cis | - - % the mordent is on the D ! - <>2.-\mordent -} - - -lower = \context Staff \notes\relative c{ - \context Voice=i - - d4-\mordent r r | - d,4 r r | - d'-\mordent r r | - d,4 r r | - d'-\mordent r r | - - d,4 r r | - d'8 a d f d f | - a f a d a d | - gis,4 r r | - e gis e | - a8 e' c a e' c | - g! es' c g es' c | - fis,4 r r - d fis d | - \property Voice.TextScript \set #'font-style = #'roman - g4-\mordent^\markup { \musicglyph #"accidentals-1" } r r8 f!8 | - \property Voice.TextScript \set #'font-style = #'italic - e4-\prall r r | - f4-\mordent r r8 e | - d4 r8 f e d | - e d cis e d cis | - d4 c! bes | - a a' a, | - a a' a, | - a a' a, | - a a' a, | - bes r r | - bes bes' bes, | - a r r | - a d d, | - g r r | - g g' g, | - g r r | - g g' g, | - a r r | - a a' a, | - a r r | - a a' a, | - cis, r r | - cis cis' cis, | - d s16 - \stemDown - g'16-[ f e] f a d, f | - a, \stemUp d-[ c bes] - - a \stemDown g-[ f e] d f a d | - \stemUp - - f-[ a] - \stemDown - d,-[ f] a s s8 s4 | - \stemBoth -% ugh whole rest has duration of one bar - R2. | -% r4 r r | - \stemBoth - cis,8 e cis a d16 c bes a | - g8 g' a g a a, | - % ah, both at last - % what's going on here?? - \stemBoth - \stemBoth - \stemBoth - d4 d' d, | - d r r | - d, d' d, | - d2. | -} - -global = \notes{ - \time 3/4 - \key f \major -} - -\score{ - % Moderato - \context PianoStaff < - \context Staff = upper < - \global - { \upper \bar "|." } - > - \context Staff = lower < - \global - \clef "bass" - \lower - > - > - \paper{ - linewidth = 18.0 \cm - \translator {\PianoStaffContext - VerticalAlignment \set #'forced-distance = #10 - } - - } - \midi{ \tempo 4 = 90 } - \header{ - piece = \piece - opus = \opus - } -} - - diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly deleted file mode 100644 index 987b52a7c0..0000000000 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "1.7.18" -% This is the main score file of the Petites Preludes - -\include "header.ly" - -\paper { linewidth = 18.0\cm } - -\include "preludes-1.ly" -\include "preludes-2.ly" -\include "preludes-3.ly" -\include "preludes-4.ly" -\include "preludes-5.ly" -\include "preludes-6.ly" - - diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/input/mutopia/J.S.Bach/bwv940.ly similarity index 50% rename from input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly rename to input/mutopia/J.S.Bach/bwv940.ly index ef03afda73..a03c519e01 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,14 +1,46 @@ -%#(ly:set-point-and-click 'line-column) +\version "1.8.0" -opus = "BWV 940" -piece = "6" +%{ + Header for Petites Preludes. -\version "1.7.18" + Six Petits Preludes, + Collection Johann Peter Kellner + ca 1703 - 1707 + Kellner was a student of Bach's that copied some 90 works of his master. +%} -one = \context Staff \notes\relative c{ - \context Voice=i +\header{ + title = "Praeludium" + composer = "Johann Sebastian Bach (1685-1750)" + enteredby = "JCN,HWN" + opus= "BWV 940" + + + % mutopia headers. + mutopiacomposer = "J.S.Bach (1685-1750)" + mutopiaopus = "BWV940" + + mutopiainstrument = "Harpsichord,Clavichord" + date = "1700s" + source = "Ed. Henry Lemoine Urtext" + style = "Baroque" + copyright = "Public Domain" + maintainer = "Jan Nieuwenhuizen" + maintainerEmail = "janneke@gnu.org" + lastupdated = "2003/Aug/22" + mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small + \\\\This music is part of the Mutopia project, + \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset + and placed in the public domain by " + \maintainer + + ".\\\\Unrestricted modification and redistribution is permitted + and encouraged---copy this music and share it.}" + tagline = \mutopiapublicdomain + footer = "Mutopia-2003/08/22-nr" +} + +one = \notes\relative c{ \skip 1 | \stemUp r4 d''2 cis4 | @@ -29,8 +61,7 @@ one = \context Staff \notes\relative c{ \bar "|." } -two = \context Staff \notes\relative c{ - \context Voice=ii +two = \notes\relative c{ r16 d'' c bes a bes f g a8.-\mordent bes16 g8.-\prall f16 | \stemDown @@ -41,7 +72,7 @@ two = \context Staff \notes\relative c{ r16 b' a g f8. f16 e2 ~ | %5 e2 ~ e4 ~ e16 e f! d | - s4 e32 d e8.~ e4 d4 ~ | + s4 e4_\mordent-~ e4 d4 ~ | d4. cis16 d cis4 d ~ | d8 r r16 e f d r16 e f d r d e cis | r16 e d c! bes! d8. s4 r16 bes' a g | @@ -49,8 +80,7 @@ two = \context Staff \notes\relative c{ fis1 } -three = \context Staff \notes\relative c{ - \context Voice=iii +three = \notes\relative c{ \stemUp f2 e | \stemBoth @@ -61,10 +91,11 @@ three = \context Staff \notes\relative c{ a2 ~ a16 a g f e f c d | %5 e8.-\mordent f16 d8.-\prall c16 \stemBoth c4. d8 | - \stemDown + \stemDown \tieDown + e4 ~ e16 f e d cis a b cis d e f d | \property Voice.TextScript \set #'font-style = #'finger - bes!2 a ~ | + bes2 a ~ | a a | d, cis' | %10 @@ -72,8 +103,7 @@ three = \context Staff \notes\relative c{ \bar "|." } -four = \context Staff \notes\relative c{ - \context Voice=iv +four = \notes\relative c{ \stemDown d2 cis | \skip 1*2 | @@ -93,7 +123,9 @@ four = \context Staff \notes\relative c{ d4. fis16 g r16 bes8. ~ bes4 | %10 \stemDown - d,1 + < d,1 { \fatText s4^\markup { \hspace #20 } + s4^\markup { \hspace #1 } s4 } + > } global = \notes{ @@ -106,25 +138,24 @@ global = \notes{ \context PianoStaff < \context Staff = upper < \global - \one - \two + \context Voice = i\one + \context Voice = ii \two > \context Staff = lower < \global \clef "bass" - \three - \four + \context Voice= iii \three + \context Voice = iv \four > > \paper{ - linewidth = 18.0 \cm - + linewidth = 17.0 \cm + \translator { + \ScoreContext + SpacingSpanner \set #'spacing-increment = #2.0 + } } \midi{ \tempo 4 = 40 } - \header{ - piece = \piece - opus = \opus - } } diff --git a/input/mutopia/J.S.Bach/wtk1-fugue1.ly b/input/mutopia/J.S.Bach/wtk1-fugue1.ly deleted file mode 100644 index 1a0fd209e1..0000000000 --- a/input/mutopia/J.S.Bach/wtk1-fugue1.ly +++ /dev/null @@ -1,205 +0,0 @@ -\version "1.8.1" -\header{ -title = "Fuga a 4" -opus = "BWV 846" -composer = "Johann Sebastian Bach (1685-1750)" -enteredby = "Shay Rojansky" - - - % mutopia headers. - mutopiatitle = "Das Wohltemperierte Clavier I, Fuga 1 (c-major)" - mutopiacomposer = "J.S. Bach" - mutopiaopus = "BWV846" - style = "baroque" - copyright = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Han-Wen Nienhuys.\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!" - maintainer = "hanwen@cs.uu.nl" - lastupdated = "2003/Aug/21" - footer = "Mutopia-2001/4/6-4" -} - -%{ -TODO: use autobeaming. -%} -\version "1.8.1" - -% #(ly:set-point-and-click 'line-column) - -alt = \notes \relative c' { - r8 c8-[ d e] f8.-[ g32 f] e8-[ a] | - d,-[ g] ~ g16-[ a g f] e-[ f e d] c-[ d c b ] | - a8-[ fis'] g4 ~ g8-[ fis16 e] f8-[ d] | - g-[ f! e d] c r r g' ~ | -%%5 - g-[ f16 e] f4 ~ f16-[ f e8] d4 | - c8-[ f] r16 g-[ f e] f8-[ d] g4 ~ | - g4 r4 r2 | - r1 | - r8 g8-[ a b] c8.-[ d32 c ] b8-[ e ] -%%10 - a,-[ d ] ~ d16-[ e d c ] b8 r8 r d, | - e-[ fis] g8.-[ a32 g] fis8-[ b e, a] ~ | - a16-[ b a gis] fis8-[ f!] e-[ d] ~ d16-[ e fis gis] | - a-[ gis a b] gis-[ fis gis a] b8 r8 r4 | - r8 c,8-[ d e] f8.-[ g32 f] e8-[ a] | -%%15 - d,-[ g] ~ g16-[ a g f] e8 e-[ fis g] ~ | - g8-[ fis] gis8-[ a] ~ a-[ g! a b] | - c8.-[ d32 c ] b8-[ e ] a,-[ d ] ~ d16-[ e d c ] | - b8-[ g' cis, d ] e-[ cis d e ] | - a,8 r8 r e fis-[ g] a8.-[ b32 a] | -%%20 - g8-[ c fis, b] ~ b16-[ c b a] g-[ fis e d] | - e4 d ~ d16-[ a' g f!] e-[ g f! a] | - g4 ~ g16-[ a bes8] c4 d8-[ g,] | - g4. f8 ~ f-[ e] d4 | - e8 a4 g8 ~ g8-[ f g a] | -%%25 - bes8.-[ c32 b] a8-[ d ] g,-[ c ] ~ c16-[ d c bes] | - a-[ bes a g] f-[ g f e] d4 ~ d8.-[ g16] | - a4 r16 f'16-[ d8] e2 | - } - - -soprane = - \notes \relative c' { - r1 | - r2 r8 g'8-[ a b] | - c8.-[ d32 c ] b8-[ e ] a,-[ d ] ~ d16-[ e d c ] | - b-[ g a b] c-[ b c d ] e-[ d e fis ] g8-[ b,] | -%%5 - c-[ a] d16-[ c b a] g8.-[ g16] f-[ e f g] | - a-[ g a b] c2 b4 | - r8 c8-[ d e] f8.-[ g32 f] e8-[ a] | - d,-[ g] ~ g16-[ a g f] e8-[ a] ~ a16-[ b a g] | - f2 e8.-[ fis16] g4 ~ -%%10 - g4 fis g16-[ f! e d] c-[ d c b ] | - a16-[ c b a ] g8 r8 r16 c16-[ b a ] gis8-[ e'] | - d-[ c16 b16] a-[ gis a b ] c-[ fis, a gis ] b8-[ a16 b ] - c8-[ f e d] ~ d-[ c16 b ] b8.-[ a16] | - a4 r4 r2 | -%%15 - r2 r8 g8-[ a b ] | - c8.-[ d32 c] b8-[ c] d-[ e] f!8.-[ g32 f!] | - e8-[ a d, g] ~ g16-[ a g f] e8-[ a] | - d,8-[ bes'] a-[ g16 f] g-[ f g e] f-[ g g f32 g] | - a16-[ cis, d g] e8.-[ d16] d8 r8 r4 | -%%20 - r2 r4 r8 g, | - a-[ b ] c8.-[ d32 c] b8-[ e a, d( ] | - [ e16-) e d c] b-[ c d e] f-[ g a g] f-[ e d c] | - b4 c,8-[ d] g c4 b8 | - c4 b8-[ bes8] a d4 c8 | -%%25 - d8-[ e] f4 ~ f16-[ a g f] e-[ f e d] | - c2 r16 g32-[ a b!16 c] d-[ e f8] ~ | - f32-[ c d e f16 g] a8.-[ b16] <>2 | - } - -tenor = - \notes \relative c { - - R1*3 | - r8 g'8-[ a b] c8.-[ d32 c ] b8-[ e ] | -%%5 - a,-[ d ] ~ d16-[ e d c ] b8-[ c ~ c bes8] | - a-[ d g, c ] r16 a16-[ b c ] d4 | - g,4 r8 g8 a-[ b] c8.-[ d32 c ] | - b8-[ e a, d ] ~ d16-[ e d c!] b!8-[ e ] ~ | - e4 d4 c16-[ b c a] e'-[ d c b] | -%%10 - c16-[ a b c ] d-[ c b a] g4 r4 | - r1 | - r8 e8-[ fis gis] a8.-[ b32 a] gis8-[ c ] | - fis,-[ b] ~ b16-[ c b a] gis8 a4 gis8 | - a4 r8 g8 a-[ b] c8. d32-[ c ] | -%%15 - b8-[ e a, d ] ~ d-[ g,] d'4 | - c8-[ a] e'4 d8 r8 r4 | - r8 a8-[ b cis ] d8.-[ e32 d ] c!8-[ f ] | - b,8-[ e ] ~ e16-[ f e d ] cis8 r8 r4 | - r8 a8-[ b cis ] d8.-[ e32 d ] c!8-[ fis ] | -%%20 - b,-[ e ] ~ e16-[ fis e d ] c2 ~ | - c16-[ d c b] a-[ g a fis] g8-[ b c d ] | - e8.-[ f32 e ] d8-[ g ] c,-[ f ] ~ f16-[ g f e ] | - d4 e8-[ d ] ~ d-[ g,] g4 ~ - g8-[ c, d e] f8.-[ g32 f] e8-[ a] | -%%25 - d,-[ g] ~ g16-[ a g f] e-[ d e f] g-[ a bes g] | - a-[ e f g] a-[ b c a] b2 | - c1 | - } - -bass = \notes \relative c { - - R1*4 | -%%5 - r2 r8 c8-[ d e] | - f8.-[ g32 f] e8-[ a] d,-[ g] ~ g16-[ a g f] | - e-[ f e d] c-[ d c b ] a'8-[ d a fis] | - g16-[ a bes g] cis,8-[ d] a'4 e4 | - a16-[ b c d ] c-[ b a g] c8 r8 r4 | -%%10 - r2 r8 g,8-[ a b ] | - c8.-[ d32 c] b8-[ e] a,-[ d] ~ d16-[ e d c] | - b8 e4 d8 c f!4 e8 ~ | - e d4 e8 f!-[ e16 d] e4 | - a,4 r4 r2 | -%%15 - r8 g8-[ a b ] c8.-[ d32 c] b8-[ e] | - a,8-[ d] ~ d16-[ e d c] b8-[ bes a g ] | - a8-[ fis' g e] d4 e8-[ f!] | - g8.-[ a32 g] f8-[ bes] e,-[ a] ~ a16-[ bes a g] | - f-[ e f d] g8-[ a] d,2 ~ | -%%20 - d16-[ e d c] b-[ a g fis ] e'8-[ e fis g] ~ | - g-[ a16 g16] fis8-[ d] g2 ~ | - g2 a4 b8-[ c ] | - f,16-[ a g f] e-[ d c b ] c-[ d e f] g8-[ g, ] | - c1 ~ | -%%25 - c1 ~ | - c1 ~ | - c1 | - } - - -\score { - \notes \context PianoStaff < - \context Staff = one { - \time 4/4 - \clef treble - < - \soprane \\ - \alt - > \bar "|." } - \context Staff = two { - \clef bass - < - \tenor \\ - \bass - > } - > - - \paper{ - linewidth = 18.0 \cm - \translator { - \ScoreContext - -%{ - - This is effective in squeezing it in more pages, but 1/32nd looks - better. Unfortunately, with that configuration, it doesn't - fit to 2 pages anymore. - -%} - - SpacingSpanner \set #'common-shortest-duration = #(ly:make-moment 1 16) - - } - } - - \midi { \tempo 4 = 84 } -} - -- 2.39.5