X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=7ae0854e984c3283799b59754c3b2a2687ffdafb;hb=4bf1bf0e2050fd48c20836ae0f5501da7cc73c65;hp=047e880f3c1fc085ce2899f1efd65c03fc842b51;hpb=2d6c005d7e1f82fee33060ea18d4d32ec626ddbc;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 047e880f3c..7ae0854e98 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2006 Han-Wen Nienhuys + (c) 1996--2009 Han-Wen Nienhuys */ #include "paper-score.hh" @@ -62,7 +62,7 @@ Paper_score::typeset_system (System *system) vector Paper_score::find_break_indices () const { - vector all = root_system ()->columns (); + vector all = root_system ()->used_columns (); vector retval; for (vsize i = 0; i < all.size (); i++) @@ -106,9 +106,9 @@ Paper_score::calc_breaking () int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0); if (system_count) - algorithm.resize (system_count); + return algorithm.solve (0, VPOS, system_count); - return algorithm.solve (); + return algorithm.best_solution (0, VPOS); } void @@ -121,14 +121,6 @@ Paper_score::process () message (_ ("Preprocessing graphical objects...")); - /* FIXME: Check out why we need this - removing gives assertion failures - down the road. - - doubly, also done in Score_engraver */ - vector pc (system_->columns ()); - pc[0]->set_property ("line-break-permission", ly_symbol2scm ("allow")); - pc.back ()->set_property ("line-break-permission", ly_symbol2scm ("allow")); - system_->pre_processing (); } @@ -152,8 +144,15 @@ Paper_score::get_paper_systems () vector breaking = calc_breaking (); system_->break_into_pieces (breaking); message (_ ("Drawing systems...") + " "); + system_->do_break_substitution_and_fixup_refpoints (); paper_systems_ = system_->get_paper_systems (); } return paper_systems_; } + +Paper_score * +unsmob_paper_score (SCM x) +{ + return dynamic_cast (unsmob_music_output (x)); +}