From d63012b877b9c0297efaf29cedc3c7207a001f72 Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 19 Dec 1996 00:25:39 +0000 Subject: [PATCH] lilypond-0.0.18 --- src/break.cc | 10 +++++----- src/pscore.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/break.cc b/src/break.cc index 6cb1d3303b..ff86e848af 100644 --- a/src/break.cc +++ b/src/break.cc @@ -10,7 +10,7 @@ // construct an appropriate Spacing_problem and solve it. svec -PScore::solve_line(svec curline) const +PScore::solve_line(svec< PCol *> curline) const { Spacing_problem sp; @@ -28,7 +28,7 @@ PScore::solve_line(svec curline) const } bool -PScore::feasible(svec curline) const +PScore::feasible(svec< PCol *> curline) const { Real l =0; for (int i=0; i < curline.sz(); i++) @@ -49,14 +49,14 @@ PScore::problem_OK() const } struct Col_configuration { - svec line; + svec< PCol*> line; svec config; Real energy; Col_configuration() { energy = INFTY; } - void add(const PCol*c) { line.add(c);} + void add( PCol*c) { line.add(c);} void setsol(svec sol) { config = sol; energy = config.last(); @@ -85,7 +85,7 @@ PScore::calc_breaking() problem_OK(); PCursor curcol(cols); - svec breakpoints(find_breaks()); + svec breakpoints(find_breaks()); assert(breakpoints.sz()>=2); for (int i=0 ; i < breakpoints.sz() -1; ) { Col_configuration minimum; diff --git a/src/pscore.cc b/src/pscore.cc index fcd03ca55a..a34d86b0ba 100644 --- a/src/pscore.cc +++ b/src/pscore.cc @@ -77,7 +77,7 @@ PScore::typeset_spanner(Spanner*sp, PStaff*ps) void -PScore::add_line(svec curline, svec config) +PScore::add_line(svec< PCol *> curline, svec config) { Line_of_score *p = new Line_of_score(curline,this); lines.bottom().add(p); @@ -105,7 +105,7 @@ PScore::get_spacing(PCol*l, PCol*r) int -PScore::compare_pcols(const PCol*a, const PCol*b)const +PScore::compare_pcols(PCol*a, PCol*b)const { PCursor ac(find_col(a)); PCursor bc(find_col(b)); @@ -116,10 +116,10 @@ PScore::compare_pcols(const PCol*a, const PCol*b)const /* return all breakable columns */ -svec +svec< PCol *> PScore::find_breaks() const { - svec retval; + svec< PCol *> retval; for (PCursor c(cols); c.ok(); c++) if (c->breakable()) retval.add(c); @@ -217,7 +217,7 @@ PScore::postprocess() } PCursor -PScore::find_col(const PCol *c)const +PScore::find_col(PCol *c)const { PCol*what = (PCol*)c; if (what->daddy ) -- 2.39.5