Nitpick run.

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index c2d4b09828197cf8d4eafb595ced3e029243c98c..9778f3076b849be498ff439e15af107f33d4a640 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -9,8 +9,9 @@
 #include <math.h>
 
 #include "break-align-interface.hh"
-#include "libc-extension.hh"   // isinf
 
+#include "libc-extension.hh"   // isinf
+#include "pointer-group-interface.hh"
 #include "self-alignment-interface.hh"
 #include "side-position-interface.hh"
 #include "axis-group-interface.hh"
@@ -35,7 +36,7 @@ Break_align_interface::alignment_callback (SCM element_smob, SCM axis)
       Break_align_interface::do_alignment (par);
     }
 
-  return scm_make_real (0);
+  return scm_from_double (0);
 }
 
 MAKE_SCHEME_CALLBACK (Break_align_interface, self_align_callback, 2);
@@ -43,15 +44,13 @@ SCM
 Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  (void)  axis;
+  (void) axis;
   assert (scm_to_int (axis) == X_AXIS);
 
   Item *item = dynamic_cast<Item *> (me);
   Direction bsd = item->break_status_dir ();
   if (bsd == LEFT)
-    {
-      me->set_property ("self-alignment-X", scm_int2num (RIGHT));
-    }
+    me->set_property ("self-alignment-X", scm_from_int (RIGHT));
 
   /*
     Force break alignment itself to be done first, in the case
@@ -70,13 +69,16 @@ Link_array<Grob>
 Break_align_interface::ordered_elements (Grob *grob)
 {
   Item *me = dynamic_cast<Item *> (grob);
-  SCM elts = me->get_property ("elements");
+  extract_grob_set (me, "elements", elts);
+
   SCM order_vec = me->get_property ("break-align-orders");
   if (!scm_is_vector (order_vec)
       || scm_c_vector_length (order_vec) < 3)
-    return extract_grob_array (me, ly_symbol2scm ("elements"));
+    return elts;
+
+  Link_array<Grob> writable_elts (elts);
   SCM order = scm_vector_ref (order_vec,
-                             scm_int2num (me->break_status_dir () + 1));
+                             scm_from_int (me->break_status_dir () + 1));
 
   /*
     Copy in order specified in BREAK-ALIGN-ORDER.
@@ -86,16 +88,17 @@ Break_align_interface::ordered_elements (Grob *grob)
     {
       SCM sym = scm_car (order);
 
-      for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
+      for (int i = writable_elts.size (); i--;)
        {
-         Grob *g = unsmob_grob (scm_car (s));
+         Grob *g = writable_elts[i];
          if (g && sym == g->get_property ("break-align-symbol"))
            {
              new_elts.push (g);
-             elts = scm_delq (g->self_scm (), elts);
+             writable_elts.del (i);
            }
        }
     }
+
   return new_elts;
 }
 
@@ -151,10 +154,11 @@ Break_align_interface::do_alignment (Grob *grob)
       /*
        Find the first grob with a space-alist entry.
       */
-      for (SCM s = l->get_property ("elements");
-          scm_is_pair (s); s = scm_cdr (s))
+      extract_grob_set (l, "elements", elts);
+
+      for (int i = elts.size (); i--;)
        {
-         Grob *elt = unsmob_grob (scm_car (s));
+         Grob *elt = elts[i];
 
          if (edge_idx < 0
              && elt->get_property ("break-align-symbol")
@@ -176,12 +180,15 @@ Break_align_interface::do_alignment (Grob *grob)
        table, but that gets icky when that grob is suicided for some
        reason.
       */
-      for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
-          !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
+      if (r)
        {
-         Grob *elt = unsmob_grob (scm_car (s));
-
-         rsym = elt->get_property ("break-align-symbol");
+         extract_grob_set (r, "elements", elts);
+         for (int i = elts.size ();
+              !scm_is_symbol (rsym) && i--;)
+           {
+             Grob *elt = elts[i];
+             rsym = elt->get_property ("break-align-symbol");
+           }
        }
 
       if (rsym == ly_symbol2scm ("left-edge"))
@@ -225,12 +232,10 @@ Break_align_interface::do_alignment (Grob *grob)
              - extents[next_idx][LEFT];
          /* should probably junk minimum-space */
          else if (type == ly_symbol2scm ("minimum-space"))
-           offsets[next_idx] = extents[idx][RIGHT] >? distance;
+           offsets[next_idx] = max (extents[idx][RIGHT], distance);
        }
       else
-       {
-         extra_right_space = distance;
-       }
+       extra_right_space = distance;
 
       idx = next_idx;
     }
@@ -247,10 +252,11 @@ Break_align_interface::do_alignment (Grob *grob)
       total_extent.unite (extents[i] + here);
     }
 
+  if (total_extent.is_empty ())
+    return;
+
   if (me->break_status_dir () == LEFT)
-    {
-      alignment_off = -total_extent[RIGHT] - extra_right_space;
-    }
+    alignment_off = -total_extent[RIGHT] - extra_right_space;
   else if (edge_idx < 0)
     alignment_off = -total_extent[LEFT];