lilypond-0.0.71pre

diff --git a/lily/clef-reg.cc b/lily/clef-reg.cc
index 4e3d25eb401dd986497da0431b54bdc73df99dd9..3f4c311937ce358a3f1305c266e7520583885f93 100644 (file)
--- a/lily/clef-reg.cc
+++ b/lily/clef-reg.cc
@@ -56,10 +56,9 @@ void
 Clef_register::acknowledge_element(Score_elem_info info)
 {
     if (info.elem_l_->name() == Bar::static_name() ) {
-       if (!clef_p_){
-           create_clef();
+       create_clef();
+       if ( !clef_req_l_ )
            clef_p_->default_b_ = true;
-       }
     }
 }
 
@@ -79,8 +78,7 @@ Clef_register::do_try_request(Request * r_l)
 
     clef_req_l_ = creq_l->clefchange();
     
-    // do it now! Others have to read c0_pos.
-    read_req(creq_l->clefchange()); 
+    read_req(clef_req_l_); 
     return true;
 }
 
@@ -89,13 +87,11 @@ Clef_register::create_clef()
 {
     if (!clef_p_) {
        clef_p_ = new Clef_item;
-        announce_element(Score_elem_info(clef_p_,
-                                    clef_req_l_));
-    
-       clef_p_->read(*this);
+        announce_element(Score_elem_info(clef_p_,clef_req_l_));
     }
-
+    clef_p_->read(*this);
 }
+
 void
 Clef_register::do_process_requests()
 {

diff --git a/lily/include/interpreter.hh b/lily/include/interpreter.hh
index 92541c7211a94d28ed9f37e3f16d8c95fe80bc3d..6645ab00528e5a5999fe1dd8d205825719d9f835 100644 (file)
--- a/lily/include/interpreter.hh
+++ b/lily/include/interpreter.hh
@@ -12,12 +12,4 @@
 
 #include "lily-proto.hh"
 
-class Interpreter {
-public:
-    int music_list_i_;
-    Interpreter();
-    virtual ~Interpreter();
-    virtual bool interpret_request_b(Request*) { return false;}
-};
-
 #endif // INTERPRETER_HH