X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=c401c57f73e8387f5640d1619ecf83322cf4904d;hb=48631a04b6181cd7be65702574eaaa6c52284bd2;hp=e83540533b60aff0e26e0ecd7274209e616bc836;hpb=c8989177a23864cfa3d44e013585e719b816acfd;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index e83540533b..c401c57f73 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -1,94 +1,42 @@
 /*
   score.hh -- declare Score
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "varray.hh"
-#include "proto.hh"
-#include "plist.hh"
-#include "moment.hh"
-#include "assoc.hh"
-#include "string.hh"
 #include "input.hh"
 #include "lily-proto.hh"
 
-/// the total music def of one movement
-struct Score {
-    /// paper_, staffs_ and commands_ form the problem definition.
-    Paper_def *paper_p_;
-    Midi_def *midi_p_;
-    IPointerList<Staff*> staffs_;
-    
-    /// "runtime" fields for setting up spacing    
-    IPointerList<Request_column*> rcols_;
-    
-    IPointerList<Score_column*> cols_;
-    PScore *pscore_p_;
-
-    Input input_;
-    int errorlevel_i_;
-    
-    /* *************************************************************** */
-
-    /// construction
-    Score();
-    ~Score();    
-    void add(Staff*);
-
-    /// do everything except outputting to file
-    void process();
-    
-    /// output to file
-    void output(String fn);
+#include "parray.hh"
+#include "smobs.hh"
 
+/// the total music def of one movement
+class Score: public Input {
+public:
+  /// paper_, staves_ and commands_ form the problem definition.
+  Link_array<Music_output_def> defs_;
+  SCM music_;
+  Scheme_hash_table * header_;
+  Input_file_settings* input_file_;
+  
+  int errorlevel_;
     
-    ///
-    void set(Midi_def* midi_p);
-    ///
-    void set(Paper_def* midi_p);
+  /// construction
+  Score ();
+  Score (Score const&);
 
-    // standard
-    void OK() const;
-    void print() const;
-
-    /// find a column.
-    PCursor<Score_column *> find_col(Moment,bool);
-    
-    /// when does the last *musical* element finish?
-    Moment last() const;
 
+  void process ();
+  void add_output (Music_output_def *def);
+  DECLARE_SMOBS (Score,foo);
 private:
-    void paper_output();
-    void setup_music();
-    void process_music();
-    /// do midi stuff
-    void midi();
-
-    /// do paper stuff
-    void paper();
-
-    // utils:
-    PCursor<Score_column*> create_cols(Moment, PCursor<Score_column*> &last);
-
-    Score(Score const&){}
-
-    /**
-      make the pcol_l_ fields of each Score_column point to the correct PCol,
-      remove any unnecessary Score_column's
-     */
-    void do_cols();
-
-    /// remove unused cols
-    void clean_cols();
-    
-    /// add #Idealspacings# to #pscore_#
-    void calc_idealspacing();
+  void run_translator (Music_output_def*);
 };
+DECLARE_UNSMOB(Score,score); 
 #endif