lilypond-0.0.46.jcn1

diff --git a/lily/include/staff-regs.hh b/lily/include/staff-regs.hh
new file mode 100644 (file)
index 0000000..344659d
--- /dev/null
+++ b/lily/include/staff-regs.hh
@@ -0,0 +1,39 @@
+/*
+  staff-regs.hh -- declare Staff_registers
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef STAFF_REGS_HH
+#define STAFF_REGS_HH
+
+#include "register-group.hh"
+
+/**
+  Registers which manage a Staff (one 5-line linestaff)
+ */
+class Staff_registers : public Register_group_register {
+    int c0_position_i_;    
+    Input_register const *ireg_C_;
+    int base_position_i_;
+    Array<Voice_group_registers*> group_l_arr_;
+ 
+public:
+    
+    /* *************** */
+    NAME_MEMBERS(Staff_registers);
+    void change_group(Group_change_req * greq_l,
+                     Voice_registers *voice_regs_l,
+                     Voice_group_registers * old_group);
+    Voice_group_registers * get_group(String id);
+    void terminate_register(Request_register * reg);
+    virtual bool try_request(Request * r);
+    virtual Staff_info get_staff_info();
+    Staff_registers(Input_register const*);
+    virtual bool acceptable_request_b(Request*) const ;
+};
+
+#endif // STAFF_REGS_HH

diff --git a/lily/include/voice-element.hh b/lily/include/voice-element.hh
index aa72fb8122db55fd57cec9e8cffa004f7487fd36..29a41d4658c592f48ba020407dd3d659acc767ea 100644 (file)
--- a/lily/include/voice-element.hh
+++ b/lily/include/voice-element.hh
@@ -13,16 +13,17 @@
 #include "proto.hh"
 #include "plist.hh"
 #include "moment.hh"
+#include "input.hh"
 
 /** one horizontal bit.  Voice_element is nothing but a container for
     *the requests, */
-struct Voice_element {
+class Voice_element : public Input{
+public:
     /** the duration of the element.  This can be 0; The duration is
       determined from rhythmical requests contained in this
       Voice_element */
     Moment duration_;
-    char const* defined_ch_C_;
-    Voice const *voice_l_;
+    Voice const *voice_C_;
     IPointerList<Request*> reqs;
 
     /* *************** */