release: 0.1.13

[lilypond.git] / lily / clef-grav.cc

diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index 93abaf29310042b6bfee0d6441f455d7d552fb4c..ad4814202cdad50c9fdbd61e8ecb1e2f26f7a1c0 100644 (file)
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -16,113 +16,129 @@
 
 Clef_engraver::Clef_engraver()
 {
-    clef_p_ = 0;
-    clef_req_l_ =0;
-    
-    set_type ("violin");
+  clef_p_ = 0;
+  clef_req_l_ =0;
+  clef_type_str_ = 0;
+  c0_position_i_ =0;
 }
 
 bool
 Clef_engraver::set_type (String s)
 {
-    clef_type_str_  = s;
-    if (clef_type_str_ == "violin") {
-       c0_position_i_= -2;
-    } else if (clef_type_str_ == "alto") {
-       c0_position_i_= 4;
-    } else if (clef_type_str_ == "tenor") {
-       c0_position_i_= 6;
-    } else if (clef_type_str_ == "bass") {
-       c0_position_i_= 10;
-    } else 
-       return false;
-    
-    return true;
+  clef_type_str_  = s;
+  if (clef_type_str_ == "violin") 
+    {
+      c0_position_i_= -2;
+    }
+  else if (clef_type_str_ == "alto") 
+    {
+      c0_position_i_= 4;
+    }
+  else if (clef_type_str_ == "tenor") 
+    {
+      c0_position_i_= 6;
+    }
+  else if (clef_type_str_ == "bass") 
+    {
+      c0_position_i_= 10;
+    }
+  else 
+    return false;
+  
+  return true;
 }
 
 void
 Clef_engraver::fill_staff_info (Staff_info &i)
 {
-    i.c0_position_i_l_ = &c0_position_i_;
+  i.c0_position_i_l_ = &c0_position_i_;
 }
 
 void 
 Clef_engraver::read_req (Clef_change_req*c_l)
 {
-    if (!set_type (c_l->clef_str_))
-       c_l->error ("unknown clef type ");
+  if (!set_type (c_l->clef_str_))
+    c_l->error ("unknown clef type ");
 }
 void
 Clef_engraver::acknowledge_element (Score_elem_info info)
 {
-    if (info.elem_l_->name() == Bar::static_name ()) {
-       create_clef();
-       if ( !clef_req_l_)
-           clef_p_->default_b_ = true;
+  if (info.elem_l_->name() == Bar::static_name ()) 
+    {
+      create_clef();
+      if (!clef_req_l_)
+       clef_p_->default_b_ = true;
     }
 }
 
 void
 Clef_engraver::do_creation_processing()
 {
-    create_clef();
-    clef_p_->default_b_ = false;
+   Scalar def = get_property ("defaultclef");
+  if (def)
+    set_type (def);
+  else
+    set_type ("violin");
+ create_clef();
+  clef_p_->default_b_ = false;
 }
 
 bool
 Clef_engraver::do_try_request (Request * r_l)
 {
-    Command_req* creq_l= r_l->command();
-    if (!creq_l || !creq_l->clefchange())
-       return false;
-
-    clef_req_l_ = creq_l->clefchange();
-    
-    read_req (clef_req_l_); 
-    return true;
+  Command_req* creq_l= r_l->command();
+  if (!creq_l || !creq_l->clefchange())
+    return false;
+
+  clef_req_l_ = creq_l->clefchange();
+  
+  read_req (clef_req_l_); 
+  return true;
 }
 
 void 
 Clef_engraver::create_clef()
 {
-    if (!clef_p_) {
-       clef_p_ = new Clef_item;
-        announce_element (Score_elem_info (clef_p_,clef_req_l_));
+  if (!clef_p_) 
+    {
+      clef_p_ = new Clef_item;
+      announce_element (Score_elem_info (clef_p_,clef_req_l_));
     }
-    clef_p_->read (*this);
+  clef_p_->read (*this);
 }
 
 void
 Clef_engraver::do_process_requests()
 {
-    if (clef_req_l_) {
-       create_clef();
-       clef_p_->default_b_ = false;
+  if (clef_req_l_) 
+    {
+      create_clef();
+      clef_p_->default_b_ = false;
     }
 }
 
 void
 Clef_engraver::do_pre_move_processing()
 {
-    if (!clef_p_)
-       return;
-    typeset_element (clef_p_);
-    clef_p_ = 0;
+  if (!clef_p_)
+    return;
+  typeset_element (clef_p_);
+  clef_p_ = 0;
 }
-    
+  
 void
 Clef_engraver::do_post_move_processing()
 {
-    clef_req_l_ = 0;
+  clef_req_l_ = 0;
 }
 
 void
 Clef_engraver::do_removal_processing()
 {
-    delete clef_p_;
-    clef_p_ =0;
+  delete clef_p_;
+  clef_p_ =0;
 }
 
 
 IMPLEMENT_IS_TYPE_B1(Clef_engraver,Engraver);
-ADD_THIS_ENGRAVER(Clef_engraver);
+ADD_THIS_TRANSLATOR(Clef_engraver);