lilypond-0.0.50

diff --git a/lily/include/item.hh b/lily/include/item.hh
index d1fc8c8bfa7985288772b7f201d54e894ac42b43..3a1efa36c752b199c85dc0479de57b8186065e43 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -16,7 +16,8 @@
   spacing calculation. 
   
 */
-struct Item : Staff_elem {
+class Item : public Staff_elem {
+public:
     /// indirection to the column it is in
     PCol * pcol_l_;
 

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index ff9e0fea4f87ad7f91978c7e16c8cba9ebcda906..abe556db86a6aba7d9303558b7b4cbc759050fe2 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -52,5 +52,9 @@ struct Stem_req;
 struct Terminate_voice_req;
 struct Text_req;
 struct Timing_req;
+struct Note_column_register;
+struct Note_column;
+struct Staff_side;
+struct Staff_symbol;
 
 #endif // LILY_PROTO_HH

diff --git a/lily/include/register.hh b/lily/include/register.hh
index 4ac81c61e460f978cbd9ed2f4064f29842d23849..3978c797272d36ccc32ff63201bd506e5987b3f0 100644 (file)
--- a/lily/include/register.hh
+++ b/lily/include/register.hh
@@ -7,7 +7,7 @@
 #ifndef REGISTER_HH
 #define REGISTER_HH
 
-#include "proto.hh"
+#include "lily-proto.hh"
 #include "varray.hh"
 #include "request.hh"
 #include "staff-elem-info.hh"
@@ -24,6 +24,7 @@ class Request_register {
      */
     Request_register(const Request_register&){}
 protected:
+    
 
     /// utility
     virtual Paper_def * paper() const;

diff --git a/lily/include/staff-sym-reg.hh b/lily/include/staff-sym-reg.hh
index 24bd2c7abb8afe4f92fe78e5839893dd144b6b8a..7ca370dd616e404c68945951330d23508e85f690 100644 (file)
--- a/lily/include/staff-sym-reg.hh
+++ b/lily/include/staff-sym-reg.hh
@@ -19,9 +19,11 @@ class Staff_sym_register : public Request_register {
     Staff_symbol *span_p_;
     Moment last_mom_;
 public:
-    ~Staff_sym_register();
     Staff_sym_register();
     NAME_MEMBERS(Staff_sym_register);
+protected:
+    virtual void process_requests();
+    ~Staff_sym_register();
     virtual void pre_move_processing();
     virtual void post_move_processing();
 };

diff --git a/lily/register.cc b/lily/register.cc
index 2c3f2ec1af3b9d2c9077d925d02ef031d1433105..ed84c42c9b91a99daa8f162d29c8f456bd821a5c 100644 (file)
--- a/lily/register.cc
+++ b/lily/register.cc
@@ -16,7 +16,6 @@
 #include "register-group.hh"
 #include "debug.hh"
 
-
 bool
 Request_register::try_request(Request*)
 {

diff --git a/lily/staff-sym-reg.cc b/lily/staff-sym-reg.cc
index 34a53a552ba96d582e5cceb239e508595d59a786..e201edb6e311ed53babb11caa13d95eedcd7788e 100644 (file)
--- a/lily/staff-sym-reg.cc
+++ b/lily/staff-sym-reg.cc
@@ -32,6 +32,11 @@ Staff_sym_register::post_move_processing()
     }
 }
 
+void
+Staff_sym_register::process_requests()
+{
+    announce_element(Staff_elem_info(span_p_, 0));
+}
 
 void
 Staff_sym_register::pre_move_processing()