* lily/lookup.cc (triangle): rewrite, obviating symmetric_x_triangle().

* lily/context.cc (Context): take key argument in ctor.
(create_context): new function

diff --git a/lily/context.cc b/lily/context.cc
index b57a98459e72c6660502aaa5d2bd8c4a24eeca2c..f11580d3943c3bdba542a8a337ac92bb5adc6825 100644 (file)
--- 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 42fbb1cf29ea54956231f1910e0bc36105d202a9..08444bfd8d17adfbf26f8fbdf9d5e8832b003678 100644 (file)
--- 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;
 }