From 61a270f2ab2dd32d45d0ebf32db6fdb8d7a019a4 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:46:12 +0000
Subject: [PATCH] lilypond-0.0.70pre

---
 BUGS                    | 13 +++++++++++++
 input/collisions.ly     | 39 +++++++++++++++++++++++++++++++--------
 input/slurs.ly          | 12 +++++-------
 input/toccata-fuga-E.ly | 11 ++++++-----
 lily/staff-side.cc      |  8 ++++++--
 5 files changed, 61 insertions(+), 22 deletions(-)
 create mode 100644 BUGS

diff --git a/BUGS b/BUGS
new file mode 100644
index 0000000000..b0b28cd6d1
--- /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 d021f6e278..5edeb80f23 100644
--- 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 cddf943902..8da7292ed5 100644
--- 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 ab665b4e85..f34df19761 100644
--- 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 2c5e1848c8..e7d8ccebf6 100644
--- 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)
-- 
2.39.5