2003 -> 2004

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index b4dccfadaec01a51230bd1fc37318c816f2db9c8..f41260d6b65428042c65bdf83d998db03f6928fe 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -1,7 +1,7 @@
 /*
   accidental-engraver.cc -- implement accidental_engraver
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
 */
 
@@ -82,7 +82,7 @@ static void
 set_property_on_children (Translator_group * trans, const char * sym, SCM val)
 {
   trans->set_property (sym, val);
-  for (SCM p = trans -> trans_group_list_; gh_pair_p (p); p = ly_cdr(p)) {
+  for (SCM p = trans->trans_group_list_; gh_pair_p (p); p = ly_cdr(p)) {
     Translator_group *trg =  dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
     set_property_on_children(trg,sym,ly_deep_copy(val));
   }
@@ -241,6 +241,9 @@ Accidental_engraver::process_acknowledged_grobs ()
          Translator_group * origin = accidentals_[i].origin_;
 
          Pitch * pitch = unsmob_pitch (note->get_mus_property ("pitch"));
+         if (!pitch)
+           continue;
+         
          int num = number_accidentals (note, pitch, origin, accidentals, barnum);
          int num_caut = number_accidentals (note, pitch, origin, cautionaries, barnum);
          bool cautionary = to_boolean (note->get_mus_property ("cautionary"));
@@ -281,12 +284,12 @@ Accidental_engraver::process_acknowledged_grobs ()
 
          if (num)
            {
-             Grob * a = new Item (get_property ("Accidental"));
+             Grob * a = make_item ("Accidental");
              a->set_parent (support, Y_AXIS);
 
              if (!accidental_placement_)
                {
-                 accidental_placement_ = new Item (get_property ("AccidentalPlacement"));
+                 accidental_placement_ = make_item ("AccidentalPlacement");
                  announce_grob (accidental_placement_, a->self_scm());
                }
              
@@ -394,7 +397,7 @@ Accidental_engraver::process_acknowledged_grobs ()
 void
 Accidental_engraver::finalize ()
 {
-
+  last_keysig_ = SCM_EOL;
 }
 
 void