X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=d9b2e27dea3d9cd544d7ccd831c757217028a9bb;hb=651887bf80f7d060457ef46a97341eec46688b44;hp=8ac60b91a98a69236b55d05302b373ec1103274c;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 8ac60b91a9..d9b2e27dea 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"
@@ -67,13 +69,11 @@ Clef_engraver::Clef_engraver ()
 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"));
 }
 
 /**
@@ -85,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
@@ -147,6 +145,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 ();
@@ -174,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;
@@ -196,7 +194,14 @@ 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",
-		/* accept */ "",
-		/* read */ "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef",
+		/* create */ "Clef "
+		"OctavateEight ",
+		/* read */
+		"clefGlyph "
+		"clefOctavation "
+		"clefPosition "
+		"explicitClefVisibility "
+		"forceClef "
+		"middleCPosition "
+		,
 		/* write */ "");