X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fledger-line-engraver.cc;h=cde6f5817cde603cca91c6d5b214cd7a739d35ac;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=32568dd30955c2e13b2d390fd5fd5df0436eac32;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index 32568dd309..cde6f5817c 100644
--- a/lily/ledger-line-engraver.cc
+++ b/lily/ledger-line-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  ledger-line-engraver.cc -- implement Ledger_line_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 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
+  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 "pointer-group-interface.hh"
@@ -11,23 +22,30 @@
 #include "engraver.hh"
 #include "staff-symbol.hh"
 
+#include "translator.icc"
+
 class Ledger_line_engraver : public Engraver
 {
   Spanner *span_;
+  vector<Grob *> ledgered_grobs_;
 
 public:
   TRANSLATOR_DECLARATIONS (Ledger_line_engraver);
 
 protected:
   virtual void finalize ();
-  PRECOMPUTED_VIRTUAL void process_music ();
-  virtual void acknowledge_grob (Grob_info);
+  void process_music ();
+
+  void acknowledge_ledgered (Grob_info);
+  void acknowledge_staff_symbol (Grob_info);
 
   void start_spanner ();
   void stop_spanner ();
+  void stop_translation_timestep ();
 };
 
-Ledger_line_engraver::Ledger_line_engraver ()
+Ledger_line_engraver::Ledger_line_engraver (Context *c)
+  : Engraver (c)
 {
   span_ = 0;
 }
@@ -36,14 +54,34 @@ void
 Ledger_line_engraver::start_spanner ()
 {
   assert (!span_);
+
   span_ = make_spanner ("LedgerLineSpanner", SCM_EOL);
+  span_->set_bound (LEFT, unsmob<Grob> (get_property ("currentCommandColumn")));
+}
 
-  span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+void
+Ledger_line_engraver::stop_translation_timestep ()
+{
+  if (span_)
+    {
+      for (vsize i = 0; i < ledgered_grobs_.size (); i++)
+        {
+          if (!to_boolean (ledgered_grobs_[i]->get_property ("no-ledgers")))
+            Pointer_group_interface::add_grob (span_,
+                                               ly_symbol2scm ("note-heads"),
+                                               ledgered_grobs_[i]);
+        }
+    }
+
+  ledgered_grobs_.clear ();
 }
 
 void
 Ledger_line_engraver::process_music ()
 {
+  /*
+    Need to do this, otherwise the first note might miss ledgers.
+  */
   if (!span_)
     start_spanner ();
 }
@@ -51,7 +89,7 @@ Ledger_line_engraver::process_music ()
 void
 Ledger_line_engraver::finalize ()
 {
-  stop_spanner();
+  stop_spanner ();
 }
 
 void
@@ -59,39 +97,48 @@ Ledger_line_engraver::stop_spanner ()
 {
   if (span_)
     {
-      span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      span_->set_bound (RIGHT, unsmob<Grob> (get_property ("currentCommandColumn")));
       span_ = 0;
     }
 }
 
 void
-Ledger_line_engraver::acknowledge_grob (Grob_info s)
+Ledger_line_engraver::acknowledge_staff_symbol (Grob_info s)
 {
-  if (Staff_symbol::has_interface (s.grob ()))
-    {
-      Spanner *sym = dynamic_cast<Spanner*> (s.grob ());
-
-      if (!span_
-	  || span_->get_bound (LEFT) != sym->get_bound (LEFT))
-	{
-	  stop_spanner ();
-	  start_spanner ();
-	}
-    }
-  else if (span_)
+  Spanner *sym = dynamic_cast<Spanner *> (s.grob ());
+
+  if (!span_
+      || (span_->get_bound (LEFT) != sym->get_bound (LEFT)))
     {
-      if (!to_boolean (s.grob ()->get_property ("no-ledgers")))
-	Pointer_group_interface::add_grob (span_, ly_symbol2scm ("note-heads"),
-					   s.grob ());
+      stop_spanner ();
+      start_spanner ();
     }
 }
 
-#include "translator.icc"
+void
+Ledger_line_engraver::acknowledge_ledgered (Grob_info s)
+{
+  ledgered_grobs_.push_back (s.grob ());
+}
+
+void
+Ledger_line_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Ledger_line_engraver, ledgered);
+  ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
+}
 
 ADD_TRANSLATOR (Ledger_line_engraver,
-		"Creates the spanner to draw ledger lines, and notices objects that need ledger lines",
-		/* creats*/ "LedgerLineSpanner",
-		/* accepts */ "",
-		/* acks  */ "staff-symbol-interface ledgered-interface", // ledgered-interface? 
-		/* reads */ "",
-		/* write */ "")
+                /* doc */
+                "Create the spanner to draw ledger lines, and notices"
+                " objects that need ledger lines.",
+
+                /* create */
+                "LedgerLineSpanner ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );