release: 1.5.29

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

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index d761dc093c09c4d224980131201db7a028e23ded..5679d83279da9a202fd04ae65ceb650f8df52a42 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -22,20 +22,23 @@ struct Adobe_font_metric : Font_metric
 {
   AFM_Font_info * font_inf_;
 
-  Box get_char (int, bool) const;
+  virtual int count () const;
+  virtual Box get_char (int) 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 ();
-  static SCM make_afm (AFM_Font_info*);
+  static SCM make_afm (AFM_Font_info*, unsigned);
 
+  unsigned int checksum_;
 protected:
   Array<int> ascii_to_metric_idx_;
   Dictionary<int> name_to_metric_dict_;
 
-  Adobe_font_metric (AFM_Font_info*);
+  virtual Molecule find_by_name (String) const;
 
+  Adobe_font_metric (AFM_Font_info*);
 };
 
 SCM read_afm_file (String fn);