* 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 f11580d3943c3bdba542a8a337ac92bb5adc6825..c06b9288ca77963cccffd30164204c4c4f1019be 100644 (file)
--- 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 08444bfd8d17adfbf26f8fbdf9d5e8832b003678..8cab963897a8f7352225aefd2211377b90c116a8 100644 (file)
--- 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;