lilypond-0.0.70pre

diff --git a/input/header.ly b/input/header.ly
index 9e01bf0d40d402380e963576ae66a24d1cba8bb1..e983bcb8dff6b37eb13496f5e3c1f91594e53864 100644 (file)
--- a/input/header.ly
+++ b/input/header.ly
@@ -10,4 +10,4 @@
  Tested Features:
 EndMudelaHeader
 %}
-\version "0.0.58";
+\version "0.0.60";

diff --git a/input/multi.ly b/input/multi.ly
index bb0fd590d3f4a5bb34fe057315c44301d06eae24..caafc66d16d2e99b0bca5235b91dfd28cda1cc42 100644 (file)
--- a/input/multi.ly
+++ b/input/multi.ly
@@ -1,5 +1,18 @@
+%{MudelaHeader
 
-% stupid testfile for pl68 features.
+ filename:multi.ly
+ title: 
+ description:  stupid testfile for pl68 features.
+ composers:
+ entered-by:HWN
+ copyright: public domain
+
+ Tested Features: \multi
+EndMudelaHeader
+%}
+
+
+\version "0.0.60";
 
 \score{
        \melodic 
@@ -7,7 +20,7 @@
                        < \multi 1;  { c2 c2 } { c'2 c'2 } > 
                        < \multi 2;  { \stem -1; c2 c2 } { \stem 1; c'2 c'2 } > 
                        < \multi 3;  { \clef "bass"; c2 c2 } { \bar "||"; \key cis ; c'2 c'2 } > 
-       %                       c1 c1 % bug
+                               c2 c1 
 
                }
 }

diff --git a/input/standchen.ly b/input/standchen.ly
index 09bbcd241492c3978851d2cdb144d5696ba2084a..867b6caaa12d24e775038a783a8e961c019a8803 100644 (file)
--- a/input/standchen.ly
+++ b/input/standchen.ly
@@ -13,7 +13,7 @@
 EndMudelaHeader
 %}
 
-\version "0.0.58";
+\version "0.0.60";
 
 commands = \melodic{
        \skip 2.*4;
@@ -199,7 +199,7 @@ begeleiding = \melodic{
        ''a r4 |
 %%5
 \duration 8;
-       < \multivoice { \stem 1;        
+       < \multi 2; { \stem 1;  
                [ 'f 'a d 'a d 'a ] 
                [ 'd 'e 'g 'e 'g 'e ] 
                [ 'cis 'e 'g 'e 'g e ]
@@ -216,7 +216,7 @@ begeleiding = \melodic{
 %%10
        [ 'd 'a d 'a d 'a ] |
 %%11
-       < \multivoice   
+       < \multi 2;     
        { \stem 1;
                [ 'f 'a d 'a d 'a ]
                [ 'd 'e 'g 'e 'g 'e ] 
@@ -232,7 +232,7 @@ begeleiding = \melodic{
        [ 'c 'g 'bes 'g 'bes 'g ] |
 %%16
        [ ''f 'c 'f 'c 'f 'c ] |
-       < \multivoice
+       < \multi 2;
        { \stem 1; 
                [ ''a 'e 'g 'e 'g 'e ][ 'd 'a d 'a d 'a ]
                [ ''bes 'f 'bes 'f 'bes 'f ][ ''f 'c 'f 'c 'f 'c ] }
@@ -246,7 +246,7 @@ begeleiding = \melodic{
        < [ 'e 'c > 'g c 'g c 'g ] |
 %%22
        [ 'f 'a c 'a 'f 'c ] |
-       < \multivoice {
+       < \multi 2; {
                \stem 1;
                [ ''a 'e 'g 'e 'g 'e ] 
                [ 'd 'fis 'a 'fis 'a 'fis ] 
@@ -298,7 +298,7 @@ begeleiding = \melodic{
 %%44
        < [ 'd ''b > 'fis 'b 'fis 'b 'fis ] |
 %%45
-       < \multivoice { \stem 1; 
+       < \multi 2; { \stem 1; 
                [ ''g 'd 'b 'd 'b 'd ] 
                [ 'd 'a d 'a d 'a ] 
        } {
@@ -465,20 +465,21 @@ tekstII = \lyric{
 }
 
 \score{
-       \staff{ lyricregs tekstI }
-       \staff{ lyricregs tekstII }
+%      \staff{ lyricregs tekstI }
+%      \staff{ lyricregs tekstII }
 
-       \staff{ melodicregs melodie commands}
-       \staff{ melodicregs begeleiding commands }
+       \melodic < \multi 3; < \melodie \commands >
+         <\begeleiding \commands >
+       >
        \paper{
-               \width 195\mm
+               \width 195.\mm;
 
                % on two pages...
-               \unitspace 9\mm
-               \geometric 1.2
-               \output "standchen.out"
+               \unitspace 9.\mm;
+               \geometric 1.2;
+               \output "standchen.out";
        }
        \midi{
-               \tempo 4:54
+               \tempo 4:54;
        }
 }

diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh
index 1381be3b5ef7efc8f3608f30f01d6f57ada5b403..119384067cd64bb5dbaf895932b12e1509f1ceee 100644 (file)
--- a/lily/include/text-spanner.hh
+++ b/lily/include/text-spanner.hh
@@ -15,15 +15,16 @@
   triplets, eentweetjes, ottava, etc.  */
 class Text_spanner : public Spanner {
 public:
-    Directional_spanner * support;
+    Directional_spanner * support_span_l_;
     General_script_def * spec_p_;
     Offset text_off_;
     NAME_MEMBERS();
 
     void set_support(Directional_spanner*);
     Text_spanner();
+    Text_spanner(Text_spanner const&);
 protected:
-    SCORE_ELEM_CLONE(Text_spanner)
+    SCORE_ELEM_CLONE(Text_spanner);
     ~Text_spanner();
     virtual void do_substitute_dependency(Score_elem*,Score_elem*);
     virtual void do_pre_processing();