X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=8b476249312a452717e9a73b17f8a25d7a2f386f;hb=78fab0cd2b9f3f568e9b97b313e33f28d7077223;hp=79377e0176ae57ad60d9b3c5f869cfef4efcc0d1;hpb=243db47a88df9240a66bde37356b43aaeb41260d;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 79377e0176..8b47624931 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "warn.hh" #include "dimensions.hh" @@ -16,7 +16,7 @@ #include "engraver.hh" #include "group-interface.hh" #include "directional-element-interface.hh" -#include "translator-group.hh" +#include "context.hh" #include "axis-group-interface.hh" #include "script.hh" @@ -56,7 +56,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); -TRANSLATOR_DECLARATIONS(Dynamic_engraver ); + TRANSLATOR_DECLARATIONS (Dynamic_engraver); protected: virtual void finalize (); @@ -94,25 +94,10 @@ Dynamic_engraver::try_music (Music * m) script_ev_ = m; return true; } - else if (m->is_mus_type ("abort-event")) - { - accepted_spanreqs_drul_[LEFT] = 0; - accepted_spanreqs_drul_[RIGHT] = 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_) - cresc_->suicide (); - cresc_ = 0; - } else if (m->is_mus_type ("decrescendo-event") || m->is_mus_type ("crescendo-event")) { - Direction d = to_dir (m->get_mus_property ("span-direction")); + Direction d = to_dir (m->get_property ("span-direction")); accepted_spanreqs_drul_[d] = m; if (current_cresc_ev_ && d == START) @@ -129,12 +114,11 @@ Dynamic_engraver::process_music () { if (!line_spanner_) { - line_spanner_ = make_spanner ("DynamicLineSpanner"); - Music * rq = accepted_spanreqs_drul_[START]; + line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm (): SCM_EOL ); + if (script_ev_) - rq = script_ev_ ; - announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL); + rq = script_ev_; } } @@ -155,17 +139,16 @@ Dynamic_engraver::process_music () */ if (script_ev_) { - script_ = make_item ("DynamicText"); - script_->set_grob_property ("text", - script_ev_->get_mus_property ("text")); + script_ = make_item ("DynamicText", script_ev_->self_scm ()); + script_->set_property ("text", + script_ev_->get_property ("text")); - if (Direction d = to_dir (script_ev_->get_mus_property ("direction"))) + if (Direction d = to_dir (script_ev_->get_property ("direction"))) set_grob_direction (line_spanner_, d); Axis_group_interface::add_element (line_spanner_, script_); - announce_grob(script_, script_ev_->self_scm()); } Music *stop_ev = accepted_spanreqs_drul_ [STOP] ? @@ -193,9 +176,9 @@ Dynamic_engraver::process_music () cresc_ = 0; current_cresc_ev_ = 0; } - else if (accepted_spanreqs_drul_[STOP] ) + else if (accepted_spanreqs_drul_[STOP]) { - accepted_spanreqs_drul_[STOP]->origin ()->warning(_ ("can't find start of (de)crescendo")); + accepted_spanreqs_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); stop_ev = 0; } @@ -205,11 +188,10 @@ Dynamic_engraver::process_music () { if (current_cresc_ev_) { - Direction sd = to_dir (current_cresc_ev_->get_mus_property ("span-direction")); - String msg = sd == 1 - ? _ ("already have a crescendo") - : _ ("already have a decrescendo"); - + String msg = _ ("already have a decrescendo"); + if (current_cresc_ev_->is_mus_type ("decrescendo-event")) + msg = _ ("already have a crescendo"); + accepted_spanreqs_drul_[START]->origin ()->warning (msg); current_cresc_ev_->origin ()->warning (_("Cresc started here")); } @@ -217,7 +199,7 @@ Dynamic_engraver::process_music () { current_cresc_ev_ = accepted_spanreqs_drul_[START]; - if (Direction d = to_dir (current_cresc_ev_->get_mus_property ("direction"))) + if (Direction d = to_dir (current_cresc_ev_->get_property ("direction"))) set_grob_direction (line_spanner_, d); /* @@ -225,7 +207,7 @@ Dynamic_engraver::process_music () */ String start_type = - ly_symbol2string (current_cresc_ev_->get_mus_property ("name")); + ly_symbol2string (current_cresc_ev_->get_property ("name")); /* ugh. Use push/pop? @@ -236,11 +218,11 @@ Dynamic_engraver::process_music () start_type = "crescendo"; SCM s = get_property ((start_type + "Spanner").to_str0 ()); - if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin")) + if (!ly_c_symbol_p (s) || s == ly_symbol2scm ("hairpin")) { - cresc_ = make_spanner ("Hairpin"); - cresc_->set_grob_property ("grow-direction", - gh_int2scm ((start_type == "crescendo") + cresc_ = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ()); + cresc_->set_property ("grow-direction", + scm_int2num ((start_type == "crescendo") ? BIGGER : SMALLER)); } @@ -253,19 +235,19 @@ Dynamic_engraver::process_music () */ else { - cresc_ = make_spanner ("TextSpanner"); - cresc_->set_grob_property ("style", s); - daddy_trans_->set_property ((start_type + cresc_ = make_spanner ("TextSpanner", accepted_spanreqs_drul_[START]->self_scm ()); + cresc_->set_property ("style", s); + context ()->set_property ((start_type + "Spanner").to_str0 (), SCM_EOL); s = get_property ((start_type + "Text").to_str0 ()); /* FIXME: use get_markup () to check type. */ - if (gh_string_p (s) || gh_pair_p (s)) + if (ly_c_string_p (s) || ly_c_pair_p (s)) { - cresc_->set_grob_property ("edge-text", - gh_cons (s, scm_makfrom0str (""))); - daddy_trans_->set_property ((start_type + "Text").to_str0 (), + cresc_->set_property ("edge-text", + scm_cons (s, scm_makfrom0str (""))); + context ()->set_property ((start_type + "Text").to_str0 (), SCM_EOL); } } @@ -278,7 +260,6 @@ Dynamic_engraver::process_music () add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); - announce_grob(cresc_, accepted_spanreqs_drul_[START]->self_scm()); } } } @@ -305,7 +286,7 @@ Dynamic_engraver::finalize () typeset_all (); if (line_spanner_ - && !line_spanner_->live()) + && !line_spanner_->is_live ()) line_spanner_ = 0; if (line_spanner_) { @@ -314,7 +295,7 @@ Dynamic_engraver::finalize () } if (cresc_ - && !cresc_->live()) + && !cresc_->is_live ()) cresc_ = 0; if (cresc_) { @@ -334,10 +315,10 @@ Dynamic_engraver::typeset_all () Maybe just check at typeset_grob ()? */ if (finished_cresc_ - && !finished_cresc_->live()) + && !finished_cresc_->is_live ()) finished_cresc_ = 0; if (finished_line_spanner_ - && !finished_line_spanner_->live()) + && !finished_line_spanner_->is_live ()) finished_line_spanner_ = 0; if (finished_cresc_) @@ -352,20 +333,12 @@ Dynamic_engraver::typeset_all () add_bound_item (finished_line_spanner_, finished_cresc_->get_bound (RIGHT)); } - typeset_grob (finished_cresc_); finished_cresc_ =0; } - if (script_) - { - typeset_grob (script_); script_ = 0; - } if (finished_line_spanner_) { - /* To make sure that this works */ - Side_position_interface::add_staff_support (finished_line_spanner_); - /* We used to have @@ -395,7 +368,6 @@ Dynamic_engraver::typeset_all () finished_line_spanner_->set_bound (LEFT, ci); } - typeset_grob (finished_line_spanner_); finished_line_spanner_ = 0; } } @@ -410,7 +382,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info i) { if (line_spanner_ /* Don't refill killed spanner */ - && line_spanner_->live()) + && line_spanner_->is_live ()) { Side_position_interface::add_support (line_spanner_,i.grob_); add_bound_item (line_spanner_,dynamic_cast (i.grob_)); @@ -418,28 +390,30 @@ Dynamic_engraver::acknowledge_grob (Grob_info i) if (script_ && !script_->get_parent (X_AXIS)) { - script_->set_parent (i.grob_, X_AXIS); + SCM head = scm_last_pair (i.grob_->get_property ("note-heads")); + if (ly_c_pair_p (head)) + script_->set_parent (unsmob_grob (ly_car (head)), X_AXIS); } } else if (Script_interface::has_interface (i.grob_) && script_) { - SCM p = i.grob_->get_grob_property ("script-priority"); + SCM p = i.grob_->get_property ("script-priority"); /* UGH. DynamicText doesn't really have a script-priority field. */ - if (gh_number_p (p) - && gh_scm2int (p) < gh_scm2int (script_->get_grob_property ("script-priority"))) + if (ly_c_number_p (p) + && ly_scm2int (p) < ly_scm2int (script_->get_property ("script-priority"))) { Side_position_interface::add_support (line_spanner_, i.grob_); } } } -ENTER_DESCRIPTION(Dynamic_engraver, +ENTER_DESCRIPTION (Dynamic_engraver, /* descr */ "This engraver creates hairpins, dynamic texts, and their vertical\n" "alignments. The symbols are collected onto a DynamicLineSpanner grob\n"