patch::: 1.5.17.jcn4

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 467f0f84cfdb15cfa8d70957131847fc03751c1b..0fcf96fc11782432fab276f86a2b6d76ff01c24b 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,14 +3,16 @@
   
   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)
+    Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
  */
 
 #include <math.h>
 #include <ctype.h>
 
+#include "warn.hh"
+#include "molecule.hh"
 #include "ly-smobs.icc"
 #include "font-metric.hh"
 #include "string.hh"
@@ -27,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.
@@ -38,11 +56,11 @@ Font_metric::text_dimension (String text) const
          break;
        
        default: 
-         Box b = get_char ((unsigned char)text[i],false);
+         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',false);
+           b = get_char ((unsigned char)'x');
          
          w += b[X_AXIS].length ();
          ydims.unite (b[Y_AXIS]);
@@ -52,18 +70,10 @@ 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);
 }
 
 
-Box
-Scaled_font_metric::text_dimension (String t) const
-{
-  Real realmag = pow (1.2, magstep_i_);
-  Box b (orig_l_->text_dimension (t));
-
-  return Box(b[X_AXIS]* realmag, b[Y_AXIS]*realmag);
-}
 
 Font_metric::~Font_metric ()
 {
@@ -71,70 +81,78 @@ Font_metric::~Font_metric ()
 
 Font_metric::Font_metric ()
 {
-  name_ = SCM_EOL;
+  description_ = SCM_EOL;
+
+  smobify_self ();
 }
 
 Font_metric::Font_metric (Font_metric const &)
 {
 }
 
-
-Box 
-Font_metric::get_char (int, bool)const
+int
+Font_metric::count () const
 {
-  return Box (Interval(0,0),Interval (0,0));
+  return 0;
 }
 
-Scaled_font_metric::Scaled_font_metric (Font_metric* m, int s)
+Box 
+Font_metric::get_char (int)const
 {
-  magstep_i_ = s;
-  orig_l_ = m;
+  return Box (Interval (0,0),Interval (0,0));
 }
 
+
 SCM
-Scaled_font_metric::make_scaled_font_metric (Font_metric*m, int s)
+Font_metric::mark_smob (SCM s)
 {
-  Scaled_font_metric *sfm = new Scaled_font_metric (m,s);
-  sfm->name_ = m->name_;
-  
-  return sfm->smobbed_self ();
+  Font_metric * m = (Font_metric*) SCM_CELL_WORD_1 (s);
+  return m->description_;
 }
 
-SCM
-Font_metric::description () const
+int
+Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  return gh_cons (name_, gh_int2scm (0));
+  Font_metric *m = unsmob_metrics (s);
+  scm_puts ("#<Font_metric ", port);
+  scm_write (m->description_, port);
+  scm_puts (">", port);
+  return 1;
 }
 
 
-SCM
-Scaled_font_metric::description () const
+
+IMPLEMENT_SMOBS (Font_metric);
+IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
+IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
+
+Molecule
+Font_metric::find_by_name (String) const
 {
-  SCM od = orig_l_->description ();
-  gh_set_cdr_x (od, gh_int2scm (magstep_i_));
-  return od;
+  Molecule m ;
+  return m;
 }
 
 
-
 SCM
-Font_metric::mark_smob (SCM s)
+ly_find_glyph_by_name (SCM font, SCM name)
 {
-  Font_metric * m = (Font_metric*) SCM_CELL_WORD_1(s);
-  return m->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 ();
 }
 
-int
-Font_metric::print_smob (SCM s, SCM port, scm_print_state * )
+
+static void
+font_metric_init ()
 {
-  Font_metric *m = unsmob_metrics (s);
-  scm_puts ("#<Font_metric ", port);
-  scm_display (m->name_, port);
-  scm_puts (">", port);
-  return 1;
+   scm_c_define_gsubr ("ly-find-glyph-by-name", 2 , 0, 0,
+                      (Scheme_function_unknown) ly_find_glyph_by_name);
 }
 
-
-IMPLEMENT_UNSMOB (Font_metric, metrics);
-IMPLEMENT_SIMPLE_SMOBS (Font_metric);
-IMPLEMENT_DEFAULT_EQUAL_P(Font_metric);
+ADD_SCM_INIT_FUNC (font_metric_init, font_metric_init);