* lily/lyric-engraver.cc (get_current_rest): New function.

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

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 7fad9b8b3295d2ad7a732e057891c57dbc8b5308..2adfdafb38b248699ba4a4831b1ff9cf0220d383 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -3,75 +3,44 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1999 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"
+#include "protected-scm.hh"
 
-/** all stuff which goes onto paper. notes, signs, symbols in a score
-     #Paper_score# contains the items, the columns.
-    
-    */
-
+/* PAPER output */
 class Paper_score : public Music_output
 {
-  SCM element_smob_list_;
 public:
-  Paper_def *paper_l_;
-
-  /// the columns, ordered left to right
-  Link_array<Paper_column> col_l_arr_;
+  Output_def *paper_;
+  System *system_;
 
-  Paper_outputter *outputter_l_;  
-  Line_of_score * line_l_;
-  
   Paper_score ();
 
-
-  /// add to bottom of pcols
-  void add_column (Paper_column*);
-
-  /**
-    @return index of argument.
-    */
   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 ();
 
-  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();
 protected:
-    /* MAIN ROUTINES */
-  virtual void process();
+  virtual SCM process (String);
 
 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();
+  Protected_scm systems_;
 
-  /// after calc_breaking
-  void postprocess();
+  void preprocess ();
+  void calc_idealspacing ();
+  Array<Column_x_positions> calc_breaking ();
+  void postprocess ();
   Paper_score (Paper_score const &);
 };
 
-#endif
+#endif /* PAPER_SCORE_HH */