From: fred <fred>
Date: Sun, 24 Mar 2002 19:39:27 +0000 (+0000)
Subject: lilypond-0.0.52
X-Git-Tag: release/1.5.59~4949
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a186835ffb49edf31f6e11086a555bc98be8caa4;p=lilypond.git

lilypond-0.0.52
---

diff --git a/init/register.ini b/init/register.ini
index e5822087ba..4168de973d 100644
--- a/init/register.ini
+++ b/init/register.ini
@@ -8,6 +8,7 @@ melodicregs = \inputregister {
 	\inputregister {Meter_register}
 	\inputregister {Local_key_register}
 	\inputregister { Staff_sym_register }
+	\inputregister { Collision_register }
 	\inputregister {
 		Voice_group_registers
 		\inputregister { Dynamic_register }
diff --git a/lily/include/collision-reg.hh b/lily/include/collision-reg.hh
new file mode 100644
index 0000000000..31de018f46
--- /dev/null
+++ b/lily/include/collision-reg.hh
@@ -0,0 +1,25 @@
+/*
+  collision-reg.hh -- declare Collision_register
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef COLLISION_REG_HH
+#define COLLISION_REG_HH
+
+#include "register.hh"
+
+class Collision_register : public Request_register {
+    Collision* col_p_;
+
+protected:
+    virtual void acknowledge_element(Staff_elem_info);
+    virtual void pre_move_processing();
+public:
+    Collision_register();
+    NAME_MEMBERS(Collision_register);
+};
+#endif // COLLISION_REG_HH
diff --git a/lily/include/collision.hh b/lily/include/collision.hh
new file mode 100644
index 0000000000..844496a855
--- /dev/null
+++ b/lily/include/collision.hh
@@ -0,0 +1,25 @@
+/*
+  collision.hh -- declare Collision
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef COLLISION_HH
+#define COLLISION_HH
+#include "lily-proto.hh"
+#include "item.hh"
+
+class Collision : public Item {
+    Array<Note_column*> clash_l_arr_;
+protected:
+    virtual void do_pre_processing();
+public:
+    NAME_MEMBERS(Collision);
+    void add (Note_column*ncol_l);
+    Collision();
+    
+};
+#endif // COLLISION_HH