release: 1.3.0

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 9555cad7ebbd1182bb65817d23a025ad13085d0f..080546f2f5fe6524e18e880304043fb607b9f1b1 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,7 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lyric-engraver.hh"
@@ -11,21 +12,24 @@
 #include "text-item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "paper-def.hh"
-#include "main.hh"
+
+ADD_THIS_TRANSLATOR (Lyric_engraver);
+
 
 Lyric_engraver::Lyric_engraver()
 {
-  lreq_l_ =0;
-  lyric_item_p_ =0;
+  text_p_ =0;
+  req_l_ =0;
 }
 
 bool
-Lyric_engraver::do_try_request (Request*r)
+Lyric_engraver::do_try_music (Music*r)
 {
-  if (Lyric_req * lr = dynamic_cast <Lyric_req *> (r))
+  if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
     {
-      lreq_l_ = lr;
+      if (req_l_)
+       return false;
+      req_l_ =l;
       return true;
     }
   return false;
@@ -34,46 +38,35 @@ Lyric_engraver::do_try_request (Request*r)
 void
 Lyric_engraver::do_process_requests()
 {
-  if (lreq_l_) 
+  if (req_l_)
     {
-      Text_def *td_p = new Text_def;
-      td_p->text_str_ = lreq_l_->text_str_;
-      td_p->align_dir_ = LEFT;
-      Scalar style = get_property ("textstyle");
-      if (style.length_i ())
-       {
-         td_p->style_str_ = style;
-       }
-      Scalar alignment = get_property ("textalignment");
-      if (alignment.isnum_b())
-       {
-         td_p->align_dir_= (Direction)(int)alignment;
-       }
-      
-      lyric_item_p_ =  new Text_item (td_p);
+      text_p_=  new Text_item;
+      text_p_->text_str_ = req_l_->text_str_;
+      text_p_->text_str_ += " ";       // ugh.
 
-      lyric_item_p_->dir_ = DOWN;
-      lyric_item_p_->fat_b_ = true;
-      announce_element (Score_element_info (lyric_item_p_, lreq_l_));
-    }
-}
+      SCM style = get_property ("textStyle", 0);
+      if (gh_string_p(style))
+       text_p_->style_str_ = ly_scm2string (style);
 
-void
-Lyric_engraver::do_post_move_processing()
-{
-  lreq_l_ =0;
+      text_p_->set_elt_property (non_rhythmic_scm_sym, SCM_BOOL_T);
+      
+      announce_element (Score_element_info (text_p_, req_l_));
+    }
 }
 
 void
 Lyric_engraver::do_pre_move_processing()
 {
-  if (lyric_item_p_)
+  if (text_p_)
     {
-      typeset_element (lyric_item_p_);
-      lyric_item_p_ =0;
+      typeset_element (text_p_);
+      text_p_ =0;
     }
 }
 
+void
+Lyric_engraver::do_post_move_processing ()
+{
+  req_l_ =0;
+}
 
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_TRANSLATOR(Lyric_engraver);