($(outdir)/%.pdf): add DVIPS_FLAGS. This will

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

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index 263deb8b62229ccd1d797642e59a46f87171405e..14ab748e93d9c6ab03b1e54df26ff4ff5a639a7a 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -1,66 +1,54 @@
+
 /*   
   afm.hh -- declare Adobe_font_metric
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 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"
 
-struct Adobe_font_char_metric : Character_metric {
-  int C_;
-  Real WX_;
-  String N_;
-  Box B_;
-  int size_;
-  Box &bbox();
-  String &name();
-  Real &width();
-  int  &code ();
-  
-  String str () const;
-  Adobe_font_char_metric ();
-  Box dimensions () const;
-};
+struct Adobe_font_metric : Font_metric
+{
+  AFM_Font_info * font_inf_;
 
-struct Adobe_font_metric : Font_metric {
-  String  FontName_;
-  String FullName_;
-  String FamilyName_;
-  String Weight_;
-  Real ItalicAngle_;
-  bool IsFixedPitch_;
-  Box FontBBox_;
-  Real UnderlinePosition_;
-  Real UnderlineThickness_;
-  String Version_;
-  String Notice_;
-  String EncodingScheme_;
-  Array<Adobe_font_char_metric> char_metrics_;
-  Array<int> ascii_to_metric_idx_;
-  Dictionary<int> name_to_metric_dict_;
+  virtual int name_to_index (String) const;
+  virtual int count () const;
+  virtual Box get_ascii_char (int) const;
+  virtual Box get_indexed_char (int) const;
+  virtual Offset get_indexed_wxwy (int) const;
   
-  Adobe_font_char_metric const &find_char (String name, bool warn=true) const;
-  Adobe_font_char_metric const &find_ascii (int ascii,bool warn) const;
-  String str () const;
-  Adobe_font_metric ();
-  void read_char_metrics (Data_file &input, int size);
+  AFM_CharMetricInfo const *find_char_metric (String name) const;
+  AFM_CharMetricInfo const *find_ascii_metric (int) const;  
 
-  Character_metric const *get_char (int, bool) const;
-};
+  String to_string () const;
+  ~Adobe_font_metric ();
+  static SCM make_afm (AFM_Font_info*, unsigned);
 
-Adobe_font_metric read_afm_file (String fn);
+  unsigned int checksum_;
+protected:
+  Array<int> ascii_to_metric_idx_;
+  std::map<String,int> name_to_metric_dict_;
 
+  virtual Stencil 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);
+  
 
 #endif /* AFM_HH */