source file of the GNU LilyPond music typesetter
- (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "score.hh"
#include "main.hh"
-#include "debug.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_l_ = 0;
+ paper_ =0;
+ outputter_ =0;
+ system_ = 0;
main_smob_ = SCM_EOL;
}
void
-Paper_score::typeset_line (Line_of_score *l)
+Paper_score::typeset_line (System *l)
{
- if (!line_l_)
+ if (!system_)
{
- line_l_ = l; // ugh.
+ system_ = 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. */
+ main_smob_ = gh_cons (l->self_scm (), main_smob_);
+ l->pscore_ = this;
+ scm_gc_unprotect_object (l->self_scm());
}
+
Paper_score::Paper_score (Paper_score const &s)
: Music_output (s)
{
Array<Column_x_positions>
Paper_score::calc_breaking ()
{
- Break_algorithm *algorithm_p=0;
+ Break_algorithm *algorithm=0;
Array<Column_x_positions> 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 ()
+Paper_score::process (String outname)
{
if (verbose_global_b)
- progress_indication (_f ("Element count %d ", line_l_->element_count ()));
+ progress_indication (_f ("Element count %d (spanners %d) ",
+ system_->element_count (),
+ system_->spanner_count ()));
- progress_indication (_ ("Preprocessing elements...") + " ");
+ progress_indication (_ ("Preprocessing graphical objects...") + " ");
/*
Be sure to set breakability on first & last column.
*/
- Link_array<Grob> pc (line_l_->column_l_arr ());
+ Link_array<Grob> pc (system_->columns ());
pc[0]->set_grob_property ("breakable", SCM_BOOL_T);
pc.top ()->set_grob_property ("breakable", SCM_BOOL_T);
- line_l_->pre_processing ();
+ system_->pre_processing ();
Array<Column_x_positions> breaking = calc_breaking ();
- line_l_->break_into_pieces (breaking);
+ system_->break_into_pieces (breaking);
- outputter_l_ = paper_l_->paper_outputter_p ();
-;
- outputter_l_->output_header ();
- outputter_l_->output_version ();
+ outputter_ = paper_->get_paper_outputter (outname);
+ outputter_->output_header ();
+ outputter_->output_version ();
progress_indication ("\n");
- if (global_header_p)
+ if (global_input_file->header_)
{
- Scope gh (global_header_p);
- outputter_l_->output_scope (&gh, "lilypond");
- outputter_l_->write_header_fields_to_file (&gh);
+ outputter_->output_scope (global_input_file->header_, "lilypond");
+ outputter_->write_header_fields_to_file (global_input_file->header_);
}
- if (header_l_)
+
+ if (header_)
{
- outputter_l_->output_scope (header_l_, "lilypond");
- outputter_l_->write_header_fields_to_file (header_l_);
+ outputter_->output_scope (header_, "lilypond");
+ outputter_->write_header_fields_to_file (header_);
}
-
- 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");
+ outputter_->output_scope (paper_->scope_, "lilypondpaper");
- SCM scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
- outputter_l_->output_scheme (scm);
+ SCM scm = scm_list_n (ly_symbol2scm ("header-end"), SCM_UNDEFINED);
+ outputter_->output_scheme (scm);
- line_l_->output_lines ();
+ system_->output_lines ();
- scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
- outputter_l_->output_scheme (scm);
+ scm = scm_list_n (ly_symbol2scm ("end-output"), SCM_UNDEFINED);
+ outputter_->output_scheme (scm);
progress_indication ("\n");
// huh?
- delete outputter_l_;
- outputter_l_ = 0;
+ delete outputter_;
+ outputter_ = 0;
if (verbose_global_b)
- ly_display_scm (scm_gc_stats ());
+ {
+ scm_write (scm_gc_stats (), scm_current_error_port ());
+ scm_flush (scm_current_error_port ());
+ }
}