release: 1.3.131

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 08a27382ce9eb1934a5069f327f0a46d60aba669..e8682df66bf4ffa7bb522ef183c9568b60cc014d 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
     Mats Bengtsson <matsb@s3.kth.se>  (the ugly TeX parsing in text_dimension)
  */
@@ -11,13 +11,14 @@
 #include <math.h>
 #include <ctype.h>
 
+#include "warn.hh"
 #include "molecule.hh"
 #include "ly-smobs.icc"
 #include "font-metric.hh"
 #include "string.hh"
 
 Box
-Font_metric::text_dimension (String text, Real mag) const
+Font_metric::text_dimension (String text) const
 {
   Interval ydims;
   Real w=0.0;
@@ -39,11 +40,11 @@ Font_metric::text_dimension (String text, Real mag) const
          break;
        
        default: 
-         Box b = get_char ((unsigned char)text[i],mag);
+         Box b = get_char ((unsigned char)text[i]);
          
          // Ugh, use the width of 'x' for unknown characters
          if (b[X_AXIS].length () == 0) 
-           b = get_char ((unsigned char)'x',mag);
+           b = get_char ((unsigned char)'x');
          
          w += b[X_AXIS].length ();
          ydims.unite (b[Y_AXIS]);
@@ -57,14 +58,6 @@ Font_metric::text_dimension (String text, Real mag) const
 }
 
 
-Box
-Scaled_font_metric::text_dimension (String t,Real mag) const
-{
-  Box b (orig_l_->text_dimension (t));
-
-  b.scale (magnification_f_ * mag);
-  return b;
-}
 
 Font_metric::~Font_metric ()
 {
@@ -72,34 +65,28 @@ Font_metric::~Font_metric ()
 
 Font_metric::Font_metric ()
 {
-  name_ = SCM_EOL;
+  description_ = SCM_EOL;
 
   smobify_self ();
 }
 
-Font_metric::Font_metric (Font_metric const &)
+Font_metric::Font_metric (Font_metric const &s)
 {
 }
 
 
 Box 
-Font_metric::get_char (int, Real )const
+Font_metric::get_char (int )const
 {
   return Box (Interval(0,0),Interval (0,0));
 }
 
-SCM
-Font_metric::description () const
-{
-  return gh_cons (name_, gh_int2scm (0));
-}
-
 
 SCM
 Font_metric::mark_smob (SCM s)
 {
   Font_metric * m = (Font_metric*) SCM_CELL_WORD_1(s);
-  return m->name_;
+  return m->description_;
 }
 
 int
@@ -107,7 +94,7 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state * )
 {
   Font_metric *m = unsmob_metrics (s);
   scm_puts ("#<Font_metric ", port);
-  scm_display (m->name_, port);
+  scm_write (m->description_, port);
   scm_puts (">", port);
   return 1;
 }
@@ -119,7 +106,31 @@ IMPLEMENT_DEFAULT_EQUAL_P(Font_metric);
 IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
 
 Molecule
-Font_metric::find_by_name (String, Real mag ) const
+Font_metric::find_by_name (String) const
 {
-  assert (false);
+  Molecule m ;
+  return m;
 }
+
+
+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 ();
+    }
+
+  return unsmob_metrics (font)->find_by_name (ly_scm2string (name)).smobbed_copy ();
+}
+
+
+static void
+font_metric_init ()
+{
+   scm_make_gsubr ("ly-find-glyph-by-name", 2 , 0, 0, (Scheme_function_unknown) ly_find_glyph_by_name);
+}
+
+ADD_SCM_INIT_FUNC(font_metric_init, font_metric_init);