* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

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

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index b990ad61fbcf147aa81c9126b15ef98ee43ac2e8..ba63f91d0e04e9ab67ae2c4dfeacf994273e3c60 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -41,7 +41,7 @@ Separation_item::conditional_width (Grob *me, Grob *left)
   extract_grob_set (me, "conditional-elements", elts);
   for (int i = 0; i < elts.size (); i++)
     {
-      Item *il = dynamic_cast<Item*> (elts[i]);
+      Item *il = dynamic_cast<Item *> (elts[i]);
       if (pc != il->get_column ())
        {
          /* this shouldn't happen, but let's continue anyway. */
@@ -50,14 +50,10 @@ Separation_item::conditional_width (Grob *me, Grob *left)
        }
 
       if (to_boolean (il->get_property ("no-spacing-rods")))
-       {
-         continue;
-       }
+       continue;
 
       if (Accidental_placement::has_interface (il))
-       {
-         w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left));
-       }
+       w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left));
     }
 
   SCM pad = me->get_property ("padding");
@@ -71,9 +67,7 @@ Separation_item::width (Grob *me)
 {
   SCM sw = me->get_property ("X-extent");
   if (is_number_pair (sw))
-    {
-      return ly_scm2interval (sw);
-    }
+    return ly_scm2interval (sw);
 
   Item *item = dynamic_cast<Item *> (me);
   Paper_column *pc = item->get_column ();
@@ -82,7 +76,7 @@ Separation_item::width (Grob *me)
   extract_grob_set (me, "elements", elts);
   for (int i = 0; i < elts.size (); i++)
     {
-      Item *il = dynamic_cast<Item*> (elts[i]);
+      Item *il = dynamic_cast<Item *> (elts[i]);
       if (pc != il->get_column ())
        {
          /* this shouldn't happen, but let's continue anyway. */
@@ -91,15 +85,11 @@ Separation_item::width (Grob *me)
        }
 
       if (to_boolean (il->get_property ("no-spacing-rods")))
-       {
-         continue;
-       }
+       continue;
 
       Interval iv (il->extent (pc, X_AXIS));
       if (!iv.is_empty ())
-       {
-         w.unite (iv);
-       }
+       w.unite (iv);
     }
 
   SCM pad = me->get_property ("padding");
@@ -131,14 +121,17 @@ Separation_item::extremal_break_aligned_grob (Grob *me,
   Grob *col = dynamic_cast<Item *> (me)->get_column ();
   last_ext->set_empty ();
   Grob *last_grob = 0;
-  
+
   extract_grob_set (me, "elements", elts);
-  for (int i = elts.size (); i--; )
+  for (int 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 ())