release: 1.1.65

[lilypond.git] / lily / collision.cc

diff --git a/lily/collision.cc b/lily/collision.cc
index a252a633d3448261036db905106c3c57ca40e303..4b1fb66685881bf777422191430b414611f0b5ca 100644 (file)
--- 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
     {