source file of the GNU LilyPond music typesetter
- (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>,
+ (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>,
Erik Sandberg <mandolaerik@gmail.com>
Chris Jackson <chris@fluffhouse.org.uk> - extended to support
#include "stream-event.hh"
#include "string-convert.hh"
#include "warn.hh"
-#include "protected-scm.hh"
+#include "spanner.hh"
+#include "item.hh"
+
#include "translator.icc"
+#include <string.h>
+
/*
- Urgh. This engraver is too complex. rewrite. --hwn
+ TODO:
+
+ * Junk hardcoded sustain/sostenuto/una_corda distinction;
+ Softcode using (list (sustain-event SustainPedal PianoPedalBracket) ... )
+
+ * Try to use same engraver for dynamics.
+
*/
/* Ugh: This declaration is duplicated in piano-pedal-performer */
-typedef enum Pedal_type {SOSTENUTO, SUSTAIN, UNA_CORDA, NUM_PEDAL_TYPES};
+enum Pedal_type {
+ SOSTENUTO,
+ SUSTAIN,
+ UNA_CORDA,
+ NUM_PEDAL_TYPES
+};
/*
Static precalculated data (symbols and strings) for the different
SCM style_sym_;
SCM strings_sym_;
- const char *pedal_line_spanner_c_str_;
const char *pedal_c_str_;
Pedal_type_info ()
event_class_sym_ = SCM_EOL;
style_sym_ = SCM_EOL;
strings_sym_ = SCM_EOL;
- pedal_line_spanner_c_str_ = 0;
pedal_c_str_ = 0;
}
void protect ()
Item *item_;
Spanner *bracket_; // A single portion of a pedal bracket
Spanner *finished_bracket_;
-
- /*
- This grob contains all the pedals of the same type on the same staff
- */
- Spanner *line_spanner_;
- Spanner *finished_line_spanner_;
};
static Pedal_type_info pedal_types_[NUM_PEDAL_TYPES];
{
public:
TRANSLATOR_DECLARATIONS (Piano_pedal_engraver);
- ~Piano_pedal_engraver ();
+
protected:
virtual void initialize ();
virtual void finalize ();
DECLARE_TRANSLATOR_LISTENER (sustain);
DECLARE_TRANSLATOR_LISTENER (una_corda);
DECLARE_TRANSLATOR_LISTENER (sostenuto);
- void stop_translation_timestep ();
DECLARE_ACKNOWLEDGER (note_column);
+ void stop_translation_timestep ();
void process_music ();
private:
Pedal_info info_list_[NUM_PEDAL_TYPES + 1];
- /*
- Record a stack of the current pedal spanners, so if more than one pedal
- occurs simultaneously then extra space can be added between them.
- */
-
- vector<Spanner*> previous_;
- void del_linespanner (Spanner *);
-
void create_text_grobs (Pedal_info *p, bool);
void create_bracket_grobs (Pedal_info *p, bool);
void typeset_all (Pedal_info *p);
};
+
static void
init_pedal_types ()
{
info.style_sym_ = scm_str2symbol (("pedal" + base_name + "Style").c_str ());
info.strings_sym_ = scm_str2symbol (("pedal" + base_name + "Strings").c_str ());
- info.pedal_line_spanner_c_str_ = strdup ((base_name + "PedalLineSpanner").c_str ());
info.base_name_ = name;
info.pedal_c_str_ = strdup ((base_name + "Pedal").c_str ());
pedal_types_[i] = info;
}
}
+
ADD_SCM_INIT_FUNC (Piano_pedal_engraver_init_pedal_types_, init_pedal_types);
Piano_pedal_engraver::Piano_pedal_engraver ()
info->item_ = 0;
info->bracket_ = 0;
info->finished_bracket_ = 0;
- info->line_spanner_ = 0;
- info->finished_line_spanner_ = 0;
info->current_bracket_ev_ = 0;
info->event_drul_[START] = 0;
info->event_drul_[STOP] = 0;
info_list_[NUM_PEDAL_TYPES].type_ = 0;
}
-Piano_pedal_engraver::~Piano_pedal_engraver ()
-{
-}
/*
Urg: Code dup
{
for (Pedal_info *p = info_list_; p->type_; p++)
{
- if (p->line_spanner_)
- {
- Side_position_interface::add_support (p->line_spanner_, info.grob ());
- add_bound_item (p->line_spanner_, info.grob ());
- }
if (p->bracket_)
add_bound_item (p->bracket_, info.grob ());
if (p->finished_bracket_)
{
if (p->event_drul_[STOP] || p->event_drul_[START])
{
- if (!p->line_spanner_)
- {
- const char *name = p->type_->pedal_line_spanner_c_str_;
- Stream_event *rq = (p->event_drul_[START] ? p->event_drul_[START] : p->event_drul_[STOP]);
- p->line_spanner_ = make_spanner (name, rq->self_scm ());
- }
-
/* Choose the appropriate grobs to add to the line spanner
These can be text items or text-spanners
*/
if (!mixed)
{
if (!p->start_ev_)
- p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
+ p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
else
s = scm_cadr (strings);
p->start_ev_ = p->event_drul_[START];
if (!mixed)
{
if (!p->start_ev_)
- p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
+ p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", p->type_->base_name_.c_str ()));
else
s = scm_caddr (strings);
p->start_ev_ = 0;
{
p->start_ev_ = p->event_drul_[START];
s = scm_car (strings);
- if (!mixed)
- {
- /*
- Code dup?! see below.
- */
- if (previous_.size ())
- // add extra space below the previous already-occuring pedal
- Side_position_interface::add_support (p->line_spanner_,
- previous_.back ());
- previous_.push_back (p->line_spanner_);
- }
- }
+ }
if (scm_is_string (s))
{
: p->event_drul_[STOP])->self_scm ());
p->item_->set_property ("text", s);
- Axis_group_interface::add_element (p->line_spanner_, p->item_);
}
if (!mixed)
{
if (!p->bracket_ && p->event_drul_[STOP])
{
- string msg = _f ("can't find start of piano pedal bracket: `%s'", p->type_->base_name_.c_str ());
+ string msg = _f ("cannot find start of piano pedal bracket: `%s'", p->type_->base_name_.c_str ());
p->event_drul_[STOP]->origin ()->warning (msg);
p->event_drul_[STOP] = 0;
}
if (!p->event_drul_[START])
{
SCM flare = p->bracket_->get_property ("bracket-flare");
- p->bracket_->set_property ("bracket-flare", scm_cons (scm_car (flare),
- scm_from_double (0)));
+ if (scm_is_pair (flare))
+ p->bracket_->set_property ("bracket-flare", scm_cons (scm_car (flare),
+ scm_from_double (0)));
}
p->finished_bracket_ = p->bracket_;
p->bracket_ = 0;
+
+ announce_end_grob (p->finished_bracket_, p->event_drul_[STOP]->self_scm ());
+
p->current_bracket_ev_ = 0;
}
if (p->item_)
p->bracket_->set_object ("pedal-text", p->item_->self_scm ());
}
-
- /*
- We do not use currentMusicalColumn for the left span-point.
- If the column as accidentals (eg on a different stave), the
- currentMusicalColumn is too wide, making the bracket too big.
-
- TODO:
-
- Hmm. What do we do when there are no notes when the spanner starts?
-
- TODO:
-
- what about the right span point?
-
- */
- Axis_group_interface::add_element (p->line_spanner_, p->bracket_);
-
- if (!p->event_drul_[STOP])
- {
-
- /*
- code dup. --hwn.
-
- // position new pedal spanner below the current one
- */
- if (previous_.size ())
- Side_position_interface::add_support (p->line_spanner_, previous_.back ());
-
- previous_.push_back (p->line_spanner_);
- }
}
p->event_drul_[START] = 0;
{
for (Pedal_info *p = info_list_; p->type_; p++)
{
- /*
- suicide?
- */
- if (p->line_spanner_
- && !p->line_spanner_->is_live ())
- p->line_spanner_ = 0;
-
if (p->bracket_
&& !p->bracket_->is_live ())
p->bracket_ = 0;
{
SCM cc = get_property ("currentCommandColumn");
Item *c = unsmob_item (cc);
- if (p->line_spanner_)
- p->line_spanner_->set_bound (RIGHT, c);
p->bracket_->set_bound (RIGHT, c);
p->finished_bracket_ = p->bracket_;
p->bracket_ = 0;
- p->finished_line_spanner_ = p->line_spanner_;
- p->line_spanner_ = 0;
typeset_all (p);
}
- if (p->line_spanner_)
- {
- p->finished_line_spanner_ = p->line_spanner_;
- typeset_all (p);
- }
}
}
-void
-Piano_pedal_engraver::del_linespanner (Spanner *g)
-{
- vsize idx = find (previous_, g) - previous_.begin ();
- if (idx != VPOS && idx < previous_.size ())
- previous_.erase (previous_.begin () + idx);
-}
-
void
Piano_pedal_engraver::stop_translation_timestep ()
{
for (Pedal_info *p = info_list_; p->type_; p++)
{
- if (!p->bracket_)
+
+ typeset_all (p);
+ if (p->bracket_ && !p->bracket_->get_bound (LEFT))
{
- p->finished_line_spanner_ = p->line_spanner_;
- p->line_spanner_ = 0;
- del_linespanner (p->finished_line_spanner_);
- }
+ Grob *cmc = unsmob_grob (get_property ("currentMusicalColumn"));
- typeset_all (p);
+ if (!p->bracket_->get_bound (LEFT))
+ p->bracket_->set_bound (LEFT, cmc);
+ }
}
for (Pedal_info *p = info_list_; p->type_; p++)
/*
Handle suicide.
*/
- if (p->finished_line_spanner_
- && !p->finished_line_spanner_->is_live ())
- p->finished_line_spanner_ = 0;
if (p->finished_bracket_
&& !p->finished_bracket_->is_live ())
p->finished_bracket_ = 0;
p->finished_bracket_ = 0;
}
-
- if (p->finished_line_spanner_)
- {
- Grob *l = p->finished_line_spanner_->get_bound (LEFT);
- Grob *r = p->finished_line_spanner_->get_bound (RIGHT);
- if (!r && l)
- p->finished_line_spanner_->set_bound (RIGHT, l);
- else if (!l && r)
- p->finished_line_spanner_->set_bound (LEFT, r);
- else if (!r && !l)
- {
- Grob *cc = unsmob_grob (get_property ("currentMusicalColumn"));
- Item *ci = dynamic_cast<Item *> (cc);
- p->finished_line_spanner_->set_bound (RIGHT, ci);
- p->finished_line_spanner_->set_bound (LEFT, ci);
- }
-
- p->finished_line_spanner_ = 0;
- }
}
ADD_ACKNOWLEDGER (Piano_pedal_engraver, note_column);
ADD_TRANSLATOR (Piano_pedal_engraver,
-
/* doc */
"Engrave piano pedal symbols and brackets.",
/* create */
+ "PianoPedalBracket "
"SostenutoPedal "
- "SostenutoPedalLineSpanner "
"SustainPedal "
- "SustainPedalLineSpanner "
- "UnaCordaPedal "
- "UnaCordaPedalLineSpanner ",
+ "UnaCordaPedal ",
/* read */
"currentCommandColumn "
"pedalSustainStrings "
"pedalSustainStyle "
"pedalUnaCordaStrings "
- "pedalUnaCordaStyle",
- /* write */ "");
+ "pedalUnaCordaStyle ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff