Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index 3aff11a20e7edcd19f9e48f429e10f45d46dea6a..e5c0765d4fc13f952e225a79160236bc9bab67c4 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -45,25 +45,39 @@ Break_align_interface::self_align_callback (SCM smob)
 
   So we return the correct order as an array.
 */
-Link_array<Grob>
-Break_align_interface::ordered_elements (Grob *grob)
+SCM
+Break_align_interface::break_align_order (Item *me)
 {
-  Item *me = dynamic_cast<Item *> (grob);
-  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 elts;
+    return SCM_BOOL_F;
 
-  Link_array<Grob> writable_elts (elts);
   SCM order = scm_vector_ref (order_vec,
                              scm_from_int (me->break_status_dir () + 1));
 
-  /*
+
+  return order;
+}
+
+  
+vector<Grob*>
+Break_align_interface::ordered_elements (Grob *grob)
+{
+  Item *me = dynamic_cast<Item *> (grob);
+  extract_grob_set (me, "elements", elts);
+
+
+  SCM order = break_align_order (me);
+
+  if (order == SCM_BOOL_F)
+    return elts;
+  
+  vector<Grob*> writable_elts (elts);
+   /*
     Copy in order specified in BREAK-ALIGN-ORDER.
   */
-  Link_array<Grob> new_elts;
+  vector<Grob*> new_elts;
   for (; scm_is_pair (order); order = scm_cdr (order))
     {
       SCM sym = scm_car (order);
@@ -74,7 +88,7 @@ Break_align_interface::ordered_elements (Grob *grob)
          if (g && sym == g->get_property ("break-align-symbol"))
            {
              new_elts.push_back (g);
-             writable_elts.del (i);
+             writable_elts.erase (writable_elts.begin () + i);
            }
        }
     }
@@ -95,8 +109,8 @@ Break_align_interface::calc_positioning_done (SCM smob)
   Grob *grob = unsmob_grob (smob);  
   Item *me = dynamic_cast<Item *> (grob);
 
-  Link_array<Grob> elems = ordered_elements (me);
-  std::vector<Interval> extents;
+  vector<Grob*> elems = ordered_elements (me);
+  vector<Interval> extents;
 
   int last_nonempty = -1;
   for (vsize i = 0; i < elems.size (); i++)
@@ -111,7 +125,7 @@ Break_align_interface::calc_positioning_done (SCM smob)
   while (idx < extents.size () && extents[idx].is_empty ())
     idx++;
 
-  std::vector<Real> offsets;
+  vector<Real> offsets;
   offsets.resize (elems.size ());
   for (vsize i = 0; i < offsets.size ();i++)
     offsets[i] = 0.0;
@@ -143,8 +157,8 @@ Break_align_interface::calc_positioning_done (SCM smob)
          Grob *elt = elts[i];
 
          if (edge_idx == VPOS
-             && elt->get_property ("break-align-symbol")
-             == ly_symbol2scm ("left-edge"))
+             && (elt->get_property ("break-align-symbol")
+                 == ly_symbol2scm ("left-edge")))
            edge_idx = idx;
 
          SCM l = elt->get_property ("space-alist");
@@ -183,11 +197,11 @@ Break_align_interface::calc_positioning_done (SCM smob)
       bool entry_found = scm_is_pair (entry);
       if (!entry_found)
        {
-         std::string sym_string;
+         string sym_string;
          if (scm_is_symbol (rsym))
            sym_string = ly_symbol2string (rsym);
 
-         std::string orig_string;
+         string orig_string;
          if (unsmob_grob (l->get_property ("cause")))
            orig_string = unsmob_grob (l->get_property ("cause"))->name ();
 
@@ -217,7 +231,11 @@ Break_align_interface::calc_positioning_done (SCM smob)
            offsets[next_idx] = max (extents[idx][RIGHT], distance);
        }
       else
-       extra_right_space = distance;
+       {
+         extra_right_space = distance;
+         if (idx < offsets.size() - 1)
+           offsets[idx+1] = extents[idx][RIGHT] + distance;
+       }
 
       idx = next_idx;
     }
@@ -288,3 +306,55 @@ ADD_INTERFACE (Break_align_interface, "break-alignment-interface",
               "positioning-done "
               "break-align-orders");
 
+
+MAKE_SCHEME_CALLBACK(Break_alignment_align_interface, self_align_callback, 1)
+SCM
+Break_alignment_align_interface::self_align_callback (SCM grob)
+{
+  Grob *me = unsmob_grob (grob);
+  Item *alignment = dynamic_cast<Item*> (me->get_parent (X_AXIS));
+  if (!Break_align_interface::has_interface (alignment))
+    return scm_from_int (0);
+
+  SCM my_align = me->get_property ("break-align-symbol");
+  SCM order = Break_align_interface::break_align_order (alignment);
+
+  vector<Grob*> elements = Break_align_interface::ordered_elements (alignment);
+  if (elements.size () == 0)
+    return scm_from_int (0);
+  
+  int last_idx_found = -1;
+  vsize i = 0;
+  for (SCM s = order; scm_is_pair (order); s = scm_cdr (s))  
+    {
+      if (i < elements.size ()
+         && elements[i]->get_property ("break-align-symbol") == scm_car (s))
+       {
+         last_idx_found = i;
+         i ++;
+       }
+
+      if (scm_car (s) == my_align)
+       break ;
+    }  
+
+  Direction which_edge = LEFT;
+  if (vsize (last_idx_found + 1) < elements.size())
+    last_idx_found ++;
+  else
+    which_edge = RIGHT;
+  
+  Grob *common = me->common_refpoint (elements[last_idx_found], X_AXIS);
+
+  return scm_from_double (robust_relative_extent (elements[last_idx_found], common, X_AXIS)[which_edge]
+                         - me->relative_coordinate (common, X_AXIS));
+}
+
+ADD_INTERFACE (Break_alignment_align_interface, "break-alignment-align-interface",
+              "Object that is aligned on a break aligment. ",
+
+              /* properties */
+              "break-align-symbol "
+              )
+
+