X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-engraver.cc;h=b2a79262bb64727f7b4421dfb54981032f01e278;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=05d3575d4c2a25965e3ab52c63dfdbd8d14981d1;hpb=392386cc9874bf94a4656a2074e76e462958e78d;p=lilypond.git diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index 05d3575d4c..b2a79262bb 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2010 Han-Wen Nienhuys + Copyright (C) 2005--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -36,17 +36,17 @@ struct Figure_group { Spanner *group_; Spanner *continuation_line_; - + SCM number_; SCM alteration_; SCM augmented_; SCM diminished_; SCM augmented_slash_; SCM text_; - - Item *figure_item_; + + Item *figure_item_; Stream_event *current_event_; - + Figure_group () { figure_item_ = 0; @@ -110,7 +110,7 @@ struct Figured_bass_engraver : public Engraver void add_brackets (); void create_grobs (); - void center_continuations (vector const &consecutive_lines); + void center_continuations (vector const &consecutive_lines); void center_repeated_continuations (); protected: vector groups_; @@ -118,21 +118,22 @@ protected: vector new_events_; bool continuation_; bool new_event_found_; - + Moment stop_moment_; bool have_rest_; - DECLARE_TRANSLATOR_LISTENER (rest); - DECLARE_TRANSLATOR_LISTENER (bass_figure); + void listen_rest (Stream_event *); + void listen_bass_figure (Stream_event *); - virtual void derived_mark () const; + virtual void derived_mark () const; void start_translation_timestep (); void stop_translation_timestep (); void process_music (); }; -Figured_bass_engraver::Figured_bass_engraver () +Figured_bass_engraver::Figured_bass_engraver (Context *c) + : Engraver (c) { alignment_ = 0; continuation_ = false; @@ -154,7 +155,7 @@ Figured_bass_engraver::start_translation_timestep () { if (now_mom ().main_part_ < stop_moment_.main_part_ || now_mom ().grace_part_ < Rational (0)) - return ; + return; have_rest_ = 0; new_events_.clear (); @@ -170,29 +171,27 @@ Figured_bass_engraver::stop_translation_timestep () if (groups_.empty () || now_mom ().main_part_ < stop_moment_.main_part_ || now_mom ().grace_part_ < Rational (0)) - return ; + return; bool found = false; for (vsize i = 0; !found && i < groups_.size (); i++) - found = found || groups_[i].current_event_; + found = found || groups_[i].current_event_; if (!found) clear_spanners (); } -IMPLEMENT_TRANSLATOR_LISTENER (Figured_bass_engraver, rest); void -Figured_bass_engraver::listen_rest (Stream_event *ev) +Figured_bass_engraver::listen_rest (Stream_event *) { have_rest_ = true; } -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 ()); + Moment stop = now_mom () + get_event_length (ev, now_mom ()); stop_moment_ = max (stop_moment_, stop); // Handle no-continuation here, don't even add it to the already existing @@ -201,56 +200,53 @@ Figured_bass_engraver::listen_bass_figure (Stream_event *ev) if (to_boolean (get_property ("useBassFigureExtenders")) && !no_continuation) { for (vsize i = 0; i < groups_.size (); i++) - { - if (!groups_[i].current_event_ - && groups_[i].group_is_equal_to (ev)) - { - groups_[i].current_event_ = ev; - continuation_ = true; - return; - } - } + { + if (!groups_[i].current_event_ + && groups_[i].group_is_equal_to (ev)) + { + groups_[i].current_event_ = ev; + continuation_ = true; + return; + } + } } new_events_.push_back (ev); } void -Figured_bass_engraver::center_continuations (vector const &consecutive_lines) +Figured_bass_engraver::center_continuations (vector const &consecutive_lines) { - if (consecutive_lines.size () == 2) - { - vector left_figs; - for (vsize j = consecutive_lines.size (); j--;) - left_figs.push_back (consecutive_lines[j]->get_bound (LEFT)); + vector left_figs; + 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); + SCM ga = Grob_array::make_array (); + unsmob (ga)->set_array (left_figs); - for (vsize j = consecutive_lines.size (); j--;) - consecutive_lines[j]->set_object ("figures", - unsmob_grob_array (ga)->smobbed_copy ()); - } + for (vsize j = consecutive_lines.size (); j--;) + consecutive_lines[j]->set_object ("figures", + unsmob (ga)->smobbed_copy ()); } void Figured_bass_engraver::center_repeated_continuations () -{ - vector consecutive_lines; +{ + vector consecutive_lines; 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 () - == groups_[i].continuation_line_->get_bound (LEFT)->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 - { - center_continuations (consecutive_lines); - consecutive_lines.clear (); - } + && groups_[i].continuation_line_ + && (consecutive_lines.empty () + || (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 () + == groups_[i].continuation_line_->get_bound (RIGHT)->get_column ()))) + consecutive_lines.push_back (groups_[i].continuation_line_); + else + { + center_continuations (consecutive_lines); + consecutive_lines.clear (); + } } } @@ -265,20 +261,20 @@ Figured_bass_engraver::clear_spanners () if (to_boolean (get_property ("figuredBassCenterContinuations"))) center_repeated_continuations (); - + for (vsize i = 0; i < groups_.size (); i++) { if (groups_[i].group_) - { - announce_end_grob (groups_[i].group_ , SCM_EOL); - groups_[i].group_ = 0; - } - + { + announce_end_grob (groups_[i].group_, SCM_EOL); + groups_[i].group_ = 0; + } + if (groups_[i].continuation_line_) - { - announce_end_grob (groups_[i].continuation_line_ , SCM_EOL); - groups_[i].continuation_line_ = 0; - } + { + announce_end_grob (groups_[i].continuation_line_, SCM_EOL); + groups_[i].continuation_line_ = 0; + } } /* Check me, groups_.clear () ? */ @@ -290,11 +286,11 @@ Figured_bass_engraver::process_music () bool use_extenders = to_boolean (get_property ("useBassFigureExtenders")); if (alignment_ && !use_extenders) clear_spanners (); - + // If we have a rest, or we have no new or continued events, clear all spanners bool ignore_rest = to_boolean (get_property ("ignoreFiguredBassRest")); - if ((ignore_rest && have_rest_) || - (!continuation_ && new_events_.empty ())) + if ((ignore_rest && have_rest_) + || (!continuation_ && new_events_.empty ())) { clear_spanners (); groups_.clear (); @@ -303,17 +299,17 @@ Figured_bass_engraver::process_music () if (!new_event_found_) return; - + new_event_found_ = false; /* - Don't need to sync alignments, if we're not using extenders. + Don't need to sync alignments, if we're not using extenders. */ if (!use_extenders) { clear_spanners (); } - + if (!continuation_) { clear_spanners (); @@ -324,15 +320,16 @@ Figured_bass_engraver::process_music () for (vsize i = 0; i < new_events_.size (); i++) { while (k < groups_.size () - && groups_[k].current_event_) - k++; - + && groups_[k].current_event_) + k++; + if (k >= groups_.size ()) - { - Figure_group group; - groups_.push_back (group); - } - + { + Figure_group group; + groups_.push_back (group); + } + + groups_[k].reset_figure (); groups_[k].current_event_ = new_events_[i]; groups_[k].figure_item_ = 0; k++; @@ -341,75 +338,75 @@ Figured_bass_engraver::process_music () for (vsize i = 0; i < groups_.size (); i++) { if (!groups_[i].is_continuation ()) - { - groups_[i].reset_figure (); - } + { + groups_[i].reset_figure (); + } } if (use_extenders) { vector junk_continuations; for (vsize i = 0; i < groups_.size (); i++) - { - Figure_group &group = groups_[i]; - - if (group.is_continuation ()) - { - if (!group.continuation_line_) - { - Spanner * line - = make_spanner ("BassFigureContinuation", SCM_EOL); - Item * item = group.figure_item_; - group.continuation_line_ = line; - line->set_bound (LEFT, item); - - /* - Don't add as child. This will cache the wrong - (pre-break) stencil when callbacks are triggered. - */ - line->set_parent (group.group_, Y_AXIS); - Pointer_group_interface::add_grob (line, ly_symbol2scm ("figures"), item); - - group.figure_item_ = 0; - } - } - else if (group.continuation_line_) - junk_continuations.push_back (i); - } + { + Figure_group &group = groups_[i]; + + if (group.is_continuation ()) + { + if (!group.continuation_line_) + { + Spanner *line + = make_spanner ("BassFigureContinuation", SCM_EOL); + Item *item = group.figure_item_; + group.continuation_line_ = line; + line->set_bound (LEFT, item); + + /* + Don't add as child. This will cache the wrong + (pre-break) stencil when callbacks are triggered. + */ + line->set_parent (group.group_, Y_AXIS); + Pointer_group_interface::add_grob (line, ly_symbol2scm ("figures"), item); + + group.figure_item_ = 0; + } + } + else if (group.continuation_line_) + junk_continuations.push_back (i); + } /* - Ugh, repeated code. + Ugh, repeated code. */ - vector consecutive; + vector consecutive; if (to_boolean (get_property ("figuredBassCenterContinuations"))) - { - for (vsize i = 0; i <= junk_continuations.size (); i++) - { - 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 - { - center_continuations (consecutive); - consecutive.clear (); - if (i < junk_continuations.size ()) - consecutive.push_back (groups_[junk_continuations[i]].continuation_line_); - } - } - } + { + for (vsize i = 0; i <= junk_continuations.size (); i++) + { + 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 + { + center_continuations (consecutive); + consecutive.clear (); + if (i < junk_continuations.size ()) + consecutive.push_back (groups_[junk_continuations[i]].continuation_line_); + } + } + } for (vsize i = 0; i < junk_continuations.size (); i++) - groups_[junk_continuations[i]].continuation_line_ = 0; + groups_[junk_continuations[i]].continuation_line_ = 0; } - + create_grobs (); add_brackets (); } void -Figured_bass_engraver::create_grobs () +Figured_bass_engraver::create_grobs () { Grob *muscol - = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); + = unsmob (get_property ("currentMusicalColumn")); if (!alignment_) { alignment_ = make_spanner ("BassFigureAlignment", SCM_EOL); @@ -421,50 +418,54 @@ Figured_bass_engraver::create_grobs () for (vsize i = 0; i < groups_.size (); i++) { Figure_group &group = groups_[i]; - + if (group.current_event_) - { - Item *item - = make_item ("BassFigure", group.current_event_->self_scm ()); - group.assign_from_event (group.current_event_, item); - - if (!group.group_) - { - group.group_ = make_spanner ("BassFigureLine", SCM_EOL); - group.group_->set_bound (LEFT, muscol); - Align_interface::add_element (alignment_, group.group_); - } - - if (scm_memq (group.number_, get_property ("implicitBassFigures")) != SCM_BOOL_F) - { - item->set_property ("transparent", SCM_BOOL_T); - item->set_property ("implicit", SCM_BOOL_T); - } - - SCM text = group.text_; - if (!Text_interface::is_markup (text) - && ly_is_procedure (proc)) - { - text = scm_call_3 (proc, group.number_, group.current_event_->self_scm (), - context ()->self_scm ()); - } - - item->set_property ("text", text); - - Axis_group_interface::add_element (group.group_, item); - } + { + Item *item + = make_item ("BassFigure", group.current_event_->self_scm ()); + group.assign_from_event (group.current_event_, item); + + if (!group.group_) + { + group.group_ = make_spanner ("BassFigureLine", SCM_EOL); + group.group_->set_bound (LEFT, muscol); + Align_interface::add_element (alignment_, group.group_); + } + + if (scm_is_true (scm_memq (group.number_, get_property ("implicitBassFigures")))) + { + item->set_property ("transparent", SCM_BOOL_T); + item->set_property ("implicit", SCM_BOOL_T); + } + + SCM text = group.text_; + if (!Text_interface::is_markup (text) + && ly_is_procedure (proc)) + { + text = scm_call_3 (proc, group.number_, group.current_event_->self_scm (), + context ()->self_scm ()); + } + + item->set_property ("text", text); + + Axis_group_interface::add_element (group.group_, item); + } if (group.continuation_line_) - { - /* - UGH should connect to the bass staff, and get the note heads. - */ - group.figure_item_->set_property ("transparent", SCM_BOOL_T); - group.continuation_line_->set_bound (RIGHT, group.figure_item_); - } - + { + /* + UGH should connect to the bass staff, and get the note heads. + For now, simply set the hidden figure to a default value to + ensure the extenders of different figures always end at the same + position, e.g. in <12 5> <12 5> + */ + group.figure_item_->set_property ("transparent", SCM_BOOL_T); + group.figure_item_->set_property ("text", ly_string2scm ("0")); + group.continuation_line_->set_bound (RIGHT, group.figure_item_); + } + if (groups_[i].group_) - groups_[i].group_->set_bound (RIGHT, muscol); + groups_[i].group_->set_bound (RIGHT, muscol); } @@ -473,54 +474,61 @@ Figured_bass_engraver::create_grobs () void Figured_bass_engraver::add_brackets () { - vector encompass; + vector encompass; bool inside = false; - for (vsize i = 0; i < groups_.size (); i ++) + for (vsize i = 0; i < groups_.size (); i++) { if (!groups_[i].current_event_) - continue; + continue; if (to_boolean (groups_[i].current_event_->get_property ("bracket-start"))) - inside = true; + inside = true; if (inside && groups_[i].figure_item_) - encompass.push_back (groups_[i].figure_item_); - - if (to_boolean (groups_[i].current_event_->get_property ("bracket-stop"))) - { - inside = false; - - 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, - ly_symbol2scm ("elements"), - encompass[j]); - } - encompass.clear (); - } + encompass.push_back (groups_[i].figure_item_); + + if (to_boolean (groups_[i].current_event_->get_property ("bracket-stop"))) + { + inside = false; + + 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, + ly_symbol2scm ("elements"), + encompass[j]); + } + encompass.clear (); + } } } +void +Figured_bass_engraver::boot () +{ + ADD_LISTENER (Figured_bass_engraver, rest); + ADD_LISTENER (Figured_bass_engraver, bass_figure); +} + ADD_TRANSLATOR (Figured_bass_engraver, - /* doc */ - "Make figured bass numbers.", - - /* create */ - "BassFigure " - "BassFigureAlignment " - "BassFigureBracket " - "BassFigureContinuation " - "BassFigureLine ", - - /* read */ - "figuredBassAlterationDirection " - "figuredBassCenterContinuations " - "figuredBassFormatter " - "implicitBassFigures " - "useBassFigureExtenders " - "ignoreFiguredBassRest ", - - /* write */ - "" - ); + /* doc */ + "Make figured bass numbers.", + + /* create */ + "BassFigure " + "BassFigureAlignment " + "BassFigureBracket " + "BassFigureContinuation " + "BassFigureLine ", + + /* read */ + "figuredBassAlterationDirection " + "figuredBassCenterContinuations " + "figuredBassFormatter " + "implicitBassFigures " + "useBassFigureExtenders " + "ignoreFiguredBassRest ", + + /* write */ + "" + );