X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=dba699c8f4aaf119f0de742c33d96ca6fb3fefc7;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=e2281400d01007ac9f14173a51dad0f9c9515b4b;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index e2281400d0..dba699c8f4 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Jan Nieuwenhuizen + Copyright (C) 1998--2014 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,14 +39,11 @@ protected: void stop_translation_timestep (); void process_music (); virtual void finalize (); - virtual void derived_mark () const; DECLARE_TRANSLATOR_LISTENER (note); DECLARE_TRANSLATOR_LISTENER (rest); private: - Item *chord_name_; vector notes_; - SCM last_chord_; Stream_event *rest_event_; }; @@ -55,94 +52,95 @@ Chord_name_engraver::finalize () { } -void -Chord_name_engraver::derived_mark () const -{ - scm_gc_mark (last_chord_); -} - Chord_name_engraver::Chord_name_engraver () { - chord_name_ = 0; - last_chord_ = SCM_EOL; rest_event_ = 0; } void Chord_name_engraver::process_music () { + if (!rest_event_ && notes_.empty ()) + return; + SCM markup; SCM bass = SCM_EOL; SCM inversion = SCM_EOL; SCM pitches = SCM_EOL; + Item *chord_name = 0; + // rest events present a hen-and-egg problem with regard to + // overriding the text property of the ChordName grob since we + // cannot create a ChordName grob, look at its text property and, if + // not set, use noChordSymbol to decide whether we should not have + // created the grob in the first place. if (rest_event_) { SCM no_chord_markup = get_property ("noChordSymbol"); if (!Text_interface::is_markup (no_chord_markup)) return; markup = no_chord_markup; + chord_name = make_item ("ChordName", rest_event_->self_scm ()); + chord_name->set_property ("text", markup); } else { - if (!notes_.size ()) - return; - - Stream_event *inversion_event = 0; - for (vsize i = 0; i < notes_.size (); i++) + chord_name = make_item ("ChordName", notes_[0]->self_scm ()); + // We cannot actually delay fetching the text property in case + // it is a callback since we need to compare the generated + // markups for the sake of chordChanges + markup = chord_name->get_property ("text"); + if (!Text_interface::is_markup (markup)) { - Stream_event *n = notes_[i]; - SCM p = n->get_property ("pitch"); - if (!unsmob_pitch (p)) - continue; - - if (n->get_property ("inversion") == SCM_BOOL_T) + for (vsize i = 0; i < notes_.size (); i++) { - inversion_event = n; - inversion = p; + Stream_event *n = notes_[i]; + SCM p = n->get_property ("pitch"); + if (!Pitch::unsmob (p)) + continue; + + if (n->get_property ("bass") == SCM_BOOL_T) + bass = p; + else + { + SCM oct = n->get_property ("octavation"); + if (scm_is_number (oct)) + { + Pitch orig = Pitch::unsmob (p)->transposed (Pitch (-scm_to_int (oct), 0)); + pitches = scm_cons (orig.smobbed_copy (), pitches); + } + else + pitches = scm_cons (p, pitches); + if (n->get_property ("inversion") == SCM_BOOL_T) + { + inversion = p; + if (!scm_is_number (oct)) + programming_error ("inversion does not have original pitch"); + } + } } - else if (n->get_property ("bass") == SCM_BOOL_T) - bass = p; - else - pitches = scm_cons (p, pitches); - } - if (inversion_event) - { - SCM oct = inversion_event->get_property ("octavation"); - if (scm_is_number (oct)) - { - Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch")); - int octavation = scm_to_int (oct); - Pitch orig = p->transposed (Pitch (-octavation, 0, 0)); + pitches = scm_sort_list (pitches, Pitch::less_p_proc); - pitches = scm_cons (orig.smobbed_copy (), pitches); + SCM name_proc = get_property ("chordNameFunction"); + markup = scm_call_4 (name_proc, pitches, bass, inversion, + context ()->self_scm ()); + if (!Text_interface::is_markup (markup)) + { + // Ugh, we created a grob, now we better populate it. + // Use an empty string. + markup = scm_string (SCM_EOL); } - else - programming_error ("inversion does not have original pitch"); + chord_name->set_property ("text", markup); } - - pitches = scm_sort_list (pitches, Pitch::less_p_proc); - - SCM name_proc = get_property ("chordNameFunction"); - markup = scm_call_4 (name_proc, pitches, bass, inversion, - context ()->self_scm ()); } - /* - Ugh. - */ - SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion)); - - chord_name_ = make_item ("ChordName", - rest_event_ ? rest_event_->self_scm () : notes_[0]->self_scm ()); - chord_name_->set_property ("text", markup); SCM chord_changes = get_property ("chordChanges"); - if (to_boolean (chord_changes) && scm_is_pair (last_chord_) - && ly_is_equal (chord_as_scm, last_chord_)) - chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T); + SCM last_chord = get_property ("lastChord"); + if (to_boolean (chord_changes) && ly_is_equal (markup, last_chord)) + chord_name->set_property ("begin-of-line-visible", SCM_BOOL_T); - last_chord_ = chord_as_scm; + context ()->set_property ("lastChord", markup); } IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note); @@ -162,7 +160,6 @@ Chord_name_engraver::listen_rest (Stream_event *ev) void Chord_name_engraver::stop_translation_timestep () { - chord_name_ = 0; notes_.clear (); rest_event_ = 0; } @@ -185,9 +182,10 @@ ADD_TRANSLATOR (Chord_name_engraver, "chordNoteNamer " "chordRootNamer " "chordNameExceptions " + "lastChord " "majorSevenSymbol " "noChordSymbol ", /* write */ - "" + "lastChord " );