X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=b0d43ec8bb86fad20be2775b6430f71f1bdff72b;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=81d5f2c8294a7f8b95a6bf2da46cb0457a394628;hpb=830273ee6930479dbf332731ea5243a364c1bd87;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 81d5f2c829..b0d43ec8bb 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -1,9 +1,20 @@ /* - 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 - (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 "engraver.hh" @@ -42,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 (); } @@ -61,7 +72,7 @@ class Spacing_engraver : public Engraver Moment now_; Spanner *spacing_; Stream_event *start_section_; - + TRANSLATOR_DECLARATIONS (Spacing_engraver); protected: @@ -100,7 +111,7 @@ Spacing_engraver::process_music () { if (start_section_ && spacing_) stop_spanner (); - + if (!spacing_) start_spanner (); } @@ -110,10 +121,9 @@ Spacing_engraver::start_spanner () { assert (!spacing_); - spacing_ = make_spanner ("SpacingSpanner", SCM_EOL); spacing_->set_bound (LEFT, - unsmob_grob (get_property ("currentCommandColumn"))); + Grob::unsmob (get_property ("currentCommandColumn"))); } void @@ -127,7 +137,7 @@ Spacing_engraver::stop_spanner () { if (spacing_) { - Grob *p = unsmob_grob (get_property ("currentCommandColumn")); + Grob *p = Grob::unsmob (get_property ("currentCommandColumn")); spacing_->set_bound (RIGHT, p); spacing_ = 0; @@ -149,7 +159,7 @@ Spacing_engraver::acknowledge_staff_spacing (Grob_info i) void Spacing_engraver::acknowledge_rhythmic_grob (Grob_info i) { - add_starter_duration (i); + add_starter_duration (i); } void @@ -158,7 +168,6 @@ Spacing_engraver::acknowledge_rhythmic_head (Grob_info i) add_starter_duration (i); } - void Spacing_engraver::add_starter_duration (Grob_info i) { @@ -173,11 +182,11 @@ Spacing_engraver::add_starter_duration (Grob_info i) { 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); + } } } @@ -185,18 +194,17 @@ void Spacing_engraver::stop_translation_timestep () { Paper_column *musical_column - = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); - + = dynamic_cast (Grob::unsmob (get_property ("currentMusicalColumn"))); if (!spacing_) start_spanner (); musical_column->set_object ("spacing", spacing_->self_scm ()); - unsmob_grob (get_property ("currentCommandColumn")) - ->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); @@ -210,10 +218,10 @@ Spacing_engraver::stop_translation_timestep () { 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); @@ -222,10 +230,10 @@ Spacing_engraver::stop_translation_timestep () { 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 (); @@ -239,8 +247,6 @@ Spacing_engraver::stop_translation_timestep () musical_column->set_property ("shortest-starter-duration", st); } - - void Spacing_engraver::start_translation_timestep () { @@ -248,7 +254,7 @@ 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_) @@ -261,13 +267,18 @@ 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", - /* 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 */ + "" + );