X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-score.hh;h=ac1b76208940b33386aacd5c4a39a960f36d98e8;hb=95e5705d0697eac20246352d416f14b6d92485f5;hp=8a46e6f93e0ef5de970b34be081b8e3fc0769111;hpb=0824dba176ac4991cc7671f18cf920f365100313;p=lilypond.git

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 8a46e6f93e..ac1b762089 100644
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -3,57 +3,45 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#ifndef P_SCORE_HH
-#define P_SCORE_HH
+#ifndef PAPER_SCORE_HH
+#define PAPER_SCORE_HH
 
 #include "column-x-positions.hh"
-#include "parray.hh"
-#include "lily-proto.hh"
 #include "music-output.hh"
-#include "lily-guile.hh"
-
 
-/** all stuff which goes onto paper. notes, signs, symbols in a score
-     #Paper_score# contains the items, the columns.
-    
-    */
+/* LAYOUT output */
 class Paper_score : public Music_output
 {
-  SCM main_smob_;
-public:
-  Paper_def *paper_l_;
-
-  Paper_outputter *outputter_l_;  
+  Output_def *layout_;
   System *system_;
+  SCM systems_;
+  SCM paper_systems_;
+
+  mutable vector<Grob*> cols_;
+  mutable vector<vsize> break_indices_;
+public:
+  Paper_score (Output_def *);
   
-  Paper_score ();
+  DECLARE_CLASSNAME(Paper_score);
 
-  /**
-    @return index of argument.
-    */
-  int find_col_idx (Paper_column const *) const;
+  Output_def *layout () const;
+  System *root_system () const;
 
-  Link_array<Item> broken_col_range (Item const*,Item const*) const;
-  void typeset_line (System*);
-    
+  void typeset_system (System *);
+  vector<Column_x_positions> calc_breaking ();
+  vector<vsize> find_break_indices () const;
+  vector<vsize> get_break_indices () const;
+  vector<Grob*> get_columns () const;
+  SCM get_paper_systems ();
 protected:
-    /* MAIN ROUTINES */
   virtual void process ();
+  virtual void derived_mark () const;
 
 private:
-  /// before calc_breaking
-  void preprocess ();
-  void calc_idealspacing ();
-  /// calculate where the lines are to be broken, and use results
-  Array<Column_x_positions> calc_breaking ();
-
-  /// after calc_breaking
-  void postprocess ();
   Paper_score (Paper_score const &);
 };
 
-#endif
+#endif /* PAPER_SCORE_HH */