X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fledger-line-engraver.cc;h=cde6f5817cde603cca91c6d5b214cd7a739d35ac;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=d5ba5da8c8c305440d1bb1727afe19b05b5f5fb7;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git

diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index d5ba5da8c8..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--2009 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,11 +22,13 @@
 #include "engraver.hh"
 #include "staff-symbol.hh"
 
+#include "translator.icc"
+
 class Ledger_line_engraver : public Engraver
 {
   Spanner *span_;
-  vector<Grob*> ledgered_grobs_;
-  
+  vector<Grob *> ledgered_grobs_;
+
 public:
   TRANSLATOR_DECLARATIONS (Ledger_line_engraver);
 
@@ -23,15 +36,16 @@ protected:
   virtual void finalize ();
   void process_music ();
 
-  DECLARE_ACKNOWLEDGER (ledgered);
-  DECLARE_ACKNOWLEDGER (staff_symbol);
+  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;
 }
@@ -42,7 +56,7 @@ 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
@@ -51,12 +65,12 @@ 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]);
-	}
+        {
+          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 ();
@@ -66,7 +80,7 @@ void
 Ledger_line_engraver::process_music ()
 {
   /*
-    Need to do this, otherwise the first note might miss ledgers. 
+    Need to do this, otherwise the first note might miss ledgers.
   */
   if (!span_)
     start_spanner ();
@@ -83,8 +97,7 @@ Ledger_line_engraver::stop_spanner ()
 {
   if (span_)
     {
-      span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-      Pointer_group_interface::set_ordered (span_, ly_symbol2scm ("elements"), false);
+      span_->set_bound (RIGHT, unsmob<Grob> (get_property ("currentCommandColumn")));
       span_ = 0;
     }
 }
@@ -108,21 +121,24 @@ Ledger_line_engraver::acknowledge_ledgered (Grob_info s)
   ledgered_grobs_.push_back (s.grob ());
 }
 
-#include "translator.icc"
+void
+Ledger_line_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Ledger_line_engraver, ledgered);
+  ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
+}
 
-ADD_ACKNOWLEDGER (Ledger_line_engraver, ledgered);
-ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
 ADD_TRANSLATOR (Ledger_line_engraver,
-		/* doc */
-		"Create the spanner to draw ledger lines, and notices"
-		" objects that need ledger lines.",
+                /* doc */
+                "Create the spanner to draw ledger lines, and notices"
+                " objects that need ledger lines.",
 
-		/* create */
-		"LedgerLineSpanner ",
+                /* create */
+                "LedgerLineSpanner ",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );