X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook.cc;h=3a84865462e4795f618fa995a477dca33d92e558;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f4d4dd790e1310b31cc53223b3e23f4b6f4e9404;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git diff --git a/lily/book.cc b/lily/book.cc index f4d4dd790e..3a84865462 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2007 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "book.hh" @@ -20,6 +20,7 @@ using namespace std; #include "warn.hh" #include "performance.hh" #include "paper-score.hh" +#include "page-marker.hh" #include "ly-smobs.icc" @@ -28,6 +29,7 @@ Book::Book () paper_ = 0; header_ = SCM_EOL; scores_ = SCM_EOL; + bookparts_ = SCM_EOL; input_location_ = SCM_EOL; smobify_self (); @@ -39,6 +41,7 @@ Book::Book (Book const &s) paper_ = 0; header_ = SCM_EOL; scores_ = SCM_EOL; + bookparts_ = SCM_EOL; input_location_ = SCM_EOL; smobify_self (); @@ -60,9 +63,19 @@ Book::Book (Book const &s) Score *newscore = unsmob_score (scm_car (p))->clone (); *t = scm_cons (newscore->self_scm (), SCM_EOL); - t = SCM_CDRLOC(*t); + t = SCM_CDRLOC (*t); newscore->unprotect (); } + + t = &bookparts_; + for (SCM p = s.bookparts_; scm_is_pair (p); p = scm_cdr (p)) + { + Book *newpart = unsmob_book (scm_car (p))->clone (); + + *t = scm_cons (newpart->self_scm (), SCM_EOL); + t = SCM_CDRLOC (*t); + newpart->unprotect (); + } } Input * @@ -83,14 +96,10 @@ Book::mark_smob (SCM s) { Book *book = (Book *) SCM_CELL_WORD_1 (s); -#if 0 - if (book->key_) - scm_gc_mark (book->key_->self_scm ()); -#endif - if (book->paper_) scm_gc_mark (book->paper_->self_scm ()); scm_gc_mark (book->scores_); + scm_gc_mark (book->bookparts_); scm_gc_mark (book->input_location_); return book->header_; @@ -109,61 +118,166 @@ Book::add_score (SCM s) scores_ = scm_cons (s, scores_); } +void +Book::set_parent (Book *parent) +{ + if (!paper_) + { + paper_ = new Output_def (); + 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_))) + { + SCM tmp_header = ly_make_anonymous_module (false); + ly_module_copy (tmp_header, parent->header_); + if (ly_is_module (header_)) + ly_module_copy (tmp_header, header_); + header_ = tmp_header; + } +} -/* Concatenate all score outputs into a Paper_book +/* Before an explicit \bookpart is encountered, scores are added to the book. + * But once a bookpart is added, the previous scores shall be collected into + * a new bookpart. */ -Paper_book * -Book::process (Output_def *default_paper, - Output_def *default_layout) +void +Book::add_scores_to_bookpart () +{ + if (scm_is_pair (scores_)) + { + /* If scores have been added to this book, add them to a child + * book part */ + Book *part = new Book; + part->set_parent (this); + part->scores_ = scores_; + bookparts_ = scm_cons (part->self_scm (), bookparts_); + part->unprotect (); + scores_ = SCM_EOL; + } +} + +void +Book::add_bookpart (SCM b) +{ + add_scores_to_bookpart (); + Book *part = unsmob_book (b); + part->set_parent (this); + bookparts_ = scm_cons (b, bookparts_); +} + +bool +Book::error_found () { for (SCM s = scores_; scm_is_pair (s); s = scm_cdr (s)) if (Score *score = unsmob_score (scm_car (s))) if (score->error_found_) - return 0; + 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 ()) + return true; + + return false; +} + +Paper_book * +Book::process (Output_def *default_paper, + Output_def *default_layout) +{ + return process (default_paper, default_layout, 0); +} + +void +Book::process_bookparts (Paper_book *output_paper_book, Output_def *paper, Output_def *layout) +{ + add_scores_to_bookpart (); + for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p)) + { + if (Book *book = unsmob_book (scm_car (p))) + { + 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 ()); + } + } +} +void +Book::process_score (SCM s, Paper_book *output_paper_book, Output_def *layout) +{ + if (Score *score = unsmob_score (scm_car (s))) + { + 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)) + { + if (ly_is_module (score->get_header ())) + output_paper_book->add_score (score->get_header ()); + output_paper_book->add_score (pscore->self_scm ()); + } + + outputs = scm_cdr (outputs); + } + } + else if (Text_interface::is_markup_list (scm_car (s)) + || unsmob_page_marker (scm_car (s))) + output_paper_book->add_score (scm_car (s)); + else + assert (0); + +} + +/* Concatenate all score or book part outputs into a Paper_book + */ +Paper_book * +Book::process (Output_def *default_paper, + Output_def *default_layout, + Paper_book *parent_part) +{ Output_def *paper = paper_ ? paper_ : default_paper; + + /* If top book, recursively check score errors */ + if (!parent_part && error_found ()) + return 0; + if (!paper) return 0; - + Paper_book *paper_book = new Paper_book (); Real scale = scm_to_double (paper->c_variable ("output-scale")); Output_def *scaled_bookdef = scale_output_def (paper, scale); - paper_book->paper_ = scaled_bookdef; - scaled_bookdef->unprotect (); - + if (parent_part) + { + paper_book->parent_ = parent_part; + paper_book->paper_->parent_ = parent_part->paper_; + } paper_book->header_ = header_; - /* Render in order of parsing. */ - for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s)) + if (scm_is_pair (bookparts_)) { - if (Score *score = unsmob_score (scm_car (s))) - { - SCM outputs = score - ->book_rendering (paper_book->paper_, default_layout); - - while (scm_is_pair (outputs)) - { - Music_output *output = unsmob_music_output (scm_car (outputs)); - - if (Performance *perf = dynamic_cast (output)) - paper_book->add_performance (perf->self_scm ()); - else if (Paper_score *pscore = dynamic_cast (output)) - { - if (ly_is_module (score->header_)) - paper_book->add_score (score->header_); - paper_book->add_score (pscore->self_scm ()); - } - - outputs = scm_cdr (outputs); - } - } - else if (Text_interface::is_markup (scm_car (s))) - paper_book->add_score (scm_car (s)); - else - assert (0); + /* Process children book parts */ + process_bookparts (paper_book, paper, default_layout); + } + else + { + /* Process scores */ + /* 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); + } } return paper_book; } -