X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=9781002205780066c6ba28ff4522252f95791172;hb=1753b1a73742a5b0893037116bb6f2febba277f3;hp=9666930e3a94bbb2594d738c99d82245edac247a;hpb=5320f6d196dd67186178adcb6e5debdbbec8aee8;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 9666930e3a..9781002205 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -770,8 +770,8 @@ LY_DEFINE(ly_bracket ,"ly:bracket", "given by @var{iv}. The wings protude by an amount of @var{p}, which " "may be negative. The thickness is given by @var{t}.") { - SCM_ASSERT_TYPE(ly_axis_p (a), a, SCM_ARG1, __FUNCTION__, "axis") ; - SCM_ASSERT_TYPE(ly_number_pair_p (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ; + SCM_ASSERT_TYPE(is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ; + SCM_ASSERT_TYPE(is_number_pair (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ; SCM_ASSERT_TYPE(gh_number_p (t), a, SCM_ARG3, __FUNCTION__, "number") ; SCM_ASSERT_TYPE(gh_number_p (p), a, SCM_ARG4, __FUNCTION__, "number") ; @@ -788,8 +788,8 @@ LY_DEFINE(ly_filled_box ,"ly:round-filled-box", (SCM xext, SCM yext, SCM blot), "Make a filled-box of dimensions @var{xext}, @var{yext} and roundness @var{blot}.") { - SCM_ASSERT_TYPE(ly_number_pair_p (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ; - SCM_ASSERT_TYPE(ly_number_pair_p (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ; + SCM_ASSERT_TYPE(is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ; + SCM_ASSERT_TYPE(is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ; SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ; return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),