X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=05244d1cd0175c17414be248e7c796a07053eab3;hb=087a4bf794b39cbfd99eb032183101013386f475;hp=5da8f7d4077ba6cc4d22610a7dcc8af9005b2b8a;hpb=1855cf7137149c0bd27b5851fd9db498385591b3;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 5da8f7d407..05244d1cd0 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -1,42 +1,43 @@ -/* - spacing-engraver.cc -- implement Spacing_engraver - +/* + spacing-engraver.cc -- implement Spacing_engraver + source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ -#include "event.hh" + (c) 1999--2005 Han-Wen Nienhuys +*/ + #include "paper-column.hh" #include "engraver.hh" #include "pqueue.hh" #include "note-spacing.hh" #include "staff-spacing.hh" -#include "group-interface.hh" +#include "pointer-group-interface.hh" #include "spanner.hh" +#include "translator.icc" + struct Rhythmic_tuple { Grob_info info_; Moment end_; - + Rhythmic_tuple () - { - } + { + } Rhythmic_tuple (Grob_info i, Moment m) - { - info_ = i; - end_ = m; - } - static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &); + { + info_ = i; + end_ = m; + } + static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &); }; -/** - Acknowledge rhythmic elements, for initializing spacing fields in - the columns. - - should be the last one of the toplevel context +/* + TODO: allow starting & stopping of spacing regions. +*/ +/* + Acknowledge rhythmic elements, for initializing spacing fields in + the columns. */ class Spacing_engraver : public Engraver { @@ -44,21 +45,25 @@ class Spacing_engraver : public Engraver Array now_durations_; Array stopped_durations_; Moment now_; - Spanner * spacing_; - + Spanner *spacing_; + TRANSLATOR_DECLARATIONS (Spacing_engraver); + protected: - virtual void acknowledge_grob (Grob_info); - virtual void start_translation_timestep (); - virtual void stop_translation_timestep (); - virtual void process_music (); + DECLARE_ACKNOWLEDGER (staff_spacing); + DECLARE_ACKNOWLEDGER (note_spacing); + DECLARE_ACKNOWLEDGER (rhythmic_head); + + void start_translation_timestep (); + void stop_translation_timestep (); + void process_music (); virtual void finalize (); }; inline int compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b) { - return Rhythmic_tuple::time_compare (a,b); + return Rhythmic_tuple::time_compare (a, b); } int @@ -79,8 +84,7 @@ Spacing_engraver::process_music () if (!spacing_) { spacing_ = make_spanner ("SpacingSpanner", SCM_EOL); - spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); - + spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); } } @@ -89,28 +93,35 @@ Spacing_engraver::finalize () { if (spacing_) { - Grob * p = unsmob_grob (get_property ("currentCommandColumn")); - + Grob *p = unsmob_grob (get_property ("currentCommandColumn")); + spacing_->set_bound (RIGHT, p); - spacing_ =0; + spacing_ = 0; } } void -Spacing_engraver::acknowledge_grob (Grob_info i) +Spacing_engraver::acknowledge_note_spacing (Grob_info i) { - if (Note_spacing::has_interface (i.grob_) || Staff_spacing::has_interface (i.grob_)) - { - Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob_); - } - - if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")) - || i.grob_->internal_has_interface (ly_symbol2scm ("multi-measure-event"))) + Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ()); +} + +void +Spacing_engraver::acknowledge_staff_spacing (Grob_info i) +{ + Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ()); +} + +void +Spacing_engraver::acknowledge_rhythmic_head (Grob_info i) +{ + if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")) + || i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface"))) return; /* - only pay attention to durations that are not grace notes. - */ + only pay attention to durations that are not grace notes. + */ if (!now_.grace_part_) { Music *r = i.music_cause (); @@ -126,43 +137,50 @@ Spacing_engraver::acknowledge_grob (Grob_info i) void Spacing_engraver::stop_translation_timestep () { + Paper_column *musical_column + = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); + + SCM proportional = get_property ("proportionalNotationDuration"); + if (unsmob_moment (proportional)) + { + musical_column->set_property ("shortest-playing-duration", proportional); + musical_column->set_property ("shortest-starter-duration", proportional); + return; + } + Moment shortest_playing; shortest_playing.set_infinite (1); - for (int i=0; i < playing_durations_.size (); i++) + for (int i = 0; i < playing_durations_.size (); i++) { - Music * mus = playing_durations_[i].info_.music_cause (); + Music *mus = playing_durations_[i].info_.music_cause (); if (mus) { Moment m = mus->get_length (); - shortest_playing = shortest_playing get_length (); if (m.to_bool ()) { - starter = starter (unsmob_grob (get_property ("currentMusicalColumn"))); + + shortest_playing = min (shortest_playing, starter); assert (starter.to_bool ()); SCM sh = shortest_playing.smobbed_copy (); SCM st = starter.smobbed_copy (); - sc->set_property ("shortest-playing-duration", sh); - sc->set_property ("shortest-starter-duration", st); + musical_column->set_property ("shortest-playing-duration", sh); + musical_column->set_property ("shortest-starter-duration", st); } void @@ -176,13 +194,19 @@ Spacing_engraver::start_translation_timestep () stopped_durations_.push (playing_durations_.get ()); } - - - -ENTER_DESCRIPTION (Spacing_engraver, -/* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes ", -/* creats*/ "SpacingSpanner", -/* accepts */ "", -/* acks */ "grob-interface", -/* reads */ "", -/* write */ ""); +ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing); +ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing); +ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head); + +ADD_TRANSLATOR (Spacing_engraver, + "make a SpacingSpanner and do " + "bookkeeping of shortest starting and playing notes ", + + /* create */ "SpacingSpanner", + /* accept */ "", + /* read */ + "currentMusicalColumn " + "currentCommandColumn " + "proportionalNotationDuration", + + /* write */ "");