2003 -> 2004

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

diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 182fded427da3bbd2a3d6e5b1d43fd261ca58679..5869aca15950a77035f739091c7324b29b9a162e 100644 (file)
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -3,13 +3,17 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
   revamped code from GNU Fontutils-0.6
 
  */
 
+/*
+  TODO: aren't there standard libs?  Ideally it is better to just link
+  to a C-library.  */
+
 #ifndef TFM_HH
 #define TFM_HH
 
@@ -125,16 +129,16 @@ struct Tfm_kern
   Real kern;
 };
 
-struct Tex_font_char_metric : Character_metric
+struct Tex_font_char_metric
 {
   bool exists_b_;
   Char_code code_;
   Real width_, height_, depth_, italic_correction_;
   Fix width_fix_, height_fix_, depth_fix_, italic_correction_fix_;
-  Array<Tfm_kern> kern_arr_;
-  Array<Tfm_ligature> ligature_arr_;
+  Array<Tfm_kern> kerns_;
+  Array<Tfm_ligature> ligatures_;
 
-  String str () const;
+  String to_string () const;
   Tex_font_char_metric ();
 
   Box dimensions () const; 
@@ -144,31 +148,20 @@ struct Tex_font_char_metric : Character_metric
 class Tex_font_metric : public Font_metric
 {
 public:
-  Character_metric *get_char (int, bool) const;
-  
-  Tex_font_metric ();
-  Tex_font_char_metric const &find_ascii (int ascii, bool warn=true) const;
-  String str () const;
+  static  SCM make_tfm (String filename);
+
+  virtual int count () const;
+  virtual Box get_ascii_char (int) const;
+  Tex_font_char_metric const *find_ascii (int ascii, bool warn=true) const;
 
-  /// the reader
+  String to_string () const;
+  
   Tfm_info info_;
   Tfm_header header_;
-  void clear (int n);
-  void read_file (String name);
-
   Array<Tex_font_char_metric> char_metrics_;
   Array<int> ascii_to_metric_idx_;
-
 private:
-  Real get_U32_fix_f (Binary_source_file* input);
-  Real get_U32_fix_scaled_f (Binary_source_file* input);
-  String get_bcpl_str (Binary_source_file* input);
-  void read_header (Binary_source_file* input);
-  void read_params (Binary_source_file* input);
-  void read_char_metrics (Binary_source_file* input);
-  Tex_font_char_metric read_char_metric (Binary_source_file* input, Char_code code);
-  Tex_font_char_metric read_char (Binary_source_file* input);
-  void read_lig_kern_program (Binary_source_file* input, Array<Tfm_ligature>* ligature_arr_p, Array <Tfm_kern>* kern_arr_p);
+  Tex_font_metric ();
 };