From: fred Date: Tue, 26 Mar 2002 23:22:32 +0000 (+0000) Subject: lilypond-1.3.57 X-Git-Tag: release/1.5.59~1602 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2b203508ff32e6c125d1782411126ea01ecdedba;p=lilypond.git lilypond-1.3.57 --- diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 52fc80484a..6ffe752dda 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -24,7 +24,11 @@ Axis_group_engraver::do_creation_processing () staffline_p_ = get_spanner_p (); Axis_group_interface (staffline_p_).set_interface (); Axis_group_interface (staffline_p_).set_axes (Y_AXIS, Y_AXIS); - staffline_p_->set_bound(LEFT,get_staff_info().command_pcol_l ()); + + Item * it = get_staff_info().command_pcol_l (); + Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_); + staffline_p_->set_bound(LEFT,it); + announce_element (Score_element_info (staffline_p_, 0)); } @@ -57,8 +61,11 @@ Axis_group_engraver::do_removal_processing () && gh_number_p (gh_cdr (dims))) staffline_p_->set_elt_property ("extra-extent-Y", dims); - - staffline_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ()); + Item * it = get_staff_info().command_pcol_l (); + + Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_); + staffline_p_->set_bound(RIGHT,it); + typeset_element (staffline_p_); staffline_p_ = 0; } diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc index aa4b6e8c20..202d8ff328 100644 --- a/lily/line-group-group-engraver.cc +++ b/lily/line-group-group-engraver.cc @@ -34,8 +34,10 @@ void Line_group_engraver_group::do_removal_processing() { Engraver_group_engraver::do_removal_processing (); + Item * it = get_staff_info().command_pcol_l (); - staffline_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ()); + Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_); + staffline_p_->set_bound(RIGHT,it); Engraver_group_engraver::typeset_element (staffline_p_); staffline_p_ = 0; } @@ -44,7 +46,9 @@ void Line_group_engraver_group::do_creation_processing() { create_line_spanner (); - staffline_p_->set_bound(LEFT,get_staff_info().command_pcol_l ()); + Item * it = get_staff_info().command_pcol_l (); + staffline_p_->set_bound(LEFT,it); + Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_); Engraver::announce_element (Score_element_info (staffline_p_,0)); } diff --git a/lily/paper-column.cc b/lily/paper-column.cc index f7db1474a2..d38687e4f1 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -95,7 +95,7 @@ Paper_column::column_l () const } Paper_column::Paper_column (Moment w) - : Item (SCM_EOL) + : Item (SCM_EOL) // guh.? { SCM when = (new Moment (w))->smobify_self (); scm_unprotect_object (when); @@ -103,7 +103,7 @@ Paper_column::Paper_column (Moment w) Axis_group_interface (this).set_interface (); Axis_group_interface (this).set_axes (X_AXIS, X_AXIS); - + set_elt_pointer ("bounded-by-me", SCM_EOL); line_l_=0; rank_i_ = -1; } @@ -135,5 +135,7 @@ Paper_column::musical_b () const bool Paper_column::used_b ()const { - return gh_pair_p (get_elt_pointer ("elements")) || breakable_b (); + return gh_pair_p (get_elt_pointer ("elements")) || breakable_b () + || gh_pair_p (get_elt_pointer ("bounded-by-me")) + ; }