release: 0.1.11

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

diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh
index 5490345729eb3d7b42432b8aa675c3be36cef849..1ca1f30ac8971b7ffcc71fb5af1a4b927f7d275f 100644 (file)
--- a/lily/include/p-score.hh
+++ b/lily/include/p-score.hh
@@ -1,5 +1,5 @@
 /*
-  p-score.hh -- declare PScore
+  p-score.hh -- declare Paper_score
 
   source file of the GNU LilyPond music typesetter
 
@@ -14,92 +14,74 @@
 #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
-     #PScore# contains the items, the columns.
+     #Paper_score# contains the items, the columns.
     
     */
 
-class PScore {
+class Paper_score : public Music_output {
 public:
-    Paper_def *paper_l_;
+  Paper_def *paper_l_;
 
-    /// the columns, ordered left to right
-    Pointer_list<PCol *> cols;
+  /// the columns, ordered left to right
+  Link_list<Paper_column *> col_p_list_;
 
-    /// the idealspacings, no particular order
-    Pointer_list<Idealspacing*> suz;
+  /// crescs etc; no particular order
+  Pointer_list<Spanner *> span_p_list_;
 
-    /// crescs etc; no particular order
-    Pointer_list<Spanner *> spanners;
-
-    /// other elements
-    Pointer_list<Score_elem*> elem_p_list_;
+  /// other elements
+  Pointer_list<Score_elem*> elem_p_list_;
     
-    Super_elem *super_elem_l_;
-
-    /* *************** */
-    /* CONSTRUCTION */
+  Super_elem *super_elem_l_;
     
-    PScore(Paper_def*);
-    /// add a line to the broken stuff. Positions given in #config#
-    void set_breaking(Array<Col_hpositions> const &);
+  Paper_score ();
+  /// 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,int breakstatus=1);
 
-    ///    add to bottom of pcols
-    void add(PCol*);
+  /// add to bottom of pcols
+  void add_column (Paper_column*);
 
-    /**
-      @return argument as a cursor of the list
-      */
-    PCursor<PCol *> find_col(PCol const *)const;
+  /**
+    @return argument as a cursor of the list
+    */
+  PCursor<Paper_column *> find_col (Paper_column const *) const;
 
-    Link_array<PCol> col_range(PCol *left_l, PCol *right_l) 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;
     
-    /* MAIN ROUTINES */
-    void process();
-
-    /// last deed of this struct
-    void output(Tex_stream &ts);
-
-    /* UTILITY ROUTINES */
-
-    /// get the spacing between c1 and c2, create one if necessary.
-    Idealspacing* get_spacing(PCol *c1, PCol *c2);
-
-    /// connect c1 and c2
-    void do_connect(PCol *c1, PCol *c2, Real distance_f, Real strength_f);
-
-    /// connect c1 and c2 and any children of c1 and c2
-    void connect(PCol* c1, PCol *c2, Real distance_f,Real  strength_f= 1.0);
     
-    /* STANDARD ROUTINES */
-    void OK()const;
-    void print() const;
-    ~PScore();
-    void typeset_element(Score_elem*);
-    void typeset_broken_spanner(Spanner*);
-    /// add a Spanner
-    void typeset_unbroken_spanner(Spanner*);
+  /* STANDARD ROUTINES */
+  void OK() const;
+  void print() const;
+  
+  void typeset_element (Score_elem*);
+  void typeset_broken_spanner (Spanner*);
+  /// add a Spanner
+  void typeset_unbroken_spanner (Spanner*);
  
     
+protected:
+    /* MAIN ROUTINES */
+  virtual void process();
+  virtual ~Paper_score();
+
 private:
-    /// before calc_breaking
-    void preprocess();
+  /// before calc_breaking
+  void preprocess();
 
-    /// calculate where the lines are to be broken, and use results
-    void calc_breaking();
+  void calc_idealspacing();
+  /// calculate where the lines are to be broken, and use results
+  void 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