X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=14522c6376190c9ca84817d96af2a41b585d2844;hb=0e48c075bce7d60693c5324dab175a650d477f0a;hp=50cde13ea3b2833a26c290a5851e09570c70eb65;hpb=3b2883eac4e40ebab564cb47fd446c3d31063bff;p=lilypond.git diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 50cde13ea3..14522c6376 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -1,13 +1,25 @@ /* - dynamic-engraver.cc -- implement Dynamic_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2006 Han-Wen Nienhuys + 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 "axis-group-interface.hh" #include "context.hh" +#include "engraver.hh" #include "dimensions.hh" #include "directional-element-interface.hh" #include "engraver.hh" @@ -23,6 +35,8 @@ #include "staff-symbol-referencer.hh" #include "stream-event.hh" #include "warn.hh" +#include "spanner.hh" +#include "text-interface.hh" #include "translator.icc" @@ -62,11 +76,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (script); - DECLARE_ACKNOWLEDGER (stem_tremolo); DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); DECLARE_TRANSLATOR_LISTENER (span_dynamic); @@ -178,12 +188,13 @@ Dynamic_engraver::process_music () } finished_cresc_ = cresc_; + announce_end_grob (finished_cresc_, SCM_EOL); cresc_ = 0; current_cresc_ev_ = 0; } else if (accepted_spanevents_drul_[STOP]) { - accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); + accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo")); stop_ev = 0; } } @@ -254,17 +265,23 @@ Dynamic_engraver::process_music () cresc_->set_property ("style", s); context ()->set_property ((start_type + "Spanner").c_str (), SCM_EOL); - s = get_property ((start_type + "Text").c_str ()); - /* - FIXME: use get_markup () to check type. - */ - if (scm_is_string (s) || scm_is_pair (s)) + s = get_property ((start_type + "Text").c_str ()); + if (Text_interface::is_markup (s)) { - cresc_->set_property ("edge-text", - scm_cons (s, scm_makfrom0str (""))); + cresc_->set_property ("text", s); context ()->set_property ((start_type + "Text").c_str (), SCM_EOL); } + + if (script_) + { + set_nested_property (cresc_, + scm_list_3 (ly_symbol2scm ("bound-details"), + ly_symbol2scm ("left"), + ly_symbol2scm ("attach-dir") + ), + scm_from_int (RIGHT)); + } } if (script_) @@ -272,7 +289,6 @@ Dynamic_engraver::process_music () cresc_->set_bound (LEFT, script_); add_bound_item (line_spanner_, cresc_->get_bound (LEFT)); } - Axis_group_interface::add_element (line_spanner_, cresc_); } } @@ -331,18 +347,11 @@ Dynamic_engraver::typeset_all () { if (finished_cresc_) { - bool use_bar = to_boolean (get_property ("hairpinToBarline")) - && scm_is_string (get_property ("whichBar")) - && !script_ev_; - - - if (!finished_cresc_->get_bound (RIGHT) - || use_bar) + if (!finished_cresc_->get_bound (RIGHT)) { - Grob *column_bound = unsmob_grob (use_bar - ? get_property ("currentCommandColumn") - : get_property ("currentMusicalColumn")); - + + Grob *column_bound = unsmob_grob (get_property ("currentMusicalColumn")); + finished_cresc_->set_bound (RIGHT, script_ ? script_ : column_bound); @@ -385,36 +394,10 @@ Dynamic_engraver::typeset_all () finished_line_spanner_->set_bound (RIGHT, ci); finished_line_spanner_->set_bound (LEFT, ci); } - finished_line_spanner_ = 0; } } - -void -Dynamic_engraver::acknowledge_accidental (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - -void -Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - -void -Dynamic_engraver::acknowledge_slur (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - - void Dynamic_engraver::acknowledge_note_column (Grob_info info) { @@ -453,42 +436,24 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info) finished_cresc_->set_bound (RIGHT, info.grob ()); } -void -Dynamic_engraver::acknowledge_script (Grob_info info) -{ - if (!line_spanner_ || !script_) - return; - - SCM p = info.grob ()->get_property ("script-priority"); - - /* - UGH. - - DynamicText doesn't really have a script-priority field. - */ - if (scm_is_number (p) - && scm_to_int (p) - < scm_to_int (script_->get_property ("script-priority"))) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - -ADD_ACKNOWLEDGER (Dynamic_engraver, accidental); -ADD_ACKNOWLEDGER (Dynamic_engraver, script); ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); -ADD_ACKNOWLEDGER (Dynamic_engraver, slur); -ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo); ADD_TRANSLATOR (Dynamic_engraver, /* doc */ - "This engraver creates hairpins, dynamic texts, and their vertical\n" - "alignments. The symbols are collected onto a DynamicLineSpanner grob\n" - "which takes care of vertical positioning. ", + "Create hairpins, dynamic texts, and their vertical" + " alignments. The symbols are collected onto a" + " @code{DynamicLineSpanner} grob which takes care of vertical" + " positioning.", /* create */ "DynamicLineSpanner " + "DynamicTextSpanner " "DynamicText " - "Hairpin " - "TextSpanner ", + "Hairpin ", + + /* read */ + "", - /* read */ "", - /* write */ ""); + /* write */ + "" + );