*** empty log message ***

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 29c16cd210741a94ed0f13c23fb0a2d80d895d35..1e8dc4fb001c0b4cd7ec81803915aad605a5b62c 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -3,11 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
  */
 
+#include "file-name.hh"
 #include "tfm.hh"
 #include "tfm-reader.hh"
 #include "string-convert.hh"
@@ -98,17 +99,31 @@ Tex_font_metric::make_tfm (String file_name)
   tfm->char_metrics_ = reader.char_metrics_;
   tfm->ascii_to_metric_idx_ = reader.ascii_to_metric_idx_;
 
+  File_name fn (file_name);
+  tfm->font_name_ = fn.base_;
   return tfm->self_scm ();
 }
 
+Tfm_info const &
+Tex_font_metric::info () const
+{
+  return info_;
+}
+
 Real
 Tex_font_metric::design_size () const
 {
   return info_.design_size * point_constant;
 }
 
+String
+Tex_font_metric::font_name () const
+{
+  return font_name_;
+}
+
 int
-Tex_font_metric::name_to_index (String s) const
+Tex_font_metric::name_to_index (String) const
 {
   assert (false);
 }