* lily/dynamic-engraver.cc (typeset_all):

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

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index 4f5d85c8d562c74256446d8316605d5e230b91fc..ebf8b6afb6bc61bbad048b6dcd2d5285a13c51b5 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -1,56 +1,55 @@
+
 /*   
   afm.hh -- declare Adobe_font_metric
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 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"
-
-struct Adobe_font_char_metric {
-  int C_;
-  Real WX_;
-  String N_;
-  Box B_;
-  Box &bbox();
-  String &name();
-  Real &width();
-  int  &code ();
-  
-  String str () const;
-  Adobe_font_char_metric ();
-};
-
-struct Adobe_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_;
-
-  Adobe_font_char_metric find_char (String name, bool warn=true) const;
-  String str () const;
-  Adobe_font_metric ();
+#include "font-metric.hh"
+#include "parse-afm.hh"
+
+class Adobe_font_metric : public Simple_font_metric
+{
+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;  
+
+  Array<int> ascii_to_metric_idx_;
+  std::map<String,int> name_to_metric_dict_;
+
+  Adobe_font_metric (AFM_Font_info*);
 };
 
-Adobe_font_metric read_afm (String fn);
-
-
-
+SCM read_afm_file (String);
+Box afm_bbox_to_box (AFM_BBox);
+  
 #endif /* AFM_HH */