X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-spacing-engraver.cc;h=fce1f161d08c671e5246bdcde442e4c0982a398b;hb=2628c3c9950b6abbb7bd74747726f8c01340e032;hp=0e1f8740c54ac847f094dadc58ba9f7dcb290c3c;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git diff --git a/lily/grace-spacing-engraver.cc b/lily/grace-spacing-engraver.cc index 0e1f8740c5..fce1f161d0 100644 --- a/lily/grace-spacing-engraver.cc +++ b/lily/grace-spacing-engraver.cc @@ -1,10 +1,21 @@ /* - grace-spacing-engraver.cc -- implement Grace_spacing_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2006--2012 Han-Wen - (c) 2006 Han-Wen + 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 . */ #include "engraver.hh" @@ -22,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; @@ -42,15 +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")); 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); + else + grace_spacing_->set_bound (RIGHT, column); } } @@ -63,14 +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.", + "Bookkeeping of shortest starting and playing notes in grace" + " note runs.", + + /* create */ + "GraceSpacing ", - /* create */ - "GraceSpacing ", + /* read */ + "currentMusicalColumn ", - /* read */ - "currentMusicalColumn ", - - /* write */ ""); + /* write */ + "" + );