From 78c1cefe1aab8bc192fbe5cd2f2a045f938843e2 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:59:13 +0000
Subject: [PATCH] lilypond-0.1.23

---
 input/cadenza.ly       | 12 ++++++------
 lily/rest-collision.cc |  8 +-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/input/cadenza.ly b/input/cadenza.ly
index e7538272f9..2a52afd4bf 100644
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -31,28 +31,28 @@ cad = \melodic  {
 		\bar "empty";
 			c [c_"rubato" e g c']
 	\octave c'';
-	e4. e [g ~ f_"rit" e d]
+	e4. e [g () f_"rit" e d]
 
 	\duration 16;
-	dis4~ e4
+	dis4() e4
 		\bar "" ;
 		r8 [c d] [e f g gis]
 	\duration 4;
-	a-> 'f~ 'e g
-	f-> 'd~ 'cis e
+	a-> 'f() 'e g
+	f-> 'd() 'cis e
 	\duration 8;	
 	d4^\fermata
 		\bar "" ;
 
 	r8 'a ['b cis]
 	\duration 16;	[d cis d e]
-	f4~ [f e d c]
+	f4() [f e d c]
 	'b4-\turn
 	\octave c'; [2/3 d'8 c'8 a8]1/1
 	g2
 		\bar "" ;
 	[g c e g] [c' e g c']\octave c''; 
-	[e 'g c e] g4^\fermata %~ % BUG!
+	[e 'g c e] g4^\fermata 
 		\bar "" ;
 	[g8.(_"a tempo" e g8. )e]
 	a4. g8 [f8 e8 d8 c8]
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 6c50682722..0be9090d2c 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -94,15 +94,10 @@ Rest_collision::do_pre_processing()
   // meisjes met jongetjes
   else 
     {
-#if 0 // breendet: rests go always under
-      // geen gemug, trug op je rug
-      int dir_i = -1;
-      rest_l_arr_[0]->translate_rests (dir_i * 3);	
-#else
       // int dir_i = - ncol_l_arr_[0]->dir_;
       int dir_i = rest_l_arr_[0]->dir_;
       // hope it's 4: if it works->doco
-      int midpos = 4;
+      int midpos = 0;
 	
       // minimum move
       int minpos = 4;
@@ -121,7 +116,6 @@ Rest_collision::do_pre_processing()
 	      (ncol_l_arr_[i]->head_l_arr_[j]->position_i_ -midpos) + sep_i;
 	}
       rest_l_arr_[0]->translate_rests (dir_i * minpos);	
-#endif
     }
 }
 
-- 
2.39.5