Run `make grand-replace'.

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 629ffee80c182c901cc6c14a50717a4cc2a1d5de..c8e21f2ce86e10ad12e8df144fea7b8a6e54ec6b 100644 (file)
--- 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--2008 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"
@@ -30,6 +32,8 @@ protected:
   void stop_translation_timestep ();
   void process_music ();
   DECLARE_ACKNOWLEDGER (bar_line);
+
+  virtual void derived_mark () const;
 private:
   Item *clef_;
   Item *octavate_;
@@ -42,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;
@@ -51,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"));
 }
 
 /**
@@ -75,9 +85,7 @@ Clef_engraver::acknowledge_bar_line (Grob_info info)
 {
   Item *item = dynamic_cast<Item *> (info.grob ());
   if (item && scm_is_string (get_property ("clefGlyph")))
-    {
-      create_clef ();
-    }
+    create_clef ();
 }
 
 void
@@ -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 ();
@@ -164,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;
@@ -185,8 +193,20 @@ Clef_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
 ADD_TRANSLATOR (Clef_engraver,
-               /* descr */ "Determine and set reference point for pitches",
-               /* creats*/ "Clef OctavateEight",
-               /* accepts */ "",
-               /* 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 */
+               ""
+               );