X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=e7a5f51247a9ac69ae1c6ffa603881255cc22c9f;hb=0dc1f8a5fe729cd646213d3fb621df96f1405460;hp=2154b40bf5a01063cc2d2d771999d3536e0c025a;hpb=352fd1005d930ced9e8631cd69f6ce439ceff512;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 2154b40bf5..e7a5f51247 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,133 +3,160 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys + (c) 1996--2006 Han-Wen Nienhuys */ -#include "main.hh" -#include "debug.hh" -#include "font-metric.hh" -#include "spanner.hh" -#include "paper-def.hh" -#include "line-of-score.hh" -#include "paper-column.hh" #include "paper-score.hh" -#include "paper-column.hh" -#include "scope.hh" -#include "gourlay-breaking.hh" -#include "paper-outputter.hh" -#include "file-results.hh" -#include "misc.hh" + #include "all-font-metrics.hh" +#include "book.hh" +#include "international.hh" +#include "main.hh" +#include "misc.hh" +#include "output-def.hh" +#include "paper-book.hh" +#include "paper-column.hh" +#include "scm-hash.hh" +#include "score.hh" +#include "stencil.hh" +#include "system.hh" +#include "warn.hh" +#include "constrained-breaking.hh" + +Paper_score::Paper_score (Output_def *layout) +{ + layout_ = layout; + system_ = 0; + systems_ = SCM_EOL; + paper_systems_ = SCM_BOOL_F; +} -Paper_score::Paper_score () +Paper_score::Paper_score (Paper_score const &s) + : Music_output (s) { - paper_l_ =0; - outputter_l_ =0; - line_l_ = 0; - main_smob_ = SCM_EOL; + assert (false); } void -Paper_score::typeset_line (System *l) +Paper_score::derived_mark () const { - if (!line_l_) + if (layout_) + scm_gc_mark (layout_->self_scm ()); + scm_gc_mark (systems_); + scm_gc_mark (paper_systems_); +} + +void +Paper_score::typeset_system (System *system) +{ + if (!system_) + system_ = system; + + systems_ = scm_cons (system->self_scm (), systems_); + system->pscore_ = this; + system->layout_ = layout_; + system->unprotect (); +} + + +vector +Paper_score::find_break_indices () const +{ + vector all = root_system ()->columns (); + vector retval; + + for (vsize i = 0; i < all.size (); i++) { - line_l_ = l; // ugh. + Item *it = dynamic_cast (all[i]); + if (Paper_column::is_breakable (all[i]) + && (i == 0 || it->find_prebroken_piece (LEFT)) + && (i == all.size () - 1 || it->find_prebroken_piece (RIGHT))) + retval.push_back (i); } - main_smob_ = gh_cons (l->self_scm (), main_smob_); - l->pscore_l_ = this; - /* - We don't unprotect l->self_scm (), we haven't got any place else to - protect it from collection. */ + cols_ = all; + break_indices_ = retval; + return retval; } -Paper_score::Paper_score (Paper_score const &s) - : Music_output (s) +vector +Paper_score::get_break_indices () const { - assert (false); + if (break_indices_.empty ()) + find_break_indices (); + return break_indices_; +} + +vector +Paper_score::get_columns () const +{ + if (cols_.empty ()) + find_break_indices (); + return cols_; } -Array +vector Paper_score::calc_breaking () { - Break_algorithm *algorithm_p=0; - Array sol; + Constrained_breaking algorithm; + vector sol; - algorithm_p = new Gourlay_breaking ; - algorithm_p->set_pscore (this); - sol = algorithm_p->solve (); - delete algorithm_p; + message (_ ("Calculating line breaks...") + " "); + + int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0); + if (system_count) + algorithm.resize (system_count); + + algorithm.set_pscore (this); + sol = algorithm.solve (); return sol; } -/* - urg. clean me - */ void Paper_score::process () { - if (verbose_global_b) - progress_indication (_f ("Element count %d ", line_l_->element_count ())); - - - progress_indication (_ ("Preprocessing elements...") + " "); + if (be_verbose_global) + message (_f ("Element count %d (spanners %d) ", + system_->element_count (), + system_->spanner_count ())); - /* - Be sure to set breakability on first & last column. - */ - Link_array pc (line_l_->column_l_arr ()); - - pc[0]->set_grob_property ("breakable", SCM_BOOL_T); - pc.top ()->set_grob_property ("breakable", SCM_BOOL_T); + message (_ ("Preprocessing graphical objects...") + " "); - line_l_->pre_processing (); - - Array breaking = calc_breaking (); - line_l_->break_into_pieces (breaking); - - outputter_l_ = paper_l_->paper_outputter_p (); -; - outputter_l_->output_header (); - outputter_l_->output_version (); + /* FIXME: Check out why we need this - removing gives assertion failures + down the road. - progress_indication ("\n"); + 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")); - if (global_header_p) - { - Scope gh (global_header_p); - outputter_l_->output_scope (&gh, "lilypond"); - outputter_l_->write_header_fields_to_file (&gh); - } - if (header_l_) - { - outputter_l_->output_scope (header_l_, "lilypond"); - outputter_l_->write_header_fields_to_file (header_l_); - } - - outputter_l_->output_comment (_ ("Outputting Score, defined at: ")); - outputter_l_->output_comment (origin_str_); - - if (paper_l_->scope_p_) - outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper"); - - SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED); - outputter_l_->output_scheme (scm); - - line_l_->output_lines (); + system_->pre_processing (); +} - scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED); - outputter_l_->output_scheme (scm); +System * +Paper_score::root_system () const +{ + return system_; +} - progress_indication ("\n"); +Output_def * +Paper_score::layout () const +{ + return layout_; +} - // huh? - delete outputter_l_; - outputter_l_ = 0; - - if (verbose_global_b) - ly_display_scm (scm_gc_stats ()); +SCM +Paper_score::get_paper_systems () +{ + if (paper_systems_ == SCM_BOOL_F) + { + vector breaking = calc_breaking (); + system_->break_into_pieces (breaking); + message (_ ("Drawing systems...") + " "); + paper_systems_ = system_->get_paper_systems (); + } + return paper_systems_; } +