X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmelody-engraver.cc;h=0ebd1324506ebf7b404a3ab640ba57e746cf4f91;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=96873d3293b778f2cdfb21bf7633cf3b382b4c67;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc index 96873d3293..0ebd132450 100644 --- 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 + Copyright (C) 1997--2012 Han-Wen Nienhuys 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 . */ - #include "engraver.hh" #include "item.hh" @@ -27,9 +26,9 @@ class Melody_engraver : public Engraver { Grob *melody_item_; - Grob *stem_; + Grob *stem_; protected: - + DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (slur); TRANSLATOR_DECLARATIONS (Melody_engraver); @@ -37,7 +36,6 @@ protected: void process_music (); }; - Melody_engraver::Melody_engraver () { stem_ = 0; @@ -50,7 +48,7 @@ Melody_engraver::process_music () if (scm_is_string (get_property ("whichBar"))) melody_item_ = 0; } - + void Melody_engraver::stop_translation_timestep () { @@ -59,51 +57,47 @@ Melody_engraver::stop_translation_timestep () { 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::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); 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 */ - "" - ); -