release: 0.1.48

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

diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index e7126456e2d8830fc9f2610508c99dfdafbdf5e5..5f9a9376e743c1ceb92e2f2a4e35219b8362ce00 100644 (file)
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -1,5 +1,5 @@
 /*
-  clef.cc -- implement  Clef_engraver
+  clef.cc -- implement Clef_engraver
 
   source file of the GNU LilyPond music typesetter
 
@@ -16,113 +16,142 @@
 
 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;
 }
 
+/*
+  Ugh.  Should have support for Dictionaries in mudela.
+ */
 bool
-Clef_engraver::set_type(String s)
+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_= -6;
+  else if (clef_type_str_ == "french")
+    c0_position_i_= -8;
+  else if (clef_type_str_ == "soprano")
+    c0_position_i_= -4;
+  else if (clef_type_str_ == "mezzosoprano")
+    c0_position_i_ = -2;
+  else if (clef_type_str_ == "alto")
+    c0_position_i_= 0;
+  else if (clef_type_str_ == "tenor")
+    c0_position_i_= 2;
+  else if (clef_type_str_ == "baritone")
+    c0_position_i_ = 4;
+  else if (clef_type_str_ == "varbaritone")
+    c0_position_i_ = 4;
+  else if (clef_type_str_ == "bass")
+    c0_position_i_= 6;
+  else if (clef_type_str_ == "subbass")
+    c0_position_i_ = 8;
+  else
+    return false;
+  
+  return true;
 }
 
 void
-Clef_engraver::fill_staff_info(Staff_info &i)
+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)
+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 "));
 }
+
+
+/** 
+  Generate a clef at the start of a measure. (when you see a Bar,
+  ie. a breakpoint) 
+  */
 void
-Clef_engraver::acknowledge_element(Score_elem_info info)
+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_->is_type_b (Bar::static_name ()) 
+      && clef_type_str_.length_i())
+    {
+      create_clef();
+      if (!clef_req_l_)
+       clef_p_->default_b_ = true;
     }
 }
 
 void
 Clef_engraver::do_creation_processing()
 {
+  Scalar def = get_property ("defaultclef");
+  if (def.operator bool ()) // egcs: Scalar to bool is ambiguous
+    set_type (def);
+  if (clef_type_str_.length_i ())
     create_clef();
-    clef_p_->default_b_ = false;
+  clef_p_->default_b_ = false;
 }
 
 bool
-Clef_engraver::do_try_request(Request * r_l)
+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 
+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;
+      clef_p_->break_priority_i_ = -2; // ugh
+      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_breakable_item(clef_p_);
-    clef_p_ = 0;
+  if (clef_p_)
+    {
+      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);