Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index b9335706d0fdc7ec9e05b0e7b282fed10925c905..c315e4ec32258ff19eec3acea76b8ed89f8c7738 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -13,6 +13,7 @@
 #include "pointer-group-interface.hh"
 #include "hara-kiri-group-spanner.hh"
 #include "grob-array.hh"
+#include "international.hh"
 
 /*
   TODO: for vertical spacing, should also include a rod & spring
@@ -27,7 +28,7 @@ Align_interface::calc_positioning_done (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   SCM axis = scm_car (me->get_property ("axes"));
-  Axis ax = (Axis)scm_to_int (axis);
+  Axis ax = Axis (scm_to_int (axis));
 
   SCM force = me->get_property ("forced-distance");
   if (scm_is_number (force))
@@ -49,12 +50,13 @@ Align_interface::stretch_after_break (SCM grob)
 
   Spanner *me_spanner = dynamic_cast<Spanner *> (me);
   extract_grob_set (me, "elements", elems);
+
   if (me_spanner && elems.size ())
     {
       Grob *common = common_refpoint_of_array (elems, me, Y_AXIS);
 
       /* force position callbacks */
-      for (int i = 0; i < elems.size (); i++)
+      for (vsize i = 0; i < elems.size (); i++)
        elems[i]->relative_coordinate (common, Y_AXIS);
 
       SCM details =  me_spanner->get_bound (LEFT)->get_property ("line-break-system-details");
@@ -68,7 +70,7 @@ Align_interface::stretch_after_break (SCM grob)
       Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"),
                                               DOWN);
       Real delta  = extra_space / elems.size() * stacking_dir;
-      for (int i = 0; i < elems.size (); i++)
+      for (vsize i = 0; i < elems.size (); i++)
        elems[i]->translate_axis (i * delta, Y_AXIS);
     }
   
@@ -88,15 +90,15 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a)
 
   extract_grob_set (me, "elements", elem_source);
 
-  Link_array<Grob> elems (elem_source); // writable..
+  vector<Grob*> elems (elem_source); // writable..
 
   Real where_f = 0;
 
   Interval v;
   v.set_empty ();
-  Array<Real> translates;
+  vector<Real> translates;
 
-  for (int j = elems.size (); j--;)
+  for (vsize j = elems.size (); j--;)
     {
       /*
        This is not very elegant, in that we need special support for
@@ -110,20 +112,20 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a)
        Hara_kiri_group_spanner::consider_suicide (elems[j]);
 
       if (!elems[j]->is_live ())
-       elems.del (j);
+       elems.erase (elems.begin () + j);
     }
 
-  for (int j = 0; j < elems.size (); j++)
+  for (vsize j = 0; j < elems.size (); j++)
     {
       where_f += stacking_dir * dy;
-      translates.push (where_f);
+      translates.push_back (where_f);
       v.unite (Interval (where_f, where_f));
     }
 
   /*
     TODO: support self-alignment-{Y, X}
   */
-  for (int i = 0; i < translates.size (); i++)
+  for (vsize i = 0; i < translates.size (); i++)
     elems[i]->translate_axis (translates[i] - v.center (), a);
 }
 
@@ -151,7 +153,14 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a)
 
   SCM line_break_details = SCM_EOL;
   if (a == Y_AXIS && me_spanner)
-    line_break_details =  me_spanner->get_bound (LEFT)->get_property ("line-break-system-details");
+    {
+      line_break_details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details");
+
+      if (!me->get_system ())
+       me->warning (_ ("vertical alignment called before line-breaking.\n"
+                       "Only do cross-staff spanners with PianoStaff."));
+
+    }
   
   Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"),
                                           DOWN);
@@ -159,19 +168,19 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a)
   Interval threshold = robust_scm2interval (me->get_property ("threshold"),
                                            Interval (0, Interval::infinity ()));
 
-  Array<Interval> dims;
-  Link_array<Grob> elems;
+  vector<Interval> dims;
+  vector<Grob*> elems;
 
   extract_grob_set (me, "elements", all_grobs);
-  for (int i = 0; i < all_grobs.size (); i++)
+  for (vsize i = 0; i < all_grobs.size (); i++)
     {
       Interval y = all_grobs[i]->extent (me, a);
       if (!y.is_empty ())
        {
          Grob *e = dynamic_cast<Grob *> (all_grobs[i]);
 
-         elems.push (e);
-         dims.push (y);
+         elems.push_back (e);
+         dims.push_back (y);
        }
     }
 
@@ -195,8 +204,8 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a)
                                   : SCM_EOL,
                                   extra_space);
   
-  Array<Real> translates;
-  for (int j = 0; j < elems.size (); j++)
+  vector<Real> translates;
+  for (vsize j = 0; j < elems.size (); j++)
     {
       Real dy = -dims[j][-stacking_dir];
       if (j)
@@ -211,13 +220,13 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a)
 
       where += stacking_dir * (dy + extra_space / elems.size ());
       total.unite (dims[j] + where);
-      translates.push (where);
+      translates.push_back (where);
     }
 
   SCM offsets_handle = scm_assq (ly_symbol2scm ("alignment-offsets"), line_break_details);
   if (scm_is_pair (offsets_handle))
     {
-      int i = 0;
+      vsize i = 0;
  
       for (SCM s = scm_cdr (offsets_handle); scm_is_pair (s) && i < translates.size (); s = scm_cdr (s), i++)
        {
@@ -232,18 +241,15 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a)
   /*
     also move the grobs that were empty, to maintain spatial order.
   */
-  Array<Real> all_translates;
+  vector<Real> all_translates;
   if (translates.size ())
     {
-      int i = 0;
-      int j = 0;
       Real w = translates[0];
-      while (j < all_grobs.size ())
+      for  (vsize i = 0, j = 0; j < all_grobs.size (); j++)
        {
          if (i < elems.size () && all_grobs[j] == elems[i])
            w = translates[i++];
-         all_translates.push (w);
-         j++;
+         all_translates.push_back (w);
        }
 
       /*
@@ -253,7 +259,7 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a)
       if (scm_is_number (align))
        center_offset = total.linear_combination (scm_to_double (align));
 
-      for (int j = 0; j < all_grobs.size (); j++)
+      for (vsize j = 0; j < all_grobs.size (); j++)
        all_grobs[j]->translate_axis (all_translates[j] - center_offset, a);
     }
 }