X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=0def5924387545095930e882480fe61d0004c382;hb=1a4e4afd05f01d8b8a872eec876ce49b0639c015;hp=ef3576f881d273694f525a2472376ddd6b9f1b42;hpb=3b3e161088f1a4be942e67729d0f89f0e8d31c51;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index ef3576f881..0def592438 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,9 +3,9 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ -#include "debug.hh" +#include "warn.hh" #include "dimensions.hh" #include "hairpin.hh" #include "musical-request.hh" @@ -18,7 +18,7 @@ #include "directional-element-interface.hh" #include "translator-group.hh" #include "axis-group-interface.hh" - +#include "script.hh" /* TODO: @@ -56,21 +56,18 @@ class Dynamic_engraver : public Engraver void typeset_all (); -public: - VIRTUAL_COPY_CONS(Translator); - Dynamic_engraver (); +TRANSLATOR_DECLARATIONS(Dynamic_engraver ); protected: virtual void finalize (); virtual void acknowledge_grob (Grob_info); virtual bool try_music (Music *req_l); virtual void stop_translation_timestep (); - - virtual void create_grobs (); + virtual void process_music (); virtual void start_translation_timestep (); }; -ADD_THIS_TRANSLATOR (Dynamic_engraver); + Dynamic_engraver::Dynamic_engraver () @@ -111,9 +108,13 @@ Dynamic_engraver::try_music (Music * m) { accepted_spanreqs_drul_[LEFT] = 0; accepted_spanreqs_drul_[RIGHT] = 0; - if (line_spanner_) - line_spanner_->suicide (); - line_spanner_ = 0; + /* + Let's not kill the line spanner, since that would fuck up + earlier, not-to-be-terminated stuff. + + It will disappear by itself when stop_translation_timestep + () finds that there is nothing to support anymore. */ + if (cresc_p_) cresc_p_->suicide (); cresc_p_ = 0; @@ -121,7 +122,7 @@ Dynamic_engraver::try_music (Music * m) else if (t == "crescendo" || t == "decrescendo") { - accepted_spanreqs_drul_[s->get_span_dir()] = s; + accepted_spanreqs_drul_[s->get_span_dir ()] = s; return true; } } @@ -129,7 +130,7 @@ Dynamic_engraver::try_music (Music * m) } void -Dynamic_engraver::create_grobs () +Dynamic_engraver::process_music () { if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_) { @@ -137,27 +138,21 @@ Dynamic_engraver::create_grobs () { line_spanner_ = new Spanner (get_property ("DynamicLineSpanner")); - Side_position::set_axis (line_spanner_, Y_AXIS); - Axis_group_interface::set_interface (line_spanner_); - Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS); - Music * rq = accepted_spanreqs_drul_[START]; if (script_req_l_) rq = script_req_l_ ; - announce_grob (line_spanner_, rq); - - + announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL); } } - /* - During a (de)crescendo, pending request will not be cleared, - and a line-spanner will always be created, as \< \! are already - two requests. + /* + During a (de)crescendo, pending request will not be cleared, + and a line-spanner will always be created, as \< \! are already + two requests. - Note: line-spanner must always have at least same duration - as (de)crecsendo, b.o. line-breaking. - */ + Note: line-spanner must always have at least same duration + as (de)crecsendo, b.o. line-breaking. + */ @@ -171,15 +166,12 @@ Dynamic_engraver::create_grobs () script_p_->set_grob_property ("text", script_req_l_->get_mus_property ("text")); - Side_position::set_direction (script_p_, LEFT); - Side_position::set_axis (script_p_, X_AXIS); - if (Direction d = script_req_l_->get_direction ()) Directional_element_interface::set (line_spanner_, d); Axis_group_interface::add_element (line_spanner_, script_p_); - announce_grob (script_p_, script_req_l_); + announce_grob(script_p_, script_req_l_->self_scm()); } if (accepted_spanreqs_drul_[STOP]) @@ -187,13 +179,12 @@ Dynamic_engraver::create_grobs () /* finish side position alignment if the (de)cresc ends here, and there are no new dynamics. - - */ + */ - if ( !cresc_p_) + if (!cresc_p_) { accepted_spanreqs_drul_[STOP]->origin ()->warning - (_ ("can't find start of (de)crescendo")); + (_ ("can't find start of (de)crescendo")); accepted_spanreqs_drul_[STOP] = 0; } else @@ -203,20 +194,25 @@ Dynamic_engraver::create_grobs () cresc_p_->set_bound (RIGHT, script_p_ ? script_p_ : unsmob_grob (get_property ("currentMusicalColumn"))); + add_bound_item (line_spanner_, cresc_p_->get_bound (RIGHT)); + finished_cresc_p_ = cresc_p_; cresc_p_ = 0; current_cresc_req_ = 0; } } + if (accepted_spanreqs_drul_[START]) { if (current_cresc_req_) { - accepted_spanreqs_drul_[START]->origin ()->warning - (current_cresc_req_->get_span_dir() == 1 - ? _ ("already have a crescendo") - : _ ("already have a decrescendo")); + String msg = current_cresc_req_->get_span_dir () == 1 + ? _ ("already have a crescendo") + : _ ("already have a decrescendo"); + + accepted_spanreqs_drul_[START]->origin ()->warning (msg); + current_cresc_req_->origin ()->warning (_("Cresc started here")); } else { @@ -224,41 +220,43 @@ Dynamic_engraver::create_grobs () /* TODO: Use symbols. - */ + */ String start_type = ly_scm2string (accepted_spanreqs_drul_[START]->get_mus_property ("span-type")); /* ugh. Use push/pop? - */ - SCM s = get_property ((start_type + "Spanner").ch_C()); + */ + SCM s = get_property ((start_type + "Spanner").ch_C ()); if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin")) { cresc_p_ = new Spanner (get_property ("Hairpin")); cresc_p_->set_grob_property ("grow-direction", - gh_int2scm ((start_type == "crescendo") - ? BIGGER : SMALLER)); + gh_int2scm ((start_type == "crescendo") + ? BIGGER : SMALLER)); } /* This is a convenient (and legacy) interface to TextSpanners for use in (de)crescendi. Hmm. - */ + */ else { cresc_p_ = new Spanner (get_property ("TextSpanner")); cresc_p_->set_grob_property ("type", s); - - daddy_trans_l_->set_property (start_type - + "Spanner", SCM_UNDEFINED); - s = get_property ((start_type + "Text").ch_C()); - if (gh_string_p (s)) + daddy_trans_l_->set_property ((start_type + + "Spanner").ch_C(), SCM_UNDEFINED); + s = get_property ((start_type + "Text").ch_C ()); + /* + FIXME: use markup_p () to check type. + */ + if (gh_string_p (s) || gh_pair_p (s)) { cresc_p_->set_grob_property ("edge-text", - gh_cons (s, ly_str02scm (""))); - daddy_trans_l_->set_property (start_type + "Text", - SCM_UNDEFINED); + gh_cons (s, ly_str02scm (""))); + daddy_trans_l_->set_property ((start_type + "Text").ch_C(), + SCM_EOL); } } @@ -267,30 +265,43 @@ Dynamic_engraver::create_grobs () : unsmob_grob (get_property ("currentMusicalColumn"))); Axis_group_interface::add_element (line_spanner_, cresc_p_); - announce_grob (cresc_p_, accepted_spanreqs_drul_[START]); + + add_bound_item (line_spanner_, cresc_p_->get_bound (LEFT)); + + announce_grob(cresc_p_, accepted_spanreqs_drul_[START]->self_scm()); } } - script_req_l_ = 0; - accepted_spanreqs_drul_[START] = 0; - accepted_spanreqs_drul_[STOP] = 0; } void Dynamic_engraver::stop_translation_timestep () { typeset_all (); + if (!current_cresc_req_) + { + finished_line_spanner_ = line_spanner_; + line_spanner_ =0; + typeset_all (); + } } void Dynamic_engraver::finalize () { typeset_all (); + + if (line_spanner_ + && !line_spanner_->live()) + line_spanner_ = 0; if (line_spanner_) { finished_line_spanner_ = line_spanner_; typeset_all (); } + if (cresc_p_ + && !cresc_p_->live()) + cresc_p_ = 0; if (cresc_p_) { current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo")); @@ -302,13 +313,31 @@ Dynamic_engraver::finalize () void Dynamic_engraver::typeset_all () { + /* + remove suicided spanners, + ugh: we'll need this for every spanner, beam, slur + Hmm, how to do this, cleanly? + Maybe just check at typeset_grob ()? + */ + if (finished_cresc_p_ + && !finished_cresc_p_->live()) + finished_cresc_p_ = 0; + if (finished_line_spanner_ + && !finished_line_spanner_->live()) + finished_line_spanner_ = 0; + if (finished_cresc_p_) { -#if 1 - finished_cresc_p_->set_bound (RIGHT, script_p_ - ? script_p_ - : unsmob_grob (get_property ("currentMusicalColumn"))); -#endif + if (!finished_cresc_p_->get_bound (RIGHT)) + { + finished_cresc_p_->set_bound (RIGHT, script_p_ + ? script_p_ + : unsmob_grob (get_property ("currentMusicalColumn"))); + + if (finished_line_spanner_) + add_bound_item (finished_line_spanner_, + finished_cresc_p_->get_bound (RIGHT)); + } typeset_grob (finished_cresc_p_); finished_cresc_p_ =0; } @@ -320,8 +349,38 @@ Dynamic_engraver::typeset_all () } if (finished_line_spanner_) { - Side_position::add_staff_support (finished_line_spanner_); - extend_spanner_over_elements (finished_line_spanner_); + /* To make sure that this works */ + Side_position_interface::add_staff_support (finished_line_spanner_); + + /* + We used to have + + extend-spanner-over-elements (finished_line_spanner_); + + but this is rather kludgy, since finished_line_spanner_ + typically has a staff-symbol field set , extending it over the + entire staff. + + */ + + Grob * l = finished_line_spanner_->get_bound (LEFT ); + Grob * r = finished_line_spanner_->get_bound (RIGHT); + if (!r && l) + finished_line_spanner_->set_bound (RIGHT, l); + else if (!l && r) + finished_line_spanner_->set_bound (LEFT, r); + else if (!r && !l) + { + /* + This is a isolated dynamic apparently, and does not even have + any interesting support item. + */ + Grob * cc = unsmob_grob (get_property ("currentMusicalColumn")); + Item * ci = dynamic_cast(cc); + finished_line_spanner_->set_bound (RIGHT, ci); + finished_line_spanner_->set_bound (LEFT, ci); + } + typeset_grob (finished_line_spanner_); finished_line_spanner_ = 0; } @@ -330,12 +389,45 @@ Dynamic_engraver::typeset_all () void Dynamic_engraver::acknowledge_grob (Grob_info i) { - if (Note_column::has_interface (i.elem_l_)) + if (!line_spanner_) + return ; + + if (Note_column::has_interface (i.grob_l_)) { - if (line_spanner_) + if (line_spanner_ + /* Don't refill killed spanner */ + && line_spanner_->live()) + { + Side_position_interface::add_support (line_spanner_,i.grob_l_); + add_bound_item (line_spanner_,dynamic_cast (i.grob_l_)); + } + + if (script_p_ && !script_p_->get_parent (X_AXIS)) { - Side_position::add_support (line_spanner_,i.elem_l_); - add_bound_item (line_spanner_,dynamic_cast(i.elem_l_)); + script_p_->set_parent (i.grob_l_, X_AXIS); } + + } + else if (Script_interface::has_interface (i.grob_l_) && script_p_) + { + SCM p = i.grob_l_->get_grob_property ("script-priority"); + + if (gh_number_p (p) + && gh_scm2int (p) < gh_scm2int (script_p_->get_grob_property ("script-priority"))) + { + Side_position_interface::add_support (line_spanner_, i.grob_l_); + + } } } +ENTER_DESCRIPTION(Dynamic_engraver, +/* descr */ " +This engraver creates hairpins, dynamic texts, and their vertical +alignments. The symbols are collected onto a DynamicLineSpanner grob +which takes care of vertical positioning. +", + +/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner", +/* acks */ "note-column-interface script-interface", +/* reads */ "", +/* write */ "");