X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-def.hh;h=5987e6527f46838c209371eeff688f60c2b081ef;hb=47b1c9fddeec6d243c4df9d66ab71969bdee7b2f;hp=8615d9cf86c957ab430f8d8da40e889f88cff8cd;hpb=8002fa018c81f70585c25232247c6dcba7f5cba0;p=lilypond.git

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 8615d9cf86..5987e6527f 100644
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,21 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef PAPER_DEF_HH
 #define PAPER_DEF_HH
+
+
 #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"
 
+
 /** 
 
   Symbols, dimensions and constants pertaining to visual output.
@@ -44,53 +45,35 @@
 */
 class Paper_def : public Music_output_def 
 {
-  Hash_table<int, Lookup *> *lookup_p_tab_p_;
-  static int default_count_i_;
-
 protected:
-  VIRTUAL_COPY_CONS(Music_output_def);
+  VIRTUAL_COPY_CONS (Music_output_def);
+
 
 public:    
+  SCM font_descriptions ()const;
   virtual ~Paper_def ();
-
-  Array<Interval> shape_int_a_;
+  static int score_count_i_;
+  
+  /*
+    JUNKME
+   */
   Real get_realvar (SCM symbol) const;
   Real get_var (String id) const;
-
-  SCM get_scm_var (SCM sym) const;
-  
+  SCM get_scmvar (String id)const;
+  SCM get_scmvar_scm  (SCM sym) 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
-
-  /** convert a duration to an idealspacing
-    influence using the geometric_ and  paratime_signatures.
-    */
-  Real length_mom_to_dist (Moment, Real) const;
-  
-  Real arithmetic_constant (Moment minimal_mom) const;
-  Real arithmetic_spacing (Moment mom,Real constant) const;
-
-  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_outputter* paper_outputter_p (Paper_stream*, Scope*, String) const;
-  Paper_stream* paper_stream_p () const;
-  String base_output_str () const;
+  Paper_outputter* paper_outputter_p () ;
 
+  Font_metric * find_font (SCM name, Real mag);
+  
   // urg
   friend int yyparse (void*);
 };