* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

[lilypond.git] / lily / tfm-reader.cc

diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc
index 2e3b1148c90313137a38d239ad546dc7e2b3549b..d0911767ecf75260cb07a66d07541d44946e986e 100644 (file)
--- a/lily/tfm-reader.cc
+++ b/lily/tfm-reader.cc
@@ -3,16 +3,16 @@
   
   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 "tfm-reader.hh"
+
 #include "string-convert.hh"
 #include "warn.hh"
-#include "warn.hh"
 
 #define format_string String_convert::form_string
 #define FIX_UNITY \
@@ -24,7 +24,7 @@ Tex_font_metric_reader::Tex_font_metric_reader (String name)
   : input_ (name)
 {
   
-  for (int i=0; i < TFM_SIZE; i++)
+  for (int i = 0; i < TFM_SIZE; i++)
     ascii_to_metric_idx_.push (-1);
 
   read_header ();
@@ -164,7 +164,7 @@ Tex_font_metric_reader::read_char_metrics ()
   for (int i = info_.first_charcode; i <= info_.last_charcode; i++)
     {
       Tex_font_char_metric tfm_char = read_char_metric (i);
-      if (tfm_char.exists_b_)
+      if (tfm_char.exists_)
        ascii_to_metric_idx_[tfm_char.code_] = char_metrics_.size ();
       char_metrics_.push (tfm_char);
     }
@@ -191,7 +191,7 @@ Tex_font_metric_reader::read_char_metric (Char_code code)
   /* Read the character.  */
   tfm_char = read_char ();
 
-  if (tfm_char.exists_b_)
+  if (tfm_char.exists_)
     tfm_char.code_ = code;
 
   return tfm_char;
@@ -239,7 +239,7 @@ Tex_font_metric_reader::read_char ()
      the first and last character codes given in the header.  We've
      already assumed that's true (or we couldn't be positioned at a
      `char_info_word').  */
-  tfm_char.exists_b_ = width_index != 0;
+  tfm_char.exists_ = width_index != 0;
 
   if (tag == 1)
     {