X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-spacing-engraver.cc;h=5da9c90b5cc40b16f177261373e99c2096fdb0b3;hb=bc3062dd8a07c51e074ba45e2718e1331a1e3a42;hp=37beddc538fe058d75439ba5df2ddcf88dba1a07;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git diff --git a/lily/grace-spacing-engraver.cc b/lily/grace-spacing-engraver.cc index 37beddc538..5da9c90b5c 100644 --- a/lily/grace-spacing-engraver.cc +++ b/lily/grace-spacing-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2009 Han-Wen + Copyright (C) 2006--2015 Han-Wen LilyPond is free software: you can redistribute it and/or modify @@ -33,12 +33,11 @@ protected: Moment last_moment_; Spanner *grace_spacing_; - + void process_music (); void stop_translation_timestep (); }; - Grace_spacing_engraver::Grace_spacing_engraver () { grace_spacing_ = 0; @@ -53,20 +52,19 @@ Grace_spacing_engraver::process_music () grace_spacing_ = make_spanner ("GraceSpacing", SCM_EOL); } - if (grace_spacing_ && (now.grace_part_ || last_moment_.grace_part_)) { - Grob *column = unsmob_grob (get_property ("currentMusicalColumn")); + Grob *column = unsmob (get_property ("currentMusicalColumn")); Pointer_group_interface::add_grob (grace_spacing_, - ly_symbol2scm ("columns"), - column); + ly_symbol2scm ("columns"), + column); column->set_object ("grace-spacing", grace_spacing_->self_scm ()); if (!grace_spacing_->get_bound (LEFT)) - grace_spacing_->set_bound (LEFT, column); + grace_spacing_->set_bound (LEFT, column); else - grace_spacing_->set_bound (RIGHT, column); + grace_spacing_->set_bound (RIGHT, column); } } @@ -79,17 +77,16 @@ Grace_spacing_engraver::stop_translation_timestep () grace_spacing_ = 0; } - ADD_TRANSLATOR (Grace_spacing_engraver, - "Bookkeeping of shortest starting and playing notes in grace" - " note runs.", - - /* create */ - "GraceSpacing ", - - /* read */ - "currentMusicalColumn ", - - /* write */ - "" - ); + "Bookkeeping of shortest starting and playing notes in grace" + " note runs.", + + /* create */ + "GraceSpacing ", + + /* read */ + "currentMusicalColumn ", + + /* write */ + "" + );