* 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 42ae3994c4040a0a3db659e4aa873aef226caab2..fef4babe23d08c088616013472c6e0a198affb5b 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,70 +1,87 @@
-/*
+/*   
   text-item.cc -- implement Text_item
 
   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>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-
-#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(General_script_def*tdef_l, int d)
+MAKE_SCHEME_CALLBACK(Text_item,interpret_markup,3);
+SCM
+Text_item::interpret_markup (SCM paper, SCM props, SCM markup)
 {
-    dir_i_ = d;
-    fat_b_ = false;
-    tdef_p_ = tdef_l->clone();
-    pos_i_ =0;
-}
+  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_item::~Text_item()
-{
-    delete 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;
+    }
 }
 
-void
-Text_item::set_default_index()
+MAKE_SCHEME_CALLBACK(Text_item,brew_molecule,1);
+SCM
+Text_item::brew_molecule (SCM grob)
 {
-    pos_i_  = get_position_i(
-       tdef_p_->get_atom(paper(), dir_i_).extent().y );
+  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::do_pre_processing()
-{
-    if (!dir_i_)
-       dir_i_ = -1;
-}
 
-void
-Text_item::do_post_processing()
+/*
+  Ugh. Duplicated from Scheme.
+ */
+bool
+Text_item::markup_p (SCM x)
 {
-    set_default_index();
+  return
+    gh_string_p (x) ||
+    (gh_pair_p (x)
+     && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature")));
 }
 
-    
-Molecule*
-Text_item::brew_molecule_p() const
-{
-    Atom a(tdef_p_->get_atom(paper(), dir_i_));
+ADD_INTERFACE (Text_item,"text-interface",
+  "A scheme markup text, see @ref{Markup functions}.",
+  "text baseline-skip word-space");
+
 
-/*
-  if ( fat_b_)
-       a.sym.dim.x = tdef_p_->width(paper());
-       */
-    Molecule* mol_p = new Molecule(a);
 
-    if(dir_i_<0 )              // should do something better anyway.
-       mol_p->translate_y( -mol_p->extent().y.left );
-    mol_p->translate_y( pos_i_ * paper()->internote_f());
-    
-    return mol_p;
-}
 
-IMPLEMENT_STATIC_NAME(Text_item);
-IMPLEMENT_IS_TYPE_B1(Text_item,Item);