#include <stdio.h>
+#include "lily-parser.hh"
#include "book.hh"
-
#include "cpu-timer.hh"
#include "global-context.hh"
#include "ly-module.hh"
{
header_ = SCM_EOL;
music_ = SCM_EOL;
+ error_found_ = false;
smobify_self ();
}
: Input (s)
{
music_ = SCM_EOL;
-
+ error_found_ = s.error_found_;
+
/* FIXME: SCM_EOL? */
header_ = 0;
Output_def *odef = unsmob_output_def (output_def);
Music *music = unsmob_music (mus);
- if (!music)
- return SCM_BOOL_F;
-
+ 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");
{
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");
Output_def *bpd = unsmob_output_def (book_outputdef);
/* ugh. */
- if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T)
+ if (bpd->c_variable ("is-paper") == SCM_BOOL_T)
{
- Real scale = ly_scm2double (bpd->c_variable ("outputscale"));
+ Real scale = scm_to_double (bpd->c_variable ("outputscale"));
Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
scaled_def = def->self_scm ();
/* ugh, this is strange, Paper_book without a Book object. */
Paper_book *paper_book = new Paper_book ();
paper_book->header_ = header;
- paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef);
+ paper_book->paper_ = unsmob_output_def (scaled_bookdef);
Score_systems sc;
sc.systems_ = systems;
Format score, return systems. OUTNAME is still passed to create a midi
file.
-PAPERBOOK should be scaled already.
+LAYOUTBOOK should be scaled already.
*/
SCM
Score::book_rendering (String outname,
- Output_def *paperbook,
+ Output_def *layoutbook,
Output_def *default_def)
{
+ if (error_found_)
+ return SCM_EOL;
+
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"));
+ if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
+ scale = scm_to_double (layoutbook->c_variable ("outputscale"));
SCM out = scm_makfrom0str (outname.to_str0 ());
SCM systems = SCM_EOL;
for (int i = 0; !i || i < outdef_count; i++)
{
Output_def *def = outdef_count ? defs_[i] : default_def;
- SCM scaled= SCM_EOL;
- if (def->c_variable ("is-paper") == SCM_BOOL_T)
+ SCM scaled = SCM_EOL;
+ if (def->c_variable ("is-layout") == SCM_BOOL_T)
{
def = scale_output_def (def, scale);
- def->parent_ = paperbook;
+ def->parent_ = layoutbook;
scaled = def->self_scm ();
scm_gc_unprotect_object (scaled);
}
- /* TODO: fix or junk --no-paper. */
+ /* TODO: fix or junk --no-layout. */
SCM context = ly_run_translator (music_, def->self_scm ());
if (dynamic_cast<Global_context*> (unsmob_context (context)))
{
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, "
+ 2, 0, 0, (SCM score, SCM layout),
+ "Run @var{score} through @var{layout}, an output definition, "
"scaled to correct outputscale already, "
- "return a list of paper-lines.")
+ "return a list of layout-lines.")
{
Score * sc = unsmob_score (score);
- Output_def *od = unsmob_output_def (paper);
+ Output_def *od = unsmob_output_def (layout);
+ if (sc->error_found_)
+ {
+ return SCM_EOL;
+ }
+
SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");
- SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def");
+ SCM_ASSERT_TYPE (od, layout, SCM_ARG2, __FUNCTION__, "Output_def");
Output_def * score_def = 0;
- /* UGR, FIXME, these are default \paper blocks once again. They
+ /* UGR, FIXME, these are default \layout 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)
+ if (sc->defs_[i]->c_variable ("is-layout") == SCM_BOOL_T)
score_def = sc->defs_[i];
if (!score_def)
itself. */
score_def->parent_ = od;
- SCM context = ly_run_translator (sc->music_, score_def->self_scm ());
+ SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ());
SCM lines = ly_format_output (context, scm_makfrom0str ("<embedded>"));
scm_remember_upto_here_1 (prot);
return lines;
}
+
+void
+Score::set_music (SCM music, SCM parser)
+{
+ /* URG? */
+ SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
+ for (; scm_is_pair (check_funcs); check_funcs = scm_cdr (check_funcs))
+ music = scm_call_2 (scm_car (check_funcs), music, parser);
+
+ if (unsmob_music (music_))
+ {
+ unsmob_music (music)->origin ()->error (_("Already have music in score"));
+ unsmob_music (music_)->origin ()->error (_("This is the previous music"));
+ }
+ Music * m = unsmob_music (music);
+ if (m && to_boolean (m->get_property ("error-found")))
+ {
+ m->origin()->error (_("Error found in this music expression. Ignoring it"));
+
+ this->error_found_ = this->error_found_ || to_boolean (m->get_property ("error-found"));
+
+ }
+
+ if (this->error_found_)
+ this->music_ = SCM_EOL;
+ else
+ this->music_ = music;
+
+}
+
+SCM
+Score::get_music () const
+{
+ return music_;
+}
projects / lilypond.git / blobdiff