2003 -> 2004

[lilypond.git] / lily / include / font-metric.hh

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 767b3475df3a3d0319a0141c2ac0bfba3f4cb59a..cb9206efdcae1cbb3d8da6eb87d8231976871d72 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,24 +14,34 @@
 #include "lily-guile.hh"
 #include "smobs.hh"
 #include "lily-proto.hh"
+#include "string.hh"
 
 struct Font_metric
 {
 public:
   SCM description_;
-
-  virtual Box get_char (int ascii) const;
+  String path_;
+  
+  virtual int count () const;
+  virtual Offset get_indexed_wxwy (int) const;
+  virtual Box get_indexed_char (int index) const;
+  virtual Box get_ascii_char (int ascii) const;
   virtual Box text_dimension (String)  const;
-  virtual Molecule find_by_name (String) const;
+  virtual int name_to_index (String) const;
 
-  DECLARE_SMOBS(Font_metric,);
+  virtual Molecule find_by_name (String) const;
+  virtual Molecule get_indexed_char_molecule (int k) const;
+  virtual Molecule get_ascii_char_molecule (int k) const;  
+  
+  DECLARE_SMOBS (Font_metric,);
 private:
   Font_metric (Font_metric const&); // no copy.
 protected:
+  virtual void derived_mark () const;
+
   Font_metric ();
 };
 
-Font_metric * unsmob_metrics (SCM s);
+DECLARE_UNSMOB(Font_metric, metrics);
 
 #endif /* FONT_METRIC_HH */
-