lilypond-0.0.32

diff --git a/hdr/score.hh b/hdr/score.hh
index cd5a56c5e73279b4952efc41eaa542b55dec3ea9..f48ad356df76b869d7012ed04062aa04c5f68f36 100644 (file)
--- a/hdr/score.hh
+++ b/hdr/score.hh
@@ -1,5 +1,15 @@
+/*
+  score.hh -- declare Score
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
 #ifndef SCORE_HH
 #define SCORE_HH
+
 #include "varray.hh"
 #include "proto.hh"
 #include "plist.hh"
@@ -20,8 +30,6 @@ struct Score {
     const char *defined_ch_c_l_;
     int errorlevel_i_;
     
-    Assoc<String, Moment> markers_assoc_;
-
     /* *************************************************************** */
 
     /// construction
@@ -29,7 +37,6 @@ struct Score {
     ~Score();    
     void add(Staff*);
 
-    void add_marks(Array<String>, Array<Moment>);
     /// do everything except outputting to file
     void process();
     
@@ -40,16 +47,18 @@ struct Score {
     void OK() const;
     void print() const;
 
-    // utils:
-    PCursor<Score_column*> create_cols(Moment);
-
-    /// find a column. The cursor is given to try a little efficiency.
+    /// find a column.
     PCursor<Score_column *> find_col(Moment,bool);
     
     /// when does the last *musical* element finish?
     Moment last() const;
 
 private:
+    void setup_music();
+    void process_music();
+    // utils:
+    PCursor<Score_column*> create_cols(Moment);
+
     Score(Score const&){}
 
     /**

diff --git a/hdr/staff.hh b/hdr/staff.hh
index 6f43293b264c6baa188181a1b8401b1eee200059..4c507c4b5bb1ccedb2c18879d742a953b2f35a48 100644 (file)
--- a/hdr/staff.hh
+++ b/hdr/staff.hh
@@ -1,45 +1,41 @@
+/*
+  staff.hh -- declare Staff
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #ifndef STAFF_HH
 #define STAFF_HH
 
-#include "staffcommands.hh"
-
+#include "plist.hh"
+#include "proto.hh"
+#include "moment.hh"
 
 /// base class for a collection of voices.
-struct Staff {
+class Staff {
+    Staff_column *get_col(Moment, PCursor<Staff_column*> * last= 0);
+    Staff(const Staff&src);
+    
     /// synchronous horizontal stuff
-    IPointerList<Voice*> voices;
+    IPointerList<Voice*> voice_list_;
+
+public:
 
     /// runtime field
     IPointerList<Staff_column*> cols;
 
     Score *score_l_;
     PScore *pscore_l_;
-    String define_spot_str_;
 
     /* *************************************************************** */
 
-    void add(PointerList<Voice*> &s);
-    void do_commands(PointerList<Input_command*> score_wide,
-                    PointerList<Input_command*> staff_wide);
+    void add(const PointerList<Voice*> &s);
 
-    void get_marks(Array<String>&, Array<Moment>&);
-    
-    /// throw away cols later the #l#
-    void truncate_cols(Moment l);
-
-    Staff(const Staff&src);
     void add_voice(Voice *v);
-    void add_staff_column(Staff_column *sp);
-
     Paperdef*paper()const;
-    
-    /// interpret all requests and add items to #destination#.
-    /**
-    This routines calls virtual functions from Staff, to delegate the
-    interpretation of requests to a derived class of Staff */
-    void process();
 
-    
     void setup_staffcols();
 
     void OK() const;
@@ -50,22 +46,12 @@ struct Staff {
 
     /// remove unused cols
     void clean_cols() ;
-    
-    Staff_column *get_col(Moment,bool); // ugh
-
     Staff();
-
-    /* 
-      VIRTUALS
-      */
-
+    
     virtual void set_output(PScore * destination)=0;
-    virtual void walk()=0;    
-    virtual Staff_column * create_col(Score_column * )=0;
+    virtual Staff_walker *get_walker_p()=0;    
     virtual ~Staff() { }
-private:
-    void set_time_descriptions();
+protected:
+    virtual Staff_column * create_col()=0;
 };
 #endif
-
-

diff --git a/src/staff.cc b/src/staff.cc
index 2e650b008fb7578cf56d366e179cbac7e62bc5ed..a69f625aed51d024cde0fda7f4942de5da8bccd8 100644 (file)
--- a/src/staff.cc
+++ b/src/staff.cc
@@ -4,59 +4,19 @@
 #include "staffwalker.hh"
 #include "stcol.hh"
 #include "sccol.hh"
-#include "staffcommands.hh"
-#include "debug.hh"
-#include "inputcommands.hh"
-#include "inputcommand.hh"
-#include "request.hh"
-
-void
-Staff::do_commands(PointerList<Input_command*> score_wide,
-                  PointerList<Input_command*> staff_wide)
-{
-    Input_commands commands;
-
-    // bring in commands from voices.
-    for (iter_top(voices, i); i.ok(); i++) {
-       Moment here = i->start;
-       for (iter_top(i->elts, j); j.ok(); j++) {
-           for (iter_top(j->reqs, k); k.ok(); k++) {
-               if (k->command()){
-                   commands.find_moment(here);
-                   commands.add(*k->command()->com_p_,
-                                score_l_->markers_assoc_);
-               }
-           }
-           here += j->duration;
-       }
-    }
-    for (iter_top(score_wide,i); i.ok(); i++) 
-       commands.add(**i, score_l_->markers_assoc_);
-    for (iter_top(staff_wide,i); i.ok(); i++) 
-       commands.add(**i, score_l_->markers_assoc_);
 
-    commands.parse(this);
-}
+#include "debug.hh"
+#include "musicalrequest.hh"
+#include "commandrequest.hh" // todo
 
 void
-Staff::add(PointerList<Voice*> &l)
+Staff::add(PointerList<Voice*> const &l)
 {
     for (iter_top(l,i); i.ok(); i++)
-       voices.bottom().add(i);
+       voice_list_.bottom().add(i);
 }
 
-void
-Staff::truncate_cols(Moment l)
-{
-    iter_bot(cols, i);
-    for (; i->when() > l; i=cols.bottom()) {
-       Staff_column * col_p = i.get();
-       assert(col_p->when() > l);
-       delete col_p;
-    }
-}
-
-Paperdef*
+Paperdef *
 Staff::paper() const
 {
     return score_l_->paper_p_;
@@ -67,7 +27,12 @@ Staff::clean_cols()
 {
     iter_top(cols,i);
     for(; i.ok(); ){
-       if (!i->score_column_l_->used())
+       if (!i->musical_column_l_->used())
+           i->musical_column_l_ = 0;
+       if (!i->command_column_l_->used())
+           i->command_column_l_ =0;
+       
+       if (!i->command_column_l_&& !i->musical_column_l_)
            delete i.get();
        else
            i++;
@@ -75,109 +40,60 @@ Staff::clean_cols()
 }
 
 Staff_column *
-Staff::get_col(Moment w, bool mus)
-{
-    iter_top(cols,i);    
+Staff::get_col(Moment w, PCursor<Staff_column*> *last)
+{    
+    iter_top(cols,i);
+    if (last && last->ok() && (*last)->when() <= w)
+       i = *last;
+    
     for (; i.ok(); i++) {
        if (i->when() == w) {
-           if (i->musical_b() == mus) {
-               assert( score_l_->find_col(w,mus).ptr() == i->score_column_l_);
-               return i;
-           }
-           else if (!mus)
-               break;
+           if (last)
+               *last = i;
+           return i;
        } else if (i->when() > w)
            break;
     }
-    /* post: *sc > *->score_column_l_ || !i.ok() */
 
-    Score_column* sccol_l = score_l_->find_col(w,mus);
-    Staff_column* newst = create_col(sccol_l);
 
-    if (!i.ok()) {
-       cols.bottom().add(newst);
-       return cols.bottom();
-    }
-    
-    if (mus) {
-       i.insert(newst);
-       
-       return newst;
-    }
+    PCursor<Score_column*> sccols(score_l_->find_col(w, false));
+    Staff_column* stcol_p = create_col();
 
+    Score_column* comcol_l  = sccols++;
+    stcol_p->set_cols(comcol_l, sccols);
     
-    // making a fix at 2:30 am, with several beers drunk.
-    // but it works :-)
-    if ((i-1).ok()&& (i-1)->when() == newst->when()) {
+    if (!i.ok()) {
+       cols.bottom().add(    stcol_p);
+       i = cols.bottom();
+    } else {
+       i.insert(stcol_p);
        i--;
     }
-
-    i.insert(newst);
-    
-    return newst;
+    if (last)
+       *last = i;
+    return i;
 }
 
-void
-Staff::get_marks(Array<String>&s_arr, Array<Moment>&m_arr)
-{
-     for (iter_top(voices,i); i.ok(); i++) {
-       Moment now = i->start;
-       for (iter_top(i->elts,j); j.ok(); j++) {
-           for (iter_top(j->reqs, k); k.ok(); k++) {
-               if (k->mark()) { // ugh. 4 levels
-                   s_arr.push(k->mark()->mark_str_);
-                   m_arr.push(now);
-               }
-           }
-           now += j->duration;     
-       }
-     }
-}
-/*
-    put all stuff grouped vertically in the Staff_cols
+/**
+  put all stuff grouped vertically in the Staff_cols.
+  Do the preprarations for walking the cols. not virtual
     */
 void
 Staff::setup_staffcols()
 {    
-    for (iter_top(voices,i); i.ok(); i++) {
-
+    for (iter_top(voice_list_,i); i.ok(); i++) {
+       PCursor<Staff_column*> last(cols);
        Moment now = i->start;
        for (iter_top(i->elts,j); j.ok(); j++) {
            
-           Staff_column *s_l= get_col(now, true);
+           Staff_column *s_l= get_col(now, &last);
            assert(now == s_l->when());
            s_l->add(j);
            now += j->duration;     
        }
-       get_col(now, false);
-    }
-    OK();
-    set_time_descriptions();
-}
-
-
-
-void
-Staff::set_time_descriptions()
-{
-    Time_description t(0,0);
-    for (iter_top(cols,i); i.ok(); i++) {
-       if (i->staff_commands_p_)
-           t = i->staff_commands_p_->tdescription_;
-       else if (i->tdescription_)
-           t = *i->tdescription_;
-       if(!i->tdescription_) {
-           i->tdescription_ = new Time_description(i->when() - t.when ,&t);
-       }
+//     get_col(now,last);
     }
-
-}
-void
-Staff::process()
-{
-    setup_staffcols();
     OK();
-    walk();
 }
 
 void
@@ -185,15 +101,12 @@ Staff::OK() const
 {
 #ifndef NDEBUG
     cols.OK();
-    voices.OK();
+    voice_list_.OK();
     iter_top(cols, i);
     iter_top(cols, j);
     i++;
     for (; i.ok(); j++,i++) {
-       if ( j->when() == i->when())
-           assert(!j->musical_b() && i->musical_b());
-       else
-           assert(j->when () < i->when() );
+       assert(j->when () < i->when() );
     }
     assert(score_l_);
 #endif    
@@ -204,7 +117,7 @@ Moment
 Staff::last() const
 {
     Moment l = 0.0;
-    for (iter_top(voices,i); i.ok(); i++) {
+    for (iter_top(voice_list_,i); i.ok(); i++) {
        l = l >? i->last();
     }
     return l;
@@ -216,7 +129,7 @@ Staff::print() const
 {
 #ifndef NPRINT
     mtor << "Staff {\n";
-    for (iter_top(voices,i); i.ok(); i++) {
+    for (iter_top(voice_list_,i); i.ok(); i++) {
        i->print();     
     }
     mtor <<"}\n";