X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeaming-pattern.hh;h=8210e1e5f8acebb484dbac894875e69412457cf1;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=58ec08443b6ed112476457b5cf9257f029aee128;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/include/beaming-pattern.hh b/lily/include/beaming-pattern.hh index 58ec08443b..8210e1e5f8 100644 --- a/lily/include/beaming-pattern.hh +++ b/lily/include/beaming-pattern.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2014 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 @@ -28,6 +28,7 @@ struct Beaming_options { SCM grouping_; bool subdivide_beams_; + bool strict_beat_beaming_; Moment base_moment_; Moment measure_length_; @@ -43,7 +44,11 @@ struct Beam_rhythmic_element int rhythmic_importance_; bool invisible_; - Beam_rhythmic_element (Moment, int, bool); + Rational factor_; + + bool tuplet_start_; + + Beam_rhythmic_element (Moment, int, bool, Rational, bool); Beam_rhythmic_element (); int count (Direction d) const; @@ -61,9 +66,11 @@ public: void beamify (Beaming_options const &); void de_grace (); - void add_stem (Moment d, int beams, bool invisible); + void add_stem (Moment d, int beams, bool invisible, Rational factor, bool tuplet_starrt); int beamlet_count (int idx, Direction d) const; bool invisibility (int idx) const; + Rational factor (int idx) const; + bool tuplet_start (int idx) const; Moment start_moment (int idx) const; Moment end_moment (int idx) const; Beaming_pattern *split_pattern (int idx);