* input/regression/new-part-combine-solo.ly: more cases.

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index ac80893cf281ae4f701870a0f013a269bd7ad390..fef4babe23d08c088616013472c6e0a198affb5b 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -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);
       
@@ -40,11 +39,18 @@ Text_item::interpret_markup (SCM grob, SCM props, SCM markup)
       Box b = fm->text_dimension (ly_scm2string (markup));
       return Molecule (b, list).smobbed_copy();
     }
-  else
+  else if (gh_pair_p (markup))
     {
       SCM func = gh_car (markup);
       SCM args = gh_cdr (markup);
-      return scm_apply_2 (func, grob, props, args);
+      if (!markup_p (markup))
+       programming_error ("Markup head has no markup signature.");
+      
+      return scm_apply_2 (func, paper, props, args);
+    }
+  else
+    {
+      return SCM_EOL;
     }
 }
 
@@ -53,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);
 }