From fb610cf56e17f88cd46a5277132667b715224775 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:48:53 +0000 Subject: [PATCH] lilypond-1.1.39 --- lily/bar-script-engraver.cc | 8 +++++++- lily/include/staff-info.hh | 16 ++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index 2fc8e86b17..7897404c65 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -13,6 +13,7 @@ #include "g-staff-side.hh" #include "g-text-item.hh" #include "lily-guile.hh" +#include "p-col.hh" Bar_script_engraver::Bar_script_engraver () { @@ -46,7 +47,12 @@ Bar_script_engraver::do_acknowledge_element (Item *i) = &i->dim_cache_[axis_]; staff_side_p_->add_support (i); - i->add_dependency (staff_side_p_); // UGH. + + /* + How do we make sure that staff_side_p_ has a dependency from + someone else? We can't use i for that, + */ + get_staff_info ().command_pcol_l ()->add_dependency (staff_side_p_); } } diff --git a/lily/include/staff-info.hh b/lily/include/staff-info.hh index cbedf848ed..72ec7831da 100644 --- a/lily/include/staff-info.hh +++ b/lily/include/staff-info.hh @@ -17,14 +17,14 @@ JUNKME. */ struct Staff_info { - Time_description const *time_C_; - Rhythmic_grouping const *rhythmic_C_; - Score_column *musical_l_; - Score_column *command_l_; - - Paper_column * command_pcol_l(); - Paper_column * musical_pcol_l(); - Staff_info(); + Time_description const *time_C_; + Rhythmic_grouping const *rhythmic_C_; + Score_column *musical_l_; + Score_column *command_l_; + + Paper_column * command_pcol_l(); + Paper_column * musical_pcol_l(); + Staff_info(); }; #endif // STAFF_INFO_HH -- 2.39.5