release: 0.1.11

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

diff --git a/lily/include/axis-group.hh b/lily/include/axis-group.hh
index bdf758cb4288de571199773e2019c026c5e8e161..e2e030f0b9fd3b9184e8a43d05d4b9e141aa231e 100644 (file)
--- a/lily/include/axis-group.hh
+++ b/lily/include/axis-group.hh
@@ -15,21 +15,22 @@ axis-group.hh -- declare Axis_group_administration, Axis_group_element
 #include "real.hh"
 #include "lily-proto.hh"
 #include "score-elem.hh"
+
 /**
   Do the dirty work for Axis_group_element.
  */
 struct Axis_group_administration {
-    Link_array<Score_elem> elem_l_arr_;
-    
-    Interval extent(Axis)const;
-    void print() const ;
-    Axis_group_administration(Axis_group_administration const&);
-    Axis_group_administration(){}
-    void remove_all(Axis a1,Axis a2);
+  Link_array<Score_elem> elem_l_arr_;
     
-    bool contains_b(Score_elem const *)const;
-    void add_element(Score_elem*, Axis_group_element*, Axis a1, Axis a2);
-    void remove_element(Score_elem*, Axis a1, Axis a2);
+  Interval extent (Axis) const;
+  void print() const ;
+  Axis_group_administration (Axis_group_administration const&);
+  Axis_group_administration(){}
+  void remove_all (Axis a1,   Axis a2);
+
+  bool contains_b (Score_elem const *) const;
+  void add_element (Score_elem*, Axis_group_element*, Axis a1, Axis a2);
+  void remove_element (Score_elem*, Axis a1, Axis a2);
 };
 
 /** 
@@ -38,16 +39,18 @@ struct Axis_group_administration {
   */
 class Axis_group_element : public virtual Score_elem {
 protected:
-    Axis_group_administration axis_admin_;
-    virtual void do_print()const;
-    virtual Link_array<Score_elem> get_extra_dependencies()const;
-    virtual void do_unlink();
+  Axis_group_administration axis_admin_;
+  virtual void do_print() const;
+  virtual Link_array<Score_elem> get_extra_dependencies() const;
+  virtual void do_unlink();
+  virtual void do_junk_links();
 
 public:
-    virtual void remove_all()=0;
-    virtual void add_element(Score_elem*)=0;
-    virtual void remove_element(Score_elem*)=0;
-    virtual bool contains_b(Score_elem const *)const;
-    DECLARE_MY_RUNTIME_TYPEINFO;
+  Axis_group_element();
+  virtual void remove_all()=0;
+  virtual void add_element (Score_elem*)=0;
+  virtual void remove_element (Score_elem*)=0;
+  virtual bool contains_b (Score_elem const *) const;
+  DECLARE_MY_RUNTIME_TYPEINFO;
 };
 #endif // Axis_group_administration_HH