X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=d6af7039ca25057404be5f68968f862cec2bbe06;hb=233b5a1921a6c2c438fb1516abdcc01cc5a244e8;hp=e51b01cef39b821803337c41b1a4760dd6d81650;hpb=82731e802565546441c401a84a13b486e54eb760;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index e51b01cef3..d6af7039ca 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -1,224 +1,140 @@ /* - 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--2003 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 "input-file-results.hh" #include "misc.hh" #include "all-font-metrics.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_score::Paper_score (Paper_score const &s) - : Music_output (s) -{ - assert (false); -} - -Paper_score::~Paper_score () -{ - scm_unprotect_object (element_smob_list_); + paper_ =0; + outputter_ =0; + system_ = 0; + main_smob_ = SCM_EOL; } void -Paper_score::typeset_element (Score_element * elem_p) +Paper_score::typeset_line (System *l) { - elem_p->pscore_l_ = this; + if (!system_) + { + system_ = l; // ugh. + } - 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_); -} + main_smob_ = gh_cons (l->self_scm (), main_smob_); + l->pscore_ = this; -void -Paper_score::add_column (Paper_column *p) -{ - p->set_rank (col_l_arr_.size ()); - col_l_arr_.push (p); - typeset_element(p); -} + /* + We don't unprotect l->self_scm (), we haven't got any place else to + protect it from collection. */ -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_score::Paper_score (Paper_score const &s) + : Music_output (s) { - Paper_column const *what = c; - - return col_l_arr_.find_i ((Paper_column*)what); + assert (false); } 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; } - - +/* + urg. clean me + */ void Paper_score::process () { + if (verbose_global_b) + progress_indication (_f ("Element count %d (spanners %d) ", + system_->element_count (), + system_->spanner_count ())); - print (); - *mlog << _ ("Preprocessing elements...") << " " << flush; - line_l_->breakable_col_processing (); - line_l_->pre_processing (); - *mlog << '\n' << _ ("Calculating column positions...") << " " << flush; - line_l_->space_processing (); + progress_indication (_ ("Preprocessing graphical objects...") + " "); - Array breaking = calc_breaking (); - - - outputter_l_ = new Paper_outputter ; - outputter_l_->output_header (); - - outputter_l_->output_version(); + /* + Be sure to set breakability on first & last column. + */ + Link_array pc (system_->columns ()); - 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_); + pc[0]->set_grob_property ("breakable", SCM_BOOL_T); + pc.top ()->set_grob_property ("breakable", SCM_BOOL_T); - if (paper_l_->scope_p_) - outputter_l_->output_scope (paper_l_->scope_p_, "mudelapaper"); + system_->pre_processing (); + + Array breaking = calc_breaking (); + system_->break_into_pieces (breaking); - 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); + outputter_ = paper_->get_paper_outputter (); + outputter_->output_header (); + outputter_->output_version (); + progress_indication ("\n"); - /* - 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_; - - Link_array lines; - for (int i=0; i < breaking.size (); i++) + if (global_input_file->header_) { - Line_of_score *line_l = line_l_->set_breaking (breaking, i); - lines.push (line_l); - if (line_l != line_l_) - typeset_element (line_l); + outputter_->output_scope (global_input_file->header_, "lilypond"); + outputter_->write_header_fields_to_file (global_input_file->header_); } - - - *mlog << "\n"; - *mlog << _ ("Line ... "); - line_l_->break_processing (); - for (int i=0; i < lines.size (); i++) + + if (header_) { - *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; + outputter_->output_scope (header_, "lilypond"); + outputter_->write_header_fields_to_file (header_); } - - 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; - -} + outputter_->output_comment (_ ("Outputting Score, defined at: ")); + outputter_->output_comment (origin_string_); -Link_array -Paper_score::broken_col_range (Item const*l, Item const*r) const -{ - Link_array ret; + outputter_->output_scope (paper_->scope_, "lilypondpaper"); - l = l->column_l (); - r = r->column_l (); - - int start = l - ? find_col_idx (dynamic_cast ((Item*)l))+1 - : 0; + SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED); + outputter_->output_scheme (scm); + + system_->output_lines (); + + scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED); + outputter_->output_scheme (scm); - int stop = r - ? find_col_idx (dynamic_cast((Item*)r)) - : col_l_arr_.size (); + progress_indication ("\n"); - while (start < stop) + // huh? + delete outputter_; + outputter_ = 0; + + if (verbose_global_b) { - Paper_column *c = col_l_arr_[start]; - if (c->breakable_b () && !c->line_l_) - ret.push (c); - start++; + scm_write (scm_gc_stats (), scm_current_error_port ()); + scm_flush (scm_current_error_port ()); } - - return ret; }