X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=f2ef9697a1f86566c15e5a621f7f6b76020b7287;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=1b9cf0b08a7c03fd061d740602d9e0b69e0b1df3;hpb=f1bb461ca8037b12343479b22d56bf96abe238b6;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 1b9cf0b08a..f2ef9697a1 100644 --- a/lily/script-engraver.cc +++ b/lily/script-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--2015 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 @@ -58,6 +58,8 @@ protected: DECLARE_ACKNOWLEDGER (rhythmic_head); DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (tie); + DECLARE_END_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (inline_accidental); @@ -88,7 +90,7 @@ Script_engraver::listen_articulation (Stream_event *ev) void copy_property (Grob *g, SCM sym, SCM alist) { - if (g->internal_get_property (sym) == SCM_EOL) + if (g->get_property (sym) == SCM_EOL) { SCM entry = scm_assoc (sym, alist); if (scm_is_pair (entry)) @@ -199,6 +201,26 @@ Script_engraver::acknowledge_stem_tremolo (Grob_info info) } } +void +Script_engraver::acknowledge_tie (Grob_info info) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} + +void +Script_engraver::acknowledge_end_tie (Grob_info info) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} + void Script_engraver::acknowledge_inline_accidental (Grob_info info) { @@ -255,6 +277,8 @@ Script_engraver::stop_translation_timestep () ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head); ADD_ACKNOWLEDGER (Script_engraver, stem); +ADD_ACKNOWLEDGER (Script_engraver, tie); +ADD_END_ACKNOWLEDGER (Script_engraver, tie); ADD_ACKNOWLEDGER (Script_engraver, note_column); ADD_ACKNOWLEDGER (Script_engraver, stem_tremolo); ADD_ACKNOWLEDGER (Script_engraver, inline_accidental);