X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=3f0c6248fa9c2e8930172303aaf7c28f43556588;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5bdb47359cfae830f25a77f00f601c0f4f33854b;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git diff --git a/lily/include/book.hh b/lily/include/book.hh index 5bdb47359c..3f0c6248fa 100644 --- a/lily/include/book.hh +++ b/lily/include/book.hh @@ -3,17 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #ifndef BOOK_HH #define BOOK_HH -#include "input.hh" #include "lily-proto.hh" #include "std-vector.hh" -#include "object-key.hh" #include "std-string.hh" +#include "virtual-methods.hh" +#include "smobs.hh" class Book { @@ -24,6 +24,7 @@ public: SCM header_; Output_def *paper_; SCM scores_; + SCM bookparts_; SCM input_location_; Book (Book const &); @@ -31,9 +32,24 @@ public: 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); + 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);