#include "stream-event.hh"
#include "warn.hh"
#include "spanner.hh"
+#include "text-interface.hh"
#include "translator.icc"
void typeset_all ();
TRANSLATOR_DECLARATIONS (Dynamic_engraver);
- DECLARE_ACKNOWLEDGER (accidental);
- DECLARE_ACKNOWLEDGER (stem_tremolo);
DECLARE_ACKNOWLEDGER (note_column);
- DECLARE_ACKNOWLEDGER (slur);
DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
DECLARE_TRANSLATOR_LISTENER (span_dynamic);
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))
+ if (Text_interface::is_markup (s))
{
- cresc_->set_property ("edge-text",
- scm_cons (s, scm_from_locale_string ("")));
+ cresc_->set_property ("text", s);
context ()->set_property ((start_type + "Text").c_str (),
SCM_EOL);
}
}
}
-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)
{
finished_cresc_->set_bound (RIGHT, info.grob ());
}
-ADD_ACKNOWLEDGER (Dynamic_engraver, accidental);
ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
-ADD_ACKNOWLEDGER (Dynamic_engraver, slur);
-ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo);
ADD_TRANSLATOR (Dynamic_engraver,
/* doc */