X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=26b4a607bb13bb39fbcd6954da896ab293161625;hb=refs%2Fheads%2Fdebian;hp=bdca1d10b13f732ab0951f2b5cc5e8c5851f027f;hpb=243db47a88df9240a66bde37356b43aaeb41260d;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index bdca1d10b1..26b4a607bb 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -1,154 +1,203 @@ /* - 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--2012 Jan Nieuwenhuizen - (c) 1998--2003 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 "engraver.hh" #include "chord-name.hh" -#include "event.hh" -#include "paper-def.hh" -#include "font-interface.hh" -#include "paper-def.hh" +#include "context.hh" #include "dimensions.hh" +#include "engraver.hh" +#include "font-interface.hh" #include "item.hh" +#include "output-def.hh" #include "pitch.hh" #include "protected-scm.hh" -#include "translator-group.hh" +#include "stream-event.hh" +#include "text-interface.hh" #include "warn.hh" -class Chord_name_engraver : public Engraver +#include "translator.icc" + +class Chord_name_engraver : public Engraver { - TRANSLATOR_DECLARATIONS( Chord_name_engraver); + TRANSLATOR_DECLARATIONS (Chord_name_engraver); protected: - virtual void stop_translation_timestep (); - virtual void process_music (); - virtual bool try_music (Music *); - + void stop_translation_timestep (); + void process_music (); + virtual void finalize (); + virtual void derived_mark () const; + DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_TRANSLATOR_LISTENER (rest); private: - void add_note (Music *); - - Item* chord_name_; - Link_array notes_; - - Protected_scm last_chord_; + Item *chord_name_; + vector notes_; + + SCM last_chord_; + Stream_event *rest_event_; }; -Chord_name_engraver::Chord_name_engraver () +void +Chord_name_engraver::finalize () { - chord_name_ = 0; - last_chord_ = SCM_EOL; } void -Chord_name_engraver::add_note (Music * n) +Chord_name_engraver::derived_mark () const { - notes_.push (n); + 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 (!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_mus_property ("pitch"); - if (!unsmob_pitch (p)) - continue; - - if (n->get_mus_property ("inversion") == SCM_BOOL_T) - { - inversion_event = n; - inversion = p; - } - else if (n->get_mus_property ("bass") == SCM_BOOL_T) - bass = p; - else - pitches = gh_cons (p, pitches); - } + if (!rest_event_ && !notes_.size ()) + return; - if (inversion_event) - { - SCM oct = inversion_event->get_mus_property ("octavation"); - if (gh_number_p (oct)) - { - Pitch *p = unsmob_pitch (inversion_event->get_mus_property ("pitch")); - int octavation = gh_scm2int (oct); - Pitch orig = p->transposed (Pitch (-octavation, 0,0)); - - pitches= gh_cons (orig.smobbed_copy (), pitches); - } - else - programming_error ("Inversion does not have original pitch."); - } + chord_name_ = make_item ("ChordName", + rest_event_ ? rest_event_->self_scm () : notes_[0]->self_scm ()); + + SCM maybe_markup = chord_name_->get_property_data ("text"); - pitches = scm_sort_list (pitches, Pitch::less_p_proc); + bool make_markup = !(Text_interface::is_markup (maybe_markup) + || ly_is_procedure (maybe_markup)); - SCM name_proc = get_property ("chordNameFunction"); - SCM markup = scm_call_4 (name_proc, pitches, bass, inversion, - daddy_trans_->self_scm()); + SCM markup; + if (rest_event_ && !make_markup) { } + else if (rest_event_) + { + SCM no_chord_markup = get_property ("noChordSymbol"); + if (!Text_interface::is_markup (no_chord_markup)) + return; + markup = no_chord_markup; + } + else + { + SCM bass = SCM_EOL; + SCM inversion = SCM_EOL; + SCM pitches = SCM_EOL; + + 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"); + if (make_markup) + markup = scm_call_4 (name_proc, pitches, bass, inversion, + context ()->self_scm ()); + } /* - Ugh. - */ - SCM chord_as_scm = gh_cons (pitches, gh_cons (bass, inversion)); - - chord_name_ = make_item ("ChordName"); - chord_name_->set_grob_property("text", markup); - announce_grob(chord_name_, notes_[0]->self_scm ()); - SCM s = get_property ("chordChanges"); - if (to_boolean (s) && gh_pair_p (last_chord_) - && gh_equal_p (chord_as_scm, last_chord_)) - chord_name_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T); - - last_chord_ = chord_as_scm; + Ugh. + */ + if (make_markup) + chord_name_->set_property ("text", markup); + else if (Text_interface::is_markup (maybe_markup)) + markup = maybe_markup; + + SCM chord_changes = get_property ("chordChanges"); + if (to_boolean (chord_changes) && scm_is_pair (last_chord_) + && ly_is_equal (markup, last_chord_)) + chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T); + + last_chord_ = markup; } -bool -Chord_name_engraver::try_music (Music* m) +IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note); +void +Chord_name_engraver::listen_note (Stream_event *ev) { - /* - hmm. Should check? - */ - if (m->is_mus_type ("note-event")) - { - add_note (m); - return true; - } - return false; + 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 () { - if (chord_name_) - { - typeset_grob (chord_name_); - } 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. */ -ENTER_DESCRIPTION(Chord_name_engraver, -/* descr */ "Catch note-events " -"and generate the appropriate chordname.", -/* creats*/ "ChordName", -/* accepts */ "note-event", -/* acks */ "", -/* reads */ "chordChanges chordNameExceptions chordNameFunction " -"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol", -/* write */ ""); +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 */ + "" + );