duh.

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 11f63489e8913c59b32bab6fa37b6a94a0c8cb8c..84c1cd10456a77b2f3e6b0c66882f034e16ca681 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -137,14 +137,25 @@ Font_metric::find_by_name (String) const
 SCM
 ly_find_glyph_by_name (SCM font, SCM name)
 {
-  if (!unsmob_metrics (font) || !gh_string_p (name))
-    {
-      warning ("ly-find-glyph-by-name: invalid argument.");
-      Molecule m;
-      return m.smobbed_copy ();
-    }
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE(fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE(gh_string_p (name), name, SCM_ARG2, __FUNCTION__, "string");
+
+  return fm->find_by_name (ly_scm2string (name)).smobbed_copy ();
+}
+
 
-  return unsmob_metrics (font)->find_by_name (ly_scm2string (name)).smobbed_copy ();
+SCM
+ly_text_dimension (SCM font, SCM text)
+{
+  Box b;
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE(fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE(gh_string_p (text), text, SCM_ARG2, __FUNCTION__, "string");
+
+  b = fm->text_dimension (ly_scm2string (text));
+  
+  return gh_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm(b[Y_AXIS]));
 }
 
 
@@ -153,6 +164,8 @@ font_metric_init ()
 {
    scm_c_define_gsubr ("ly-find-glyph-by-name", 2 , 0, 0,
                       (Scheme_function_unknown) ly_find_glyph_by_name);
+   scm_c_define_gsubr ("ly-text-dimension", 2 , 0, 0,
+                      (Scheme_function_unknown) ly_text_dimension);
 }
 
 ADD_SCM_INIT_FUNC (font_metric_init, font_metric_init);