release: 1.3.73

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

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 3d33f133bcc633800b5045c5597cf824c1d51a52..31914b2c206176575f6a94a100cf5a6d978f219e 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, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,53 +15,31 @@
 #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.
     
     */
-
 class Paper_score : public Music_output
 {
-  SCM element_smob_list_;
+  SCM main_smob_;
 public:
   Paper_def *paper_l_;
 
-  /// the columns, ordered left to right
-  /*
-    UGH. MOVE INTO LINE_OF_SCORE ?!
-   */
-  Link_array<Paper_column> col_l_arr_;
-
   Paper_outputter *outputter_l_;  
   Line_of_score * line_l_;
   
   Paper_score ();
 
-  void fixup_refpoints ();
-
-
-  /// 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 (Line_of_score*);
     
-    
-  /* 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();
@@ -69,7 +47,6 @@ protected:
 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();