X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=1eab7f80f6bc4b54db8cdb55d60f47f415ff191b;hb=4cd5fde58781f8ea5e2e071674cbe0499eb1232e;hp=4a78ff3fb358ac223fdba3768a61cfd7c32af234;hpb=9bc467a994787949def91708bf3bd50d088db982;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 4a78ff3fb3..1eab7f80f6 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -1,36 +1,36 @@ /* - p-score.cc -- implement Paper_score + paper-score.cc -- implement Paper_score source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999 Han-Wen Nienhuys + (c) 1996--2004 Han-Wen Nienhuys */ +#include "score.hh" #include "main.hh" -#include "debug.hh" -#include "lookup.hh" +#include "warn.hh" +#include "font-metric.hh" #include "spanner.hh" #include "paper-def.hh" -#include "line-of-score.hh" +#include "system.hh" #include "paper-column.hh" #include "paper-score.hh" #include "paper-column.hh" -#include "scope.hh" +#include "scm-hash.hh" #include "gourlay-breaking.hh" -#include "paper-stream.hh" -#include "paper-outputter.hh" -#include "file-results.hh" +//#include "paper-outputter.hh" +#include "input-file-results.hh" #include "misc.hh" #include "all-font-metrics.hh" +#include "stencil.hh" +#include "paper-book.hh" +#include "ly-module.hh" + Paper_score::Paper_score () { - 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; + paper_ = 0; + system_ = 0; } Paper_score::Paper_score (Paper_score const &s) @@ -39,182 +39,59 @@ 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) +Paper_score::typeset_line (System *system) { - elem_p->pscore_l_ = this; - - SCM_CDR(element_smob_list_) = gh_cons (elem_p->self_scm_, - SCM_CDR (element_smob_list_)); - elem_p->set_elt_property ("full-name", - gh_str02scm((char*)elem_p->name())); - - scm_unprotect_object (elem_p->self_scm_); -} + if (!system_) + system_ = system; -void -Paper_score::add_column (Paper_column *p) -{ - p->set_rank (col_l_arr_.size ()); - col_l_arr_.push (p); - typeset_element(p); -} + systems_ = gh_cons (system->self_scm (), systems_); + system->pscore_ = this; -void -Paper_score::print () const -{ -#ifndef NPRINT - if (!flower_dstream) - return ; - - DEBUG_OUT << "Paper_score { "; - DEBUG_OUT << "\n elements: "; - - for (SCM p = SCM_CDR (element_smob_list_); - p != SCM_EOL; - p = SCM_CDR(p)) - gh_display (SCM_CAR(p)); - DEBUG_OUT << "}\n"; -#endif -} - -int -Paper_score::find_col_idx (Paper_column const *c) const -{ - Paper_column const *what = c; - - return col_l_arr_.find_i ((Paper_column*)what); + scm_gc_unprotect_object (system->self_scm ()); } 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 () +SCM +Paper_score::process (String) { - - print (); - *mlog << _ ("Preprocessing elements...") << " " << flush; - line_l_->breakable_col_processing (); - fixup_refpoints (); - line_l_->pre_processing (); - - *mlog << '\n' << _ ("Calculating column positions...") << " " << flush; - line_l_->space_processing (); - - Array breaking = calc_breaking (); - line_l_->break_into_pieces (breaking); - - 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 + if (verbose_global_b) + progress_indication (_f ("Element count %d (spanners %d) ", + system_->element_count (), + system_->spanner_count ())); + + progress_indication (_ ("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); - */ - 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; - -} - -Link_array -Paper_score::broken_col_range (Item const*l, Item const*r) const -{ - Link_array ret; + system_->pre_processing (); + + Array breaking = calc_breaking (); + system_->break_into_pieces (breaking); + SCM lines = system_->get_lines (); + progress_indication ("\n"); - l = l->column_l (); - r = r->column_l (); + /* Only keep result stencils in lines_, *title_; delete all grobs. */ + systems_ = SCM_EOL; - 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; -} - - -void -Paper_score::fixup_refpoints () -{ - 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 = SMOB_TO_TYPE (Score_element,e ); - se->fixup_refpoint (); - } - } + return lines; }