X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=eec815089429a4ff115244552bbcea2e33c46535;hb=b7bda3ecd08b19f4b598f40ca8940e183083fd4f;hp=a940c4e452b5f1b48f33af4826e92d3a6786868c;hpb=913f4a33e9b60b94e673ae48c1fb299f1465b4ad;p=lilypond.git

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index a940c4e452..eec8150894 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -32,10 +32,10 @@ Text_interface::interpret_string (SCM layout_smob,
   SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
 		   __FUNCTION__, "string");
 
-  String str = ly_scm2string (markup);
+  string str = ly_scm2string (markup);
 
   Font_metric *fm = select_encoded_font (layout, props);
-  return fm->text_stencil (str).smobbed_copy ();
+  return fm->word_stencil (str).smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3);
@@ -77,7 +77,7 @@ Text_interface::print (SCM grob)
 
   SCM t = me->get_property ("text");
   SCM chain = Font_interface::text_font_alist_chain (me);
-  return interpret_markup (me->get_layout ()->self_scm (), chain, t);
+  return interpret_markup (me->layout ()->self_scm (), chain, t);
 }
 
 /* Ugh. Duplicated from Scheme.  */
@@ -91,7 +91,7 @@ Text_interface::is_markup (SCM x)
 				      ly_symbol2scm ("markup-signature"))));
 }
 
-ADD_INTERFACE (Text_interface, "text-interface",
+ADD_INTERFACE (Text_interface,
 	       "A scheme markup text, see @usermanref{Text markup}.",
 	       "baseline-skip "
 	       "text "