X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=db0258328232ee30cec1a199bd7862c0e51f8f61;hb=e9a308e9c6002900fc336733950a0175bcbcc333;hp=fc0c5933b549c266dbc6d1315543b952f4eaa279;hpb=d182d030b396d66a84efa13d947fbbdfb7240874;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index fc0c5933b5..db02583282 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,136 +3,164 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys + (c) 1996--2007 Han-Wen Nienhuys */ -#include "main.hh" -#include "warn.hh" -#include "font-metric.hh" -#include "spanner.hh" -#include "paper-def.hh" -#include "system.hh" -#include "paper-column.hh" #include "paper-score.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 "gourlay-breaking.hh" -#include "paper-outputter.hh" -#include "file-results.hh" -#include "misc.hh" -#include "all-font-metrics.hh" +#include "score.hh" +#include "stencil.hh" +#include "system.hh" +#include "warn.hh" +#include "constrained-breaking.hh" -Paper_score::Paper_score () +Paper_score::Paper_score (Output_def *layout) { - paper_ =0; - outputter_ =0; + layout_ = layout; system_ = 0; - main_smob_ = SCM_EOL; + systems_ = SCM_EOL; + paper_systems_ = SCM_BOOL_F; +} + +Paper_score::Paper_score (Paper_score const &s) + : Music_output (s) +{ + assert (false); +} + +void +Paper_score::derived_mark () const +{ + if (layout_) + scm_gc_mark (layout_->self_scm ()); + scm_gc_mark (systems_); + scm_gc_mark (paper_systems_); } void -Paper_score::typeset_line (System *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 +{ + vector all = root_system ()->used_columns (); + vector retval; + + for (vsize i = 0; i < all.size (); i++) { - system_ = 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_ = 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 +vector +Paper_score::get_columns () const +{ + if (cols_.empty ()) + find_break_indices (); + return cols_; +} + +vector Paper_score::calc_breaking () { - Break_algorithm *algorithm=0; - Array sol; + Constrained_breaking algorithm (this); + vector sol; + + message (_ ("Calculating line breaks...") + " "); - algorithm = new Gourlay_breaking ; - algorithm->set_pscore (this); - sol = algorithm->solve (); - delete algorithm; + int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0); + if (system_count) + return algorithm.solve (0, VPOS, system_count); - return sol; + return algorithm.best_solution (0, VPOS); } -/* - urg. clean me - */ void Paper_score::process () { - if (verbose_global_b) - progress_indication (_f ("Element count %d ", system_->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 (system_->columns ()); - - pc[0]->set_grob_property ("breakable", SCM_BOOL_T); - pc.top ()->set_grob_property ("breakable", SCM_BOOL_T); + message (_ ("Preprocessing graphical objects...")); - system_->pre_processing (); - - Array breaking = calc_breaking (); - system_->break_into_pieces (breaking); - - outputter_ = paper_->get_paper_outputter (); -; - outputter_->output_header (); - outputter_->output_version (); - - progress_indication ("\n"); - - if (global_header) - { + /* FIXME: Check out why we need this - removing gives assertion failures + down the road. - outputter_->output_scope (global_header, "lilypond"); - outputter_->write_header_fields_to_file (global_header); - } - if (header_) - { - outputter_->output_scope (header_, "lilypond"); - outputter_->write_header_fields_to_file (header_); - } - - outputter_->output_comment (_ ("Outputting Score, defined at: ")); - outputter_->output_comment (origin_string_); + doubly, also done in Score_engraver */ + vector pc (system_->used_columns ()); + pc[0]->set_property ("line-break-permission", ly_symbol2scm ("allow")); + pc.back ()->set_property ("line-break-permission", ly_symbol2scm ("allow")); - if (paper_->variable_tab_) - outputter_->output_scope (paper_->variable_tab_, "lilypondpaper"); - - SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED); - outputter_->output_scheme (scm); - - system_->output_lines (); + system_->pre_processing (); +} - scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED); - outputter_->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_; - outputter_ = 0; - - if (verbose_global_b) +SCM +Paper_score::get_paper_systems () +{ + if (paper_systems_ == SCM_BOOL_F) { - scm_write (scm_gc_stats (), scm_current_error_port ()); - scm_flush (scm_current_error_port ()); + 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)); }