X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-scheme.cc;h=a3462354e07be6e76ed73b41bd6d04faee72d88c;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=aaa5b529b3d8033ce83a4a94972f3f0f4d46c7ca;hpb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;p=lilypond.git diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc index aaa5b529b3..a3462354e0 100644 --- a/lily/context-scheme.cc +++ b/lily/context-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2014 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -21,6 +21,7 @@ #include "context.hh" #include "context-def.hh" #include "dispatcher.hh" +#include "grob-properties.hh" LY_DEFINE (ly_context_current_moment, "ly:context-current-moment", @@ -70,7 +71,7 @@ LY_DEFINE (ly_context_grob_definition, "ly:context-grob-definition", LY_ASSERT_SMOB (Context, context, 1); LY_ASSERT_TYPE (ly_is_symbol, name, 2); - return updated_grob_properties (tr, name); + return Grob_property_info (tr, name).updated (); } LY_DEFINE (ly_context_pushpop_property, "ly:context-pushpop-property", @@ -101,7 +102,7 @@ LY_DEFINE (ly_context_property, "ly:context-property", LY_ASSERT_TYPE (ly_is_symbol, sym, 2); Context *t = Context::unsmob (context); - SCM result = t->internal_get_property (sym); + SCM result = t->get_property (sym); return def != SCM_UNDEFINED && scm_is_null (result) ? def : result; }