release: 1.0.15

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

diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh
index 60ebda08cd8be2cb042b76800b703fb62c888b0f..6b627f9377fe789b893e3174cd1a2075f6d14f25 100644 (file)
--- a/lily/include/p-score.hh
+++ b/lily/include/p-score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -21,8 +21,8 @@
     
     */
 
-class Paper_score : public Music_output {
-  void tex_output ();
+class Paper_score : public Music_output
+{
 public:
   Paper_def *paper_l_;
 
@@ -33,14 +33,12 @@ public:
   Pointer_list<Spanner *> span_p_list_;
 
   /// other elements
-  Pointer_list<Score_elem*> elem_p_list_;
+  Pointer_list<Score_element*> elem_p_list_;
+  
+  Paper_outputter *outputter_l_;  
+  Line_of_score * line_l_;
   
-  Outputter *outputter_l_;  
-  Super_elem *super_elem_l_;
-    
   Paper_score ();
-  /// add a line to the broken stuff. Positions given in #config#
-  void set_breaking (Array<Col_hpositions> const &);
 
 
   /// add to bottom of pcols
@@ -59,7 +57,7 @@ public:
   /* STANDARD ROUTINES */
   void print() const;
   
-  void typeset_element (Score_elem*);
+  void typeset_element (Score_element*);
   void typeset_broken_spanner (Spanner*);
   /// add a Spanner
   void typeset_unbroken_spanner (Spanner*);
@@ -67,18 +65,22 @@ public:
     
   virtual ~Paper_score();
 protected:
+
+  
     /* MAIN ROUTINES */
   virtual void process();
 // can't instantiate template with cygnus' gcc...
 //  virtual ~Paper_score();
 
 private:
+
+  void remove_line (Line_of_score*);
   /// before calc_breaking
   void preprocess();
 
   void calc_idealspacing();
   /// calculate where the lines are to be broken, and use results
-  void calc_breaking();
+  Array<Column_x_positions> calc_breaking();
 
   /// after calc_breaking
   void postprocess();