-/*
- new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
-
+/*
+ new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
+
source file of the GNU LilyPond music typesetter
-
- (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "engraver.hh"
+ (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
#include "repeated-music.hh"
-#include "engraver-group-engraver.hh"
-#include "global-translator.hh"
+#include "global-context.hh"
#include "warn.hh"
#include "misc.hh"
#include "spanner.hh"
#include "item.hh"
#include "percent-repeat-iterator.hh"
+#include "bar-line.hh"
+#include "score-engraver.hh"
/**
- This acknowledges repeated music with "percent" style. It typesets
- a % sign.
+ This acknowledges repeated music with "percent" style. It typesets
+ a % sign.
- TODO:
+ TODO:
- - BEAT case: Create items for single beat repeats, i.e. c4 / / /
+ - BEAT case: Create items for single beat repeats, i.e. c4 / / /
- - DOUBLE_MEASURE case: attach a % to an appropriate barline.
-
+ - DOUBLE_MEASURE case: attach a % to an appropriate barline.
*/
class Percent_repeat_engraver : public Engraver
{
void typeset_perc ();
public:
- VIRTUAL_COPY_CONS (Translator);
- Percent_repeat_engraver ();
+ TRANSLATOR_DECLARATIONS (Percent_repeat_engraver);
protected:
- Repeated_music * repeat_;
+ Music *repeat_;
/// moment (global time) where beam started.
Moment start_mom_;
Moment next_moment_;
Moment body_length_;
- enum {
- UNKNOWN,
- BEAT,
- MEASURE,
- DOUBLE_MEASURE,
- } repeat_sign_type_ ;
-
- Spanner * perc_p_;
- Spanner * finished_perc_p_;
- Item * stem_tremolo_;
+ enum
+ {
+ UNKNOWN,
+ MEASURE,
+ DOUBLE_MEASURE,
+ }
+ repeat_sign_type_;
+
+ Item *double_percent_;
+ Spanner *perc_;
+ Spanner *finished_perc_;
protected:
virtual void finalize ();
- virtual bool try_music (Music*);
- virtual void acknowledge_grob (Grob_info);
- virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
- virtual void process_music ();
+ virtual bool try_music (Music *);
+ void stop_translation_timestep ();
+ void start_translation_timestep ();
+ void process_music ();
};
Percent_repeat_engraver::Percent_repeat_engraver ()
{
- perc_p_ = finished_perc_p_ = 0;
- repeat_ =0;
- stem_tremolo_ = 0;
+ perc_ = 0;
+ finished_perc_ = 0;
+ repeat_ = 0;
+
+ double_percent_ = 0;
}
bool
-Percent_repeat_engraver::try_music (Music * m)
+Percent_repeat_engraver::try_music (Music *m)
{
- Repeated_music * rp = dynamic_cast<Repeated_music*> (m);
- if (rp
- && rp->get_mus_property ("iterator-ctor")
- == Percent_repeat_iterator::constructor_cxx_function
+ if (m->is_mus_type ("repeated-music")
+ && m->get_property ("iterator-ctor")
+ == Percent_repeat_iterator::constructor_proc
&& !repeat_)
{
- body_length_ = rp->body_length_mom ();
- int count = rp->repeat_count ();
-
+ body_length_ = Repeated_music::body_get_length (m);
+ int count = Repeated_music::repeat_count (m);
+
Moment now = now_mom ();
start_mom_ = now;
stop_mom_ = start_mom_ + Moment (count) * body_length_;
next_moment_ = start_mom_ + body_length_;
- SCM m = get_property ("timeSignatureFraction");
- Moment mlen (1,
- gh_scm2int (gh_cdr (m)));
-
- if (mlen == body_length_)
- repeat_sign_type_ = BEAT;
+ Moment meas_len (robust_scm2moment (get_property ("measureLength"), Moment (1)));
+ if (meas_len == body_length_)
+ repeat_sign_type_ = MEASURE;
+ else if (Moment (2) * meas_len == body_length_)
+ {
+ repeat_sign_type_ = DOUBLE_MEASURE;
+ }
else
{
- mlen *= gh_scm2int (gh_car (m));
- if (mlen == body_length_)
- repeat_sign_type_ = MEASURE;
- else if (Moment (2)* mlen == body_length_)
- repeat_sign_type_ = DOUBLE_MEASURE;
-
- if (repeat_sign_type_ != MEASURE)
- {
- warning (_ ("Don't know yet how to handle this percent repeat."));
- return false;
- }
+ warning (_f ("can't handle a percent repeat of length: %s",
+ body_length_.to_string ()));
+ return false;
}
- repeat_ = rp;
+ repeat_ = m;
-
- Global_translator *global_l =0;
- Translator *t = this;
- do
+ Global_context *global = get_global_context ();
+ for (int i = 1; i < count; i++)
{
- t = t->daddy_trans_l_ ;
- global_l = dynamic_cast<Global_translator*> (t);
+ Moment m = next_moment_ + Moment (i) * body_length_;
+ global->add_moment_to_process (m);
+
+ /* bars between % too. */
+ if (repeat_sign_type_ == DOUBLE_MEASURE)
+ global->add_moment_to_process (m - meas_len);
}
- while (!global_l);
- for (int i = 0; i < count; i++)
- global_l->add_moment_to_process (now + Moment (1+i) * body_length_);
-
+ if (repeat_sign_type_ == DOUBLE_MEASURE)
+ next_moment_ += meas_len;
+
return true;
}
{
if (repeat_ && now_mom () == next_moment_)
{
- if (repeat_sign_type_ == BEAT)
+ if (repeat_sign_type_ == MEASURE)
{
- ;
+ finished_perc_ = perc_;
+ typeset_perc ();
+ perc_ = make_spanner ("PercentRepeat", repeat_->self_scm ());
+ SCM col = get_property ("currentCommandColumn");
+ perc_->set_bound (LEFT, unsmob_grob (col));
}
- else if (repeat_sign_type_ == MEASURE)
+ else if (repeat_sign_type_ == DOUBLE_MEASURE)
{
- finished_perc_p_ = perc_p_;
- typeset_perc ();
- perc_p_ = new Spanner (get_property ("PercentRepeat"));
- SCM col =get_property ("currentCommandColumn");
- perc_p_->set_bound (LEFT, unsmob_grob (col));
- announce_grob (perc_p_, repeat_);
+ double_percent_ = make_item ("DoublePercentRepeat", repeat_->self_scm ());
+
+ /*
+ forbid breaks on a % line. Should forbid all breaks, really.
+
+ Ugh. Why can't this be regular communication between
+ contexts?
+ */
+ get_score_engraver ()->forbid_breaks ();
}
-
next_moment_ = next_moment_ + body_length_;
}
}
+
void
Percent_repeat_engraver::finalize ()
{
typeset_perc ();
- if (perc_p_)
+ if (perc_)
{
- repeat_->origin ()->warning (_ ("unterminated chord tremolo"));
- perc_p_->suicide ();
+ repeat_->origin ()->warning (_ ("unterminated percent repeat"));
+ perc_->suicide ();
}
}
void
Percent_repeat_engraver::typeset_perc ()
{
- if (finished_perc_p_)
+ if (finished_perc_)
{
- SCM col =get_property ("currentCommandColumn");
- finished_perc_p_->set_bound (RIGHT, unsmob_grob (col));
- typeset_grob (finished_perc_p_);
- finished_perc_p_ = 0;
+ SCM col = get_property ("currentCommandColumn");
+ finished_perc_->set_bound (RIGHT, unsmob_grob (col));
+ finished_perc_ = 0;
}
-}
-
-void
-Percent_repeat_engraver::acknowledge_grob (Grob_info info)
-{
+ double_percent_ = 0;
}
-
void
Percent_repeat_engraver::start_translation_timestep ()
{
- if (perc_p_ && stop_mom_ == now_mom ())
+ if (stop_mom_ == now_mom ())
{
- finished_perc_p_ = perc_p_;
- typeset_perc ();
+ if (perc_)
+ {
+ finished_perc_ = perc_;
+ typeset_perc ();
+ }
repeat_ = 0;
- perc_p_ = 0;
+ perc_ = 0;
repeat_sign_type_ = UNKNOWN;
}
}
-
void
Percent_repeat_engraver::stop_translation_timestep ()
{
typeset_perc ();
}
-ADD_THIS_TRANSLATOR (Percent_repeat_engraver);
-
+#include "translator.icc"
+ADD_TRANSLATOR (Percent_repeat_engraver,
+ /* doc */ "Make whole bar and double bar repeats.",
+ /* create */ "PercentRepeat DoublePercentRepeat",
+ /* accept */ "repeated-music",
+ /* read */ "measureLength currentCommandColumn",
+ /* write */ "");
projects / lilypond.git / blobdiff