* lily/all-font-metrics.cc (find_font): Add "lm" to try-AFM-first

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index a72e72cd90b1a3aaa6d0372aa445af4ba91a1a0b..0aef74e9b87e51cfd941ad84cd7c59f7a311de03 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -6,16 +6,16 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <math.h>
+#include "note-collision.hh"
+
+#include <cmath>
 
 #include "warn.hh"
-#include "note-collision.hh"
 #include "note-column.hh"
 #include "note-head.hh"
 #include "rhythmic-head.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "axis-group-interface.hh"
-#include "item.hh"
 #include "stem.hh"
 #include "side-position-interface.hh"
 #include "dot-column.hh"
@@ -26,7 +26,7 @@ SCM
 Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == X_AXIS);
   
    me = me->get_parent (a);
@@ -237,7 +237,7 @@ check_meshing_chords (Grob *me,
            d->suicide ();
        }
       
-      if (wipe_ball && wipe_ball->live ())
+      if (wipe_ball && wipe_ball->is_live ())
        {
          wipe_ball->set_property ("transparent", SCM_BOOL_T);
          wipe_ball->set_property ("stencil", SCM_EOL);
@@ -268,6 +268,19 @@ check_meshing_chords (Grob *me,
     {
       Grob *d = unsmob_grob (nd->get_property ("dot"));
       Grob *parent = d->get_parent (X_AXIS);
+
+
+      /*
+       FIXME:
+        
+              |
+        x . o
+       |
+
+       
+       the . is put right of o which is erroneous o force-shifted
+       far to the right.
+      */
       if (Dot_column::has_interface (parent))
        Side_position_interface::add_support (parent, nu);
     }
@@ -302,21 +315,37 @@ Note_collision_interface::do_shifts (Grob* me)
   while (flip (&d) != UP);
   
   Link_array<Grob> done;
-  for (; ly_c_pair_p (hand); hand =ly_cdr (hand))
+  Real left_most = 1e6;
+  
+  Array<Real> amounts;
+  for (; scm_is_pair (hand); hand =scm_cdr (hand))
     {
-      Grob * s = unsmob_grob (ly_caar (hand));
-      Real amount = ly_scm2double (ly_cdar (hand));
-      
-      s->translate_axis (amount *wid, X_AXIS);
+      Grob * s = unsmob_grob (scm_caar (hand));
+      Real amount = scm_to_double (scm_cdar (hand)) * wid;
+
       done.push (s);
+      amounts.push (amount);
+      if (amount < left_most)
+       left_most = amount;
+      
     }
-  for (; ly_c_pair_p (autos); autos =ly_cdr (autos))
+  for (; scm_is_pair (autos); autos =scm_cdr (autos))
     {
-      Grob * s = unsmob_grob (ly_caar (autos));
-      Real amount = ly_scm2double (ly_cdar (autos));
+      Grob * s = unsmob_grob (scm_caar (autos));
+      Real amount = scm_to_double (scm_cdar (autos)) *wid;
       
       if (!done.find (s))
-       s->translate_axis (amount * wid, X_AXIS);
+       {
+         done.push (s);
+         amounts.push (amount);
+         if (amount < left_most)
+           left_most = amount;
+       }
+    }
+
+  for (int i = 0; i < amounts.size(); i++)
+    {
+      done[i]->translate_axis (amounts[i] - left_most, X_AXIS);
     }
 }
 
@@ -326,9 +355,9 @@ Note_collision_interface::get_clash_groups (Grob *me)
   Drul_array<Link_array<Grob> > clash_groups;
  
   SCM s = me->get_property ("elements");
-  for (; ly_c_pair_p (s); s = ly_cdr (s))
+  for (; scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM car = ly_car (s);
+      SCM car = scm_car (s);
 
       Grob * se = unsmob_grob (car);
       if (Note_column::has_interface (se))
@@ -371,8 +400,8 @@ Note_collision_interface::automatic_shift (Grob *me,
          SCM sh
            = clashes[i]->get_property ("horizontal-shift");
 
-         if (is_number (sh))
-           shift.push (ly_scm2int (sh));
+         if (scm_is_number (sh))
+           shift.push (scm_to_int (sh));
          else
            shift.push (0);
        }
@@ -452,12 +481,12 @@ Note_collision_interface::forced_shift (Grob *me)
   SCM tups = SCM_EOL;
   
   SCM s = me->get_property ("elements");
-  for (; ly_c_pair_p (s); s = ly_cdr (s))
+  for (; scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * se = unsmob_grob (ly_car (s));
+      Grob * se = unsmob_grob (scm_car (s));
 
       SCM force =  se->get_property ("force-hshift");
-      if (is_number (force))
+      if (scm_is_number (force))
        {
          tups = scm_cons (scm_cons (se->self_scm (), force),
                          tups);