*** empty log message ***

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

diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index b8a7818b407790208f11f1cd59c6a66fbe34c4b3..394c489ea31d15cc2c6596ec7a2c5bc8bf186dcd 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
@@ -17,9 +16,7 @@
 #ifndef TFM_HH
 #define TFM_HH
 
-#include "string.hh"
 #include "array.hh"
-#include "lily-proto.hh"
 #include "font-metric.hh"
 
 /* The type.  */
@@ -138,36 +135,37 @@ struct Tex_font_char_metric
   Array<Tfm_kern> kerns_;
   Array<Tfm_ligature> ligatures_;
 
-  String to_string () const;
   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 filename);
+  static SCM make_tfm (String file_name);
 
   virtual int count () const;
   virtual Box get_ascii_char (int) const;
   virtual Real design_size () const;
-  virtual String coding_scheme () const;
-  
-  Tex_font_char_metric const *find_ascii (int ascii, bool warn=true) const;
+  virtual void derived_mark () const;
+  virtual int name_to_index (String) const;
+  virtual String font_name () const;
+
+  Tfm_info const &info () const;
 
-  String to_string () 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_;
 private:
+  Tex_font_char_metric const *find_ascii (int ascii, bool warn = true) const;
   Tex_font_metric ();
 };
 
-
 #endif /* TFM_HH */