Run `make grand-replace'.

[lilypond.git] / lily / score-scheme.cc

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 2d6dbf77871ad828fadfd0fbbecbfce7023e75c2..9881bf3d4a68f1b1bacf3e05f45e28cafc009efb 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -1,77 +1,137 @@
 /*
-  score-scheme.cc --  implement Score bindings.
+  score-scheme.cc -- implement Score bindings.
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #include "score.hh"
+
 #include "music.hh"
 #include "output-def.hh"
 #include "global-context.hh"
+#include "music-output.hh"
+#include "paper-score.hh"
+#include "paper-book.hh"
 
-LY_DEFINE (ly_music_scorify, "ly:music-scorify",
-          3, 0, 0,
-          (SCM music, SCM texts, SCM parser),
-          "Return MUSIC with TEXTS encapsulated in SCORE.")
+LY_DEFINE (ly_make_score, "ly:make-score",
+          1, 0, 0,
+          (SCM music),
+          "Return score with @var{music} encapsulated in @var{score}.")
 {
-#if 0
-  SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music");
-#endif
+  LY_ASSERT_SMOB (Music, music, 1);
+
   Score *score = new Score;
+  score->set_music (music);
+
+  return score->unprotect ();
+}
+
+LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
+          1, 0, 0, (SCM score),
+          "All output definitions in a score.")
+{
+  LY_ASSERT_SMOB (Score, score, 1);
+  Score *sc = unsmob_score (score);
+
+  SCM l = SCM_EOL;
+  for (vsize i = 0; i < sc->defs_.size (); i++)
+    l = scm_cons (sc->defs_[i]->self_scm (), l);
+  return scm_reverse_x (l, SCM_EOL);
+}
+
+LY_DEFINE (ly_score_add_output_def_x, "ly:score-add-output-def!",
+          2, 0, 0, (SCM score, SCM def),
+          "Add an output definition @var{def} to @var{score}.")
+{
+  LY_ASSERT_SMOB (Score, score, 1);
+  LY_ASSERT_SMOB (Output_def, def, 2);
+  Score *sc = unsmob_score (score);
+  Output_def *output_def = unsmob_output_def (def);
+  sc->add_output_def (output_def);
+  return SCM_UNSPECIFIED;
+}
+
+LY_DEFINE (ly_score_header, "ly:score-header",
+          1, 0, 0, (SCM score),
+          "Return score header.")
+{
+  LY_ASSERT_SMOB (Score, score, 1);
+  Score *sc = unsmob_score (score);
+  return sc->get_header ();
+}
 
-  score->set_music (music, parser);
-  score->texts_ = texts;
 
-  scm_gc_unprotect_object (score->self_scm ());
-  return score->self_scm ();
+LY_DEFINE (ly_score_set_header_x, "ly:score-set-header!",
+          2, 0, 0, (SCM score, SCM module),
+          "Set the score header.")
+{
+  LY_ASSERT_SMOB (Score, score, 1);
+  SCM_ASSERT_TYPE (ly_is_module (module), module, SCM_ARG2, __FUNCTION__,
+                  "module");
+  
+  Score *sc = unsmob_score (score);
+  sc->set_header (module);
+  return SCM_UNSPECIFIED;
+}
+
+
+LY_DEFINE (ly_score_music, "ly:score-music",
+          1, 0, 0, (SCM score),
+          "Return score music.")
+{
+  LY_ASSERT_SMOB (Score, score, 1);
+  Score *sc = unsmob_score (score);
+  return sc->get_music ();
+}
+
+LY_DEFINE (ly_score_error_p, "ly:score-error?",
+          1, 0, 0, (SCM score),
+          "Was there an error in the score?")
+{
+  LY_ASSERT_SMOB (Score, score, 1);
+  Score *sc = unsmob_score (score);
+  return scm_from_bool (sc->error_found_);
 }
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
-          2, 1, 0, (SCM score, SCM layout, SCM key),
-          "Run @var{score} through @var{layout}, an output definition, "
-          "scaled to correct outputscale already, "
-          "return a list of layout-lines. "
-          "\nTake optional Object_key argument."
-          )
+          2, 0, 0, (SCM score, SCM layout),
+          "Run @var{score} through @var{layout} (an output definition)"
+          " scaled to correct output-scale already, returning a list of"
+          " layout-lines.  This function takes an optional"
+          " @code{Object_key} argument.")
 {
-  Score * sc = unsmob_score (score);
+  LY_ASSERT_SMOB (Score, score, 1);
+  LY_ASSERT_SMOB (Output_def, layout, 2);
+
+  Score *sc = unsmob_score (score);
   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, layout, SCM_ARG2, __FUNCTION__, "Output_def");
+    return SCM_EOL;
 
-  Output_def * score_def  = 0;
+  Output_def *score_def = 0;
 
   /* UGR, FIXME, these are default \layout blocks once again.  They
      suck. */
-  for (int i = 0; !score_def && i < sc->defs_.size (); i++)
+  for (vsize i = 0; !score_def && i < sc->defs_.size (); i++)
     if (sc->defs_[i]->c_variable ("is-layout") == SCM_BOOL_T)
       score_def = sc->defs_[i];
 
   if (!score_def)
-    return scm_c_make_vector (0, SCM_EOL);
-      
+    return SCM_BOOL_F;
+
   score_def = score_def->clone ();
-  SCM prot = score_def->self_scm ();
-  scm_gc_unprotect_object (prot);
+  SCM prot = score_def->unprotect ();
 
   /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
      itself. */
   score_def->parent_ = od;
-  
-  SCM context = ly_run_translator (sc->get_music (), score_def->self_scm (),
-                                  key);
-  SCM lines = ly_format_output (context, scm_makfrom0str ("<embedded>"));
-  
+
+  SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ());
+  SCM output = ly_format_output (context);
+
   scm_remember_upto_here_1 (prot);
-  return lines;
+  return output;
 }