improve freetype error reporting.

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

diff --git a/lily/include/system.hh b/lily/include/system.hh
index 9866a1966778125ce25edb882491732159e372f2..48e6875dfb43e4aaa2d1984602a5658a7f928dfc 100644 (file)
--- a/lily/include/system.hh
+++ b/lily/include/system.hh
@@ -1,8 +1,7 @@
-
 /*
-  line-of-score.hh -- part of GNU LilyPond
+  system.hh -- part of GNU LilyPond
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
 #ifndef SYSTEM_HH
@@ -10,9 +9,7 @@
 
 #include "column-x-positions.hh"
 #include "spanner.hh"
-#include "grob-array.hh"
 #include "skyline.hh"
-#include "grob-interface.hh"
 
 /*
   If you keep following offset reference points, you will always end
@@ -36,8 +33,8 @@ public:
   SCM get_paper_system ();
   SCM get_paper_systems ();
 
-  System (SCM, Object_key const *);
-  System (System const &, int);
+  System (SCM);
+  System (System const &);
 
   int element_count () const;
   int spanner_count () const;
@@ -46,7 +43,8 @@ public:
   DECLARE_GROB_INTERFACE();
 
   vector<Item*> broken_col_range (Item const *, Item const *) const;
-  vector<Grob*> columns () const;
+  vector<Grob*> used_columns () const;
+  Paper_column *column (vsize i) const;
 
   void add_column (Paper_column *);
   void typeset_grob (Grob *);
@@ -54,7 +52,7 @@ public:
 
 protected:
   virtual void derived_mark () const;
-  virtual Grob *clone (int count) const;
+  virtual Grob *clone () const;
 };
 
 void set_loose_columns (System *which, Column_x_positions const *posns);