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

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 69db6c10868843f9577d138053f901363f579df8..42fbb1cf29ea54956231f1910e0bc36105d202a9 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -690,14 +690,16 @@ Lookup::triangle (Interval iv, Real thick, Real protude)
   b[X_AXIS] = Interval (0, iv.length());
   b[Y_AXIS] = Interval (0 <? protude , 0 >? protude);
 
-  SCM s = scm_list_n (ly_symbol2scm ("symmetric-x-triangle"),
-                     scm_make_real (thick),
-                     scm_make_real (iv.length ()), 
-                     scm_make_real (protude), SCM_UNDEFINED);
-
-  Stencil stc (b, s);
-  stc.translate_axis (iv[LEFT], X_AXIS);
-  return stc;  
+
+  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));
+
+  return tri;
 }