patch::: 1.3.32.hwn2

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 1ae9e51f07349b8b55b1cc955bab8fdf2b8bf5b5..af11940191f1475b67292ac1a1482748c9d0c163 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -26,8 +26,14 @@ Tex_font_char_metric::Tex_font_char_metric ()
 {
   exists_b_ = false;
   code_ = 0;;
-  width_ = height_ = depth_ = italic_correction_ = 0;
-  width_fix_ = height_fix_ = depth_fix_ = italic_correction_fix_ = 0;
+  width_ = 0;
+  height_ = 0;
+  depth_ = 0;
+  italic_correction_ = 0;
+  width_fix_ = 0;
+  height_fix_ = 0;
+  depth_fix_ = 0;
+  italic_correction_fix_ = 0;
 }
 
 #define APPEND_CHAR_METRIC_ELT(k)  outstr += to_str (#k) + " "  + to_str (k ## _)  + "; "
@@ -53,24 +59,23 @@ Tex_font_metric::Tex_font_metric ()
 
 static Tex_font_char_metric dummy_static_char_metric;
 
-Tex_font_char_metric const &
+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)
-    return char_metrics_[ascii_to_metric_idx_ [ascii]];
+    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;  
+  return &dummy_static_char_metric;  
 }
 
-Character_metric*
+Box
 Tex_font_metric::get_char (int a, bool w) const
 {
-  return &find_ascii (a, w);
+  return find_ascii (a, w)->dimensions ();
 }
 
 
@@ -91,10 +96,4 @@ Tex_font_metric::clear (int n)
     ascii_to_metric_idx_.push (-1);
 }
 
-void
-Tex_font_metric::read_file (String name)
-{
-  Tex_font_metric_reader tfm_reader (name);
-  *this = tfm_reader.read_tfm ();
-}