Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/book-paper-def.hh b/lily/include/book-paper-def.hh
index 144df004a72c8571336c3d47d9accff688c826e2..55e7a01180f0d85c4f8507aa665d4a13a04117f6 100644 (file)
--- a/lily/include/book-paper-def.hh
+++ b/lily/include/book-paper-def.hh
@@ -1,34 +1,27 @@
 /*
-  book-paper-def.hh -- declare Book_paper_def
+  book-paper-def.hh -- declare Output_def
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2006  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef BOOK_PAPER_DEF_HH
 #define BOOK_PAPER_DEF_HH
 
-#include "lily-proto.hh"
-#include "smobs.hh"
-#include "virtual-methods.hh"
+#include "output-def.hh"
 
-class Book_paper_def
-{
-  DECLARE_SMOBS (Book_paper_def, Music_output_def);
+#error
 
+class Output_def : public Output_def
+{
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Book_paper_def, Book_paper_def);
-  Book_paper_def(Book_paper_def const &);
-  SCM scope_;
-  SCM scaled_fonts_;
-  Real output_scale_;
+  VIRTUAL_COPY_CONSTRUCTOR (Output_def, Output_def);
+  Output_def (Output_def const &);
 
-  Book_paper_def ();
+  Output_def ();
 
-  Font_metric *find_scaled_font (Font_metric *f, Real m, SCM input_enc_name);
-  Paper_def *scale_paper (Paper_def *pd) const;
+  virtual void derived_mark ();
 };
-DECLARE_UNSMOB (Book_paper_def, book_paper_def);
 
 #endif /* BOOK_PAPER_DEF_HH */