Deletes Box_quarantine.

[lilypond.git] / lily / fingering-column.cc

diff --git a/lily/fingering-column.cc b/lily/fingering-column.cc
index 76c7bd3b89bd884b782fbdcefb0568bdf8aac41f..1cc6c12b116ca4689d746dedaab149f031712d59 100644 (file)
--- a/lily/fingering-column.cc
+++ b/lily/fingering-column.cc
@@ -19,35 +19,11 @@
 
 #include "grob.hh"
 #include "fingering-column.hh"
-#include "box-quarantine.hh"
 #include "pointer-group-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 #include "paper-column.hh"
 
-#include <map>
-
-// The sorting algorithm may not preserve the order of the
-// original fingerings. We use Fingering_position_info to retain
-// this order.
-
-struct Fingering_position_info {
-  Box box_;
-  vsize idx_;
-  Fingering_position_info (Box, vsize);
-};
-
-Fingering_position_info::Fingering_position_info (Box box, vsize idx)
-  : box_ (box), idx_ (idx)
-{
-}
-
-bool
-fingering_position_less (Fingering_position_info fpi0, Fingering_position_info fpi1)
-{
-  return Interval::left_less (fpi0.box_[Y_AXIS], fpi1.box_[Y_AXIS]);
-}
-
 MAKE_SCHEME_CALLBACK (Fingering_column, calc_positioning_done, 1);
 SCM
 Fingering_column::calc_positioning_done (SCM smob)
@@ -56,8 +32,6 @@ Fingering_column::calc_positioning_done (SCM smob)
   if (!me->is_live ())
     return SCM_BOOL_T;
 
-  map<Grob *, bool> shifted;
-
   me->set_property ("positioning-done", SCM_BOOL_T);
 
   extract_grob_set (me, "fingerings", const_fingerings);
@@ -77,32 +51,43 @@ Fingering_column::calc_positioning_done (SCM smob)
                      common_refpoint_of_array (fingerings, me, Y_AXIS)};
 
   Real padding = robust_scm2double (me->get_property ("padding"), 0.2);
-  Box_quarantine bq (padding, Y_AXIS);
-  vector<Fingering_position_info> origs;
-  for (vsize i = 0; i < fingerings.size (); i++)
-    {
-      Interval x_ext = fingerings[i]->extent (common[X_AXIS], X_AXIS);
-      // center on Y parent
-      fingerings[i]->translate_axis (-fingerings[i]->extent (fingerings[i], Y_AXIS).length () / 2.0, Y_AXIS);
-      Interval y_ext = fingerings[i]->extent (fingerings[i], Y_AXIS)
-                       + fingerings[i]->get_parent (Y_AXIS)
-                         ->relative_coordinate (common[Y_AXIS], Y_AXIS);
-      origs.push_back(Fingering_position_info (Box (x_ext, y_ext), i));
-    }
 
   // order the fingerings from bottom to top
-  vector_sort (origs, fingering_position_less);
-
-  for (vsize i = 0; i < origs.size (); i++)
-    bq.add_box_to_quarantine (Box (origs[i].box_));
+  vector_sort (fingerings, pure_position_less);
+
+ vector<Real> shift(fingerings.size());
+
+  // Try stacking the fingerings top-to-bottom, and then bottom-to-top.
+  // Use the average of the resulting stacked locations as the final positions
+  for (UP_and_DOWN (d))
+     {
+      Real stack_end = -d * infinity_f;
+      Interval prev_x_ext;
+      for (vsize i = (d == UP)? 0 : fingerings.size() - 1;
+           i < fingerings.size ();
+           i += d)
+        {
+          Interval x_ext = fingerings[i]->extent(common[X_AXIS], X_AXIS);
+          Interval y_ext = fingerings[i]->extent(fingerings[i], Y_AXIS);
+          Real parent_y = fingerings[i]->get_parent(Y_AXIS)
+                         ->relative_coordinate(common[Y_AXIS], Y_AXIS);
+
+          // Checking only between sequential neighbors, seems good enough
+          if (!intersection(x_ext, prev_x_ext).is_empty())
+            stack_end += d * (y_ext.length() + padding);
+          // minmax() returns whichever is further along in direction d
+          stack_end = minmax(d, stack_end, parent_y);
+
+          shift[i] += 0.5 * (stack_end - y_ext[d] - parent_y);
+
+          prev_x_ext = x_ext;
+        }
+     }
 
-  bq.solve ();
-  vector<Box> news (bq.quarantined_boxes ());
-
-  for (vsize i = 0; i < origs.size (); i++)
-    fingerings[origs[i].idx_]->translate_axis (news[i][Y_AXIS][DOWN] - origs[i].box_[Y_AXIS][DOWN], Y_AXIS);
+  for (vsize i = 0; i < fingerings.size (); i++)
+    fingerings[i]->translate_axis(shift[i], Y_AXIS);
 
-  return SCM_BOOL_T;
+ return SCM_BOOL_T;
 }
 
 void