X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=b49f03bce86008cf6264f1506ce4d36caf25d402;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=08d397b6f380e27d6df7f37c3712d3d17b7c7a59;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 08d397b6f3..d0ced5a395 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -1,100 +1,193 @@ /* - chord-name-engraver.cc -- implement Chord_name_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Jan Nieuwenhuizen - (c) 1998--1999 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include "chord-name-engraver.hh" -#include "chord.hh" -#include "musical-request.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "main.hh" +#include "chord-name.hh" +#include "context.hh" #include "dimensions.hh" -#include "text-item.hh" +#include "engraver.hh" +#include "font-interface.hh" +#include "item.hh" +#include "output-def.hh" +#include "pitch.hh" +#include "protected-scm.hh" +#include "stream-event.hh" +#include "text-interface.hh" +#include "warn.hh" -ADD_THIS_TRANSLATOR (Chord_name_engraver); +#include "translator.icc" -Chord_name_engraver::Chord_name_engraver () +class Chord_name_engraver : public Engraver +{ + TRANSLATOR_DECLARATIONS (Chord_name_engraver); +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_; +}; + +void +Chord_name_engraver::finalize () { - tonic_req_ = 0; } void -Chord_name_engraver::acknowledge_element (Score_element_info i) +Chord_name_engraver::derived_mark () const { - if (Note_req* n = dynamic_cast (i.req_l_)) - pitch_arr_.push (n->pitch_); + scm_gc_mark (last_chord_); } -bool -Chord_name_engraver::do_try_music (Music* m) +Chord_name_engraver::Chord_name_engraver () { - if (Note_req* n = dynamic_cast (m)) - { - pitch_arr_.push (n->pitch_); - return true; - } - if (Tonic_req* t = dynamic_cast (m)) - { - tonic_req_ = t; - return true; - } - return false; + chord_name_ = 0; + last_chord_ = SCM_EOL; + rest_event_ = 0; } void -Chord_name_engraver::do_process_requests () -{ - if (text_p_arr_.size ()) - return; - if (!pitch_arr_.size ()) - return; - - Chord chord (pitch_arr_); - Musical_pitch* inversion = 0; - SCM chord_inversion = get_property ("chordInversion", 0); - if (gh_boolean_p (chord_inversion) && gh_scm2bool (chord_inversion)) +Chord_name_engraver::process_music () +{ + SCM markup; + SCM bass = SCM_EOL; + SCM inversion = SCM_EOL; + SCM pitches = SCM_EOL; + + if (rest_event_) { - int tonic_i = tonic_req_ - ? chord.find_notename_i (tonic_req_->pitch_) : chord.find_tonic_i (); - - if (tonic_i) - { - inversion = &pitch_arr_[0]; - chord.rebuild_insert_inversion (tonic_i); - } + SCM no_chord_markup = get_property ("noChordSymbol"); + if (!Text_interface::is_markup (no_chord_markup)) + return; + markup = no_chord_markup; } - - Text_item* item_p = new Text_item; + else + { + if (!notes_.size ()) + return; + + Stream_event *inversion_event = 0; + for (vsize i = 0; i < notes_.size (); i++) + { + Stream_event *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) + { + 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"); + markup = scm_call_4 (name_proc, pitches, bass, inversion, + context ()->self_scm ()); + } /* - TODO: - - switch on property, add american (?) chordNameStyle: - Chord::american_str (...) + Ugh. + */ + SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion)); - SCM chordNameStyle = get_property ("chordNameStyle", 0); - if (chordNameStyle == "Banter") - item_p->text_str_ = chord.banter_str (inversion); - */ + chord_name_ = make_item ("ChordName", + rest_event_ ? rest_event_->self_scm () : notes_[0]->self_scm ()); + chord_name_->set_property ("text", markup); - item_p->text_str_ = chord.banter_str (inversion); - - text_p_arr_.push (item_p); - announce_element (Score_element_info (item_p, 0)); + 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); + + last_chord_ = chord_as_scm; } +IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note); void -Chord_name_engraver::do_pre_move_processing () +Chord_name_engraver::listen_note (Stream_event *ev) { - for (int i=0; i < text_p_arr_.size (); i++) - { - typeset_element (text_p_arr_[i]); - } - text_p_arr_.clear (); - pitch_arr_.clear (); - tonic_req_ = 0; + notes_.push_back (ev); +} + +IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, rest); +void +Chord_name_engraver::listen_rest (Stream_event *ev) +{ + ASSIGN_EVENT_ONCE(rest_event_, ev); +} + +void +Chord_name_engraver::stop_translation_timestep () +{ + chord_name_ = 0; + notes_.clear (); + rest_event_ = 0; } + +/* + The READs description is not strictly accurate: + which properties are read depend on the chord naming function active. +*/ +ADD_TRANSLATOR (Chord_name_engraver, + /* doc */ + "Catch note and rest events and generate the appropriate chordname.", + + /* create */ + "ChordName ", + + /* read */ + "chordChanges " + "chordNameExceptions " + "chordNameFunction " + "chordNoteNamer " + "chordRootNamer " + "chordNameExceptions " + "majorSevenSymbol " + "noChordSymbol ", + + /* write */ + "" + );