release: 1.5.19

[lilypond.git] / lily / include / line-of-score.hh

diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh
index a5a0174d1990612160d42097379534f8a82898f2..e2c2fc4b73df22a269333a117cee931f8860983d 100644 (file)
--- a/lily/include/line-of-score.hh
+++ b/lily/include/line-of-score.hh
@@ -1,57 +1,40 @@
 /*
   line-of-score.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2001 Han-Wen Nienhuys
 */
 
 #ifndef SCORELINE_HH
 #define SCORELINE_HH
 
+#include "protected-scm.hh" 
 #include "column-x-positions.hh"
 #include "spanner.hh"
 
-/// the columns of a score that form one line. FIXME: multiple inheritance
 class Line_of_score : public Spanner
 {
 public:
-
-  
-/*
-  imported the following  from Super_element
-  
-  The toplevel element. The Paper_score contains this element, and any
-  element shoud be a dependency for the super element.
-
-  It is the entry point for the "constraint solver"/ dependency
-  tracker.  Every XXXX_processing () call traverses the entire
-  dependency graph, and calls the appropriate
-  Score_element::do_XXX_processing function on each Score_element it encounters.
-  
-
-  FIXME: remove this class, to eliminate multiple inheritance. Merge
-  with Line_of_score ?  */
-  void space_processing ();
-  void pre_processing();
-  void breakable_col_processing();
-  void post_processing();
-  void output_all ();
-
   int rank_i_;
-  
-  Line_of_score();
-    
+  void post_processing (bool);
+
+  Line_of_score (SCM);
   /// is #c# contained in #*this#?
   bool contains_b (Paper_column const *c) const;
-    
-  static int compare (Line_of_score* const &,Line_of_score* const &);
+  int element_count () const;
 
   void break_into_pieces (Array<Column_x_positions> const&);
   void output_lines ();
-  void output_line (bool last_line);
-  void add_column (Paper_column*);
+
+  Link_array<Item> broken_col_range (Item const*, Item const*) const;
+  Link_array<Grob> column_l_arr () const;
   
+  void add_column (Paper_column*);
+  void typeset_grob (Grob*);
+  void output_molecule (SCM, Offset);
+  void output_scheme (SCM);
+  void pre_processing ();
 protected:
-  VIRTUAL_COPY_CONS(Score_element);
+  VIRTUAL_COPY_CONS (Grob);
 };
 
 #endif