lilypond-0.0.26

diff --git a/hdr/staffwalker.hh b/hdr/staffwalker.hh
index d9945229f236bc47de31ce6481ccfb32a38aee11..efac63e7b030681d507398383fe4942fceed7a63 100644 (file)
--- a/hdr/staffwalker.hh
+++ b/hdr/staffwalker.hh
@@ -11,8 +11,8 @@
 #include "staff.hh"
 
 struct Staff_walker : public PCursor<Staff_column*> {
-    Staff * staff_;
-    PScore * pscore_;
+    Staff * staff_l_;
+    PScore * pscore_l_;
 
     int break_status;
     
@@ -31,7 +31,8 @@ struct Staff_walker : public PCursor<Staff_column*> {
      ****************/
 
     /// every time ++ is called
-    virtual void reset(){}
+    virtual void do_pre_move(){}
+    virtual void do_post_move(){}
     virtual void process_requests()=0;
     virtual void do_TYPESET_command(Command*)=0;
     virtual void do_INTERPRET_command(Command*)=0 ;

diff --git a/hdr/stcol.hh b/hdr/stcol.hh
index b9e3a9bba8f0ab11aab231143160bca01d3e99c0..0984f88022b2cfc64ca244f0ac0ce60c0f1211ab 100644 (file)
--- a/hdr/stcol.hh
+++ b/hdr/stcol.hh
@@ -34,7 +34,7 @@ struct Staff_column {
       VIRTUAL
     ****************************************************************/
 
-    virtual void process_requests()=0;
+    virtual void setup_requests()=0;
 
     virtual ~Staff_column();
 private:

diff --git a/src/complexmelodicstaff.cc b/src/complexmelodicstaff.cc
new file mode 100644 (file)
index 0000000..66aa63e
--- /dev/null
+++ b/src/complexmelodicstaff.cc
@@ -0,0 +1,31 @@
+#include "keyitem.hh"
+#include "stem.hh"
+#include "rest.hh"
+#include "notehead.hh"
+#include "paper.hh"
+#include "molecule.hh"
+#include "linepstaff.hh"
+#include "complexmelodicstaff.hh"
+#include "sccol.hh" 
+#include "localkeyitem.hh"
+#include "request.hh"
+
+const int NO_LINES=5;
+
+
+void
+Complex_melodic_staff::set_output(PScore*ps)
+{
+    theline_l_ = new Linestaff(NO_LINES,ps); // theline_l_ is added to pscore later.
+    Complex_staff::set_output(ps);
+}
+
+Item *
+Complex_melodic_staff::get_TYPESET_item(Command*com)
+{
+    if (com->args[0] == "KEY") {
+       return new Keyitem(NO_LINES);   // urgh. depends on clef.
+    } else
+       return Complex_staff::get_TYPESET_item(com);
+}
+