lilypond-1.3.74

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index b01ad19119138d8a13dfe2f50809a6acc12af93a..f705080d32cea8c0992c14d2cbcfe6866b457c0f 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -10,24 +10,22 @@
 #ifndef ALL_FONTS_HH
 #define ALL_FONTS_HH
 
-
 #include "file-path.hh"
 #include "lily-proto.hh"
 #include "font-metric.hh"
-#include "scm-hash.hh"
 
 /**
    Interface to all .afm files living in the filesystem.
  */
 class All_font_metrics
 {
-  Scheme_hash_table afm_p_dict_;
-  Scheme_hash_table tfm_p_dict_;
-  Scheme_hash_table scaled_p_dict_;
+  Scheme_hash_table *afm_p_dict_;
+  Scheme_hash_table *tfm_p_dict_;
+  Scheme_hash_table *scaled_p_dict_;
   
   File_path search_path_;
 public:
-  
+  ~All_font_metrics ();  
   Adobe_font_metric *find_afm (String name);
   Tex_font_metric *find_tfm (String);
   Font_metric *find_font (String name);  

diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh
index 569a2d06143f60058d0a0651475bd629d2f990a1..53cb6d45ede5aa22e75c39c947ca22e20e0d607f 100644 (file)
--- a/lily/include/tfm-reader.hh
+++ b/lily/include/tfm-reader.hh
@@ -18,12 +18,7 @@
 
 class Tex_font_metric_reader
 {
-public:
-  static Tex_font_metric * read_file (String name);
-  
 private:
-  Tex_font_metric_reader (Tex_font_metric *, String name);
-
   Real get_U32_fix_f ();
   Real get_U32_fix_scaled_f ();
   String get_bcpl_str ();
@@ -34,8 +29,17 @@ private:
   Tex_font_char_metric read_char ();
   void read_lig_kern_program (Array<Tfm_ligature>* ligature_arr_p, Array <Tfm_kern>* kern_arr_p);
 
-  Tex_font_metric *tfm_l_;
+
   Binary_source_file input_;
+
+public:
+  Tex_font_metric_reader ( String name);
+
+  
+  Tfm_info info_;
+  Tfm_header header_;
+  Array<Tex_font_char_metric> char_metrics_;
+  Array<int> ascii_to_metric_idx_;
 };