Release: bump Welcome versions.

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

diff --git a/lily/fingering-column.cc b/lily/fingering-column.cc
index 1cc6c12b116ca4689d746dedaab149f031712d59..c069fb7c74c61c8a033c7ec833151c75ffe748a4 100644 (file)
--- a/lily/fingering-column.cc
+++ b/lily/fingering-column.cc
@@ -17,6 +17,7 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "directional-element-interface.hh"
 #include "grob.hh"
 #include "fingering-column.hh"
 #include "pointer-group-interface.hh"
@@ -24,22 +25,51 @@
 #include "item.hh"
 #include "paper-column.hh"
 
+#define EPS 1e-5
+
+struct Fingering_and_offset
+{
+  Grob *fingering_;
+  Real offset_;
+  Fingering_and_offset (Grob *fingering, Real offset);
+};
+
+Fingering_and_offset::Fingering_and_offset (Grob *fingering, Real offset) :
+  fingering_ (fingering), offset_ (offset)
+{
+}
+
+bool
+fingering_and_offset_less (Fingering_and_offset fo0, Fingering_and_offset fo1)
+{
+  return fo0.offset_ < fo1.offset_;
+}
+
 MAKE_SCHEME_CALLBACK (Fingering_column, calc_positioning_done, 1);
 SCM
 Fingering_column::calc_positioning_done (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   if (!me->is_live ())
     return SCM_BOOL_T;
 
   me->set_property ("positioning-done", SCM_BOOL_T);
 
+  do_y_positioning (me);
+  do_x_positioning (me);
+
+  return SCM_BOOL_T;
+}
+
+void
+Fingering_column::do_y_positioning (Grob *me)
+{
   extract_grob_set (me, "fingerings", const_fingerings);
 
   if (const_fingerings.size () < 2)
     {
       me->programming_error ("This FingeringColumn should have never been created.");
-      return SCM_BOOL_T;
+      return;
     }
 
   vector<Grob *> fingerings;
@@ -69,8 +99,7 @@ Fingering_column::calc_positioning_done (SCM smob)
         {
           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);
+          Real parent_y = fingerings[i]->parent_relative (common[Y_AXIS], Y_AXIS);
 
           // Checking only between sequential neighbors, seems good enough
           if (!intersection(x_ext, prev_x_ext).is_empty())
@@ -86,8 +115,40 @@ Fingering_column::calc_positioning_done (SCM smob)
 
   for (vsize i = 0; i < fingerings.size (); i++)
     fingerings[i]->translate_axis(shift[i], Y_AXIS);
+}
+
+void
+Fingering_column::do_x_positioning (Grob *me)
+{
+  extract_grob_set (me, "fingerings", fingerings);
+  if (!fingerings.size ())
+    return;
+
+  Grob *common_x = common_refpoint_of_array (fingerings, me, X_AXIS);
+
+  Real snap = robust_scm2double (me->get_property ("snap-radius"), 0.3);
+  vector<Fingering_and_offset> fos;
+
+  for (vsize i = 0; i < fingerings.size (); i++)
+    fos.push_back (Fingering_and_offset (fingerings[i], fingerings[i]->relative_coordinate (common_x, X_AXIS)));
+
+  vector_sort (fos, fingering_and_offset_less);
+  Direction dir = get_grob_direction (fingerings[0]);
+  if (dir == RIGHT)
+    reverse (fos);
+
+  Real prev = infinity_f * dir;
+  for (vsize i = 0; i < fos.size (); i++)
+    {
+      if ((fabs (fos[i].offset_ - prev) < snap)
+                && (fabs (fos[i].offset_ - prev) > EPS))
+        fos[i].offset_ = prev;
+
+      prev = fos[i].offset_;
+    }
 
- return SCM_BOOL_T;
+  for (vsize i = 0; i < fos.size (); i++)
+    fos[i].fingering_->translate_axis (fos[i].offset_ - fos[i].fingering_->relative_coordinate (common_x, X_AXIS), X_AXIS);
 }
 
 void
@@ -100,9 +161,11 @@ Fingering_column::add_fingering (Grob *fc, Grob *f)
 
 ADD_INTERFACE (Fingering_column,
                "Makes sure that fingerings placed laterally"
-               " do not collide.",
+               " do not collide and that they are flush if"
+               " necessary.",
 
                /* properties */
                "padding "
                "positioning-done "
+               "snap-radius "
               );