#include <stdio.h>
#include "book.hh"
+
#include "cpu-timer.hh"
#include "global-context.hh"
#include "ly-module.hh"
#include "ly-smobs.icc"
#include "main.hh"
#include "music-iterator.hh"
-#include "music-output-def.hh"
+#include "output-def.hh"
#include "music-output.hh"
#include "music.hh"
#include "paper-book.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "paper-score.hh"
#include "scm-hash.hh"
#include "score.hh"
smobify_self ();
- Music * m =unsmob_music (s.music_);
- music_ = m?m->clone ()->self_scm () : SCM_EOL;
+ Music *m =unsmob_music (s.music_);
+ music_ = m ? m->clone ()->self_scm () : SCM_EOL;
scm_gc_unprotect_object (music_);
for (int i = 0; i < s.defs_.size (); i++)
defs_.push (s.defs_[i]->clone ());
- header_ = ly_make_anonymous_module ();
- if (is_module (s.header_))
+ header_ = ly_make_anonymous_module (false);
+ if (ly_c_module_p (s.header_))
ly_import_module (header_, s.header_);
}
"and @var{mus} is interpreted with it. "
"The context is returned in its final state.")
{
- Music_output_def *odef = unsmob_music_output_def (output_def);
+ Output_def *odef = unsmob_output_def (output_def);
Music *music = unsmob_music (mus);
SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music");
Cpu_timer timer;
- Global_context * trans = new Global_context (odef,
- music->get_length ()
- );
+ Global_context * trans = new Global_context (odef, music->get_length ());
if (!trans)
{
iter->construct_children ();
- if (! iter->ok ())
+ if (!iter->ok ())
{
warning (_ ("Need music in a score"));
- return SCM_BOOL_F; // todo: should throw exception.
+ /* todo: should throw exception. */
+ return SCM_BOOL_F;
}
trans->run_iterator_on_me (iter);
if (verbose_global_b)
progress_indication (_f ("elapsed time: %.2f seconds", timer.read ()));
-
return scm_gc_unprotect_object (trans->self_scm ());
}
}
void
-default_rendering (SCM music, SCM outdef, SCM header, SCM outname)
+default_rendering (SCM music, SCM outdef,
+ SCM book_outputdef,
+ SCM header, SCM outname)
{
- SCM context = ly_run_translator (music, outdef);
+ SCM scaled_def = outdef;
+ SCM scaled_bookdef = book_outputdef;
+
+ Output_def *bpd = unsmob_output_def (book_outputdef);
+
+ /*
+ ugh.
+ */
+ if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T)
+ {
+ Real scale = ly_scm2double (bpd->c_variable ("outputscale"));
+
+ Output_def * def = scale_output_def (unsmob_output_def (outdef), scale);
+ scaled_def = def->self_scm ();
+
+ scaled_bookdef = scale_output_def (bpd, scale)->self_scm ();
+ unsmob_output_def (scaled_def)->parent_ = unsmob_output_def (scaled_bookdef);
+
+ scm_gc_unprotect_object (scaled_bookdef);
+ scm_gc_unprotect_object (scaled_def);
+ }
+
+ SCM context = ly_run_translator (music, scaled_def);
if (Global_context *g = dynamic_cast<Global_context*>
(unsmob_context (context)))
if (systems != SCM_UNDEFINED)
{
Paper_book *paper_book = new Paper_book ();
- Paper_score *ps = dynamic_cast<Paper_score*> (output);
- paper_book->papers_.push (ps->paper_);
- paper_book->scores_.push (systems);
- paper_book->headers_.push (header);
+
+ paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef);
+
+ Score_lines sc;
+ sc.lines_ = systems;
+ sc.header_ = header;
+
+ paper_book->score_lines_.push (sc);
paper_book->classic_output (ly_scm2string (outname));
scm_gc_unprotect_object (paper_book->self_scm ());
}
delete output;
}
+
+ scm_remember_upto_here_1 (scaled_def);
+ scm_remember_upto_here_1 (scaled_bookdef);
}
+/*
+ PAPERBOOK should be scaled already.
+ */
SCM
-Score::book_rendering (String outname, Music_output_def *default_def,
- Paper_def **paper)
+Score::book_rendering (String outname,
+ Output_def *paperbook,
+ Output_def *default_def)
{
+ SCM scaled_bookdef = SCM_EOL;
+ Real scale = 1.0;
+
+ if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T)
+ {
+ scale = ly_scm2double (paperbook->c_variable ("outputscale"));
+ }
+
SCM out = scm_makfrom0str (outname.to_str0 ());
SCM systems = SCM_EOL;
int outdef_count = defs_.size ();
for (int i = 0; !i || i < outdef_count; i++)
{
- Music_output_def *def = outdef_count ? defs_[i] : default_def;
- SCM context = ly_run_translator (music_, def->self_scm ());
- if (Global_context *g = dynamic_cast<Global_context*>
- (unsmob_context (context)))
+ Output_def *def = outdef_count ? defs_[i] : default_def;
+ SCM scaled= SCM_EOL;
+ if (def->c_variable ("is-paper") == SCM_BOOL_T)
+ {
+ def = scale_output_def (def, scale);
+ def->parent_ = paperbook;
+ scaled = def->self_scm ();
+ scm_gc_unprotect_object (scaled);
+ }
+
+ if (!(no_paper_global_b && dynamic_cast<Output_def*> (def)))
{
- SCM s = ly_format_output (context, out);
- if (s != SCM_UNDEFINED)
+ SCM context = ly_run_translator (music_, def->self_scm ());
+ if (dynamic_cast<Global_context*> (unsmob_context (context)))
{
- systems = s;
- /* Ugh. */
- Music_output *output = g->get_output ();
- if (Paper_score *ps = dynamic_cast<Paper_score*> (output))
- *paper = ps->paper_;
+ SCM s = ly_format_output (context, out);
+ if (s != SCM_UNDEFINED)
+ {
+ systems = s;
+ }
}
}
+
+ scm_remember_upto_here_1 (scaled);
}
+
+ scm_remember_upto_here_1 (scaled_bookdef);
return systems;
}
(SCM score_smob),
"Return SCORE encapsulated in a BOOK.")
{
-#if 0
- SCM_ASSERT_TYPE (ly_c_parser_p (parser_smob), parser_smobd, SCM_ARG1, __FUNCTION__, "parser_smob");
- SCM_ASSERT_TYPE (ly_c_score_p (score_smob), score_smob, SCM_ARG1, __FUNCTION__, "score_smob");
-#endif
+ SCM_ASSERT_TYPE (unsmob_score (score_smob), score_smob, SCM_ARG1, __FUNCTION__, "score_smob");
Score *score = unsmob_score (score_smob);
Book *book = new Book;
projects / lilypond.git / blobdiff