release: 0.1.52

[lilypond.git] / lily / include / elem-group.hh

diff --git a/lily/include/elem-group.hh b/lily/include/elem-group.hh
index c49c425a45e3493cfdbb2ff47c9f5d8f08861c32..59bb03cdf052c0ad86b357eb622ac569f13d11d5 100644 (file)
--- a/lily/include/elem-group.hh
+++ b/lily/include/elem-group.hh
@@ -1,5 +1,5 @@
 /*
-  elem-group.hh -- declare Horizontal_vertical_group
+  elem-group.hh -- declare Horizontal_vertical_group_element
 
   source file of the GNU LilyPond music typesetter
 
@@ -9,63 +9,12 @@
 
 #ifndef ELEM_GROUP_HH
 #define ELEM_GROUP_HH
-#include "score-elem.hh"
 
-class Elbement_group: public virtual Score_elem {
-protected:
-    Link_array<Score_elem> elem_l_arr_;
-    
-    virtual void do_print() const ;
-public:
-    Elbement_group();
-    bool contains_b(Score_elem const *)const;
-    void add_element(Score_elem*);
-    NAME_MEMBERS();
-       
-};
+#include "score-elem.hh"
+#include "axis-group-element.hh"
 
-class Horizontal_group : public Elbement_group {
-public:
-    NAME_MEMBERS();
-    Horizontal_group(Horizontal_group const&);
-    Horizontal_group(){}
-    void add_element(Score_elem*);
-protected:
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    virtual void do_print() const ;
-  virtual void translate_x(Real);
-    virtual Interval do_width()const;
-};
 
-class Vertical_group : public Elbement_group {
-protected:
-    virtual void translate_y(Real);
-    virtual void do_print() const ;
-  virtual Interval do_height()const;
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    void add_element(Score_elem*);
-public:
-    Vertical_group(Vertical_group const &);
-    Vertical_group(){}
-    NAME_MEMBERS();
-};
 
-/** A class to treat a group of elements as a single entity. The
-  dimensions are the unions of the dimensions of what it contains.
-  Translation means translating the contents.
-  */
-class Horizontal_vertical_group : public Vertical_group, 
-                                 public Horizontal_group 
-{  
-protected:
-    virtual Horizontal_vertical_group* elem_group() { return this; }
-public:
-    Element_group();
-    bool contains_b(Score_elem const *)const;
-    NAME_MEMBERS();
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    virtual void do_print() const;
-    void add_element(Score_elem*);
-};
 
+#error
 #endif // ELEM_GROUP_HH