/*
slur-grav.cc -- implement Slur_engraver
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "proto.hh"
-#include "plist.hh"
#include "musical-request.hh"
#include "slur-engraver.hh"
#include "slur.hh"
#include "debug.hh"
#include "note-column.hh"
+#include "translator-group.hh"
bool
Slur_engraver::do_try_music (Music *req_l)
{
- Musical_req *mus_l = dynamic_cast <Musical_req *> (req_l);
- if (Slur_req *sl = dynamic_cast <Slur_req *> (mus_l))
+ if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
{
- new_slur_req_l_arr_.push (dynamic_cast <Slur_req *> (mus_l));
+ if (sl->span_type_str_ != "slur")
+ return false;
+ new_slur_req_l_arr_.push (sl);
+
return true;
}
return false;
}
+void
+Slur_engraver::set_melisma (bool m)
+{
+ Translator_group *where = daddy_trans_l_;
+ get_property ("slurMelismaBusy", &where);
+ if (!where)
+ where = daddy_trans_l_;
+
+ daddy_trans_l_->set_property ("slurMelismaBusy", m ? "1" :"0");
+}
+
void
Slur_engraver::acknowledge_element (Score_element_info info)
{
typeset_element (slur_l_stack_[i]);
}
slur_l_stack_.clear ();
- for (int i=0; i < requests_arr_.size(); i++)
- {
- requests_arr_[i]->warning (_ ("unterminated slur"));
- }
+ if (!get_property ("weAreGraceContext",0).to_bool ())
+ for (int i=0; i < requests_arr_.size(); i++)
+ {
+ requests_arr_[i]->warning (_ ("unterminated slur"));
+ }
}
void
Array<Slur*> start_slur_l_arr_;
for (int i=0; i< new_slur_req_l_arr_.size(); i++)
{
- Slur_req* slur_req_l = new_slur_req_l_arr_[i];
+ Span_req* slur_req_l = new_slur_req_l_arr_[i];
// end slur: move the slur to other array
- if (slur_req_l->spantype == Span_req::STOP)
+ if (slur_req_l->span_dir_ == STOP)
{
if (slur_l_stack_.empty())
requests_arr_.pop();
}
}
- else if (slur_req_l->spantype == Span_req::START)
+ else if (slur_req_l->span_dir_ == START)
{
// push a new slur onto stack.
//(use temp. array to wait for all slur STOPs)
Slur * s_p =new Slur;
- Scalar prop = get_property ("slurdash");
+ Scalar prop = get_property ("slurDash", 0);
if (prop.isnum_b ())
- s_p->dash_i_ = prop;
+ s_p->set_elt_property (dashed_scm_sym, gh_int2scm(prop));
+
requests_arr_.push (slur_req_l);
start_slur_l_arr_.push (s_p);
announce_element (Score_element_info (s_p, slur_req_l));
void
Slur_engraver::do_pre_move_processing()
{
- Scalar dir (get_property ("slurydirection"));
- Scalar dir2 (get_property ("ydirection"));
+ Scalar dir (get_property ("slurVerticalDirection", 0));
+ Scalar dir2 (get_property ("verticalDirection", 0));
Direction slurdir = CENTER;
if (dir.length_i () && dir.isnum_b ())
Slur_engraver::do_post_move_processing()
{
new_slur_req_l_arr_.clear();
+ if (get_property ("automaticMelismata",0).to_bool ())
+ {
+ set_melisma (slur_l_stack_.size ());
+ }
}