From 5586776cba4a0b8ee6386d1a355e8519352c1862 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:10:08 +0000 Subject: [PATCH] lilypond-1.3.39 --- lily/include/line-of-score.hh | 9 +-------- lily/score-element.cc | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh index a5a0174d19..f9031a2f50 100644 --- a/lily/include/line-of-score.hh +++ b/lily/include/line-of-score.hh @@ -14,8 +14,6 @@ class Line_of_score : public Spanner { public: - - /* imported the following from Super_element @@ -26,13 +24,8 @@ public: tracker. Every XXXX_processing () call traverses the entire dependency graph, and calls the appropriate Score_element::do_XXX_processing function on each Score_element it encounters. + */ - - FIXME: remove this class, to eliminate multiple inheritance. Merge - with Line_of_score ? */ - void space_processing (); - void pre_processing(); - void breakable_col_processing(); void post_processing(); void output_all (); diff --git a/lily/score-element.cc b/lily/score-element.cc index 4f1870886a..49de87c742 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -28,12 +28,20 @@ #include "side-position-interface.hh" #include "item.hh" +/* +TODO: + +remove dynamic_cast and put this code into respective + subclass. +*/ + Score_element::Score_element() { dim_cache_[X_AXIS] = new Dimension_cache; dim_cache_[Y_AXIS] = new Dimension_cache; dim_cache_[X_AXIS]->elt_l_ = dim_cache_[Y_AXIS]->elt_l_ = this; - + + // junkme. used_b_ = false; dim_cache_[X_AXIS]->set_callback (molecule_extent); @@ -261,11 +269,6 @@ Score_element::after_line_breaking () { } -void -Score_element::do_breakable_col_processing() -{ - handle_prebroken_dependencies(); -} void Score_element::before_line_breaking () @@ -686,3 +689,8 @@ init_functions () } ADD_SCM_INIT_FUNC(scoreelt, init_functions); + +void +Score_element::do_breakable_col_processing () +{ +} -- 2.39.5