From 48eb640005f5abb84b3d6f8db2e1704d4bff7645 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 14 Nov 2004 02:07:49 +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 | 4 ++-- lily/lookup.cc | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lily/context.cc b/lily/context.cc index b57a98459e..f11580d394 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -186,7 +186,7 @@ Context::create_context (Context_def * cdef, = cdef->instantiate (ops, key); scm_gc_unprotect_object (key->self_scm ()); - new_group->id_string_ = this_id; + new_group->id_string_ = id; add_context (new_group); apply_property_operations (new_group, ops); @@ -268,7 +268,7 @@ Context::get_default_interpreter () t = unsmob_context_def (this->definition_); } - Context *tg = create_context (t, "", SCM_EOL) + Context *tg = create_context (t, "", SCM_EOL); if (!tg->is_bottom_context ()) return tg->get_default_interpreter (); else diff --git a/lily/lookup.cc b/lily/lookup.cc index 42fbb1cf29..08444bfd8d 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -694,10 +694,13 @@ Lookup::triangle (Interval iv, Real thick, Real protude) Offset z1(iv[LEFT], 0); Offset z2(iv[RIGHT], 0); Offset z3(z2[X_AXIS]/2, protude); - - Stencil tri = make_line (z1, z2); - tri.add_stencil (make_line (z2, z3)); - tri.add_stencil (make_line (z3, z1)); + + /* + TODO: move Triangle to Line_interface ? + */ + Stencil tri = Line_interface::make_line (thick, z1, z2); + tri.add_stencil (Line_interface::make_line (thick, z2, z3)); + tri.add_stencil (Line_interface::make_line (thick, z3, z1)); return tri; } -- 2.39.2