lilypond-0.0.32

diff --git a/hdr/lyriccolumn.hh b/hdr/lyriccolumn.hh
index 118b9f34bdb5beca83d4d521211307e878b8338f..a7202e593d53ba5b25398fa0313c0f1c7a787cb8 100644 (file)
--- a/hdr/lyriccolumn.hh
+++ b/hdr/lyriccolumn.hh
@@ -1,5 +1,5 @@
 //
-// lyriccolumn.hh -- part of LilyPond
+// lyriccolumn.hh -- declare Lyric_column
 //
 // copyright 1997 Jan Nieuwenhuizen <jan@digicash.nl>
 
@@ -11,25 +11,16 @@
 #include "stcol.hh"
 #include "staff.hh"
 
-struct Lyric_staff;
-
-/// (winfo)
-struct Word_info {
-    Lyric_req* lreq_l_;
-    Word_info();
-    Word_info(Lyric_req* lreq_l);
-};
-
 /// (lcol)
 struct Lyric_column : Staff_column {
 
-    Array<Word_info> winfo_array_;
+    Array<Lyric_req*> lreq_l_array_;
     Lyric_staff* lstaff_l_;
     
     void typeset_item(Item *);
-    virtual void setup_requests();
+    virtual void setup_one_request(Request*);
 
-    Lyric_column(Score_column* s,Lyric_staff*rs);
+    Lyric_column(Lyric_staff*rs);
 };
 
 #endif // LYRICSTAFF_HH

diff --git a/hdr/meterreg.hh b/hdr/meterreg.hh
new file mode 100644 (file)
index 0000000..f14e2ec
--- /dev/null
+++ b/hdr/meterreg.hh
@@ -0,0 +1,28 @@
+/*
+  meterreg.hh -- declare  Meter_register
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef METERREG_HH
+#define METERREG_HH
+#include "register.hh"
+
+/**
+  generate meters. 
+  */
+class Meter_register : public Request_register {
+public:
+    Meter_change_req * meter_req_l_;
+    Meter * meter_p_;
+ 
+    virtual bool try_request(Request *req_l);
+    virtual void process_request();
+    virtual void do_pre_move_process();
+    virtual void do_post_move_process();
+    Meter_register(Complex_walker*);
+};
+#endif // METERREG_HH

diff --git a/src/lyriccolumn.cc b/src/lyriccolumn.cc
index c54ebc2b397ad5bc10c3146db8e94c47d94c0da0..9d5cbe329773f33b367cf88fe5baa655a9191a5c 100644 (file)
--- a/src/lyriccolumn.cc
+++ b/src/lyriccolumn.cc
@@ -1,4 +1,4 @@
-#include "request.hh"
+#include "musicalrequest.hh"
 #include "voice.hh"
 #include "staffwalker.hh"
 #include "debug.hh"
@@ -9,43 +9,21 @@
 #include "pscore.hh"
 #include "main.hh"
 
-Lyric_column::Lyric_column(Score_column* s, Lyric_staff* lstaff_l)
-    : Staff_column(s)
+Lyric_column::Lyric_column(Lyric_staff* lstaff_l)
 {
     lstaff_l_ = lstaff_l;
 }
 
 void
-Lyric_column::setup_requests()
+Lyric_column::setup_one_request(Request*req_l)
 {
-    for (int i = 0 ; i < v_elts.size(); i ++) {
-       for (iter_top(v_elts[i]->reqs,j); j.ok(); j++) {
-           Request* req_l = j;
-           if (req_l->barcheck()) {
-               if (tdescription_->whole_in_measure) {
-                   warning( "Barcheck failed ", req_l->defined_ch_c_l_m );
-               }
-           }
-           if (req_l->lreq_l()) {
-               winfo_array_.push(req_l->lreq_l());
-           }
-       }
-    }
+    if (req_l->lreq_l()) 
+       lreq_l_array_.push(req_l->lreq_l());   
 }
 
 void
 Lyric_column::typeset_item(Item *i)
 {    
-    lstaff_l_->pscore_l_->typeset_item(i, score_column_l_->pcol_l_,
+    lstaff_l_->pscore_l_->typeset_item(i, musical_column_l_->pcol_l_,
                                  lstaff_l_->pstaff_l_);
-}    
-
-Word_info::Word_info()
-{
-    lreq_l_ = 0;
-}
-
-Word_info::Word_info(Lyric_req* lreq_l) 
-{
-    lreq_l_ = lreq_l;
 }