X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-engraver.cc;h=8a06ea3a1b8471ef5fcfee3ab3229d25e1f3c3ee;hb=17e898abae3983e28021b0988d2fdf88365261f8;hp=01b352f28d647f067eab52bb7f2b4fd42f9944d0;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index 01b352f28d..8a06ea3a1b 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -3,22 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ #include "engraver.hh" +#include "align-interface.hh" +#include "axis-group-interface.hh" #include "context.hh" -#include "music.hh" +#include "grob-array.hh" #include "item.hh" -#include "spanner.hh" -#include "axis-group-interface.hh" -#include "align-interface.hh" #include "pointer-group-interface.hh" +#include "spanner.hh" +#include "stream-event.hh" #include "text-interface.hh" -#include "grob-array.hh" - #include "translator.icc" @@ -29,9 +28,12 @@ struct Figure_group SCM number_; SCM alteration_; + SCM augmented_; + SCM diminished_; + SCM augmented_slash_; Item *figure_item_; - Music *current_music_; + Stream_event *current_event_; bool force_no_continuation_; Figure_group () @@ -41,25 +43,34 @@ struct Figure_group continuation_line_ = 0; number_ = SCM_EOL; alteration_ = SCM_EOL; + augmented_ = SCM_EOL; + diminished_ = SCM_EOL; + augmented_slash_ = SCM_EOL; group_ = 0; - current_music_ = 0; + current_event_ = 0; } bool is_continuation () const { return - current_music_ + current_event_ && !force_no_continuation_ && ly_is_equal (number_, - current_music_->get_property ("figure")) + current_event_->get_property ("figure")) && ly_is_equal (alteration_, - current_music_->get_property ("alteration")); + current_event_->get_property ("alteration")) + && ly_is_equal (augmented_, + current_event_->get_property ("augmented")) + && ly_is_equal (diminished_, + current_event_->get_property ("diminished")) + && ly_is_equal (augmented_slash_, + current_event_->get_property ("augmented-slash")); } }; struct Figured_bass_engraver : public Engraver { - TRANSLATOR_DECLARATIONS(Figured_bass_engraver); - void clear_spanners(); + TRANSLATOR_DECLARATIONS (Figured_bass_engraver); + void clear_spanners (); void add_brackets (); void create_grobs (); @@ -68,14 +79,16 @@ struct Figured_bass_engraver : public Engraver protected: vector groups_; Spanner *alignment_; - vector new_musics_; + vector new_events_; bool continuation_; - bool new_music_found_; + bool new_event_found_; Moment stop_moment_; - Music *rest_event_; - - virtual bool try_music (Music *); + Stream_event *rest_event_; + + DECLARE_TRANSLATOR_LISTENER (rest); + DECLARE_TRANSLATOR_LISTENER (bass_figure); + virtual void derived_mark () const; void start_translation_timestep (); @@ -90,6 +103,9 @@ Figured_bass_engraver::derived_mark () const { scm_gc_mark (groups_[i].number_); scm_gc_mark (groups_[i].alteration_); + scm_gc_mark (groups_[i].augmented_); + scm_gc_mark (groups_[i].diminished_); + scm_gc_mark (groups_[i].augmented_slash_); } } @@ -103,7 +119,7 @@ Figured_bass_engraver::stop_translation_timestep () bool found = false; for (vsize i = 0; !found && i < groups_.size (); i++) - found = found || groups_[i].current_music_; + found = found || groups_[i].current_event_; if (!found) clear_spanners (); @@ -114,7 +130,7 @@ Figured_bass_engraver::Figured_bass_engraver () alignment_ = 0; continuation_ = false; rest_event_ = 0; - new_music_found_ = false; + new_event_found_ = false; } void @@ -125,43 +141,56 @@ Figured_bass_engraver::start_translation_timestep () return ; rest_event_ = 0; - new_musics_.clear (); + new_events_.clear (); for (vsize i = 0; i < groups_.size (); i++) - groups_[i].current_music_ = 0; + groups_[i].current_event_ = 0; + continuation_ = false; + + } -bool -Figured_bass_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Figured_bass_engraver, rest); +void +Figured_bass_engraver::listen_rest (Stream_event *ev) { - new_music_found_ = true; - if (m->is_mus_type ("rest-event")) + if (to_boolean (get_property ("ignoreFiguredBassRest"))) { - rest_event_ = m; - return true; + new_event_found_ = true; + + /* + No ASSIGN_EVENT_ONCE () ; otherwise we get warnings about + polyphonic rests. + */ + rest_event_ = ev; } - else +} + +IMPLEMENT_TRANSLATOR_LISTENER (Figured_bass_engraver, bass_figure); +void +Figured_bass_engraver::listen_bass_figure (Stream_event *ev) +{ + new_event_found_ = true; + Moment stop = now_mom () + get_event_length (ev, now_mom ()); + stop_moment_ = max (stop_moment_, stop); + + if (to_boolean (get_property ("useBassFigureExtenders"))) { - stop_moment_ = now_mom () + m->get_length (); - - SCM fig = m->get_property ("figure"); + SCM fig = ev->get_property ("figure"); for (vsize i = 0; i < groups_.size (); i++) { - if (!groups_[i].current_music_ + if (!groups_[i].current_event_ && ly_is_equal (groups_[i].number_, fig)) { - groups_[i].current_music_ = m; + groups_[i].current_event_ = ev; groups_[i].force_no_continuation_ - = to_boolean (m->get_property ("no-continuation")); + = to_boolean (ev->get_property ("no-continuation")); continuation_ = true; - return true; + return; } } - - new_musics_.push_back (m); - - return true; - } + } + new_events_.push_back (ev); } void @@ -170,13 +199,13 @@ Figured_bass_engraver::center_continuations (vector const &consecutive if (consecutive_lines.size () == 2) { vector left_figs; - for (vsize j = consecutive_lines.size(); j--;) + for (vsize j = consecutive_lines.size (); j--;) left_figs.push_back (consecutive_lines[j]->get_bound (LEFT)); SCM ga = Grob_array::make_array (); unsmob_grob_array (ga)->set_array (left_figs); - for (vsize j = consecutive_lines.size(); j--;) + for (vsize j = consecutive_lines.size (); j--;) consecutive_lines[j]->set_object ("figures", unsmob_grob_array (ga)->smobbed_copy ()); } @@ -186,14 +215,14 @@ void Figured_bass_engraver::center_repeated_continuations () { vector consecutive_lines; - for (vsize i = 0; i <= groups_.size(); i++) + for (vsize i = 0; i <= groups_.size (); i++) { if (i < groups_.size () && groups_[i].continuation_line_ && (consecutive_lines.empty () - || (consecutive_lines[0]->get_bound(LEFT)->get_column () + || (consecutive_lines[0]->get_bound (LEFT)->get_column () == groups_[i].continuation_line_->get_bound (LEFT)->get_column () - && consecutive_lines[0]->get_bound(RIGHT)->get_column () + && consecutive_lines[0]->get_bound (RIGHT)->get_column () == groups_[i].continuation_line_->get_bound (RIGHT)->get_column ()))) consecutive_lines.push_back (groups_[i].continuation_line_); else @@ -217,7 +246,7 @@ Figured_bass_engraver::clear_spanners () } if (to_boolean (get_property ("figuredBassCenterContinuations"))) - center_repeated_continuations(); + center_repeated_continuations (); for (vsize i = 0; i < groups_.size (); i++) { @@ -244,20 +273,20 @@ Figured_bass_engraver::add_brackets () bool inside = false; for (vsize i = 0; i < groups_.size (); i ++) { - if (!groups_[i].current_music_) + if (!groups_[i].current_event_) continue; - if (to_boolean (groups_[i].current_music_->get_property ("bracket-start"))) + if (to_boolean (groups_[i].current_event_->get_property ("bracket-start"))) inside = true; if (inside && groups_[i].figure_item_) encompass.push_back (groups_[i].figure_item_); - if (to_boolean (groups_[i].current_music_->get_property ("bracket-stop"))) + if (to_boolean (groups_[i].current_event_->get_property ("bracket-stop"))) { inside = false; - Item * brack = make_item ("BassFigureBracket", groups_[i].current_music_->self_scm ()); + Item * brack = make_item ("BassFigureBracket", groups_[i].current_event_->self_scm ()); for (vsize j = 0; j < encompass.size (); j++) { Pointer_group_interface::add_grob (brack, @@ -272,6 +301,9 @@ Figured_bass_engraver::add_brackets () void Figured_bass_engraver::process_music () { + if (alignment_ && !to_boolean (get_property ("useBassFigureExtenders"))) + clear_spanners (); + if (rest_event_) { clear_spanners (); @@ -280,17 +312,17 @@ Figured_bass_engraver::process_music () } if (!continuation_ - && new_musics_.empty ()) + && new_events_.empty ()) { clear_spanners (); groups_.clear (); return; } - if (!new_music_found_) + if (!new_event_found_) return; - new_music_found_ = false; + new_event_found_ = false; /* Don't need to sync alignments, if we're not using extenders. @@ -308,10 +340,10 @@ Figured_bass_engraver::process_music () } vsize k = 0; - for (vsize i = 0; i < new_musics_.size (); i++) + for (vsize i = 0; i < new_events_.size (); i++) { while (k < groups_.size () - && groups_[k].current_music_) + && groups_[k].current_event_) k++; if (k >= groups_.size ()) @@ -320,7 +352,7 @@ Figured_bass_engraver::process_music () groups_.push_back (group); } - groups_[k].current_music_ = new_musics_[i]; + groups_[k].current_event_ = new_events_[i]; groups_[k].figure_item_ = 0; k++; } @@ -331,21 +363,25 @@ Figured_bass_engraver::process_music () { groups_[i].number_ = SCM_BOOL_F; groups_[i].alteration_ = SCM_BOOL_F; + groups_[i].augmented_ = SCM_BOOL_F; + groups_[i].diminished_ = SCM_BOOL_F; + groups_[i].augmented_slash_ = SCM_BOOL_F; } } if (use_extenders) { vector junk_continuations; - for (vsize i = 0; i < groups_.size(); i++) + for (vsize i = 0; i < groups_.size (); i++) { - Figure_group &group = groups_[i]; + Figure_group &group = groups_[i]; if (group.is_continuation ()) { if (!group.continuation_line_) { - Spanner * line = make_spanner ("BassFigureContinuation", SCM_EOL); + Spanner * line + = make_spanner ("BassFigureContinuation", SCM_EOL); Item * item = group.figure_item_; group.continuation_line_ = line; line->set_bound (LEFT, item); @@ -372,7 +408,7 @@ Figured_bass_engraver::process_music () { for (vsize i = 0; i <= junk_continuations.size (); i++) { - if (i < junk_continuations.size() + if (i < junk_continuations.size () && (i == 0 || junk_continuations[i-1] == junk_continuations[i] - 1)) consecutive.push_back (groups_[junk_continuations[i]].continuation_line_); else @@ -395,7 +431,8 @@ Figured_bass_engraver::process_music () void Figured_bass_engraver::create_grobs () { - Grob *muscol = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); + Grob *muscol + = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); if (!alignment_) { alignment_ = make_spanner ("BassFigureAlignment", SCM_EOL); @@ -404,18 +441,18 @@ Figured_bass_engraver::create_grobs () alignment_->set_bound (RIGHT, muscol); SCM proc = get_property ("figuredBassFormatter"); - for (vsize i = 0; i < groups_.size(); i++) + for (vsize i = 0; i < groups_.size (); i++) { Figure_group &group = groups_[i]; - if (group.current_music_) + if (group.current_event_) { Item *item = make_item ("BassFigure", - group.current_music_->self_scm ()); + group.current_event_->self_scm ()); - SCM fig = group.current_music_->get_property ("figure"); + SCM fig = group.current_event_->get_property ("figure"); if (!group.group_) { group.group_ = make_spanner ("BassFigureLine", SCM_EOL); @@ -431,13 +468,16 @@ Figured_bass_engraver::create_grobs () } group.number_ = fig; - group.alteration_ = group.current_music_->get_property ("alteration"); + group.alteration_ = group.current_event_->get_property ("alteration"); + group.augmented_ = group.current_event_->get_property ("augmented"); + group.diminished_ = group.current_event_->get_property ("diminished"); + group.augmented_slash_ = group.current_event_->get_property ("augmented-slash"); - SCM text = group.current_music_->get_property ("text"); + SCM text = group.current_event_->get_property ("text"); if (!Text_interface::is_markup (text) && ly_is_procedure (proc)) { - text = scm_call_3 (proc, fig, group.current_music_->self_scm (), + text = scm_call_3 (proc, fig, group.current_event_->self_scm (), context ()->self_scm ()); } @@ -465,17 +505,14 @@ Figured_bass_engraver::create_grobs () ADD_TRANSLATOR (Figured_bass_engraver, /* doc */ - "Make figured bass numbers.", + /* create */ "BassFigure " "BassFigureAlignment " "BassFigureBracket " "BassFigureContinuation " - "BassFigureLine " - , - /* accept */ - "bass-figure-event rest-event", + "BassFigureLine ", /* read */ "figuredBassAlterationDirection " @@ -483,7 +520,8 @@ ADD_TRANSLATOR (Figured_bass_engraver, "figuredBassFormatter " "implicitBassFigures " "useBassFigureExtenders " - , + "ignoreFiguredBassRest ", /* write */ - ""); + "" + );