* lily/mark-engraver.cc: remove properties.

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 29c16cd210741a94ed0f13c23fb0a2d80d895d35..3f415802e46bdca4c2014ed46e78733d3bd871fd 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -1,18 +1,21 @@
-/*   
+/*
   tfm.cc -- implement Tex_font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
- */
+*/
 
 #include "tfm.hh"
-#include "tfm-reader.hh"
+
+#include "dimensions.hh"
+#include "file-name.hh"
+#include "international.hh"
 #include "string-convert.hh"
+#include "tfm-reader.hh"
 #include "warn.hh"
-#include "dimensions.hh"
 
 static Tex_font_char_metric dummy_static_char_metric;
 
@@ -39,13 +42,13 @@ Tex_font_char_metric::dimensions () const
       b.set_empty ();
       return b;
     }
-  
+
   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 (min (d, height_) * point_constant,
+                       max (d, height_) * point_constant));
 }
 
 Tex_font_metric::Tex_font_metric ()
@@ -60,35 +63,35 @@ Tex_font_metric::derived_mark () const
 }
 
 Tex_font_char_metric const *
-Tex_font_metric::find_ascii (int ascii, bool warn) const
+Tex_font_metric::find_ascii (vsize ascii, bool warn) const
 {
-  if (ascii >= 0 && ascii < ascii_to_metric_idx_.size ()
-      && ascii_to_metric_idx_[ascii] >= 0)
-    return & char_metrics_[ascii_to_metric_idx_ [ascii]];
+  if (ascii != VPOS && ascii < ascii_to_metric_idx_.size ()
+      && ascii_to_metric_idx_[ascii] != VPOS)
+    return &char_metrics_[ascii_to_metric_idx_ [ascii]];
   else if (warn)
     warning (_f ("can't find ascii character: %d", ascii));
-  return &dummy_static_char_metric;  
+  return &dummy_static_char_metric;
 }
 
 /* UGH: glyphs need not be consecutive in TFM. */
-int
+vsize
 Tex_font_metric::count () const
 {
-  for (int i = ascii_to_metric_idx_.size (); i--;)
-    if (ascii_to_metric_idx_[i] != -1)
+  for (vsize i = ascii_to_metric_idx_.size (); i--;)
+    if (ascii_to_metric_idx_[i] != VPOS)
       return i + 1;
   return 0;
 }
 
 Box
-Tex_font_metric::get_ascii_char (int a) const
+Tex_font_metric::get_ascii_char (vsize a) const
 {
   Box b = find_ascii (a)->dimensions ();
   return b;
 }
 
 SCM
-Tex_font_metric::make_tfm (String file_name)
+Tex_font_metric::make_tfm (string file_name)
 {
   Tex_font_metric *tfm = new Tex_font_metric;
   Tex_font_metric_reader reader (file_name);
@@ -98,17 +101,32 @@ 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;
 }
 
-int
-Tex_font_metric::name_to_index (String s) const
+string
+Tex_font_metric::font_name () const
+{
+  return font_name_;
+}
+
+vsize
+Tex_font_metric::name_to_index (string) const
 {
   assert (false);
+  return 0;
 }