lilypond-1.1.65

diff --git a/input/test/force-hshift.fly b/input/test/force-hshift.fly
new file mode 100644 (file)
index 0000000..9bdee7d
--- /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 c895dac10df96e50f7115c35883209c4dc0e65cf..e9989408b3759171a0484d804491e2e15eeaeafe 100644 (file)
--- 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);