Merge branch 'lilypond/translation'

[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 b72fcd4d9f64decd030e7bedfde3822718c67c7c..04af68b6e7407ac91fb778eaba4a08521c9eadae 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  Stencil text_stencil (Output_def* output_state, string, bool) const;
+  Stencil text_stencil (Output_def *output_state, string, bool) const;
 
   static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
   size_t count () const;
@@ -45,9 +45,7 @@ protected:
   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 get_indexed_char_dimensions (size_t) const;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */