lilypond-0.0.51

diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index 5bff42ebc0060ff9b9b7a1f511cbd027e5bc62cb..45f6381820c1d0a84782bba2945b08d65a31e909 100644 (file)
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -1,18 +1,16 @@
 % JS Bach, Das Wohltemperirtes Clavier I, Fuga II (c-minor)
 %
-% a 7 \bar fragment
-%
 %      Public Domain -- typed by by HWN
 %
 \version "0.0.50";
 
- global = \melodic{
+global = \melodic{
        \meter 4/4 ;
        \grouping 2*2; 
        \key bes es as; 
-  }
+}
   
- dux = \melodic  {
+dux = \melodic  {
        \clef "violin";
        \octave c' ;
        \duration  \last ;
@@ -27,6 +25,34 @@
        [g a bes8(] [)bes16 es f g ] [as g f es] [d8 c'16 b]|
        c'4 r4 r8 [f' es' d'] 
        r8 [as g f] [g f16 es] [f8 d] | 
+       g4 r8 b [c' c'16 b] [c'8 g] |
+%% 10  
+       as4 r8 a [bes bes16 a] [bes8 f] |
+       g4 r8 g [as as g f] | % should jump staff
+       \octave c;
+       r8 [as bes c'] r8 [as16 g] [as8 f8] |
+       [bes8 c bes as ] [bes g f es] |
+       [f des' c' bes ] [c' as g f] |
+       [g8 %jump!
+       \octave c';
+               g16 fis] [g8 c] [es g16 fis] [g8 a] |
+       [d g16 fis] [g8 a] [c16 d] es4 [d16 c] |
+       'bes8 r8 r16 [d e fis ] [g a bes8( ] [)bes16 e f g] |
+       [a bes c'8(] [)c'16 fis16  g a ] [bes8 es16 d] [es8 'g] |
+       ['as f16 e] [f8 'a8] ['bes g16 f] [g8 'b] |
+% 20
+       [c16 f es d] [c Bes As G] [F8 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] |
+       c2 () [c8 d16 es][ f es f d] |
+       B8 r8 r B c r r es |
+       d r r f()f r r f |
+       [es as g f] [es d es f] |
+       [B c d B] [B c] r c |
+       [f16 d es c]()[c8 B] c4 r8 e |
+       f4 r8 <f8 as b> [f es16 d] [es8 <f a] > |
+       <B d> r <B d> r <G2 c> |
 }
 
 comes = \melodic  {
@@ -40,6 +66,31 @@ comes = \melodic  {
        ['bes8 g16 f] [g8 'b] [c8 d16 es] f4( |
        [) f8 es16 d] [c16 'bes 'as 'g] ['f8 as g f] 
        [es d es f] ['b c d 'b] |
+       [c g16 fis] [g8 d] es4 r8 e8 |
+%% 10 
+       [f f16 e] [f8 c8] d4 r8 d |
+       [es8 es16 d] [es8 'bes] [c es16 d] [es8 f] |
+       ['bes es16 d] [es8 f] ['as16 'bes] c4 ['bes16 'as] |
+       [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] |
+       [c'8 b16 a] [g f e d] [c8 es d c] |
+       [Bes A Bes c] [Fis G A Fis] |
+       [G8 d16 c] d8 r8 r8 [e16 d] e8 r8 |
+       r [fis16 e] fis8 r r [G16 F] G8 r8 |
+       r8 [A16 G] A8 r r [B16 A] B8 r |
+%% 20
+       r8 [c16 'b] [c8 'g] [As c16 'c] [c8 d] |
+       [G c16 B] [c8 d] [F16 G] As4 [G16 F] |
+       [Es8 c16 B] [c8 G] As4 r8 A |
+       [Bes8 Bes16 A] [Bes8 F8] g4 r8 G(|
+       )[G As16 Bes] [c B c As] F2( |
+       )[F8 d16 c] [d8 F] [Es es16 d] [es8 G] |
+       [F f16 es] [f8 As] [G16 f es d] [c B A G] |
+       [c8 f es d] r [As G f] |
+       [G F16 Es] [F8 D] [As G] r A |
+       [B c] [F16 Es D C] [C8 c16 B] [c8  G]|
+       [As c16 B] [c8 d] [G8 c16 B] [c8 d] |
+       [F16 G] As4 [G16 F] E2 |
        
 }
 
@@ -54,6 +105,35 @@ bassdux = \melodic  {
        r1 |
        r8 [c16 B] [c8 G] [As c16 B] [c8 d] |
        [G c16 B] [c8 d] [F16 G] As4 [G16 F] | 
+       \octave c;
+       [es c' b a] [g f es d] [c d es d] [c Bes As G] |
+%% 10
+       [F bes as g ] [f es d c] [Bes c d c ] [Bes As G F]|
+       [Es as g f] [es des c Bes] [As8 c' bes as] |
+       [g8 f g as] [d es f d] |
+       [es as g f] [g es d c] |
+       [d bes as g] [as f es d] |
+       es8 r8 r4 r8 [c Bes A] |
+       r [es d c] [d c16 Bes] [c8 d] |
+       [G8 bes16 a] [bes8 d] [es c'16 bes] [c'8 e] |
+       [f d'16 c'] [d'8 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] |
+       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] |
+       [As Bes c Bes] [As G F Es] [D g f es ] [d c B A] |
+       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] 
+       < \multivoice 
+       { \stem 1; c2 (|)c1(|) c1 }
+       { \stem -1; C2(|)C1(|) C1 }
+       >
+
 }
 
 % every "melody" declared in a staff has its own "voicegroup"
@@ -69,7 +149,7 @@ trebstaf = \staff{
        }
        \paper{}
        \midi{
-               \tempo 4:90
+               \tempo 4:84
        }
 }
 

diff --git a/lily/text-item.cc b/lily/text-item.cc
index ee10d5e873b393749176d872fc75338038ce899d..e97c7357b3b56e69ed920911b483eb17d6146564 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -50,12 +50,14 @@ Text_item::Text_item(Text_req* treq_l)
 void
 Text_item::set_default_index()
 {
-    pos_i_  = get_position_i();
+    pos_i_  = get_position_i(tdef_p_->create_atom(paper()).extent().y );
 }
 
 void
-Text_item::do_pre_processing()
+Text_item::do_post_processing()
 {
+    if (!dir_i_)
+       dir_i_ = -1;
     set_default_index();
 }