X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=4bf248770f26bb4d99a6bb0b645e4fc9fc672cf7;hb=5d1d077e3d4f49fd822d3c04e785eee4be06a7fc;hp=f72a38bcd1bb4d2c549db4e1bdd3daae3ab493cb;hpb=b0720e5b9114fc250f752b10661a63e5437a40ae;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index f72a38bcd1..4bf248770f 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
@@ -69,12 +69,10 @@ void
 Clef_engraver::set_glyph ()
 {
   SCM glyph_sym = ly_symbol2scm ("glyph");
-  SCM glyph = get_property ("clefGlyph");
-
   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"));
 }
 
 /**
@@ -146,6 +144,10 @@ Clef_engraver::inspect_clef_properties ()
       || 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 ();
@@ -191,7 +193,15 @@ Clef_engraver::stop_translation_timestep ()
 ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
 ADD_TRANSLATOR (Clef_engraver,
 		/* doc */ "Determine and set reference point for pitches",
-		/* create */ "Clef OctavateEight",
+		/* create */ "Clef "
+		"OctavateEight ",
 		/* accept */ "",
-		/* read */ "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef",
+		/* read */
+		"clefGlyph "
+		"clefOctavation "
+		"clefPosition "
+		"explicitClefVisibility "
+		"forceClef "
+		"middleCPosition "
+		,
 		/* write */ "");