From: fred Date: Wed, 27 Mar 2002 00:34:03 +0000 (+0000) Subject: lilypond-1.3.114 X-Git-Tag: release/1.5.59~1070 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0655a329ea69a187db3fb40c15f1761b6bab6cbf;p=lilypond.git lilypond-1.3.114 --- diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index 99713d7d39..e921bd0a0f 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -233,8 +233,6 @@ Line_of_score::add_column (Paper_column*p) p->rank_i_ = prev ? Paper_column::rank_i (prev) + 1 : 0; - - me->set_grob_property ("columns", gh_cons (p->self_scm (), cs)); Axis_group_interface::add_element (me, p); diff --git a/lily/spanner.cc b/lily/spanner.cc index 5b67f00571..54f6253131 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -110,18 +110,6 @@ Spanner::do_break_processing () || bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ()) { programming_error ("bounds of spanner are invalid"); -#if 0 - /* - lily crashes upon displaying this ... - - */ - - gh_display (ly_str02scm ("\nspanner:mutable_property_alist_\n")); - gh_display (mutable_property_alist_); - gh_display (ly_str02scm ("\nspanner:immutable_property_alist_\n")); - gh_display (immutable_property_alist_); - gh_newline (); -#endif span_p->suicide (); } else @@ -168,6 +156,10 @@ Spanner::get_bound (Direction d) const return spanned_drul_ [d]; } +/* + Set the items that this spanner spans. If D == LEFT, we also set the + X-axis parent of THIS to S. +*/ void Spanner::set_bound(Direction d, Grob*s) { @@ -202,7 +194,6 @@ Spanner::set_bound(Direction d, Grob*s) } } - Spanner::Spanner (SCM s) : Grob (s) { @@ -216,7 +207,6 @@ Spanner::Spanner (Spanner const &s) spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; } - Real Spanner::spanner_length() const { @@ -383,7 +373,5 @@ extend_spanner_over_elements (Grob*s) Grob* p2 = unsmob_grob (gh_cdr (pair)); sp->set_bound (LEFT,p1); sp->set_bound (RIGHT, p2); - - //extra precaution. }