From: Joe Neeman Date: Sat, 28 Jul 2007 10:32:06 +0000 (+1000) Subject: Revert "fixes for dots in vaticana ligatures" X-Git-Tag: release/2.11.29-1~37 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f9180593c6b22d81363f810c32924eed0c50ba49;p=lilypond.git Revert "fixes for dots in vaticana ligatures" This causes a regression for mensural-ligatures.ly This reverts commit 145b59d7a8ec0bbfaa1d2256c6dcbe6be9976f66. --- diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index acbbbf8e18..004cf8d78e 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -9,7 +9,6 @@ #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 +95,6 @@ Coherent_ligature_engraver::move_related_items_to_column // interest continue; - if (dynamic_cast (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 +104,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); } diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 89ccfa9722..45a30edf6c 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -416,7 +416,6 @@ Vaticana_ligature_engraver::add_mora_column (Paper_column *column) Dot_column::add_head (dotcol, primitive); // FIXME: why isn't the dot picked up by Paper_column_engraver? - // it is, but in the wrong timestep. UGH Separation_item::add_item (column, dot); } }