/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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 = Score::unsmob (entry))
+ * t = scm_cons (newscore->clone ()->unprotect (), SCM_EOL);
+ else if (Page_marker *marker = Page_marker::unsmob (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_;
for (SCM p = s.bookparts_; scm_is_pair (p); p = scm_cdr (p))
{
- Book *newpart = unsmob_book (scm_car (p))->clone ();
+ Book *newpart = Book::unsmob (scm_car (p))->clone ();
*t = scm_cons (newpart->self_scm (), SCM_EOL);
t = SCM_CDRLOC (*t);
Input *
Book::origin () const
{
- return unsmob_input (input_location_);
+ return Input::unsmob (input_location_);
}
Book::~Book ()
scm_gc_mark (book->scores_);
scm_gc_mark (book->bookparts_);
scm_gc_mark (book->input_location_);
-
+
return book->header_;
}
int
-Book::print_smob (SCM, SCM p, scm_print_state*)
+Book::print_smob (SCM, SCM p, scm_print_state *)
{
scm_puts ("#<Book>", p);
return 1;
/* 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_);
{
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);
Book::add_bookpart (SCM b)
{
add_scores_to_bookpart ();
- Book *part = unsmob_book (b);
+ Book *part = Book::unsmob (b);
part->set_parent (this);
bookparts_ = scm_cons (b, bookparts_);
}
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 *score = Score::unsmob (scm_car (s)))
if (score->error_found_)
- return true;
-
+ return true;
+
for (SCM part = bookparts_; scm_is_pair (part); part = scm_cdr (part))
- if (Book *bookpart = unsmob_book (scm_car (part)))
+ if (Book *bookpart = Book::unsmob (scm_car (part)))
if (bookpart->error_found ())
- return true;
+ return true;
return false;
}
Paper_book *
Book::process (Output_def *default_paper,
- Output_def *default_layout)
+ Output_def *default_layout)
{
return process (default_paper, default_layout, 0);
}
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)))
+ if (Book *book = Book::unsmob (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 ());
- paper_book_part->unprotect ();
- }
+ {
+ output_paper_book->add_bookpart (paper_book_part->self_scm ());
+ paper_book_part->unprotect ();
+ }
}
}
/* In a Paper_book, bookparts are stored in straight order */
void
Book::process_score (SCM s, Paper_book *output_paper_book, Output_def *layout)
{
- if (Score *score = unsmob_score (scm_car (s)))
+ if (Score *score = Score::unsmob (scm_car (s)))
{
SCM outputs = score
- ->book_rendering (output_paper_book->paper_, layout);
-
+ ->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<Performance *> (output))
- output_paper_book->add_performance (perf->self_scm ());
- else if (Paper_score *pscore = dynamic_cast<Paper_score *> (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);
- }
+ {
+ Music_output *output = Music_output::unsmob (scm_car (outputs));
+
+
if (Performance *perf = dynamic_cast<Performance *> (output))
+ output_paper_book->add_performance (perf->self_scm ());
+
else if (Paper_score *pscore = dynamic_cast<Paper_score *> (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)))
+ || Page_marker::unsmob (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 *default_layout,
+ Paper_book *parent_part)
{
Output_def *paper = paper_ ? paper_ : default_paper;
{
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);
projects / lilypond.git / blobdiff