X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook.cc;h=e1fdef644dfdca3fe25af5705be47d3050b7420b;hb=6156bb1b68443fdb3dcf8321eb8b85e6e384ffbb;hp=96243e1b954647127c7dc50d4bd51ed1293618cb;hpb=def21b306e2b8fa2d5630fab0878e9922e197f0c;p=lilypond.git diff --git a/lily/book.cc b/lily/book.cc index 96243e1b95..e1fdef644d 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -1,9 +1,20 @@ /* - book.cc -- implement Book + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2007 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 + 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 . */ #include "book.hh" @@ -50,21 +61,27 @@ Book::Book (Book const &s) paper_ = s.paper_->clone (); paper_->unprotect (); } - + input_location_ = make_input (*s.origin ()); - header_ = ly_make_anonymous_module (false); + header_ = ly_make_module (false); if (ly_is_module (s.header_)) ly_module_copy (header_, s.header_); - SCM *t = &scores_; for (SCM p = s.scores_; scm_is_pair (p); p = scm_cdr (p)) { - Score *newscore = unsmob_score (scm_car (p))->clone (); + SCM entry = scm_car (p); - *t = scm_cons (newscore->self_scm (), SCM_EOL); + if (Score *newscore = unsmob_score (entry)) + *t = scm_cons (newscore->clone ()->unprotect (), SCM_EOL); + else if (Page_marker *marker = unsmob_page_marker (entry)) + *t = scm_cons (marker->clone ()->unprotect (), SCM_EOL); + else + { + /* This entry is a markup list */ + *t = scm_cons (entry, SCM_EOL); + } t = SCM_CDRLOC (*t); - newscore->unprotect (); } t = &bookparts_; @@ -101,7 +118,7 @@ Book::mark_smob (SCM s) scm_gc_mark (book->scores_); scm_gc_mark (book->bookparts_); scm_gc_mark (book->input_location_); - + return book->header_; } @@ -127,10 +144,10 @@ Book::set_parent (Book *parent) paper_->unprotect (); } paper_->parent_ = parent->paper_; - /* If this part is the first child of parent, copy its header */ - if (ly_is_module (parent->header_) && (scm_is_null (parent->bookparts_))) + /* Copy the header block of the parent */ + if (ly_is_module (parent->header_)) { - SCM tmp_header = ly_make_anonymous_module (false); + SCM tmp_header = ly_make_module (false); ly_module_copy (tmp_header, parent->header_); if (ly_is_module (header_)) ly_module_copy (tmp_header, header_); @@ -147,7 +164,7 @@ Book::add_scores_to_bookpart () { if (scm_is_pair (scores_)) { - /* If scores have been added to this book, add them to a child + /* If scores have been added to this book, add them to a child * book part */ Book *part = new Book; part->set_parent (this); @@ -174,7 +191,7 @@ Book::error_found () if (Score *score = unsmob_score (scm_car (s))) if (score->error_found_) return true; - + for (SCM part = bookparts_; scm_is_pair (part); part = scm_cdr (part)) if (Book *bookpart = unsmob_book (scm_car (part))) if (bookpart->error_found ()) @@ -200,9 +217,14 @@ Book::process_bookparts (Paper_book *output_paper_book, Output_def *paper, Outpu { Paper_book *paper_book_part = book->process (paper, layout, output_paper_book); if (paper_book_part) - output_paper_book->add_bookpart (paper_book_part->self_scm ()); + { + output_paper_book->add_bookpart (paper_book_part->self_scm ()); + paper_book_part->unprotect (); + } } } + /* In a Paper_book, bookparts are stored in straight order */ + output_paper_book->bookparts_ = scm_reverse_x (output_paper_book->bookparts_, SCM_EOL); } void @@ -212,11 +234,11 @@ Book::process_score (SCM s, Paper_book *output_paper_book, Output_def *layout) { SCM outputs = score ->book_rendering (output_paper_book->paper_, layout); - + while (scm_is_pair (outputs)) { Music_output *output = unsmob_music_output (scm_car (outputs)); - + if (Performance *perf = dynamic_cast (output)) output_paper_book->add_performance (perf->self_scm ()); else if (Paper_score *pscore = dynamic_cast (output)) @@ -225,7 +247,7 @@ Book::process_score (SCM s, Paper_book *output_paper_book, Output_def *layout) output_paper_book->add_score (score->get_header ()); output_paper_book->add_score (pscore->self_scm ()); } - + outputs = scm_cdr (outputs); } } @@ -234,7 +256,7 @@ Book::process_score (SCM s, Paper_book *output_paper_book, Output_def *layout) output_paper_book->add_score (scm_car (s)); else assert (0); - + } /* Concatenate all score or book part outputs into a Paper_book @@ -263,6 +285,7 @@ Book::process (Output_def *default_paper, paper_book->paper_->parent_ = parent_part->paper_; } paper_book->header_ = header_; + scaled_bookdef->unprotect (); if (scm_is_pair (bookparts_)) { @@ -271,8 +294,9 @@ Book::process (Output_def *default_paper, } else { + paper_book->paper_->normalize (); /* Process scores */ - /* Render in order of parsing. */ + /* Render in order of parsing. */ for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s)) { process_score (s, paper_book, default_layout);