* lily/include/music.hh (class Music): include SCM init argument.

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 571df4319c76f66dc077daa4695647c5f20c3cfb..2786291ae2a4c2c4c0bda3cf70aa809a968ec5f1 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -8,8 +8,8 @@
   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"
 #include "warn.hh"
@@ -42,12 +42,11 @@ Tex_font_char_metric::dimensions () const
     }
   
   Real d = -depth_;
-
   Real point_constant = 1 PT;
   
-  return Box (Interval (0, width_*point_constant ),
-             Interval ((d <? height_)*point_constant,
-                       (d >? height_)*point_constant));
+  return Box (Interval (0, width_* point_constant ),
+             Interval ((d <? height_) * point_constant,
+                       (d >? height_) * point_constant));
 }
 
 Tex_font_metric::Tex_font_metric ()
@@ -55,8 +54,6 @@ Tex_font_metric::Tex_font_metric ()
   encoding_table_ = SCM_EOL;
 }
 
-
-
 void
 Tex_font_metric::derived_mark () const
 {
@@ -102,41 +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_;
 
-  tfm->encoding_table_
-    = scm_call_1 (ly_scheme_function ("get-coding-table"),
-                 scm_makfrom0str (tfm->coding_scheme ().to_str0 ()));
-
+  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;
+  return info_.design_size * point_constant;
 }
 
 String
-Tex_font_metric::coding_scheme () const
+Tex_font_metric::font_name () const
 {
-  String scm = info_.coding_scheme;
-
-  for(int i = 0; i < scm.length (); i++)
-    if (scm[i] == ' ')
-      scm[i] = '-';
-
-  return scm;
+  return font_name_;
 }
 
 int
-Tex_font_metric::name_to_index (String s) const
+Tex_font_metric::name_to_index (String) const
 {
-  SCM sym = ly_symbol2scm (s.to_str0 ());
-
-  SCM idx = scm_hash_ref (encoding_table_, sym, SCM_BOOL_F);
-  if (ly_c_char_p (idx))
-    {
-      return (unsigned char) ly_scm2char (idx);
-    }
-  else
-    return -1;  
+  assert (false);
 }