patch::: 1.3.32.hwn2

[lilypond.git] / lily / include / axis-group-spanner.hh

diff --git a/lily/include/axis-group-spanner.hh b/lily/include/axis-group-spanner.hh
index 028529a6ef21473d1e39ebc66d9c2ff2519f842b..d421973f5058d361958dc8c487184e068144fad5 100644 (file)
--- a/lily/include/axis-group-spanner.hh
+++ b/lily/include/axis-group-spanner.hh
@@ -3,35 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#ifndef SPAN_AXIS_GROUP_HH
-#define SPAN_AXIS_GROUP_HH
+#ifndef AXIS_GROUP_SPANNER_HH
+#define AXIS_GROUP_SPANNER_HH
 
 #include "spanner.hh"
-#include "axis-group.hh"
+#include "axis-group-element.hh"
 
-/** An element which groups a line in a certain direction. The most
-  useful example of this is the Vertical_group_spanner */
-class Axis_group_spanner : public Spanner, public virtual Axis_group_element
-{
-  void do_break_processing_if_unbroken();
-protected:
-  virtual void do_junk_links () { 
-    Spanner::do_junk_links();
-    Axis_group_element::do_junk_links();
-  }
-  virtual void do_unlink() {
-    Spanner::do_unlink();
-    Axis_group_element::do_unlink();
-  }
-  virtual void do_break_processing();
-  virtual void do_print() const;
+/**
+   An element which groups a line in a certain direction. The most
+   useful example of this is the Vertical_group_spanner
+*/
+class Axis_group_spanner : public virtual Axis_group_element,
+                          public virtual Spanner
 
+{
 public:
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS(Score_element);
 };
 
 #endif // SPAN_AXIS_GROUP_HH