Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / spacing-determine-loose-columns.cc

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 616cabe7d07dd92873d7d428918ea67f6c16e31c..34f4c97214c50bab299e42aa6f13717abef1d32d 100644 (file)
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -37,7 +37,7 @@ is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
     return true;
 
   if (Paper_column::is_musical (c)
-      || Item::is_breakable (c))
+      || Paper_column::is_breakable (c))
     return false;
 
   extract_grob_set (c, "right-neighbors", rns);
@@ -64,7 +64,7 @@ is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
     such a borderline case.)
 
   */
-  if (lns.is_empty () || rns.is_empty ())
+  if (lns.empty () || rns.empty ())
     return false;
 
   Item *l_neighbor = dynamic_cast<Item *> (lns[0]);
@@ -87,8 +87,8 @@ is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
     some cases (two isolated, consecutive clef changes) won't be
     nicely folded, but hey, then don't do that.
   */
-  if (! ((Paper_column::is_musical (l_neighbor) || Item::is_breakable (l_neighbor))
-        && (Paper_column::is_musical (r_neighbor) || Item::is_breakable (r_neighbor))))
+  if (! ((Paper_column::is_musical (l_neighbor) || Paper_column::is_breakable (l_neighbor))
+        && (Paper_column::is_musical (r_neighbor) || Paper_column::is_breakable (r_neighbor))))
     return false;
 
   /*
@@ -98,13 +98,13 @@ is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
     in any case, we don't want to move bar lines.
   */
   extract_grob_set (c, "elements", elts);
