lilypond-0.0.10

diff --git a/hdr/lookup.hh b/hdr/lookup.hh
index 6bf89c0093a68331c5a881755ca6fd9c710898e7..5be2b254644b8b0923fe6b79b1603ac69041ec5e 100644 (file)
--- a/hdr/lookup.hh
+++ b/hdr/lookup.hh
@@ -27,10 +27,11 @@ struct Lookup {
       */
 
     Symbol rule_symbol(Real height, Real width);
-
+    Symbol accidental(int);
     Symbol ball(int);
     Symbol flag(int);
     Symbol rest(int);
+    Symbol clef(String);
     Symbol bar(String);
     Symbol dots(int);
     Lookup();

diff --git a/hdr/simplewalker.hh b/hdr/simplewalker.hh
new file mode 100644 (file)
index 0000000..5f27957
--- /dev/null
+++ b/hdr/simplewalker.hh
@@ -0,0 +1,44 @@
+/*
+  simplewalker.hh -- part of LilyPond
+
+  (c) 1996 Han-Wen Nienhuys
+*/
+
+#ifndef SIMPLEWALKER_HH
+#define SIMPLEWALKER_HH
+
+#include "proto.hh"
+
+struct Simple_walker: Staff_walker {
+    Stem *stem_;
+    svec<Notehead *>noteheads;
+    Local_key local_key_;
+    Key key_;
+    svec<int> *oldkey_undo;
+    svec<int> typesetkey;
+    Beam *beam_;
+    Local_key_item *local_key_item_;
+    bool wantkey;              // urgh
+    bool processed_key;
+    bool processed_clef;
+    Clef clef_;
+    
+    /****************/
+
+    virtual void do_TYPESET_command(Command*);
+    virtual void do_INTERPRET_command(Command*);
+    virtual void process_requests();
+    virtual void reset();
+    
+    void do_notes();
+    Simple_walker(Simple_staff*);
+    Simple_column *col();
+    Simple_staff *staff();
+
+    void do_local_key(Note_req*n);
+};
+
+
+#endif // SIMPLEWALKER_HH
+
+

diff --git a/src/simplestaff.cc b/src/simplestaff.cc
index 5150d5478aefef8914c41e7ac1b6cfcd84e41a64..21cccabcb135abcebd9e81740ed9af9dedd6fe30 100644 (file)
--- a/src/simplestaff.cc
+++ b/src/simplestaff.cc
@@ -1,11 +1,12 @@
 #include "request.hh"
 #include "swalker.hh"
 #include "debug.hh"
+#include "clef.hh"
 #include "staff.hh"
 #include "command.hh"
 #include "simplestaff.hh"
 #include "sccol.hh" 
-
+#include "simplewalker.hh"
 
 
 
@@ -50,11 +51,13 @@ Simple_column::process_requests()
            }
        }
 }
+
 Staff_column*
 Simple_staff::create_col(Score_column*s)
 {
     return new Simple_column(s,this);
 }
+
 void
 Simple_staff::walk()
 {