remove break-algorithm.{cc,hh} as they are no longer used.

[lilypond.git] / lily / align-interface.cc

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 410344dae2487a58065812212e920e9672820f5f..736ecb9096a51a48111595b51d938b74c896189a 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -93,7 +93,7 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a)
 
   vector<Grob*> elems (elem_source); // writable..
 
-  Real where_f = 0;
+  Real where = 0;
 
   Interval v;
   v.set_empty ();
@@ -118,9 +118,9 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a)
 
   for (vsize j = 0; j < elems.size (); j++)
     {
-      where_f += stacking_dir * dy;
-      translates.push_back (where_f);
-      v.unite (Interval (where_f, where_f));
+      where += stacking_dir * dy;
+      translates.push_back (where);
+      v.unite (Interval (where, where));
     }
 
   /*
@@ -206,7 +206,9 @@ Align_interface::get_extents_aligned_translates (Grob *me,
                                   ? scm_cdr (extra_space_handle)
                                   : SCM_EOL,
                                   extra_space);
-  
+
+  Real padding = robust_scm2double (me->get_property ("padding"),
+                                   0.0);
   vector<Real> translates;
   for (vsize j = 0; j < elems.size (); j++)
     {
@@ -221,17 +223,20 @@ Align_interface::get_extents_aligned_translates (Grob *me,
       if (j)
        dy = min (max (dy, threshold[SMALLER]), threshold[BIGGER]);
 
-      where += stacking_dir * (dy + extra_space / elems.size ());
+
+      where += stacking_dir * (dy + padding + extra_space / elems.size ());
       total.unite (dims[j] + where);
       translates.push_back (where);
     }
 
-  SCM offsets_handle = scm_assq (ly_symbol2scm ("alignment-offsets"), line_break_details);
+  SCM offsets_handle = scm_assq (ly_symbol2scm ("alignment-offsets"),
+                                line_break_details);
   if (scm_is_pair (offsets_handle))
     {
       vsize i = 0;
  
-      for (SCM s = scm_cdr (offsets_handle); scm_is_pair (s) && i < translates.size (); s = scm_cdr (s), i++)
+      for (SCM s = scm_cdr (offsets_handle);
+          scm_is_pair (s) && i < translates.size (); s = scm_cdr (s), i++)
        {
          if (scm_is_number (scm_car (s)))
            translates[i] = scm_to_double (scm_car (s));
@@ -323,7 +328,7 @@ Align_interface::add_element (Grob *me, Grob *element)
   SCM sym = axis_offset_symbol (a);
   SCM proc = axis_parent_positioning (a);
     
-  element->internal_set_property (sym, proc);
+  element->set_property (sym, proc);
   Axis_group_interface::add_element (me, element);
 }
 
@@ -375,12 +380,15 @@ ADD_INTERFACE (Align_interface,
               /*
                 properties
                */
+              "align-dir "
+              "axes "
+              "elements "
               "forced-distance "
+              "padding "
+              "positioning-done "
               "stacking-dir "
-              "align-dir "
               "threshold "
-              "positioning-done "
-              "elements axes");
+              );
 
 struct Foobar
 {