source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
#include "dimensions.hh"
-#include "crescendo.hh"
+#include "hairpin.hh"
#include "musical-request.hh"
-#include "lookup.hh"
-#include "paper-def.hh"
#include "paper-column.hh"
-#include "staff-symbol.hh"
#include "note-column.hh"
-#include "text-item.hh"
+#include "item.hh"
#include "side-position-interface.hh"
#include "engraver.hh"
-#include "stem.hh"
-#include "note-head.hh"
#include "group-interface.hh"
#include "directional-element-interface.hh"
-#include "staff-symbol-referencer.hh"
+#include "translator-group.hh"
+#include "axis-group-interface.hh"
-#define DYN_LINE
-
-#ifdef DYN_LINE
-
-class Dynamic_line_spanner : public Spanner
-{
-public:
- Dynamic_line_spanner ();
-
- void add_element (Score_element*);
- void add_column (Note_column*);
- Direction get_default_dir () const;
-
-protected:
- virtual void do_add_processing ();
- // URG: see Dynamic_engraver::do_removal_processing
- friend class Dynamic_engraver;
- virtual void do_post_processing ();
-
-private:
- void translate_elements (Real);
- Real get_extreme_y () const;
-};
-
-Dynamic_line_spanner::Dynamic_line_spanner ()
-{
- set_elt_property ("transparent", SCM_BOOL_T);
-}
-
-void
-Dynamic_line_spanner::add_element (Score_element* e)
-{
- Group_interface gi (this, "elements");
- gi.add_element (e);
- //?
- Side_position_interface (e).set_axis (Y_AXIS);
- add_dependency (e);
-}
-
-void
-Dynamic_line_spanner::add_column (Note_column* n)
-{
- Group_interface gi (this, "note-columns");
- gi.add_element (n);
- add_dependency (n);
-}
/*
- Copied (urg: literally!) from slur.
- Why not do this once, at post-processing stage?
- */
-void
-Dynamic_line_spanner::do_add_processing ()
-{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
-
- if (encompass_arr.size ())
- {
- set_bounds (LEFT, encompass_arr[0]);
- if (encompass_arr.size () > 1)
- set_bounds (RIGHT, encompass_arr.top ());
- }
-}
-
-#if 0
-Molecule
-Dynamic_line_spanner::do_brew_molecule () const
-{
- return Molecule ();
-}
-#endif
-
-void
-Dynamic_line_spanner::do_post_processing ()
-{
- translate_elements (get_extreme_y ());
-}
-
-void
-Dynamic_line_spanner::translate_elements (Real dy)
-{
- SCM s = get_elt_property ("elements");
- for (; gh_pair_p (s); s = gh_cdr (s))
- {
- Score_element* se = unsmob_element (gh_car (s));
- se->translate_axis (dy, Y_AXIS);
- }
-}
-
-Direction
-Dynamic_line_spanner::get_default_dir () const
-{
- return DOWN;
- //Direction dir = directional_element (this).get ();
-}
-
-Real
-Dynamic_line_spanner::get_extreme_y () const
-{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
-
- Staff_symbol_referencer_interface si (this);
- int stafflines = si.line_count ();
- //hurg?
- stafflines = stafflines != 0 ? stafflines : 5;
- Direction dir = get_default_dir ();
-
- Real staff_space = si.staff_space ();
- // burp? when are these available?
- staff_space = staff_space != 0 ? staff_space : 5 PT;
-
- // urg: TODO: padding
- Real y = (stafflines / 2 + 1) * staff_space;
-
- for (int i = 0; i < encompass_arr.size (); i++)
- {
- Note_column* column = encompass_arr[i];
- Stem* stem = column->stem_l ();
- if (stem)
- {
- Direction stem_dir = directional_element (stem).get ();
- if ((stem_dir == dir)
- && !stem->extent (Y_AXIS).empty_b ())
- {
- y = y >? (stem->extent (Y_AXIS)[dir]) * dir;
- }
- else
- {
- y = y >? (column->extent (Y_AXIS)[dir]) * dir;
- }
- }
- }
+ TODO:
- return y * dir;
-}
+ * direction of text-dynamic-request if not equal to direction of
+ line-spanner
-#endif
+ - TODO: this engraver is too complicated. We should split it into
+ the handling of the basic grobs and the linespanner
-/*
- TODO:
- * why handle absolute and span requests in one cryptic engraver,
- what about Span_dynamic_engraver?
+ - TODO: the line-spanner is not killed after the (de)crescs are
+ finished.
- * hairpin
- * text:
- - `cresc. -- -- --'
- - `cresc. poco a poco -- -- --'
- */
+*/
/**
print text & hairpin dynamics.
*/
class Dynamic_engraver : public Engraver
{
- Text_item * abs_text_p_;
- Text_item * cr_text_p_;
- Crescendo * to_end_cresc_p_;
- Crescendo * cresc_p_;
-
- Span_req * cresc_req_l_;
- Array<Request*> dynamic_req_l_arr_;
+ Item * script_p_;
+ Spanner * finished_cresc_p_;
+ Spanner * cresc_p_;
-#ifdef DYN_LINE
- /*
- We probably need two of these: line-up above and below staff
- */
- Dynamic_line_spanner* spanner_;
- Moment last_request_mom_;
-#endif
+ Text_script_req* script_req_l_;
- void typeset_all ();
-public:
- VIRTUAL_COPY_CONS(Translator);
- Dynamic_engraver();
+ Span_req * current_cresc_req_;
+ Drul_array<Span_req*> accepted_spanreqs_drul_;
+
+ Spanner* line_spanner_;
+ Spanner* finished_line_spanner_;
+
+ Link_array<Note_column> pending_column_arr_;
+ Link_array<Grob> pending_element_arr_;
-protected:
+ void typeset_all ();
- void announce_element (Score_element_info);
+TRANSLATOR_DECLARATIONS(Dynamic_engraver );
- virtual void do_removal_processing ();
- virtual void acknowledge_element (Score_element_info);
- virtual bool do_try_music (Music *req_l);
- virtual void do_process_requests();
- virtual void do_pre_move_processing();
- virtual void do_post_move_processing();
- virtual void typeset_element (Score_element*);
+protected:
+ virtual void finalize ();
+ virtual void acknowledge_grob (Grob_info);
+ virtual bool try_music (Music *req_l);
+ virtual void stop_translation_timestep ();
+ virtual void process_music ();
+ virtual void start_translation_timestep ();
};
-ADD_THIS_TRANSLATOR (Dynamic_engraver);
-void
-Dynamic_engraver::announce_element (Score_element_info i)
-{
- group (i.elem_l_, "interfaces").add_thing (ly_symbol2scm ("dynamic"));
-
- Engraver::announce_element (i);
-}
Dynamic_engraver::Dynamic_engraver ()
{
- do_post_move_processing();
- abs_text_p_ = 0;
- cr_text_p_ = 0;
- to_end_cresc_p_ = cresc_p_ = 0;
- cresc_req_l_ = 0;
-#ifdef DYN_LINE
- spanner_ = 0;
-#endif
+ script_p_ = 0;
+ finished_cresc_p_ = 0;
+ line_spanner_ = 0;
+ finished_line_spanner_ = 0;
+ current_cresc_req_ = 0;
+ cresc_p_ =0;
+
+ script_req_l_ = 0;
+ accepted_spanreqs_drul_[START] = 0;
+ accepted_spanreqs_drul_[STOP] = 0;
}
void
-Dynamic_engraver::do_post_move_processing()
+Dynamic_engraver::start_translation_timestep ()
{
- dynamic_req_l_arr_.clear();
+ script_req_l_ = 0;
+ accepted_spanreqs_drul_[START] = 0;
+ accepted_spanreqs_drul_[STOP] = 0;
}
-/*
- ugr
- */
bool
-Dynamic_engraver::do_try_music (Music * m)
+Dynamic_engraver::try_music (Music * m)
{
- Request * r = dynamic_cast<Request*> (m);
-
- if(Text_script_req * d = dynamic_cast <Text_script_req *> (r))
+ if (dynamic_cast <Text_script_req*> (m)
+ && m->get_mus_property ("text-type") == ly_symbol2scm ("dynamic"))
{
- if (d->style_str_ != "dynamic")
- return false;
+ script_req_l_ = dynamic_cast<Text_script_req*> (m);
+ return true;
}
- else if (Span_req * s = dynamic_cast <Span_req*> (r))
+ else if (Span_req* s = dynamic_cast <Span_req*> (m))
{
- if (s-> span_type_str_ != "crescendo"
- && s->span_type_str_ != "decrescendo")
- return false;
+ String t = ly_scm2string (s->get_mus_property ("span-type"));
+ if (t== "abort")
+ {
+ 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_p_)
+ cresc_p_->suicide ();
+ cresc_p_ = 0;
+ }
+ else if (t == "crescendo"
+ || t == "decrescendo")
+ {
+ accepted_spanreqs_drul_[s->get_span_dir ()] = s;
+ return true;
+ }
}
- else
- return false;
-
-#ifdef DYN_LINE
- if (!spanner_)
- spanner_ = new Dynamic_line_spanner;
- last_request_mom_ = now_mom ();
-#endif
-
- for (int i=0; i < dynamic_req_l_arr_.size (); i++)
- if (r->equal_b (dynamic_req_l_arr_[i]))
- return true;
-
- dynamic_req_l_arr_.push (r);
- return true;
+ return false;
}
-
void
-Dynamic_engraver::do_process_requests()
+Dynamic_engraver::process_music ()
{
- Crescendo* new_cresc_p=0;
-
- for (int i=0; i < dynamic_req_l_arr_.size(); i++)
+ if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_)
{
- if (Text_script_req *absd =
- dynamic_cast<Text_script_req *> ( dynamic_req_l_arr_[i]))
+ if (!line_spanner_)
{
- if (abs_text_p_)
- {
- dynamic_req_l_arr_[i]->warning (_("Got a dynamic already. Continuing dazed and confused."));
- continue;
- }
-
- String loud = absd->text_str_;
-
- abs_text_p_ = new Text_item;
- abs_text_p_->set_elt_property ("text",
- ly_str02scm (loud.ch_C()));
- abs_text_p_->set_elt_property ("style", gh_str02scm ("dynamic"));
- abs_text_p_->set_elt_property ("script-priority",
- gh_int2scm (100));
-
-#ifdef DYN_LINE
- assert (spanner_);
- spanner_->add_element (abs_text_p_);
-#else
- Side_position_interface (abs_text_p_).set_axis (Y_AXIS);
-
- if (absd->get_direction ())
- {
- abs_text_p_->set_elt_property ("direction", gh_int2scm (absd->get_direction ()));
- }
+ line_spanner_ = new Spanner (get_property ("DynamicLineSpanner"));
+ Side_position_interface::set_axis (line_spanner_, Y_AXIS);
+ Axis_group_interface::set_interface (line_spanner_);
+ Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS);
- /*
- UGH UGH
- */
- SCM prop = get_property ("dynamicDirection");
- if (!isdir_b (prop))
- {
- prop = get_property ("verticalDirection");
- }
+ Music * rq = accepted_spanreqs_drul_[START];
+ if (script_req_l_)
+ rq = script_req_l_ ;
+ announce_grob (line_spanner_, rq);
+
- if (isdir_b (prop) && to_dir (prop))
- abs_text_p_->set_elt_property ("direction", prop);
+ }
+ }
+
+ /*
+ During a (de)crescendo, pending request will not be cleared,
+ and a line-spanner will always be created, as \< \! are already
+ two requests.
- prop = get_property ("dynamicPadding");
- if (gh_number_p(prop))
- {
- abs_text_p_->set_elt_property ("padding", prop);
- }
-#endif
- announce_element (Score_element_info (abs_text_p_, absd));
+ Note: line-spanner must always have at least same duration
+ as (de)crecsendo, b.o. line-breaking.
+ */
+
+
+ /*
+ maybe we should leave dynamic texts to the text-engraver and
+ simply acknowledge them?
+ */
+ if (script_req_l_)
+ {
+ script_p_ = new Item (get_property ("DynamicText"));
+ script_p_->set_grob_property ("text",
+ script_req_l_->get_mus_property ("text"));
+
+ Side_position_interface::set_direction (script_p_, DOWN);
+
+ 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_);
+ }
+
+ if (accepted_spanreqs_drul_[STOP])
+ {
+ /*
+ finish side position alignment if the (de)cresc ends here, and
+ there are no new dynamics.
+ */
+
+ if (!cresc_p_)
+ {
+ accepted_spanreqs_drul_[STOP]->origin ()->warning
+ (_ ("can't find start of (de)crescendo"));
+ accepted_spanreqs_drul_[STOP] = 0;
}
- else if (Span_req *span_l
- = dynamic_cast <Span_req *> (dynamic_req_l_arr_[i]))
+ else
{
- if (span_l->span_dir_ == STOP)
+ assert (!finished_cresc_p_ && cresc_p_);
+
+ 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"));
+ }
+ else
+ {
+ current_cresc_req_ = accepted_spanreqs_drul_[START];
+
+ /*
+ 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 ());
+ if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
{
- if (!cresc_p_)
- {
- span_l->warning (_ ("Can't find (de)crescendo to end"));
- }
- else
- {
- assert (!to_end_cresc_p_);
- to_end_cresc_p_ =cresc_p_;
-
- cresc_p_ = 0;
- }
+ cresc_p_ = new Spanner (get_property ("Hairpin"));
+ cresc_p_->set_grob_property ("grow-direction",
+ gh_int2scm ((start_type == "crescendo")
+ ? BIGGER : SMALLER));
+
}
- else if (span_l->span_dir_ == START)
+ /*
+ This is a convenient (and legacy) interface to TextSpanners
+ for use in (de)crescendi.
+ Hmm.
+ */
+ else
{
- cresc_req_l_ = span_l;
- assert (!new_cresc_p);
- new_cresc_p = new Crescendo;
- new_cresc_p->set_elt_property
- ("grow-direction",
- gh_int2scm ((span_l->span_type_str_ == "crescendo")
- ? BIGGER : SMALLER));
+ cresc_p_ = new Spanner (get_property ("TextSpanner"));
+ cresc_p_->set_interface (ly_symbol2scm ("dynamic-interface"));
+ cresc_p_->set_grob_property ("type", s);
- SCM s = get_property (span_l->span_type_str_ + "Text");
- if (gh_string_p (s))
- {
- cr_text_p_ = new Text_item;
- cr_text_p_->set_elt_property ("text", s);
- // urg
- cr_text_p_->set_elt_property ("style", gh_str02scm ("italic"));
- // ?
- cr_text_p_->set_elt_property ("script-priority",
- gh_int2scm (100));
-
- /*
- This doesn't work.
- I'd like to have support like this:
- |
- x|
- cresc. - - -
-
- or
- |
- x|
- ff cresc. - - -
-
- */
- if (0) //abs_text_p_)
- {
- Side_position_interface (cr_text_p_).set_axis (X_AXIS);
- Side_position_interface (cr_text_p_).add_support (abs_text_p_);
- }
-
-#ifdef DYN_LINE
- assert (spanner_);
- spanner_->add_element (cr_text_p_);
-#endif
-
- //Side_position_interface (cr_text_p_).set_axis (Y_AXIS);
- announce_element (Score_element_info (cr_text_p_, span_l));
- }
-
- s = get_property (span_l->span_type_str_ + "Spanner");
- if (gh_string_p (s)) //&& ly_scm2string (s) != "hairpin")
+ 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))
{
- new_cresc_p->set_elt_property ("spanner", s);
+ cresc_p_->set_grob_property ("edge-text",
+ gh_cons (s, ly_str02scm ("")));
+ daddy_trans_l_->set_property ((start_type + "Text").ch_C(),
+ SCM_UNDEFINED);
}
-
-#ifdef DYN_LINE
- assert (spanner_);
- spanner_->add_element (new_cresc_p);
-#else
- // what's the diff between side_position and Side_pos_iface?
- side_position (new_cresc_p).set_axis (Y_AXIS);
-#endif
- announce_element (Score_element_info (new_cresc_p, span_l));
}
- }
- }
-
- if (new_cresc_p)
- {
- if (cresc_p_)
- {
- ::warning (_ ("Too many crescendi here"));
- typeset_element (cresc_p_);
+ cresc_p_->set_bound (LEFT, script_p_
+ ? script_p_
+ : unsmob_grob (get_property ("currentMusicalColumn")));
- cresc_p_ = 0;
- }
-
- cresc_p_ = new_cresc_p;
- cresc_p_->set_bounds(LEFT,get_staff_info().musical_pcol_l ());
+ Axis_group_interface::add_element (line_spanner_, cresc_p_);
- // arrragh, brr, urg: we know how wide text is, no?
- if (abs_text_p_)
- {
- index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"),
- LEFT, SCM_BOOL_T);
- if (to_end_cresc_p_)
- index_set_cell (to_end_cresc_p_->get_elt_property ("dynamic-drul"),
- RIGHT, SCM_BOOL_T);
+ add_bound_item (line_spanner_, cresc_p_->get_bound (LEFT));
+
+ announce_grob (cresc_p_, accepted_spanreqs_drul_[START]);
}
}
-
}
void
-Dynamic_engraver::do_pre_move_processing()
+Dynamic_engraver::stop_translation_timestep ()
{
typeset_all ();
+ if (script_req_l_ && !current_cresc_req_)
+ {
+ finished_line_spanner_ = line_spanner_;
+ line_spanner_ =0;
+ typeset_all ();
+ }
}
void
-Dynamic_engraver::do_removal_processing ()
+Dynamic_engraver::finalize ()
{
- if (cresc_p_)
+ typeset_all ();
+
+ if (line_spanner_
+ && line_spanner_->immutable_property_alist_ == SCM_EOL)
+ line_spanner_ = 0;
+ if (line_spanner_)
{
- typeset_element (cresc_p_ );
- cresc_req_l_->warning (_ ("unended crescendo"));
- cresc_p_ =0;
+ finished_line_spanner_ = line_spanner_;
+ typeset_all ();
}
-#ifdef DYN_LINE
- if (spanner_)
+
+ if (cresc_p_
+ && cresc_p_->immutable_property_alist_ == SCM_EOL)
+ cresc_p_ = 0;
+ if (cresc_p_)
{
- // URG urg. We did't get a post_processing call !?
- spanner_->do_post_processing ();
- typeset_element (spanner_);
- spanner_ = 0;
+ current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo"));
+ cresc_p_->suicide ();
+ cresc_p_ = 0;
}
-#endif
- typeset_all ();
}
-
void
Dynamic_engraver::typeset_all ()
{
- if (to_end_cresc_p_)
+ /*
+ 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_->immutable_property_alist_ == SCM_EOL)
+ finished_cresc_p_ = 0;
+ if (finished_line_spanner_
+ && finished_line_spanner_->immutable_property_alist_ == SCM_EOL)
+ finished_line_spanner_ = 0;
+
+ if (finished_cresc_p_)
{
- to_end_cresc_p_->set_bounds(RIGHT,get_staff_info().musical_pcol_l ());
- typeset_element (to_end_cresc_p_);
-
- to_end_cresc_p_ =0;
+ 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;
}
- if (abs_text_p_)
- {
- typeset_element (abs_text_p_);
- abs_text_p_ = 0;
- }
-
- if (cr_text_p_)
- {
- typeset_element (cr_text_p_);
- cr_text_p_ = 0;
- }
-#ifdef DYN_LINE
- /*
- TODO: This should be optionised:
- * break when group of dynamic requests ends
- * break now
- * continue through piece
- */
- if (spanner_ && last_request_mom_ < now_mom ())
+ if (script_p_)
{
- typeset_element (spanner_);
- spanner_ = 0;
+ typeset_grob (script_p_);
+ script_p_ = 0;
}
-#endif
-}
-
-void
-Dynamic_engraver::typeset_element (Score_element * e)
-{
-#ifndef DYN_LINE
- side_position(e).add_staff_support ();
-#endif
- Engraver::typeset_element (e);
-}
-
-#ifdef DYN_LINE
-
-void
-Dynamic_engraver::acknowledge_element (Score_element_info i)
-{
- if (spanner_)
+ if (finished_line_spanner_)
{
- if (Note_column* n = dynamic_cast<Note_column*> (i.elem_l_))
- spanner_->add_column (n);
+ /* 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<Item*>(cc);
+ finished_line_spanner_->set_bound (RIGHT, ci);
+ finished_line_spanner_->set_bound (LEFT, ci);
+ }
+
+ typeset_grob (finished_line_spanner_);
+ finished_line_spanner_ = 0;
}
}
-#else
-
void
-Dynamic_engraver::acknowledge_element (Score_element_info i)
+Dynamic_engraver::acknowledge_grob (Grob_info i)
{
- if (dynamic_cast<Stem *> (i.elem_l_)
- || dynamic_cast<Note_head *> (i.elem_l_)
- )
+ if (Note_column::has_interface (i.grob_l_))
{
- if (abs_text_p_)
- Side_position_interface (abs_text_p_).add_support (i.elem_l_);
-
- if (cr_text_p_) ///&& !abs_text_p_)
+ if (line_spanner_
+ /* Don't refill killed spanner */
+ && line_spanner_->immutable_property_alist_ != SCM_EOL)
{
- Side_position_interface (cr_text_p_).set_axis (Y_AXIS);
- Side_position_interface (cr_text_p_).add_support (i.elem_l_);
+ Side_position_interface::add_support (line_spanner_,i.grob_l_);
+ add_bound_item (line_spanner_,dynamic_cast<Item*> (i.grob_l_));
}
-
- if (to_end_cresc_p_)
- Side_position_interface (to_end_cresc_p_).add_support (i.elem_l_);
-
- if (cresc_p_)
- Side_position_interface(cresc_p_).add_support (i.elem_l_);
}
}
-
-#endif
+ENTER_DESCRIPTION(Dynamic_engraver,
+/* descr */ "",
+/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
+/* acks */ "note-column-interface",
+/* reads */ "",
+/* write */ "");
projects / lilypond.git / blobdiff