X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmodified-font-metric.hh;h=c1c893a61320a6eb4b3fd6ee8479132bb56e2064;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=7fa70e365dd2ecf581e898096d7b7b08c6ec88da;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 7fa70e365d..c1c893a613 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--2014 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,14 +26,13 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  Box text_dimension (string) const;
-  Box word_dimension (string) const;
-  Stencil text_stencil (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;
@@ -47,9 +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_ascii_char (size_t) const;
+  Box get_indexed_char_dimensions (size_t) const;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */