Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 3deebd03ca0dbb881256f93be7a9f5116901725b..f5d036f972ea63fd6e01efa2bd053004ba40f231 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -20,23 +20,30 @@ class Font_metric
 
 public:
   SCM description_;
-  std::string file_name_;
-
-  virtual Stencil text_stencil (std::string) const;
-  virtual Box text_dimension (std::string) const;
-  virtual std::string font_name () const;
-  virtual vsize count () const;
-  virtual Offset attachment_point (std::string) const;
-  virtual Offset get_indexed_wxwy (vsize) const;
-  virtual Box get_indexed_char (vsize index) const;
-  virtual Box get_ascii_char (vsize ascii) const;
-  virtual vsize name_to_index (std::string) const;
-  virtual vsize index_to_charcode (vsize) const;
-  virtual vsize index_to_ascii (vsize) 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 (std::string) const;
-  virtual Stencil get_indexed_char_stencil (vsize k) const;
-  virtual Stencil get_ascii_char_stencil (vsize 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,);
@@ -51,7 +58,7 @@ protected:
   Font_metric ();
 };
 
-int get_encoded_index (Font_metric *m, std::string input_coding, int code);
+int get_encoded_index (Font_metric *m, string input_coding, int code);
 
 class Simple_font_metric : public Font_metric
 {