X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fmodified-font-metric.hh;h=3383c92d81bdc9a607d4d6d3f26e943f114cd50a;hb=6bb158ef626b6ba36595e342bc10d18e225fd2b8;hp=26d9575d5b25b86e84e0a9032c4b1235ec44bca0;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 26d9575d5b..3383c92d81 100644
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -1,9 +1,20 @@
 /*
-  modified-font-metric.hh -- declare Font_metric
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef MODIFIED_FONT_METRIC_HH
@@ -15,15 +26,14 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  virtual Box text_dimension (String) const;
-  virtual Stencil text_stencil (String) const;
+  Stencil text_stencil (Output_def* output_state, string, bool) 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;
+  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:
@@ -31,14 +41,12 @@ protected:
   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;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */