X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-engraver.cc;h=f9994d69541f0e3386c805ee107a2592415a12f1;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0b5cb6640d1b914b48d4d3996c0104fb9e8d691f;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git

diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 0b5cb6640d..f9994d6954 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -1,39 +1,90 @@
 /*
-  staff-symbol-engraver.cc -- implement Staff_symbol_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "staff-symbol-engraver.hh"
+#include "engraver.hh"
+#include "international.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
+
+class Staff_symbol_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Staff_symbol_engraver);
+
+protected:
+  Drul_array<Stream_event *> span_events_;
+  Spanner *span_;
+  Spanner *finished_span_;
+  bool first_start_;
+
+protected:
+  virtual void start_spanner ();
+  virtual void stop_spanner ();
+
+  void stop_translation_timestep ();
+  virtual ~Staff_symbol_engraver ();
+  DECLARE_ACKNOWLEDGER (grob);
+  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 ()
 {
   finished_span_ = 0;
-  first_start_ = true; 
+  first_start_ = true;
   span_ = 0;
-  span_events_[LEFT] = 0;
-  span_events_[RIGHT] = 0;
+  span_events_.set (0, 0);
 }
 
-bool
-Staff_symbol_engraver::try_music (Music *music)
+IMPLEMENT_TRANSLATOR_LISTENER (Staff_symbol_engraver, staff_span);
+void
+Staff_symbol_engraver::listen_staff_span (Stream_event *ev)
 {
-  Direction d = to_dir (music->get_property ("span-direction"));
+  Direction d = to_dir (ev->get_property ("span-direction"));
   if (d)
-    {
-      span_events_[d] = music;
-      return true;
-    }
-  
-  return false;
+    ASSIGN_EVENT_ONCE (span_events_[d], ev);
+  else
+    programming_error ("staff-span event has no direction");
 }
 
 void
@@ -43,6 +94,8 @@ Staff_symbol_engraver::process_music ()
     {
       finished_span_ = span_;
       span_ = 0;
+      if (first_start_)
+        first_start_ = false;
     }
 
   if (span_events_[START]
@@ -56,16 +109,25 @@ Staff_symbol_engraver::start_spanner ()
   if (!span_)
     {
       span_ = make_spanner ("StaffSymbol", SCM_EOL);
+      span_->set_bound (LEFT,
+                        Grob::unsmob (get_property ("currentCommandColumn")));
     }
 }
 
 void
 Staff_symbol_engraver::stop_spanner ()
 {
-  if (finished_span_ && !finished_span_->get_bound (RIGHT))
-    {
-      finished_span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-    }
+  if (!finished_span_)
+    return;
+
+  if (!finished_span_->get_bound (RIGHT))
+    finished_span_->set_bound (RIGHT, Grob::unsmob (get_property ("currentCommandColumn")));
+
+  announce_end_grob (finished_span_,
+                     span_events_[STOP]
+                     ? span_events_[STOP]->self_scm ()
+                     : SCM_EOL);
+
   finished_span_ = 0;
 }
 
@@ -73,15 +135,10 @@ void
 Staff_symbol_engraver::stop_translation_timestep ()
 {
   if ((span_events_[START] || first_start_)
-      && span_
-      && !span_->get_bound (LEFT))
-    {
-      span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-      first_start_ = false;
-    }
+      && span_)
+    first_start_ = false;
 
-  span_events_[START] = 0;
-  span_events_[STOP] = 0;
+  span_events_.set (0, 0);
   stop_spanner ();
 }
 
@@ -93,28 +150,31 @@ Staff_symbol_engraver::finalize ()
   stop_spanner ();
 }
 
+/*
+  Todo: staff-symbol-referencer iface.
+*/
 void
 Staff_symbol_engraver::acknowledge_grob (Grob_info s)
 {
-
-  /*
-    Perhaps should try to take SeparationItem as bound of the staff
-    symbol?
-   */
-  if (span_  || finished_span_ )
+  if (span_ || finished_span_)
     {
       Spanner *my = span_ ? span_ : finished_span_;
       s.grob ()->set_object ("staff-symbol", my->self_scm ());
     }
 }
 
-#include "translator.icc"
-ADD_ACKNOWLEDGER(Staff_symbol_engraver,grob);
+ADD_ACKNOWLEDGER (Staff_symbol_engraver, grob);
+
 ADD_TRANSLATOR (Staff_symbol_engraver,
-		/* descr */ "Create the constellation of five (default) "
-		"staff lines.",
-		/* creats*/ "StaffSymbol",
-		/* accepts */ "staff-span-event",
-		/* acks  */ "",
-		/* reads */ "",
-		/* write */ "");
+                /* doc */
+                "Create the constellation of five (default) staff lines.",
+
+                /* create */
+                "StaffSymbol ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );