X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=63b75650351026c101dd18b757cff1254a16de16;hb=3dfd0a47e01374e0d8d1e6b127fa3f7a15a53edc;hp=eeb219e244f0c0835ab20c517e137b0f85ded724;hpb=dc067afa0915bb0ecbd34d2f7f413f616d893c32;p=lilypond.git diff --git a/lily/grob.cc b/lily/grob.cc index eeb219e244..63b7565035 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -403,7 +403,7 @@ Grob::get_offset (Axis a) const UGH: can't fold next 2 statements together. Apparently GCC thinks dim_cache_[a].offset_ is unaliased. */ - Real off = robust_scm2double (internal_get_property (sym), 0.0); + Real off = robust_scm2double (get_property (sym), 0.0); if (me->dim_cache_[a].offset_) { *me->dim_cache_[a].offset_ += off; @@ -458,20 +458,15 @@ Grob::extent (Grob *refp, Axis a) const /* Order is significant: ?-extent may trigger suicide. */ - SCM ext_sym - = (a == X_AXIS) - ? ly_symbol2scm ("X-extent") - : ly_symbol2scm ("Y-extent"); - - SCM ext = internal_get_property (ext_sym); + SCM ext = (a == X_AXIS) + ? get_property ("X-extent") + : get_property ("Y-extent"); if (is_number_pair (ext)) real_ext.unite (ly_scm2interval (ext)); - SCM min_ext_sym - = (a == X_AXIS) - ? ly_symbol2scm ("minimum-X-extent") - : ly_symbol2scm ("minimum-Y-extent"); - SCM min_ext = internal_get_property (min_ext_sym); + SCM min_ext = (a == X_AXIS) + ? get_property ("minimum-X-extent") + : get_property ("minimum-Y-extent"); if (is_number_pair (min_ext)) real_ext.unite (ly_scm2interval (min_ext));