X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=262d8a1559cd8ee8d8400c687f50bb3cd70e9ba8;hb=c5d9ef8c7eaed663fabcd70742ba7a0e56cb337b;hp=9901f4c38292987ab9376ac524d1c2e2e53a8a6c;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 9901f4c382..262d8a1559 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,11 +1,20 @@
 /*
-  font-metric.cc -- implement 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--2008 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.
 
-  Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
+  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/>.
 */
 
 #include "font-metric.hh"
@@ -147,15 +156,6 @@ Font_metric::index_to_charcode (size_t i) const
   return index_to_ascii (i);
 }
 
-Stencil
-Font_metric::get_ascii_char_stencil (size_t code) const
-{
-  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
-		       scm_from_unsigned (code));
-  Box b = get_ascii_char (code);
-  return Stencil (b, at);
-}
-
 Stencil
 Font_metric::get_indexed_char_stencil (size_t code) const
 {
@@ -179,22 +179,11 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::word_stencil (string str) const
+Font_metric::text_stencil (Output_def* state,
+                           string, bool) const
 {
-  return text_stencil (str);
-}
-
-Stencil
-Font_metric::text_stencil (string str) const
-{
-  (void) str;
-  programming_error("Cannot get a text stencil from this font");
+  (void) state;
+  
+  programming_error ("Cannot get a text stencil from this font");
   return Stencil (Box (), SCM_EOL);
 }
-
-Box
-Font_metric::text_dimension (string) const
-{
-  return Box (Interval (0, 0), Interval (0, 0));
-}
-