(LY_DEFINE): new file.

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

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 5310e2ac086a5bccd8292c56764541ae727b4b1d..3e82beb44822acd4a6c20a31a2cf058a7ad8b07f 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -3,57 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.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_;
-
-  Paper_outputter *outputter_;  
+  Output_def *layout_;
   System *system_;
-  
+
   Paper_score ();
 
-  /**
-    @return index of argument.
-    */
   int find_col_idx (Paper_column const *) const;
-
-  Link_array<Item> broken_col_range (Item const*,Item const*) const;
+  Link_array<Item> broken_col_range (Item const*, Item const*) const;
   void typeset_line (System*);
-    
+  void output ();
+
 protected:
-    /* MAIN ROUTINES */
-  virtual void process ();
+  virtual SCM process (String);
 
 private:
-  /// before calc_breaking
+  Protected_scm systems_;
+
   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 */