lilypond-0.0.26

diff --git a/src/beam.cc b/src/beam.cc
index c36ca67436933b5083eefdf98907dd6fbed6fa0a..abf94d157b284e8acc8e62fae4e74209fb1e4320 100644 (file)
--- a/src/beam.cc
+++ b/src/beam.cc
@@ -11,6 +11,8 @@
 #include "lookup.hh"
 #include "grouping.hh"
 
+NAME_METHOD(Beam);
+
 struct Stem_info {
     Real x;
     Real idealy;
@@ -60,7 +62,7 @@ void
 Beam::add(Stem*s)
 {
     stems.bottom().add(s);
-    s->dependencies.add(this);
+    s->dependencies.push(this);
     s->print_flag = false;
 }
 
@@ -89,13 +91,13 @@ Beam::solve_slope()
     for (iter_top(stems,i); i.ok(); i++) {
        i->set_default_extents();
        Stem_info info(i);
-       sinfo.add(info);
+       sinfo.push(info);
     }
     Real leftx = sinfo[0].x;
     Least_squares l;
     for (int i=0; i < sinfo.size(); i++) {
        sinfo[i].x -= leftx;
-       l.input.add(Offset(sinfo[i].x, sinfo[i].idealy));
+       l.input.push(Offset(sinfo[i].x, sinfo[i].idealy));
     }
 
     l.minimise(slope, left_pos);
@@ -152,12 +154,12 @@ Beam::set_grouping(Rhythmic_grouping def, Rhythmic_grouping cur)
        for (; s.ok(); s++) {
            int f = intlog2(abs(s->flag))-2;
            assert(f>0);
-           flags.add(f);
+           flags.push(f);
        }
        int fi =0;
        b= cur.generate_beams(flags, fi);
        b.insert(0,0);
-       b.add(0);
+       b.push(0);
        assert(stems.size() == b.size()/2);
     }
 
@@ -276,12 +278,11 @@ Beam::brew_molecule_p() const return out;
 }
 
 void
-Beam::print()const
+Beam::do_print()const
 {
 #ifndef NPRINT
-    mtor << "{ slope " <<slope << "left ypos " << left_pos;
+    mtor << "slope " <<slope << "left ypos " << left_pos;
     Spanner::print();
-    mtor << "}\n";
 #endif
 }
 

diff --git a/src/linespace.cc b/src/linespace.cc
index 8ce517a7a276f17b696f22cb5c89dcf65420c49a..b70e2a26f5683472f03878c6f12dda46d2d4cef2 100644 (file)
--- a/src/linespace.cc
+++ b/src/linespace.cc
@@ -42,7 +42,7 @@ Spacing_problem::OK() const
     }
     for (int i = 0; i < cols.size(); i++)
        if (cols[i].fixed())
-           fixed.add(i);
+           fixed.push(i);
     for (int i = 0; i < cols.size(); i++) {
        bool c=false;
        for (int j =0; j<fixed.size(); j++)
@@ -186,7 +186,7 @@ Spacing_problem::solve() const
        
 
     Array<Real> posns(sol);
-    posns.add(lp.eval(sol));
+    posns.push(lp.eval(sol));
     return posns;
 }
 
@@ -197,7 +197,7 @@ void
 Spacing_problem::add_column(const PCol *col, bool fixed, Real fixpos)
 {
     Colinfo c(col,(fixed)? &fixpos :  0);
-    cols.add(c);
+    cols.push(c);
 }
 
 void
@@ -209,7 +209,7 @@ Spacing_problem::add_ideal(const Idealspacing *i)
     if (!contains(l) || !contains(r)) {
        return;
     }
-    ideals.add(i);
+    ideals.push(i);
 }
 
 void