* lily/axis-group-engraver.cc (finalize): extra check; if

process_music() is never called, then staffline_ == 0.

* VERSION: release 2.1.13

diff --git a/ChangeLog b/ChangeLog
index c283e4c0858e12cd4182083d147a543e396570b6..b625d0bedc43ccfb596287cde3cd7db390008833 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * 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 842bb6259b0ddc8bb05c6a65854051b3e5f8482b..689bd8de21427da550e4233b52d1d1ee069d10f3 100644 (file)
--- 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 0cff96e94679064decf5d4d1f4d4e8bbf8f5bc9d..38ffd0caf7d3131522639508548ed8c92695bf53 100644 (file)
--- 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");