lilypond-0.0.35

diff --git a/hdr/register.hh b/hdr/register.hh
index 922d874644f63f6f5c74964cd396890824c4e1f0..95dfe1e67b8e48afc64436a0ab6a6d1a3eb728f5 100644 (file)
--- a/hdr/register.hh
+++ b/hdr/register.hh
@@ -18,14 +18,14 @@
    Hungarian postfix: reg
   */
 class Request_register {
-public:
-    Complex_walker * walk_l_;
-    Array<Request*> accepted_req_arr_;
-    
     /**
       Warning: you can't copy a #Request_register#
       */
     Request_register(Request_register const &);
+public:
+    Complex_walker * walk_l_;
+    Array<Request*> accepted_req_arr_;
+    
     Request_register(Complex_walker*);
     Request_register();
     virtual ~Request_register(){}
@@ -59,7 +59,7 @@ public:
     void pre_move_processing();
     /// reset any appropriate data.
     void post_move_processing();
-    
+    virtual bool acceptable_request_b(Request*) const;    
     virtual void set_dir(int){}
 protected:
     /// utility

diff --git a/src/register.cc b/src/register.cc
index d58f2622959d8f3bfeae718808bb51cb65bd8c6a..a1b45a96a5a090617e455c1bbe369c08e567bed2 100644 (file)
--- a/src/register.cc
+++ b/src/register.cc
@@ -1,5 +1,5 @@
 /*
-  register.cc -- implement  Staff_elem_info, Request_register
+  register.cc -- implement Request_register
 
   Sourcefile of LilyPond musictypesetter
 
@@ -14,27 +14,7 @@
 #include "localkeyitem.hh"
 #include "complexstaff.hh"
 
-Staff_elem_info::Staff_elem_info(Staff_elem*s_l, Request*r_l,
-                                Request_register *reg_l)
-{
-    elem_p_ = s_l;
-    voice_l_ =  (r_l)?r_l->elt_l_->voice_l_:0;
-    req_l_ = r_l;
-    group_regs_l_ = 0;
-    origin_reg_l_ = reg_l;
-}
-
-Staff_elem_info::Staff_elem_info()
-{
-    elem_p_ = 0;
-    voice_l_ = 0;
-
-    group_regs_l_ = 0;
-    origin_reg_l_ = 0;
-    req_l_ = 0;
-}
 
-/* *************** */
 bool
 Request_register::try_request(Request*)
 {
@@ -93,3 +73,8 @@ Request_register::typeset_breakable_item(Item * pre_p , Item * nobreak_p,
     walk_l_->typeset_breakable_item(pre_p,  nobreak_p,post_p);
 }
 
+bool
+Request_register::acceptable_request_b(Request*)const
+{
+    return false;
+}