2003 -> 2004

[lilypond.git] / lily / text-item.cc

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 0bf318708eff267e93cb7d607c387d5cda4b4cdf..1c4e596bf1f091927548ca1e0df5b2cc1255043f 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
  */
 #include <math.h>
@@ -13,17 +13,16 @@
 #include "text-item.hh"
 #include "font-interface.hh"
 #include "virtual-font-metric.hh"
-
-
+#include "paper-def.hh"
 
 MAKE_SCHEME_CALLBACK(Text_item,interpret_markup,3);
 SCM
-Text_item::interpret_markup (SCM grob, SCM props, SCM markup)
+Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
 {
   if (gh_string_p (markup))
     {
-      Grob *me = unsmob_grob (grob);
-      Font_metric *fm = Font_interface::get_font (me, props);
+      Paper_def *pap = unsmob_paper (paper);
+      Font_metric *fm = select_font (pap, props);
   
       SCM list = scm_list_n (ly_symbol2scm ("text"), markup, SCM_UNDEFINED);
       
@@ -47,7 +46,7 @@ Text_item::interpret_markup (SCM grob, SCM props, SCM markup)
       if (!markup_p (markup))
        programming_error ("Markup head has no markup signature.");
       
-      return scm_apply_2 (func, grob, props, args);
+      return scm_apply_2 (func, paper, props, args);
     }
   else
     {
@@ -60,10 +59,10 @@ SCM
 Text_item::brew_molecule (SCM grob)
 {
   Grob * me = unsmob_grob (grob);
-
+  
   SCM t = me->get_grob_property ("text");
   SCM chain = Font_interface::font_alist_chain (me);
-  return interpret_markup (grob, chain, t);
+  return interpret_markup (me->get_paper ()->self_scm (), chain, t);
 }