X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeaming-pattern.hh;h=089bb31abdcdc21912091cd5f71bc7ff0b434aa2;hb=0c538805488f6a6c134fe88ccef58995037535e9;hp=1fe990aaa49392a569b8c5196698c72d38112b5b;hpb=44155056614ee1ff6b3bf4f286bdb386147c21a2;p=lilypond.git

diff --git a/lily/include/beaming-pattern.hh b/lily/include/beaming-pattern.hh
index 1fe990aaa4..089bb31abd 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 <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   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_;
 
@@ -45,7 +46,9 @@ struct Beam_rhythmic_element
 
   Rational factor_;
 
-  Beam_rhythmic_element (Moment, int, bool, Rational);
+  bool tuplet_start_;
+
+  Beam_rhythmic_element (Moment, int, bool, Rational, bool);
   Beam_rhythmic_element ();
 
   int count (Direction d) const;
@@ -63,10 +66,11 @@ public:
 
   void beamify (Beaming_options const &);
   void de_grace ();
-  void add_stem (Moment d, int beams, bool invisible, Rational factor);
+  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);
@@ -76,6 +80,9 @@ private:
   Direction flag_direction (Beaming_options const &, vsize) const;
   void find_rhythmic_importance (Beaming_options const &);
   void unbeam_invisible_stems ();
+  Moment remaining_length (int idx) const;
+  int beam_count_for_rhythmic_position (int idx) const;
+  int beam_count_for_length (Moment len) const;
 };
 
 #endif /* BEAMING_PATTERN_HH */