X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-scheme.cc;h=1d3e55bc6e31873047eae282ac033a6fe865fcf5;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=83111f670755cf74ae935c1ff5a938dcf4b9205e;hpb=ae9943e466d3b718bc96a858438f43cd23d62fec;p=lilypond.git

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 83111f6707..1d3e55bc6e 100644
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -1,9 +1,20 @@
 /*
-  score-scheme.cc -- implement Score bindings.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "score.hh"
@@ -16,9 +27,9 @@
 #include "paper-book.hh"
 
 LY_DEFINE (ly_make_score, "ly:make-score",
-	   1, 0, 0,
-	   (SCM music),
-	   "Return score with @var{music} encapsulated in @var{score}.")
+           1, 0, 0,
+           (SCM music),
+           "Return score with @var{music} encapsulated in it.")
 {
   LY_ASSERT_SMOB (Music, music, 1);
 
@@ -29,11 +40,11 @@ LY_DEFINE (ly_make_score, "ly:make-score",
 }
 
 LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
-	   1, 0, 0, (SCM score),
-	   "All output defs in a score.")
+           1, 0, 0, (SCM score),
+           "All output definitions in a score.")
 {
   LY_ASSERT_SMOB (Score, score, 1);
-  Score *sc = unsmob_score (score);
+  Score *sc = unsmob<Score> (score);
 
   SCM l = SCM_EOL;
   for (vsize i = 0; i < sc->defs_.size (); i++)
@@ -41,48 +52,69 @@ LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
   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.")
+           1, 0, 0, (SCM score),
+           "Return score header.")
 {
   LY_ASSERT_SMOB (Score, score, 1);
-  Score *sc = unsmob_score (score);
-  return sc->header_;
+  Score *sc = unsmob<Score> (score);
+  return sc->get_header ();
 }
 
+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.")
+           1, 0, 0, (SCM score),
+           "Return score music.")
 {
   LY_ASSERT_SMOB (Score, score, 1);
-  Score *sc = unsmob_score (score);
+  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?")
+           1, 0, 0, (SCM score),
+           "Was there an error in the score?")
 {
   LY_ASSERT_SMOB (Score, score, 1);
-  Score *sc = unsmob_score (score);
+  Score *sc = unsmob<Score> (score);
   return scm_from_bool (sc->error_found_);
 }
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
-	   2, 0, 0, (SCM score, SCM layout),
-	   "Run @var{score} through @var{layout}, an output definition, "
-	   "scaled to correct output-scale 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.")
 {
   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);
+  Score *sc = unsmob<Score> (score);
+  Output_def *od = unsmob<Output_def> (layout);
 
   if (sc->error_found_)
     return SCM_EOL;
@@ -92,22 +124,22 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
   /* UGR, FIXME, these are default \layout blocks once again.  They
      suck. */
   for (vsize i = 0; !score_def && i < sc->defs_.size (); i++)
-    if (sc->defs_[i]->c_variable ("is-layout") == SCM_BOOL_T)
+    if (to_boolean (sc->defs_[i]->c_variable ("is-layout")))
       score_def = sc->defs_[i];
 
   if (!score_def)
     return SCM_BOOL_F;
 
-  score_def = score_def->clone ();
-  SCM prot = score_def->unprotect ();
+  /* Don't rescale if the layout has already been scaled */
+  if (to_boolean (score_def->c_variable ("cloned")))
+    score_def = score_def->clone ();
+  else
+    score_def = scale_output_def (score_def, output_scale (od));
 
-  /* 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 ());
+  SCM context = ly_run_translator (sc->get_music (), score_def->unprotect ());
   SCM output = ly_format_output (context);
 
-  scm_remember_upto_here_1 (prot);
   return output;
 }