X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fbeaming-pattern.hh;h=8b9318da5d1ed5e96778a160666752318e70e10a;hb=b0f94fb2156046b5fc721f271d55e2feb788167d;hp=df21ccc93bcf2c44f32e1795d31a6a32c35f28e7;hpb=f287d7846e9d5f2de14894cd655b2f84341c4a2c;p=lilypond.git

diff --git a/lily/include/beaming-pattern.hh b/lily/include/beaming-pattern.hh
index df21ccc93b..8b9318da5d 100644
--- a/lily/include/beaming-pattern.hh
+++ b/lily/include/beaming-pattern.hh
@@ -1,9 +1,20 @@
 /*
-  beaming-pattern.hh -- declare beaming-pattern.hh
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 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
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #ifndef BEAMING_PATTERN_HH
@@ -17,11 +28,12 @@ struct Beaming_options
 {
   SCM grouping_;
   bool subdivide_beams_;
-  Moment beat_length_;
+  bool strict_beat_beaming_;
+  Moment base_moment_;
   Moment measure_length_;
 
   Beaming_options ();
-  void from_context (Context*);  
+  void from_context (Context *);
 };
 
 struct Beam_rhythmic_element
@@ -31,8 +43,12 @@ 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;
@@ -47,16 +63,22 @@ class Beaming_pattern
 {
 public:
   Beaming_pattern ();
-  
-  void beamify (Beaming_options const&);
+
+  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);
+
 private:
   vector<Beam_rhythmic_element> infos_;
-  Direction flag_direction (Beaming_options const&, vsize) const;
-  void find_rhythmic_importance (Beaming_options const&);
+  Direction flag_direction (Beaming_options const &, vsize) const;
+  void find_rhythmic_importance (Beaming_options const &);
   void unbeam_invisible_stems ();
 };