/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1999--2015 Jan Nieuwenhuizen <janneke@gnu.org>
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 "context-handle.hh"
#include "duration.hh"
#include "engraver.hh"
+#include "grob-properties.hh"
#include "item.hh"
#include "rest.hh"
#include "spanner.hh"
virtual void finalize ();
virtual void derived_mark () const;
- DECLARE_ACKNOWLEDGER (rest);
- DECLARE_ACKNOWLEDGER (beam);
- DECLARE_ACKNOWLEDGER (bar_line);
- DECLARE_ACKNOWLEDGER (breathing_sign);
- DECLARE_ACKNOWLEDGER (stem);
- DECLARE_TRANSLATOR_LISTENER (beam_forbid);
+ void acknowledge_rest (Grob_info);
+ void acknowledge_beam (Grob_info);
+ void acknowledge_bar_line (Grob_info);
+ void acknowledge_breathing_sign (Grob_info);
+ void acknowledge_stem (Grob_info);
+ void listen_beam_forbid (Stream_event *);
private:
virtual bool test_moment (Direction, Moment, Moment);
}
}
-Auto_beam_engraver::Auto_beam_engraver ()
+Auto_beam_engraver::Auto_beam_engraver (Context *c)
+ : Engraver (c)
{
forbid_ = 0;
process_acknowledged_count_ = 0;
stems_ = 0;
shortest_mom_ = Moment (Rational (1, 4));
+ extend_mom_ = Moment (-1);
finished_beam_ = 0;
finished_grouping_ = 0;
grouping_ = 0;
beam_settings_ = SCM_EOL;
}
-IMPLEMENT_TRANSLATOR_LISTENER (Auto_beam_engraver, beam_forbid);
void
Auto_beam_engraver::listen_beam_forbid (Stream_event *ev)
{
bool
Auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment dur)
{
- return scm_call_4 (get_property ("autoBeamCheck"),
- context ()->self_scm (),
- scm_from_int (dir),
- test_mom.smobbed_copy (),
- dur.smobbed_copy ())
- != SCM_BOOL_F;
+ return scm_is_true (scm_call_4 (get_property ("autoBeamCheck"),
+ context ()->self_scm (),
+ scm_from_int (dir),
+ test_mom.smobbed_copy (),
+ dur.smobbed_copy ()));
}
void
Beam::add_stem (beam, (*stems_)[i]);
Grob_info i = make_grob_info (beam, (*stems_)[0]->self_scm ());
- i.rerouting_daddy_context_ = beam_start_context_.get_context ();
- announce_grob (i);
+ announce_grob (i, beam_start_context_.get_context ());
return beam;
}
stems_ = new vector<Item *>;
grouping_ = new Beaming_pattern ();
beaming_options_.from_context (context ());
- beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
+ beam_settings_ = Grob_property_info (context (), ly_symbol2scm ("Beam")).updated ();
beam_start_context_.set_context (context ()->get_parent_context ());
beam_start_moment_ = now_mom ();
if (finished_beam_)
{
Grob_info i = make_grob_info (finished_beam_, SCM_EOL);
- i.rerouting_daddy_context_ = beam_start_context_.get_context ();
- announce_end_grob (i);
+ announce_end_grob (i, beam_start_context_.get_context ());
finished_grouping_ = grouping_;
finished_beaming_options_ = beaming_options_;
}
return;
}
- int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log ();
+ int durlog = unsmob<Duration> (ev->get_property ("duration"))->duration_log ();
if (durlog <= 2)
{
if (!is_same_grace_state (beam_start_location_, now))
return;
- Duration *stem_duration = unsmob_duration (ev->get_property ("duration"));
+ Duration *stem_duration = unsmob<Duration> (ev->get_property ("duration"));
Moment dur = stem_duration->get_length ();
- //Moment dur = unsmob_duration (ev->get_property ("duration"))->get_length ();
+ //Moment dur = unsmob<Duration> (ev->get_property ("duration"))->get_length ();
Moment measure_now = measure_position (context ());
bool recheck_needed = false;
durlog - 2,
Stem::is_invisible (stem),
stem_duration->factor (),
- (stem->get_property ("tuplet-start") == SCM_BOOL_T));
+ (to_boolean (stem->get_property ("tuplet-start"))));
stems_->push_back (stem);
last_add_mom_ = now;
extend_mom_ = max (extend_mom_, now) + get_event_length (ev, now);
process_acknowledged_count_++;
}
-ADD_ACKNOWLEDGER (Auto_beam_engraver, stem);
-ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line);
-ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
-ADD_ACKNOWLEDGER (Auto_beam_engraver, breathing_sign);
-ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
+void
+Auto_beam_engraver::boot ()
+{
+ ADD_LISTENER (Auto_beam_engraver, beam_forbid);
+ ADD_ACKNOWLEDGER (Auto_beam_engraver, stem);
+ ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line);
+ ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
+ ADD_ACKNOWLEDGER (Auto_beam_engraver, breathing_sign);
+ ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
+}
+
ADD_TRANSLATOR (Auto_beam_engraver,
/* doc */
"Generate beams based on measure characteristics and observed"
class Grace_auto_beam_engraver : public Auto_beam_engraver
{
TRANSLATOR_DECLARATIONS (Grace_auto_beam_engraver);
- DECLARE_TRANSLATOR_LISTENER (beam_forbid);
+ TRANSLATOR_INHERIT (Auto_beam_engraver);
private:
Moment last_grace_start_; // Full starting time of last grace group
virtual bool test_moment (Direction, Moment, Moment);
};
-Grace_auto_beam_engraver::Grace_auto_beam_engraver ()
+Grace_auto_beam_engraver::Grace_auto_beam_engraver (Context *c)
+ : Auto_beam_engraver (c)
{
last_grace_start_.main_part_.set_infinite (-1);
// grace_part_ is zero -> test_moment is false, last_grace_position_
// not considered.
}
-IMPLEMENT_TRANSLATOR_LISTENER (Grace_auto_beam_engraver, beam_forbid);
-void
-Grace_auto_beam_engraver::listen_beam_forbid (Stream_event *ev)
-{
- Auto_beam_engraver::listen_beam_forbid (ev);
-}
-
bool
Grace_auto_beam_engraver::is_same_grace_state (Moment, Moment)
{
return !test_mom.grace_part_;
}
-ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, stem);
-ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, bar_line);
-ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, beam);
-ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, breathing_sign);
-ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, rest);
+void
+Grace_auto_beam_engraver::boot ()
+{
+ ADD_LISTENER (Grace_auto_beam_engraver, beam_forbid);
+ ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, stem);
+ ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, bar_line);
+ ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, beam);
+ ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, breathing_sign);
+ ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, rest);
+}
+
ADD_TRANSLATOR (Grace_auto_beam_engraver,
/* doc */
"Generates one autobeam group across an entire grace phrase. "