X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=cab6834a094225664a5f5e7d318f0e497d9ab9a2;hb=5f03f8603e38802a1c38cf7a85a1c833ccfc2c39;hp=9202095e17aceae65fa377aa146431265b84c86f;hpb=25645986aa3e8d999e901426932c539e8de6a1ca;p=lilypond.git diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 9202095e17..cab6834a09 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -1,41 +1,45 @@ /* - paper-score.cc -- implement Paper_score + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1996--2009 Han-Wen Nienhuys - (c) 1996--2004 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include "score.hh" -#include "main.hh" -#include "warn.hh" -#include "font-metric.hh" -#include "spanner.hh" -#include "paper-def.hh" -#include "system.hh" -#include "paper-column.hh" #include "paper-score.hh" + +#include "all-font-metrics.hh" +#include "book.hh" +#include "international.hh" +#include "main.hh" +#include "misc.hh" +#include "output-def.hh" +#include "paper-book.hh" #include "paper-column.hh" #include "scm-hash.hh" -#include "gourlay-breaking.hh" -#include "paper-outputter.hh" -#include "input-file-results.hh" -#include "misc.hh" -#include "all-font-metrics.hh" - +#include "score.hh" #include "stencil.hh" -#include "paper-book.hh" -#include "ly-module.hh" +#include "system.hh" +#include "warn.hh" +#include "constrained-breaking.hh" -Paper_score::Paper_score () +Paper_score::Paper_score (Output_def *layout) { - paper_ = 0; - outputter_ = 0; + layout_ = layout; system_ = 0; - main_smob_ = SCM_EOL; - lines_ = SCM_EOL; - book_title_ = 0; - score_title_ = 0; + systems_ = SCM_EOL; + paper_systems_ = SCM_BOOL_F; } Paper_score::Paper_score (Paper_score const &s) @@ -44,115 +48,122 @@ Paper_score::Paper_score (Paper_score const &s) assert (false); } +void +Paper_score::derived_mark () const +{ + if (layout_) + scm_gc_mark (layout_->self_scm ()); + scm_gc_mark (systems_); + scm_gc_mark (paper_systems_); +} void -Paper_score::typeset_line (System *line) +Paper_score::typeset_system (System *system) { if (!system_) - /* ugh. */ - system_ = line; + system_ = system; + + systems_ = scm_cons (system->self_scm (), systems_); + system->pscore_ = this; + system->layout_ = layout_; + system->unprotect (); +} + + +vector +Paper_score::find_break_indices () const +{ + vector all = root_system ()->used_columns (); + vector retval; + + for (vsize i = 0; i < all.size (); i++) + { + Item *it = dynamic_cast (all[i]); + if (Paper_column::is_breakable (all[i]) + && (i == 0 || it->find_prebroken_piece (LEFT)) + && (i == all.size () - 1 || it->find_prebroken_piece (RIGHT))) + retval.push_back (i); + } + + cols_ = all; + break_indices_ = retval; + + return retval; +} - main_smob_ = gh_cons (line->self_scm (), main_smob_); - line->pscore_ = this; +vector +Paper_score::get_break_indices () const +{ + if (break_indices_.empty ()) + find_break_indices (); + return break_indices_; +} - scm_gc_unprotect_object (line->self_scm ()); +vector +Paper_score::get_columns () const +{ + if (cols_.empty ()) + find_break_indices (); + return cols_; } -Array +vector Paper_score::calc_breaking () { - Break_algorithm *algorithm=0; - Array sol; + Constrained_breaking algorithm (this); + vector sol; + + message (_ ("Calculating line breaks...") + " "); - algorithm = new Gourlay_breaking ; - algorithm->set_pscore (this); - sol = algorithm->solve (); - delete algorithm; + int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0); + if (system_count) + return algorithm.solve (0, VPOS, system_count); - return sol; + return algorithm.best_solution (0, VPOS); } void -Paper_score::process (String outname) +Paper_score::process () { - 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); - + if (be_verbose_global) + message (_f ("Element count %d (spanners %d) ", + system_->element_count (), + system_->spanner_count ())); + + message (_ ("Preprocessing graphical objects...")); + system_->pre_processing (); - - Array breaking = calc_breaking (); - system_->break_into_pieces (breaking); - lines_ = system_->get_lines (); - - // FIXME: ... - outputter_ = paper_->get_paper_outputter (outname); - - progress_indication ("\n"); - - SCM scopes = SCM_EOL; - if (header_) - scopes = scm_cons (header_, scopes); - if (global_input_file->header_ && global_input_file->header_ != header_) - scopes = scm_cons (global_input_file->header_, scopes); - - outputter_->output_metadata (scopes, paper_); - -#ifdef PAGE_LAYOUT - SCM make_title = scm_primitive_eval (ly_symbol2scm ("make-title")); - SCM b = ly_modules_lookup (scopes, ly_symbol2scm ("bookTitle")); - if (b != SCM_UNDEFINED && scm_variable_bound_p (b) == SCM_BOOL_T) - book_title_ - = unsmob_stencil (gh_call2 (make_title, paper_->self_scm (), - scm_variable_ref (b))); - - SCM s = ly_modules_lookup (scopes, ly_symbol2scm ("scoreTitle")); - if (s != SCM_UNDEFINED && scm_variable_bound_p (s) == SCM_BOOL_T) - score_title_ - = unsmob_stencil (gh_call2 (make_title, paper_->self_scm (), - scm_variable_ref (s))); - -#if 0 - // FIXME: - delete system_; - system_ = 0; -#endif - - /* Ugh: caller (Score) should do this, but does not know our flavor - (paper or midi). */ - paper_book->paper_scores_.push (this); -#else - output (); -#endif } -void -Paper_score::output () +System * +Paper_score::root_system () const +{ + return system_; +} + +Output_def * +Paper_score::layout () const +{ + return layout_; +} + +SCM +Paper_score::get_paper_systems () +{ + if (paper_systems_ == SCM_BOOL_F) + { + vector breaking = calc_breaking (); + system_->break_into_pieces (breaking); + message (_ ("Drawing systems...") + " "); + system_->do_break_substitution_and_fixup_refpoints (); + paper_systems_ = system_->get_paper_systems (); + } + return paper_systems_; +} + + +Paper_score * +unsmob_paper_score (SCM x) { - outputter_->output_header (paper_); - - int line_count = SCM_VECTOR_LENGTH ((SCM) lines_); - for (int i = 0; i < line_count; i++) - outputter_->output_line (scm_vector_ref (lines_, scm_int2num (i)), - i == line_count - 1); - - outputter_->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); - progress_indication ("\n"); - -#if 0 - // huh? - delete outputter_; - outputter_ = 0; -#endif + return dynamic_cast (unsmob_music_output (x)); }