Web-ja: update introduction

[lilypond.git] / lily / staff-symbol-engraver.cc

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index e5d981b04e28230e39a392b266d9aceb9284b49f..fad9f0437900d5765301d6eb82376b9ce714d38e 100644 (file)
--- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -42,18 +42,34 @@ protected:
 
   void stop_translation_timestep ();
   virtual ~Staff_symbol_engraver ();
-  DECLARE_ACKNOWLEDGER (grob);
-  DECLARE_TRANSLATOR_LISTENER (staff_span);
+  void acknowledge_grob (Grob_info);
+  void listen_staff_span (Stream_event *);
   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 ()
+Staff_symbol_engraver::Staff_symbol_engraver (Context *c)
+  : Engraver (c)
 {
   finished_span_ = 0;
   first_start_ = true;
@@ -61,7 +77,6 @@ Staff_symbol_engraver::Staff_symbol_engraver ()
   span_events_.set (0, 0);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Staff_symbol_engraver, staff_span);
 void
 Staff_symbol_engraver::listen_staff_span (Stream_event *ev)
 {
@@ -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")));
     }
 }
 
@@ -106,12 +121,12 @@ Staff_symbol_engraver::stop_spanner ()
     return;
 
   if (!finished_span_->get_bound (RIGHT))
-    finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+    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;
 }
@@ -148,18 +163,24 @@ Staff_symbol_engraver::acknowledge_grob (Grob_info s)
     }
 }
 
-ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
+
+void
+Staff_symbol_engraver::boot ()
+{
+  ADD_LISTENER (Staff_symbol_engraver, staff_span);
+  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 */
+                ""
+               );