Merge branch 'lilypond/translation'

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

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index acbbbf8e183ad8e221d6fa25848b93c8fd6e042c..e9ce487e2a0690f8f0e69a86c3c2d9a49827314b 100644 (file)
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -1,15 +1,25 @@
 /*
-  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--2010 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2003--2007 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"
 
 #include "warn.hh"
-#include "axis-group-interface.hh"
 #include "paper-column.hh"
 #include "pitch.hh"
 #include "pointer-group-interface.hh"
@@ -96,9 +106,6 @@ Coherent_ligature_engraver::move_related_items_to_column
        // interest
        continue;
 
-      if (dynamic_cast<Item*> (sibling)->get_column () != source_column)
-       continue;
-
 #if 0 /* experimental code to collapse spacing after ligature */
       Grob *sibling_parent = sibling->get_parent (X_AXIS);
       sibling_parent->warning (_f ("Coherent_ligature_engraver: "
@@ -108,7 +115,6 @@ Coherent_ligature_engraver::move_related_items_to_column
                                    scm_from_double (0.01));
 #endif
 
-      Axis_group_interface::add_element (target_column, sibling);
       sibling->set_parent (target_column, X_AXIS);
       sibling->translate_axis (offset, X_AXIS);
     }