From: hanwen <hanwen>
Date: Sun, 25 Jan 2004 14:45:06 +0000 (+0000)
Subject: * input/regression/rest-collision-beam.ly: move beam/rest stuff
X-Git-Tag: release/2.1.15~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ec380d3b26e3e070d6d94426c3490f1a573fdbfd;p=lilypond.git

* input/regression/rest-collision-beam.ly: move beam/rest stuff
from beam-collision.ly

* lily/beam.cc (rest_collision_callback): remove direction.
---

diff --git a/ChangeLog b/ChangeLog
index 78647286fd..c3094f4665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-01-25  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* input/regression/rest-collision-beam.ly: move beam/rest stuff
+	from beam-collision.ly 
+
+	* lily/beam.cc (rest_collision_callback): remove direction.
+
 	* scm/define-grobs.scm (all-grob-descriptions): remove
 	enclose-bounds in OttavaBracket and PianoPedalBracket
 
diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly
new file mode 100644
index 0000000000..4359bb0697
--- /dev/null
+++ b/input/regression/rest-collision-beam.ly
@@ -0,0 +1,25 @@
+
+\header {
+    
+    texidoc = "Rests under beams are only moved if necessary."
+
+}
+
+\version "2.1.14"
+
+\score {
+    \new Staff
+    \notes {
+	\stemUp
+	\transpose c c' {
+	    c''8[ r8 c''8 c''8]
+	    c8[ r8 c8 c8]
+	    c8[ r8 r8 c'''8]	
+	    \stemDown
+	    c8[ r8 c8 c8]
+	    c''8[ r8 c''8 c''8]
+	    c'8[ r8 r8 c'''8]
+	}
+    }
+    \paper { raggedright = ##t }
+}
diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 4cace5b16e..eeace72687 100644
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -40,23 +40,15 @@ restsII =  \context Staff \notes {
 	\context Staff << { r8} r8 r8 \\ {  r8} >>
 	\context Staff << { r} \\ {  r} >>
 	\context Staff << { r} r\\ { \stemDown r} >>
-	\stemUp
-	\transpose c c' {  c''8[ r8 c''8 c''8]
-	 c8[ r8 c8 c8]
-	 c8[ r8 r8 c'''8]	
-	\stemDown
-	 c8[ r8 c8 c8]
-	 c''8[ r8 c''8 c''8]
-	 c'8[ r8 r8 c'''8]
 	\different	
 	}
-}
 
 \score{
 	\notes { 
 		\scales 
 		\restsII 
 	}
+	\paper { raggedright = ##t }
 }	
 
 
diff --git a/lily/beam.cc b/lily/beam.cc
index 83bf7260de..4c5f743030 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1498,7 +1498,7 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis)
   Real minimum_distance =
     staff_space * robust_scm2double (rest->get_grob_property ("minimum-distance"), 0.0);
 
-  Real shift =d * (((beam_y - d * minimum_distance) - rest_dim) * d  <? 0.0);
+  Real shift = d * (((beam_y - d * minimum_distance) - rest_dim) * d  <? 0.0);
 
   shift /= staff_space;
   Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2;
@@ -1513,7 +1513,7 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis)
       < rad)
     shift = ceil (fabs (shift)) *sign (shift);
 
-  return gh_double2scm (-d * staff_space * shift);
+  return gh_double2scm (staff_space * shift);
 }
 
 bool