X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=c1487c89b26553f459d265502939296ee297e198;hb=fe6b181832f78629fc2285dc1d23dccc7373e9ec;hp=d8cba19d43f13871999e83186695482e1bbada58;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index d8cba19d43..c1487c89b2 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -1,35 +1,32 @@ /* - 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 "all-font-metrics.hh" +#include "font-metric.hh" +#include "gourlay-breaking.hh" +#include "ly-module.hh" #include "main.hh" -#include "debug.hh" -#include "lookup.hh" -#include "spanner.hh" -#include "paper-def.hh" -#include "line-of-score.hh" +#include "misc.hh" +#include "output-def.hh" +#include "paper-book.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 "scm-hash.hh" +#include "score.hh" +#include "spanner.hh" +#include "stencil.hh" +#include "system.hh" +#include "warn.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; + layout_ = 0; + system_ = 0; } Paper_score::Paper_score (Paper_score const &s) @@ -38,164 +35,62 @@ 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; - - SCM_CDR(element_smob_list_) = gh_cons (elem_p->self_scm_, - SCM_CDR (element_smob_list_)); - elem_p->set_elt_property (ly_symbol ("full-name"), - gh_str02scm((char*)elem_p->name())); - - scm_unprotect_object (elem_p->self_scm_); -} - -void -Paper_score::add_column (Paper_column *p) -{ - p->set_rank (col_l_arr_.size ()); - col_l_arr_.push (p); - typeset_element(p); -} - void -Paper_score::print () const +Paper_score::typeset_line (System *system) { -#ifndef NPRINT - if (!flower_dstream) - return ; + if (!system_) + system_ = system; - DEBUG_OUT << "Paper_score { "; - DEBUG_OUT << "\n elements: "; + systems_ = scm_cons (system->self_scm (), systems_); + system->pscore_ = this; - 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) { - Dictionary type_stats; - type_stats["Item"] =0; - type_stats["Spanner"] =0; - type_stats["Total"]=0; - - print (); - *mlog << _ ("Preprocessing elements...") << " " << flush; - line_l_->breakable_col_processing (); - line_l_->pre_processing (); - - *mlog << '\n' << _ ("Calculating column positions...") << " " << flush; - line_l_->space_processing (); - + 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); + + system_->pre_processing (); + Array breaking = calc_breaking (); - - - Paper_stream* paper_stream_p = paper_l_->paper_stream_p (); - outputter_l_ = paper_l_->paper_outputter_p (paper_stream_p, header_l_, origin_str_); - - Link_array lines; - for (int i=0; i < breaking.size (); i++) - { - Line_of_score *line_l = line_l_->set_breaking (breaking, i); - lines.push (line_l); - if (line_l != line_l_) - typeset_element (line_l); - } - - - *mlog << "\n"; - *mlog << _ ("Line ... "); - line_l_->break_processing (); - for (int i=0; i < lines.size (); i++) - { - *mlog << '[' << flush; - - Line_of_score *line_l = lines[i]; - - line_l->post_processing (); - *mlog << i << flush; - line_l->output_all (i + 1 == lines.size()); - *mlog << ']' << flush; - } + system_->break_into_pieces (breaking); + SCM lines = system_->get_lines (); +#if 0 + /* gourlay:do_solve also prints newline. */ + progress_indication ("\n"); +#endif - // huh? - delete outputter_l_; - delete paper_stream_p; - outputter_l_ = 0; - - - /* - todo: sort output - */ - if (experimental_features_global_b) - { - for (Dictionary_iter i(type_stats); i.ok(); i++) - { - *mlog << i.key () << ": " << i.val () << " objects\n"; - } - } - *mlog << '\n' << flush; - -} - -Link_array -Paper_score::broken_col_range (Item const*l, Item const*r) const -{ - Link_array ret; - - 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; + return lines; }