X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=00c345771728f4e46a06ed75ce08c023b0740f1c;hb=41839ed7390861d2a3f3fa31c5fc93a28599d99e;hp=5551cbc07c6eac64e15f22f47f7060aa96dced9e;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 5551cbc07c..00c3457717 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Mats Bengtsson <matsb@s3.kth.se>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@ using namespace std;
 
 #include "item.hh"
 #include "context.hh"
-#include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
 #include "engraver.hh"
 #include "direction.hh"
@@ -106,30 +105,30 @@ Clef_engraver::create_clef ()
       SCM cpos = get_property ("clefPosition");
 
       if (scm_is_number (cpos))
-	clef_->set_property ("staff-position", cpos);
+        clef_->set_property ("staff-position", cpos);
 
       SCM oct = get_property ("clefOctavation");
       if (scm_is_number (oct) && scm_to_int (oct))
-	{
-	  Item *g = make_item ("OctavateEight", SCM_EOL);
-
-	  int abs_oct = scm_to_int (oct);
-	  int dir = sign (abs_oct);
-	  abs_oct = abs (abs_oct) + 1;
-
-	  SCM txt = scm_number_to_string (scm_from_int (abs_oct),
-					  scm_from_int (10));
-
-	  g->set_property ("text",
-			   scm_list_n (ly_lily_module_constant ("vcenter-markup"),
-				       txt, SCM_UNDEFINED));
-	  Side_position_interface::add_support (g, clef_);
-
-	  g->set_parent (clef_, Y_AXIS);
-	  g->set_parent (clef_, X_AXIS);
-	  g->set_property ("direction", scm_from_int (dir));
-	  octavate_ = g;
-	}
+        {
+          Item *g = make_item ("OctavateEight", SCM_EOL);
+
+          int abs_oct = scm_to_int (oct);
+          int dir = sign (abs_oct);
+          abs_oct = abs (abs_oct) + 1;
+
+          SCM txt = scm_number_to_string (scm_from_int (abs_oct),
+                                          scm_from_int (10));
+
+          g->set_property ("text",
+                           scm_list_n (ly_lily_module_constant ("vcenter-markup"),
+                                       txt, SCM_UNDEFINED));
+          Side_position_interface::add_support (g, clef_);
+
+          g->set_parent (clef_, Y_AXIS);
+          g->set_parent (clef_, X_AXIS);
+          g->set_property ("direction", scm_from_int (dir));
+          octavate_ = g;
+        }
     }
 }
 void
@@ -138,6 +137,14 @@ Clef_engraver::process_music ()
   inspect_clef_properties ();
 }
 
+static void apply_on_children (Context *context, SCM fun)
+{
+  scm_call_1 (fun, context->self_scm ());
+  for (SCM s = context->children_contexts ();
+       scm_is_pair (s); s = scm_cdr (s))
+    apply_on_children (unsmob_context (scm_car (s)), fun);
+}
+
 void
 Clef_engraver::inspect_clef_properties ()
 {
@@ -152,16 +159,15 @@ 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"));
-      
+      apply_on_children (context (),
+                         ly_lily_module_constant ("invalidate-alterations"));
+
       set_glyph ();
       if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef")))
-	create_clef ();
+        create_clef ();
 
       if (clef_)
-	clef_->set_property ("non-default", SCM_BOOL_T);
+        clef_->set_property ("non-default", SCM_BOOL_T);
 
       prev_cpos_ = clefpos;
       prev_glyph_ = glyph;
@@ -183,10 +189,10 @@ 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);
+        clef_->set_property ("break-visibility", vis);
 
       clef_ = 0;
 
@@ -196,20 +202,20 @@ 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 ",
-
-		/* read */
-		"clefGlyph "
-		"clefOctavation "
-		"clefPosition "
-		"explicitClefVisibility "
-		"forceClef ",
-
-		/* write */
-		""
-		);
+                /* doc */
+                "Determine and set reference point for pitches.",
+
+                /* create */
+                "Clef "
+                "OctavateEight ",
+
+                /* read */
+                "clefGlyph "
+                "clefOctavation "
+                "clefPosition "
+                "explicitClefVisibility "
+                "forceClef ",
+
+                /* write */
+                ""
+               );