X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=fef4babe23d08c088616013472c6e0a198affb5b;hb=11b3094461e045deafd0e2b1cef8c60f79e259a1;hp=034173e7c5688a18c6fe3d292b99340a9b91f0cd;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 034173e7c5..fef4babe23 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -3,27 +3,85 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2003 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) : "";
-  SCM txt = get_elt_property ("text");
-  String t = gh_string_p (txt) ? ly_scm2string (txt) : "";
+  if (gh_string_p (markup))
+    {
+      Paper_def *pap = unsmob_paper (paper);
+      Font_metric *fm = select_font (pap, props);
   
-  Molecule a= paper_l ()->lookup_l(0)->text (st, t, paper_l ());
+      SCM list = 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);
 
-  return new Molecule (a);
+      Box b = fm->text_dimension (ly_scm2string (markup));
+      return Molecule (b, list).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);
+    }
+  else
+    {
+      return SCM_EOL;
+    }
 }
 
+MAKE_SCHEME_CALLBACK(Text_item,brew_molecule,1);
+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 (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 @ref{Markup functions}.",
+  "text baseline-skip word-space");
+
+
+