Distangle classic output routines.

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

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index c188de3704d9e1a7ea9d32d16250ad363cbe3f87..b48219ad44895e36a0f1ec77a705ba0563186014 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -12,6 +12,9 @@
 #include "output-def.hh"
 #include "global-context.hh"
 #include "lilypond-key.hh"
+#include "music-output.hh"
+#include "paper-score.hh"
+#include "paper-book.hh"
 
 LY_DEFINE (ly_make_score, "ly:make-score",
           1, 0, 0,
@@ -27,6 +30,49 @@ LY_DEFINE (ly_make_score, "ly:make-score",
   return score->unprotect ();
 }
 
+LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
+          1, 0, 0, (SCM score),
+          "All output defs in a score.")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "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_header, "ly:score-header",
+          1, 0, 0, (SCM score),
+          "return score header.")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "score");
+  return sc->header_;
+}
+
+
+LY_DEFINE (ly_score_music, "ly:score-music",
+          1, 0, 0, (SCM score),
+          "return score music.")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "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?")
+{
+  Score *sc = unsmob_score (score);
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "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, "
@@ -69,47 +115,66 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
   return output;
 }
 
-LY_DEFINE (ly_score_process, "ly:score-process",
-          5, 0, 0,
-          (SCM score_smob,
-           SCM default_header,
-           SCM default_paper,
-           SCM default_layout,
-           SCM basename),
-          "Print score without page-layout: just print the systems.")
+LY_DEFINE (ly_score_process, "ly:render-music-as-systems",
+          5, 0, 0, (SCM music,
+                    SCM outdef,
+                    SCM book_outputdef,
+                    SCM header,
+                    SCM outname),
+          "Create output using a default \\book block. ")
 {
-  Score *score = unsmob_score (score_smob);
+  SCM_ASSERT_TYPE(unsmob_music(music), music,
+                 SCM_ARG1, __FUNCTION__, "music");
+  SCM_ASSERT_TYPE(unsmob_output_def (outdef), outdef,
+                 SCM_ARG2, __FUNCTION__, "output def");
+  SCM_ASSERT_TYPE(unsmob_output_def (book_outputdef), book_outputdef,
+                 SCM_ARG3, __FUNCTION__, "output def");
+  SCM_ASSERT_TYPE(scm_is_string (outname), outname,
+                 SCM_ARG5, __FUNCTION__, "string");
+  
+  
+  SCM scaled_def = outdef;
+  SCM scaled_bookdef = book_outputdef;
+
+  Output_def *bpd = unsmob_output_def (book_outputdef);
+
+  /* ugh .  */
+  assert (bpd->c_variable ("is-paper") == SCM_BOOL_T);
+
+  Real scale = scm_to_double (bpd->c_variable ("output-scale"));
+
+  Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
+  Output_def *bdef = scale_output_def (bpd, scale);
+  def->parent_ = bdef;
+
+  scaled_def = def->self_scm ();
+  scaled_bookdef = bdef->self_scm ();
 
-  SCM_ASSERT_TYPE (score, score_smob, SCM_ARG1, __FUNCTION__, "score");
+  def->unprotect ();
+  bdef->unprotect ();
 
-  // allow header to be undefined.
-  SCM_ASSERT_TYPE (unsmob_output_def (default_paper),
-                  default_header, SCM_ARG3, __FUNCTION__, "\\paper block");
-  SCM_ASSERT_TYPE (unsmob_output_def (default_layout),
-                  default_header, SCM_ARG4, __FUNCTION__, "\\layout block");
+  SCM context = ly_run_translator (music, scaled_def, SCM_BOOL_F);
+  SCM output_as_scm = ly_format_output (context);
+  Music_output *output = unsmob_music_output (output_as_scm);
 
-  Object_key *key = new Lilypond_general_key (0, score->user_key_, 0);
+  Paper_score *pscore = dynamic_cast<Paper_score *> (output);
+  assert (pscore);
 
-  if (score->error_found_)
-    return SCM_UNSPECIFIED;
+  /* ugh, this is strange, Paper_book without a Book object. */
+  Paper_book *paper_book = new Paper_book ();
+  paper_book->header_ = header;
+  paper_book->paper_ = unsmob_output_def (scaled_bookdef);
 
-  SCM header = ly_is_module (score->header_)
-    ? score->header_
-    : default_header;
+  if (ly_is_module (header))
+    paper_book->add_score (header);
 
-  for (vsize i = 0; i < score->defs_.size (); i++)
-    default_rendering (score->get_music (), score->defs_[i]->self_scm (),
-                      default_paper, header, basename, key->self_scm ());
+  paper_book->add_score (pscore->self_scm ());
+  paper_book->classic_output (outname);
+  paper_book->unprotect ();
 
-  if (score->defs_.empty ())
-    {
-      default_rendering (score->get_music (),
-                        default_layout,
-                        default_paper,
-                        header, basename, key->self_scm ());
-    }
+  scm_remember_upto_here_1 (scaled_def);
+  scm_remember_upto_here_1 (scaled_bookdef);
 
-  key->unprotect ();
   return SCM_UNSPECIFIED;
 }