X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmodified-font-metric.hh;h=85882e86e8c9ce2a03263d6b67c6998f5cca8fea;hb=3863f416bea79ef29dded3b1b8a3f61419098f7a;hp=095115d27eb9d375384ec234edce3ce361a88493;hpb=085f80bad751ed2ab6f146884271ade8633389e0;p=lilypond.git

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 095115d27e..85882e86e8 100644
--- 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MODIFIED_FONT_METRIC_HH
@@ -15,39 +15,30 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  virtual Box text_dimension (String) const;
-  virtual Stencil text_stencil (String) const;
-  
-  static SCM make_scaled_font_metric (Font_metric *fm, Real magnification,
-				      SCM font_encoding, SCM input_encoding);
-  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;
-  virtual String coding_scheme () const;
-  virtual Font_metric *original_font () 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);
+  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:
-  SCM coding_vector_;
-  SCM coding_table_;
-  SCM coding_mapping_;
-  SCM coding_description_;
   Font_metric *orig_;
   Real magnification_;
-  String input_encoding_;
-  friend SCM ly_font_encoding_alist (SCM);
-    
-  Modified_font_metric (Font_metric *fm, Real magnification,
-			String font_encoding, String input_encoding);
-  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;
+
+  Modified_font_metric (Font_metric *fm, Real magnification);
+  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;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */