source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "book.hh"
#include <cstdio>
using namespace std;
-#include "lilypond-key.hh"
-#include "global-context.hh"
#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 "ly-smobs.icc"
Book::Book ()
- : Input ()
{
paper_ = 0;
header_ = SCM_EOL;
scores_ = 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;
+ 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 ();
+ }
}
-Book*
-Book::clone () const
+Input *
+Book::origin () const
{
- return new Book (*this);
+ return unsmob_input (input_location_);
}
Book::~Book ()
{
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->input_location_);
+
return book->header_;
}
Book::process (Output_def *default_paper,
Output_def *default_layout)
{
- for (SCM s = scores_; s != SCM_EOL; s = scm_cdr (s))
+ 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 0;
Paper_book *paper_book = new Paper_book ();
- Real scale = scm_to_double (paper->c_variable ("outputscale"));
+ Real scale = scm_to_double (paper->c_variable ("output-scale"));
Output_def *scaled_bookdef = scale_output_def (paper, scale);
- Object_key *key = new Lilypond_general_key (0, user_key_, 0);
- SCM scm_key = key->unprotect ();
-
paper_book->paper_ = scaled_bookdef;
scaled_bookdef->unprotect ();
paper_book->header_ = header_;
/* Render in order of parsing. */
- for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))
{
if (Score *score = unsmob_score (scm_car (s)))
{
SCM outputs = score
- ->book_rendering (paper_book->paper_, default_layout, key);
+ ->book_rendering (paper_book->paper_, default_layout);
while (scm_is_pair (outputs))
{
paper_book->add_performance (perf->self_scm ());
else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
{
- SCM systems = pscore->get_paper_systems ();
if (ly_is_module (score->header_))
paper_book->add_score (score->header_);
- paper_book->add_score (systems);
+ paper_book->add_score (pscore->self_scm ());
}
outputs = scm_cdr (outputs);
assert (0);
}
- scm_remember_upto_here_1 (scm_key);
return paper_book;
}