resolve merge

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

diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index bb4dbd401c74a93bd43895f138dd11c29248ecc5..fda67e11ba9d216257b595bf6852485d53046d6c 100644 (file)
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -1,9 +1,20 @@
 /*
-  font-metric-scheme.cc -- implement Font_metric scheme bindings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--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.
+
+  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"
@@ -20,7 +31,8 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
           "\n"
           "Note that this command can only be used to access glyphs from"
           " fonts loaded with @code{ly:system-font-load}; currently, this"
-          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " means either the Emmentaler or Emmentaler-Brace "
+           " fonts, corresponding"
           " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
           " respectively.")
 {
@@ -34,25 +46,6 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
   return m.smobbed_copy ();
 }
 
-LY_DEFINE (ly_get_glyph, "ly:get-glyph",
-          2, 0, 0,
-          (SCM font, SCM index),
-          "Retrieve a stencil for the glyph numbered @var{index}"
-          " in @var{font}.\n"
-          "\n"
-          "Note that this command can only be used to access glyphs from"
-          " fonts loaded with @code{ly:system-font-load}; currently, this"
-          " means either the Emmentaler or Aybabtu fonts, corresponding"
-          " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
-          " respectively.")
-{
-  Font_metric *fm = unsmob_metrics (font);
-  LY_ASSERT_SMOB (Font_metric, font, 1);
-  LY_ASSERT_TYPE (scm_is_number, index,2);
-
-  return fm->get_ascii_char_stencil (scm_to_int (index)).smobbed_copy ();
-}
-
 LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
           2, 0, 0,
           (SCM font, SCM name),
@@ -60,7 +53,7 @@ LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
           "\n"
           "Note that this command can only be used to access glyphs from"
           " fonts loaded with @code{ly:system-font-load}; currently, this"
-          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " means either the Emmentaler or Emmentaler-Brace fonts, corresponding"
           " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
           " respectively.")
 {
@@ -78,7 +71,7 @@ LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
           "\n"
           "Note that this command can only be used to access glyphs from"
           " fonts loaded with @code{ly:system-font-load}; currently, this"
-          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " means either the Emmentaler or Emmentaler-Brace fonts, corresponding"
           " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
           " respectively.")
 {
@@ -96,7 +89,7 @@ LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
           "\n"
           "Note that this command can only be used to access glyphs from"
           " fonts loaded with @code{ly:system-font-load}; currently, this"
-          " means either the Emmentaler or Aybabtu fonts, corresponding"
+          " means either the Emmentaler or Emmentaler-Brace fonts, corresponding"
           " to the font encodings @code{fetaMusic} and @code{fetaBraces},"
           " respectively.")
 {
@@ -107,25 +100,6 @@ LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
   return scm_from_unsigned_integer (fm->index_to_charcode (fm->name_to_index (ly_scm2string (name))));
 }
 
-LY_DEFINE (ly_text_dimension, "ly:text-dimension",
-          2, 0, 0,
-          (SCM font, SCM text),
-          "Given the font metric in @var{font} and the string @var{text},"
-          " compute the extents of that text in that font.  The return"
-          " value is a pair of number-pairs.")
-{
-  Box b;
-  Modified_font_metric *fm = dynamic_cast<Modified_font_metric *>
-    (unsmob_metrics (font));
-
-  LY_ASSERT_SMOB (Font_metric, font, 1);
-  LY_ASSERT_TYPE (scm_is_string, text, 2);
-  Stencil stc (fm->text_stencil (ly_scm2string (text)));
-  return scm_cons (ly_interval2scm (stc.extent (X_AXIS)),
-                  ly_interval2scm (stc.extent (Y_AXIS)));
-}
-
-
 /*
   TODO: when are non string retvals allowed?
  */