/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "spanner.hh"
#include "stream-event.hh"
#include "stem.hh"
+#include "unpure-pure-container.hh"
#include "warn.hh"
#include "translator.icc"
class Beam_engraver : public Engraver
{
public:
- DECLARE_ACKNOWLEDGER (stem);
- DECLARE_ACKNOWLEDGER (rest);
+ void acknowledge_stem (Grob_info);
+ void acknowledge_rest (Grob_info);
+ void listen_beam (Stream_event *);
protected:
Stream_event *start_ev_;
virtual bool valid_start_point ();
virtual bool valid_end_point ();
- DECLARE_TRANSLATOR_LISTENER (beam);
public:
TRANSLATOR_DECLARATIONS (Beam_engraver);
};
return valid_start_point ();
}
-Beam_engraver::Beam_engraver ()
+Beam_engraver::Beam_engraver (Context *c)
+ : Engraver (c)
{
beam_ = 0;
finished_beam_ = 0;
prev_start_ev_ = 0;
}
-IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam);
void
Beam_engraver::listen_beam (Stream_event *ev)
{
{
if (finished_beam_)
{
- if (!finished_beam_->get_bound (RIGHT))
- finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
- if (forced_direction_)
+ Grob *stem = finished_beam_->get_bound (RIGHT);
+ if (!stem)
{
- Grob *stem = finished_beam_->get_bound (RIGHT);
- set_grob_direction (stem, forced_direction_);
- forced_direction_ = CENTER;
+ stem = finished_beam_->get_bound (LEFT);
+ if (stem)
+ finished_beam_->set_bound (RIGHT, stem);
}
+
+ if (stem && forced_direction_)
+ set_grob_direction (stem, forced_direction_);
+
+ forced_direction_ = CENTER;
finished_beam_info_->beamify (finished_beaming_options_);
Beam::set_beaming (finished_beam_, finished_beam_info_);
if (beam_
&& !scm_is_number (info.grob ()->get_property_data ("staff-position")))
chain_offset_callback (info.grob (),
- Beam::rest_collision_callback_proc, Y_AXIS);
+ Unpure_pure_container::make_smob
+ (Beam::rest_collision_callback_proc,
+ Beam::pure_rest_collision_callback_proc),
+ Y_AXIS);
}
void
if (!valid_start_point ())
return;
+ // It's suboptimal that we don't support callbacks returning ##f,
+ // but this makes beams have no effect on "stems" reliably in
+ // TabStaff when \tabFullNotation is switched off: the real stencil
+ // callback for beams is called quite late in the process, and we
+ // don't want to trigger it early.
+ if (scm_is_false (beam_->get_property_data ("stencil")))
+ return;
+
Item *stem = dynamic_cast<Item *> (info.grob ());
if (Stem::get_beam (stem))
return;
last_stem_added_at_ = now;
- Duration *stem_duration = unsmob_duration (ev->get_property ("duration"));
+ Duration *stem_duration = unsmob<Duration> (ev->get_property ("duration"));
int durlog = stem_duration->duration_log ();
- //int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log ();
+ //int durlog = unsmob<Duration> (ev->get_property ("duration"))->duration_log ();
if (durlog <= 2)
{
ev->origin ()->warning (_ ("stem does not fit in beam"));
beam_info_->add_stem (stem_location,
max (durlog - 2, 0),
Stem::is_invisible (stem),
- stem_duration->factor ());
+ stem_duration->factor (),
+ (to_boolean (stem->get_property ("tuplet-start"))));
Beam::add_stem (beam_, stem);
}
-ADD_ACKNOWLEDGER (Beam_engraver, stem);
-ADD_ACKNOWLEDGER (Beam_engraver, rest);
+
+void
+Beam_engraver::boot ()
+{
+ ADD_LISTENER (Beam_engraver, beam);
+ ADD_ACKNOWLEDGER (Beam_engraver, stem);
+ ADD_ACKNOWLEDGER (Beam_engraver, rest);
+}
ADD_TRANSLATOR (Beam_engraver,
/* doc */
{
public:
TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
-
- DECLARE_TRANSLATOR_LISTENER (beam);
+ TRANSLATOR_INHERIT (Beam_engraver);
protected:
virtual bool valid_start_point ();
virtual bool valid_end_point ();
};
-Grace_beam_engraver::Grace_beam_engraver ()
+Grace_beam_engraver::Grace_beam_engraver (Context *c)
+ : Beam_engraver (c)
{
}
return beam_ && valid_start_point ();
}
-/*
- Ugh, C&P code.
- */
-IMPLEMENT_TRANSLATOR_LISTENER (Grace_beam_engraver, beam);
void
-Grace_beam_engraver::listen_beam (Stream_event *ev)
+Grace_beam_engraver::boot ()
{
- Direction d = to_dir (ev->get_property ("span-direction"));
-
- if (d == START && valid_start_point ())
- start_ev_ = ev;
- else if (d == STOP && valid_end_point ())
- stop_ev_ = ev;
+ ADD_LISTENER (Grace_beam_engraver, beam);
+ ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
+ ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
}
-ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
-ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
-
ADD_TRANSLATOR (Grace_beam_engraver,
/* doc */
"Handle @code{Beam} events by engraving beams. If omitted,"