source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "book.hh"
#include <cstdio>
+using namespace std;
#include "lilypond-key.hh"
#include "global-context.hh"
smobify_self ();
}
+Book*
+Book::clone () const
+{
+ return new Book (*this);
+}
+
Book::~Book ()
{
}
scores_ = scm_cons (s, scores_);
}
-/* This function does not dump the output; outname is required eg. for
- dumping header fields. */
+/* Concatenate all score outputs into a Paper_book
+ */
Paper_book *
-Book::process (String outname,
- Output_def *default_paper,
+Book::process (Output_def *default_paper,
Output_def *default_layout)
{
for (SCM s = scores_; s != SCM_EOL; s = scm_cdr (s))
if (score->error_found_)
return 0;
- Output_def *paper = paper_ ? default_paper : paper_;
+ Output_def *paper = paper_ ? paper_ : default_paper;
+ if (!paper)
+ return 0;
Paper_book *paper_book = new Paper_book ();
Real scale = scm_to_double (paper->c_variable ("outputscale"));
Output_def *scaled_bookdef = scale_output_def (paper, scale);
Object_key *key = new Lilypond_general_key (0, user_key_, 0);
- SCM scm_key = key->self_scm ();
- scm_gc_unprotect_object (scm_key);
+ SCM scm_key = key->unprotect ();
paper_book->paper_ = scaled_bookdef;
- scm_gc_unprotect_object (scaled_bookdef->self_scm ());
+ scaled_bookdef->unprotect ();
paper_book->header_ = header_;
/* Render in order of parsing. */
- int midi_count = 0;
for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
{
if (Score *score = unsmob_score (scm_car (s)))
Music_output *output = unsmob_music_output (scm_car (outputs));
if (Performance *perf = dynamic_cast<Performance *> (output))
- {
- String fn = outname;
- if (midi_count)
- fn += "-" + to_string (midi_count);
-
- midi_count ++;
- perf->write_output (fn);
- }
- else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
+ 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);
}
-
+
outputs = scm_cdr (outputs);
}
}
- else if (Text_interface::markup_p (scm_car (s)))
+ else if (Text_interface::is_markup (scm_car (s)))
paper_book->add_score (scm_car (s));
else
assert (0);
scm_remember_upto_here_1 (scm_key);
return paper_book;
}
+