X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=92fee10a50a3fddf160078537e9f5dfee526559e;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=221c1e8881ee950c70da5af60b29f202236d30ef;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index 221c1e8881..92fee10a50 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2011 Juergen Reuter + Copyright (C) 2002--2012 Juergen Reuter Han-Wen Nienhuys set_parent (heads_[d], Y_AXIS); heads_[d]->set_object ("accidental-grob", - accidentals_[d]->self_scm ()); + accidentals_[d]->self_scm ()); Axis_group_interface::add_element (group_, heads_[d]); Axis_group_interface::add_element (group_, accidentals_[d]); } - while (flip (&d) != DOWN); ambitus_->set_parent (heads_[DOWN], X_AXIS); Axis_group_interface::add_element (group_, ambitus_); @@ -120,8 +118,14 @@ Ambitus_engraver::stop_translation_timestep () * may then oversee a clef that is defined in a staff context if * we are in a voice context; middleCPosition would then be * assumed to be 0. + + * Don't use middleCPosition as this may be thwarted by a cue + * starting here. middleCOffset is not affected by cue clefs. */ - start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0); + int clef_pos = robust_scm2int (get_property ("middleCClefPosition"), 0); + int offset = robust_scm2int (get_property ("middleCOffset"), 0); + + start_c0_ = clef_pos + offset; start_key_sig_ = get_property ("keySignature"); is_typeset_ = true; @@ -136,17 +140,17 @@ Ambitus_engraver::acknowledge_note_head (Grob_info info) { SCM p = nr->get_property ("pitch"); /* - If the engraver is added to a percussion context, - filter out unpitched note heads. + If the engraver is added to a percussion context, + filter out unpitched note heads. */ if (!unsmob_pitch (p)) - return; + return; Pitch pitch = *unsmob_pitch (p); Drul_array expands = pitch_interval_.add_point (pitch); if (expands[UP]) - causes_[UP] = nr; + causes_[UP] = nr; if (expands[DOWN]) - causes_[DOWN] = nr; + causes_[DOWN] = nr; } } @@ -155,63 +159,59 @@ Ambitus_engraver::finalize () { if (ambitus_ && !pitch_interval_.is_empty ()) { - 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); - - 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]); - Pointer_group_interface::add_grob (ambitus_, - ly_symbol2scm ("note-heads"), - heads_[d]); - } - while (flip (&d) != DOWN); + 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 (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); + + 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]); + Pointer_group_interface::add_grob (ambitus_, + ly_symbol2scm ("note-heads"), + heads_[d]); + } Axis_group_interface::add_element (group_, accidental_placement); } else { - Direction d = DOWN; - do - { - accidentals_[d]->suicide (); - heads_[d]->suicide (); - } - while (flip (&d) != DOWN); + for (DOWN_and_UP (d)) + { + accidentals_[d]->suicide (); + heads_[d]->suicide (); + } ambitus_->suicide (); } @@ -219,20 +219,21 @@ Ambitus_engraver::finalize () ADD_ACKNOWLEDGER (Ambitus_engraver, note_head); ADD_TRANSLATOR (Ambitus_engraver, - /* doc */ - "Create an ambitus.", - - /* create */ - "AccidentalPlacement " - "Ambitus " - "AmbitusAccidental " - "AmbitusLine " - "AmbitusNoteHead ", - - /* read */ - "keySignature " - "middleCPosition ", - - /* write */ - "" - ); + /* doc */ + "Create an ambitus.", + + /* create */ + "AccidentalPlacement " + "Ambitus " + "AmbitusAccidental " + "AmbitusLine " + "AmbitusNoteHead ", + + /* read */ + "keySignature " + "middleCClefPosition " + "middleCOffset ", + + /* write */ + "" + );