release: 1.5.0

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index c3a2136f2a0fc278f568118f6b0e78c7d7ed5082..d16cb8a20b5db7a4058e5ac061b73c10bc45c429 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
@@ -12,18 +12,15 @@
 
 #include "translator-group.hh"
 #include "key-item.hh"
-#include "local-key-item.hh"
 #include "bar.hh"
-#include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "debug.hh"
 #include "engraver.hh"
 #include "direction.hh"
 #include "side-position-interface.hh"
 #include "item.hh"
-#include "custos.hh"
 
-/// where is c-0 in the staff?
+
 class Clef_engraver : public  Engraver
 {
 public:
@@ -35,9 +32,9 @@ public:
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void create_grobs ();
+  virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
-
+  virtual void do_creation_processing ();
 private:
   Item * clef_p_;
   Item * octavate_p_;
@@ -46,8 +43,8 @@ private:
   SCM prev_cpos_;
   SCM prev_octavation_;
   void create_clef ();
-  void set_central_c (SCM, SCM, SCM);
   void set_glyph ();
+  void inspect_clef_properties ();
 };
 
 Clef_engraver::Clef_engraver ()
@@ -57,42 +54,11 @@ Clef_engraver::Clef_engraver ()
   octavate_p_ = 0;
 
   /*
-    will trigger a clef at the start since #f != '()
+    will trigger a clef at the start since #f != ' ()
    */
   prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
 }
 
-void
-Clef_engraver::set_central_c (SCM glyph,SCM clefpos, SCM octavation)
-{
-  prev_cpos_ = clefpos;
-  prev_glyph_ = glyph;
-  prev_octavation_ = octavation;
-
-  SCM p = get_property ("clefPitches");
-  int c0_position =  0;
-  if (gh_list_p (p))
-    {
-      SCM found = scm_assoc (glyph, p);
-      if (found == SCM_BOOL_F)
-       {
-         c0_position =0;
-       }
-      else
-       {
-         c0_position =  gh_scm2int (gh_cdr (found));
-
-         if (gh_number_p (octavation))
-             c0_position -= gh_scm2int (octavation);
-      
-         if (gh_number_p (clefpos))
-           c0_position += gh_scm2int (clefpos);
-       }
-      
-    }
-  daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
-}
-
 void
 Clef_engraver::set_glyph ()
 {
@@ -112,30 +78,19 @@ Clef_engraver::set_glyph ()
 void
 Clef_engraver::acknowledge_grob (Grob_info info)
 {
-  create_grobs ();
   Item * item =dynamic_cast <Item *> (info.elem_l_);
   if (item)
     {
       if (Bar::has_interface (info.elem_l_)
          && gh_string_p (get_property ("clefGlyph")))
        create_clef ();
-      
 
-      if (Note_head::has_interface (item)
-         || Local_key_item::has_interface (item)
-         || Custos::has_interface (item)
-         )
-       {
-         int p = int (Staff_symbol_referencer::position_f (item))
-           + gh_scm2int (get_property ("centralCPosition"));
-         Staff_symbol_referencer::set_position (item, p);
-       }
-      else if (Key_item::has_interface (item))
+      if (Key_item::has_interface (item))
        {
          /*
            Key_item adapts its formatting to make sure that the
            accidentals stay in the upper half of the staff. It needs
-           to know c0-pos for this.  (?)
+           to know c0-pos for this. (?)
          */
 
          item->set_grob_property ("c0-position", get_property ("centralCPosition"));
@@ -158,12 +113,12 @@ Clef_engraver::create_clef ()
   Staff_symbol_referencer::set_position (clef_p_,
                                         gh_scm2int (get_property ("clefPosition")));
 
-  SCM oct =  get_property("clefOctavation");
+  SCM oct =  get_property ("clefOctavation");
   if (gh_number_p (oct) && gh_scm2int (oct))
     {
       Item * g = new Item (get_property ("OctavateEight"));
 
-      Side_position::add_support (g,clef_p_);      
+      Side_position_interface::add_support (g,clef_p_);      
 
       g->set_parent (clef_p_, Y_AXIS);
       g->set_parent (clef_p_, X_AXIS);
@@ -175,26 +130,56 @@ Clef_engraver::create_clef ()
 }
 
 void
-Clef_engraver::create_grobs ()
+Clef_engraver::process_music ()
+{
+  inspect_clef_properties ();
+}
+
+/*
+  this must be done in creation_proc() since grace notes will be
+  processed before Clef_engraver::prcoess_music()
+
+  Grace notes and clef changes are still broken.
+*/
+void
+Clef_engraver::do_creation_processing ()
+{
+  inspect_clef_properties ();
+}
+
+void
+Clef_engraver::inspect_clef_properties ()
 {
   SCM glyph = get_property ("clefGlyph");
   SCM clefpos = get_property ("clefPosition");
   SCM octavation = get_property ("clefOctavation");
-
+  SCM force_clef = get_property ("forceClef");
+  
   if (clefpos == SCM_EOL
       || 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)    
+      || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F
+      || to_boolean (force_clef)
+)
     {
-      set_glyph();
-      set_central_c (glyph, clefpos, octavation);
-       
+      set_glyph ();
       create_clef ();
 
       clef_p_->set_grob_property ("non-default", SCM_BOOL_T);
+
+      prev_cpos_ = clefpos;
+      prev_glyph_ = glyph;
+      prev_octavation_ = octavation;
+    }
+
+  if (to_boolean (force_clef))
+    {
+      Translator_group * w = daddy_trans_l_->where_defined (ly_symbol2scm ("forceClef"));
+      w->set_property ("forceClef", SCM_EOL);
     }
 }
 
+
 void
 Clef_engraver::stop_translation_timestep ()
 {