/*
- spacing-engraver.cc -- implement Spacing_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1999--2006 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "engraver.hh"
+#include "moment.hh"
#include "note-spacing.hh"
#include "paper-column.hh"
#include "pointer-group-interface.hh"
int
Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
- Rhythmic_tuple const &h2)
+ Rhythmic_tuple const &h2)
{
return (h1.end_ - h2.end_).main_part_.sign ();
}
Moment now_;
Spanner *spacing_;
Stream_event *start_section_;
-
+
TRANSLATOR_DECLARATIONS (Spacing_engraver);
protected:
DECLARE_ACKNOWLEDGER (staff_spacing);
DECLARE_ACKNOWLEDGER (note_spacing);
DECLARE_ACKNOWLEDGER (rhythmic_head);
+ DECLARE_ACKNOWLEDGER (rhythmic_grob);
DECLARE_TRANSLATOR_LISTENER (spacing_section);
void start_translation_timestep ();
void stop_translation_timestep ();
void process_music ();
-
+ void add_starter_duration (Grob_info i);
+
virtual void finalize ();
void start_spanner ();
void
Spacing_engraver::listen_spacing_section (Stream_event *ev)
{
- start_section_ = ev;
+ ASSIGN_EVENT_ONCE (start_section_, ev);
}
void
{
if (start_section_ && spacing_)
stop_spanner ();
-
+
if (!spacing_)
start_spanner ();
}
spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
spacing_->set_bound (LEFT,
- unsmob_grob (get_property ("currentCommandColumn")));
+ Grob::unsmob (get_property ("currentCommandColumn")));
}
void
{
if (spacing_)
{
- Grob *p = unsmob_grob (get_property ("currentCommandColumn"));
+ Grob *p = Grob::unsmob (get_property ("currentCommandColumn"));
spacing_->set_bound (RIGHT, p);
spacing_ = 0;
Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
}
+void
+Spacing_engraver::acknowledge_rhythmic_grob (Grob_info i)
+{
+ add_starter_duration (i);
+}
+
void
Spacing_engraver::acknowledge_rhythmic_head (Grob_info i)
+{
+ add_starter_duration (i);
+}
+
+void
+Spacing_engraver::add_starter_duration (Grob_info i)
{
if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
|| i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface")))
{
Stream_event *r = i.event_cause ();
if (r && r->in_event_class ("rhythmic-event"))
- {
- Moment len = get_event_length (r);
- Rhythmic_tuple t (i, now_mom () + len);
- now_durations_.push_back (t);
- }
+ {
+ Moment len = get_event_length (r, now_);
+ Rhythmic_tuple t (i, now_mom () + len);
+ now_durations_.push_back (t);
+ }
}
}
Spacing_engraver::stop_translation_timestep ()
{
Paper_column *musical_column
- = dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
+ = dynamic_cast<Paper_column *> (Grob::unsmob (get_property ("currentMusicalColumn")));
+
+ if (!spacing_)
+ start_spanner ();
+
+ musical_column->set_object ("spacing", spacing_->self_scm ());
+ Grob::unsmob (get_property ("currentCommandColumn"))
+ ->set_object ("spacing", spacing_->self_scm ());
SCM proportional = get_property ("proportionalNotationDuration");
- if (unsmob_moment (proportional))
+ if (Moment::unsmob (proportional))
{
musical_column->set_property ("shortest-playing-duration", proportional);
musical_column->set_property ("shortest-starter-duration", proportional);
+ musical_column->set_property ("used", SCM_BOOL_T);
return;
}
{
Stream_event *ev = playing_durations_[i].info_.event_cause ();
if (ev)
- {
- Moment m = get_event_length (ev);
- shortest_playing = min (shortest_playing, m);
- }
+ {
+ Moment m = get_event_length (ev);
+ shortest_playing = min (shortest_playing, m);
+ }
}
Moment starter;
starter.set_infinite (1);
{
Moment m = get_event_length (now_durations_[i].info_.event_cause ());
if (m.to_bool ())
- {
- starter = min (starter, m);
- playing_durations_.insert (now_durations_[i]);
- }
+ {
+ starter = min (starter, m);
+ playing_durations_.insert (now_durations_[i]);
+ }
}
now_durations_.clear ();
musical_column->set_property ("shortest-playing-duration", sh);
musical_column->set_property ("shortest-starter-duration", st);
-
- musical_column->set_object ("spacing", spacing_->self_scm ());
- unsmob_grob (get_property ("currentCommandColumn"))
- ->set_object ("spacing", spacing_->self_scm ());
}
-
-
void
Spacing_engraver::start_translation_timestep ()
{
now_ = now_mom ();
stopped_durations_.clear ();
-
+
while (playing_durations_.size () && playing_durations_.front ().end_ < now_)
playing_durations_.delmin ();
while (playing_durations_.size () && playing_durations_.front ().end_ == now_)
ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing);
ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing);
ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_grob);
ADD_TRANSLATOR (Spacing_engraver,
- "make a SpacingSpanner and do "
- "bookkeeping of shortest starting and playing notes ",
-
- /* create */ "SpacingSpanner",
- /* accept */
- "spacing-section-event ",
- /* read */
- "currentMusicalColumn "
- "currentCommandColumn "
- "proportionalNotationDuration",
-
- /* write */ "");
+ /* doc */
+ "Make a @code{SpacingSpanner} and do bookkeeping of shortest"
+ " starting and playing notes.",
+
+ /* create */
+ "SpacingSpanner ",
+
+ /* read */
+ "currentMusicalColumn "
+ "currentCommandColumn "
+ "proportionalNotationDuration ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff