/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1999--2011 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 "beaming-pattern.hh"
#include "beam.hh"
#include "context.hh"
+#include "context-handle.hh"
#include "duration.hh"
#include "engraver.hh"
#include "item.hh"
DECLARE_ACKNOWLEDGER (rest);
DECLARE_ACKNOWLEDGER (beam);
DECLARE_ACKNOWLEDGER (bar_line);
+ DECLARE_ACKNOWLEDGER (breathing_sign);
DECLARE_ACKNOWLEDGER (stem);
DECLARE_TRANSLATOR_LISTENER (beam_forbid);
bool is_same_grace_state (Grob *e);
void recheck_beam ();
void typeset_beam ();
- vector<Item*> *remove_end_stems (vsize);
+ vector<Item *> *remove_end_stems (vsize);
Stream_event *forbid_;
/*
*/
Moment shortest_mom_;
Spanner *finished_beam_;
- vector<Item*> *stems_;
+ vector<Item *> *stems_;
int process_acknowledged_count_;
Moment last_add_mom_;
Moment extend_mom_;
Moment beam_start_moment_;
Moment beam_start_location_;
+ /*
+ Handle on the starting staff keeps it alive until beam is comlete
+ */
+ Context_handle beam_start_context_;
// We act as if beam were created, and start a grouping anyway.
Beaming_pattern *grouping_;
Beaming_pattern *finished_grouping_;
-
Beaming_options beaming_options_;
Beaming_options finished_beaming_options_;
-
void check_bar_property ();
};
if (stems_)
{
if (extend_mom_ < now)
- end_beam ();
+ end_beam ();
}
if (scm_is_string (get_property ("whichBar")))
if (forbid_)
{
- consider_end (measure_position (context ()), shortest_mom_);
- junk_beam ();
+ if (stems_)
+ end_beam ();
+ else
+ junk_beam ();
}
}
forbid_ = 0;
process_acknowledged_count_ = 0;
stems_ = 0;
- shortest_mom_ = Moment (Rational (1, 8));
+ shortest_mom_ = Moment (Rational (1, 4));
finished_beam_ = 0;
finished_grouping_ = 0;
grouping_ = 0;
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;
+ context ()->self_scm (),
+ scm_from_int (dir),
+ test_mom.smobbed_copy (),
+ dur.smobbed_copy ())
+ != SCM_BOOL_F;
}
void
{
bool b = test_moment (START, test_mom, dur);
if (b)
- begin_beam ();
+ begin_beam ();
}
}
if (stems_)
{
/* Allow already started autobeam to end:
- don't check for autoBeaming */
+ don't check for autoBeaming */
bool b = test_moment (STOP, test_mom, dur);
if (b)
- end_beam ();
+ end_beam ();
}
}
return 0;
/*
- Can't use make_spanner_from_properties () because we have to use
+ Can't use make_spanner () because we have to use
beam_settings_.
*/
Spanner *beam = new Spanner (beam_settings_);
for (vsize i = 0; i < stems_->size (); i++)
Beam::add_stem (beam, (*stems_)[i]);
- announce_grob (beam, (*stems_)[0]->self_scm ());
+ Grob_info i = make_grob_info (beam, (*stems_)[0]->self_scm ());
+ i.rerouting_daddy_context_ = beam_start_context_.get_context ();
+ announce_grob (i);
return beam;
}
return;
}
- stems_ = new vector<Item*>;
+ stems_ = new vector<Item *>;
grouping_ = new Beaming_pattern ();
beaming_options_.from_context (context ());
beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
+ beam_start_context_.set_context (context ()->get_parent_context ());
beam_start_moment_ = now_mom ();
beam_start_location_
= robust_scm2moment (get_property ("measurePosition"), Moment (0));
grouping_ = 0;
beam_settings_ = SCM_EOL;
- shortest_mom_ = Moment (Rational (1, 8));
+ shortest_mom_ = Moment (Rational (1, 4));
}
void
finished_beam_ = create_beam ();
if (finished_beam_)
- {
- announce_end_grob (finished_beam_, SCM_EOL);
- finished_grouping_ = grouping_;
- finished_beaming_options_ = beaming_options_;
- }
+ {
+ Grob_info i = make_grob_info (finished_beam_, SCM_EOL);
+ i.rerouting_daddy_context_ = beam_start_context_.get_context ();
+
+ announce_end_grob (i);
+ finished_grouping_ = grouping_;
+ finished_beaming_options_ = beaming_options_;
+ }
delete stems_;
stems_ = 0;
grouping_ = 0;
beam_settings_ = SCM_EOL;
}
- shortest_mom_ = Moment (Rational (1, 8));
+ beam_start_context_.set_context (NULL);
+ shortest_mom_ = Moment (Rational (1, 4));
}
void
if (finished_beam_)
{
if (!finished_beam_->get_bound (RIGHT))
- finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
+ finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
finished_grouping_->beamify (finished_beaming_options_);
Beam::set_beaming (finished_beam_, finished_grouping_);
junk_beam ();
}
-
void
Auto_beam_engraver::acknowledge_beam (Grob_info /* info */)
{
end_beam ();
}
+void
+Auto_beam_engraver::acknowledge_breathing_sign (Grob_info /* info */)
+{
+ check_bar_property ();
+ if (stems_)
+ end_beam ();
+}
+
void
Auto_beam_engraver::acknowledge_rest (Grob_info /* info */)
{
if (!Stem::head_count (stem))
{
if (stems_)
- end_beam ();
+ end_beam ();
return;
}
if (Stem::get_beam (stem))
{
if (stems_)
- junk_beam ();
+ junk_beam ();
return;
}
if (durlog <= 2)
{
if (stems_)
- end_beam ();
+ end_beam ();
return;
}
if (bool (beam_start_location_.grace_part_) != bool (now.grace_part_))
return;
- Moment ev_dur = unsmob_duration (ev->get_property ("duration"))->get_length ();
- Moment dur = Rational (1, ev_dur.den ());
+ Moment dur = unsmob_duration (ev->get_property ("duration"))->get_length ();
Moment measure_now = measure_position (context ());
- bool recheck_needed = 0;
+ bool recheck_needed = false;
if (dur < shortest_mom_)
{
- /* new shortest moment, so store it and set recheck_needed */
- shortest_mom_ = dur;
- recheck_needed = 1;
+ /* new shortest moment, so store it and set recheck_needed */
+ shortest_mom_ = dur;
+ recheck_needed = true;
}
/* end should be based on shortest_mom_, begin should be
return;
grouping_->add_stem (now - beam_start_moment_ + beam_start_location_,
- durlog - 2,
- Stem::is_invisible (stem));
+ durlog - 2,
+ Stem::is_invisible (stem));
stems_->push_back (stem);
last_add_mom_ = now;
extend_mom_ = max (extend_mom_, now) + get_event_length (ev, now);
- if (recheck_needed) recheck_beam ();
+ if (recheck_needed)
+ recheck_beam ();
}
void
the last part of the beam
*/
Beaming_pattern *new_grouping_ = 0;
- vector<Item*> *new_stems_ = 0;
+ vector<Item *> *new_stems_ = 0;
Moment temporary_shortest_mom;
SCM temporary_beam_settings;
bool found_end;
-
- for (vsize i = 0; i < stems_->size () - 1; )
+ for (vsize i = 0; i < stems_->size () - 1;)
{
found_end = test_moment (STOP,
grouping_->end_moment (i),
from stems_, and return a vector containing all of the
removed stems
*/
-vector <Item*> *
+vector <Item *> *
Auto_beam_engraver::remove_end_stems (vsize split_index)
{
- vector <Item*> *removed_stems = 0;
- removed_stems = new vector <Item*>;
+ vector <Item *> *removed_stems = 0;
+ removed_stems = new vector <Item *>;
- for (vsize j=split_index + 1; j < stems_->size (); j++)
+ for (vsize j = split_index + 1; j < stems_->size (); j++)
removed_stems->push_back ((*stems_).at (j));
- for (vsize j=split_index + 1; j < stems_->size (); )
+ for (vsize j = split_index + 1; j < stems_->size ();)
stems_->pop_back ();
- return (removed_stems);
+ return removed_stems;
}
void
Auto_beam_engraver::process_acknowledged ()
{
- Moment now = now_mom();
+ Moment now = now_mom ();
if (extend_mom_ > now)
return;
{
Moment measure_now = measure_position (context ());
consider_end (measure_now, shortest_mom_);
- consider_begin (measure_now, shortest_mom_);
}
else if (process_acknowledged_count_ > 1)
{
if (stems_)
- {
- if ((extend_mom_ < now)
- || ((extend_mom_ == now) && (last_add_mom_ != now)))
- end_beam ();
- else if (!stems_->size ())
- junk_beam ();
- }
+ {
+ if ((extend_mom_ < now)
+ || ((extend_mom_ == now) && (last_add_mom_ != now)))
+ end_beam ();
+ else if (!stems_->size ())
+ junk_beam ();
+ }
}
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);
ADD_TRANSLATOR (Auto_beam_engraver,
- /* doc */
- "Generate beams based on measure characteristics and observed"
- " Stems. Uses @code{beatLength}, @code{measureLength}, and"
- " @code{measurePosition} to decide when to start and stop a"
- " beam. Overriding beaming is done through"
- " @ref{Stem_engraver} properties @code{stemLeftBeamCount} and"
- " @code{stemRightBeamCount}.",
-
- /* create */
- "Beam ",
-
- /* read */
- "autoBeaming "
- "beamSettings "
- "beatLength "
- "subdivideBeams ",
-
- /* write */
- ""
- );
+ /* doc */
+ "Generate beams based on measure characteristics and observed"
+ " Stems. Uses @code{baseMoment}, @code{beatStructure},"
+ " @code{beamExceptions}, @code{measureLength}, and"
+ " @code{measurePosition} to decide when to start and stop a"
+ " beam. Overriding beaming is done through"
+ " @ref{Stem_engraver} properties @code{stemLeftBeamCount} and"
+ " @code{stemRightBeamCount}.",
+
+ /* create */
+ "Beam ",
+
+ /* read */
+ "autoBeaming "
+ "baseMoment "
+ "beamExceptions "
+ "beatStructure "
+ "subdivideBeams ",
+
+ /* write */
+ ""
+ );