trem fix

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 7b6f0085273458c88c79526b5013904cf9da4949..89a09a5011807a79027e05e1eef94f222e3c9d78 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -1,9 +1,9 @@
 /*   
-  tfm.cc --  implement Tex_font_metric
+  tfm.cc -- implement Tex_font_metric
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
@@ -14,12 +14,25 @@
 #include "string-convert.hh"
 #include "debug.hh"
 #include "warn.hh"
+#include "dimensions.hh"
 
 Box
 Tex_font_char_metric::dimensions () const
 {
+  if (!exists_b_)
+    {
+      Box b;
+      b.set_empty ();
+      return b;
+    }
+  
   Real d = -depth_;
-  return Box (Interval (0, width_),Interval ( d <? height_, d >? height_));
+
+  Real point_constant = 1 PT;
+  
+  return Box (Interval (0, width_*point_constant ),
+             Interval ((d <? height_)*point_constant,
+                       (d >? height_)*point_constant));
 }
 
 Tex_font_char_metric::Tex_font_char_metric ()
@@ -63,20 +76,35 @@ static Tex_font_char_metric dummy_static_char_metric;
 Tex_font_char_metric const *
 Tex_font_metric::find_ascii (int ascii, bool warn) const
 {
-  if (ascii < ascii_to_metric_idx_.size() && ascii_to_metric_idx_[ascii] >= 0)
+  if (ascii < ascii_to_metric_idx_.size () && ascii_to_metric_idx_[ascii] >= 0)
     return & char_metrics_[ascii_to_metric_idx_ [ascii]];
   else if (warn)
-
     {
-      warning (_f ("can't find ascii character: `%d'", ascii));
+      warning (_f ("can't find ascii character: %d", ascii));
     }
   return &dummy_static_char_metric;  
 }
 
+
+/*
+  UGH: glyphs need not be consecutive in TFM.
+ */
+int
+Tex_font_metric::count () const
+{
+  for (int i = ascii_to_metric_idx_.size (); i--;)
+    {
+      if (ascii_to_metric_idx_[i] != -1)
+       return i + 1;
+    }
+  return 0;
+}
+
 Box
-Tex_font_metric::get_char (int a, bool w) const
+Tex_font_metric::get_char (int a) const
 {
-  return find_ascii (a, w)->dimensions ();
+  Box b = find_ascii (a)->dimensions () ;
+  return b;
 }
 
 
@@ -96,7 +124,7 @@ Tex_font_metric::str () const
 SCM
 Tex_font_metric::make_tfm (String fn)
 {
-  Tex_font_metric      * tfm_p = new Tex_font_metric;
+  Tex_font_metric * tfm_p = new Tex_font_metric;
   Tex_font_metric_reader reader (fn);
 
   tfm_p->info_ = reader.info_;
@@ -104,5 +132,5 @@ Tex_font_metric::make_tfm (String fn)
   tfm_p->char_metrics_ = reader.char_metrics_;
   tfm_p->ascii_to_metric_idx_ = reader.ascii_to_metric_idx_;
   
-  return tfm_p->smobbed_self ();
+  return tfm_p->self_scm ();
 }