Run `make grand-replace'.

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

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 1f3b380aee105d6c5a12161c693c3a460be76ad4..ada0060970ec4bb88aa34b870a034ecb9c839704 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -1,9 +1,9 @@
-/*   
+/*
   modified-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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MODIFIED_FONT_METRIC_HH
@@ -15,30 +15,31 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  virtual Box text_dimension (String) const;
-  virtual Stencil text_stencil (String) const;
-  
+  Box text_dimension (string) const;
+  Box word_dimension (string) const;
+  Stencil text_stencil (string) const;
+
   static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
-  virtual int count () const;
-  virtual Offset get_indexed_wxwy (int) const;
-  virtual Offset attachment_point (String) const;
-  virtual int name_to_index (String) const;
-  virtual unsigned index_to_charcode (int) const;
-  Font_metric*original_font () const;
-  
+  size_t count () const;
+  Offset get_indexed_wxwy (size_t) const;
+  Offset attachment_point (string) const;
+  size_t name_to_index (string) const;
+  size_t index_to_charcode (size_t) const;
+  Font_metric *original_font () const;
+
 protected:
   Font_metric *orig_;
   Real magnification_;
-    
+
   Modified_font_metric (Font_metric *fm, Real magnification);
-  virtual SCM sub_fonts () const;
-  virtual String font_name () const;
-  virtual Real design_size () const;
-  virtual void derived_mark () const; 
-  virtual Box get_indexed_char (int) const;
-  virtual int index_to_ascii (int) const;
-  virtual Box get_ascii_char (int) const;
-  Box tex_kludge (String) const;
+  SCM sub_fonts () const;
+  string font_name () const;
+  Real design_size () const;
+  void derived_mark () const;
+  Box get_indexed_char (size_t) const;
+  size_t index_to_ascii (size_t) const;
+  Box get_ascii_char (size_t) const;
+  Box tex_kludge (string) const;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */