Run `make grand-replace'.

[lilypond.git] / lily / coherent-ligature-engraver.cc

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index ff1691ef643312fe78fd2ab2519216ff02b36402..df89149f2daba60e9cca3a1b6f4eb738fbd65f79 100644 (file)
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -3,17 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2003--2008 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "coherent-ligature-engraver.hh"
 
 #include "warn.hh"
-#include "staff-symbol-referencer.hh"
-#include "spanner.hh"
 #include "paper-column.hh"
 #include "pitch.hh"
 #include "pointer-group-interface.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
 
 /*
  * This abstract class serves as common superclass for all ligature
@@ -71,80 +72,41 @@
  * example, Ligature_bracket_engraver does not share any of this code.
  */
 
-/*
- * TODO: Let superflous space after each ligature collapse.  The
- * following code should help in doing so (though it does not yet
- * fully work).  Just put the following code into
- * Spacing_spanner::do_measure ().  I put it temporarily here as memo
- * until it really works and I also get Han-Wen's/Jan's permission to
- * add it to the spacing spanner code.
- */
-#if 0 /* experimental code to collapse spacing after ligature */
-SCM incr_scm = lc->get_property ("forced-spacing");
-if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */
-  {
-    me->warning (_f ("gotcha: ptr=%ul", lc));//debug
-    ly_display_scm (lc->self_scm ());
-    Real distance;
-    if (incr_scm != SCM_EOL)
-      distance = scm_to_double (incr_scm);
-    else
-      {
-       me->warning (_ ("distance undefined, assuming 0.1"));
-       distance = 0.1;
-      }
-    me->warning (_f ("distance=%f", distance));//debug
-    Real inverse_strength = 1.0;
-    Spaceable_grob::add_spring (lc, rc, distance, inverse_strength);
-    if (Item *rb = r->find_prebroken_piece (LEFT))
-      Spaceable_grob::add_spring (lc, rb, distance, inverse_strength);
-
-    continue;
-  }
-#endif
 
 /*
  * TODO: move this function to class Item?
  */
 void
-Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
+Coherent_ligature_engraver::move_related_items_to_column
+(Item *item, Paper_column *target_column, Real offset)
 {
-  Item *parent = dynamic_cast<Item *> (item->get_parent (X_AXIS));
-  if (!parent)
-    {
-      programming_error ("failed tweaking paper column in ligature");
-      return;
-    }
-
-  string name = parent->name ();
-  if (name != "PaperColumn")
+  Paper_column *source_column = item->get_column ();
+  Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (item);
+  extract_item_set (source_column, "elements", elements);
+  for (vsize i = elements.size (); i--;)
     {
-      // Change column not only for targeted item (NoteColumn), but
-      // also for all associated grobs (NoteSpacing, SeparationItem).
-      Grob *sl = Staff_symbol_referencer::get_staff_symbol (item);
+      Item *sibling = elements[i];
+      if (!sibling)
+       // should not occur, but who knows... -jr
+       continue;
 
-      extract_item_set (parent, "elements", elements);
+      if (Staff_symbol_referencer::get_staff_symbol (sibling) != staff_symbol)
+       // sibling is from a staff different than that of the item of
+       // interest
+       continue;
 
-      for (vsize i = elements.size (); i--;)
-       {
-         Item *sibling = elements[i];
-         if ((sibling)
-             && (Staff_symbol_referencer::get_staff_symbol (sibling) == sl))
-           {
 #if 0 /* experimental code to collapse spacing after ligature */
-             Grob *sibling_parent = sibling->get_parent (X_AXIS);
-             sibling_parent->warning (_f ("Coherent_ligature_engraver: "
-                                          "setting `spacing-increment="
-                                          "0.01': ptr=%ul", parent));
-             sibling_parent->set_property ("forced-spacing",
-                                           scm_from_double (0.01));
+      Grob *sibling_parent = sibling->get_parent (X_AXIS);
+      sibling_parent->warning (_f ("Coherent_ligature_engraver: "
+                                  "setting `spacing-increment="
+                                  "0.01': ptr=%ul", parent));
+      sibling_parent->set_property ("forced-spacing",
+                                   scm_from_double (0.01));
 #endif
-             sibling->set_parent (column, X_AXIS);
-           }
-       }
+
+      sibling->set_parent (target_column, X_AXIS);
+      sibling->translate_axis (offset, X_AXIS);
     }
-  else
-    get_set_column (parent, column);
 }
 
 /*
@@ -173,19 +135,19 @@ compute_delta_pitches (vector<Grob_info> primitives)
   for (vsize i = 0; i < primitives.size (); i++)
     {
       primitive = dynamic_cast<Item *> (primitives[i].grob ());
-      Music *music_cause = primitives[i].music_cause ();
+      Stream_event *cause = primitives[i].event_cause ();
       int pitch
-       = unsmob_pitch (music_cause->get_property ("pitch"))->steps ();
+       = unsmob_pitch (cause->get_property ("pitch"))->steps ();
       if (prev_primitive)
        {
          delta_pitch = pitch - prev_pitch;
-         prev_primitive->set_property ("delta-pitch",
+         prev_primitive->set_property ("delta-position",
                                        scm_from_int (delta_pitch));
        }
       prev_pitch = pitch;
       prev_primitive = primitive;
     }
-  primitive->set_property ("delta-pitch", scm_from_int (0));
+  primitive->set_property ("delta-position", scm_from_int (0));
 }
 
 void