From: fred <fred> Date: Tue, 26 Mar 2002 22:27:31 +0000 (+0000) Subject: lilypond-1.2.13 X-Git-Tag: release/1.5.59~2117 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9bc2ebf57c6fc47bedcb9ae722fcb73da3fd0c9f;p=lilypond.git lilypond-1.2.13 --- diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 5de1ecf8cb..0d7cbfdddf 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -16,7 +16,6 @@ #include "paper-score.hh" #include "paper-column.hh" #include "scope.hh" -#include "word-wrap.hh" #include "gourlay-breaking.hh" #include "paper-stream.hh" #include "paper-outputter.hh" @@ -118,27 +117,12 @@ Paper_score::calc_breaking () { Break_algorithm *algorithm_p=0; Array<Column_x_positions> sol; - bool try_wrap = !paper_l_->get_var ("castingalgorithm"); - if (!try_wrap) - { - algorithm_p = new Gourlay_breaking ; - algorithm_p->set_pscore (this); - sol = algorithm_p->solve (); - delete algorithm_p; - if (! sol.size ()) - { - warning (_ ("Can't solve this casting problem exactly; reverting to Word_wrap")); - try_wrap = true; - } - } - if (try_wrap) - { - algorithm_p = new Word_wrap; - algorithm_p->set_pscore (this); - sol = algorithm_p->solve (); - delete algorithm_p; - } + algorithm_p = new Gourlay_breaking ; + algorithm_p->set_pscore (this); + sol = algorithm_p->solve (); + delete algorithm_p; + return sol; }