From ed1653c4e29f37f45dca16bb82c4cabed07be765 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 14 Nov 2004 02:11:19 +0000 Subject: [PATCH] * lily/lookup.cc (triangle): rewrite, obviating symmetric_x_triangle(). * lily/context.cc (Context): take key argument in ctor. (create_context): new function --- lily/context.cc | 6 +++--- lily/lookup.cc | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lily/context.cc b/lily/context.cc index f11580d394..c06b9288ca 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -150,9 +150,9 @@ Context::find_create_context (SCM n, String id, SCM operations) } - current = create_context (path[i], - this_id, - ops); + current = current->create_context (path[i], + this_id, + ops); } return current; diff --git a/lily/lookup.cc b/lily/lookup.cc index 08444bfd8d..8cab963897 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -670,14 +670,14 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) b[a] = iv; b[other] = Interval (-1, 1) * thick * 0.5; - Stencil m = round_filled_box (b, blot); + Stencil m = round_filled_box (b, blot); b[a] = Interval (iv[UP] - thick, iv[UP]); - Interval oi = Interval (-thick/2, thick/2 + fabs (protude)) ; - oi *= sign (protude); + Interval oi = Interval (-thick/2, thick/2 + fabs (protude)); + oi *= sign (protude); b[other] = oi; m.add_stencil (round_filled_box (b, blot)); - b[a] = Interval (iv[DOWN], iv[DOWN] +thick); + b[a] = Interval (iv[DOWN], iv[DOWN] + thick); m.add_stencil (round_filled_box (b,blot)); return m; -- 2.39.2