X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-engraver.cc;h=003b37ff318f56f11638bb099ffbfffe76efb7fc;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=9aa20975d9d0376694e0467579b02d5bf4f55186;hpb=03b5368b31bed546689477110ecff2aaf800c1c9;p=lilypond.git

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 9aa20975d9..003b37ff31 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -103,7 +103,8 @@ public:
   in grobs should always store ly_deep_copy ()s of those.
 */
 
-Accidental_engraver::Accidental_engraver ()
+Accidental_engraver::Accidental_engraver (Context *c)
+  : Engraver (c)
 {
   accidental_placement_ = 0;
   last_keysig_ = SCM_EOL;
@@ -199,10 +200,7 @@ check_pitch_against_rules (Pitch const &pitch, Context *origin,
       */
       else if (scm_is_symbol (rule))
         {
-          Context *dad = origin;
-          while (dad && !dad->is_alias (rule))
-            dad = dad->get_parent_context ();
-
+          Context *dad = find_context_above (origin, rule);
           if (dad)
             origin = dad;
         }
@@ -233,7 +231,7 @@ Accidental_engraver::process_acknowledged ()
           Stream_event *note = accidentals_[i].melodic_;
           Context *origin = accidentals_[i].origin_;
 
-          Pitch *pitch = Pitch::unsmob (note->get_property ("pitch"));
+          Pitch *pitch = unsmob<Pitch> (note->get_property ("pitch"));
           if (!pitch)
             continue;
 
@@ -317,7 +315,7 @@ Accidental_engraver::make_standard_accidental (Stream_event * /* note */,
   */
   for (vsize i = 0; i < left_objects_.size (); i++)
     {
-      if (left_objects_[i]->get_property ("side-axis") == scm_from_int (X_AXIS))
+      if (ly_is_equal (left_objects_[i]->get_property ("side-axis"), scm_from_int (X_AXIS)))
         Side_position_interface::add_support (left_objects_[i], a);
     }
 
@@ -332,7 +330,7 @@ Accidental_engraver::make_standard_accidental (Stream_event * /* note */,
 
   Accidental_placement::add_accidental
     (accidental_placement_, a,
-     get_property ("accidentalGrouping") == ly_symbol2scm ("voice"),
+     scm_is_eq (get_property ("accidentalGrouping"), ly_symbol2scm ("voice")),
      (long) trans);
 
   note_head->set_object ("accidental-grob", a->self_scm ());
@@ -348,7 +346,7 @@ Accidental_engraver::make_suggested_accidental (Stream_event * /* note */,
   Grob *a = trans->make_item ("AccidentalSuggestion", note_head->self_scm ());
 
   Side_position_interface::add_support (a, note_head);
-  if (Grob *stem = Grob::unsmob (a->get_object ("stem")))
+  if (Grob *stem = unsmob<Grob> (a->get_object ("stem")))
     Side_position_interface::add_support (a, stem);
 
   a->set_parent (note_head, X_AXIS);
@@ -372,8 +370,8 @@ Accidental_engraver::stop_translation_timestep ()
         {
           // Don't mark accidentals as "tied" when the pitch is not
           // actually the same.  This is relevant for enharmonic ties.
-          Stream_event *le = Stream_event::unsmob (l->get_property ("cause"));
-          Stream_event *re = Stream_event::unsmob (r->get_property ("cause"));
+          Stream_event *le = unsmob<Stream_event> (l->get_property ("cause"));
+          Stream_event *re = unsmob<Stream_event> (r->get_property ("cause"));
           if (le && re
               && !ly_is_equal (le->get_property ("pitch"), re->get_property ("pitch")))
             continue;
@@ -399,7 +397,7 @@ Accidental_engraver::stop_translation_timestep ()
 
       int barnum = measure_number (origin);
 
-      Pitch *pitch = Pitch::unsmob (note->get_property ("pitch"));
+      Pitch *pitch = unsmob<Pitch> (note->get_property ("pitch"));
       if (!pitch)
         continue;
 
@@ -409,7 +407,7 @@ Accidental_engraver::stop_translation_timestep ()
       SCM key = scm_cons (scm_from_int (o), scm_from_int (n));
 
       Moment end_mp = measure_position (context (),
-                                        Duration::unsmob (note->get_property ("duration")));
+                                        unsmob<Duration> (note->get_property ("duration")));
       SCM position = scm_cons (scm_from_int (barnum), end_mp.smobbed_copy ());
 
       SCM localsig = SCM_EOL;
@@ -467,7 +465,8 @@ Accidental_engraver::acknowledge_rhythmic_head (Grob_info info)
           || note->in_event_class ("trill-span-event"))
       // option to skip accidentals on string harmonics
       && (to_boolean (get_property ("harmonicAccidentals"))
-          || info.grob ()->get_property ("style") != ly_symbol2scm ("harmonic"))
+          || !scm_is_eq (info.grob ()->get_property ("style"),
+                         ly_symbol2scm ("harmonic")))
       // ignore accidentals in non-printing voices like NullVoice
       && !to_boolean (info.context ()->get_property ("nullAccidentals")))
     {
@@ -509,15 +508,20 @@ void
 Accidental_engraver::process_music ()
 {
   SCM sig = get_property ("keyAlterations");
-  if (last_keysig_ != sig)
+  if (!scm_is_eq (last_keysig_, sig))
     update_local_key_signature (sig);
 }
 
-ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio);
-ADD_ACKNOWLEDGER (Accidental_engraver, finger);
-ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
-ADD_END_ACKNOWLEDGER (Accidental_engraver, tie);
-ADD_ACKNOWLEDGER (Accidental_engraver, note_column);
+
+void
+Accidental_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio);
+  ADD_ACKNOWLEDGER (Accidental_engraver, finger);
+  ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
+  ADD_END_ACKNOWLEDGER (Accidental_engraver, tie);
+  ADD_ACKNOWLEDGER (Accidental_engraver, note_column);
+}
 
 ADD_TRANSLATOR (Accidental_engraver,
                 /* doc */