X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftweak-engraver.cc;h=81138b3670ebd749b84f360b06ca99ac5eb13195;hb=24107d843c902a8101fbb696f47bf7538dd4493a;hp=188780c59171e6b5388938b4c847f836567425fe;hpb=1e8572b316ffeee9bcb6e0e5eded0106fe794411;p=lilypond.git diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc index 188780c591..81138b3670 100644 --- a/lily/tweak-engraver.cc +++ b/lily/tweak-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2012 Han-Wen Nienhuys + Copyright (C) 2005--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -60,14 +60,16 @@ Tweak_engraver::acknowledge_grob (Grob_info info) if (scm_is_symbol (scm_caaar (s))) { if (SCM_UNBNDP (grobname)) - grobname = scm_from_locale_symbol + grobname = scm_from_utf8_symbol (info.grob ()->name ().c_str ()); if (scm_is_eq (scm_caaar (s), grobname)) - if (scm_is_symbol (scm_cdaar (s))) - info.grob ()->set_property (scm_cdaar (s), scm_cdar (s)); - else - set_nested_property (info.grob (), scm_cdaar (s), - scm_cdar (s)); + { + if (scm_is_symbol (scm_cdaar (s))) + info.grob ()->set_property (scm_cdaar (s), scm_cdar (s)); + else + set_nested_property (info.grob (), scm_cdaar (s), + scm_cdar (s)); + } } else if (direct) set_nested_property (info.grob (), scm_cdaar (s),