X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-score.cc;h=9193e92c0abc692ecca8227c7186f3f8a32d2a6d;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=508d93f24c303d3e9b267bd535a5dbfc93bfd176;hpb=eae90c59e6fc5a916c6736d2ca56486b045768a5;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 508d93f24c..b4252c8296 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,133 +3,156 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2008 Han-Wen Nienhuys */ -#include "main.hh" -#include "debug.hh" -#include "lookup.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-stream.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 const &s) + : Music_output (s) +{ + assert (false); +} -Paper_score::Paper_score () +void +Paper_score::derived_mark () const { - paper_l_ =0; - outputter_l_ =0; - line_l_ = 0; - main_smob_ = SCM_EOL; + if (layout_) + scm_gc_mark (layout_->self_scm ()); + scm_gc_mark (systems_); + scm_gc_mark (paper_systems_); } void -Paper_score::typeset_line (Line_of_score *l) +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 { - if (!line_l_) + vector all = root_system ()->used_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_; } -Array -Paper_score::calc_breaking () +vector +Paper_score::get_columns () const { - Break_algorithm *algorithm_p=0; - Array sol; + if (cols_.empty ()) + find_break_indices (); + return cols_; +} - algorithm_p = new Gourlay_breaking ; - algorithm_p->set_pscore (this); - sol = algorithm_p->solve (); - delete algorithm_p; +vector +Paper_score::calc_breaking () +{ + Constrained_breaking algorithm (this); + vector sol; - return sol; -} + message (_ ("Calculating line breaks...") + " "); + int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0); + if (system_count) + return algorithm.solve (0, VPOS, system_count); + return algorithm.best_solution (0, VPOS); +} -/* - 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...") + " "); - - /* - Be sure to set breakability on first & last column. - */ - Link_array pc (line_l_->column_l_arr ()); - - pc[0]->set_elt_property ("breakable", SCM_BOOL_T); - pc.top ()->set_elt_property ("breakable", SCM_BOOL_T); - - line_l_->pre_processing (); - - Array breaking = calc_breaking (); - line_l_->break_into_pieces (breaking); - - outputter_l_ = new Paper_outputter (paper_l_->paper_stream_p ()); -; - outputter_l_->output_header (); - outputter_l_->output_version(); - - if (header_global_p) - outputter_l_->output_scope (header_global_p, "mudela"); - if (header_l_) - outputter_l_->output_scope (header_l_, "mudela"); - - 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_, "mudelapaper"); - - SCM scm; - if(experimental_features_global_b) - { - SCM scm = gh_list (ly_symbol2scm ("experimental-on"), SCM_UNDEFINED); - outputter_l_->output_scheme (scm); - } - scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED); - outputter_l_->output_scheme (scm); - - line_l_->output_lines (); + if (be_verbose_global) + message (_f ("Element count %d (spanners %d) ", + system_->element_count (), + system_->spanner_count ())); + + message (_ ("Preprocessing graphical objects...")); + system_->pre_processing (); +} + +System * +Paper_score::root_system () const +{ + return system_; +} + +Output_def * +Paper_score::layout () const +{ + return layout_; +} - scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED); - outputter_l_->output_scheme (scm); +SCM +Paper_score::get_paper_systems () +{ + if (paper_systems_ == SCM_BOOL_F) + { + 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_; +} - progress_indication ("\n"); - // huh? - delete outputter_l_; - outputter_l_ = 0; - if (verbose_global_b) - ly_display_scm (scm_gc_stats ()); +Paper_score * +unsmob_paper_score (SCM x) +{ + return dynamic_cast (unsmob_music_output (x)); }