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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index e83540533b..7d4fa0142b 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -1,94 +1,51 @@
 /*
   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--2008 Han-Wen Nienhuys <hanwen@xs4all.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);
-
-    
-    ///
-    void set(Midi_def* midi_p);
-    ///
-    void set(Paper_def* midi_p);
-
-    // 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;
-
-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);
+#include "input.hh"
+#include "std-vector.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
+
+class Score
+{
+  DECLARE_SMOBS (Score);
+
+  SCM music_;
+  SCM input_location_;
+  SCM header_;
+public:
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
+  bool error_found_;
+
+  Score ();
+  Score (Score const &);
+
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
+  
+  SCM get_music () const;
+  void add_output_def (Output_def *def);
+  void set_music (SCM music);
+  SCM book_rendering (Output_def *, Output_def *);
+  SCM get_header () const;
+  void set_header (SCM module);
+};
 
-    Score(Score const&){}
+DECLARE_UNSMOB (Score, score);
 
-    /**
-      make the pcol_l_ fields of each Score_column point to the correct PCol,
-      remove any unnecessary Score_column's
-     */
-    void do_cols();
+SCM ly_render_output (SCM, SCM);
+SCM ly_run_translator (SCM, SCM);
 
-    /// remove unused cols
-    void clean_cols();
-    
-    /// add #Idealspacings# to #pscore_#
-    void calc_idealspacing();
-};
-#endif
+#endif /* SCORE_HH */