lilypond-0.0.70pre

diff --git a/BUGS b/BUGS
new file mode 100644 (file)
index 0000000..b0b28cd
--- /dev/null
+++ b/BUGS
@@ -0,0 +1,13 @@
+This file documents bugs which were "re-introduced" in various pl's
+
+
+pl69
+       * scales.ly
+
+       * slurs.ly
+
+pl68:
+       
+       * lyrics broken,
+
+       * midi broken

diff --git a/input/collisions.ly b/input/collisions.ly
index d021f6e2787787d62e469e49dec467915ebc0e71..5edeb80f23ac5ed4780c642ffc2707ccd3cadef6 100644 (file)
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -3,14 +3,14 @@
  filename: collisions.ly
  title:
  description:  random counterpoint to test collisions
- composer(s): HWN
- entered-by: HWN
+ composer(s): HWN,JCN
+ entered-by: HWN,JCN
  copyright: public domain
 
  Tested Features:test the Collision resolution 
 EndMudelaHeader
 %}
-\version "0.0.59";
+\version "0.0.60";
 
 
 
@@ -56,12 +56,35 @@ rests = \melodic
        }
        >
 
-\score{
+restsII = \melodic {
+       \octave c'; 
+                       < \multi2;  
+                               { \stem 1;  g' f' e' d' c' b a g f e d c }
+                               { \stem -1; r  r  r  r  r  r r r r r r r }
+                       >
+                       < \multi2;  
+                               { \stem 1;  r r r r r r r r  r  r  r  r }
+                               { \stem -1; c d e f g a b c' d' e' f' g' }
+                       >
+                       r8
+                       < \multi2;  r8 r8 >
+                       < \multi2;  r8 r8 r8 >
+                       < \multi2;  r8 r8 r8 r8 >
+                       < \multi2;  r r >
+                       < \multi2;  r r r >
+                       \stem 1;
+                       [c''8 r8 c''8 c''8]
+                       [c8 r8 c8 c8]
+                       \stem -1;
+                       [c8 r8 c8 c8]
+                       [c''8 r8 c''8 c''8]
+}
 
-               \melodic {  \$two_voice  \$two_voice_steminvert 
-                       \$three_voice  \rests
-               }
+\score{
+       \melodic {  \$two_voice  \$two_voice_steminvert 
+                       \$three_voice  \rests \restsII }
+       
 
-       \paper {}
+       
 %      \midi { \tempo 4:80 }
 }

diff --git a/input/slurs.ly b/input/slurs.ly
index cddf943902202b3860dcd7306cf46f334264cdca..8da7292ed5015edaf209ec89dbd3f9ce6e1368bc 100644 (file)
--- a/input/slurs.ly
+++ b/input/slurs.ly
@@ -11,10 +11,9 @@
 EndMudelaHeader
 %}
 
-\version "0.0.58";
+\version "0.0.60";
 
-\score{\staff{
-       melodicregs 
+\score{
        \melodic{\octave c';
                \duration "last";
                'c4 ~ 'c c'' ~ c'' ~ g ~ c ~
@@ -29,11 +28,10 @@ EndMudelaHeader
                < { c ~ d }
                  { e ~ f }
                >
-       < \multivoice 
+       < \multi 2;
        { \stem 1; c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c }
-       { \stem -1; c (e g )c'~( [b a g )d]     r2 } >
-
-       }
+       { \stem -1; c (e g )c'~( [b a g )d]     r2 } 
+       >
 
        }
 }

diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly
index ab665b4e85176811fc369782a86a0e38eb4bf127..f34df1976109b9e636d905cec9eb002df76aa761 100644 (file)
--- a/input/toccata-fuga-E.ly
+++ b/input/toccata-fuga-E.ly
@@ -20,7 +20,7 @@ EndMudelaHeader
 %}
 
 
-\version "0.0.59";
+\version "0.0.60";
 
 toccata_commands = \melodic{
        \meter 4/4;
@@ -136,15 +136,16 @@ break = \melodic{ \meter 4/4; r1 }
 % these should be two separate scores...
 \score{
        \melodic < \multi 3;
-               { \$toccata_right   \break   \$fuga2_right }
-               {       \$toccata_left   \break   \$fuga2_left }
+
+                {\$toccata_right     \break   \$fuga2_right }
+                {\$toccata_left  \break   \$fuga2_left }
        
-               { \$toccata_pedal   \break   \$fuga2_pedal }
+                {\$toccata_pedal    \break   \$fuga2_pedal }
                
        >
        \paper{}
        \midi{
-               \tempo 4:96
+               \tempo 4:96;
        }
 }
 

diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 2c5e1848c8fad807a6e1f0e04f53883b591fe5ee..e7d8ccebf6cec936aa5c32704a256040e6b75bd1 100644 (file)
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -17,6 +17,7 @@ void
 Staff_side::set_staffsym(Staff_symbol* s_l)
 {
     staff_sym_l_ = s_l;
+    add_dependency( s_l );
 }
 
 Staff_side::Staff_side()
@@ -89,12 +90,15 @@ int
 Staff_side::get_position_i(Interval sym_dim) const
 { 
     int i= get_position_i();
-    return i+ int(rint(- sym_dim[-dir_i_] / paper()->internote_f()));
+    if (dir_i_)
+       return i+ int(rint(- sym_dim[-dir_i_] / paper()->internote_f()));
+    else
+       return i;
 }
 
 
 void
-Staff_side::do_substitute_dependency(Score_elem*o, Score_elem*n )
+Staff_side::do_substitute_dependency(Score_elem*o, Score_elem*n)
 { 
     int i;
     while ((i=support_l_arr_.find_i(o) ) >=0)