Gets vertical ordering of footnotes correct.

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

diff --git a/lily/include/beaming-pattern.hh b/lily/include/beaming-pattern.hh
index 6eed0606b30f462576684afae4e85df2a77349e4..1fe990aaa49392a569b8c5196698c72d38112b5b 100644 (file)
--- a/lily/include/beaming-pattern.hh
+++ b/lily/include/beaming-pattern.hh
@@ -32,7 +32,7 @@ struct Beaming_options
   Moment measure_length_;
 
   Beaming_options ();
-  void from_context (Context*);
+  void from_context (Context *);
 };
 
 struct Beam_rhythmic_element
@@ -43,7 +43,9 @@ struct Beam_rhythmic_element
   int rhythmic_importance_;
   bool invisible_;
 
-  Beam_rhythmic_element (Moment, int, bool);
+  Rational factor_;
+
+  Beam_rhythmic_element (Moment, int, bool, Rational);
   Beam_rhythmic_element ();
 
   int count (Direction d) const;
@@ -59,19 +61,20 @@ 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);
   int beamlet_count (int idx, Direction d) const;
   bool invisibility (int idx) const;
+  Rational factor (int idx) const;
   Moment start_moment (int idx) const;
   Moment end_moment (int idx) const;
-  Beaming_pattern* split_pattern(int idx);
+  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 ();
 };