patch::: 1.5.43.jcn2

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index e8682df66bf4ffa7bb522ef183c9568b60cc014d..84c1cd10456a77b2f3e6b0c66882f034e16ca681 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,9 +3,9 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-    Mats Bengtsson <matsb@s3.kth.se>  (the ugly TeX parsing in text_dimension)
+    Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
  */
 
 #include <math.h>
@@ -29,7 +29,23 @@ Font_metric::text_dimension (String text) const
       switch (text[i]) 
        {
        case '\\':
-         for (i++; (i < text.length_i ()) && !isspace(text[i]) 
+  // accent marks use width of base letter
+         if (i +1 < text.length_i ())
+          {
+            if (text[i+1]=='\'' || text[i+1]=='`' || text[i+1]=='"' ||
+                text[i+1]=='^')
+              {
+                i++;
+                break;
+              }
+            // for string width \\ is a \ and \_ is a _.
+            if (text[i+1]=='\\' || text[i+1]=='_')        
+              {
+                break;
+              }
+          }
+         
+         for (i++; (i < text.length_i ()) && !isspace (text[i]) 
                 && text[i]!='{' && text[i]!='}'; i++)
            ;
          // ugh.
@@ -54,7 +70,7 @@ Font_metric::text_dimension (String text) const
   if (ydims.empty_b ())
     ydims = Interval (0,0);
 
-  return Box(Interval (0, w), ydims);
+  return Box (Interval (0, w), ydims);
 }
 
 
@@ -70,27 +86,32 @@ Font_metric::Font_metric ()
   smobify_self ();
 }
 
-Font_metric::Font_metric (Font_metric const &s)
+Font_metric::Font_metric (Font_metric const &)
 {
 }
 
+int
+Font_metric::count () const
+{
+  return 0;
+}
 
 Box 
-Font_metric::get_char (int )const
+Font_metric::get_char (int)const
 {
-  return Box (Interval(0,0),Interval (0,0));
+  return Box (Interval (0,0),Interval (0,0));
 }
 
 
 SCM
 Font_metric::mark_smob (SCM s)
 {
-  Font_metric * m = (Font_metric*) SCM_CELL_WORD_1(s);
+  Font_metric * m = (Font_metric*) SCM_CELL_WORD_1 (s);
   return m->description_;
 }
 
 int
-Font_metric::print_smob (SCM s, SCM port, scm_print_state * )
+Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 {
   Font_metric *m = unsmob_metrics (s);
   scm_puts ("#<Font_metric ", port);
@@ -100,9 +121,9 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state * )
 }
 
 
-IMPLEMENT_UNSMOB (Font_metric, metrics);
+
 IMPLEMENT_SMOBS (Font_metric);
-IMPLEMENT_DEFAULT_EQUAL_P(Font_metric);
+IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
 IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
 
 Molecule
@@ -116,21 +137,35 @@ 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 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)
+{
+  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]));
 }
 
 
 static void
 font_metric_init ()
 {
-   scm_make_gsubr ("ly-find-glyph-by-name", 2 , 0, 0, (Scheme_function_unknown) ly_find_glyph_by_name);
+   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);
+ADD_SCM_INIT_FUNC (font_metric_init, font_metric_init);