patch::: 1.1.21.jcn1: Re: gnossienne-4 in pats

[lilypond.git] / mutopia / J.S.Bach / wtk1-fugue2.ly

diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index 550835215bd57c984cbca42ae595ca18e79b5a5d..3ad507b208084f3146143e20f93181a1897cff9e 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -13,21 +13,24 @@
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "1.0.1";
+\version "1.0.14";
 
 \include "nederlands.ly"                 % for correct parsing of note names
 
-global = \melodic {
+global = \notes {
+  \key c \minor;
   \time 4/4;
-  \keysignature bes es as;
+  \property Staff.timeSignatureStyle = "C"
   \skip 1*31;
   \bar "|."; |
 }
   
-dux = \melodic \relative c'' {
+dux = \type Voice=two \notes \relative c''{
+  \voicetwo
   \clef violin;
 
-  \stemdown
+  \property Voice.ydirection = "-1"
+  
   r8 [c16 b] [c8 g] [as c16 b] [c8 d ] |
   [g, c16 b] [c8 d ] [f,16 g] as4 [g16 f] |
   [es c'  b a] [g f! es d] [c8 es'  d  c ] |
@@ -42,20 +45,22 @@ dux = \melodic \relative c'' {
 %%10   
   as4 r8 a [bes bes16 a] [bes8 f] |
   g4 r8 g [as as g f] |
+  r8 
   \translator Staff = bass \stemup 
-   r8 [as, bes c ] r8 [as16 g] [as8 f8] |
+  [as, bes c ] r8 [as16 g] [as8 f8] |
   [bes8 c  bes as] [bes g f es] |
   [f des'  c  bes] [c  as g f] |
 %%15
   g8
-   \translator Staff = treble \stemdown
-   [g'16 fis] [g8 c,] [es g16 fis!] [g8 a] |
+  [g'16 fis] [g8 c,] 
+  [es \translator Staff = treble \stemdown g16 fis!] [g8 a] |
   [d, g16 fis] [g8 a!] [c,16 d] es4 [d16 c] |         % forced accident!
   bes8 r8 r16 [d e fis] [g a bes8] ~ [bes16 e, f g] |
   [a bes c8] ~ [c16 fis,16 g a] [bes8 es,!16 d] [es8 g, ] |
   [as  f'16 es] [f8 a,8] [bes  g'16 f] [g8 b, ] |
 %%20
-  [c16 f es d] [c bes! as g] [f8 as' g f] |
+  [c16 f \translator Staff = bass \stemup es d] [c bes! as g] 
+  [f8 \translator Staff = treble \stemdown as' g f] |
   [es d es f] [b, c d b] |
   c4 r8 e8 [f f16 e] [f8 c] |
   d4 r8 d8 [es8 es16 d] [es8 bes] |
@@ -67,16 +72,15 @@ dux = \melodic \relative c'' {
   [b, c d b] [b c] r c |
   [f16 d es c] ~ [c8 b] c4 r8 e |
 %%30
-  f4 r8 f [f es16 d] [es8 <f as]> |
+  f4 r8 f [f es16 d] [es8 <f as>] |
   <b, d> r <b d> r <g2 c> |
 }
 
 
-comes = \melodic \relative c''  {
-  \stemup
-
-  r1 |
-  r1 |
+comes = \type Voice=one \notes \relative c''  {
+  \voiceone
+  R1 |
+  R1 |
   r8 [g'16 fis] [g8 c,] [es g16 fis] [g8 a] |
   [d,8 g16 fis] [g8 a] [c,16 d] es4 [d16 c] |
 %%5
@@ -88,8 +92,8 @@ comes = \melodic \relative c''  {
 %%10 
   [f f16 e] [f8 c8] d4 r8 d |
   [es8 es16 d] [es8 bes ] [c es16 d] [es8 f] |
-  \stemboth [bes,  es16 d] [es8 f] [as,16 bes ] c4 [bes16 as ] |
-  [g16 es f g] [as bes c d] [es d c d] [es f g a] |
+  [bes,  es16 d] [es8 f] [as,16 bes ] c4 [bes16 as ] |
+  \stemboth [g16 es f g] [as bes c d] [es d c d] [es f g a] |
   [bes f, g as] [bes c d e] [f es d es] [ f g a b] |
 %%15
   \stemup [c8 b16 a] [g f! es d] [c8 es d c] |
@@ -110,21 +114,20 @@ comes = \melodic \relative c''  {
   [g f16 es] [f8 d] [as' g] r a |
   [b c] [f,16 es d c] c8 [c'16 b] [c8 g] |
 %%30
-  [as c16 b] [c8 <d b ! as !]> [g,8 c16 b] [c8 d] |
+  [as c16 b] [c8 <d b ! as !>] [g,8 c16 b] [c8 d] |
   [f,16 g] as4 [g16 f] e2 |
 }
 
 
-bassdux = \melodic \relative c' {
+bassdux = \type Voice=three \notes \relative c' {
   \clef bass;
-
-  r1 |
-  r |
-  r |
-  r |
+  R1 |
+  R |
+  R |
+  R |
 %%5
-  r |
-  r1 |
+  R |
+  R1 |
   r8 [c16 b] [c8 g] [as c16 b] [c8 d] |
   [g, c16 b] [c8 d] [f,16 g] as4 [g16 f] | 
  [es c'  b a] [g f es d] [c d es d] [c bes! as! g] |
@@ -142,7 +145,8 @@ bassdux = \melodic \relative c' {
   [f d'16 c ] [d8 fis,] g4 r16 [g, a b] |
   [c16 d es8~] [es16 a, bes c] [d es f8~] [f16 b,  c d] |
 %%20    
-  es8 r r e [f f, es! d] |                           % -> \classic_accidentals
+%   es8 r r e [f f, es! d] |                           % -> \classic_accidentals
+  es8 r r e \stemdown [f f, es! d] \stemboth |
   r [as' g f] [g f16 es] [f8 g] |
   [c16 d  es d] [c bes as g] [f bes' as g] [f es d c] |
   [bes c d c] [bes as g f] [es as' g f] [es d c bes] |
@@ -151,12 +155,12 @@ bassdux = \melodic \relative c' {
   g4 r4 r16 [g a b] [c d es f] |
   [g f as g] [f es d c] [b8 c16 b] [c8 g] |
   [as c16 b] [c8 d] [g, c16 b] [c8 d] |
-  [f16 g] as4 [g16 f] es4 r8 es |
-  [d c g g]
+  [f,16 g] as4 [g16 f] es4 r8 es' |
+  [d c g' g,]
 %%30
-  \type Staff <
-    { \stemup c2 ~ | c1 ~ | c1 }
-    { \stemdown c,2 ~ | c1 ~ | c1 }
+  \type Staff=bass <
+    {\voicethree c2 ~ | c1 ~ | c1 }
+    {\voicefour c,2 ~ | c1 ~ | c1 }
   >
 }
 
@@ -176,9 +180,23 @@ bassdux = \melodic \relative c' {
     >
 
   \paper {
-    gourlay_maxmeasures =5.;
-%    castingalgorithm = \Wordwrap;
-
+    gourlay_maxmeasures = 4.;
+    indent = 8.\mm;
+    textheight = 295.\mm;
+
+    %hmm
+%    \translator { \BarNumberingScoreContext }
+%    \translator { \BarNumberingStaffContext }
+%  \translator{ \OrchestralScoreContext }
+    \translator{ \OrchestralScoreContext }
+    \translator{ 
+      \GrandStaffContext
+      minVerticalAlign = 3.0*\staffheight;
+      maxVerticalAlign = 3.0*\staffheight;
+    }
+  }
+  \header{
+         opus = "BWV 847";
   }
 
   \midi {