From a858743c42178b35e2e8685143cd635e5a2b3291 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:39:00 +0000 Subject: [PATCH] lilypond-0.0.50 --- lily/include/item.hh | 3 ++- lily/include/lily-proto.hh | 4 ++++ lily/include/register.hh | 3 ++- lily/include/staff-sym-reg.hh | 4 +++- lily/register.cc | 1 - lily/staff-sym-reg.cc | 5 +++++ 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lily/include/item.hh b/lily/include/item.hh index d1fc8c8bfa..3a1efa36c7 100644 --- 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 ff9e0fea4f..abe556db86 100644 --- 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 4ac81c61e4..3978c79727 100644 --- 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 24bd2c7abb..7ca370dd61 100644 --- 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 2c3f2ec1af..ed84c42c9b 100644 --- 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 34a53a552b..e201edb6e3 100644 --- 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() -- 2.39.5