*** empty log message ***

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

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index 9bb7118a3167bf0595cd61b40af928ca81ded079..ebf8b6afb6bc61bbad048b6dcd2d5285a13c51b5 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,36 +19,37 @@
 #include "font-metric.hh"
 #include "parse-afm.hh"
 
-struct Adobe_font_metric : Font_metric
+class Adobe_font_metric : public Simple_font_metric
 {
-  AFM_Font_info * font_inf_;
+public:
+  AFM_Font_info *font_info_;
+  unsigned int checksum_;
+  Real design_size_;
+
+  ~Adobe_font_metric ();
 
   virtual int name_to_index (String) const;
   virtual int count () const;
+  virtual int index_to_ascii (int) const;
   virtual Box get_ascii_char (int) const;
   virtual Box get_indexed_char (int) const;
   virtual Offset get_indexed_wxwy (int) const;
-  
+  virtual String coding_scheme () const;
+  static SCM make_afm (AFM_Font_info*, unsigned, Real);
+  virtual Real design_size () const;
+
+protected:
   AFM_CharMetricInfo const *find_char_metric (String name) const;
   AFM_CharMetricInfo const *find_ascii_metric (int) const;  
 
-  String to_string () const;
-  ~Adobe_font_metric ();
-  static SCM make_afm (AFM_Font_info*, unsigned);
-
-  unsigned int checksum_;
-protected:
   Array<int> ascii_to_metric_idx_;
   std::map<String,int> name_to_metric_dict_;
 
-  virtual Molecule find_by_name (String) const;
-
   Adobe_font_metric (AFM_Font_info*);
 };
 
-SCM read_afm_file (String fn);
-Box afm_bbox_to_box (AFM_BBox bb);
+SCM read_afm_file (String);
+Box afm_bbox_to_box (AFM_BBox);
   
-
 #endif /* AFM_HH */