*** empty log message ***

[lilypond.git] / lily / include / tfm.hh

diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 29ce45d8a77bd4448f9b71fcac523178670193a9..85e2002029c88fa9c32facda0399167e6d634c09 100644 (file)
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -1,14 +1,13 @@
-/*   
+/*
   tfm.hh -- declare 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>
 
-  revamped code from GNU Fontutils-0.6
 
- */
+  revamped code from GNU Fontutils-0.6
+*/
 
 /*
   TODO: aren't there standard libs?  Ideally it is better to just link
@@ -104,7 +103,7 @@ struct Tfm_info
   Char_code first_charcode, last_charcode;
   U32 checksum;
   Real design_size;
-  String coding_scheme;
+  std::string coding_scheme;
   unsigned parameter_count;
   // Real parameters [Tex_font_metric::MAX_FONTDIMENS];
   Real parameters [TFM_MAX_FONTDIMENS];
@@ -138,36 +137,35 @@ struct Tex_font_char_metric
 
   Tex_font_char_metric ();
 
-  Box dimensions () const; 
+  Box dimensions () const;
 };
 
-
 class Tex_font_metric : public Simple_font_metric
 {
+  DECLARE_CLASSNAME(Tex_font_metric);
 public:
-  static SCM make_tfm (String file_name);
+  static SCM make_tfm (std::string file_name);
 
   virtual int count () const;
   virtual Box get_ascii_char (int) const;
   virtual Real design_size () const;
   virtual void derived_mark () const;
-  virtual int name_to_index (String) const;
-  virtual String font_name () const;
+  virtual int name_to_index (std::string) const;
+  virtual std::string font_name () const;
 
   Tfm_info const &info () const;
-  
+
 protected:
   Tfm_info info_;
   Tfm_header header_;
   Array<Tex_font_char_metric> char_metrics_;
   Array<int> ascii_to_metric_idx_;
   SCM encoding_table_;
-  String font_name_;
+  std::string font_name_;
 private:
   Tex_font_char_metric const *find_ascii (int ascii, bool warn = true) const;
   Tex_font_metric ();
 };
 
-
 #endif /* TFM_HH */