release: 1.3.106

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 83eb544afe64ebca957910a826afa3d4cdc79ce4..818e3544a0f93c0c417ceda23a183713a797534c 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -32,86 +32,81 @@ public:
   Clef_engraver ();
 
   Direction octave_dir_;
-  bool  first_b_;
 
 protected:
   virtual void do_process_music ();
   virtual void do_pre_move_processing ();
   virtual void do_creation_processing ();
   virtual void do_post_move_processing ();
-  virtual bool do_try_music (Music*);
   virtual void acknowledge_element (Score_element_info);
 
 private:
   Item * clef_p_;
   Item * octavate_p_;
   Clef_change_req * clef_req_l_;
-  
+
+  SCM prev_glyph_;
+  SCM prev_cpos_;
+  SCM prev_octavation_;
   void create_clef ();
-  bool set_type (String);
+  void set_central_c (SCM, SCM, SCM);
+  void set_glyph ();
 };
 
 Clef_engraver::Clef_engraver ()
 {
-  first_b_ = true;
   clef_p_ = 0;
   clef_req_l_ = 0;
   octave_dir_ = CENTER;
   octavate_p_ = 0;
+
+  /*
+    will trigger a clef at the start since #f != '()
+   */
+  prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
 }
 
-bool
-Clef_engraver::set_type (String s)
+void
+Clef_engraver::set_central_c (SCM glyph,SCM clefpos, SCM octavation)
 {
-  if (s.right_str (2) == "_8") // Down one octave
-    {
-      octave_dir_ = DOWN;
-      s = s.left_str (s.length_i () - 2);
-    }
-  else if (s.right_str (2) == "^8") // Up one octave
-    {
-      octave_dir_ = UP;
-      s = s.left_str (s.length_i () - 2);
-    }
-  else
-    octave_dir_ = CENTER;
+  prev_cpos_ = clefpos;
+  prev_glyph_ = glyph;
+  prev_octavation_ = octavation;
 
-  SCM c = get_property ("supportedClefTypes");
   SCM p = get_property ("clefPitches");
-  
-  if (gh_list_p (c))
+  int c0_position =  0;
+  if (gh_list_p (p))
     {
-      SCM found = scm_assoc (ly_str02scm (s.ch_C ()), c);
+      SCM found = scm_assoc (glyph, p);
       if (found == SCM_BOOL_F)
-       return false;
-      
-      SCM glyph = gh_cadr (found);
-      SCM pos = gh_caddr (found);
-
-      daddy_trans_l_->set_property ("clefGlyph", glyph);
-      daddy_trans_l_->set_property ("clefPosition", pos);
-
-      found = scm_assoc (glyph, p);
-      if (found == SCM_BOOL_F)
-       return false;
+       {
+         c0_position =0;
+       }
+      else
+       {
+         c0_position =  gh_scm2int (gh_cdr (found));
 
-      int c0_position = gh_scm2int (pos) + gh_scm2int (gh_cdr (found));
-      daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
+         if (gh_number_p (octavation))
+             c0_position -= gh_scm2int (octavation);
+      
+         if (gh_number_p (clefpos))
+           c0_position += gh_scm2int (clefpos);
+       }
+      
     }
-
-  int c0_position = gh_scm2int (get_property ("centralCPosition"));
-  c0_position -= (int)octave_dir_ * 7;
   daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
+}
 
+void
+Clef_engraver::set_glyph ()
+{
+  SCM glyph_sym = ly_symbol2scm ("glyph");
+  SCM glyph = get_property ("clefGlyph");
 
   SCM basic = ly_symbol2scm ("Clef");
-  SCM gl = ly_symbol2scm ("glyph");
-
-  daddy_trans_l_->execute_single_pushpop_property (basic, gl, SCM_UNDEFINED);
-  daddy_trans_l_->execute_single_pushpop_property (basic, gl,
-                                                  get_property ("clefGlyph"));
-
-  return true;
+  
+  daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED);
+  daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, glyph);
 }
 
 /** 
@@ -154,31 +149,9 @@ Clef_engraver::acknowledge_element (Score_element_info info)
 void
 Clef_engraver::do_creation_processing ()
 {
-  daddy_trans_l_->set_property ("clefPosition", gh_int2scm (0));
-  daddy_trans_l_->set_property ("clefGlyph", SCM_EOL);
-  daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (0));
-
-  SCM def = get_property ("defaultClef");
-  if (gh_string_p (def))
-    {
-      set_type (ly_scm2string (def));
-    }
 }
 
-bool
-Clef_engraver::do_try_music (Music * r_l)
-{
-  if (Clef_change_req *cl = dynamic_cast <Clef_change_req *> (r_l))
-    {
-      clef_req_l_ = cl;
-      String t = ly_scm2string (cl->get_mus_property ("clef-type"));
-      if (!set_type (t))
-       cl->origin ()->warning (_ ("unknown clef type"));
 
-      return true;
-    }
-  return false;
-}
 
 void
 Clef_engraver::create_clef ()
@@ -186,16 +159,17 @@ Clef_engraver::create_clef ()
   if (!clef_p_)
     {
       Item *c= new Item (get_property ("Clef"));
-      announce_element (c, clef_req_l_);
+      announce_element (c, 0);
 
       Staff_symbol_referencer::set_interface (c);
       
       clef_p_ = c;
     }
   Staff_symbol_referencer::set_position (clef_p_,
-                                        gh_scm2int (get_property ("clefPosition")
-                                                    ));
-  if (octave_dir_)
+                                        gh_scm2int (get_property ("clefPosition")));
+
+  SCM oct =  get_property("clefOctavation");
+  if (gh_number_p (oct) && gh_scm2int (oct))
     {
       Item * g = new Item (get_property ("OctavateEight"));
 
@@ -204,18 +178,28 @@ Clef_engraver::create_clef ()
       g->set_parent (clef_p_, Y_AXIS);
       g->set_parent (clef_p_, X_AXIS);
 
-      g->set_elt_property ("direction", gh_int2scm (octave_dir_));
+      g->set_elt_property ("direction", gh_int2scm (sign (gh_scm2int (oct))));
       octavate_p_ = g;
-      announce_element (octavate_p_, clef_req_l_);
+      announce_element (octavate_p_, 0);
     }
 }
 
 void
 Clef_engraver::do_process_music ()
 {
-  if (clef_req_l_ || first_b_)
+  SCM glyph = get_property ("clefGlyph");
+  SCM clefpos = get_property ("clefPosition");
+  SCM octavation = get_property ("clefOctavation");
+  
+  if (scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
+      || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
+      || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F)    
     {
+      set_glyph();
+      set_central_c (glyph, clefpos, octavation);
+       
       create_clef ();
+
       clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
     }
 }
@@ -246,14 +230,11 @@ Clef_engraver::do_pre_move_processing ()
 
       octavate_p_ = 0;
     }
-
-  first_b_ = 0;
 }
 
 void
 Clef_engraver::do_post_move_processing ()
 {
-  clef_req_l_ = 0;
 }
 
 ADD_THIS_TRANSLATOR (Clef_engraver);