2003 -> 2004

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

diff --git a/lily/new-accidental-engraver.cc b/lily/new-accidental-engraver.cc
index 4d2cad0b29b6714740b892ab9ff2f5504ad2ff16..9b3d6a04ee3d9a83a2dcd0c4a4c21b0f333bc433 100644 (file)
--- a/lily/new-accidental-engraver.cc
+++ b/lily/new-accidental-engraver.cc
@@ -1,8 +1,8 @@
 /*
   new-accidental-engraver.cc -- implement new_accidental_engraver
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  Modified 2001--2003 by Rune Zedeler <rz@daimi.au.dk>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Modified 2001--2004 by Rune Zedeler <rz@daimi.au.dk>
 
   This is an experimental file - producing correct accidentals but
   unfortunately ruining the spacing. -rz
@@ -64,7 +64,6 @@ protected:
   virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
-  virtual void initialize ();
   virtual void process_acknowledged_grobs ();
   virtual void finalize ();
   virtual void process_grobs_first_pass ();
@@ -102,8 +101,8 @@ protected:
 
 New_accidental_engraver::New_accidental_engraver ()
 {
+  last_keysig_ = SCM_BOOL_F;
   accidental_placement_ = 0;
-  last_keysig_ = SCM_EOL;
 }
 
 /* inserts the source alist into the destination alist, erasing old entries.
@@ -167,13 +166,6 @@ static void set_property_on_family(Translator_group * trans, const char * sym, S
     }
 }
 
-void
-New_accidental_engraver::initialize ()
-{
-  // to ensure that process_music will initialize last_keysig_
-  last_keysig_ = SCM_BOOL_F;
-}
-
 /*
 calculates the number of accidentals on basis of the current local key sig
   (passed as argument)
@@ -272,7 +264,7 @@ number_accidentals (Music * note, Pitch *pitch, Translator_group * origin,
        {
          SCM context = ly_car (accidentals);
          
-         while (origin && !origin->is_alias_b (context))
+         while (origin && !origin->is_alias (context))
            origin = origin->daddy_trans_;
       
          if (!origin)
@@ -421,12 +413,12 @@ New_accidental_engraver::process_grobs_second_pass ()
       
       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());
            }