2003 -> 2004

[lilypond.git] / lily / include / paper-def.hh

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 29d0abacc53b1aae3195af44b136ae7c1da98275..a95c307c72b6137d25b244ea47fe673ef11f0727 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,12 +14,10 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 #include "real.hh"
-
-#include "moment.hh"
 #include "array.hh"
 #include "interval.hh"
 #include "music-output-def.hh"
-#include "protected-scm.hh"
+
 
 /** 
 
@@ -48,30 +46,26 @@
 class Paper_def : public Music_output_def 
 {
 protected:
-  VIRTUAL_COPY_CONS(Music_output_def);
-
+  VIRTUAL_COPY_CONS (Music_output_def);
 
 public:    
+  Paper_outputter* get_paper_outputter (String)  const;
+
   SCM font_descriptions ()const;
   virtual ~Paper_def ();
-  static int score_count_i_;
+  static int score_count_;
   
   /*
     JUNKME
    */
   Real get_realvar (SCM symbol) const;
-  Real get_var (String id) const;
-  SCM get_scmvar (String id)const; 
   void reinit ();
   Paper_def ();
   Paper_def (Paper_def const&);
 
   Interval line_dimensions_int (int) const;
 
-  virtual int get_next_score_count () const;
-  static void reset_score_count ();
   void output_settings (Paper_outputter*) const;
-  Paper_outputter* paper_outputter_p () ;
 
   Font_metric * find_font (SCM name, Real mag);
   
@@ -79,4 +73,7 @@ public:
   friend int yyparse (void*);
 };
 
+Paper_def * unsmob_paper (SCM x);
+Font_metric *select_font (Paper_def *paper, SCM chain);
+
 #endif // Paper_def_HH