Index: lily/include/note-collision.hh |
diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh |
index ae0f3271b0ce9bfe0fabe1705bfeb021b946084f..a473e03821f4c72ba7b137e27f5dac14bf595d82 100644 |
--- a/lily/include/note-collision.hh |
+++ b/lily/include/note-collision.hh |
@@ -45,4 +45,29 @@ public: |
static void add_column (Grob *me, Grob *ncol); |
DECLARE_GROB_INTERFACE (); |
}; |
+ |
+ |
+struct Collision_type { |
+ bool merge_possible; |
+ |
+ bool touch; |
+ bool full_collide; |
+ bool close_half_collide; |
+ bool distant_half_collide; |
+}; |
+ |
+void update_offsets (Drul_array<vector<Real> > *offsets, |
+ Drul_array<vector<Grob *> > const &clash_groups, |
+ Real shift_amount); |
+ |
+ |
+Collision_type determine_collision_type(Grob *me, |
+ Drul_array<Grob *> stems, |
+ vector<int> ups, |
+ vector<int> dps, |
+ Grob *head_up, |
+ Grob *head_down, |
+ int up_ball_type, |
+ int down_ball_type); |
+ |
#endif // COLLISION_HH |