X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=0a71a6b9e442a6901b82028d45c83ca09831a945;hb=7d5f2d0fd52ccdbe8bdafc40220176b22049d4ba;hp=44c764703d664e25167cea8589d7dc86d85fe21b;hpb=6ddd5b9373861e63801b29b336580621ca4b9ef1;p=lilypond.git

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 44c764703d..0a71a6b9e4 100644
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -1,38 +1,67 @@
 /*
-  book.hh -- declare Book
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef BOOK_HH
 #define BOOK_HH
 
-#include "input.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
-#include "object-key.hh"
-#include "string.hh"
+#include "std-vector.hh"
+#include "std-string.hh"
+#include "virtual-methods.hh"
+#include "smobs.hh"
 
-class Book : public Input
+class Book : public Smob<Book>
 {
-  DECLARE_SMOBS (Book, foo);
-
 public:
-  String user_key_;
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
+  virtual ~Book ();
   SCM header_;
   Output_def *paper_;
   SCM scores_;
+  SCM bookparts_;
+  SCM input_location_;
 
+  Book (Book const &);
+  Input *origin () const;
+  VIRTUAL_COPY_CONSTRUCTOR (Book, Book);
   Book ();
   void add_score (SCM);
-  Paper_book *process (String,
-		       Output_def *def_paper,
-		       Output_def *def_layout);
+  void add_bookpart (SCM);
+  Paper_book *process (Output_def *def_paper,
+                       Output_def *def_layout);
+  Paper_book *process (Output_def *default_paper,
+                       Output_def *default_layout,
+                       Paper_book *parent_part);
   void set_keys ();
+
+protected:
+  void set_parent (Book *parent);
+  void add_scores_to_bookpart ();
+  bool error_found ();
+  void process_score (SCM score,
+                      Paper_book *output_paper_book,
+                      Output_def *layout);
+  void process_bookparts (Paper_book *output_paper_book,
+                          Output_def *paper,
+                          Output_def *layout);
 };
 
-DECLARE_UNSMOB (Book, book);
 
 #endif /* BOOK_HH */