release: 1.3.101

[lilypond.git] / lily / lyric-engraver.cc

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 61e12a1c5101c8a75746e4328cfa999ca7d989a0..09e9fc9ee94eacf41e0e234bee8a5ac5b72c86dc 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -9,9 +9,10 @@
 
 #include "lyric-engraver.hh"
 #include "musical-request.hh"
-#include "text-item.hh"
+#include "item.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-metric.hh"
+#include "side-position-interface.hh"
 
 ADD_THIS_TRANSLATOR (Lyric_engraver);
 
@@ -40,12 +41,20 @@ Lyric_engraver::do_process_music()
 {
   if (req_l_)
     {
-      text_p_=  new Text_item;
+      text_p_=  new Item (get_property ("LyricText"));
       
-      text_p_->set_elt_property ("text",
-                                ly_str02scm   ((req_l_->text_str_ + " ").ch_C ()));
-      text_p_->set_elt_property ("non-rhythmic", SCM_BOOL_T);
-      announce_element (Score_element_info (text_p_, req_l_));
+      text_p_->set_elt_property ("text", req_l_->get_mus_property ("text"));
+
+      /*
+       We can't reach the notehead where we're centered from here. So
+       we kludge.
+
+       (UGH UGH, pulled amount of space out of thin air)
+      */
+      
+      text_p_->translate_axis (0.66, X_AXIS);
+      
+      announce_element (text_p_, req_l_);
     }
 }