X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook.cc;h=3a84865462e4795f618fa995a477dca33d92e558;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3e68631b289ee5b716a0e49660948912e90cf8d8;hpb=bc17fb8ad9be1d3614b8ae2762ba6ec6da4f3c99;p=lilypond.git diff --git a/lily/book.cc b/lily/book.cc index 3e68631b28..3a84865462 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -3,33 +3,85 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include - #include "book.hh" -#include "global-context.hh" -#include "ly-module.hh" + +#include +using namespace std; + #include "main.hh" -#include "music-iterator.hh" -#include "music-output.hh" #include "music.hh" #include "output-def.hh" #include "paper-book.hh" #include "score.hh" -#include "stencil.hh" +#include "text-interface.hh" #include "warn.hh" +#include "performance.hh" +#include "paper-score.hh" +#include "page-marker.hh" #include "ly-smobs.icc" Book::Book () - : Input () { - bookpaper_ = 0; + paper_ = 0; header_ = SCM_EOL; - assert (!scores_.size ()); + scores_ = SCM_EOL; + bookparts_ = SCM_EOL; + input_location_ = SCM_EOL; smobify_self (); + + input_location_ = make_input (Input ()); +} + +Book::Book (Book const &s) +{ + paper_ = 0; + header_ = SCM_EOL; + scores_ = SCM_EOL; + bookparts_ = SCM_EOL; + input_location_ = SCM_EOL; + smobify_self (); + + if (s.paper_) + { + paper_ = s.paper_->clone (); + paper_->unprotect (); + } + + input_location_ = make_input (*s.origin ()); + + header_ = ly_make_anonymous_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 (); + + *t = scm_cons (newscore->self_scm (), SCM_EOL); + 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 * +Book::origin () const +{ + return unsmob_input (input_location_); } Book::~Book () @@ -42,13 +94,14 @@ IMPLEMENT_DEFAULT_EQUAL_P (Book); SCM Book::mark_smob (SCM s) { - Book *book = (Book*) SCM_CELL_WORD_1 (s); - int score_count = book->scores_.size (); - for (int i = 0; i < score_count; i++) - scm_gc_mark (book->scores_[i]->self_scm ()); + Book *book = (Book *) SCM_CELL_WORD_1 (s); - if (book->bookpaper_) - scm_gc_mark (book->bookpaper_->self_scm ()); + 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_; } @@ -59,66 +112,172 @@ Book::print_smob (SCM, SCM p, scm_print_state*) return 1; } -/* This function does not dump the output; outname is required eg. for - dumping header fields. */ -Paper_book * -Book::process (String outname, Output_def *default_def) +void +Book::add_score (SCM s) { - Paper_book *paper_book = new Paper_book (); - Real scale = ly_scm2double (bookpaper_->c_variable ("outputscale")); - - Output_def * scaled_bookdef = scale_output_def (bookpaper_, scale); + scores_ = scm_cons (s, scores_); +} - paper_book->bookpaper_ = scaled_bookdef; - scm_gc_unprotect_object (scaled_bookdef->self_scm()); - - paper_book->header_ = header_; +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; + } +} + +/* 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. + */ +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 true; - int score_count = scores_.size (); - for (int i = 0; i < score_count; i++) + 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 systems = scores_[i]->book_rendering (outname, - paper_book->bookpaper_, - default_def); - - /* If the score is empty, generate no output. Should we - do titling? */ - if (SCM_NFALSEP(scm_vector_p (systems))) + SCM outputs = score + ->book_rendering (output_paper_book->paper_, layout); + + while (scm_is_pair (outputs)) { - Score_systems sc; - sc.systems_ = systems; - sc.header_ = scores_[i]->header_; - paper_book->score_systems_.push (sc); + 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); } } - - return paper_book; + 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); + } -LY_DEFINE(ly_make_book, "ly:make-book", - 2, 0, 1, (SCM bookpaper, SCM header, SCM scores), - "Make a \\book of @var{bookpaper} and @var{header} (which may be #f as well) " - "containing @code{\\scores}.") +/* 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 * odef = unsmob_output_def (bookpaper); - SCM_ASSERT_TYPE (odef, bookpaper, - SCM_ARG1, __FUNCTION__, "Output_def"); + Output_def *paper = paper_ ? paper_ : default_paper; - Book *book = new Book; - book->bookpaper_ = odef; + /* If top book, recursively check score errors */ + if (!parent_part && error_found ()) + return 0; - if (ly_c_module_p (header)) - book->header_ = header; - - for (SCM s = scores; ly_c_pair_p (s); s = ly_cdr (s)) + 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; + if (parent_part) { - Score *score = unsmob_score (ly_car (s)); - if (score) - book->scores_.push (score); + paper_book->parent_ = parent_part; + paper_book->paper_->parent_ = parent_part->paper_; } - - SCM x = book->self_scm (); - scm_gc_unprotect_object (x); - return x; + paper_book->header_ = header_; + + if (scm_is_pair (bookparts_)) + { + /* 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; } -