patch::: 1.3.107.mb1: Re: lily 1.3.107

[lilypond.git] / lily / breathing-sign-engraver.cc

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 669a606353d7f6237a51ceaf19af567e2670f885..8c06a74e8dd09c8f979578f78116ae9fec4c3f6f 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -14,14 +14,30 @@ TODO:
 */
 
 #include "staff-symbol-referencer.hh"
-#include "breathing-sign-engraver.hh"
 #include "breathing-sign.hh"
 #include "musical-request.hh"
 #include "command-request.hh"
 #include "engraver-group-engraver.hh"
-#include "note-head.hh"
-#include "local-key-item.hh"
+#include "item.hh"
+#include "engraver.hh"
+#include "command-request.hh"
+
+class Breathing_sign_engraver : public Engraver {
+public:
+  Breathing_sign_engraver();
+  VIRTUAL_COPY_CONS(Translator);
+  
+protected:
+  virtual bool do_try_music (Music *req_l);
+  virtual void do_process_music();
+
+  virtual void do_pre_move_processing();
+  virtual void do_post_move_processing();
 
+private:
+  Breathing_sign_req * breathing_sign_req_l_;
+  Score_element * breathing_sign_p_;
+};
 
 Breathing_sign_engraver::Breathing_sign_engraver()
 {
@@ -32,39 +48,43 @@ Breathing_sign_engraver::Breathing_sign_engraver()
 bool
 Breathing_sign_engraver::do_try_music (Music*r_l)
 {
-  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r_l)) {
-    breathing_sign_req_l_ = b;
-    return true;
-  }
+  if (Breathing_sign_req  * b= dynamic_cast <Breathing_sign_req *> (r_l))
+    {
+      breathing_sign_req_l_ = b;
+      return true;
+    }
  
   return false;
 }
 
 void
-Breathing_sign_engraver::do_process_requests()
+Breathing_sign_engraver::do_process_music()
 {
-  if(breathing_sign_req_l_) {
-    breathing_sign_p_ = new Breathing_sign;
-    Staff_symbol_referencer_interface st (breathing_sign_p_);
-    st.set_interface ();
+  if(breathing_sign_req_l_)
+    {
+      SCM b = get_property ("BreathingSign");
+      breathing_sign_p_ = new Item (b);
 
-    announce_element (Score_element_info (breathing_sign_p_, breathing_sign_req_l_));
-  }
+      Breathing_sign::set_interface (breathing_sign_p_);
+
+      announce_element (breathing_sign_p_, breathing_sign_req_l_);
+    }
 }
 
 void 
 Breathing_sign_engraver::do_pre_move_processing()
 {
-  if(breathing_sign_p_) {
-    typeset_element(breathing_sign_p_);
-    breathing_sign_p_ = 0;
-  }
+  if(breathing_sign_p_)
+    {
+      typeset_element(breathing_sign_p_);
+      breathing_sign_p_ = 0;
+    }
 }
 
 void
 Breathing_sign_engraver::do_post_move_processing()
 {
-    breathing_sign_req_l_ = 0;
+  breathing_sign_req_l_ = 0;
 }
 
 ADD_THIS_TRANSLATOR(Breathing_sign_engraver);