X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=9acf07106b601525e6a388cfc0fa85bbbb9390b2;hb=32f10f1e5741ddadbae0ed5d4bd3008a22fb6fb9;hp=9d8e6acd3ffad646e01f47cfb7ac2dab15e9a61f;hpb=ea1b3696c02bb143fc7faf8b872a5c23c0725fef;p=lilypond.git diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 9d8e6acd3f..9acf07106b 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -1,16 +1,14 @@ -/* - tuplet-engraver.cc -- implement Tuplet_engraver - +/* + tuplet-engraver.cc -- implement Tuplet_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2004 Han-Wen Nienhuys - - */ + + (c) 1998--2005 Han-Wen Nienhuys +*/ #include "tuplet-bracket.hh" #include "note-column.hh" #include "beam.hh" -#include "music-list.hh" #include "engraver.hh" #include "spanner.hh" @@ -20,7 +18,7 @@ struct Tuplet_description Rational stop_; Rational span_stop_; Spanner *spanner_; - Tuplet_description() + Tuplet_description () { music_ = 0; spanner_ = 0; @@ -36,7 +34,7 @@ protected: Array tuplets_; virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*r); + virtual bool try_music (Music *r); virtual void start_translation_timestep (); virtual void process_music (); }; @@ -51,13 +49,13 @@ Tuplet_engraver::try_music (Music *music) { Tuplet_description d; d.music_ = music; - d.stop_ = now_mom ().main_part_ + music->get_length ().main_part_; + d.stop_ = now_mom ().main_part_ + music->get_length ().main_part_; d.span_stop_ = d.stop_; - + SCM s = get_property ("tupletSpannerDuration"); if (unsmob_moment (s)) d.span_stop_ = d.span_stop_ self_scm ()); tuplets_[i].spanner_ = spanner; @@ -92,9 +90,9 @@ Tuplet_engraver::acknowledge_grob (Grob_info i) if (Note_column::has_interface (i.grob_)) { for (int j = 0; j < tuplets_.size (); j++) - if (tuplets_[j].spanner_) + if (tuplets_[j].spanner_) Tuplet_bracket::add_column (tuplets_[j].spanner_, - dynamic_cast (i.grob_)); + dynamic_cast (i.grob_)); } } @@ -116,10 +114,10 @@ Tuplet_engraver::start_translation_timestep () { if (!sp->get_bound (RIGHT)) sp->set_bound (RIGHT, sp->get_bound (LEFT)); - + tuplets_[i].spanner_ = 0; } - + if (tsd.to_bool ()) tuplets_[i].span_stop_ += tsd.main_part_; } @@ -136,9 +134,9 @@ Tuplet_engraver::Tuplet_engraver () } ADD_TRANSLATOR (Tuplet_engraver, -/* descr */ "Catch Time_scaled_music and generate appropriate bracket ", -/* creats*/ "TupletBracket", -/* accepts */ "time-scaled-music", -/* acks */ "note-column-interface", -/* reads */ "tupletNumberFormatFunction tupletSpannerDuration", -/* write */ ""); + /* descr */ "Catch Time_scaled_music and generate appropriate bracket ", + /* creats*/ "TupletBracket", + /* accepts */ "time-scaled-music", + /* acks */ "note-column-interface", + /* reads */ "tupletNumberFormatFunction tupletSpannerDuration", + /* write */ "");