Imported sources

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 92dab534a18c1a30911e7d2bee94dd823b6bacf8..76c814444f48f23c19e0689ff0d43bef56f18525 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
@@ -11,16 +11,13 @@
 #include <ctype.h>
 
 #include "translator-group.hh"
-#include "key-item.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
-#include "debug.hh"
 #include "engraver.hh"
 #include "direction.hh"
 #include "side-position-interface.hh"
 #include "item.hh"
 
-
 class Clef_engraver : public  Engraver
 {
 public:
@@ -30,12 +27,11 @@ public:
 
 protected:
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
 private:
-  Item * clef_p_;
-  Item * octavate_p_;
+  Item * clef_;
+  Item * octavate_;
 
   SCM prev_glyph_;
   SCM prev_cpos_;
@@ -47,9 +43,9 @@ private:
 
 Clef_engraver::Clef_engraver ()
 {
-  clef_p_ = 0;
+  clef_ = 0;
   octave_dir_ = CENTER;
-  octavate_p_ = 0;
+  octavate_ = 0;
 
   /*
     will trigger a clef at the start since #f != ' ()
@@ -65,8 +61,8 @@ Clef_engraver::set_glyph ()
 
   SCM basic = ly_symbol2scm ("Clef");
   
-  daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED);
-  daddy_trans_l_->execute_single_pushpop_property (basic, glyph_sym, glyph);
+  execute_pushpop_property (daddy_trans_, basic, glyph_sym, SCM_UNDEFINED);
+  execute_pushpop_property (daddy_trans_, basic, glyph_sym, glyph);
 }
 
 /** 
@@ -76,49 +72,51 @@ Clef_engraver::set_glyph ()
 void
 Clef_engraver::acknowledge_grob (Grob_info info)
 {
-  Item * item =dynamic_cast <Item *> (info.grob_l_);
+  Item * item =dynamic_cast <Item *> (info.grob_);
   if (item)
     {
-      if (Bar::has_interface (info.grob_l_)
+      if (Bar_line::has_interface (info.grob_)
          && gh_string_p (get_property ("clefGlyph")))
        create_clef ();
-
     } 
 }
 
 void
 Clef_engraver::create_clef ()
 {
-  if (!clef_p_)
+  if (!clef_)
     {
-      Item *c= new Item (get_property ("Clef"));
-      announce_grob (c, 0);
+      Item *c= make_item ("Clef");
+      announce_grob(c, SCM_EOL);
 
-      Staff_symbol_referencer::set_interface (c);
-      
-      clef_p_ = c;
-    }
-  SCM cpos = get_property ("clefPosition");
+      clef_ = c;
+      SCM cpos = get_property ("clefPosition");
 
-  if (gh_number_p (cpos))
-    Staff_symbol_referencer::set_position (clef_p_, gh_scm2int (cpos));
+      if (gh_number_p (cpos))
+       Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos));
 
-  SCM oct =  get_property ("clefOctavation");
-  if (gh_number_p (oct) && gh_scm2int (oct))
-    {
-      Item * g = new Item (get_property ("OctavateEight"));
-
-      Side_position_interface::add_support (g,clef_p_);      
-
-      g->set_parent (clef_p_, Y_AXIS);
-      g->set_parent (clef_p_, X_AXIS);
-
-      g->set_grob_property ("direction", gh_int2scm (sign (gh_scm2int (oct))));
-      octavate_p_ = g;
-      announce_grob (octavate_p_, 0);
+      SCM oct =  get_property ("clefOctavation");
+      if (gh_number_p (oct) && gh_scm2int (oct))
+       {
+         Item * g = make_item ("OctavateEight");
+
+         int abs_oct = gh_scm2int (oct) ;
+         int dir = sign (abs_oct);
+         abs_oct = abs (abs_oct)  + 1;
+           
+         g->set_grob_property ("text",
+                               scm_number_to_string (gh_int2scm (abs_oct),
+                                                     SCM_MAKINUM (10)));
+         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 (dir));
+         octavate_ = g;
+         announce_grob(octavate_, SCM_EOL);
+       }
     }
 }
-
 void
 Clef_engraver::process_music ()
 {
@@ -137,13 +135,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_p_->set_grob_property ("non-default", SCM_BOOL_T);
+      clef_->set_grob_property ("non-default", SCM_BOOL_T);
 
       prev_cpos_ = clefpos;
       prev_glyph_ = glyph;
@@ -152,7 +149,7 @@ Clef_engraver::inspect_clef_properties ()
 
   if (to_boolean (force_clef))
     {
-      Translator_group * w = daddy_trans_l_->where_defined (ly_symbol2scm ("forceClef"));
+      Translator_group * w = daddy_trans_->where_defined (ly_symbol2scm ("forceClef"));
       w->set_property ("forceClef", SCM_EOL);
     }
 }
@@ -161,41 +158,42 @@ Clef_engraver::inspect_clef_properties ()
 void
 Clef_engraver::stop_translation_timestep ()
 {
-  if (clef_p_)
+  if (clef_)
     {
       SCM vis = 0; 
-      if (to_boolean (clef_p_->get_grob_property ("non-default")))
+      if (to_boolean (clef_->get_grob_property ("non-default")))
        {
          vis = get_property ("explicitClefVisibility");
        }
 
       if (vis)
        {
-         clef_p_->set_grob_property ("visibility-lambda", vis);
-         if (octavate_p_)
-           octavate_p_->set_grob_property ("visibility-lambda", vis);
+         clef_->set_grob_property ("break-visibility", vis);
+         if (octavate_)
+           {
+             octavate_->set_grob_property ("break-visibility", vis);
+
+           }
        }
       
-      typeset_grob (clef_p_);
-      clef_p_ =0;
+      typeset_grob (clef_);
+      clef_ =0;
 
-      if (octavate_p_)
-       typeset_grob (octavate_p_);
+      if (octavate_)
+       {
+         typeset_grob (octavate_);
+       }
 
-      octavate_p_ = 0;
+      octavate_ = 0;
     }
 }
 
-void
-Clef_engraver::start_translation_timestep ()
-{
-}
-
 
 
 ENTER_DESCRIPTION(Clef_engraver,
 /* descr */       "Determine and set reference point for pitches",
 /* creats*/       "Clef OctavateEight",
-/* acks  */       "bar-line-interface",
+/* accepts */     "",
+/* acks  */      "bar-line-interface",
 /* reads */       "clefPosition clefGlyph centralCPosition clefOctavation explicitClefVisibility",
 /* write */       "");