From f2709fe419775fc1dd6df91a708e2bf7ec6e0c2b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 20 Jan 2004 17:56:26 +0000 Subject: [PATCH] * lily/axis-group-engraver.cc (finalize): extra check; if process_music() is never called, then staffline_ == 0. * VERSION: release 2.1.13 --- ChangeLog | 3 +++ VERSION | 2 +- lily/axis-group-engraver.cc | 20 +++++++++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c283e4c085..b625d0bedc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-01-20 Han-Wen Nienhuys + * lily/axis-group-engraver.cc (finalize): extra check; if + process_music() is never called, then staffline_ == 0. + * lily/simultaneous-music-iterator.cc (pending_moment): don't check run_always (). diff --git a/VERSION b/VERSION index 842bb6259b..689bd8de21 100644 --- a/VERSION +++ b/VERSION @@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=1 PATCH_LEVEL=13 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=hwn1 diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 0cff96e946..38ffd0caf7 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -41,16 +41,16 @@ Axis_group_engraver::Axis_group_engraver () void Axis_group_engraver::process_music () { -if (!staffline_) - { - staffline_ = get_spanner (); + if (!staffline_) + { + staffline_ = get_spanner (); - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); + Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_->set_bound (LEFT,it); + staffline_->set_bound (LEFT,it); - announce_grob(staffline_, SCM_EOL); -} + announce_grob(staffline_, SCM_EOL); + } } Spanner* @@ -66,6 +66,12 @@ Axis_group_engraver::get_spanner () const void Axis_group_engraver::finalize () { + if (!staffline_) + { + programming_error ("Huh? This context never lived?"); + return ; + } + String type = get_daddy_grav ()->context_name (); SCM dims = get_property ("verticalExtent"); -- 2.39.2