- Grob * support_l = head_l_arr_[i];
- Note_req * note_l = mel_l_arr_[i];
- Translator_group * origin_l = origin_l_arr_[i];
-
- int num = number_accidentals (note_l, origin_l, accidentals, barnum);
- int num_caut = number_accidentals (note_l, origin_l, cautionaries, barnum);
- bool cautionary = to_boolean (note_l->get_mus_property ("cautionary"));
+ if (accidentals_[i].done_ )
+ continue;
+ accidentals_[i].done_ = true;
+ Grob * support = accidentals_[i].head_;
+ Music * note = accidentals_[i].melodic_;
+ Translator_group * origin = accidentals_[i].origin_;
+
+ Pitch * pitch = unsmob_pitch (note->get_mus_property ("pitch"));
+ 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"));