#include "stem.hh"
#include "side-position-interface.hh"
#include "staff-symbol-referencer.hh"
-#include "dictionary.hh"
-#include "dictionary-iter.hh"
#include "text-item.hh"
-
-/*
- Urg.
- This is almost text
- Problem is:
- * we have no kerning
- * symbols are at wrong place in font
-*/
-
-class Sustain_pedal : public Item
-{
-public:
- VIRTUAL_COPY_CONS (Score_element);
-
-protected:
- virtual Molecule do_brew_molecule () const;
- virtual void after_line_breaking ();
-};
-
-void
-Sustain_pedal::after_line_breaking ()
-{
- Side_position_interface i (this);
- Direction d = i.get_direction ();
- i.set_direction (d);
-}
-
-Molecule
-Sustain_pedal::do_brew_molecule () const
-{
- Molecule mol;
- SCM glyph = get_elt_property ("glyph");
- if (glyph == SCM_UNDEFINED)
- return mol;
- String text = ly_scm2string (glyph);
-
- for (int i = 0; i < text.length_i (); i++)
- {
- // leuke koor dump door tiepo, snapnie helemaal:
- //String idx = ("pedal-") + text[i];
- // urg, Byte* ??
- // braak: waarom vindt String het zo moeilijk om
- // String + char te doen?
- //String idx = "pedal-" + String (&text.byte_C ()[i], 1);
- String idx = String ("pedal-") + String (&text.byte_C ()[i], 1);
- Molecule m = lookup_l ()->afm_find (idx);
- if (m.empty_b ())
- continue;
- Real kern = 0;
- if (i)
- {
- SCM s = scm_eval (gh_list (ly_symbol2scm ("pedal-kerning"),
- ly_str02scm (String (&text.byte_C ()[i - 1], 1).ch_C ()),
- ly_str02scm (String (&text.byte_C ()[i], 1).ch_C ()),
- SCM_UNDEFINED));
- if (gh_number_p (s))
- {
- Staff_symbol_referencer_interface st (this);
- Real staff_space = st.staff_space ();
- kern = gh_scm2double (s) * staff_space;
- }
- }
- mol.add_at_edge (X_AXIS, RIGHT, m, kern);
- }
-
- return mol;
-}
-
-
-
+#include "sustain-pedal.hh"
/*
TODO:
- * it would be real cool if an engraver could be initialised with a
+ * it would be really cool if an engraver could be initialised with a
string, ie:
Piano_pedal_engraver::"sostenuto"
Piano_pedal_engraver::"sustain"
Piano_pedal_engraver::"una-chorda"
+
+
+
*/
+/*
+ Would it? The semantics are unclear, and real benefits are muddy
+ too. --hwn */
+
+
+
/**
- engrave Piano pedals
+ engrave Piano pedals symbols.
*/
class Piano_pedal_engraver : public Engraver
{
- struct Pedal_info
- {
- Span_req* start_req_l_;
- Drul_array<Span_req*> req_l_drul_;
- Item* item_p_;
- };
-
public:
VIRTUAL_COPY_CONS (Translator);
Piano_pedal_engraver ();
-
+ ~Piano_pedal_engraver ();
protected:
+ virtual void do_creation_processing ();
virtual bool do_try_music (Music*);
virtual void do_process_music ();
virtual void do_pre_move_processing ();
virtual void acknowledge_element (Score_element_info);
private:
- Dictionary<Pedal_info> info_dict_;
+ struct Pedal_info
+ {
+ char const * name_;
+ Span_req* start_req_l_;
+ Drul_array<Span_req*> req_l_drul_;
+ Item* item_p_;
+ };
+
+
+ Pedal_info *info_list_;
};
ADD_THIS_TRANSLATOR (Piano_pedal_engraver);
Piano_pedal_engraver::Piano_pedal_engraver ()
{
- (void)info_dict_["Sostenuto"];
- (void)info_dict_["Sustain"];
- (void)info_dict_["UnaChorda"];
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ info_list_ = 0;
+}
+void
+Piano_pedal_engraver::do_creation_processing()
+{
+ info_list_ = new Pedal_info[4];
+ Pedal_info *p = info_list_;
+
+
+ char * names [] = { "Sostenuto", "Sustain", "UnaChorda", 0 };
+ char **np = names ;
+ do
{
- Pedal_info& p = i.val_ref ();
- p.item_p_ = 0;
- p.req_l_drul_[START] = 0;
- p.req_l_drul_[STOP] = 0;
- p.start_req_l_ = 0;
+ p->name_ = *np;
+ p->item_p_ = 0;
+ p->req_l_drul_[START] = 0;
+ p->req_l_drul_[STOP] = 0;
+ p->start_req_l_ = 0;
+
+ p++;
}
+ while (*(np ++));
+}
+
+Piano_pedal_engraver::~Piano_pedal_engraver()
+{
+ delete[] info_list_;
}
/*
void
Piano_pedal_engraver::acknowledge_element (Score_element_info info)
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ for (Pedal_info*p = info_list_; p->name_; p ++)
{
- Pedal_info& p = i.val_ref ();
- if (p.item_p_)
+ if (p->item_p_)
{
if (Note_head* n = dynamic_cast<Note_head*> (info.elem_l_))
{
- Side_position_interface st (p.item_p_);
+ Side_position_interface st (p->item_p_);
st.add_support (n);
if (st.get_axis( ) == X_AXIS
- && !p.item_p_->parent_l (Y_AXIS))
- p.item_p_->set_parent (n, Y_AXIS);
+ && !p->item_p_->parent_l (Y_AXIS))
+ p->item_p_->set_parent (n, Y_AXIS);
}
if (Stem* s = dynamic_cast<Stem*> (info.elem_l_))
{
- Side_position_interface st (p.item_p_);
+ Side_position_interface st (p->item_p_);
st.add_support (s);
}
}
bool
Piano_pedal_engraver::do_try_music (Music *m)
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ if (Span_req * s = dynamic_cast<Span_req*>(m))
{
- Pedal_info& p = i.val_ref ();
- if (Span_req * s = dynamic_cast<Span_req*>(m))
+ for (Pedal_info*p = info_list_; p->name_; p ++)
{
- if (s->span_type_str_ == i.key ())
+ if (s->span_type_str_ == p->name_)
{
- p.req_l_drul_[s->span_dir_] = s;
+ p->req_l_drul_[s->span_dir_] = s;
return true;
}
}
void
Piano_pedal_engraver::do_process_music ()
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ for (Pedal_info*p = info_list_; p->name_; p ++)
{
- Pedal_info& p = i.val_ref ();
SCM s = SCM_UNDEFINED;
- if (p.req_l_drul_[STOP] && p.req_l_drul_[START])
+ if (p->req_l_drul_[STOP] && p->req_l_drul_[START])
{
- if (!p.start_req_l_)
+ if (!p->start_req_l_)
{
- p.req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", i.key ()));
+ p->req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", p->name_ ));
}
else
{
- s = get_property ("stopStart" + i.key ());
+ s = get_property ("stopStart" + String (p->name_ ));
}
- p.start_req_l_ = p.req_l_drul_[START];
+ p->start_req_l_ = p->req_l_drul_[START];
}
- else if (p.req_l_drul_[STOP])
+ else if (p->req_l_drul_[STOP])
{
- if (!p.start_req_l_)
+ if (!p->start_req_l_)
{
- p.req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", i.key ()));
+ p->req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", p->name_ ));
}
else
{
- s = get_property ("stop" + i.key ());
+ s = get_property ("stop" + String (p->name_ ));
}
- p.start_req_l_ = 0;
+ p->start_req_l_ = 0;
}
- else if (p.req_l_drul_[START])
+ else if (p->req_l_drul_[START])
{
- p.start_req_l_ = p.req_l_drul_[START];
- s = get_property ("start" + i.key ());
+ p->start_req_l_ = p->req_l_drul_[START];
+ s = get_property ("start" + String (p->name_ ));
}
if (s != SCM_UNDEFINED)
{
- if (i.key () == "Sustain")
+ if (p->name_ == String ("Sustain"))
{
- p.item_p_ = new Sustain_pedal;
- p.item_p_->set_elt_property ("glyph", s);
+ p->item_p_ = new Sustain_pedal;
+ p->item_p_->set_elt_property ("text", s);
}
else
{
- p.item_p_ = new Text_item;
- p.item_p_->set_elt_property ("text", s);
+ p->item_p_ = new Text_item;
+ p->item_p_->set_elt_property ("text", s);
// guh
- p.item_p_->set_elt_property ("style", ly_str02scm ("italic"));
+ p->item_p_->set_elt_property ("style", ly_str02scm ("italic"));
}
- Side_position_interface si (p.item_p_);
+ Side_position_interface si (p->item_p_);
si.set_axis (Y_AXIS);
/* Hmm,
If set to empty, it can't be centred
Howto centre non-fat text?
- p.item_p_->set_empty (X_AXIS);
+ p->item_p_->set_empty (X_AXIS);
*/
- p.item_p_->set_elt_property ("self-alignment-X", gh_int2scm (0));
- p.item_p_->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
- p.item_p_->add_offset_callback (Side_position_interface::centered_on_parent, X_AXIS);
- announce_element (Score_element_info (p.item_p_,
- p.req_l_drul_[START]
- ? p.req_l_drul_[START]
- : p.req_l_drul_[STOP]));
+ p->item_p_->set_elt_property ("no-spacing-rods" , SCM_BOOL_T);
+ p->item_p_->set_elt_property ("self-alignment-X", gh_int2scm (0));
+ p->item_p_->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
+ p->item_p_->add_offset_callback (Side_position_interface::centered_on_parent, X_AXIS);
+ announce_element (Score_element_info (p->item_p_,
+ p->req_l_drul_[START]
+ ? p->req_l_drul_[START]
+ : p->req_l_drul_[STOP]));
}
}
}
void
Piano_pedal_engraver::do_pre_move_processing ()
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ Item * sustain = 0;
+ for (Pedal_info*p = info_list_; p->name_; p ++)
+ {
+ if (p->name_ == String ("Sustain"))
+ sustain = p->item_p_;
+ }
+
+ for (Pedal_info*p = info_list_; p->name_; p ++)
{
- Pedal_info& p = i.val_ref ();
- if (p.item_p_)
+ if (p->item_p_)
{
- side_position (p.item_p_).add_staff_support ();
+ side_position (p->item_p_).add_staff_support ();
/*
Hmm.
*/
- if (i.key () != "Sustain")
+ if (p->name_ != String ("Sustain"))
{
- if (Item* sustain = info_dict_["Sustain"].item_p_)
+ if (sustain)
{
- Side_position_interface st (p.item_p_);
+ Side_position_interface st (p->item_p_);
st.add_support (sustain);
}
}
- typeset_element (p.item_p_);
+ typeset_element (p->item_p_);
}
- p.item_p_ = 0;
+ p->item_p_ = 0;
}
}
void
Piano_pedal_engraver::do_post_move_processing ()
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ for (Pedal_info*p = info_list_; p->name_; p ++)
{
- Pedal_info& p = i.val_ref ();
- p.req_l_drul_[STOP] = 0;
- p.req_l_drul_[START] = 0;
+ p->req_l_drul_[STOP] = 0;
+ p->req_l_drul_[START] = 0;
}
}
{
struct Pedal_info
{
+ char const *name_;
Span_req* start_req_l_;
Drul_array<Span_req*> req_l_drul_;
};
public:
VIRTUAL_COPY_CONS (Translator);
-
Piano_pedal_performer ();
-
+ ~Piano_pedal_performer ();
+
protected:
+ virtual void do_creation_processing ();
virtual bool do_try_music (Music*);
virtual void do_process_music ();
virtual void do_pre_move_processing ();
private:
Link_array<Audio_piano_pedal> audio_p_arr_;
- Dictionary<Pedal_info> info_dict_;
+ Pedal_info * info_alist_;
};
ADD_THIS_TRANSLATOR (Piano_pedal_performer);
Piano_pedal_performer::Piano_pedal_performer ()
{
- (void)info_dict_["Sostenuto"];
- (void)info_dict_["Sustain"];
- (void)info_dict_["UnaChorda"];
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ info_alist_ = 0;
+}
+
+Piano_pedal_performer::~Piano_pedal_performer()
+{
+ delete[] info_alist_;
+}
+
+void
+Piano_pedal_performer::do_creation_processing ()
+{
+ info_alist_ = new Pedal_info[4];
+ Pedal_info *p = info_alist_;
+
+ char * names [] = { "Sostenuto", "Sustain", "UnaChorda", 0 };
+ char **np = names ;
+ do
{
- Pedal_info& p = i.val_ref ();
- p.req_l_drul_[START] = 0;
- p.req_l_drul_[STOP] = 0;
- p.start_req_l_ = 0;
+ p->name_ = *np;
+ p->req_l_drul_[START] = 0;
+ p->req_l_drul_[STOP] = 0;
+ p->start_req_l_ = 0;
+
+ p++;
}
+ while (*(np ++));
}
void
Piano_pedal_performer::do_process_music ()
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ for (Pedal_info*p = info_alist_; p->name_; p ++)
+
{
- Pedal_info& p = i.val_ref ();
- if (p.req_l_drul_[STOP])
+ if (p->req_l_drul_[STOP])
{
- if (!p.start_req_l_)
+ if (!p->start_req_l_)
{
- p.req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", i.key ()));
+ p->req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", String (p->name_)));
}
else
{
Audio_piano_pedal* a = new Audio_piano_pedal;
- a->type_str_ = i.key ();
+ a->type_str_ = String (p->name_);
a->dir_ = STOP;
audio_p_arr_.push (a);
}
- p.start_req_l_ = 0;
+ p->start_req_l_ = 0;
}
- if (p.req_l_drul_[START])
+ if (p->req_l_drul_[START])
{
- p.start_req_l_ = p.req_l_drul_[START];
+ p->start_req_l_ = p->req_l_drul_[START];
Audio_piano_pedal* a = new Audio_piano_pedal;
- a->type_str_ = i.key ();
+ a->type_str_ = String (p->name_);
a->dir_ = START;
audio_p_arr_.push (a);
}
void
Piano_pedal_performer::do_pre_move_processing ()
{
- for (int i=0; i < audio_p_arr_.size (); i++)
+ for (int i=0; i< audio_p_arr_.size (); i++)
play_element (audio_p_arr_[i]);
audio_p_arr_.clear ();
}
void
Piano_pedal_performer::do_post_move_processing ()
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ for (Pedal_info*p = info_alist_; p->name_; p ++)
{
- Pedal_info& p = i.val_ref ();
- p.req_l_drul_[STOP] = 0;
- p.req_l_drul_[START] = 0;
+ p->req_l_drul_[STOP] = 0;
+ p->req_l_drul_[START] = 0;
}
}
bool
Piano_pedal_performer::do_try_music (Music* r)
{
- for (Dictionary_iter <Pedal_info> i (info_dict_); i.ok (); i++)
+ if (Span_req * s = dynamic_cast<Span_req*>(r))
{
- Pedal_info& p = i.val_ref ();
- if (Span_req * s = dynamic_cast<Span_req*>(r))
+ for (Pedal_info*p = info_alist_; p->name_; p ++)
{
- if (s->span_type_str_ == i.key ())
+ if (s->span_type_str_ == String (p->name_))
{
- p.req_l_drul_[s->span_dir_] = s;
+ p->req_l_drul_[s->span_dir_] = s;
return true;
}
}
projects / lilypond.git / commitdiff