- new_pit.to_relative_octave (last);
- set_mus_property ("pitch", new_pit.smobbed_copy ());
+ new_pit = new_pit.to_relative_octave (last);
+
+ SCM check = get_property ("absolute-octave");
+ if (ly_c_number_p (check) &&
+ new_pit.get_octave () != ly_scm2int (check))
+ {
+ Pitch expected_pit (ly_scm2int (check),
+ new_pit.get_notename (),
+ new_pit.get_alteration ());
+ origin ()->warning (_f ("octave check failed; expected %s, found: %s",
+ expected_pit.to_string (),
+ new_pit.to_string ()));
+ new_pit = expected_pit;
+ }
+
+ set_property ("pitch", new_pit.smobbed_copy ());