X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-def.hh;h=c177436ec8ae06727620df1743b4aeca00509651;hb=11b3094461e045deafd0e2b1cef8c60f79e259a1;hp=8d4c326c756bcfae6c27da2112737c28fafdbded;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 8d4c326c75..c177436ec8 100644
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1996--2003 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"
+
 
 /** 
 
@@ -47,39 +45,38 @@
 */
 class Paper_def : public Music_output_def 
 {
-  Protected_scm lookup_alist_;
 protected:
-  VIRTUAL_COPY_CONS(Music_output_def);
+  VIRTUAL_COPY_CONS (Music_output_def);
 
 public:    
+  Paper_outputter* get_paper_outputter () ;
+
+  SCM font_descriptions ()const;
   virtual ~Paper_def ();
-  static int default_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 ();
-  void set_lookup (int, Lookup*);
   Paper_def (Paper_def const&);
 
-  /** The distance between beams of multiplicity_i
-      JUNKME
-  */
-  Real interbeam_f (int multiplicity_i) const;
   Interval line_dimensions_int (int) const;
-  void print () const;
-  Lookup const * lookup_l (int sz) const;	// TODO naming
-  virtual int get_next_default_count () const;
-  static void reset_default_count();
+
+  virtual int get_next_score_count () const;
+  static void reset_score_count ();
   void output_settings (Paper_outputter*) const;
-  Paper_stream* paper_stream_p () const;
-  String base_output_str () const;
 
+  Font_metric * find_font (SCM name, Real mag);
+  
   // urg
   friend int yyparse (void*);
 };
 
+Paper_def * unsmob_paper (SCM x);
+Font_metric *select_font (Paper_def *paper, SCM chain);
+
 #endif // Paper_def_HH