release: 1.5.29

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

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 7c569fd7adcb6c4c18ce3704cee759594a0a97fd..0ad02d105b68d26ca8eaba53e269105d07473b18 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>
 */
 
 
@@ -48,14 +48,14 @@
 class Paper_def : public Music_output_def 
 {
 protected:
-  VIRTUAL_COPY_CONS(Music_output_def);
+  VIRTUAL_COPY_CONS (Music_output_def);
+
 
-  Protected_scm scaled_fonts_;
 public:    
-  Protected_scm style_sheet_;
   SCM font_descriptions ()const;
   virtual ~Paper_def ();
-  static int default_count_i_;
+  static int score_count_i_;
+  
   /*
     JUNKME
    */
@@ -68,11 +68,10 @@ public:
 
   Interval line_dimensions_int (int) 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_stream* paper_stream_p () const;
-  String base_output_str () const;
+  Paper_outputter* paper_outputter_p () ;
 
   Font_metric * find_font (SCM name, Real mag);