X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=415fed1bf264ca92ee22ba40a2eed06ff2098318;hb=08d8e06fd23fab1fc7eabc5384f8fb1561b0bd7f;hp=090647ae71771d4eae6eef463c23b0a438f5840e;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 090647ae71..415fed1bf2 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
 
 #include <cctype>
+using namespace std;
 
+#include "item.hh"
 #include "context.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
@@ -17,6 +19,8 @@
 #include "direction.hh"
 #include "side-position-interface.hh"
 
+#include "translator.icc"
+
 class Clef_engraver : public Engraver
 {
 public:
@@ -25,9 +29,11 @@ public:
   Direction octave_dir_;
 
 protected:
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
-  virtual void acknowledge_grob (Grob_info);
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_ACKNOWLEDGER (bar_line);
+
+  virtual void derived_mark () const;
 private:
   Item *clef_;
   Item *octavate_;
@@ -40,6 +46,14 @@ private:
   void inspect_clef_properties ();
 };
 
+void
+Clef_engraver::derived_mark () const
+{
+  scm_gc_mark (prev_octavation_);
+  scm_gc_mark (prev_cpos_);
+  scm_gc_mark (prev_glyph_);
+}
+
 Clef_engraver::Clef_engraver ()
 {
   clef_ = 0;
@@ -49,19 +63,17 @@ Clef_engraver::Clef_engraver ()
   /*
     will trigger a clef at the start since #f != ' ()
   */
-  prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
+  prev_octavation_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
 }
 
 void
 Clef_engraver::set_glyph ()
 {
-  SCM glyph_sym = ly_symbol2scm ("glyph-name");
-  SCM glyph = get_property ("clefGlyph");
-
+  SCM glyph_sym = ly_symbol2scm ("glyph");
   SCM basic = ly_symbol2scm ("Clef");
 
   execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
-  execute_pushpop_property (context (), basic, glyph_sym, glyph);
+  execute_pushpop_property (context (), basic, glyph_sym, get_property ("clefGlyph"));
 }
 
 /**
@@ -69,15 +81,11 @@ Clef_engraver::set_glyph ()
    ie. a breakpoint)
 */
 void
-Clef_engraver::acknowledge_grob (Grob_info info)
+Clef_engraver::acknowledge_bar_line (Grob_info info)
 {
   Item *item = dynamic_cast<Item *> (info.grob ());
-  if (item)
-    {
-      if (Bar_line::has_interface (info.grob ())
-	  && scm_is_string (get_property ("clefGlyph")))
-	create_clef ();
-    }
+  if (item && scm_is_string (get_property ("clefGlyph")))
+    create_clef ();
 }
 
 void
@@ -102,7 +110,7 @@ Clef_engraver::create_clef ()
 	  int dir = sign (abs_oct);
 	  abs_oct = abs (abs_oct) + 1;
 
-	  SCM txt = scm_number_to_string (scm_int2num (abs_oct),
+	  SCM txt = scm_number_to_string (scm_from_int (abs_oct),
 					  scm_from_int (10));
 
 	  g->set_property ("text",
@@ -112,7 +120,7 @@ Clef_engraver::create_clef ()
 
 	  g->set_parent (clef_, Y_AXIS);
 	  g->set_parent (clef_, X_AXIS);
-	  g->set_property ("direction", scm_int2num (dir));
+	  g->set_property ("direction", scm_from_int (dir));
 	  octavate_ = g;
 	}
     }
@@ -131,12 +139,16 @@ Clef_engraver::inspect_clef_properties ()
   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
-       || to_boolean (force_clef))
+  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
+      || to_boolean (force_clef))
     {
+      set_context_property_on_children (context (),
+					ly_symbol2scm ("localKeySignature"),
+					get_property ("keySignature"));
+      
       set_glyph ();
       if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef")))
 	create_clef ();
@@ -151,7 +163,8 @@ Clef_engraver::inspect_clef_properties ()
 
   if (to_boolean (force_clef))
     {
-      Context *w = context ()->where_defined (ly_symbol2scm ("forceClef"));
+      SCM prev;
+      Context *w = context ()->where_defined (ly_symbol2scm ("forceClef"), &prev);
       w->set_property ("forceClef", SCM_EOL);
     }
 }
@@ -163,17 +176,13 @@ Clef_engraver::stop_translation_timestep ()
     {
       SCM vis = 0;
       if (to_boolean (clef_->get_property ("non-default")))
-	{
-	  vis = get_property ("explicitClefVisibility");
-	}
+	vis = get_property ("explicitClefVisibility");
 
       if (vis)
 	{
 	  clef_->set_property ("break-visibility", vis);
 	  if (octavate_)
-	    {
-	      octavate_->set_property ("break-visibility", vis);
-	    }
+	    octavate_->set_property ("break-visibility", vis);
 	}
 
       clef_ = 0;
@@ -182,12 +191,22 @@ Clef_engraver::stop_translation_timestep ()
     }
 }
 
-#include "translator.icc"
-
+ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
 ADD_TRANSLATOR (Clef_engraver,
-		/* descr */ "Determine and set reference point for pitches",
-		/* creats*/ "Clef OctavateEight",
-		/* accepts */ "",
-		/* acks  */ "bar-line-interface",
-		/* reads */ "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef",
-		/* write */ "");
+		/* doc */
+		"Determine and set reference point for pitches.",
+
+		/* create */
+		"Clef "
+		"OctavateEight ",
+
+		/* read */
+		"clefGlyph "
+		"clefOctavation "
+		"clefPosition "
+		"explicitClefVisibility "
+		"forceClef ",
+
+		/* write */
+		""
+		);