* The grand 2005-2006 replace.

[lilypond.git] / lily / include / system.hh

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 18ef76e739c21f78b63381d8c44c8653f3505be9..ce6f69fee6783dd5b49e997980cf8fb3aac7034e 100644 (file)
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -2,7 +2,7 @@
 /*
   line-of-score.hh -- part of GNU LilyPond
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2006 Han-Wen Nienhuys
 */
 
 #ifndef SYSTEM_HH
@@ -21,7 +21,10 @@ class System : public Spanner
 {
   int rank_;
   Grob_array *all_elements_;
-  void init_elements ();  
+  void init_elements ();
+  friend class Paper_score;    // ugh.
+  Paper_score *pscore_;        // ugh.
+  
 public:
   int get_rank () const;
   void post_processing ();
@@ -45,10 +48,11 @@ public:
   void pre_processing ();
 
 protected:
-  virtual SCM do_derived_mark () const;
+  virtual void derived_mark () const;
   virtual Grob *clone (int count) const;
 };
 
 void set_loose_columns (System *which, Column_x_positions const *posns);
+
 #endif /* SYSTEM_HH */