release: 1.2.8

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 42ae3994c4040a0a3db659e4aa873aef226caab2..3f19466ee141456af55d37c084ec8be5def38bcf 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,70 +1,33 @@
-/*
+/*   
   text-item.cc -- implement Text_item
 
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1998--1999 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"
 
-Text_item::Text_item(General_script_def*tdef_l, int d)
+Molecule*
+Text_item::do_brew_molecule_p () const
 {
-    dir_i_ = d;
-    fat_b_ = false;
-    tdef_p_ = tdef_l->clone();
-    pos_i_ =0;
-}
+  Molecule a= paper_l ()->lookup_l(0)->text (style_str_,text_str_, paper_l ()); 
 
-Text_item::~Text_item()
-{
-    delete tdef_p_;
+  return new Molecule (a);
 }
 
-void
-Text_item::set_default_index()
+Text_item::Text_item ()
 {
-    pos_i_  = get_position_i(
-       tdef_p_->get_atom(paper(), dir_i_).extent().y );
+  style_str_ = "roman";
 }
 
 void
-Text_item::do_pre_processing()
+Text_item::do_print () const
 {
-    if (!dir_i_)
-       dir_i_ = -1;
+  DOUT <<  "text= " << text_str_;
 }
-
-void
-Text_item::do_post_processing()
-{
-    set_default_index();
-}
-
-    
-Molecule*
-Text_item::brew_molecule_p() const
-{
-    Atom a(tdef_p_->get_atom(paper(), dir_i_));
-
-/*
-  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);