use the new spacing-interface stuff in staff-spacing

diff --git a/lily/include/spacing-interface.hh b/lily/include/spacing-interface.hh
index 08e404e4e742ad9500fef7d1f8e6ca9c1d0ce250..168a3da3c81b27b847f0d8bd4c7b27cec601c414 100644 (file)
--- a/lily/include/spacing-interface.hh
+++ b/lily/include/spacing-interface.hh
@@ -14,7 +14,8 @@
 struct Spacing_interface
 {
   static Real minimum_distance (Grob *me);
-  static Drul_array<Item*> note_columns (Grob *me);
+  static vector<Item*> right_note_columns (Grob *me);
+  static vector<Item*> left_note_columns (Grob *me);
   static Item* right_column (Grob *me);
   static Item* left_column (Grob *me);
 

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index 6180e102026aa4f86902a10c9cf633deeb3f6059..1553129b575a0b44faa37bc3840a1563fe7ee4c2 100644 (file)
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -16,8 +16,7 @@
 class Staff_spacing
 {
   static Real optical_correction (Grob *, Grob *, Interval);
-  static Real left_stickout (Grob *, Grob *);
-  static Real next_notes_correction (Grob *, Grob *, Real, Real);
+  static Real next_notes_correction (Grob *, Grob *);
 
 public:
   DECLARE_GROB_INTERFACE();

diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc
index 8a0c353c4b4a8c0d496d111c4e854ec8abf8d561..b25fd65ad27289d99dadca013c06b2958eecd4f5 100644 (file)
--- a/lily/spacing-interface.cc
+++ b/lily/spacing-interface.cc
@@ -13,6 +13,7 @@
 #include "grob-array.hh"
 #include "item.hh"
 #include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "paper-column.hh"
 #include "separation-item.hh"
 #include "skyline.hh"
@@ -101,25 +102,32 @@ Spacing_interface::left_column (Grob *me)
   return dynamic_cast<Item *> (me)->get_column ();
 }
 
-Drul_array<Item*>
-Spacing_interface::note_columns (Grob *me)
+static vector<Item*>
+get_note_columns (vector<Grob*> const &elts)
 {
-  Drul_array<Item*> ret (0, 0);
-  Drul_array<vector<Grob*> > items (ly_scm2link_array (me->get_object ("left-items")),
-                                   ly_scm2link_array (me->get_object ("right-items")));
+  vector<Item*> ret;
 
-  Direction d = LEFT;
-  do
-    {
-      for (vsize i = 0; i < items[d].size (); i++)
-       if (Note_column::has_interface (items[d][i]))
-         ret[d] = dynamic_cast<Item*> (items[d][i]);
-    }
-  while (flip (&d) != LEFT);
+  for (vsize i = 0; i < elts.size (); i++)
+    if (Note_column::has_interface (elts[i]))
+      ret.push_back (dynamic_cast<Item*> (elts[i]));
 
   return ret;
 }
 
+vector<Item*>
+Spacing_interface::right_note_columns (Grob *me)
+{
+  extract_grob_set (me, "right-items", elts);
+  return get_note_columns (elts);
+}
+
+vector<Item*>
+Spacing_interface::left_note_columns (Grob *me)
+{
+  extract_grob_set (me, "left-items", elts);
+  return get_note_columns (elts);
+}
+
 ADD_INTERFACE (Spacing_interface,
               "This object calculates the desired and minimum distances between two columns.",
 

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 2919602843f32ccdc15bff7de1ea719211d93da3..08ef57839909c230502e61cbe2ab4b87a1754ecb 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -19,40 +19,11 @@ using namespace std;
 #include "staff-symbol-referencer.hh"
 #include "note-column.hh"
 #include "stem.hh"
+#include "spacing-interface.hh"
 #include "accidental-placement.hh"
 #include "pointer-group-interface.hh"
 #include "directional-element-interface.hh"
 
-Real
-Staff_spacing::left_stickout (Grob *me, Grob *g)
-{
-  if (!g || !Note_column::has_interface (g))
-    return 0;
-
-  Item *col = dynamic_cast<Item *> (g)->get_column ();
-  Real ret = max (0., (- g->extent (col, X_AXIS)[LEFT]));
-
-  /*
-    Duh. If this gets out of hand, we should invent something more generic.
-  */
-  Grob *accs = Note_column::accidentals (g);
-  if (accs)
-    {
-      Interval v;
-      if (Accidental_placement::has_interface (accs))
-       v = Accidental_placement::get_relevant_accidental_extent (accs, col, me);
-      else
-       v = accs->extent (col, X_AXIS);
-      
-      ret = max (ret, (- v[LEFT]));
-    }
-  Grob *arpeggio = unsmob_grob (g->get_object ("arpeggio"));
-  if (arpeggio)
-    ret = max (ret, - arpeggio->extent (col, X_AXIS)[LEFT]);
-
-  return ret;
-}
-
 Real
 Staff_spacing::optical_correction (Grob *me, Grob *g, Interval bar_height)
 {
@@ -113,51 +84,20 @@ Staff_spacing::bar_y_positions (Grob *bar_grob)
   return bar_size;
 }
 
-/*
-  Do corrections for the following notes.
-
-  This is slightly convoluted, since the staffspacing grob gets
-  pointers to the separation-items, not the note-columns or
-  note-spacings.
-*/
-
 Real
 Staff_spacing::next_notes_correction (Grob *me,
-                                     Grob *last_grob,
-                                     Real current_fixed,
-                                     Real right_stickout)
+                                     Grob *last_grob)
 {
   Interval bar_size = bar_y_positions (last_grob);
   Grob *orig = me->original () ? me->original () : me;
+  vector<Item*> note_columns = Spacing_interface::right_note_columns (orig);
 
-  extract_grob_set (orig, "right-items", right_items);
-
-  Real max_left_stickout = 0.0;
   Real max_optical = 0.0;
 
-  for (vsize i = right_items.size (); i--;)
-    {
-      Grob *g = right_items[i];
-      if (Note_column::has_interface (right_items[i]))
-       {
-         max_left_stickout = max (max_left_stickout, left_stickout (me, g));
-         max_optical = max (max_optical, optical_correction (me, g, bar_size));
-       }
-      else
-       {
-         extract_grob_set (g, "elements", elts);
-         for (vsize j = elts.size (); j--;)
-           {
-             max_left_stickout = max (max_left_stickout, left_stickout (me, elts[j]));
-             max_optical = max (max_optical, optical_correction (me, g, bar_size));
-           }
-       }
-    }
+  for (vsize i = 0; i < note_columns.size (); i++)
+    max_optical = max (max_optical, optical_correction (me, note_columns[i], bar_size));
 
-  /* we put a minimum distance of 0.3 between the right edge of the left grob and
-     the left edge of the right grob */
-  max_left_stickout = max (0.0, max_left_stickout + right_stickout + 0.3 - current_fixed);
-  return max (max_left_stickout, max_optical);
+  return max_optical;
 }
 
 /* This routine does not impose any minimum distances between columns; it only
@@ -251,12 +191,16 @@ Staff_spacing::get_spacing_params (Grob *me)
       ideal = fixed;
     }
 
-  Real correction = next_notes_correction (me, last_grob, fixed, last_ext[RIGHT]);
+  Real optical_correction = next_notes_correction (me, last_grob);
+  Real min_dist = Spacing_interface::minimum_distance (me);
+  Real min_dist_correction = max (0.0, 0.3 + min_dist - fixed);
+  Real correction = max (optical_correction, min_dist_correction);
+
   fixed += correction;
   ideal += correction;
 
   Spring ret;
-  ret.min_distance_ = 0.0;
+  ret.min_distance_ = max (min_dist, fixed);
   ret.distance_ = ideal;
   ret.inverse_stretch_strength_ = ret.inverse_compress_strength_ = ideal - fixed;
   return ret;