#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"
#include "warn.hh"
-/*
- TODO: junkme.
- */
Score::Score ()
: Input ()
{
IMPLEMENT_SMOBS (Score);
IMPLEMENT_DEFAULT_EQUAL_P (Score);
+IMPLEMENT_TYPE_P (Score, "ly:score?");
SCM
Score::mark_smob (SCM s)
return 1;
}
-
-
-/*
- store point & click locations.
- Global to save some time. (Sue us!)
- */
-
Score::Score (Score const &s)
: Input (s)
{
music_ = SCM_EOL;
- // FIXME: SCM_EOL?
+ /* FIXME: SCM_EOL? */
header_ = 0;
smobify_self ();
defs_.push (s.defs_[i]->clone ());
header_ = ly_make_anonymous_module (false);
- if (is_module (s.header_))
+ if (ly_c_module_p (s.header_))
ly_import_module (header_, s.header_);
}
+
LY_DEFINE (ly_run_translator, "ly:run-translator",
- 2, 0, 0, (SCM mus, SCM output_def),
+ 2, 0, 0, (SCM mus, SCM output_def),
"Process @var{mus} according to @var{output_def}. "
"An interpretation context is set up, "
"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);
+ if (!music
+ || !music->get_length ().to_bool ())
+ {
+ warning (_ ("Need music in a score"));
+ return SCM_BOOL_F;
+ }
+
SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music");
SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, "Output definition");
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)
{
{
Global_context *g = dynamic_cast<Global_context*> (unsmob_context (context));
SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context");
- SCM_ASSERT_TYPE (ly_c_string_p (outname), outname, SCM_ARG2, __FUNCTION__, "output filename");
+ SCM_ASSERT_TYPE (scm_is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output filename");
Music_output *output = g->get_output ();
progress_indication ("\n");
- // ugh, midi still wants outname
+ /* ugh, midi still wants outname */
return output->process (ly_scm2string (outname));
}
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)))
{
Music_output *output = g->get_output ();
if (systems != SCM_UNDEFINED)
{
+ /* ugh, this is strange, Paper_book without a Book object. */
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->header_ = header;
+ paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef);
+
+ Score_systems sc;
+ sc.systems_ = systems;
+ sc.header_ = header;
+
+ paper_book->score_systems_.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);
}
+/*
+Format score, return systems. OUTNAME is still passed to create a midi
+file.
+
+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;
- if (!(no_paper_global_b && dynamic_cast<Paper_def*> (def)))
+ Output_def *def = outdef_count ? defs_[i] : default_def;
+ SCM scaled= SCM_EOL;
+ if (def->c_variable ("is-paper") == SCM_BOOL_T)
{
- SCM context = ly_run_translator (music_, def->self_scm ());
- if (Global_context *g = dynamic_cast<Global_context*>
- (unsmob_context (context)))
- {
- SCM s = ly_format_output (context, out);
- if (s != SCM_UNDEFINED)
- {
- systems = s;
- /* Ugh. */
- Music_output *output = g->get_output ();
- if (Paper_score *ps = dynamic_cast<Paper_score*> (output))
- *paper = ps->paper_;
- }
- }
+ def = scale_output_def (def, scale);
+ def->parent_ = paperbook;
+ scaled = def->self_scm ();
+ scm_gc_unprotect_object (scaled);
}
+
+ /* TODO: fix or junk --no-paper. */
+ SCM context = ly_run_translator (music_, def->self_scm ());
+ if (dynamic_cast<Global_context*> (unsmob_context (context)))
+ {
+ 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;
}
-LY_DEFINE (ly_score_bookify, "ly:score-bookify",
- 1, 0, 0,
- (SCM score_smob),
- "Return SCORE encapsulated in a BOOK.")
+
+
+
+LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
+ 2, 0, 0, (SCM score, SCM paper),
+ "Run @var{score} through @var{paper}, an output definition, "
+ "scaled to correct outputscale already, "
+ "return a list of paper-lines.")
{
- SCM_ASSERT_TYPE (unsmob_score (score_smob), score_smob, SCM_ARG1, __FUNCTION__, "score_smob");
+ Score * sc = unsmob_score (score);
+ Output_def *od = unsmob_output_def (paper);
+
+ SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");
+ SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def");
+
+ Output_def * score_def = 0;
+
+ /* UGR, FIXME, these are default \paper blocks once again. They
+ suck. */
+ for (int i = 0; !score_def && i < sc->defs_.size (); i++)
+ if (sc->defs_[i]->c_variable ("is-paper") == SCM_BOOL_T)
+ score_def = sc->defs_[i];
+
+ if (!score_def)
+ return scm_c_make_vector (0, SCM_EOL);
+
+ score_def = score_def->clone ();
+ SCM prot = score_def->self_scm ();
+ scm_gc_unprotect_object (prot);
+
+ /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
+ itself. */
+ score_def->parent_ = od;
+
+ SCM context = ly_run_translator (sc->music_, score_def->self_scm ());
+ SCM lines = ly_format_output (context, scm_makfrom0str ("<embedded>"));
- Score *score = unsmob_score (score_smob);
- Book *book = new Book;
- book->scores_.push (score);
- scm_gc_unprotect_object (book->self_scm ());
- return book->self_scm ();
+ scm_remember_upto_here_1 (prot);
+ return lines;
}
projects / lilypond.git / blobdiff