resolve merge

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 12d8807831d5d57023ef905de5bdb501a8d46972..458528dd2e4dce9a6994a6975c2f0a86ae570ebf 100644 (file)
--- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2009 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"
@@ -41,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);
@@ -70,17 +79,11 @@ Font_metric::count () const
 }
 
 Box
-Font_metric::get_ascii_char (size_t) const
+Font_metric::get_indexed_char_dimensions (size_t) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
 
-Box
-Font_metric::get_indexed_char (size_t k) const
-{
-  return get_ascii_char (k);
-}
-
 size_t
 Font_metric::name_to_index (string) const
 {
@@ -135,35 +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_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
-{
-  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
@@ -179,21 +157,11 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::word_stencil (string str) const
-{
-  return text_stencil (str);
-}
-
-Stencil
-Font_metric::text_stencil (string /* str */) const
+Font_metric::text_stencil (Output_def *state,
+                           string, bool) const
 {
-  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));
-}
-