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 2d4386b927f4b91b54fcb6089d174aef19df418c..55e7a01180f0d85c4f8507aa665d4a13a04117f6 100644 (file)
--- a/lily/include/book-paper-def.hh
+++ b/lily/include/book-paper-def.hh
@@ -1,33 +1,27 @@
 /*
-  book-paper-def.hh -- declare Book_output_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 "output-def.hh"
 
-class Book_output_def : public Output_def
+#error
+
+class Output_def : public Output_def
 {
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Output_def, Book_output_def);
-  Book_output_def (Book_output_def const &);
-  SCM scaled_fonts_;
-  Real output_scale_;
-  Real output_scale () const;
+  VIRTUAL_COPY_CONSTRUCTOR (Output_def, Output_def);
+  Output_def (Output_def const &);
 
-  Book_output_def ();
+  Output_def ();
 
   virtual void derived_mark ();
-  Font_metric *find_scaled_font (Font_metric *f, Real m, SCM input_enc_name);
-  Output_def *scale_paper (Output_def *pd) const;
 };
 
-Book_output_def *unsmob_book_output_def (SCM bp);
-
 #endif /* BOOK_PAPER_DEF_HH */