-  for (int i = elts.size (); i--;)
+  for (vsize i = elts.size (); i--;)
     {
       Grob *g = elts[i];
       if (g && Break_align_interface::has_interface (g))
        {
          extract_grob_set (g, "elements", gelts);
-         for (int j = gelts.size (); j--;)
+         for (vsize j = gelts.size (); j--;)
            {
              Grob *h = gelts[j];
 
@@ -126,25 +126,25 @@ is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
   between.
 */
 void
-Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols,
+Spacing_spanner::prune_loose_columns (Grob *me, vector<Grob*> *cols,
                                      Spacing_options const *options)
 {
-  Link_array<Grob> newcols;
+  vector<Grob*> newcols;
 
-  for (int i = 0; i < cols->size (); i++)
+  for (vsize i = 0; i < cols->size (); i++)
     {
-      Grob *c = cols->elem (i);
+      Grob *c = cols->at (i);
 
       bool loose = (i > 0 && i < cols->size () - 1)
-       && is_loose_column (cols->elem (i - 1), c, cols->elem (i + 1), options);
+       && is_loose_column (cols->at (i - 1), c, cols->at (i + 1), options);
 
       if (loose)
        {
          extract_grob_set (c, "right-neighbors", rns_arr);
          extract_grob_set (c, "left-neighbors", lns_arr);
 
-         SCM lns = lns_arr.size () ? lns_arr.top ()->self_scm () : SCM_BOOL_F;
-         SCM rns = rns_arr.size () ? rns_arr.top ()->self_scm () : SCM_BOOL_F;
+         SCM lns = lns_arr.size () ? lns_arr.back ()->self_scm () : SCM_BOOL_F;
+         SCM rns = rns_arr.size () ? rns_arr.back ()->self_scm () : SCM_BOOL_F;
 
          /*
            Either object can be non existent, if the score ends
@@ -159,8 +159,8 @@ Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols,
            Set distance constraints for loose columns
          */
          Drul_array<Grob *> next_door;
-         next_door[LEFT] = cols->elem (i - 1);
-         next_door[RIGHT] = cols->elem (i + 1);
+         next_door[LEFT] = cols->at (i - 1);
+         next_door[RIGHT] = cols->at (i + 1);
          Direction d = LEFT;
          Drul_array<Real> dists (0, 0);
 
@@ -171,7 +171,7 @@ Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols,
              Item *rc = dynamic_cast<Item *> (d == LEFT ? c : next_door[RIGHT]);
 
              extract_grob_set (lc, "spacing-wishes", wishes);
-             for (int k = wishes.size (); k--;)
+             for (vsize k = wishes.size (); k--;)
                {
                  Grob *sp = wishes[k];
                  if (Note_spacing::left_column (sp) != lc
@@ -212,13 +212,13 @@ Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols,
 
          Rod r;
          r.distance_ = dists[LEFT] + dists[RIGHT];
-         r.item_drul_[LEFT] = dynamic_cast<Item *> (cols->elem (i - 1));
-         r.item_drul_[RIGHT] = dynamic_cast<Item *> (cols->elem (i + 1));
+         r.item_drul_[LEFT] = dynamic_cast<Item *> (cols->at (i - 1));
+         r.item_drul_[RIGHT] = dynamic_cast<Item *> (cols->at (i + 1));
 
          r.add_to_cols ();
        }
       else
-       newcols.push (c);
+       newcols.push_back (c);
     }
 
   *cols = newcols;
@@ -228,16 +228,16 @@ Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols,
   Set neighboring columns determined by the spacing-wishes grob property.
 */
 void
-Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> const &cols)
+Spacing_spanner::set_explicit_neighbor_columns (vector<Grob*> const &cols)
 {
-  for (int i = 0; i < cols.size (); i++)
+  for (vsize i = 0; i < cols.size (); i++)
     {
       SCM right_neighbors = Grob_array::make_array ();
       Grob_array *rn_arr = unsmob_grob_array (right_neighbors);
       int min_rank = 100000;   // inf.
 
       extract_grob_set (cols[i], "spacing-wishes", wishes);
-      for (int k = wishes.size (); k--;)
+      for (vsize k = wishes.size (); k--;)
        {
          Item *wish = dynamic_cast<Item *> (wishes[k]);
 
@@ -272,7 +272,7 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> const &cols)
          extract_grob_set (rc, "left-neighbors", lns_arr);
          if (lns_arr.size ())
            {
-             Item *it = dynamic_cast<Item *> (lns_arr.top ());
+             Item *it = dynamic_cast<Item *> (lns_arr.back ());
              maxrank = Paper_column::get_rank (it->get_column ());
            }
 
@@ -300,12 +300,12 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> const &cols)
   yet. Only do breakable non-musical columns, and musical columns.
 */
 void
-Spacing_spanner::set_implicit_neighbor_columns (Link_array<Grob> const &cols)
+Spacing_spanner::set_implicit_neighbor_columns (vector<Grob*> const &cols)
 {
-  for (int i = 0; i < cols.size (); i++)
+  for (vsize i = 0; i < cols.size (); i++)
     {
       Item *it = dynamic_cast<Item *> (cols[i]);
-      if (!Item::is_breakable (it) && !Paper_column::is_musical (it))
+      if (!Paper_column::is_breakable (it) && !Paper_column::is_musical (it))
        continue;
 
       // it->breakable || it->musical
@@ -314,7 +314,7 @@ Spacing_spanner::set_implicit_neighbor_columns (Link_array<Grob> const &cols)
        sloppy with typing left/right-neighbors should take list, but paper-column found instead.
       */
       extract_grob_set (cols[i], "left-neighbors", lns);
-      if (lns.is_empty () && i)
+      if (lns.empty () && i)
        {
          SCM ga_scm = Grob_array::make_array ();
          Grob_array *ga = unsmob_grob_array (ga_scm);
@@ -322,7 +322,7 @@ Spacing_spanner::set_implicit_neighbor_columns (Link_array<Grob> const &cols)
          cols[i]->set_object ("left-neighbors", ga_scm);
        }
       extract_grob_set (cols[i], "right-neighbors", rns);
-      if (rns.is_empty () && i < cols.size () - 1)
+      if (rns.empty () && i < cols.size () - 1)
        {
          SCM ga_scm = Grob_array::make_array ();
          Grob_array *ga = unsmob_grob_array (ga_scm);