* lily/stencil-scheme.cc:

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index ac80893cf281ae4f701870a0f013a269bd7ad390..29273cf6620f9a699b4cc8b4dcf5db86faeabcda 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,50 +13,59 @@
 #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);
+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);
-  
-      SCM list = scm_list_n (ly_symbol2scm ("text"), markup, SCM_UNDEFINED);
-      
-      if (dynamic_cast<Virtual_font_metric*> (fm))
+      String str = ly_scm2string (markup);
+      if (str.index_any (" \t\n\r") != -1)
        {
-         /*
-           ARGH.
-         */
-         programming_error ("Can't use virtual font for text.");
+         /* Multi word string to line markup.  */
+         static SCM proc;
+         if (!proc)
+           proc = scm_c_eval_string ("make-simple-markup");
+         return interpret_markup (paper, props, scm_call_1 (proc, markup));
        }
+
+      /* Simple word.  */
+      Paper_def *pap = unsmob_paper (paper);
+      Font_metric *fm = select_font (pap, props);
+      SCM lst = scm_list_n (ly_symbol2scm ("text"), markup, SCM_UNDEFINED);
+      
+      if (dynamic_cast<Virtual_font_metric*> (fm))
+       /* ARGH. */
+       programming_error ("Can't use virtual font for text.");
       else
-       list = fontify_atom (fm, list);
+       lst = fontify_atom (fm, lst);
 
-      Box b = fm->text_dimension (ly_scm2string (markup));
-      return Molecule (b, list).smobbed_copy();
+      Box b = fm->text_dimension (str);
+      return Stencil (b, lst).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);
     }
+  return SCM_EOL;
 }
 
-MAKE_SCHEME_CALLBACK(Text_item,brew_molecule,1);
+MAKE_SCHEME_CALLBACK(Text_item,print,1);
 SCM
-Text_item::brew_molecule (SCM grob)
+Text_item::print (SCM grob)
 {
   Grob * me = unsmob_grob (grob);
-
-  SCM t = me->get_grob_property ("text");
+  
+  SCM t = me->get_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);
 }
 
 
@@ -73,7 +82,7 @@ Text_item::markup_p (SCM x)
 }
 
 ADD_INTERFACE (Text_item,"text-interface",
-  "A scheme markup text, see @ref{Markup functions}.",
+  "A scheme markup text, see @usermanref{Text-markup}.",
   "text baseline-skip word-space");