X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmodified-font-metric.hh;h=c63c532fbde743a0d1e208e4b0702e0f67030520;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3383c92d81bdc9a607d4d6d3f26e943f114cd50a;hpb=6bb158ef626b6ba36595e342bc10d18e225fd2b8;p=lilypond.git

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 3383c92d81..c63c532fbd 100644
--- 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--2015 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,12 +26,13 @@
 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, const string&, bool) const;
+  Real get_magnification () 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;
+  Offset attachment_point (const string&) const;
   size_t name_to_index (string) const;
   size_t index_to_charcode (size_t) const;
   Font_metric *original_font () const;
@@ -45,8 +46,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_indexed_char_dimensions (size_t) const;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */