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 7c497cd919d07e27f5d9b0570159a5e7b40b1fad..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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,87 +14,79 @@
 #include "parray.hh"
 #include "lily-proto.hh"
 #include "plist.hh"
+#include "music-output.hh"
 
 /** all stuff which goes onto paper. notes, signs, symbols in a score
      #Paper_score# contains the items, the columns.
     
     */
 
-class Paper_score {
+class Paper_score : public Music_output
+{
 public:
-    Paper_def *paper_l_;
+  Paper_def *paper_l_;
 
-    /// the columns, ordered left to right
-    Pointer_list<PCol *> col_p_list_;
+  /// the columns, ordered left to right
+  Link_list<Paper_column *> col_p_list_;
 
-    /// the idealspacings, no particular order
-    Pointer_list<Idealspacing*> suz_p_list_;
+  /// crescs etc; no particular order
+  Pointer_list<Spanner *> span_p_list_;
 
-    /// crescs etc; no particular order
-    Pointer_list<Spanner *> span_p_list_;
+  /// other elements
+  Pointer_list<Score_element*> elem_p_list_;
+  
+  Paper_outputter *outputter_l_;  
+  Line_of_score * line_l_;
+  
+  Paper_score ();
 
-    /// other elements
-    Pointer_list<Score_elem*> elem_p_list_;
-    
-    Super_elem *super_elem_l_;
-
-    /* *************** */
-    /* CONSTRUCTION */
-    
-    Paper_score (Paper_def*);
-    /// add a line to the broken stuff. Positions given in #config#
-    void set_breaking (Array<Col_hpositions> const &);
-
-    /** add an item.
-       add the item in specified containers. If breakstatus is set
-       properly, add it to the {pre,post}break of the pcol.
-       */
-    void typeset_item (Item *item_p,  PCol *pcol_l);
-
-    /// add to bottom of pcols
-    void add (PCol*);
-
-    /**
-      @return argument as a cursor of the list
-      */
-    PCursor<PCol *> find_col (PCol const *)const;
-
-    Link_array<PCol> col_range (PCol *left_l, PCol *right_l) const;
-    Link_array<PCol> breakable_col_range (PCol*,PCol*) const;
-    Link_array<PCol> broken_col_range (PCol*,PCol*) const;
-    
-    /* MAIN ROUTINES */
-    void process();
 
-    /// last deed of this struct
-    void output (Tex_stream &ts);
+  /// add to bottom of pcols
+  void add_column (Paper_column*);
 
-    /* UTILITY ROUTINES */
+  /**
+    @return argument as a cursor of the list
+    */
+  PCursor<Paper_column *> find_col (Paper_column const *) const;
 
+  Link_array<Paper_column> col_range (Paper_column *left_l, Paper_column *right_l) const;
+  Link_array<Paper_column> breakable_col_range (Paper_column*,Paper_column*) const;
+  Link_array<Item> broken_col_range (Item const*,Item const*) const;
     
-    /* STANDARD ROUTINES */
-    void OK()const;
-    void print() const;
-    ~Paper_score();
-    void typeset_element (Score_elem*);
-    void typeset_broken_spanner (Spanner*);
-    /// add a Spanner
-    void typeset_unbroken_spanner (Spanner*);
+    
+  /* 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();
+// can't instantiate template with cygnus' gcc...
+//  virtual ~Paper_score();
+
 private:
-    /// before calc_breaking
-    void preprocess();
 
-    void calc_idealspacing();
-    /// calculate where the lines are to be broken, and use results
-    void calc_breaking();
+  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
+  Array<Column_x_positions> calc_breaking();
 
-    /// after calc_breaking
-    void postprocess();
+  /// after calc_breaking
+  void postprocess();
     
-    /// delete unused columns
-    void clean_cols();
+  /// delete unused columns
+  void clean_cols();
 };
 
 #endif