X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=00dc8227609b68fd2eb067d317399d1b678057b2;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=b3ca5753932cb2253c2cc3e3d385bc8d18c61940;hpb=d755c3361f6a53ee9b40013e0ee7df69aab56f3d;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index b3ca575393..00dc822760 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -1,18 +1,31 @@ /* - 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--2015 Han-Wen Nienhuys - (c) 1999--2006 Han-Wen Nienhuys + 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 . */ -#include "paper-column.hh" #include "engraver.hh" -#include "pqueue.hh" +#include "moment.hh" #include "note-spacing.hh" -#include "staff-spacing.hh" +#include "paper-column.hh" #include "pointer-group-interface.hh" +#include "pqueue.hh" #include "spanner.hh" +#include "staff-spacing.hh" +#include "stream-event.hh" #include "translator.icc" @@ -40,7 +53,7 @@ compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b) 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 (); } @@ -58,37 +71,39 @@ class Spacing_engraver : public Engraver vector stopped_durations_; Moment now_; Spanner *spacing_; - Music *start_section_; - + Stream_event *start_section_; + TRANSLATOR_DECLARATIONS (Spacing_engraver); protected: - DECLARE_ACKNOWLEDGER (staff_spacing); - DECLARE_ACKNOWLEDGER (note_spacing); - DECLARE_ACKNOWLEDGER (rhythmic_head); + void acknowledge_staff_spacing (Grob_info); + void acknowledge_note_spacing (Grob_info); + void acknowledge_rhythmic_head (Grob_info); + void acknowledge_rhythmic_grob (Grob_info); + void listen_spacing_section (Stream_event *); void start_translation_timestep (); void stop_translation_timestep (); void process_music (); - + void add_starter_duration (Grob_info i); + virtual void finalize (); - virtual bool try_music (Music *m); void start_spanner (); void stop_spanner (); }; -Spacing_engraver::Spacing_engraver () +Spacing_engraver::Spacing_engraver (Context *c) + : Engraver (c) { spacing_ = 0; start_section_ = 0; } -bool -Spacing_engraver::try_music (Music *m) +void +Spacing_engraver::listen_spacing_section (Stream_event *ev) { - start_section_ = m; - return true; + ASSIGN_EVENT_ONCE (start_section_, ev); } void @@ -96,7 +111,7 @@ Spacing_engraver::process_music () { if (start_section_ && spacing_) stop_spanner (); - + if (!spacing_) start_spanner (); } @@ -108,7 +123,7 @@ Spacing_engraver::start_spanner () spacing_ = make_spanner ("SpacingSpanner", SCM_EOL); spacing_->set_bound (LEFT, - unsmob_grob (get_property ("currentCommandColumn"))); + unsmob (get_property ("currentCommandColumn"))); } void @@ -122,7 +137,7 @@ Spacing_engraver::stop_spanner () { if (spacing_) { - Grob *p = unsmob_grob (get_property ("currentCommandColumn")); + Grob *p = unsmob (get_property ("currentCommandColumn")); spacing_->set_bound (RIGHT, p); spacing_ = 0; @@ -141,8 +156,20 @@ Spacing_engraver::acknowledge_staff_spacing (Grob_info i) 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"))) @@ -153,13 +180,13 @@ Spacing_engraver::acknowledge_rhythmic_head (Grob_info i) */ if (!now_.grace_part_) { - Music *r = i.music_cause (); - if (r && r->is_mus_type ("rhythmic-event")) - { - Moment len = r->get_length (); - Rhythmic_tuple t (i, now_mom () + len); - now_durations_.push_back (t); - } + Stream_event *r = i.event_cause (); + if (r && r->in_event_class ("rhythmic-event")) + { + Moment len = get_event_length (r, now_); + Rhythmic_tuple t (i, now_mom () + len); + now_durations_.push_back (t); + } } } @@ -167,13 +194,21 @@ void Spacing_engraver::stop_translation_timestep () { Paper_column *musical_column - = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); + = unsmob (get_property ("currentMusicalColumn")); + + if (!spacing_) + start_spanner (); + + musical_column->set_object ("spacing", spacing_->self_scm ()); + unsmob (get_property ("currentCommandColumn")) + ->set_object ("spacing", spacing_->self_scm ()); SCM proportional = get_property ("proportionalNotationDuration"); - if (unsmob_moment (proportional)) + if (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; } @@ -181,24 +216,24 @@ Spacing_engraver::stop_translation_timestep () shortest_playing.set_infinite (1); for (vsize i = 0; i < playing_durations_.size (); i++) { - Music *mus = playing_durations_[i].info_.music_cause (); - if (mus) - { - Moment m = mus->get_length (); - shortest_playing = min (shortest_playing, m); - } + Stream_event *ev = playing_durations_[i].info_.event_cause (); + if (ev) + { + Moment m = get_event_length (ev); + shortest_playing = min (shortest_playing, m); + } } Moment starter; starter.set_infinite (1); for (vsize i = 0; i < now_durations_.size (); i++) { - Moment m = now_durations_[i].info_.music_cause ()->get_length (); + 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 (); @@ -219,27 +254,37 @@ 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_) stopped_durations_.push_back (playing_durations_.get ()); } -ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing); -ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing); -ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head); + +void +Spacing_engraver::boot () +{ + ADD_LISTENER (Spacing_engraver, spacing_section); + 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 */ + "" + );