X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fself-alignment-interface.cc;h=e0b7f00cb2887fc6e1c1e9afd194aa0045f86e5d;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=a37b5871007eec8ef9368976958997b6a4c84a98;hpb=bdf74886dc9bcaf01c55677bf2086f4b76a7ef8c;p=lilypond.git

diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc
index a37b587100..e0b7f00cb2 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 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,10 +19,7 @@
 
 #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"
@@ -59,8 +56,12 @@ 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));
+      // Empty extent doesn't mean an error - we simply don't align such grobs.
+      // However, empty extent and non-empty stencil would be suspicious.
       if (!ext.is_empty ())
         return scm_from_double (- ext.linear_combination (scm_to_double (align)));
+      else if (me->get_stencil ())
+        warning (me->name () + " has empty extent and non-empty stencil.");
     }
   return scm_from_double (0.0);
 }
@@ -147,80 +148,23 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
   Real align = scm_to_double (align_prop);
 
   Interval ext (me->extent (me, a));
-  if (ext.is_empty ())
-    programming_error ("cannot align on self: empty element");
-  else
+
+  // Empty extent doesn't mean an error - we simply don't align such grobs.
+  // However, empty extent and non-empty stencil would be suspicious.
+  if (!ext.is_empty ())
     x -= ext.linear_combination (align);
+  else if (me->get_stencil ())
+    warning (me->name () + " has empty extent and non-empty stencil.");
 
+  // See comment above.
   if (!he.is_empty ())
     x += he.linear_combination (align);
+  else if (him->get_stencil ())
+    warning (him->name () + " has empty extent and non-empty stencil.");
 
   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)
 {
@@ -229,12 +173,6 @@ 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)
 {
@@ -258,11 +196,6 @@ 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 "
               );