lilypond-manuals.css: edit color scheme and some spacing

[lilypond.git] / lily / melody-engraver.cc

diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc
index 96873d3293b778f2cdfb21bf7633cf3b382b4c67..65f464c357e16982085603a0d86013508342159d 100644 (file)
--- a/lily/melody-engraver.cc
+++ b/lily/melody-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
@@ -17,7 +17,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include "engraver.hh"
 
 #include "item.hh"
@@ -27,18 +26,19 @@
 class Melody_engraver : public Engraver
 {
   Grob *melody_item_;
-  Grob *stem_; 
+  Grob *stem_;
 protected:
-  
-  DECLARE_ACKNOWLEDGER (stem);
-  DECLARE_ACKNOWLEDGER (slur);
+
+  void acknowledge_stem (Grob_info);
+  void acknowledge_slur (Grob_info);
   TRANSLATOR_DECLARATIONS (Melody_engraver);
   void stop_translation_timestep ();
+  void process_acknowledged ();
   void process_music ();
 };
 
-
-Melody_engraver::Melody_engraver ()
+Melody_engraver::Melody_engraver (Context *c)
+  : Engraver (c)
 {
   stem_ = 0;
   melody_item_ = 0;
@@ -50,27 +50,35 @@ Melody_engraver::process_music ()
   if (scm_is_string (get_property ("whichBar")))
     melody_item_ = 0;
 }
-  
+
+/*
+  Used to be in stop_translation_timestep, but grobs can't
+  be created here.
+*/
 void
-Melody_engraver::stop_translation_timestep ()
+Melody_engraver::process_acknowledged ()
 {
   if (stem_
       && !is_direction (stem_->get_property_data ("neutral-direction")))
     {
       extract_grob_set (stem_, "rests", rests);
       if (rests.size ())
-       melody_item_ = 0;
+        melody_item_ = 0;
       else
-       {
-         if (!melody_item_)
-           melody_item_ = make_item ("MelodyItem", stem_->self_scm ());
+        {
+          if (!melody_item_)
+            melody_item_ = make_item ("MelodyItem", stem_->self_scm ());
 
-         Melody_spanner::add_stem (melody_item_, stem_);
-       }
+          Melody_spanner::add_stem (melody_item_, stem_);
+        }
     }
-  stem_ = 0;
 }
 
+void
+Melody_engraver::stop_translation_timestep ()
+{
+  stem_ = 0;
+}
 
 void
 Melody_engraver::acknowledge_slur (Grob_info /* info */)
@@ -78,32 +86,34 @@ Melody_engraver::acknowledge_slur (Grob_info /* info */)
   melody_item_ = 0;
 }
 
-
 void
 Melody_engraver::acknowledge_stem (Grob_info info)
 {
   stem_ = info.grob ();
 }
 
-
-
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (Melody_engraver, stem);
-ADD_ACKNOWLEDGER (Melody_engraver, slur);
+
+void
+Melody_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Melody_engraver, stem);
+  ADD_ACKNOWLEDGER (Melody_engraver, slur);
+}
 
 ADD_TRANSLATOR (Melody_engraver,
-               /* doc */
-               "Create information for context dependent typesetting"
-               " decisions.",
+                /* doc */
+                "Create information for context dependent typesetting"
+                " decisions.",
+
+                /* create */
+                "MelodyItem ",
 
-               /* create */
-               "MelodyItem ",
+                /* read */
+                "",
 
-               /* read */
-               "",
+                /* write */
+                ""
+               );
 
-               /* write */
-               ""
-               );
-