X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=49646fb56a20a821e5d064280850aa88d7f140be;hb=94189ec2b8da6d7e89dc619c646a927adead9b19;hp=0d7cbfdddf4058ec383c5200b22b87144cfc64f4;hpb=0cf97b5cdceecbba937f43ac827f4065aad5001e;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 0d7cbfdddf..49646fb56a 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -1,14 +1,14 @@ /* - 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--2001 Han-Wen Nienhuys */ #include "main.hh" #include "debug.hh" -#include "lookup.hh" +#include "font-metric.hh" #include "spanner.hh" #include "paper-def.hh" #include "line-of-score.hh" @@ -21,95 +21,36 @@ #include "paper-outputter.hh" #include "file-results.hh" #include "misc.hh" +#include "all-font-metrics.hh" Paper_score::Paper_score () { - protected_scms_ = scm_protect_object (gh_cons (SCM_BOOL_T, SCM_EOL)); paper_l_ =0; outputter_l_ =0; - Line_of_score * line_p = new Line_of_score; - typeset_unbroken_spanner (line_p); - - line_l_ = line_p; -} - -Paper_score::Paper_score (Paper_score const &s) - : Music_output (s) -{ - assert (false); -} - -Paper_score::~Paper_score () -{ - for (int i=span_p_arr_.size (); --i >=0 ; ) - delete span_p_arr_[i]; - for (int i=elem_p_arr_.size (); --i >=0 ; ) - delete elem_p_arr_[i]; - - scm_unprotect_object (protected_scms_); + line_l_ = 0; + main_smob_ = SCM_EOL; } void -Paper_score::typeset_element (Score_element * elem_p) +Paper_score::typeset_line (Line_of_score *l) { - elem_p_arr_.push (elem_p); - elem_p->pscore_l_ = this; - - // take over protection. - SCM_CDR(protected_scms_) = gh_cons (elem_p->element_property_alist_, - SCM_CDR (protected_scms_)); - scm_unprotect_object (elem_p->element_property_alist_); - - SCM p = elem_p->remove_elt_property (break_helper_only_scm_sym); - if (p != SCM_BOOL_F) - break_helpers_arr_.push (elem_p); -} - - -void -Paper_score::typeset_unbroken_spanner (Spanner*span_p) -{ - span_p_arr_.push (span_p); - span_p->pscore_l_=this; - - SCM p = span_p->remove_elt_property (break_helper_only_scm_sym); - if (p != SCM_BOOL_F) - break_helpers_arr_.push (span_p); -} - -void -Paper_score::add_column (Paper_column *p) -{ - p->set_rank (col_l_arr_.size ()); - col_l_arr_.push (p); - typeset_element(p); -} - + if (!line_l_) + { + line_l_ = l; // ugh. + } + main_smob_ = gh_cons (l->self_scm (), main_smob_); + l->pscore_l_ = this; + /* + 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 (int i=0; i < span_p_arr_.size (); i++) - span_p_arr_[i]->print (); - for (int i=0; i < elem_p_arr_.size (); i++) - elem_p_arr_[i]->print(); - - 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 @@ -126,103 +67,74 @@ Paper_score::calc_breaking () return sol; } - - +/* + urg. clean me + */ void Paper_score::process () { - 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 (); + if (verbose_global_b) + progress_indication ( _f("Element count %d ", line_l_->element_count ())); + - *mlog << '\n' << _ ("Calculating column positions...") << " " << flush; - line_l_->space_processing (); + progress_indication (_ ("Preprocessing elements...") + " "); - Array breaking = calc_breaking (); + /* + Be sure to set breakability on first & last column. + */ + Link_array pc (line_l_->column_l_arr ()); + + pc[0]->set_grob_property ("breakable", SCM_BOOL_T); + pc.top ()->set_grob_property ("breakable", SCM_BOOL_T); + line_l_->pre_processing (); + + Array breaking = calc_breaking (); + line_l_->break_into_pieces (breaking); + + outputter_l_ = paper_l_->paper_outputter_p (); +; + outputter_l_->output_header (); + outputter_l_->output_version (); - 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++) + if (global_header_p) { - Line_of_score *line_l = line_l_->set_breaking (breaking, i); - lines.push (line_l); - if (line_l != line_l_) - typeset_element (line_l); + Scope gh (global_header_p); + outputter_l_->output_scope (&gh, "lilypond"); } - - if (experimental_features_global_b) - *mlog << _f ("%s elements", elem_p_arr_.size () + span_p_arr_.size ()); - - *mlog << "\n"; - *mlog << _ ("Line ... "); - line_l_->break_processing (); - for (int i=0; i < lines.size (); i++) + if (header_l_) { - *mlog << '[' << flush; - - Line_of_score *line_l = lines[i]; - - line_l->post_processing (); - *mlog << i << flush; - line_l->output_all (i + 1 == lines.size()); - if (experimental_features_global_b) - *mlog << '(' << elem_p_arr_.size () + span_p_arr_.size () << ')'; - - *mlog << ']' << flush; - } + if (header_l_) + outputter_l_->output_scope (header_l_, "lilypond"); + } - // huh? - delete outputter_l_; - delete paper_stream_p; - outputter_l_ = 0; + 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_, "lilypondpaper"); - /* - 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; - -} + SCM scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED); + outputter_l_->output_scheme (scm); -Link_array -Paper_score::broken_col_range (Item const*l, Item const*r) const -{ - Link_array ret; + line_l_->output_lines (); - l = l->column_l (); - r = r->column_l (); - - int start = l - ? find_col_idx (dynamic_cast ((Item*)l))+1 - : 0; + scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED); + outputter_l_->output_scheme (scm); - int stop = r - ? find_col_idx (dynamic_cast((Item*)r)) - : col_l_arr_.size (); + progress_indication ("\n"); - while (start < stop) + if (global_header_p) { - Paper_column *c = col_l_arr_[start]; - if (c->breakable_b () && !c->line_l_) - ret.push (c); - start++; + Scope gh (global_header_p); + outputter_l_->write_header_fields_to_file (&gh); } - - return ret; + + // huh? + delete outputter_l_; + outputter_l_ = 0; + + if (verbose_global_b) + ly_display_scm (scm_gc_stats ()); }