* lily/lookup.cc (triangle): rewrite, obviating symmetric_x_triangle().

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index b828248d23cdfb8c81423b315c0672d5635cea09..bcd62a73fc380cffbcb4e6e2ccb47ef0441df9cb 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -17,7 +17,7 @@
 #include "lily-guile.hh"
 #include "break-align-interface.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "paper-column.hh"
 #include "group-interface.hh"
 #include "align-interface.hh"
@@ -28,7 +28,7 @@ SCM
 Break_align_interface::alignment_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
 
   assert (a == X_AXIS);
   Grob *par = me->get_parent (a);
@@ -38,7 +38,7 @@ Break_align_interface::alignment_callback (SCM element_smob, SCM axis)
       Break_align_interface::do_alignment (par);
     }
     
-  return gh_double2scm (0);
+  return scm_make_real (0);
 }
 
 MAKE_SCHEME_CALLBACK (Break_align_interface,self_align_callback,2);
@@ -46,7 +46,7 @@ SCM
 Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == X_AXIS);
   
   Item* item = dynamic_cast<Item*> (me);
@@ -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 (!ly_c_vector_p (order_vec)
+      || ly_vector_length (order_vec) < 3)
+    return  Pointer_group_interface__extract_grobs (me, (Grob*)0,
+                                                   "elements");
+  SCM order = scm_vector_ref (order_vec,
+                             scm_int2num (me->break_status_dir() + 1));
+
+
+  /*
+    Copy in order specified in BREAK-ALIGN-ORDER.
+  */
+  Link_array<Grob> new_elts;
+  for (; scm_is_pair (order); order = scm_cdr (order))
+    {
+      SCM sym = scm_car (order);
+      
+      for (SCM s =elts; scm_is_pair (s); s = scm_cdr (s))
+       {
+         Grob *g = unsmob_grob (scm_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; 
@@ -117,10 +160,10 @@ Break_align_interface::do_alignment (Grob *me)
       /*
        Find the first grob with a space-alist entry.
        */
-      for (SCM s= l->get_property ("elements");
-          gh_pair_p (s) ; s = gh_cdr (s))
+      for (SCM s = l->get_property ("elements");
+          scm_is_pair (s) ; s = scm_cdr (s))
          {
-           Grob *elt = unsmob_grob (gh_car (s));
+           Grob *elt = unsmob_grob (scm_car (s));
 
            if (edge_idx < 0
                && elt->get_property ("break-align-symbol")
@@ -128,7 +171,7 @@ Break_align_interface::do_alignment (Grob *me)
              edge_idx = idx;
            
            SCM l =elt->get_property ("space-alist");
-           if (gh_pair_p (l))
+           if (scm_is_pair (l))
              {
                alist= l;
                break;
@@ -143,9 +186,9 @@ Break_align_interface::do_alignment (Grob *me)
        reason.
       */
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
-          !gh_symbol_p (rsym) && gh_pair_p (s); s = gh_cdr (s))
+          !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
        {
-         Grob * elt =unsmob_grob (gh_car (s));
+         Grob * elt =unsmob_grob (scm_car (s));
 
          rsym = elt->get_property ("break-align-symbol");
        }
@@ -154,14 +197,14 @@ Break_align_interface::do_alignment (Grob *me)
        edge_idx = next_idx;
 
       SCM entry = SCM_EOL;
-      if (gh_symbol_p (rsym))
+      if (scm_is_symbol (rsym))
        entry = scm_assq (rsym, alist);
 
-      bool entry_found = gh_pair_p (entry);
+      bool entry_found = scm_is_pair (entry);
       if (!entry_found)
        {
          String sym_string;
-         if (gh_symbol_p (rsym))
+         if (scm_is_symbol (rsym))
            sym_string = ly_symbol2string (rsym);
 
          String orig_string ;
@@ -178,10 +221,10 @@ Break_align_interface::do_alignment (Grob *me)
       
       if (entry_found)
        {
-         entry = gh_cdr (entry);
+         entry = scm_cdr (entry);
          
-         distance = gh_scm2double (gh_cdr (entry));
-         type = gh_car (entry) ;
+         distance = scm_to_double (scm_cdr (entry));
+         type = scm_car (entry) ;
        }
 
       if (r)
@@ -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;
     }
@@ -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");