(triangle): add s to 0triangle.

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index e334548fbb75601c2803dba7ca49223ba7634a40..3c29320258d3cc6ac26dea45d9736cf6ff4a658e 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -165,7 +165,7 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph",
 LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
           2, 0, 0,
          (SCM font, SCM name),
-          "Return the index for @{name} in @var{font}.")
+          "Return the index for @var{name} in @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
@@ -183,13 +183,13 @@ LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   SCM_ASSERT_TYPE (scm_is_integer (index), index, SCM_ARG2, __FUNCTION__, "index");
 
-  return scm_from_unsigned_integer (fm->index_to_charcode (ly_scm2int (index)));
+  return scm_from_unsigned_integer (fm->index_to_charcode (scm_to_int (index)));
 }
 
 LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
           2, 0, 0,
          (SCM font, SCM name),
-          "Return the character code for glyph @{name} in @var{font}.")
+          "Return the character code for glyph @var{name} in @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
@@ -284,14 +284,6 @@ Font_metric::index_to_charcode (int i) const
   return (unsigned) index_to_ascii (i);
 }
 
-#if 0
-unsigned
-Font_metric::glyph_name_to_charcode (String glyph_name) const
-{
-  return (unsigned) index_to_ascii (name_to_index (glyph_name));
-}
-#endif
-
 Stencil
 Font_metric::get_ascii_char_stencil (int code) const
 {
@@ -329,3 +321,9 @@ Font_metric::attachment_point (String) const
 {
   return Offset (0, 0);
 }
+
+SCM
+Font_metric::sub_fonts () const
+{
+  return SCM_EOL;
+}