X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=31d34024109c800c968b47582eca660b4270200f;hb=6f28237e24268c76147ba3e9d8619316a4b4b4fb;hp=1d32e746a3f2cb123c3b772f8cc34fea7c63fa51;hpb=8a28f0429e9ce4ce7258156d62261b939edd72d1;p=lilypond.git

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 1d32e746a3..31d3402410 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -3,30 +3,88 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 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>
 
+#include "warn.hh"
+#include "grob.hh"
 #include "text-item.hh"
-#include "debug.hh"
-#include "molecule.hh"
+#include "font-interface.hh"
+#include "virtual-font-metric.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
 
-Molecule*
-Text_item::do_brew_molecule_p () const
+MAKE_SCHEME_CALLBACK (Text_item, interpret_markup, 3)
+SCM
+Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
 {
-  SCM style = get_elt_property ("style");
-  String st = gh_string_p (style) ?  ly_scm2string (style) : "";
-  
-  Molecule a= paper_l ()->lookup_l(0)->text (st, text_str_, paper_l ());
+  if (gh_string_p (markup))
+    {
+      String str = ly_scm2string (markup);
+      if (str.index_any (" \t\n\r") != -1)
+	{
+	  /* 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));
+	}
 
-  return new Molecule (a);
+      /* 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
+	lst = fontify_atom (fm, lst);
+
+      Box b = fm->text_dimension (str);
+      return Stencil (b, lst).smobbed_copy ();
+    }
+  else if (gh_pair_p (markup))
+    {
+      SCM func = gh_car (markup);
+      SCM args = gh_cdr (markup);
+      if (!markup_p (markup))
+	programming_error ("Markup head has no markup signature.");
+      
+      return scm_apply_2 (func, paper, props, args);
+    }
+  return SCM_EOL;
 }
 
-void
-Text_item::do_print () const
+MAKE_SCHEME_CALLBACK (Text_item,print,1);
+SCM
+Text_item::print (SCM grob)
 {
-  DEBUG_OUT <<  "text= " << text_str_;
+  Grob * me = unsmob_grob (grob);
+  
+  SCM t = me->get_property ("text");
+  SCM chain = Font_interface::font_alist_chain (me);
+  return interpret_markup (me->get_paper ()->self_scm (), chain, t);
 }
 
+
+/*
+  Ugh. Duplicated from Scheme.
+ */
+bool
+Text_item::markup_p (SCM x)
+{
+  return
+    gh_string_p (x) ||
+    (gh_pair_p (x)
+     && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature")));
+}
+
+ADD_INTERFACE (Text_item,"text-interface",
+  "A scheme markup text, see @usermanref{Text-markup}.",
+  "text baseline-skip word-space");
+
+
+
+