X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=e5dd86e0419095a32c405c71b5948994cd2b3aa5;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=cf478432388fea996d8a35224815a64d1a56de57;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git

diff --git a/lily/include/book.hh b/lily/include/book.hh
index cf47843238..e5dd86e041 100644
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -1,9 +1,20 @@
 /*
-  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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -20,20 +31,35 @@ class Book
   DECLARE_SMOBS (Book);
 
 public:
-  string user_key_;
   SCM header_;
   Output_def *paper_;
   SCM scores_;
+  SCM bookparts_;
   SCM input_location_;
 
   Book (Book const &);
-  Input *origin() const;
-  VIRTUAL_COPY_CONSTRUCTOR(Book, Book);
+  Input *origin () const;
+  VIRTUAL_COPY_CONSTRUCTOR (Book, Book);
   Book ();
   void add_score (SCM);
+  void add_bookpart (SCM);
   Paper_book *process (Output_def *def_paper,
-		       Output_def *def_layout);
+                       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);