#include "hairpin.hh"
#include "interval.hh"
#include "item.hh"
-#include "new-slur.hh"
+#include "slur.hh"
#include "note-column.hh"
#include "paper-column.hh"
#include "script-interface.hh"
start_type = "crescendo";
SCM s = get_property ((start_type + "Spanner").to_str0 ());
- if (!ly_c_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
+ if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
{
cresc_ = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ());
+ if (finished_cresc_)
+ {
+ Pointer_group_interface::add_grob (finished_cresc_,
+ ly_symbol2scm ("adjacent-hairpins"),
+ cresc_);
+
+ Pointer_group_interface::add_grob (cresc_,
+ ly_symbol2scm ("adjacent-hairpins"),
+ finished_cresc_);
+ }
cresc_->set_property ("grow-direction",
scm_int2num ((start_type == "crescendo")
? BIGGER : SMALLER));
/*
FIXME: use get_markup () to check type.
*/
- if (ly_c_string_p (s) || ly_c_pair_p (s))
+ if (scm_is_string (s) || ly_c_pair_p (s))
{
cresc_->set_property ("edge-text",
scm_cons (s, scm_makfrom0str ("")));
DynamicText doesn't really have a script-priority field.
*/
- if (ly_c_number_p (p)
- && ly_scm2int (p)
- < ly_scm2int (script_->get_property ("script-priority")))
+ 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_);
}
- else if (New_slur::has_interface (info.grob_))
+ else if (Slur::has_interface (info.grob_))
slur_ = dynamic_cast<Spanner*> (info.grob_);
}
/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
/* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event",
-/* acks */ "note-column-interface script-interface new-slur-interface",
+/* acks */ "note-column-interface script-interface slur-interface",
/* reads */ "",
/* write */ "");