add horizon_padding to skylines (although it is currently always 0)

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

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index f4271c389804e1c1084b214303d4839accbfd48c..a07668d13b68ca8891d18dc69a71f8a33b73f95e 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -31,20 +31,17 @@ void
 Separation_item::set_skyline_distance (Drul_array<Item *> items,
                                       Real padding)
 {
-  Drul_array<Skyline> lines;
+  Drul_array<Skyline*> lines;
   Direction d = LEFT;
 
   do
     {
       SCM prop = items[d]->get_property ("skylines");
-      lines[d] =
-       Skyline (ly_scm2offsets (index_get_cell (prop, -d)),
-                2.0,
-                -d);
+      lines[d] = Skyline::unsmob (index_get_cell (prop, -d));
     }
   while (flip (&d) != LEFT);
 
-  Real dist = padding + lines[LEFT].distance (lines[RIGHT]);
+  Real dist = padding + lines[LEFT]->distance (*lines[RIGHT]);
   if (dist > 0)
     {
       Rod rod;
@@ -56,18 +53,16 @@ Separation_item::set_skyline_distance (Drul_array<Item *> items,
     }  
 }
 
-void
+bool
 Separation_item::set_distance (Drul_array<Item *> items,
                               Real padding)
 {
-#if 0
-  if (0 && !Item::is_non_musical (items[LEFT])
+  if (!Item::is_non_musical (items[LEFT])
       && !Item::is_non_musical (items[RIGHT]))
     {
       set_skyline_distance (items, padding);
-      return;
+      return true;
     }
-#endif
   
   Interval li (Separation_item::width (items[LEFT]));
   Interval ri (Separation_item::conditional_width (items[RIGHT], items[LEFT]));
@@ -81,7 +76,9 @@ Separation_item::set_distance (Drul_array<Item *> items,
 
       if (rod.distance_  > 0)
        rod.add_to_cols ();
+      return true;
     }
+  return false;
 }
 
 /*
@@ -131,8 +128,8 @@ Separation_item::calc_skylines (SCM smob)
   vector<Box> bs = boxes (me);
   do
     {
-      Skyline l (bs, Y_AXIS, d);
-      index_set_cell (lines, d, ly_offsets2scm (l.to_points ()));
+      Skyline l (bs, 0, Y_AXIS, d);
+      index_set_cell (lines, d, l.smobbed_copy ());
     }
   while (flip (&d) != LEFT);
 
@@ -164,7 +161,7 @@ Separation_item::boxes (Grob *me)
        continue;
 
       Interval y (il->pure_height (ycommon, 0, very_large));
-      y.widen (0.01);          // fixme
+      y.widen (0.1);           // fixme
       Box b (il->extent (pc, X_AXIS), y);
 
       out.push_back (b);
@@ -261,11 +258,11 @@ Separation_item::extremal_break_aligned_grob (Grob *me,
 
 ADD_INTERFACE (Separation_item,
               "Item that computes widths to generate spacing rods. "
-              "This is done in concert with @ref{separation-spanner-interface}.",
+              "This is done in concert with @ref{separating-group-spanner-interface}.",
 
               "X-extent "
               "conditional-elements "
-              "elements"
+              "elements "
               "padding "
               "skylines "
               );