X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcoherent-ligature-engraver.cc;h=d0451afa92c51e26cb4e5719844141269fcde551;hb=c4dc8775b15ddf53c92c123a56a99c9a820541ce;hp=96ff842d0c57a44ffe2ff7a9555ce0b40cddd28a;hpb=abbdb46061be5c0a0682059d1f86bf3e44ca5cf3;p=lilypond.git

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index 96ff842d0c..d0451afa92 100644
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  coherent-ligature-engraver.cc -- implement Coherent_ligature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2012 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "coherent-ligature-engraver.hh"
@@ -72,49 +83,40 @@
  * example, Ligature_bracket_engraver does not share any of this code.
  */
 
-
 /*
  * 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)
+  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--;)
     {
-      programming_error ("failed tweaking paper column in ligature");
-      return;
-    }
+      Item *sibling = elements[i];
+      if (!sibling)
+        // should not occur, but who knows... -jr
+        continue;
+
+      if (Staff_symbol_referencer::get_staff_symbol (sibling) != staff_symbol)
+        // sibling is from a staff different than that of the item of
+        // interest
+        continue;
 
-  string name = parent->name ();
-  if (name != "PaperColumn")
-    {
-      // 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);
-
-      extract_item_set (parent, "elements", elements);
-
-      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);
 }
 
 /*
@@ -145,13 +147,13 @@ compute_delta_pitches (vector<Grob_info> primitives)
       primitive = dynamic_cast<Item *> (primitives[i].grob ());
       Stream_event *cause = primitives[i].event_cause ();
       int pitch
-	= unsmob_pitch (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-position",
-					scm_from_int (delta_pitch));
-	}
+        {
+          delta_pitch = pitch - prev_pitch;
+          prev_primitive->set_property ("delta-position",
+                                        scm_from_int (delta_pitch));
+        }
       prev_pitch = pitch;
       prev_primitive = primitive;
     }
@@ -160,7 +162,7 @@ compute_delta_pitches (vector<Grob_info> primitives)
 
 void
 Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
-					      vector<Grob_info> primitives)
+                                              vector<Grob_info> primitives)
 {
   // compute some commonly needed context info stored as grob
   // properties