X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-item.cc;h=6d3b67d003e0623bb331d72cd8f8923b75146f3c;hb=11b3094461e045deafd0e2b1cef8c60f79e259a1;hp=e97c7357b3b56e69ed920911b483eb17d6146564;hpb=450905eed19bced95484ebb2639aba2eeb250b06;p=lilypond.git

diff --git a/lily/text-item.cc b/lily/text-item.cc
index e97c7357b3..fef4babe23 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,77 +1,87 @@
-/*
-  textitem.cc -- implement Text_item
-
-  source file of the LilyPond music typesetter
+/*   
+  text-item.cc -- implement Text_item
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+ */
+#include <math.h>
 
-
-#include "musical-request.hh"
-#include "paper-def.hh"
+#include "warn.hh"
+#include "grob.hh"
 #include "text-item.hh"
-#include "stem.hh"
-#include "molecule.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
+#include "virtual-font-metric.hh"
+#include "paper-def.hh"
 
-Text_item::Text_item(Text_def *tdef_l)
-    : Staff_side(this)
+MAKE_SCHEME_CALLBACK(Text_item,interpret_markup,3);
+SCM
+Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
 {
-    dir_i_ =-1;
-    init(tdef_l);  
-}
+  if (gh_string_p (markup))
+    {
+      Paper_def *pap = unsmob_paper (paper);
+      Font_metric *fm = select_font (pap, props);
+  
+      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);
 
-Text_def*
-Text_item::tdef_l()
-{
-    return tdef_p_;
+      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;
+    }
 }
 
-Text_item::~Text_item()
+MAKE_SCHEME_CALLBACK(Text_item,brew_molecule,1);
+SCM
+Text_item::brew_molecule (SCM grob)
 {
-    delete tdef_p_;
+  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);
 }
 
-void
-Text_item::init(Text_def *tdef_l)
-{
-    tdef_p_ = new Text_def (*tdef_l);
-}
 
-Text_item::Text_item(Text_req* treq_l)
-    : Staff_side(this)
+/*
+  Ugh. Duplicated from Scheme.
+ */
+bool
+Text_item::markup_p (SCM x)
 {
-    init(treq_l->tdef_p_);
-    dir_i_ = treq_l->dir_i_;
-    if (!dir_i_)
-	dir_i_ = -1;
+  return
+    gh_string_p (x) ||
+    (gh_pair_p (x)
+     && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature")));
 }
 
-void
-Text_item::set_default_index()
-{
-    pos_i_  = get_position_i(tdef_p_->create_atom(paper()).extent().y );
-}
+ADD_INTERFACE (Text_item,"text-interface",
+  "A scheme markup text, see @ref{Markup functions}.",
+  "text baseline-skip word-space");
 
-void
-Text_item::do_post_processing()
-{
-    if (!dir_i_)
-	dir_i_ = -1;
-    set_default_index();
-}
 
-    
-Molecule*
-Text_item::brew_molecule_p() const
-{
-    Molecule* mol_p = new Molecule(tdef_p_->create_atom(paper()));
 
-    if(dir_i_<0 )		// should do something better anyway.
-	mol_p->translate(Offset(0, -mol_p->extent().y.left ));
-    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
-    
-    return mol_p;
-}
 
-IMPLEMENT_STATIC_NAME(Text_item);