X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=1ca6a4dce1f57ad256f472bba2c0eda6a960a602;hb=bfc7fdae57842d561568d1516337ce60e9aa8be0;hp=11f14ea1c6040dbbd5c544a777b9c066a2d0414b;hpb=1fa09b30b4bc32b9377eda2488b3694703b2a21f;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 11f14ea1c6..1ca6a4dce1 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -46,11 +46,26 @@ protected:
   DECLARE_TRANSLATOR_LISTENER (staff_span);
   virtual void finalize ();
   void process_music ();
+  virtual void derived_mark () const;
 };
 
+void
+Staff_symbol_engraver::derived_mark () const
+{
+  for (LEFT_and_RIGHT (d))
+    {
+      if (span_events_[d])
+        scm_gc_mark (span_events_[d]->self_scm ());
+    }
+}
+
 Staff_symbol_engraver::~Staff_symbol_engraver ()
 {
-  assert (!span_);
+  if (span_)
+    {
+      // Somehow finalize() was not called?
+      programming_error ("Have a pending spanner in destructor.");
+    }
 }
 
 Staff_symbol_engraver::Staff_symbol_engraver ()
@@ -80,7 +95,7 @@ Staff_symbol_engraver::process_music ()
       finished_span_ = span_;
       span_ = 0;
       if (first_start_)
-	first_start_ = false;
+        first_start_ = false;
     }
 
   if (span_events_[START]
@@ -95,7 +110,7 @@ Staff_symbol_engraver::start_spanner ()
     {
       span_ = make_spanner ("StaffSymbol", SCM_EOL);
       span_->set_bound (LEFT,
-			unsmob_grob (get_property ("currentCommandColumn")));
+                        unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
 
@@ -109,9 +124,9 @@ Staff_symbol_engraver::stop_spanner ()
     finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
 
   announce_end_grob (finished_span_,
-		     span_events_[STOP]
-		     ? span_events_[STOP]->self_scm ()
-		     : SCM_EOL);
+                     span_events_[STOP]
+                     ? span_events_[STOP]->self_scm ()
+                     : SCM_EOL);
 
   finished_span_ = 0;
 }
@@ -151,15 +166,15 @@ Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
 
 ADD_TRANSLATOR (Staff_symbol_engraver,
-		/* doc */
-		"Create the constellation of five (default) staff lines.",
+                /* doc */
+                "Create the constellation of five (default) staff lines.",
 
-		/* create */
-		"StaffSymbol ",
+                /* create */
+                "StaffSymbol ",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );