X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=458528dd2e4dce9a6994a6975c2f0a86ae570ebf;hb=978bc4c9ea9a904d0365e8935a41cfaea9696a7c;hp=db50ca67c26122ef92d91bb144608695989b38f1;hpb=6bb158ef626b6ba36595e342bc10d18e225fd2b8;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index db50ca67c2..458528dd2e 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -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
@@ -50,7 +50,7 @@ Font_metric::find_by_name (string s) const
       expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
 			 self_scm (),
 			 ly_string2scm (s));
-      b = get_indexed_char (idx);
+      b = get_indexed_char_dimensions (idx);
     }
 
   Stencil q (b, expr);
@@ -79,7 +79,7 @@ Font_metric::count () const
 }
 
 Box
-Font_metric::get_indexed_char (size_t k) const
+Font_metric::get_indexed_char_dimensions (size_t) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
@@ -138,26 +138,10 @@ Font_metric::font_name () const
   return s;
 }
 
-size_t
-Font_metric::index_to_ascii (size_t i) const
-{
-  return i;
-}
-
 size_t
 Font_metric::index_to_charcode (size_t i) const
 {
-  return index_to_ascii (i);
-}
-
-Stencil
-Font_metric::get_indexed_char_stencil (size_t code) const
-{
-  size_t idx = index_to_ascii (code);
-  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
-		       scm_from_unsigned (idx));
-  Box b = get_indexed_char (code);
-  return Stencil (b, at);
+  return i;
 }
 
 Offset
@@ -173,7 +157,7 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::text_stencil (Output_def* state,
+Font_metric::text_stencil (Output_def *state,
                            string, bool) const
 {
   (void) state;