partial: 1.0.1.jcn

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

diff --git a/lily/lyric-grav.cc b/lily/lyric-grav.cc
index 0ba2ae489676a30fcd5cce11a4b8f8bd1b5e551b..9c4cb14629f88e1a8f303e5ed7bde281e1d63bd9 100644 (file)
--- a/lily/lyric-grav.cc
+++ b/lily/lyric-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include "lyric-engraver.hh"
@@ -11,50 +11,67 @@
 #include "text-item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
+#include "paper-def.hh"
+#include "main.hh"
 
 Lyric_engraver::Lyric_engraver()
 {
-    lreq_l_ =0;
-    lyric_item_p_ =0;
+  lreq_l_ =0;
+  lyric_item_p_ =0;
 }
 
 bool
-Lyric_engraver::do_try_request(Request*r)
+Lyric_engraver::do_try_request (Request*r)
 {
-    Musical_req * m =r->musical();
-    if (!m || ! m->lreq_l()) 
-       return false;
-    lreq_l_ = m->lreq_l();
+  Musical_req * m =r->musical();
+  if (!m || ! m->lreq_l()) 
+    return false;
+  lreq_l_ = m->lreq_l();
 
-    return true;
+  return true;
 }
 
 void
 Lyric_engraver::do_process_requests()
 {
-    if ( lreq_l_ ) {  
-       lyric_item_p_ =  new Text_item(lreq_l_->tdef_p_ );
-       lyric_item_p_->dir_i_ = -1;
-       lyric_item_p_->fat_b_ = true;
-       announce_element( Score_elem_info( lyric_item_p_, lreq_l_));
+  if (lreq_l_) 
+    {
+      lyric_item_p_ =  new Text_item (lreq_l_->tdef_p_);
+
+      lyric_item_p_->translate_axis (paper()->note_width ()/2 , X_AXIS);
+      lyric_item_p_->dir_ = DOWN;
+      lyric_item_p_->fat_b_ = true;
+      announce_element (Score_elem_info (lyric_item_p_, lreq_l_));
     }
 }
 
 void
 Lyric_engraver::do_post_move_processing()
 {
-    lreq_l_ =0;
+  lreq_l_ =0;
 }
 
 void
 Lyric_engraver::do_pre_move_processing()
 {
-    if ( lyric_item_p_ ){
-       typeset_element( lyric_item_p_);
-       lyric_item_p_ =0;
+  if (lyric_item_p_)
+    {
+      /*
+        urg. should check-out deriving from staff/line spanner
+       */
+      if (experimental_features_global_b)
+        {
+         if (lyric_item_p_->tdef_p_->static_name () == Text_def::static_name ())
+           {
+             Text_def* t = (Text_def*)lyric_item_p_->tdef_p_;
+             t->text_str_ += "\\hrule 1mm 10mm 20mm";
+           }
+       }
+      typeset_element (lyric_item_p_);
+      lyric_item_p_ =0;
     }
 }
 
 
 IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_ENGRAVER(Lyric_engraver);
+ADD_THIS_TRANSLATOR(Lyric_engraver);