remove

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index ac2c14cdc39d11c7d16bb7fe93be624efca2e324..69db6c10868843f9577d138053f901363f579df8 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -452,8 +452,8 @@ Stencil
 Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) 
 {
   Stencil m;
-  String sym = ly_scm2string (ly_car (s));
-  String reg = ly_scm2string (ly_car (ly_cdr (s)));
+  String sym = ly_scm2string (scm_car (s));
+  String reg = ly_scm2string (scm_car (scm_cdr (s)));
 
   if (sym == "Discant")
     {
@@ -687,7 +687,7 @@ Stencil
 Lookup::triangle (Interval iv, Real thick, Real protude)
 {
   Box b ;
-  b[X_AXIS] = iv;
+  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"),
@@ -695,7 +695,9 @@ Lookup::triangle (Interval iv, Real thick, Real protude)
                      scm_make_real (iv.length ()), 
                      scm_make_real (protude), SCM_UNDEFINED);
 
-  return Stencil (b, s);
+  Stencil stc (b, s);
+  stc.translate_axis (iv[LEFT], X_AXIS);
+  return stc;  
 }
 
 
@@ -708,14 +710,14 @@ LY_DEFINE (ly_bracket ,"ly:bracket",
 {
   SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
   SCM_ASSERT_TYPE (is_number_pair (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
-  SCM_ASSERT_TYPE (ly_c_number_p (t), a, SCM_ARG3, __FUNCTION__, "number") ;
-  SCM_ASSERT_TYPE (ly_c_number_p (p), a, SCM_ARG4, __FUNCTION__, "number") ;
+  SCM_ASSERT_TYPE (scm_is_number (t), a, SCM_ARG3, __FUNCTION__, "number") ;
+  SCM_ASSERT_TYPE (scm_is_number (p), a, SCM_ARG4, __FUNCTION__, "number") ;
 
 
-  return Lookup::bracket ((Axis)ly_scm2int (a), ly_scm2interval (iv),
-                         ly_scm2double (t),
-                         ly_scm2double (p),
-                         0.95 * ly_scm2double (t)).smobbed_copy ();
+  return Lookup::bracket ((Axis)scm_to_int (a), ly_scm2interval (iv),
+                         scm_to_double (t),
+                         scm_to_double (p),
+                         0.95 * scm_to_double (t)).smobbed_copy ();
 }
 
 
@@ -730,9 +732,9 @@ LY_DEFINE (ly_filled_box ,"ly:round-filled-box",
 {
   SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
   SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
-  SCM_ASSERT_TYPE (ly_c_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
+  SCM_ASSERT_TYPE (scm_is_number (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
 
   return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),
-                                  ly_scm2double (blot)).smobbed_copy ();
+                                  scm_to_double (blot)).smobbed_copy ();
 }