X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=3855b65f1a61319cce68d5def3107aed26db2ddf;hb=36342ddfdbf0c112be9cb4ce471417e9c0e8fa1f;hp=41a4fcd8e0e18c8f79d423bdedb4e982b5d25fcc;hpb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 41a4fcd8e0..3855b65f1a 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -1,36 +1,32 @@ /* - p-score.cc -- implement Paper_score + paper-score.cc -- implement Paper_score source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2005 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 "all-font-metrics.hh" #include "gourlay-breaking.hh" -#include "paper-stream.hh" -#include "paper-outputter.hh" -#include "file-results.hh" +#include "main.hh" #include "misc.hh" -#include "all-font-metrics.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" -Paper_score::Paper_score () +Paper_score::Paper_score (Output_def *layout) { - paper_l_ =0; - outputter_l_ =0; - Line_of_score * line_p = new Line_of_score; - line_p->pscore_l_ = this; - element_smob_list_ = scm_protect_object (gh_cons (line_p->self_scm_, SCM_EOL)); - line_l_ = line_p; + layout_ = layout; + system_ = 0; + systems_ = SCM_EOL; + paper_systems_ = SCM_EOL; } Paper_score::Paper_score (Paper_score const &s) @@ -39,197 +35,81 @@ Paper_score::Paper_score (Paper_score const &s) assert (false); } -Paper_score::~Paper_score () -{ - scm_unprotect_object (element_smob_list_); -} - -void -Paper_score::typeset_element (Score_element * elem_p) -{ - elem_p->pscore_l_ = this; - - gh_set_cdr_x(element_smob_list_, - gh_cons (elem_p->self_scm_, gh_cdr (element_smob_list_))); - elem_p->set_elt_property ("full-name", - gh_str02scm((char*)elem_p->name())); - - scm_unprotect_object (elem_p->self_scm_); -} - void -Paper_score::add_column (Paper_column *p) +Paper_score::derived_mark () const { - p->set_rank (col_l_arr_.size ()); - col_l_arr_.push (p); - typeset_element(p); + if (layout_) + scm_gc_mark (layout_->self_scm ()); + scm_gc_mark (systems_); + scm_gc_mark (paper_systems_); } void -Paper_score::print () const -{ -#ifndef NPRINT - if (!flower_dstream) - return ; - - DEBUG_OUT << "Paper_score { "; - DEBUG_OUT << "\n elements: "; - - for (SCM p = gh_cdr (element_smob_list_); - p != SCM_EOL; - p = gh_cdr(p)) - gh_display (gh_car (p)); - DEBUG_OUT << "}\n"; -#endif -} - -int -Paper_score::find_col_idx (Paper_column const *c) const +Paper_score::typeset_system (System *system) { - Paper_column const *what = c; + if (!system_) + system_ = system; - return col_l_arr_.find_i ((Paper_column*)what); + systems_ = scm_cons (system->self_scm (), systems_); + system->pscore_ = this; + system->layout_ = layout_; + system->unprotect (); } Array Paper_score::calc_breaking () { - Break_algorithm *algorithm_p=0; + Break_algorithm *algorithm = 0; Array sol; - algorithm_p = new Gourlay_breaking ; - algorithm_p->set_pscore (this); - sol = algorithm_p->solve (); - delete algorithm_p; + algorithm = new Gourlay_breaking; + algorithm->set_pscore (this); + sol = algorithm->solve (); + delete algorithm; return sol; } - - void Paper_score::process () { - print (); - progress_indication (_ ("Preprocessing elements...") + " "); - line_l_->breakable_col_processing (); - fixup_refpoints (); - line_l_->pre_processing (); - - progress_indication ("\n" + _ ("Calculating column positions...") + " " ); - line_l_->space_processing (); + if (be_verbose_global) + message (_f ("Element count %d (spanners %d) ", + system_->element_count (), + system_->spanner_count ())); + + message (_ ("Preprocessing graphical objects...") + " "); + + /* FIXME: Check out why we need this - removing gives assertion failures + down the road. + + doubly, also done in Score_engraver */ + Link_array pc (system_->columns ()); + pc[0]->set_property ("breakable", SCM_BOOL_T); + pc.top ()->set_property ("breakable", SCM_BOOL_T); + + system_->pre_processing (); Array breaking = calc_breaking (); - line_l_->break_into_pieces (breaking); - - for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s)) - { - Score_element *sc = unsmob_element (gh_car (s)); - sc->do_break_processing (); - } - for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s)) - { - Score_element *sc = unsmob_element (gh_car (s)); - sc->handle_broken_dependencies (); - } - - outputter_l_ = new Paper_outputter ; - 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 = 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); - - - /* - This is tricky: we have to put the font definitions before the - actual output, but we don't know all fonts in advanced: generating - the output might trigger loading of a new font. So we store the - place to insert the font definitions, generate the output and then - insert the definitions - - */ - SCM before_output = outputter_l_->last_cons_; - - - fixup_refpoints (); - line_l_->output_lines (); - - - SCM font_names = ly_quote_scm (all_fonts_global_p->font_descriptions ()); - gh_set_cdr_x (before_output, - gh_cons (gh_list (ly_symbol2scm ("define-fonts"), - font_names, - SCM_UNDEFINED), - gh_cdr (before_output))); - - Paper_stream* psp = paper_l_->paper_stream_p (); - outputter_l_->dump_onto (psp); - // huh? - delete outputter_l_; - - outputter_l_ = 0; - delete psp; - + system_->break_into_pieces (breaking); + + paper_systems_ = system_->get_paper_systems (); } -Link_array -Paper_score::broken_col_range (Item const*l, Item const*r) const +System * +Paper_score::root_system () const { - Link_array ret; - - l = l->column_l (); - r = r->column_l (); - - int start = l - ? find_col_idx (dynamic_cast ((Item*)l))+1 - : 0; - - int stop = r - ? find_col_idx (dynamic_cast((Item*)r)) - : col_l_arr_.size (); - - while (start < stop) - { - Paper_column *c = col_l_arr_[start]; - if (c->breakable_b () && !c->line_l_) - ret.push (c); - start++; - } - - return ret; + return system_; } +Output_def * +Paper_score::layout () const +{ + return layout_; +} -void -Paper_score::fixup_refpoints () +SCM +Paper_score::get_paper_systems () const { - for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s)) - { - SCM e = gh_car (s); - if (SMOB_IS_TYPE_B(Score_element, e)) - { - Score_element * se = unsmob_element (e); - se->fixup_refpoint (); - - if (!dynamic_cast (se) && !se->parent_l (Y_AXIS)) - { - programming_error ("No parent!"); - } - } - } + return paper_systems_; }