Merge remote-tracking branch 'origin/translation'

[lilypond.git] / lily / include / beaming-pattern.hh

diff --git a/lily/include/beaming-pattern.hh b/lily/include/beaming-pattern.hh
index eb813da275517094b8d8a645722362ace58bd2e8..8210e1e5f8acebb484dbac894875e69412457cf1 100644 (file)
--- 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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2014 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,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
@@ -42,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;
@@ -58,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 ();
 };