*** empty log message ***

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index 6fcbfa596807d4513431c1eb1ce8e0cb39d9f164..3e5f9d38b5ea39bebf027465ea02176aac9896a9 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -62,6 +62,49 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
   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);
+  SCM elts = me->get_property ("elements");
+  SCM order_vec = me->get_property ("break-align-orders");
+  if (!gh_vector_p (order_vec)
+      || gh_vector_length (order_vec) < 3)
+    return  Pointer_group_interface__extract_grobs (me, (Grob*)0,
+                                                   "elements");
+  SCM order = scm_vector_ref (order_vec,
+                             gh_int2scm (me->break_status_dir() + 1));
+
+
+  /*
+    Copy in order specified in BREAK-ALIGN-ORDER.
+  */
+  Link_array<Grob> new_elts;
+  for (; gh_pair_p (order); order = ly_cdr (order))
+    {
+      SCM sym = gh_car (order);
+      
+      for (SCM s =elts; gh_pair_p (s); s = gh_cdr (s))
+       {
+         Grob *g = unsmob_grob (gh_car (s));
+         if (g && sym == g->get_property ("break-align-symbol"))
+           {
+             new_elts.push (g);
+             elts = scm_delq (g->self_scm (), elts); 
+           }
+       }
+    }
+  return new_elts;
+}
+
 void
 Break_align_interface::add_element (Grob*me, Grob *toadd)
 {
@@ -69,12 +112,12 @@ Break_align_interface::add_element (Grob*me, Grob *toadd)
 }
 
 void
-Break_align_interface::do_alignment (Grob *me)
+Break_align_interface::do_alignment (Grob *grob)
 {
-  Item * item = dynamic_cast<Item*> (me);
-  Link_array<Grob> elems
-    = Pointer_group_interface__extract_grobs (me, (Grob*)0,
-                                                "elements");
+  Item * me = dynamic_cast<Item*> (grob);
+
+  
+  Link_array<Grob> elems = ordered_elements (me);
   Array<Interval> extents;
 
   int last_nonempty = -1; 
@@ -91,24 +134,24 @@ Break_align_interface::do_alignment (Grob *me)
     idx++;
   
   Array<Real> offsets;
-  offsets.set_size (elems.size());
-  for (int i= 0; i < offsets.size();i ++)
+  offsets.set_size (elems.size ());
+  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())
+  while (idx < elems.size ())
     {
       int next_idx = idx+1;
-      while (next_idx < elems.size() &&
+      while (next_idx < elems.size () &&
             extents[next_idx].is_empty () )
        next_idx++;
       
       Grob *l = elems[idx];
       Grob *r = 0;
 
-      if (next_idx < elems.size())
+      if (next_idx < elems.size ())
        r = elems[next_idx];
 
       SCM alist = SCM_EOL;
@@ -124,11 +167,11 @@ Break_align_interface::do_alignment (Grob *me)
 
            if (edge_idx < 0
                && elt->get_property ("break-align-symbol")
-               == ly_symbol2scm( "left-edge"))
+               == ly_symbol2scm ( "left-edge"))
              edge_idx = idx;
            
            SCM l =elt->get_property ("space-alist");
-           if (gh_pair_p(l))
+           if (gh_pair_p (l))
              {
                alist= l;
                break;
@@ -145,12 +188,12 @@ Break_align_interface::do_alignment (Grob *me)
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
           !gh_symbol_p (rsym) && gh_pair_p (s); s = gh_cdr (s))
        {
-         Grob * elt =unsmob_grob(gh_car (s));
+         Grob * elt =unsmob_grob (gh_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;
@@ -161,14 +204,14 @@ Break_align_interface::do_alignment (Grob *me)
       if (!entry_found)
        {
          String sym_string;
-         if(gh_symbol_p (rsym))
+         if (gh_symbol_p (rsym))
            sym_string = ly_symbol2string (rsym);
 
          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'",
+         programming_error (_f ("No spacing entry from %s to `%s'",
                                orig_string.to_str0 (),
                                sym_string.to_str0 ()));
        }
@@ -190,7 +233,7 @@ Break_align_interface::do_alignment (Grob *me)
            offsets[next_idx] = extents[idx][RIGHT] + distance
              - extents[next_idx][LEFT];
          /* should probably junk minimum-space */
-         else if (type == ly_symbol2scm("minimum-space"))
+         else if (type == ly_symbol2scm ("minimum-space"))
            offsets[next_idx] = extents[idx][RIGHT] >? distance;
        }
       else
@@ -205,7 +248,7 @@ Break_align_interface::do_alignment (Grob *me)
   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)
@@ -214,7 +257,7 @@ Break_align_interface::do_alignment (Grob *me)
     }
 
 
-  if (item->break_status_dir () == LEFT)
+  if (me->break_status_dir () == LEFT)
     {
       alignment_off = - total_extent[RIGHT] - extra_right_space;
     }
@@ -222,7 +265,7 @@ Break_align_interface::do_alignment (Grob *me)
     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);
@@ -257,7 +300,7 @@ ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface",
 
 ADD_INTERFACE (Break_align_interface, "break-alignment-interface",
               "The object that performs break aligment. See @ref{break-aligned-interface}.",
-              "positioning-done");
+              "positioning-done break-align-orders");