Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

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

diff --git a/lily/include/beaming-pattern.hh b/lily/include/beaming-pattern.hh
index 4a9eae6198c7eb8ab61b0a8cbea846e6953641e0..b78ae31a22351a1d595a331befa55efd81b36deb 100644 (file)
--- a/lily/include/beaming-pattern.hh
+++ b/lily/include/beaming-pattern.hh
@@ -29,14 +29,13 @@ struct Beam_rhythmic_element
   Moment start_moment_;
   Drul_array<int> beam_count_drul_;
 
-  Moment beat_start_;
-  Moment beat_length_;
-  Moment group_start_;
+  int rhythmic_importance_;
+  bool invisible_;
   
-  Beam_rhythmic_element (Moment, int);
+  Beam_rhythmic_element (Moment, int, bool);
   Beam_rhythmic_element ();
 
-  int count (Direction d);
+  int count (Direction d) const;
   void de_grace ();
 };
 
@@ -51,14 +50,14 @@ public:
   
   void beamify (Beaming_options const&);
   void de_grace ();
-  void add_stem (Moment d, int beams);
+  void add_stem (Moment d, int beams, bool invisible);
   int beamlet_count (int idx, Direction d) const;
   
 private:
   vector<Beam_rhythmic_element> infos_;
-  void beamify (bool);
-  int beam_extend_count (Direction) const;
-  int best_splitpoint_index (bool *split) const;
+  Direction flag_direction (vsize) const;
+  void find_rhythmic_importance (Beaming_options const&);
+  void unbeam_invisible_stems ();
 };
 
 #endif /* BEAMING_PATTERN_HH */