* lily/skyline.cc (merge_skyline): new function

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

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index 7220978207af5ba2cb3fad7c5818d4d8fcfdff22..c3bb9a8cec6bf19b2727603df929f714cb579af8 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -4,17 +4,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #ifndef AFM_HH
 #define AFM_HH
 
+#include <map>
+
 #include "string.hh"
 #include "box.hh"
 #include "array.hh"
-#include "dictionary.hh"
 #include "font-metric.hh"
 #include "parse-afm.hh"
 
@@ -22,19 +23,21 @@ struct Adobe_font_metric : Font_metric
 {
   AFM_Font_info * font_inf_;
 
-  Box get_char (int, Real mag =1.0) 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;
+  String to_string () 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_;
+  std::map<String,int> name_to_metric_dict_;
 
-  virtual Molecule find_by_name (String, Real mag = 1.0) const;
+  virtual Molecule find_by_name (String) const;
 
   Adobe_font_metric (AFM_Font_info*);
 };