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

lilypond-1.1.65
---

diff --git a/lily/collision.cc b/lily/collision.cc
index a252a633d3..4b1fb66685 100644
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -10,6 +10,7 @@
 #include "note-column.hh"
 #include "note-head.hh"
 #include "paper-def.hh"
+#include "ly-symbols.hh"
 
 Collision::Collision()
 {
@@ -135,7 +136,20 @@ Collision::do_pre_processing()
 	  }
 	  while ((flip (&d))!= UP);
     }
-
+  do
+    {
+      for (int i=0; i < clash_groups[d].size (); i++)
+	{
+	  SCM force =  clash_groups[d][i]->remove_elt_property (force_hshift_scm_sym);
+	  if (force != SCM_BOOL_F)
+	    {
+	      force = SCM_CDR (force);
+	      offsets[d][i] = gh_scm2double (force);
+	    }
+	}
+    }
+  while ((flip (&d))!= UP);
+  
   Real wid_f = paper_l ()->note_width ();
   do
     {
diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 5e03c9b3fb..a2f1103d8a 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -105,13 +105,19 @@ Rhythmic_column_engraver::do_pre_move_processing()
   if (ncol_p_) 
     {
       Scalar sh = get_property ("horizontalNoteShift", 0);
-      // egcs
-      if (sh.to_bool () && sh.isnum_b ())
+      if (sh.isnum_b ())
 	{
 	  ncol_p_->set_elt_property (horizontal_shift_scm_sym,
 				     gh_int2scm (int (sh)));
 	}
 
+      sh = get_property ("forceHorizontalShift" ,0);
+      if (sh.isnum_b ())
+	{
+	  ncol_p_->set_elt_property (force_hshift_scm_sym,
+				     gh_double2scm (double (sh)));
+	}
+
       typeset_element (ncol_p_);
       ncol_p_ =0;
     }