X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=efbc3deb00b063725a5721992ae0e1956c85b779;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=82eef1a3ab60b1a46f0bbc8511ceae82eec91b7b;hpb=728c1f61013a32153c647a72ca31bc2353754803;p=lilypond.git

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 82eef1a3ab..efbc3deb00 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--2014 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,7 +31,6 @@ class Book
   DECLARE_SMOBS (Book);
 
 public:
-  string user_key_;
   SCM header_;
   Output_def *paper_;
   SCM scores_;
@@ -28,20 +38,28 @@ public:
   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 ();
   void add_bookpart (SCM);
-  void set_parent (Book *parent);
-  bool error_found ();
   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);
+                       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);