release: 1.5.27

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

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 8346074e30950e3931dd848d93ef75e9cafda1c8..e30aa30e82f2386395fe695c77717118d6cd4057 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -48,13 +48,13 @@
 class Paper_def : public Music_output_def 
 {
 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
@@ -68,8 +68,8 @@ 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_outputter* paper_outputter_p () ;