X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=7971743be44de4677e8c5e029a4cf1011eabc933;hb=e166ef4d795f43bcdff1f04162d17c2d8c7a9302;hp=097ef2bc38982c033efe05f3a880178bacdb9942;hpb=48f2b9351f93d0161c675cfb60e95bf919041df2;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 097ef2bc38..7971743be4 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--2002 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" @@ -17,7 +17,6 @@ #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" @@ -27,68 +26,30 @@ 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_); + 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->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_); -} + if (!line_l_) + { + line_l_ = l; // ugh. + } + main_smob_ = gh_cons (l->self_scm (), main_smob_); + l->pscore_l_ = 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 = 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::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 @@ -105,127 +66,70 @@ Paper_score::calc_breaking () return sol; } - - +/* + urg. clean me + */ void Paper_score::process () { + if (verbose_global_b) + progress_indication (_f ("Element count %d ", line_l_->element_count ())); - print (); + progress_indication (_ ("Preprocessing elements...") + " "); - line_l_->breakable_col_processing (); - fixup_refpoints (); - line_l_->pre_processing (); + + /* + Be sure to set breakability on first & last column. + */ + Link_array pc (line_l_->column_l_arr ()); - progress_indication ("\n" + _ ("Calculating column positions...") + " " ); - line_l_->space_processing (); + 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 (); + + progress_indication ("\n"); - for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s)) + if (global_header_p) { - Score_element *sc = unsmob_element (gh_car (s)); - sc->do_break_processing (); + Scope gh (global_header_p); + outputter_l_->output_scope (&gh, "lilypond"); + outputter_l_->write_header_fields_to_file (&gh); } - for (SCM s = element_smob_list_; gh_pair_p (s); s = gh_cdr (s)) + if (header_l_) { - Score_element *sc = unsmob_element (gh_car (s)); - sc->handle_broken_dependencies (); + outputter_l_->output_scope (header_l_, "lilypond"); + outputter_l_->write_header_fields_to_file (header_l_); } - - 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); + outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper"); + SCM scm = scm_list_n (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 = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED); + outputter_l_->output_scheme (scm); + + progress_indication ("\n"); - 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; - - 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; -} - - -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 = unsmob_element (e); - se->fixup_refpoint (); - } - } + if (verbose_global_b) + ly_display_scm (scm_gc_stats ()); }