lilypond-1.3.74

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index a0dfa15f429063fe9df88cb867fde1e084d2d5d0..d761dc093c09c4d224980131201db7a028e23ded 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -18,22 +18,27 @@
 #include "font-metric.hh"
 #include "parse-afm.hh"
 
-struct Adobe_font_metric : Font_metric {
+struct Adobe_font_metric : Font_metric
+{
   AFM_Font_info * font_inf_;
 
-  Array<int> ascii_to_metric_idx_;
-  Dictionary<int> name_to_metric_dict_;
-
   Box get_char (int, bool) const;
   AFM_CharMetricInfo const *find_char_metric (String name, bool warn=true) const;
   AFM_CharMetricInfo const *find_ascii_metric (int, bool warn=true) const;  
 
   String str () const;
-  Adobe_font_metric (AFM_Font_info*);
   ~Adobe_font_metric ();
+  static SCM make_afm (AFM_Font_info*);
+
+protected:
+  Array<int> ascii_to_metric_idx_;
+  Dictionary<int> name_to_metric_dict_;
+
+  Adobe_font_metric (AFM_Font_info*);
+
 };
 
-Adobe_font_metric * read_afm_file (String fn);
+SCM read_afm_file (String fn);
 Box afm_bbox_to_box (AFM_BBox bb);
   
 

diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 0481ad1b7e345de560414c93d49b9829ab40437e..098fbe3e912c36410fd29ba7409cfd8e86428e86 100644 (file)
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -148,14 +148,16 @@ struct Tex_font_char_metric
 class Tex_font_metric : public Font_metric
 {
 public:
-  Tex_font_metric ();
+  static  SCM make_tfm (String filename);
 
-  void clear (int n);
   Box get_char (int, bool) const;
   Tex_font_char_metric const *find_ascii (int ascii, bool warn=true) const;
 
   String str () const;
 
+private:
+  Tex_font_metric ();
+  
   Tfm_info info_;
   Tfm_header header_;
   Array<Tex_font_char_metric> char_metrics_;