* The grand 2005-2006 replace.

[lilypond.git] / lily / include / paper-score.hh

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index bd90ec1de26f030a5e163bfd31f34cbd94fe08ff..a117bb74e7f5a2b5738086824a6d87bbcbacdb4d 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_SCORE_HH
@@ -15,27 +15,28 @@
 /* LAYOUT output */
 class Paper_score : public Music_output
 {
-public:
   Output_def *layout_;
   System *system_;
+  SCM systems_;
+  SCM paper_systems_;
+
+public:
+  Paper_score (Output_def *);
 
-  Paper_score ();
+  DECLARE_CLASSNAME(Paper_score);
 
-  int find_col_idx (Paper_column const *) const;
-  Link_array<Item> broken_col_range (Item const *, Item const *) const;
-  void typeset_line (System *);
-  void output ();
+  Output_def *layout () const;
+  System *root_system () const;
 
+  void typeset_system (System *);
+  Array<Column_x_positions> calc_breaking ();
+
+  SCM get_paper_systems () const;
 protected:
-  virtual SCM process (String);
+  virtual void process ();
+  virtual void derived_mark () const;
 
 private:
-  Protected_scm systems_;
-
-  void preprocess ();
-  void calc_idealspacing ();
-  Array<Column_x_positions> calc_breaking ();
-  void postprocess ();
   Paper_score (Paper_score const &);
 };