X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore.hh;h=d4f26da4d22c5227b87aae787cf2e0904dda3fb1;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=15486e2aaaf333e0e044cba11110825659eb1064;hpb=57d6628b46ba1d7ed7c9c0ca7f579567d1912b0d;p=lilypond.git

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 15486e2aaa..d4f26da4d2 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,88 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef SCORE_HH
 #define SCORE_HH
 
-#include "varray.hh"
-#include "lily-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
-class Score: public Input {
-public:
-    /// paper_, staffs_ and commands_ form the problem definition.
-    Paper_def *paper_p_;
-    Midi_def *midi_p_;
-    Music * music_p_;
-    
-    
-    Pointer_list<Score_column*> cols_;
-    PScore *pscore_p_;
-
-    int errorlevel_i_;
-    
-    /* *************************************************************** */
-
-    /// construction
-    Score();
-    ~Score();    
-
-    /// 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);
-    
-    Score(Score const&);
-
-private:
-    void run_translator(Global_translator*);
-    void midi_output();
-    void paper_output();
-
-    /// do midi stuff
-    void midi();
+#include "input.hh"
+#include "std-vector.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
 
-    /// do paper stuff
-    void paper();
+class Score
+{
+  DECLARE_SMOBS (Score);
 
-    // utils:
-    PCursor<Score_column*> create_cols(Moment, PCursor<Score_column*> &last);
+  SCM music_;
+  SCM input_location_;
+public:
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
+  SCM header_;
+  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 *);
+};
 
+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 */