X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbook.hh;h=7527cf5062c2780c758cb5329c1da811434e3486;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=83a645c850265792c8c228ec376e43acb3a3d834;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/include/book.hh b/lily/include/book.hh index 83a645c850..7527cf5062 100644 --- a/lily/include/book.hh +++ b/lily/include/book.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,6 @@ class Book DECLARE_SMOBS (Book); public: - string user_key_; SCM header_; Output_def *paper_; SCM scores_; @@ -39,16 +38,16 @@ 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 (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); + Output_def *default_layout, + Paper_book *parent_part); void set_keys (); protected: @@ -56,13 +55,12 @@ protected: void add_scores_to_bookpart (); bool error_found (); void process_score (SCM score, - Paper_book *output_paper_book, - Output_def *layout); + Paper_book *output_paper_book, + Output_def *layout); void process_bookparts (Paper_book *output_paper_book, - Output_def *paper, - Output_def *layout); + Output_def *paper, + Output_def *layout); }; -DECLARE_UNSMOB (Book, book); #endif /* BOOK_HH */