patch::: 1.3.57.jcn2

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 2171a81d240a794826872543a04adee6f1e14671..35e5aa5c3dfca2e8242ea7c5f6d14183118374e2 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,74 +1,46 @@
-/*
-  textitem.cc -- implement Text_item
+/*   
+  text-item.cc -- implement Text_item
 
-  source file of the LilyPond music typesetter
+  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(Text_def *tdef_l, int staffsize_i)
+Text_item::Text_item (SCM s)
+  : Item (s)
 {
-    dir_i_ =-1;
-    init(tdef_l, staffsize_i);  
+  
 }
 
-Text_def*
-Text_item::tdef_l()
-{
-    return tdef_p_;
-}
+MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Text_item)
 
-Text_item::~Text_item()
+Molecule 
+Text_item::do_brew_molecule () const
 {
-    delete tdef_p_;
-}
+  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) : "";
 
-void
-Text_item::init(Text_def *tdef_l, int staffsize_i)
-{
-    staffsize_i_ = staffsize_i;
-    tdef_p_ = new Text_def (*tdef_l);
-}
+  Molecule mol = paper_l ()->lookup_l(0)->text (st, t, paper_l ());
 
-Text_item::Text_item(Text_req* treq_l, int staffsize_i)
-{
-    init(treq_l->tdef_p_, staffsize_i);
-    dir_i_ = treq_l->dir_i_;
-    if (!dir_i_)
-       dir_i_ = -1;
+  SCM s = get_elt_property ("word-space");
+  if (gh_number_p (s))
+    {
+      Molecule m;
+      m.set_empty (false);
+      mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (s)*
+                      staff_symbol_referencer (this).staff_space ());
+    }
+  return mol; 
 }
 
-void
-Text_item::set_default_index()
-{
-    pos_i_  = (dir_i_ > 0) ? staffsize_i_ + 2: -4;
-}
-
-void
-Text_item::do_pre_processing()
-{
-    set_default_index();
-}
-
-    
-Molecule*
-Text_item::brew_molecule_p() const
-{
-    Molecule* mol_p = new Molecule(tdef_p_->create_atom(paper()));
-    mol_p->translate(Offset(0, pos_i_ * paper()->internote()));
-
-    if(dir_i_<0)
-       mol_p->translate(Offset(0, -mol_p->extent().y.length() ));
-    
-    return mol_p;
-}
 
-IMPLEMENT_STATIC_NAME(Text_item);