X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fself-alignment-interface.cc;h=a37b5871007eec8ef9368976958997b6a4c84a98;hb=3b84da64116a14f6329b8a3b1d981163c61efbde;hp=0c7215233338ebb32c277e2af1a2c88ec154c216;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc
index 0c72152333..a37b587100 100644
--- a/lily/self-alignment-interface.cc
+++ b/lily/self-alignment-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,8 +19,13 @@
 
 #include "self-alignment-interface.hh"
 
+#include "directional-element-interface.hh"
 #include "grob.hh"
+#include "grob-array.hh"
+#include "interval-minefield.hh"
+#include "note-column.hh"
 #include "paper-column.hh"
+#include "pointer-group-interface.hh"
 #include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, y_aligned_on_self, 1);
@@ -54,9 +59,7 @@ Self_alignment_interface::aligned_on_self (Grob *me, Axis a, bool pure, int star
   if (scm_is_number (align))
     {
       Interval ext (me->maybe_pure_extent (me, a, pure, start, end));
-      if (ext.is_empty ())
-        programming_error ("cannot align on self: empty element");
-      else
+      if (!ext.is_empty ())
         return scm_from_double (- ext.linear_combination (scm_to_double (align)));
     }
   return scm_from_double (0.0);
@@ -75,6 +78,27 @@ Self_alignment_interface::centered_on_x_parent (SCM smob)
   return centered_on_object (unsmob_grob (smob)->get_parent (X_AXIS), X_AXIS);
 }
 
+MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_note_columns, 1);
+SCM
+Self_alignment_interface::centered_on_note_columns (SCM smob)
+{
+  Item *it = unsmob_item (smob)->get_column ();
+  if (!it)
+    return scm_from_double (0.0);
+
+  extract_grob_set (it, "elements", elts);
+  vector<Grob *> ncs;
+  Interval centers;
+  for (vsize i = 0; i < elts.size (); i++)
+    if (Note_column::has_interface (elts[i]))
+      centers.add_point (scm_to_double (centered_on_object (elts[i], X_AXIS)));
+
+  if (centers.is_empty ())
+    return scm_from_double (0.0);
+
+  return scm_from_double (centers.center ());
+}
+
 MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_y_parent, 1);
 SCM
 Self_alignment_interface::centered_on_y_parent (SCM smob)
@@ -134,6 +158,69 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
   return scm_from_double (x);
 }
 
+MAKE_SCHEME_CALLBACK (Self_alignment_interface, avoid_x_colliding_grobs, 2);
+SCM
+Self_alignment_interface::avoid_x_colliding_grobs (SCM smob, SCM o)
+{
+  SCM avoided = avoid_colliding_grobs (unsmob_grob (smob), X_AXIS, robust_scm2double (o, 0.0));
+  return scm_is_null (avoided) ? o : avoided;
+}
+
+MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_colliding_grobs, 1);
+SCM
+Self_alignment_interface::x_colliding_grobs (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "potential-X-colliding-grobs", pot);
+  vector<Grob *> act;
+  Direction d = get_grob_direction (me->get_parent (Y_AXIS));
+  for (vsize i = 0; i < pot.size (); i++)
+    if (d == get_grob_direction (pot[i])
+        && to_boolean (pot[i]->get_property ("cross-staff")))
+      act.push_back (pot[i]);
+
+  SCM grobs_scm = Grob_array::make_array ();
+  unsmob_grob_array (grobs_scm)->set_array (act);
+
+  return grobs_scm;
+}
+
+SCM
+Self_alignment_interface::avoid_colliding_grobs (Grob *me, Axis a, Real offset)
+{
+  extract_grob_set (me, a == X_AXIS ? "X-colliding-grobs" : "Y-colliding-grobs", colls);
+  if (!colls.size ())
+    return SCM_EOL;
+  vector<Interval> ivs;
+
+  Item *refp = dynamic_cast<Item *> (common_refpoint_of_array (colls, me, a));
+  if (!refp)
+    return SCM_EOL;
+
+  Interval iv = me->extent (me, a) + offset;
+  for (vsize i = 0; i < colls.size (); i++)
+    ivs.push_back (colls[i]->extent (refp, a));
+
+  Interval_minefield minefield (Interval (iv.center (), iv.center ()), iv.length ());
+  for (vsize i = 0; i < ivs.size (); i++)
+    minefield.add_forbidden_interval (ivs[i]);
+  minefield.solve ();
+  Interval pos = minefield.feasible_placements ();
+
+  if (pos[LEFT] == pos[RIGHT])
+    return SCM_EOL;
+
+  Direction col_dir = ((abs (pos[LEFT] - iv.center ())
+                        + robust_scm2double (me->get_property ("collision-bias"), 0.0))
+                       > abs (pos[RIGHT] - iv.center ()))
+                      ? RIGHT
+                      : LEFT;
+
+  return scm_from_double ((pos[col_dir] - (iv.length () / 2)
+                           + col_dir
+                           * robust_scm2double (me->get_property ("collision-padding"), 0.0)));
+}
+
 void
 Self_alignment_interface::set_center_parent (Grob *me, Axis a)
 {
@@ -142,6 +229,12 @@ Self_alignment_interface::set_center_parent (Grob *me, Axis a)
                        a);
 }
 
+void
+Self_alignment_interface::avoid_x_collisions (Grob *me)
+{
+  chain_offset_callback (me, avoid_x_colliding_grobs_proc, X_AXIS);
+}
+
 void
 Self_alignment_interface::set_align_self (Grob *me, Axis a)
 {
@@ -165,6 +258,11 @@ ADD_INTERFACE (Self_alignment_interface,
                "@end table\n",
 
                /* properties */
+               "collision-bias "
+               "collision-padding "
+               "potential-X-colliding-grobs "
                "self-alignment-X "
                "self-alignment-Y "
+               "X-colliding-grobs "
+               "Y-colliding-grobs "
               );