X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffont-metric.hh;h=f5d036f972ea63fd6e01efa2bd053004ba40f231;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=c94fa2bb986340960dcd401b566c3e0ce91020ec;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index c94fa2bb98..f5d036f972 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -1,48 +1,56 @@
 /*
-
   font-metric.hh -- declare Font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FONT_METRIC_HH
 #define FONT_METRIC_HH
 
 #include "box.hh"
-#include "smobs.hh"
 #include "lily-proto.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
 
 class Font_metric
 {
+  DECLARE_CLASSNAME(Font_metric);
+
 public:
   SCM description_;
-  String file_name_;
-
-  virtual Stencil text_stencil (String) const;
-  virtual Box text_dimension (String) const;
-  virtual String font_name () const;
-  virtual int count () const;
-  virtual Offset attachment_point (String) 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 int name_to_index (String) const;
-  virtual unsigned index_to_charcode (int) const;
-  virtual int index_to_ascii (int) const;
+  string file_name_;
+
+
+  virtual Stencil text_stencil (string) const;
+  virtual Box text_dimension (string) const;
+  virtual string font_name () const;
+  virtual size_t count () const;
+  virtual Offset attachment_point (string) const;
+  virtual Offset get_indexed_wxwy (size_t) const;
+  virtual Box get_indexed_char (size_t index) const;
+  virtual Box get_ascii_char (size_t ascii) const;
+
+  /*
+    WTF are these vsize ?
+
+    Font_metric is not related to vector<> 
+   */
+  virtual size_t name_to_index (string) const;
+  virtual size_t index_to_charcode (size_t) const;
+  virtual size_t index_to_ascii (size_t) const;
   virtual Real design_size () const;
-  virtual Stencil find_by_name (String) const;
-  virtual Stencil get_indexed_char_stencil (int k) const;
-  virtual Stencil get_ascii_char_stencil (int k) const;
+  virtual Stencil find_by_name (string) const;
+  virtual Stencil get_indexed_char_stencil (size_t k) const;
+  virtual Stencil get_ascii_char_stencil (size_t k) const;
   virtual SCM sub_fonts () const;
-  virtual SCM font_file_name () const; 
-  DECLARE_SMOBS (Font_metric, );
+  virtual SCM font_file_name () const;
+  DECLARE_SMOBS (Font_metric,);
 
 private:
   /* No copying, no implicit copy constructor.  */
-  Font_metric (Font_metric const&);
+  Font_metric (Font_metric const &);
 
 protected:
   virtual void derived_mark () const;
@@ -50,10 +58,11 @@ protected:
   Font_metric ();
 };
 
-int get_encoded_index (Font_metric *m, String input_coding, int code);
+int get_encoded_index (Font_metric *m, string input_coding, int code);
 
 class Simple_font_metric : public Font_metric
 {
+  DECLARE_CLASSNAME(Simple_font_metric);
 public:
 };