release: 1.3.101

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index e31edb695029819d0e6c00f4f9428d28419ac46c..09e9fc9ee94eacf41e0e234bee8a5ac5b72c86dc 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -11,7 +11,7 @@
 #include "musical-request.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);
@@ -41,18 +41,18 @@ Lyric_engraver::do_process_music()
 {
   if (req_l_)
     {
-      text_p_=  new Item (get_property ("basicLyricTextProperties"));
+      text_p_=  new Item (get_property ("LyricText"));
       
-      text_p_->set_elt_property ("text",
-//                              ly_str02scm   ((req_l_->text_str_ + " ").ch_C ()));
-                                ly_str02scm   ((req_l_->text_str_).ch_C ()));
+      text_p_->set_elt_property ("text", req_l_->get_mus_property ("text"));
 
-      text_p_->add_offset_callback (&Side_position::aligned_on_self,X_AXIS);
       /*
        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 (paper_l()->get_var ("quartwidth")/2, X_AXIS);
+      
+      text_p_->translate_axis (0.66, X_AXIS);
       
       announce_element (text_p_, req_l_);
     }