X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fline-of-score.cc;h=4d8f3b74290d2a3ade1d4694fcea5fc9394c3ae3;hb=refs%2Ftags%2Frelease%2F1.3.39;hp=3bba1d479bd35869be7f12f57e8ef71404326c94;hpb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;p=lilypond.git diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index 3bba1d479b..4d8f3b7429 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -6,19 +6,23 @@ (c) 1996--2000 Han-Wen Nienhuys */ +#include "axis-group-interface.hh" +#include "debug.hh" #include "line-of-score.hh" +#include "main.hh" +#include "paper-column.hh" #include "paper-def.hh" #include "paper-outputter.hh" -#include "paper-column.hh" #include "paper-score.hh" +#include "string.hh" #include "warn.hh" -#include "main.hh" -#include "debug.hh" + Line_of_score::Line_of_score() { set_elt_property ("columns", SCM_EOL); - set_axes (Y_AXIS,X_AXIS); + Axis_group_interface (this).set_interface (); + Axis_group_interface (this).set_axes (Y_AXIS,X_AXIS); } @@ -65,15 +69,9 @@ Line_of_score::add_column (Paper_column*p) { set_elt_property ("columns", gh_cons (p->self_scm_, get_elt_property ("columns"))); - add_element (p); + Axis_group_interface (this).add_element (p); } -void -Line_of_score::do_print() const -{ - Spanner::do_print(); - Axis_group_spanner::do_print (); -} void Line_of_score::output_line (bool last_line) @@ -85,7 +83,7 @@ Line_of_score::output_line (bool last_line) translate_axis (- i[MAX], Y_AXIS); pscore_l_->outputter_l_->start_line (i.length ()); - Super_element::output_all (); + output_all (); if (last_line) pscore_l_->outputter_l_->stop_last_line(); else @@ -97,3 +95,19 @@ Line_of_score::compare (Line_of_score* const &p1,Line_of_score* const &p2) { return p1->rank_i_ - p2->rank_i_; } + +void +Line_of_score::post_processing () +{ + calculate_dependencies (POSTCALCED, POSTCALCING, &Score_element::after_line_breaking); +} + +void +Line_of_score::output_all () +{ + calculate_dependencies (BREWED, BREWING, &Score_element::output_processing); +} + + + +