X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook-paper-def.hh;h=2d4386b927f4b91b54fcb6089d174aef19df418c;hb=664070d837cc4855091455892cb942cdcedeef0c;hp=a0f3bcfab6babb9c24fb4fefbbcb1d69372dbf94;hpb=18cb1761c781a9ce2607305fa5c9bb7fb34225bd;p=lilypond.git

diff --git a/lily/include/book-paper-def.hh b/lily/include/book-paper-def.hh
index a0f3bcfab6..2d4386b927 100644
--- a/lily/include/book-paper-def.hh
+++ b/lily/include/book-paper-def.hh
@@ -1,5 +1,5 @@
 /*
-  book-paper-def.hh -- declare Book_paper_def
+  book-paper-def.hh -- declare Book_output_def
 
   source file of the GNU LilyPond music typesetter
 
@@ -10,27 +10,24 @@
 #define BOOK_PAPER_DEF_HH
 
 #include "lily-proto.hh"
-#include "smobs.hh"
-#include "virtual-methods.hh"
+#include "output-def.hh"
 
-class Book_paper_def
+class Book_output_def : public Output_def
 {
-  DECLARE_SMOBS (Book_paper_def, Music_output_def);
-
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Book_paper_def, Book_paper_def);
-  Book_paper_def (Book_paper_def const &);
-  SCM scope_;
+  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;
 
-  Book_paper_def ();
-  SCM c_variable (String id) const;
-  SCM lookup_variable (SCM sym) const;
+  Book_output_def ();
 
+  virtual void derived_mark ();
   Font_metric *find_scaled_font (Font_metric *f, Real m, SCM input_enc_name);
-  Paper_def *scale_paper (Paper_def *pd) const;
+  Output_def *scale_paper (Output_def *pd) const;
 };
-DECLARE_UNSMOB (Book_paper_def, book_paper_def);
+
+Book_output_def *unsmob_book_output_def (SCM bp);
 
 #endif /* BOOK_PAPER_DEF_HH */