* flower

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index 36966bcd139a95c2e26b0913b3a2bbca2a1ec92a..1b3daecdb32ec39cc35aa5bcb34ec51a08aaa9db 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -6,7 +6,6 @@
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include <math.h>
 
 #include "break-align-interface.hh"
@@ -47,7 +46,7 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
   Axis a = (Axis) scm_to_int (axis);
   assert (a == X_AXIS);
 
-  Item* item = dynamic_cast<Item*> (me);
+  Item *item = dynamic_cast<Item *> (me);
   Direction bsd = item->break_status_dir ();
   if (bsd == LEFT)
     {
@@ -56,31 +55,29 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
 
   /*
     Force break alignment itself to be done first, in the case
-   */
+  */
   return Self_alignment_interface::aligned_on_self (element_smob, axis);
 }
 
-
 /*
   This is tricky: we cannot modify 'elements, since callers are
   iterating the same list. Reordering the list in-place, or resetting
   'elements will skip elements in the loops of callers.
 
   So we return the correct order as an array.
- */
+*/
 Link_array<Grob>
 Break_align_interface::ordered_elements (Grob *grob)
 {
-  Item *me = dynamic_cast<Item*> (grob);
+  Item *me = dynamic_cast<Item *> (grob);
   SCM elts = me->get_property ("elements");
   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 extract_grob_array (me, ly_symbol2scm ("elements"));
   SCM order = scm_vector_ref (order_vec,
                              scm_int2num (me->break_status_dir () + 1));
 
-
   /*
     Copy in order specified in BREAK-ALIGN-ORDER.
   */
@@ -111,8 +108,7 @@ Break_align_interface::add_element (Grob *me, Grob *toadd)
 void
 Break_align_interface::do_alignment (Grob *grob)
 {
-  Item * me = dynamic_cast<Item*> (grob);
-
+  Item *me = dynamic_cast<Item *> (grob);
 
   Link_array<Grob> elems = ordered_elements (me);
   Array<Interval> extents;
@@ -126,23 +122,22 @@ Break_align_interface::do_alignment (Grob *grob)
        last_nonempty = i;
     }
 
-  int idx  = 0;
-  while (idx < extents.size  () && extents[idx].is_empty ())
+  int idx = 0;
+  while (idx < extents.size () && extents[idx].is_empty ())
     idx++;
 
   Array<Real> offsets;
   offsets.set_size (elems.size ());
-  for (int i = 0; i < offsets.size ();i ++)
+  for (int i = 0; i < offsets.size ();i++)
     offsets[i] = 0.0;
 
-
   Real extra_right_space = 0.0;
   int edge_idx = -1;
   while (idx < elems.size ())
     {
-      int next_idx = idx+1;
-      while (next_idx < elems.size () &&
-            extents[next_idx].is_empty () )
+      int next_idx = idx + 1;
+      while (next_idx < elems.size ()
+            && extents[next_idx].is_empty ())
        next_idx++;
 
       Grob *l = elems[idx];
@@ -153,27 +148,26 @@ Break_align_interface::do_alignment (Grob *grob)
 
       SCM alist = SCM_EOL;
 
-
       /*
        Find the first grob with a space-alist entry.
-       */
+      */
       for (SCM s = l->get_property ("elements");
-          scm_is_pair (s) ; s = scm_cdr (s))
-         {
-           Grob *elt = unsmob_grob (scm_car (s));
-
-           if (edge_idx < 0
-               && elt->get_property ("break-align-symbol")
-               == ly_symbol2scm ( "left-edge"))
-             edge_idx = idx;
-
-           SCM l = elt->get_property ("space-alist");
-           if (scm_is_pair (l))
-             {
-               alist = l;
-               break;
-             }
-         }
+          scm_is_pair (s); s = scm_cdr (s))
+       {
+         Grob *elt = unsmob_grob (scm_car (s));
+
+         if (edge_idx < 0
+             && elt->get_property ("break-align-symbol")
+             == ly_symbol2scm ("left-edge"))
+           edge_idx = idx;
+
+         SCM l = elt->get_property ("space-alist");
+         if (scm_is_pair (l))
+           {
+             alist = l;
+             break;
+           }
+       }
 
       SCM rsym = r ? SCM_EOL : ly_symbol2scm ("right-edge");
 
@@ -185,12 +179,12 @@ Break_align_interface::do_alignment (Grob *grob)
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
           !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
        {
-         Grob * elt = unsmob_grob (scm_car (s));
+         Grob *elt = unsmob_grob (scm_car (s));
 
          rsym = elt->get_property ("break-align-symbol");
        }
 
-      if (rsym  == ly_symbol2scm ("left-edge"))
+      if (rsym == ly_symbol2scm ("left-edge"))
        edge_idx = next_idx;
 
       SCM entry = SCM_EOL;
@@ -204,13 +198,13 @@ Break_align_interface::do_alignment (Grob *grob)
          if (scm_is_symbol (rsym))
            sym_string = ly_symbol2string (rsym);
 
-         String orig_string ;
+         String orig_string;
          if (unsmob_grob (l->get_property ("cause")))
            orig_string = unsmob_grob (l->get_property ("cause"))->name ();
 
          programming_error (_f ("No spacing entry from %s to `%s'",
-                               orig_string.to_str0 (),
-                               sym_string.to_str0 ()));
+                                orig_string.to_str0 (),
+                                sym_string.to_str0 ()));
        }
 
       Real distance = 1.0;
@@ -221,7 +215,7 @@ Break_align_interface::do_alignment (Grob *grob)
          entry = scm_cdr (entry);
 
          distance = scm_to_double (scm_cdr (entry));
-         type = scm_car (entry) ;
+         type = scm_car (entry);
        }
 
       if (r)
@@ -245,7 +239,7 @@ Break_align_interface::do_alignment (Grob *grob)
   Interval total_extent;
 
   Real alignment_off = 0.0;
-  for (int i = 0 ; i < offsets.size (); i++)
+  for (int i = 0; i < offsets.size (); i++)
     {
       here += offsets[i];
       if (i == edge_idx)
@@ -253,23 +247,21 @@ Break_align_interface::do_alignment (Grob *grob)
       total_extent.unite (extents[i] + here);
     }
 
-
   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];
 
   here = alignment_off;
-  for (int i = 0 ; i < offsets.size (); i++)
+  for (int i = 0; i < offsets.size (); i++)
     {
       here += offsets[i];
       elems[i]->translate_axis (here, X_AXIS);
     }
 }
 
-
 ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface",
               "Items that are aligned in prefatory matter.\n"
               "\n"
@@ -299,5 +291,3 @@ ADD_INTERFACE (Break_align_interface, "break-alignment-interface",
               "The object that performs break aligment. See @ref{break-aligned-interface}.",
               "positioning-done break-align-orders");
 
-
-