X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-score.hh;h=7ec8fe8ce3c2f0af591533843f980cc8d9244ca3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c17afddfee42bd25c3ede20dbd29902cc3bf2d2f;hpb=d9d9a1b85f7d68dd35fb435c5ca315c6eb793af0;p=lilypond.git

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index c17afddfee..7ec8fe8ce3 100644
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -3,82 +3,45 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2008 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
 {
-  /// crescs etc; no particular order
-  Link_array<Spanner> span_p_arr_;
-
-  /// other elements
-  Link_array<Score_element> elem_p_arr_;
-  Link_array<Score_element> break_helpers_arr_;
+  Output_def *layout_;
+  System *system_;
+  SCM systems_;
+  SCM paper_systems_;
 
-  SCM protected_scms_;
+  mutable vector<Grob*> cols_;
+  mutable vector<vsize> break_indices_;
 public:
-  Paper_def *paper_l_;
-
-  /// the columns, ordered left to right
-  Link_array<Paper_column> col_l_arr_;
-
-  Paper_outputter *outputter_l_;  
-  Line_of_score * line_l_;
+  Paper_score (Output_def *);
   
-  Paper_score ();
-
+  DECLARE_CLASSNAME(Paper_score);
 
-  /// add to bottom of pcols
-  void add_column (Paper_column*);
+  Output_def *layout () const;
+  System *root_system () const;
 
-  /**
-    @return index of argument.
-    */
-  int find_col_idx (Paper_column const *) const;
-
-  Link_array<Item> broken_col_range (Item const*,Item const*) const;
-    
-    
-  /* STANDARD ROUTINES */
-  void print() const;
-  
-  void typeset_element (Score_element*);
-  void typeset_broken_spanner (Spanner*);
-  /// add a Spanner
-  void typeset_unbroken_spanner (Spanner*);
-  
-    
-  virtual ~Paper_score();
+  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 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 */