Merge branch 'original' into HEAD

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index a692fc0b9b558b7e0b30d4419b96232d6aaefc2a..f8d1cb739ffc59c20a5da2c7f85cb4136bf2b6cd 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -10,6 +10,7 @@
 
 #include "axis-group-interface.hh"
 #include "lookup.hh"
+#include "note-head.hh"
 #include "stencil.hh"
 #include "skyline.hh"
 #include "paper-column.hh"
@@ -30,13 +31,12 @@ Separation_item::add_conditional_item (Grob *me, Grob *e)
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e);
 }
 
-void
-Separation_item::set_distance (Drul_array<Item *> items,
-                                      Real padding)
+Real
+Separation_item::set_distance (Item *l, Item *r, Real padding)
 {
-  Drul_array<Skyline_pair*> lines (Skyline_pair::unsmob (items[LEFT]->get_property ("horizontal-skylines")),
-                                  Skyline_pair::unsmob (items[RIGHT]->get_property ("horizontal-skylines")));
-  Skyline right = conditional_skyline (items[RIGHT], items[LEFT]);
+  Drul_array<Skyline_pair*> lines (Skyline_pair::unsmob (l->get_property ("horizontal-skylines")),
+                                  Skyline_pair::unsmob (r->get_property ("horizontal-skylines")));
+  Skyline right = conditional_skyline (r, l);
   right.merge ((*lines[RIGHT])[LEFT]);
   
   Real dist = padding + (*lines[LEFT])[RIGHT].distance (right);
@@ -44,11 +44,13 @@ Separation_item::set_distance (Drul_array<Item *> items,
     {
       Rod rod;
 
-      rod.item_drul_ = items;
+      rod.item_drul_ = Drul_array<Item*> (l, r);
 
       rod.distance_ = dist;
       rod.add_to_cols ();
-    }  
+    }
+
+  return max (dist, 0.0);
 }
 
 bool
@@ -108,7 +110,14 @@ Separation_item::boxes (Grob *me, Grob *left)
       Item *il = dynamic_cast<Item *> (elts[i]);
       if (pc != il->get_column ())
        continue;
-      if (Axis_group_interface::has_interface (il))
+
+      /* ugh. We want to exclude groups of grobs (so that we insert each grob
+        individually into the skyline instead of adding a single box that
+        bounds all of them). However, we can't exclude an axis-group that
+        adds to its childrens' stencil. Currently, this is just TrillPitchGroup;
+        hence the check for note-head-interface. */
+      if (Axis_group_interface::has_interface (il)
+         && !Note_head::has_interface (il))
        continue;
 
       Interval y (il->pure_height (ycommon, 0, very_large));
@@ -128,45 +137,6 @@ Separation_item::boxes (Grob *me, Grob *left)
   return out;      
 }
 
-/*
-  Try to find the break-aligned symbol in SEPARATION_ITEM that is
-  sticking out at direction D. The x size is put in LAST_EXT
-*/
-Grob *
-Separation_item::extremal_break_aligned_grob (Grob *me,
-                                             Direction d,
-                                             Interval *last_ext)
-{
-  Grob *col = dynamic_cast<Item *> (me)->get_column ();
-  last_ext->set_empty ();
-  Grob *last_grob = 0;
-
-  extract_grob_set (me, "elements", elts);
-  for (vsize i = elts.size (); i--;)
-    {
-      Grob *break_item = elts[i];
-      if (!scm_is_symbol (break_item->get_property ("break-align-symbol")))
-       continue;
-
-      if (!scm_is_pair (break_item->get_property ("space-alist")))
-       continue;
-
-      Interval ext = break_item->extent (col, X_AXIS);
-
-      if (ext.is_empty ())
-       continue;
-
-      if (!last_grob
-         || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0))
-       {
-         *last_ext = ext;
-         last_grob = break_item;
-       }
-    }
-
-  return last_grob;
-}
-
 extern bool debug_skylines;
 MAKE_SCHEME_CALLBACK (Separation_item, print, 1)
 SCM