release: 0.0.32

[lilypond.git] / src / lyricwalker.cc

diff --git a/src/lyricwalker.cc b/src/lyricwalker.cc
index bd8ac0e40da56f1d39ab3c91e7615d830ae13e95..960c1e76e00e4955ba22af5172c235a258d86b95 100644 (file)
--- a/src/lyricwalker.cc
+++ b/src/lyricwalker.cc
@@ -1,54 +1,34 @@
-//
-//  what about 
-//      #include "flower.hh"
-//      #include "lily.hh"
-//
-//  or should we first devide lily/src up ?
-// HWN: huh?
+/*
+  lyricwalker.cc -- implement Lyric_walker
 
-#include "textspanner.hh"
-#include "script.hh"
-#include "request.hh"
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Jan Nieuwenhuizen <jan@digicash.nl>
+*/
+
+#include "musicalrequest.hh"
 #include "voice.hh"
 #include "pscore.hh"
 #include "lyricstaff.hh"
 #include "lyricwalker.hh"
-#include "sccol.hh"
 #include "debug.hh"
 #include "lyricitem.hh"
 
-void
-Lyric_walker::do_word(Word_info)
-{
-}
-
-void
-Lyric_walker::do_INTERPRET_command(Command* )
-{
-//    WARN << "command for Lyrics found\n";
-}
-
-void
-Lyric_walker::do_TYPESET_command(Command* )
-{
-//    WARN << "command for Lyrics found\n";
-}
-
 void
 Lyric_walker::process_requests()
 {
-    Lyric_column* lcol_l = Lyric_walker::lcol_l();
-
-    for (int i = 0; i <  lcol_l->winfo_array_.size(); i++)  {
-       lcol_l->typeset_item(new Lyric_item(lcol_l->winfo_array_[i].lreq_l_, i));
+    allow_break();
+    for (int i = 0; i <  lcol_l()->lreq_l_array_.size(); i++)  {
+       lcol_l()->typeset_item(
+           new Lyric_item(lcol_l()->lreq_l_array_[i],i)
+           );
     }
-    
 }
 
 Lyric_walker::Lyric_walker(Lyric_staff* lstaff_l)
-    : Staff_walker(lstaff_l, lstaff_l->line_pstaff_p_->pscore_l_)
+    : Staff_walker(lstaff_l, lstaff_l->pstaff_l_->pscore_l_)
 {
-    reset();
+
 }
 
 
@@ -56,7 +36,7 @@ Lyric_walker::Lyric_walker(Lyric_staff* lstaff_l)
 Lyric_staff*
 Lyric_walker::lstaff_l()
 {
-    return (Lyric_staff*)staff_;
+    return (Lyric_staff*)staff_l_;
 }
 
 Lyric_column*
@@ -64,9 +44,3 @@ Lyric_walker::lcol_l()
 {
     return (Lyric_column*) *(*this);
 }
-
-void
-Lyric_walker::reset()
-{
-}
-