patch::: 1.1.37.script1

[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 138c58787a5da57e6337dd84e707929fe872c03d..0de8cc51efb3a6a2eaed60863454b14d2e21eadd 100644 (file)
--- a/lily/include/axis-group-spanner.hh
+++ b/lily/include/axis-group-spanner.hh
@@ -7,23 +7,26 @@
 */
 
 
-#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-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
+class Axis_group_spanner : public virtual Axis_group_element,
+                          public virtual Spanner
+
 {
   void do_break_processing_if_unbroken();
 protected:
   virtual void do_break_processing();
   virtual void do_print() const;
+  virtual Interval do_width () const;
 
 public:
-  
+  VIRTUAL_COPY_CONS(Score_element);
 };
 
 #endif // SPAN_AXIS_GROUP_HH