release: 1.3.19

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 3f19466ee141456af55d37c084ec8be5def38bcf..034173e7c5688a18c6fe3d292b99340a9b91f0cd 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,18 +16,14 @@
 Molecule*
 Text_item::do_brew_molecule_p () const
 {
-  Molecule a= paper_l ()->lookup_l(0)->text (style_str_,text_str_, paper_l ()); 
+  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) : "";
+  
+  Molecule a= paper_l ()->lookup_l(0)->text (st, t, paper_l ());
 
   return new Molecule (a);
 }
 
-Text_item::Text_item ()
-{
-  style_str_ = "roman";
-}
 
-void
-Text_item::do_print () const
-{
-  DOUT <<  "text= " << text_str_;
-}