release: 1.3.0

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index b7dac5052bfc2386a4c2dca6cfa3140ed1951ce3..68d96cef59cd25f3193dbcb88f7c60a20490e427 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,7 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+
   Mats Bengtsson <matsb@s3.kth.se>
 */
 
@@ -20,13 +21,18 @@
 
 Clef_engraver::Clef_engraver()
 {
+  clef_p_ = 0;
   clef_req_l_ = 0;
   clef_type_str_ = "";
   c0_position_i_ = 0;
   clef_position_i_ = 0;
   octave_dir_ = CENTER;
+  create_default_b_ = true;
 }
 
+/*
+  PUT THIS IN GUILE!
+ */
 struct Clef_settings {
   char const *name;
   char const *cleftype;
@@ -36,7 +42,6 @@ struct Clef_settings {
   {"violin", "treble", -2},
   {"G", "treble", -2},
   {"G2", "treble", -2},  
-  {"scarlatti", "scarlatti", 0 },
   {"french", "treble",-4 },
   {"soprano", "alto",-4 },
   {"mezzosoprano", "alto",-2 },
@@ -50,12 +55,6 @@ struct Clef_settings {
   {0,0,0}
 };
 
-
-
-
-/*
-  Ugh.  Should have support for Dictionaries in mudela.
- */
 bool
 Clef_engraver::set_type (String s)
 {
@@ -82,6 +81,7 @@ Clef_engraver::set_type (String s)
          found = 1;
        }
       }
+
   if (!found)
     {
       switch(toupper (s[0]))
@@ -107,8 +107,6 @@ Clef_engraver::set_type (String s)
     c0_position_i_ = clef_position_i_;
   else if (clef_type_str_ == "bass")
     c0_position_i_ = clef_position_i_ + 4;
-  else if (clef_type_str_ == "scarlatti")
-    c0_position_i_ = 0;
   else
     assert (false);
       
@@ -117,13 +115,6 @@ Clef_engraver::set_type (String s)
   return true;
 }
 
-void
-Clef_engraver::read_req (Clef_change_req*c_l)
-{
-  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,
@@ -135,13 +126,11 @@ Clef_engraver::acknowledge_element (Score_element_info info)
   if (dynamic_cast<Bar*>(info.elem_l_)
       && clef_type_str_.length_i())
     {
+      bool def = !clef_p_;
       create_clef();
-      if (!clef_req_l_)
-       for (int i=0; i < clef_p_arr_.size (); i++)
-         {
-           clef_p_arr_[i]->default_b_ = true;
-         }
-
+      if(def)
+       clef_p_->set_elt_property(visibility_lambda_scm_sym,
+                                 ly_ch_C_eval_scm ("postbreak_only_visibility"));
     }
 
   /* ugh; should make Clef_referenced baseclass */
@@ -150,6 +139,7 @@ Clef_engraver::acknowledge_element (Score_element_info info)
     {
       if (Note_head * h = dynamic_cast<Note_head*>(it_l))
        {
+         //      h->position_i_ += c0_position_i_;
          h->position_i_ += c0_position_i_;
        }
       else if (Local_key_item *i = dynamic_cast<Local_key_item*> (it_l))
@@ -166,26 +156,27 @@ Clef_engraver::acknowledge_element (Score_element_info info)
 void
 Clef_engraver::do_creation_processing()
 {
-  Scalar def = get_property ("defaultClef");
-  if (def.to_bool ()) // egcs: Scalar to bool is ambiguous
-    set_type (def);
+  create_default_b_ = true;    // should read property.
+  SCM def = get_property ("createInitdefaultClef", 0);
+  if (gh_string_p (def))
+    set_type (ly_scm2string (def));
   
   if (clef_type_str_.length_i ())
     { 
       create_clef();
-       for (int i=0; i < clef_p_arr_.size (); i++)
-
-           clef_p_arr_[i]->default_b_ = false;
+      clef_p_->set_elt_property (non_default_scm_sym, SCM_BOOL_T);
     }
 }
 
 bool
-Clef_engraver::do_try_request (Request * r_l)
+Clef_engraver::do_try_music (Music * r_l)
 {
   if (Clef_change_req *cl = dynamic_cast <Clef_change_req *> (r_l))
     {
       clef_req_l_ = cl;
-      read_req (clef_req_l_);
+      if (!set_type (cl->clef_str_))
+       cl->error (_ ("unknown clef type"));
+
       return true;
     }
   else
@@ -196,36 +187,23 @@ Clef_engraver::do_try_request (Request * r_l)
 void
 Clef_engraver::create_clef()
 {
-  if (clef_type_str_ == "scarlatti")
+  if (!clef_p_)
     {
-      while (clef_p_arr_.size () < 2)
-       {
-         Clef_item *ct= new Clef_item;
-         ct->break_priority_i_ =  -2; // UGH
-         announce_element (Score_element_info (ct, clef_req_l_));
-         clef_p_arr_.push (ct);
-       }
-      clef_p_arr_[0]->symbol_ = "treble";
-      clef_p_arr_[0]->y_position_i_ = 4;
-      clef_p_arr_[1]->symbol_ = "bass";
-      clef_p_arr_[1]->y_position_i_ = -4;
+      Clef_item *c= new Clef_item;
+      c->set_elt_property (break_priority_scm_sym, gh_int2scm (-2)); // ugh
+      SCM clefstyle = get_property ("clefStyle", 0);
+      if (gh_string_p(clefstyle))
+       c->set_elt_property (style_scm_sym, clefstyle);
+      
+      announce_element (Score_element_info (c, clef_req_l_));
+      clef_p_ = c;
     }
-  else
+  
+  clef_p_->symbol_ = clef_type_str_;
+  clef_p_->y_position_i_ = clef_position_i_;
+  if (octave_dir_)
     {
-      if (!clef_p_arr_.size ())
-       {
-         Clef_item *c= new Clef_item;
-         c->break_priority_i_ = -2; // ugh
-         announce_element (Score_element_info (c, clef_req_l_));
-         clef_p_arr_.push (c);
-       }
-
-      for (int i=0; i < clef_p_arr_.size (); i++)
-       {
-         clef_p_arr_[i]->symbol_ = clef_type_str_;
-         clef_p_arr_[i]->y_position_i_ = clef_position_i_;
-         clef_p_arr_[i]->octave_dir_ = octave_dir_;
-       }
+      clef_p_->set_elt_property (octave_dir_scm_sym, gh_int2scm (octave_dir_));
     }
 }
 
@@ -236,19 +214,28 @@ Clef_engraver::do_process_requests()
   if (clef_req_l_)
     {
       create_clef();
-      for (int i=0; i < clef_p_arr_.size (); i++)
-       clef_p_arr_[i]->default_b_ = false;
+    }
+  else if (create_default_b_)
+    {
+      SCM type = get_property ("defaultClef", 0);
+      if (gh_string_p (type))
+       set_type (ly_scm2string (type));
+      else
+       set_type ( "treble");
+      create_clef ();
+      create_default_b_ =0;
     }
 }
 
 void
 Clef_engraver::do_pre_move_processing()
 {
-  for (int i=0; i <clef_p_arr_.size (); i++)
+  if (clef_p_)
     {
-      typeset_element (clef_p_arr_[i]);
+      typeset_element (clef_p_);
+      clef_p_ =0;
     }
-  clef_p_arr_.clear ();
+  create_default_b_ = false;
 }
 
 void
@@ -260,12 +247,9 @@ Clef_engraver::do_post_move_processing()
 void
 Clef_engraver::do_removal_processing()
 {
-  if (clef_p_arr_.size ())
-    {
-      assert (false);
-    }
+  assert (!clef_p_);
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Clef_engraver,Engraver);
+
 ADD_THIS_TRANSLATOR(Clef_engraver);