X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=0c5157d599c976e620a7e11747e360cf0ac14b51;hb=32f10f1e5741ddadbae0ed5d4bd3008a22fb6fb9;hp=e5566dfa4112c0262258773bb3c8e18b1116d1d5;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index e5566dfa41..0c5157d599 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -3,8 +3,8 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2004 Juergen Reuter , - Han-Wen Nienhuys + (c) 2000--2005 Juergen Reuter , + Han-Wen Nienhuys */ #include "engraver.hh" @@ -30,9 +30,8 @@ public: virtual void stop_translation_timestep (); virtual void finalize (); - private: - Item * create_custos (); + Item *create_custos (); bool custos_permitted; Link_array custodes_; Array pitches_; @@ -43,13 +42,12 @@ Custos_engraver::Custos_engraver () custos_permitted = false; } - void Custos_engraver::stop_translation_timestep () { /* delay typeset until we're at the next moment, so we can silence custodes at the end of the piece. - */ + */ pitches_.clear (); custos_permitted = false; @@ -61,14 +59,13 @@ Custos_engraver::start_translation_timestep () custodes_.clear (); } - void Custos_engraver::acknowledge_grob (Grob_info info) { - Item *item = dynamic_cast (info.grob_); + Item *item = dynamic_cast (info.grob_); if (item) { - Music * m = info.music_cause (); + Music *m = info.music_cause (); if (Bar_line::has_interface (info.grob_)) custos_permitted = true; else if (Note_head::has_interface (info.grob_) @@ -84,7 +81,7 @@ Custos_engraver::acknowledge_grob (Grob_info info) don't look at the staff-position, since we can't be sure whether Clef_engraver already applied a vertical shift. */ - pitches_.push (*unsmob_pitch (m->get_property ("pitch"))); + pitches_.push (*unsmob_pitch (m->get_property ("pitch"))); } } } @@ -94,7 +91,7 @@ Custos_engraver::process_acknowledged_grobs () { if (scm_is_string (get_property ("whichBar"))) custos_permitted = true; - + if (custos_permitted) { for (int i = pitches_.size (); i--;) @@ -106,24 +103,21 @@ Custos_engraver::process_acknowledged_grobs () if (scm_is_number (c0)) p += scm_to_int (c0); - c->set_property ("staff-position", - scm_int2num (p)); - + scm_int2num (p)); } pitches_.clear (); } } -Item* +Item * Custos_engraver::create_custos () { - Item* custos = make_item ("Custos", SCM_EOL); - - + Item *custos = make_item ("Custos", SCM_EOL); + custodes_.push (custos); - + return custos; } @@ -137,12 +131,10 @@ Custos_engraver::finalize () custodes_.clear (); } - - ADD_TRANSLATOR (Custos_engraver, -/* descr */ "", -/* creats*/ "Custos", -/* accepts */ "", -/* acks */ "bar-line-interface note-head-interface", -/* reads */ "", -/* write */ ""); + /* descr */ "", + /* creats*/ "Custos", + /* accepts */ "", + /* acks */ "bar-line-interface note-head-interface", + /* reads */ "", + /* write */ "");