2003 -> 2004

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 2219b191ffe9ad99dffb84e9c5eeec18e4d772e4..5529c0b1894d4e12132a953d652c0e1fa69f384c 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
@@ -49,10 +49,10 @@ Tex_font_char_metric::Tex_font_char_metric ()
   italic_correction_fix_ = 0;
 }
 
-#define APPEND_CHAR_METRIC_ELT(k)  outstr += to_string (#k) + " "  + to_string (k ## _)  + "; "
+#define APPEND_CHAR_METRIC_ELT(k)  outstr += ::to_string (#k) + " "  + ::to_string (k ## _)  + "; "
 
 String
-Tex_font_char_metric::string () const
+Tex_font_char_metric::to_string () const
 {
   String outstr ;
 
@@ -76,7 +76,7 @@ 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 >= 0 && ascii < ascii_to_metric_idx_.size () && ascii_to_metric_idx_[ascii] >= 0)
     return & char_metrics_[ascii_to_metric_idx_ [ascii]];
   else if (warn)
     {
@@ -101,19 +101,18 @@ Tex_font_metric::count () const
 }
 
 Box
-Tex_font_metric::get_char (int a) const
+Tex_font_metric::get_ascii_char (int a) const
 {
   Box b = find_ascii (a)->dimensions () ;
   return b;
 }
 
-
 String
-Tex_font_metric::string () const
+Tex_font_metric::to_string () const
 {
   String outstr;
   for (int i=0; i < char_metrics_.size (); i++)
-    outstr += char_metrics_[i].string ();
+    outstr += char_metrics_[i].to_string ();
   
   return outstr;
 }