X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-engraver.cc;h=957a3ce5dce17d16c11be0c25bcec62cf82d0fc1;hb=aa23e460ca96734a29387c163e75db4f3980d13f;hp=d81d9a3c361d04d66622f5a7f4ca4a535d1fde2d;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index d81d9a3c36..957a3ce5dc 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
 */
 
@@ -94,16 +94,6 @@ public:
   those.
 */
 
-static void
-set_property_on_children (Context *trans, char const *sym, SCM val)
-{
-  trans->set_property (sym, ly_deep_copy (val));
-  for (SCM p = trans->children_contexts (); scm_is_pair (p); p = scm_cdr (p))
-    {
-      Context *trg = unsmob_context (scm_car (p));
-      set_property_on_children (trg, sym, ly_deep_copy (val));
-    }
-}
 
 Accidental_engraver::Accidental_engraver ()
 {
@@ -121,7 +111,9 @@ void
 Accidental_engraver::update_local_key_signature ()
 {
   last_keysig_ = get_property ("keySignature");
-  set_property_on_children (context (), "localKeySignature", last_keysig_);
+  set_context_property_on_children (context (),
+				    ly_symbol2scm ("localKeySignature"),
+				    last_keysig_);
 
   Context *trans = context ()->get_parent_context ();
 
@@ -225,7 +217,8 @@ number_accidentals_from_sig (bool *different, SCM sig, Pitch *pitch,
 
       if (alter == prev)
 	num = 0;
-      else if ((abs (alter) < abs (prev) || prev * alter < 0) && alter != 0)
+      else if ((abs (alter) < abs (prev)
+		|| prev * alter < 0) && alter != 0)
 	num = 2;
       *different = (alter != prev);
     }