X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=363ba3e22e9a215f10aa6a13dbfeffdd987d30af;hb=91821bd59959b1289f2d711509017a4dacebecd2;hp=5ecf45194e5be0e05c91772c3b6e14abd038c52a;hpb=a0b072ed070ca6abb36a11e015073b117103e35d;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 5ecf45194e..363ba3e22e 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,120 +3,160 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Jan Nieuwenhuizen + (c) 1998--2005 Jan Nieuwenhuizen */ #include "engraver.hh" #include "chord-name.hh" -#include "chord.hh" -#include "musical-request.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "font-interface.hh" -#include "paper-def.hh" -#include "main.hh" +#include "output-def.hh" #include "dimensions.hh" #include "item.hh" -#include "pitch.hh" #include "protected-scm.hh" +#include "context.hh" +#include "warn.hh" +#include "pitch.hh" -class Chord_name_engraver : public Engraver +class Chord_name_engraver : public Engraver { - - TRANSLATOR_DECLARATIONS( Chord_name_engraver); - + TRANSLATOR_DECLARATIONS (Chord_name_engraver); protected: - virtual void stop_translation_timestep (); - virtual void acknowledge_grob (Grob_info i); - virtual void process_acknowledged_grobs (); + void stop_translation_timestep (); + void process_music (); virtual bool try_music (Music *); - + virtual void finalize (); + virtual void derived_mark () const; private: - void add_note (Note_req *); - - Item* chord_name_p_; - - Protected_scm chord_; - Protected_scm last_chord_; -}; + void add_note (Music *); + Item *chord_name_; + Link_array notes_; + SCM last_chord_; +}; -Chord_name_engraver::Chord_name_engraver () +void +Chord_name_engraver::finalize () { - chord_name_p_ = 0; - chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); - last_chord_ = chord_; } void -Chord_name_engraver::add_note (Note_req* n) +Chord_name_engraver::derived_mark () const { - SCM pitches = ly_car (chord_); - SCM modifiers = ly_cdr (chord_); - SCM inversion = modifiers == SCM_EOL ? SCM_EOL : ly_car (modifiers); - SCM bass = modifiers == SCM_EOL ? SCM_EOL : ly_cdr (modifiers); - - if (n->get_mus_property ("inversion") == SCM_BOOL_T) - inversion = n->get_mus_property ("pitch"); - else if (n->get_mus_property ("bass") == SCM_BOOL_T) - bass = n->get_mus_property ("pitch"); - else - pitches = scm_sort_list (gh_cons (n->get_mus_property ("pitch"), pitches), - Pitch::less_p_proc); - chord_ = gh_cons (pitches, gh_cons (inversion, bass)); + scm_gc_mark (last_chord_); } -bool -Chord_name_engraver::try_music (Music* m) +Chord_name_engraver::Chord_name_engraver () { - if (Note_req* n = dynamic_cast (m)) - { - add_note (n); - return true; - } - return false; + chord_name_ = 0; + last_chord_ = SCM_EOL; } void -Chord_name_engraver::acknowledge_grob (Grob_info i) +Chord_name_engraver::add_note (Music *n) { - if (Note_req* n = dynamic_cast (i.music_cause ())) - add_note (n); + notes_.push (n); } void -Chord_name_engraver::process_acknowledged_grobs () +Chord_name_engraver::process_music () { - if (!chord_name_p_ && ly_car (chord_) != SCM_EOL) + if (!notes_.size ()) + return; + + SCM bass = SCM_EOL; + SCM inversion = SCM_EOL; + SCM pitches = SCM_EOL; + + Music *inversion_event = 0; + for (int i = 0; i < notes_.size (); i++) + { + Music *n = notes_[i]; + SCM p = n->get_property ("pitch"); + if (!unsmob_pitch (p)) + continue; + + if (n->get_property ("inversion") == SCM_BOOL_T) + { + inversion_event = n; + inversion = p; + } + else if (n->get_property ("bass") == SCM_BOOL_T) + bass = p; + else + pitches = scm_cons (p, pitches); + } + + if (inversion_event) { - chord_name_p_ = new Item (get_property ("ChordName")); - chord_name_p_->set_grob_property ("chord", chord_); - announce_grob(chord_name_p_, SCM_EOL); - SCM s = get_property ("chordChanges"); - if (to_boolean (s) && ly_car (last_chord_) != SCM_EOL - && gh_equal_p (chord_, last_chord_)) - chord_name_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T); + 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_cons (orig.smobbed_copy (), pitches); + } + else + programming_error ("inversion does not have original pitch"); } + + pitches = scm_sort_list (pitches, Pitch::less_p_proc); + + SCM name_proc = get_property ("chordNameFunction"); + SCM 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", notes_[0]->self_scm ()); + chord_name_->set_property ("text", markup); + + SCM s = get_property ("chordChanges"); + if (to_boolean (s) && scm_is_pair (last_chord_) + && ly_is_equal (chord_as_scm, last_chord_)) + chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T); + + last_chord_ = chord_as_scm; } -void -Chord_name_engraver::stop_translation_timestep () +bool +Chord_name_engraver::try_music (Music *m) { - if (chord_name_p_) + /* + hmm. Should check? + */ + if (m->is_mus_type ("note-event")) { - typeset_grob (chord_name_p_); + add_note (m); + return true; } - chord_name_p_ = 0; + return false; +} - if (ly_car (chord_) != SCM_EOL) - last_chord_ = chord_; - chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); +void +Chord_name_engraver::stop_translation_timestep () +{ + chord_name_ = 0; + notes_.clear (); } -ENTER_DESCRIPTION(Chord_name_engraver, -/* descr */ "Catch Note_req's, Tonic_reqs, Inversion_reqs, Bass_req -and generate the appropriate chordname.", -/* creats*/ "ChordName", -/* acks */ "grob-interface", -/* reads */ "chordChanges", -/* write */ ""); +/* + The READs description is not strictly accurate: + which properties are read depend on the chord naming function active. +*/ +#include "translator.icc" + +ADD_TRANSLATOR (Chord_name_engraver, + /* doc */ "Catch note-events " + "and generate the appropriate chordname.", + /* create */ "ChordName", + /* accept */ "note-event", + /* read */ "chordChanges chordNameExceptions chordNameFunction " + "chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol", + /* write */ "");