- Grob * accidental_placement =
- make_item ("AccidentalPlacement",
- accidentals_[DOWN]->self_scm ());
-
- Direction d = DOWN;
- do
- {
- Pitch p = pitch_interval_[d];
- heads_[d]->set_property ("cause", causes_[d]->self_scm());
- heads_[d]->set_property ("staff-position",
- scm_from_int (start_c0_
- + p.steps ()));
-
- SCM handle = scm_assoc (scm_cons (scm_from_int (p.get_octave ()),
- scm_from_int (p.get_notename ())),
- start_key_sig_);
-
- if (handle == SCM_BOOL_F)
- handle = scm_assoc (scm_from_int (p.get_notename ()),
- start_key_sig_);
-
- Rational sig_alter = (handle != SCM_BOOL_F)
- ? robust_scm2rational (scm_cdr (handle), Rational (0)) : Rational (0);
-
- if (sig_alter == p.get_alteration ())
- {
- accidentals_[d]->suicide ();
- heads_[d]->set_object ("accidental-grob", SCM_EOL);
- }
- else
- {
- accidentals_[d]->set_property ("alteration", ly_rational2scm (p.get_alteration ()));
- }
- Separation_item::add_conditional_item (heads_[d], accidental_placement);
- Accidental_placement::add_accidental (accidental_placement, accidentals_[d]);
- }
- while (flip (&d) != DOWN);
-
-
- Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[DOWN]);
- Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[UP]);
+ Grob *accidental_placement
+ = make_item ("AccidentalPlacement", accidentals_[DOWN]->self_scm ());
+
+ for (DOWN_and_UP (d))
+ {
+ Pitch p = pitch_interval_[d];
+ heads_[d]->set_property ("cause", causes_[d]->self_scm ());
+ heads_[d]->set_property ("staff-position",
+ scm_from_int (start_c0_ + p.steps ()));
+
+ SCM handle = scm_assoc (scm_cons (scm_from_int (p.get_octave ()),
+ scm_from_int (p.get_notename ())),
+ start_key_sig_);
+
+ if (scm_is_false (handle))
+ handle = scm_assoc (scm_from_int (p.get_notename ()),
+ start_key_sig_);
+
+ Rational sig_alter = (scm_is_true (handle))
+ ? robust_scm2rational (scm_cdr (handle), Rational (0))
+ : Rational (0);
+
+ const Pitch other = pitch_interval_[-d];
+
+ if (sig_alter == p.get_alteration ()
+ && !((p.steps () == other.steps ())
+ && (p.get_alteration () != other.get_alteration ())))
+ {
+ accidentals_[d]->suicide ();
+ heads_[d]->set_object ("accidental-grob", SCM_EOL);
+ }
+ else
+ accidentals_[d]->
+ set_property ("alteration",
+ ly_rational2scm (p.get_alteration ()));
+ Separation_item::add_conditional_item (heads_[d],
+ accidental_placement);
+ Accidental_placement::add_accidental (accidental_placement,
+ accidentals_[d], false, 0);
+ Pointer_group_interface::add_grob (ambitus_,
+ ly_symbol2scm ("note-heads"),
+ heads_[d]);
+ }
+