release: 1.3.94

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 4701f2b10983c6616c6b164e3bbeb90a31fb7665..feca94f8845ef460a56e1ffec8d37189e196ef10 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,61 +1,47 @@
-/*
+/*   
   text-item.cc -- implement Text_item
 
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-
-#include "musical-request.hh"
-#include "paper-def.hh"
-#include "text-item.hh"
-#include "stem.hh"
+#include "debug.hh"
 #include "molecule.hh"
+#include "paper-def.hh"
 #include "lookup.hh"
+#include "staff-symbol-referencer.hh"
 
-Text_item::Text_item (General_script_def*tdef_l, Direction d) 
+struct Text_item
 {
-  dir_ = d;
-  fat_b_ = false;
-  tdef_p_ = tdef_l->clone();
-}
+  DECLARE_SCHEME_CALLBACK( brew_molecule, (SCM));
+};
 
-Text_item::~Text_item()
-{
-  delete tdef_p_;
-}
 
-void
-Text_item::do_pre_processing()
-{
-  if (!dir_)
-    dir_ = DOWN;
-}
+MAKE_SCHEME_CALLBACK(Text_item,brew_molecule,1);
 
-Interval
-Text_item::symbol_height() const
-{
-  return tdef_p_->get_atom (paper(), dir_).dim_.y ();
-}
-  
-Molecule*
-Text_item::brew_molecule_p() const
+SCM 
+Text_item::brew_molecule (SCM sm) 
 {
-  Atom a (tdef_p_->get_atom (paper(), dir_));
-
-  /*
-    if (fat_b_)
-    a.sym.dim.x = tdef_p_->width (paper());
-    */
-  Molecule* mol_p = new Molecule (a);
-
-  if (dir_<0)          // should do something better anyway.
-    mol_p->translate (-mol_p->extent().y ().left , Y_AXIS);
-  mol_p->translate (pos_i_ * paper()->internote_f (), Y_AXIS);
+  Score_element * s = unsmob_element (sm);
   
-  return mol_p;
+  SCM style = s->get_elt_property ("style");
+  String st = gh_string_p (style) ?  ly_scm2string (style) : "";
+  SCM txt = s-> get_elt_property ("text");
+  String t = gh_string_p (txt) ? ly_scm2string (txt) : "";
+
+  Molecule mol =  s->paper_l ()->lookup_l(0)->text (st, t, s->paper_l ());
+
+  SCM space =  s->get_elt_property ("word-space");
+  if (gh_number_p (space))
+    {
+      Molecule m;
+      m.set_empty (false);
+      mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space)*
+                      Staff_symbol_referencer::staff_space (s));
+    }
+  return mol.create_scheme (); 
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Text_item,Item);