Fix [a8 a32].

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 577471baa3ec63b6b580434fe575da1026e97182..8fd2a49931717a94369b6392c86314e45ca7d9be 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -23,14 +23,14 @@ Font_metric::text_dimension (String text) const
   Interval ydims;
   Real w=0.0;
   
-  for (int i = 0; i < text.length_i (); i++) 
+  for (int i = 0; i < text.length (); i++) 
     {
       
       switch (text[i]) 
        {
        case '\\':
   // accent marks use width of base letter
-         if (i +1 < text.length_i ())
+         if (i +1 < text.length ())
           {
             if (text[i+1]=='\'' || text[i+1]=='`' || text[i+1]=='"' ||
                 text[i+1]=='^')
@@ -45,7 +45,7 @@ Font_metric::text_dimension (String text) const
               }
           }
          
-         for (i++; (i < text.length_i ()) && !isspace (text[i]) 
+         for (i++; (i < text.length ()) && !isspace (text[i]) 
                 && text[i]!='{' && text[i]!='}'; i++)
            ;
          // ugh.
@@ -134,47 +134,33 @@ Font_metric::find_by_name (String) const
 }
 
 
-SCM
-ly_find_glyph_by_name (SCM font, SCM name)
+LY_DEFINE(ly_find_glyph_by_name, "ly-find-glyph-by-name", 2 , 0, 0,
+         (SCM font, SCM name),
+         "This function retrieves a Molecule for the glyph named @var{name} in
+@var{font}.  The font must be available as an AFM file.")
 {
-  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 unsmob_metrics (font)->find_by_name (ly_scm2string (name)).smobbed_copy ();
+  return fm->find_by_name (ly_scm2string (name)).smobbed_copy ();
 }
 
 
-SCM
-ly_text_dimension (SCM font, SCM text)
+LY_DEFINE(ly_text_dimension,"ly-text-dimension", 2 , 0, 0,
+         (SCM font, SCM text),
+         "Given the font metric in @var{font} and the string @var{text}, compute
+the extents of that text in that font. The return value is a pair of
+number-pairs.")
 {
   Box b;
-  
-  if (!unsmob_metrics (font) || !gh_string_p(text))
-    {
-      warning ("ly-find-glyph-by-name: invalid argument.");
-      Molecule m;
-      return m.smobbed_copy ();
-    }
-  else
-    {
-      b = unsmob_metrics (font)->text_dimension (ly_scm2string (text));
-    }
+  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]));
 }
 
 
-static void
-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);