X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=0fcf96fc11782432fab276f86a2b6d76ff01c24b;hb=dfe0c6ad15227d6d3646bd7445df5de6aa386ff7;hp=f11483f8f092ee826a22f0c8a1b5e250caf906ff;hpb=f15b2ffdd283bacb74ba6db27f68dd26843a193f;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index f11483f8f0..0fcf96fc11 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,16 +3,19 @@
   
   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"
 
 Box
 Font_metric::text_dimension (String text) const
@@ -26,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.
@@ -37,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]);
@@ -51,28 +70,19 @@ 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 ()
 {
-  unsmobify_self ();
 }
 
 Font_metric::Font_metric ()
 {
-  self_scm_ = SCM_EOL;
-  name_ = SCM_EOL;
+  description_ = SCM_EOL;
+
   smobify_self ();
 }
 
@@ -80,57 +90,69 @@ 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
-Font_metric::description () const
+Font_metric::mark_smob (SCM s)
 {
-  return gh_cons (name_, gh_int2scm (0));
+  Font_metric * m = (Font_metric*) SCM_CELL_WORD_1 (s);
+  return m->description_;
 }
 
-
-SCM
-Scaled_font_metric::description () const
+int
+Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  SCM od = orig_l_->description ();
-  gh_set_cdr_x (od, gh_int2scm (magstep_i_));
-  return od;
+  Font_metric *m = unsmob_metrics (s);
+  scm_puts ("#<Font_metric ", port);
+  scm_write (m->description_, port);
+  scm_puts (">", port);
+  return 1;
 }
 
 
-void
-Font_metric::do_smobify_self ()
+
+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
 {
+  Molecule m ;
+  return m;
 }
 
+
 SCM
-Font_metric::mark_smob (SCM s)
+ly_find_glyph_by_name (SCM font, SCM name)
 {
-  Font_metric * m = SMOB_TO_TYPE(Font_metric, 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_SMOBS(Font_metric);
-
+ADD_SCM_INIT_FUNC (font_metric_init, font_metric_init);