Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 83111f670755cf74ae935c1ff5a938dcf4b9205e..d52b25f0961b90b88b7138aaab1cb9456d23d8dc 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -30,7 +30,7 @@ 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.")
+          "All output definitions in a score.")
 {
   LY_ASSERT_SMOB (Score, score, 1);
   Score *sc = unsmob_score (score);
@@ -41,11 +41,21 @@ 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.")
+          "Return score header.")
 {
   LY_ASSERT_SMOB (Score, score, 1);
   Score *sc = unsmob_score (score);
@@ -55,7 +65,7 @@ LY_DEFINE (ly_score_header, "ly:score-header",
 
 LY_DEFINE (ly_score_music, "ly:score-music",
           1, 0, 0, (SCM score),
-          "return score music.")
+          "Return score music.")
 {
   LY_ASSERT_SMOB (Score, score, 1);
   Score *sc = unsmob_score (score);
@@ -73,10 +83,10 @@ LY_DEFINE (ly_score_error_p, "ly:score-error?",
 
 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.")
+          "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.")
 {
   LY_ASSERT_SMOB (Score, score, 1);
   LY_ASSERT_SMOB (Output_def, layout, 2);