X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=fb5daa0402ec9e2f9b212e3d11e23eaa71879909;hb=1855cf7137149c0bd27b5851fd9db498385591b3;hp=819ee2cedf1c8ca8568ed4277ea16c84bdfa3a28;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 819ee2cedf..fb5daa0402 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,34 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
 
 #include <ctype.h>
 
-#include "translator-group.hh"
-
+#include "context.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
-
 #include "engraver.hh"
 #include "direction.hh"
 #include "side-position-interface.hh"
 #include "item.hh"
 
-
 class Clef_engraver : public  Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Clef_engraver);
+  TRANSLATOR_DECLARATIONS (Clef_engraver);
 
   Direction octave_dir_;
 
 protected:
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
 private:
@@ -65,8 +61,8 @@ Clef_engraver::set_glyph ()
 
   SCM basic = ly_symbol2scm ("Clef");
   
-  daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED);
-  daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, glyph);
+  execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
+  execute_pushpop_property (context (), basic, glyph_sym, glyph);
 }
 
 /** 
@@ -80,9 +76,8 @@ Clef_engraver::acknowledge_grob (Grob_info info)
   if (item)
     {
       if (Bar_line::has_interface (info.grob_)
-	  && gh_string_p (get_property ("clefGlyph")))
+	  && ly_c_string_p (get_property ("clefGlyph")))
 	create_clef ();
-
     } 
 }
 
@@ -91,28 +86,37 @@ Clef_engraver::create_clef ()
 {
   if (!clef_)
     {
-      Item *c= new Item (get_property ("Clef"));
-      announce_grob(c, SCM_EOL);
+      Item *c = make_item ("Clef", SCM_EOL);
+      
 
       clef_ = c;
       SCM cpos = get_property ("clefPosition");
 
-      if (gh_number_p (cpos))
-	Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos));
+      if (ly_c_number_p (cpos))
+	Staff_symbol_referencer::set_position (clef_, ly_scm2int (cpos));
 
       SCM oct =  get_property ("clefOctavation");
-      if (gh_number_p (oct) && gh_scm2int (oct))
+      if (ly_c_number_p (oct) && ly_scm2int (oct))
 	{
-	  Item * g = new Item (get_property ("OctavateEight"));
+	  Item * g = make_item ("OctavateEight", SCM_EOL);
+
+	  int abs_oct = ly_scm2int (oct) ;
+	  int dir = sign (abs_oct);
+	  abs_oct = abs (abs_oct)  + 1;
 
+	  SCM txt = scm_number_to_string (scm_int2num (abs_oct),
+					  SCM_MAKINUM (10));
+
+	  g->set_property ("text",
+			   scm_list_n (ly_scheme_function ("vcenter-markup"),
+				       txt,  SCM_UNDEFINED));
 	  Side_position_interface::add_support (g,clef_);      
 
 	  g->set_parent (clef_, Y_AXIS);
 	  g->set_parent (clef_, X_AXIS);
-
-	  g->set_grob_property ("direction", scm_int2num (sign (gh_scm2int (oct))));
+	  g->set_property ("direction", scm_int2num (dir));
 	  octavate_ = g;
-	  announce_grob(octavate_, SCM_EOL);
+	  
 	}
     }
 }
@@ -134,13 +138,12 @@ Clef_engraver::inspect_clef_properties ()
       || 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
-      || to_boolean (force_clef)
-)
+      || to_boolean (force_clef))
     {
       set_glyph ();
       create_clef ();
 
-      clef_->set_grob_property ("non-default", SCM_BOOL_T);
+      clef_->set_property ("non-default", SCM_BOOL_T);
 
       prev_cpos_ = clefpos;
       prev_glyph_ = glyph;
@@ -149,7 +152,7 @@ Clef_engraver::inspect_clef_properties ()
 
   if (to_boolean (force_clef))
     {
-      Translator_group * w = daddy_trans_->where_defined (ly_symbol2scm ("forceClef"));
+      Context * w = context ()->where_defined (ly_symbol2scm ("forceClef"));
       w->set_property ("forceClef", SCM_EOL);
     }
 }
@@ -161,45 +164,33 @@ Clef_engraver::stop_translation_timestep ()
   if (clef_)
     {
       SCM vis = 0; 
-      if (to_boolean (clef_->get_grob_property ("non-default")))
+      if (to_boolean (clef_->get_property ("non-default")))
 	{
 	  vis = get_property ("explicitClefVisibility");
 	}
 
       if (vis)
 	{
-	  clef_->set_grob_property ("break-visibility", vis);
+	  clef_->set_property ("break-visibility", vis);
 	  if (octavate_)
 	    {
-	      octavate_->set_grob_property ("break-visibility", vis);
+	      octavate_->set_property ("break-visibility", vis);
 
 	    }
 	}
       
-      typeset_grob (clef_);
       clef_ =0;
 
-      if (octavate_)
-	{
-	  Side_position_interface::add_staff_support (octavate_);	  
-	  typeset_grob (octavate_);
-	}
-
       octavate_ = 0;
     }
 }
 
-void
-Clef_engraver::start_translation_timestep ()
-{
-}
-
 
 
-ENTER_DESCRIPTION(Clef_engraver,
+ENTER_DESCRIPTION (Clef_engraver,
 /* descr */       "Determine and set reference point for pitches",
 /* creats*/       "Clef OctavateEight",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "bar-line-interface",
-/* reads */       "clefPosition clefGlyph centralCPosition clefOctavation explicitClefVisibility",
+/* reads */       "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility",
 /* write */       "");