lilypond-0.1.14

diff --git a/lily/axis-group-spanner.cc b/lily/axis-group-spanner.cc
index 033a55b33a25be97a84e0af417556f87249d7bc6..42050ae5b4499fda404da13cd5c55757b7890361 100644 (file)
--- a/lily/axis-group-spanner.cc
+++ b/lily/axis-group-spanner.cc
@@ -17,7 +17,7 @@
 void
 Axis_group_spanner::do_break_processing_if_unbroken()
 {
-  Link_array<Score_elem> elems = axis_admin_.elem_l_arr_;
+  Link_array<Score_elem> elems = elem_l_arr ();
   Line_of_score *my_line = line_l();
   for (int i=0; i < elems.size(); i++) 
     {
@@ -49,7 +49,7 @@ Axis_group_spanner::do_break_processing()
     }
 
   break_into_pieces ();
-  Link_array<Score_elem> loose_elems = axis_admin_.elem_l_arr_;
+  Link_array<Score_elem> loose_elems = elem_l_arr ();
   remove_all();
   
   for (int i=0; i < loose_elems.size(); i++) 

diff --git a/lily/include/axis-group-administration.hh b/lily/include/axis-group-administration.hh
index 77007f8ff1ab66ee97eb29b3f4261be0cb1d72a4..d7e33e4c7e35e587bafeec8bebe1be3eb30a4645 100644 (file)
--- a/lily/include/axis-group-administration.hh
+++ b/lily/include/axis-group-administration.hh
@@ -20,7 +20,7 @@
   Do the dirty work for Axis_group_element.
  */
 struct Axis_group_administration {
-  Link_array<Score_elem> elem_l_arr_;
+  Link_array<Graphical_element> elem_l_arr_;
     
   Interval extent (Axis) const;
   void print() const ;
@@ -28,9 +28,9 @@ struct Axis_group_administration {
   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);
+  bool contains_b (Graphical_element const *) const;
+  void add_element (Graphical_element*, Axis_group_element*, Axis a1, Axis a2);
+  void remove_element (Graphical_element*, Axis a1, Axis a2);
 };
 
 #endif // AXIS_GROUP_ADMINISTRATION_HH

diff --git a/lily/include/axis-group-element.hh b/lily/include/axis-group-element.hh
index 42a31fd42365842d9fcf8bd6a2c01353bba64334..b79b70084ecb25a89e2b3725c95e035f611b74b9 100644 (file)
--- a/lily/include/axis-group-element.hh
+++ b/lily/include/axis-group-element.hh
@@ -25,11 +25,12 @@ protected:
   virtual void do_junk_links();
 
 public:
+  virtual Link_array<Score_elem> elem_l_arr() const;
   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;
+  virtual void add_element (Graphical_element*)=0;
+  virtual void remove_element (Graphical_element*)=0;
+  virtual bool contains_b (Graphical_element const *) const;
   DECLARE_MY_RUNTIME_TYPEINFO;
 };
 

diff --git a/lily/include/elem-group.hh b/lily/include/elem-group.hh
index 0edd067ec21814df8186765bdce7eaada035689b..82ab4cc787517a1883e8bd518cd0d92aea0e4298 100644 (file)
--- a/lily/include/elem-group.hh
+++ b/lily/include/elem-group.hh
@@ -26,8 +26,8 @@ protected:
 
 public:
     DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual void add_element (Score_elem*);
-    virtual void remove_element (Score_elem*);
+    virtual void add_element (Graphical_element*);
+    virtual void remove_element (Graphical_element*);
 
 };
 /**
@@ -39,8 +39,8 @@ protected:
     virtual void remove_all();
 
 public:
-    virtual void add_element (Score_elem*);
-    virtual void remove_element (Score_elem*);
+    virtual void add_element (Graphical_element*);
+    virtual void remove_element (Graphical_element*);
     DECLARE_MY_RUNTIME_TYPEINFO;
 };
 
@@ -54,8 +54,8 @@ class Horizontal_vertical_group_element : public Vertical_group_element,
 protected:
     virtual void remove_all();
 public:
-    virtual void add_element (Score_elem*);
-    virtual void remove_element (Score_elem*);
+    virtual void add_element (Graphical_element*);
+    virtual void remove_element (Graphical_element*);
     
     DECLARE_MY_RUNTIME_TYPEINFO;    
 };

diff --git a/lily/include/horizontal-group-item.hh b/lily/include/horizontal-group-item.hh
index 35918c95706313a092d1e2b7b042c4a14a74ae94..10d8106b1d5eb790fe6ede1ef08d765e9b22e30e 100644 (file)
--- a/lily/include/horizontal-group-item.hh
+++ b/lily/include/horizontal-group-item.hh
@@ -27,8 +27,8 @@ protected:
   }
   virtual void do_print() const;
 public:
-  virtual void add_element (Score_elem*e) { Horizontal_group_element::add_element (e); }
-  virtual void remove_element (Score_elem*e) { Horizontal_group_element::remove_element (e); }
+  virtual void add_element (Graphical_element*e) { Horizontal_group_element::add_element (e); }
+  virtual void remove_element (Graphical_element*e) { Horizontal_group_element::remove_element (e); }
   DECLARE_MY_RUNTIME_TYPEINFO;
   SCORE_ELEM_CLONE(Horizontal_group_item);
 };

diff --git a/lily/include/vertical-group-spanner.hh b/lily/include/vertical-group-spanner.hh
index 720b2989324e212a870d25778305d09d7dd670b8..3c9ef948bce9628af57447bedf1494ca75f49c50 100644 (file)
--- a/lily/include/vertical-group-spanner.hh
+++ b/lily/include/vertical-group-spanner.hh
@@ -24,8 +24,8 @@ protected:
   virtual void do_unlink () { Axis_group_spanner::do_unlink (); }
 public:
   DECLARE_MY_RUNTIME_TYPEINFO;
-  virtual void add_element (Score_elem*e) { Vertical_group_element::add_element (e); }
-  virtual void remove_element (Score_elem*e) { Vertical_group_element::remove_element (e); }  
+  virtual void add_element (Graphical_element*e) { Vertical_group_element::add_element (e); }
+  virtual void remove_element (Graphical_element*e) { Vertical_group_element::remove_element (e); }  
 };
 
 #endif // SPAN_VERTICAL_GROUP_HH