X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flyric-engraver.cc;h=64a306b3ed427a2ad07e3c92c9e6c63a83a6f922;hb=c52973e438ce3490d688860bb71849a7b3c26fef;hp=f6b61316fa50995b51fa8a8ec7f5bceb09d39d99;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index f6b61316fa..64a306b3ed 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lyric-engraver.hh"
 #include "musical-request.hh"
-#include "text-item.hh"
+#include "item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
 
@@ -36,16 +36,15 @@ Lyric_engraver::do_try_music (Music*r)
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::do_process_music()
 {
   if (req_l_)
     {
-      text_p_=  new Text_item;
-      text_p_->text_str_ = req_l_->text_str_;
-      text_p_->text_str_ += " ";	// ugh.
-
-      text_p_->set_elt_property (non_rhythmic_scm_sym, SCM_BOOL_T);
+      text_p_=  new Item (get_property ("basicLyricTextProperties"));
       
+      text_p_->set_elt_property ("text",
+				 ly_str02scm   ((req_l_->text_str_ + " ").ch_C ()));
+
       announce_element (Score_element_info (text_p_, req_l_));
     }
 }
@@ -66,3 +65,4 @@ Lyric_engraver::do_post_move_processing ()
   req_l_ =0;
 }
 
+