*/
#include "debug.hh"
#include "crescendo.hh"
-#include "dynamic-engraver.hh"
#include "musical-request.hh"
#include "lookup.hh"
#include "paper-def.hh"
#include "score-column.hh"
#include "staff-symbol.hh"
#include "note-column.hh"
-#include "g-text-item.hh"
-#include "g-staff-side.hh"
+#include "text-item.hh"
+#include "staff-side.hh"
#include "engraver.hh"
#include "stem.hh"
#include "note-head.hh"
*/
class Dynamic_engraver : public Engraver
{
- G_text_item * text_p_;
- G_staff_side_item * staff_side_p_;
-
+ Text_item * text_p_;
Crescendo * to_end_cresc_p_;
Crescendo * cresc_p_;
- Span_dynamic_req * cresc_req_l_;
- Array<Dynamic_req*> dynamic_req_l_arr_;
+
+ Span_req * cresc_req_l_;
+ Array<Request*> dynamic_req_l_arr_;
void typeset_all ();
public:
VIRTUAL_COPY_CONS(Translator);
{
do_post_move_processing();
text_p_ =0;
- staff_side_p_ =0;
+
to_end_cresc_p_ = cresc_p_ = 0;
+
cresc_req_l_ = 0;
}
}
bool
-Dynamic_engraver::do_try_music (Music * r)
+Dynamic_engraver::do_try_music (Music * m)
{
- if(Dynamic_req * d = dynamic_cast <Dynamic_req *> (r))
+ Request * r = dynamic_cast<Request*> (m);
+
+ if(Text_script_req * d = dynamic_cast <Text_script_req *> (r))
{
- for (int i=0; i < dynamic_req_l_arr_.size (); i++)
- if (d->equal_b (dynamic_req_l_arr_[i]))
- return true;
-
- dynamic_req_l_arr_.push (d);
- return true;
+ if (d->style_str_ != "dynamic")
+ return false;
+ }
+ else if (Span_req * s = dynamic_cast <Span_req*> (r))
+ {
+ if (s-> span_type_str_ != "crescendo"
+ && s->span_type_str_ != "decrescendo")
+ return false;
}
- return false;
+ else
+ return false;
+
+ 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;
}
+
+
void
Dynamic_engraver::do_process_requests()
{
Crescendo* new_cresc_p=0;
+
for (int i=0; i < dynamic_req_l_arr_.size(); i++)
{
- Dynamic_req *dreq_l = dynamic_req_l_arr_[i];
- if (Absolute_dynamic_req *absd = dynamic_cast<Absolute_dynamic_req *> (dreq_l))
+ if (Text_script_req *absd =
+ dynamic_cast<Text_script_req *> ( dynamic_req_l_arr_[i]))
{
if (text_p_)
{
- dynamic_req_l_arr_[i]->warning (_("Got a dynamic already. Continuing dazed and confused"));
+ dynamic_req_l_arr_[i]->warning (_("Got a dynamic already. Continuing dazed and confused."));
continue;
}
- String loud = absd->loudness_str_;
+ String loud = absd->text_str_;
- text_p_ = new G_text_item;
+ text_p_ = new Text_item;
text_p_->text_str_ = loud; // ugh
- Scalar prop = get_property ("dynamicStyle", 0);
+ text_p_->set_elt_property ("style", gh_str02scm ("dynamic"));
+ text_p_->set_elt_property ("script-priority",
+ gh_int2scm (100));
+ Side_position_interface (text_p_).set_axis (Y_AXIS);
- text_p_->style_str_ = prop.length_i () ? prop : "dynamic";
-
- staff_side_p_ = new G_staff_side_item;
- staff_side_p_->set_victim (text_p_);
- staff_side_p_->axis_ = Y_AXIS;
+ if (absd->get_direction ())
+ {
+ text_p_->set_elt_property ("direction", gh_int2scm (absd->get_direction ()));
+ }
+
- prop = get_property ("dynamicDir", 0);
- if (prop.isnum_b ())
+ /*
+ UGH UGH
+ */
+ SCM prop = get_property ("dynamicDirection", 0);
+ if (!isdir_b (prop))
{
- staff_side_p_->dir_ = (Direction) (int) prop;
+ prop = get_property ("verticalDirection", 0);
}
+ if (isdir_b (prop) && to_dir (prop))
+ text_p_->set_elt_property ("direction", prop);
- announce_element (Score_element_info (text_p_, dreq_l));
- announce_element (Score_element_info (staff_side_p_, dreq_l));
+
+ prop = get_property ("dynamicPadding", 0);
+ if (gh_number_p(prop))
+ {
+ text_p_->set_elt_property ("padding", prop);
+ }
+ announce_element (Score_element_info (text_p_, absd));
}
- else if (Span_dynamic_req *span_l
- = dynamic_cast <Span_dynamic_req *> (dreq_l))
+ else if (Span_req *span_l
+ = dynamic_cast <Span_req *> (dynamic_req_l_arr_[i]))
{
- if (span_l->spantype_ == STOP)
+ if (span_l->span_dir_ == STOP)
{
if (!cresc_p_)
{
- span_l->warning (_ ("can't find (de)crescendo to end"));
+ 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;
- Scalar prop = get_property ("dynamicDir", 0);
- if (prop.isnum_b ())
- {
- to_end_cresc_p_->dir_ = (Direction) (int) prop;
- }
+ cresc_p_ = 0;
}
}
- else if (span_l->spantype_ == START)
+ else if (span_l->span_dir_ == START)
{
cresc_req_l_ = span_l;
assert (!new_cresc_p);
new_cresc_p = new Crescendo;
- new_cresc_p->grow_dir_ = span_l->dynamic_dir_;
+ new_cresc_p->grow_dir_ = (span_l->span_type_str_ == "crescendo") ? BIGGER : SMALLER;
+
+ Side_position_interface (new_cresc_p).set_axis (Y_AXIS);
announce_element (Score_element_info (new_cresc_p, span_l));
}
}
{
::warning (_ ("Too many crescendi here"));
typeset_element (cresc_p_);
+
cresc_p_ = 0;
}
cresc_p_ = new_cresc_p;
cresc_p_->set_bounds(LEFT,get_staff_info().musical_pcol_l ());
+
if (text_p_)
{
cresc_p_->dyn_b_drul_[LEFT] = true;
if (to_end_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 (text_p_)
{
typeset_element (text_p_);
- typeset_element (staff_side_p_);
text_p_ =0;
- staff_side_p_ =0;
}
}
|| dynamic_cast<Note_head *> (i.elem_l_)
)
{
- if (staff_side_p_)
- staff_side_p_->add_support (i.elem_l_);
+ if (text_p_)
+ Side_position_interface (text_p_).add_support (i.elem_l_);
if (to_end_cresc_p_)
- to_end_cresc_p_->add_support (i.elem_l_);
+ Side_position_interface (to_end_cresc_p_).add_support (i.elem_l_);
if (cresc_p_)
- cresc_p_->add_support (i.elem_l_);
+ Side_position_interface(cresc_p_).add_support (i.elem_l_);
}
}
+
projects / lilypond.git / blobdiff