source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <stdio.h>
+#include <cstdio>
-#include "ly-smobs.icc"
-#include "stencil.hh"
#include "book.hh"
+#include "lilypond-key.hh"
#include "global-context.hh"
-#include "ly-module.hh"
#include "main.hh"
#include "music-iterator.hh"
-#include "output-def.hh"
#include "music-output.hh"
#include "music.hh"
-#include "paper-book.hh"
#include "output-def.hh"
+#include "paper-book.hh"
#include "score.hh"
+#include "stencil.hh"
#include "warn.hh"
+#include "ly-smobs.icc"
+
Book::Book ()
: Input ()
{
- bookpaper_ = 0;
+ paper_ = 0;
header_ = SCM_EOL;
assert (!scores_.size ());
smobify_self ();
for (int i = 0; i < score_count; i++)
scm_gc_mark (book->scores_[i]->self_scm ());
- if (book->bookpaper_)
- scm_gc_mark (book->bookpaper_->self_scm ());
+#if 0
+ if (book->key_)
+ scm_gc_mark (book->key_->self_scm());
+#endif
+ if (book->paper_)
+ scm_gc_mark (book->paper_->self_scm ());
return book->header_;
}
return 1;
}
-/*
- This function does not dump the output; outname is required eg. for
- dumping header fields.
- */
+/* 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)
{
+ bool error = false;
+ for (int i = 0; i < scores_.size(); i++)
+ error = error || scores_[i]->error_found_;
+
+ if (error)
+ return 0;
+
Paper_book *paper_book = new Paper_book ();
- Real scale = ly_scm2double (bookpaper_->c_variable ("outputscale"));
-
- Output_def * scaled_bookdef = scale_output_def (bookpaper_, scale);
+ Real scale = scm_to_double (paper_->c_variable ("outputscale"));
+ Output_def * scaled_bookdef = scale_output_def (paper_, scale);
+
- paper_book->bookpaper_ = scaled_bookdef;
+ Object_key * key = new Lilypond_general_key (0, user_key_, 0);
+ SCM scm_key = key->self_scm();
+ scm_gc_unprotect_object (scm_key);
+
+ paper_book->paper_ = scaled_bookdef;
scm_gc_unprotect_object (scaled_bookdef->self_scm());
paper_book->header_ = header_;
-
int score_count = scores_.size ();
for (int i = 0; i < score_count; i++)
{
SCM systems = scores_[i]->book_rendering (outname,
- paper_book->bookpaper_,
- default_def);
- if (systems != SCM_UNDEFINED)
+ paper_book->paper_,
+ default_def,
+ key
+ );
+
+ /*
+ If the score is empty, generate no output. Should we
+ do titling?
+ */
+ if (SCM_NFALSEP(scm_vector_p (systems)))
{
- Score_lines sc;
- sc.lines_ = systems;
- sc.header_ = header_;
-
- paper_book->score_lines_.push (sc);
+ Score_systems sc;
+ sc.systems_ = systems;
+ sc.header_ = scores_[i]->header_;
+ sc.texts_ = scores_[i]->texts_;
+ paper_book->score_systems_.push (sc);
}
}
+
+ scm_remember_upto_here_1 (scm_key);
return paper_book;
}
-#if 0
-/* FIXME: WIP, this is a hack. Return first page as stencil. */
-SCM
-Book::to_stencil (Output_def *default_def)
-{
- Paper_book *paper_book = process ("<markup>", default_def);
-
- SCM pages = paper_book->pages ();
- scm_gc_unprotect_object (paper_book->self_scm ());
-
- if (ly_c_pair_p (pages))
- {
- progress_indication (_f ("paper output to `%s'...", "<markup>"));
- return ly_car (pages);
- }
- scm_gc_unprotect_object (paper_book->bookpaper_->self_scm ());
- return SCM_EOL;
+
+void
+Book::add_score (Score *s)
+{
+ scores_.push (s);
+ scm_gc_unprotect_object (s->self_scm ());
}
-#endif