From: fred <fred>
Date: Tue, 26 Mar 2002 22:15:12 +0000 (+0000)
Subject: lilypond-1.1.65
X-Git-Tag: release/1.5.59~2283
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f65cc2725309f1b451bc92dbbe3adf822a048814;p=lilypond.git

lilypond-1.1.65
---

diff --git a/input/test/force-hshift.fly b/input/test/force-hshift.fly
new file mode 100644
index 0000000000..9bdee7d1e5
--- /dev/null
+++ b/input/test/force-hshift.fly
@@ -0,0 +1,15 @@
+
+\context Staff <
+	\context Voice = VA {
+		\property Voice.forceHorizontalShift = "0.1"
+		\stemup \shifton
+		<g' d'>
+	}	
+
+	\context Voice = VB {
+		\stemdown
+		\shifton
+		\property Voice.forceHorizontalShift = "-0.1"
+		<bes f'>
+	}
+>
diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index c895dac10d..e9989408b3 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -30,8 +30,8 @@ Collision_engraver::acknowledge_element (Score_element_info i)
 {
   if (Note_column * c = dynamic_cast<Note_column *> (i.elem_l_))
     {
-      if (c->rest_b () || c->dim_cache_[X_AXIS]->parent_l_
-	  || c->dim_cache_[X_AXIS]->parent_l_)
+      /*should check Y axis? */
+      if (c->rest_b () || c->dim_cache_[X_AXIS]->parent_l_)
 	return ;
 
       note_column_l_arr_.push (c);