Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index ee1e8868e909dd5a66b02cd6966b4f23046eacce..589dd0dbecf9cb1e2739161b2dbbab691280a9df 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -11,16 +11,17 @@
 #include <cmath>               // ceil.
 using namespace std;
 
-#include "warn.hh"
+#include "directional-element-interface.hh"
+#include "duration.hh"
+#include "international.hh"
 #include "note-column.hh"
-#include "stem.hh"
-#include "rhythmic-head.hh"
 #include "output-def.hh"
-#include "rest.hh"
 #include "pointer-group-interface.hh"
+#include "rest.hh"
+#include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
-#include "duration.hh"
-#include "directional-element-interface.hh"
+#include "stem.hh"
+#include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);
 SCM
@@ -91,10 +92,10 @@ Rest_collision::calc_positioning_done (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "elements", elts);
 
-  Link_array<Grob> rests;
-  Link_array<Grob> notes;
+  vector<Grob*> rests;
+  vector<Grob*> notes;
 
-  for (int i = 0; i < elts.size (); i++)
+  for (vsize i = 0; i < elts.size (); i++)
     {
       Grob *e = elts[i];
       if (unsmob_grob (e->get_object ("rest")))
@@ -106,10 +107,10 @@ Rest_collision::calc_positioning_done (SCM smob)
          if (st && unsmob_grob (st->get_object ("beam")))
            continue;
 
-         rests.push (e);
+         rests.push_back (e);
        }
       else
-       notes.push (e);
+       notes.push_back (e);
     }
 
   /*
@@ -136,21 +137,21 @@ Rest_collision::calc_positioning_done (SCM smob)
        This is incomplete: in case of an uneven number of rests, the
        center one should be centered on the staff.
       */
-      Drul_array<Link_array<Grob> > ordered_rests;
-      for (int i = 0; i < rests.size (); i++)
+      Drul_array<vector<Grob*> > ordered_rests;
+      for (vsize i = 0; i < rests.size (); i++)
        {
          Grob *r = Note_column::get_rest (rests[i]);
 
          Direction d = get_grob_direction (r);
          if (d)
-           ordered_rests[d].push (rests[i]);
+           ordered_rests[d].push_back (rests[i]);
          else
            rests[d]->warning (_ ("can't resolve rest collision: rest direction not set"));
        }
 
       Direction d = LEFT;
       do
-       ordered_rests[d].sort (Note_column::shift_compare);
+       vector_sort (ordered_rests[d], Note_column::shift_compare);
       while (flip (&d) != LEFT)
        ;
 
@@ -170,23 +171,23 @@ Rest_collision::calc_positioning_done (SCM smob)
       common = common_refpoint_of_array (ordered_rests[UP], common, Y_AXIS);
 
       Real diff
-       = (ordered_rests[DOWN].top ()->extent (common, Y_AXIS)[UP]
-          - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) / staff_space;
+       = (ordered_rests[DOWN].back ()->extent (common, Y_AXIS)[UP]
+          - ordered_rests[UP].back ()->extent (common, Y_AXIS)[DOWN]) / staff_space;
 
       if (diff > 0)
        {
          int amount_down = (int) ceil (diff / 2);
          diff -= amount_down;
-         Note_column::translate_rests (ordered_rests[DOWN].top (),
+         Note_column::translate_rests (ordered_rests[DOWN].back (),
                                        -2 * amount_down);
          if (diff > 0)
-           Note_column::translate_rests (ordered_rests[UP].top (),
+           Note_column::translate_rests (ordered_rests[UP].back (),
                                          2 * int (ceil (diff)));
        }
 
       do
        {
-         for (int i = ordered_rests[d].size () -1; i-- > 0;)
+         for (vsize i = ordered_rests[d].size () -1; i-- > 0;)
            {
              Real last_y = ordered_rests[d][i + 1]->extent (common, Y_AXIS)[d];
              Real y = ordered_rests[d][i]->extent (common, Y_AXIS)[-d];
@@ -208,7 +209,7 @@ Rest_collision::calc_positioning_done (SCM smob)
       Grob *rcol = 0;
       Direction dir = CENTER;
 
-      for (int i = rests.size (); !rcol && i--;)
+      for (vsize i = rests.size (); !rcol && i--;)
        if (Note_column::dir (rests[i]))
          {
            dir = Note_column::dir (rests[i]);
@@ -228,7 +229,7 @@ Rest_collision::calc_positioning_done (SCM smob)
       Real minimum_dist = robust_scm2double (me->get_property ("minimum-distance"), 1.0) * staff_space;
 
       Interval notedim;
-      for (int i = 0; i < notes.size (); i++)
+      for (vsize i = 0; i < notes.size (); i++)
        notedim.unite (notes[i]->extent (common, Y_AXIS));
 
       Real dist