Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / beam.hh

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index e79b2705d9a70106808735b2abe3cef8d08cf763..9126bfbfec8e8051772978a29fe9d0a77255db6b 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -10,9 +10,9 @@
 #ifndef BEAM_HH
 #define BEAM_HH
 
+#include "grob-interface.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "stem-info.hh"
 
 /*
@@ -40,22 +40,48 @@ struct Beam_quant_parameters
   void fill (Grob *him);
 };
 
+struct Beam_segment
+{
+  int vertical_count_;
+  Interval horizontal_; 
+  Beam_segment ();
+};
+
+struct Beam_stem_segment 
+{
+  Beam_stem_segment ();
+
+  Grob *stem_;
+  Real width_;
+  Real stem_x_;
+  int rank_;
+  int stem_index_;
+  bool gapped_;
+  Direction dir_;
+  int max_connect_;
+  
+};
+
+
+bool operator <(Beam_stem_segment const &a, Beam_stem_segment const &b);
+
 class Beam
 {
 public:
   static int visible_stem_count (Grob *);
   static Grob *first_visible_stem (Grob *);
   static Grob *last_visible_stem (Grob *);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static void add_stem (Grob *, Grob *);
   static bool is_knee (Grob *);
-  static void set_beaming (Grob *, Beaming_info_list const *);
+  static void set_beaming (Grob *, Beaming_pattern const *);
   static void set_stemlens (Grob *);
   static int get_beam_count (Grob *me);
   static Real get_beam_translation (Grob *me);
   static Real get_thickness (Grob *me);
   static void connect_beams (Grob *me);
-
+  static vector<Beam_segment> get_beam_segments (Grob *me_grob, Grob **common); 
+  
   DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM prev_off));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM));