X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpraeludium-fuga-E.ly;h=fee4e0cb9b604f4ded0b3891d0dc8f33e4c8819a;hb=refs%2Ftags%2Frelease%2F1.3.53;hp=b198ed23f6cab4085636411edb52bcc41679fe1a;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index b198ed23f6..fee4e0cb9b 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -2,15 +2,18 @@ filename = "praeludium-fuga-E.ly"; title = "praeludium and fuga in E-major"; opus = "BWV 566"; - description = "Praeludium 3 bar excerpt, " - "2nd fuga transposed subject -- 4 bar excerpt. " - "We try to imitate the Griepenkerl/Keller edition which " - "gives the best approximation to Bach's original layout."; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "JCN"; copyright = "public domain"; } +%{ + description + Praeludium 3 bar excerpt, + 2nd fuga transposed subject -- 4 bar excerpt. + We try to imitate the Griepenkerl/Keller edition which + gives the best approximation to Bach's original layout +%} %{ Tested Features: purpose of this file is testing: @@ -19,28 +22,28 @@ * organ staff... %} -\version "1.0.0"; +\version "1.3.42"; -praeludium_commands = \melodic { +praeludium_commands = \notes { \time 4/4; \key e; } -praeludium_right = \melodic\transpose c'' { +praeludium_right = \notes { \$praeludium_commands \clef violin; % 13 -- how to type -- where to split -- this more neatly? - \type Staff < - { \stemup r4 dis'4 e'4. e'8 ~ | - \shifton e'4 [d'8 fis'8] \shiftoff gis'4 ~ [gis'8 fis'16 e'16] | - fis'4 ~ [fis'8 e'16 dis'16] e'4 r8 e'8 } - { \stemup \shifton r4 bis4 cis'4 \shiftoff cis'4 | - a'4 ~ [a'16 gis'16 a'16 b'16] \shifton dis'4 cis'4 ~ | - [cis'8 dis'16 ais16] bis4 cis'4 r8 b8 } - { + \context Staff < + \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ | + \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] | + fis4 ~ [fis8 e16 dis] e4 r8 e8 } + \context Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis | + a' ~ [a16 gis a b] \shifton dis,4 cis ~ | + [cis8 dis16 ais] bis4 cis r8 b } + \context Voice = IV \relative c'' { %\stemup %{ @@ -48,143 +51,158 @@ praeludium_right = \melodic\transpose c'' { edition; a hack to avoid collisions %} \stemdown - \shifton s4 gis4 } + \shifton s4 gis } - { \stemdown + \context Voice = II \relative c' { \stemdown % \shifton % idem - r4 fis4 \shiftoff gis4 gis4 | - a4. cis'8 gis2 | - fis4 gis4 gis4 r8 e8 } + r4 fis \shiftoff gis gis | + a4. cis8 gis2 | + fis4 gis gis r8 e8 } > | % 16 } -praeludium_left = \melodic { +praeludium_left = \notes \relative c { \$praeludium_commands \clef bass; % 13 - \type Staff < - { \stemup r4 dis'4 cis'4 cis'4 ~ | - [cis'8 a8 d'8 cis'8] [bis8 gis8] cis'4 | - dis'2 cis'4 r8 cis'8 } - { \stemup bis2 } - { \stemup \shifton r4 gis4 ~ [gis 8 gis8] ~ \stemdown \shiftoff gis4 | + \context Staff < + \context Voice = two { r4 } + \context Voice = one { \stemup s4 dis' cis cis ~ | + [cis8 a d cis] [bis gis] cis4 | + dis2 cis4 r8 cis } + \context Voice = one { \stemup bis2 } + \context Voice = three { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 | a4. fis8 gis4. a8 ~ | - a4 gis4 gis4 r8 gis8 } + a4 gis4 gis r8 gis } % { \stemup \shifton s4 fis4 e} % a quick hack to avoid some collisons - { \stemdown \shifton s4 fis4 e} - { \stemdown s4 dis4 cis4 } + \context Voice = four { \stemdown \shifton s4 fis4 e} + \context Voice = two { \stemdown s4 dis4 cis4 } > | - % 16 + %16 } -praeludium_pedal = \melodic { +praeludium_pedal = \notes \relative c{ \$praeludium_commands \clef bass; - % 13 - r4 fis,4-\ltoe e,4.-\lheel e8-\rheel | - fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a8-\rtoe] | - dis4-\ltoe gis4-\rtoe [cis8-\ltoe b,!8-\lheel ais,8-\rtoe gis,8-\ltoe] | - % 16 + %13 + r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | + fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] | + dis,4-\ltoe gis-\rtoe [cis,8-\ltoe b!-\lheel ais-\rtoe gis-\ltoe] | + %16 } -fuga2_commands = \melodic{ - \time 3/4; +fugaII_commands = \notes{ + \time3/4; \key e; % E-major } -fuga2_right = \melodic\transpose c'' { - \$fuga2_commands +fugaII_right = \notes \relative c'' { + \$fugaII_commands \clef violin; - % 15 - \type Staff < - { \stemup [b8 fis8] b4 } - { \stemdown fis2 } + %15 + \context Staff < + \context Voice = VA { \stemup [b8 fis8] b4 } + \context Voice = VB { \stemdown fis2 } > - %{ this chord is usually set like this: - | - x|| - x|| - x| - |x - | - %} - \type Staff < - { \stemup \shiftoff e'4 } - { \stemup \shifton cis'4 } - { \stemup \shifton ais4 } - { \stemdown fis4 } - > | - % 16 - \type Staff < - { \stemup dis'2 dis'4 | - cis'2 cis'4 | - b4. [cis'8 dis'8 e'8] } - { \stemup \shifton [b8 fis8] b2 ~ | - [b8 a!16 gis16] a2 ~ | + + \context Staff \notes\relative c''< + \context Voice=one { + \property Voice.horizontalNoteShift=0 + \property Voice.verticalDirection=1 + e4 + } + \context Voice=two { + \property Voice.verticalDirection=1 + \property Voice.horizontalNoteShift=1 + cis + } + \context Voice=three { + \property Voice.horizontalNoteShift=2 + \property Voice.verticalDirection=1 + ais + } + \context Voice=four { + \property Voice.verticalDirection=-1 + \property Voice.horizontalNoteShift=-1 + fis + } + > + + %16 + \context Staff < + \context Voice = one { dis2 dis4 | + cis2 cis4 | + b4. [cis8 dis e] } + \context Voice = three { \stemup \shifton [b8 fis] b2 ~ | + [b8 a!16 gis] a2 ~ | a4 gis2 } - { \stemdown fis2. ~ | - fis2. ~ | + \context Voice = two { \stemdown fis2. ~ | + fis ~ | fis4 e2 } > | - % 19 + %19 } -fuga2_left = \melodic { - \$fuga2_commands +fugaII_left = \notes { + \$fugaII_commands \clef bass; - % 15 - \type Staff < - { \stemdown b2 \stemup ais4 | + %15 + \context Staff < + \context Voice = two { \stemdown b2 \stemup ais4 | b2 b4 } - { \stemdown s2 e4 | + \context Voice = two { \stemdown s2 e4 | fis2 fis4 } > - \stemdown cis'2 e'4 | + \stemdown cis2 e4 | b4. b8 b4 | - % 19 + %19 } -fuga2_pedal = \melodic { - \$fuga2_commands +fugaII_pedal = \notes \relative c { + \$fugaII_commands \clef bass; - % 15 + %15 dis4.-\ltoe e8-\rtoe cis4 | - b,4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] | + b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] | fis4.-\rtoe [e8-\rheel dis8-\rtoe cis8-\ltoe] | dis4-\rtoe e4-\rheel e,4-\ltoe | - % 19 + %19 } -breakmusic = \melodic { - %\time 4/4; +breakmusic = \notes { + %\time4/4; r1 } % these should be two separate scores... \score{ - \type Score < - \type GrandStaff < - \type Staff = treble { - \praeludium_right \breakmusic \fuga2_right } - \type Staff = bass { - \praeludium_left \breakmusic \fuga2_left } + \context Score < + \context PianoStaff < + \context Staff = treble { + \property Score.midiInstrument = "church organ" + \praeludium_right \breakmusic \fugaII_right } + \context Staff = bass { + \praeludium_left \breakmusic \fugaII_left } > - \type Staff = pedal { - \praeludium_pedal \breakmusic \fuga2_pedal } + \context Staff = pedal { + \praeludium_pedal \breakmusic \fugaII_pedal } > - \paper{} + \paper { + + \translator { \OrchestralScoreContext } + } \midi { - \tempo 4 = 96; } + \tempo 4 =96; } }