X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fpraeludium-fuga-E.ly;h=34289d19bd1a6a40691571f3beb8182b450d844b;hb=5f59b94d95987c866416d07490ce964b0f2d7817;hp=638a23de1f2034a74549469791cb3cb4733fabde;hpb=7ed4019033adf7db7a8f64c4eb7b7f6d0449402f;p=lilypond.git diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index 638a23de1f..34289d19bd 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header { - filename = "praeludium-fuga-E.ly"; - title = "praeludium and fuga in E-major"; - opus = "BWV 566"; - composer = "Johann Sebastian Bach (1685-1750)"; - enteredby = "JCN"; - copyright = "public domain"; + filename = "praeludium-fuga-E.ly" + title = "praeludium and fuga in E-major" + opus = "BWV 566" + composer = "Johann Sebastian Bach (1685-1750)" + enteredby = "JCN" + copyright = "public domain" } %{ description @@ -13,7 +14,6 @@ 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: @@ -23,72 +23,72 @@ * organ staff... %} -\version "1.3.4"; -praeludium_commands = \notes { - \time 4/4; - \key e; + +praeludiumCommands = \notes { + \time 4/4 + \key e \major } -praeludium_right = \notes { - \$praeludium_commands - \clef violin; +praeludiumRight = \notes { + \praeludiumCommands + \clef violin % 13 -- how to type -- where to split -- this more neatly? \context Staff < - \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ | - \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] | + \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 ~ | + \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 + %\stemUp %{ this is a diversion from the Griepenkerl/Keller - edition; a hack to avoid collisions + edition a hack to avoid collisions %} - \stemdown - \shifton s4 gis } + \stemDown + \shiftOn s4 gis } - \context Voice = II \relative c' { \stemdown -% \shifton % idem + \context Voice = II \relative c' { \stemDown +% \shiftOn % idem - r4 fis \shiftoff gis gis | + r4 fis \shiftOff gis gis | a4. cis8 gis2 | fis4 gis gis r8 e8 } > | % 16 } -praeludium_left = \notes \relative c { - \$praeludium_commands - \clef bass; +praeludiumLeft = \notes \relative c { + \praeludiumCommands + \clef bass % 13 \context Staff < - \context VoiceTwo { r4 } - \context VoiceOne { \stemup s4 dis' cis cis ~ | + \context Voice = two { r4 } + \context Voice = one { \stemUp s4 dis' cis cis ~ | [cis8 a d cis] [bis gis] cis4 | dis2 cis4 r8 cis } - \context VoiceOne { \stemup bis2 } - \context VoiceThree { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 | + \context Voice = one { \stemUp bis2 } + \context Voice = three { \stemUp \shiftOn r4 gis ~ [gis8 gis] ~ \stemDown \shiftOff gis4 | a4. fis8 gis4. a8 ~ | a4 gis4 gis r8 gis } -% { \stemup \shifton s4 fis4 e} +% { \stemUp \shiftOn s4 fis4 e} % a quick hack to avoid some collisons - \context VoiceFour { \stemdown \shifton s4 fis4 e} - \context VoiceTwo { \stemdown s4 dis4 cis4 } + \context Voice = four { \stemDown \shiftOn s4 fis4 e} + \context Voice = two { \stemDown s4 dis4 cis4 } > | %16 } -praeludium_pedal = \notes \relative c{ - \$praeludium_commands - \clef bass; +praeludiumPedal = \notes \relative c{ + \praeludiumCommands + \clef bass %13 r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | @@ -98,79 +98,78 @@ praeludium_pedal = \notes \relative c{ } -fugaII_commands = \notes{ - \time3/4; - \key e; % E-major +fugaIICommands = \notes{ + \time3/4 + \key e \major % E-major } -fugaII_right = \notes \relative c'' { - \$fugaII_commands - \clef violin; +fugaIIRight = \notes \relative c'' { + \fugaIICommands + \clef violin %15 \context Staff < - \context Voice = VA { \stemup [b8 fis8] b4 } - \context Voice = VB { \stemdown fis2 } + \context Voice = VA { \stemUp [b8 fis8] b4 } + \context Voice = VB { \stemDown fis2 } > - % Wadieuw \context Staff \notes\relative c''< \context Voice=one { - \property Voice.horizontalNoteShift=0 - \property Voice.verticalDirection=1 + \property Voice.NoteColumn \override #'horizontal-shift = #0 + \stemUp\slurUp\tieUp e4 } \context Voice=two { - \property Voice.verticalDirection=1 - \property Voice.horizontalNoteShift=1 + \stemUp\slurUp\tieUp + \property Voice.NoteColumn \override #'horizontal-shift = #1 cis } \context Voice=three { - \property Voice.horizontalNoteShift=2 - \property Voice.verticalDirection=1 + \property Voice.NoteColumn \override #'horizontal-shift = #2 + \stemUp\slurUp\tieUp ais } \context Voice=four { - \property Voice.verticalDirection=-1 - \property Voice.horizontalNoteShift=-1 + \stemDown\slurDown\tieDown + \property Voice.NoteColumn \override #'horizontal-shift = #-1 fis } > %16 \context Staff < - \context VoiceOne { dis2 dis4 | + \context Voice = one { dis2 dis4 | cis2 cis4 | b4. [cis8 dis e] } - \context VoiceThree { \stemup \shifton [b8 fis] b2 ~ | + \context Voice = three { \stemUp \shiftOn [b8 fis] b2 ~ | [b8 a!16 gis] a2 ~ | a4 gis2 } - \context VoiceTwo { \stemdown fis2. ~ | + \context Voice = two { \stemDown fis2. ~ | fis ~ | fis4 e2 } > | %19 } -fugaII_left = \notes { - \$fugaII_commands - \clef bass; +fugaIILeft = \notes { + \fugaIICommands + \clef bass %15 \context Staff < - \context VoiceTwo { \stemdown b2 \stemup ais4 | + \context Voice = two { \stemDown b2 \stemUp ais4 | b2 b4 } - \context VoiceTwo { \stemdown s2 e4 | + \context Voice = two { \stemDown s2 e4 | fis2 fis4 } > - \stemdown cis2 e4 | + \stemDown cis2 e4 | b4. b8 b4 | %19 } -fugaII_pedal = \notes \relative c { - \$fugaII_commands - \clef bass; +fugaIIPedal = \notes \relative c { + \fugaIICommands + \clef bass %15 dis4.-\ltoe e8-\rtoe cis4 | @@ -180,8 +179,8 @@ fugaII_pedal = \notes \relative c { %19 } -breakmusic = \notes { - %\time4/4; +breakmusic = \notes { + %\time4/4 r1 } @@ -192,48 +191,19 @@ breakmusic = \notes { \context PianoStaff < \context Staff = treble { \property Score.midiInstrument = "church organ" - \praeludium_right \breakmusic \fugaII_right } + \praeludiumRight \breakmusic \fugaIIRight } \context Staff = bass { - \praeludium_left \breakmusic \fugaII_left } + \praeludiumLeft \breakmusic \fugaIILeft } > \context Staff = pedal { - \praeludium_pedal \breakmusic \fugaII_pedal } + \praeludiumPedal \breakmusic \fugaIIPedal } > \paper { - \translator { - \VoiceContext - \name "VoiceOne"; - verticalDirection = #1 - } - \translator { - \VoiceContext - \name "VoiceTwo"; - verticalDirection = #1 - } - \translator { - \VoiceContext - \name "VoiceThree"; - verticalDirection = #1 - horizontalNoteShift = #1 - } - \translator { - \VoiceContext - \name "VoiceFour"; - verticalDirection = #-1 - horizontalNoteShift = #1 - } - \translator { - \StaffContext - - \accepts VoiceFour; - \accepts VoiceThree; - \accepts VoiceTwo; - \accepts VoiceOne; - } + \translator { \OrchestralScoreContext } } \midi { - \tempo 4 =96; } + \tempo 4 =96 } }