Merge commit '3b48b5e'

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index 004cf8d78e42d82b3026fd2b75cdc3ca290579fc..acbbbf8e183ad8e221d6fa25848b93c8fd6e042c 100644 (file)
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -9,6 +9,7 @@
 #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"
@@ -95,6 +96,9 @@ 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: "
@@ -104,6 +108,7 @@ 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 45a30edf6c8faeaa8608870deba0c37fc0afffad..89ccfa9722d448d1f6fe99363a68a1b3732fec4e 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -416,6 +416,7 @@ 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);
     }
 }

diff --git a/scm/stencil.scm b/scm/stencil.scm
index db35a5ecc54af4228b43c2bcb2b5b72ef8f86603..127a5f62ad95f442c3ae090d6cdae6ee03c0d3d4 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -279,7 +279,9 @@ encloses the contents.
                      (- (list-ref bbox 2) (list-ref bbox 0))
                      (- (list-ref bbox 3) (list-ref bbox 1))
                      ))
-       (factor (exact->inexact (/ size bbox-size)))
+       (factor (if (< 0 bbox-size)
+                  (exact->inexact (/ size bbox-size))
+                  0))
        (scaled-bbox
        (map (lambda (x) (* factor x)) bbox))
        (clip-rect-string (ly:format