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

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 7bf1f39796101043ce672ae60fff51118477053d..64224c48ea3854645df259bd855624f04eb2472f 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -155,9 +155,9 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph",
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  SCM_ASSERT_TYPE (ly_c_number_p (index), index, SCM_ARG2, __FUNCTION__, "number");
+  SCM_ASSERT_TYPE (scm_is_number (index), index, SCM_ARG2, __FUNCTION__, "number");
 
-  return fm->get_ascii_char_stencil (ly_scm2int (index)).smobbed_copy ();
+  return fm->get_ascii_char_stencil (scm_to_int (index)).smobbed_copy ();
 }
 
 LY_DEFINE (ly_text_dimension,"ly:text-dimension",
@@ -186,7 +186,7 @@ LY_DEFINE (ly_font_filename,"ly:font-filename",
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  return ly_car (fm->description_);
+  return scm_car (fm->description_);
 }
 
 
@@ -222,7 +222,7 @@ LY_DEFINE (ly_font_magnification,"ly:font-magnification", 1 , 0, 0,
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  return ly_cdr (fm->description_);
+  return scm_cdr (fm->description_);
 }
 
 LY_DEFINE (ly_font_design_size,"ly:font-design-size", 1 , 0, 0,
@@ -274,5 +274,5 @@ get_encoded_index (Font_metric *m, String input_coding, int code)
                      scm_makfrom0str (input_coding.to_str0 ()),
                      scm_makfrom0str (font_coding.to_str0 ()),
                      scm_int2num (code));
-  return ly_scm2int (s);
+  return scm_to_int (s);
 }