X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=0057176a9f761c5f6bce9bc17ff419d2a3459c46;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=274e3ec3904cc71810bf2ba4bbe343d37d8c1296;hpb=16cb456cabf477f6d398ff731aa0f10b60913394;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 274e3ec390..0057176a9f 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -1,9 +1,20 @@ /* - 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--2014 Jan Nieuwenhuizen - (c) 1998--2007 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.hh" @@ -16,6 +27,7 @@ #include "pitch.hh" #include "protected-scm.hh" #include "stream-event.hh" +#include "text-interface.hh" #include "warn.hh" #include "translator.icc" @@ -27,13 +39,13 @@ 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_; + vector notes_; - SCM last_chord_; + Stream_event *rest_event_; }; void @@ -41,82 +53,98 @@ 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 (!notes_.size ()) - return; + if (!rest_event_ && !notes_.size ()) + return; + + chord_name_ = make_item ("ChordName", + rest_event_ ? rest_event_->self_scm () : notes_[0]->self_scm ()); + + SCM maybe_markup = chord_name_->get_property_data ("text"); - SCM bass = SCM_EOL; - SCM inversion = SCM_EOL; - SCM pitches = SCM_EOL; + bool make_markup = !(Text_interface::is_markup (maybe_markup) + || ly_is_procedure (maybe_markup)); - Stream_event *inversion_event = 0; - for (vsize i = 0; i < notes_.size (); i++) + SCM markup; + + if (rest_event_ && !make_markup) { } + else if (rest_event_) { - 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); + SCM no_chord_markup = get_property ("noChordSymbol"); + if (!Text_interface::is_markup (no_chord_markup)) + return; + markup = no_chord_markup; } - - if (inversion_event) + else { - 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"); + 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 ()); } - - 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_)) + 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"); + SCM last_chord = get_property ("lastChord"); + 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_ = chord_as_scm; + context ()->set_property ("lastChord", markup); } IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note); @@ -126,11 +154,19 @@ Chord_name_engraver::listen_note (Stream_event *ev) 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; } /* @@ -138,16 +174,23 @@ Chord_name_engraver::stop_translation_timestep () which properties are read depend on the chord naming function active. */ ADD_TRANSLATOR (Chord_name_engraver, - /* doc */ "Catch note-events " - "and generate the appropriate chordname.", - - /* create */ "ChordName", - /* read */ "chordChanges " - "chordNameExceptions " - "chordNameFunction " - "chordNoteNamer " - "chordRootNamer " - "chordNameExceptions " - "majorSevenSymbol " - , - /* write */ ""); + /* doc */ + "Catch note and rest events and generate the appropriate chordname.", + + /* create */ + "ChordName ", + + /* read */ + "chordChanges " + "chordNameExceptions " + "chordNameFunction " + "chordNoteNamer " + "chordRootNamer " + "chordNameExceptions " + "lastChord " + "majorSevenSymbol " + "noChordSymbol ", + + /* write */ + "lastChord " + );