release: 1.5.36

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

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 94bf6dd94f0fb09438afa29a41609b48bc5a0048..6bc9df23d3a37fec080fa951a667bc2f05d2f436 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -47,37 +47,35 @@
 */
 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:    
+  SCM font_descriptions ()const;
   virtual ~Paper_def ();
-  static int default_count_i_;
+  static int score_count_i_;
+  
   /*
     JUNKME
    */
   Real get_realvar (SCM symbol) const;
   Real get_var (String id) const;
-  SCM get_scmvar (String id)const; 
+  SCM get_scmvar (String id)const;
+  SCM get_scmvar_scm  (SCM sym) const;
   void reinit ();
   Paper_def ();
-  void set_lookup (int, SCM lookup_smob);
   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;
+  Paper_outputter* paper_outputter_p () ;
 
+  Font_metric * find_font (SCM name, Real mag);
+  
   // urg
   friend int yyparse (void*);
 };