X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fscore-scheme.cc;h=c10347530251767fc8bfafd5e98f08b49f96bf3f;hb=85902ccc9c481c2f992676ecff060e05caffef8f;hp=7cf79abe8f3fdd1a7e46811e40c5283463e6a7c7;hpb=92918346012f79ef9109ef0c391947af2d3165ca;p=lilypond.git

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 7cf79abe8f..c103475302 100644
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -20,8 +20,7 @@ LY_DEFINE (ly_make_score, "ly:make-score",
 	   (SCM music),
 	   "Return score with @var{music} encapsulated in @var{score}.")
 {
-  LY_ASSERT_FIRST_SMOB (Music, music);
-  Music *mus = unsmob_music (music);
+  LY_ASSERT_SMOB (Music, music, 1);
 
   Score *score = new Score;
   score->set_music (music);
@@ -31,14 +30,14 @@ 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_FIRST_SMOB (Score, 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);
+    l = scm_cons (sc->defs_[i]->self_scm (), l);
   return scm_reverse_x (l, SCM_EOL);
 }
 
@@ -46,9 +45,9 @@ LY_DEFINE (ly_score_output_defs, "ly:score-output-defs",
 
 LY_DEFINE (ly_score_header, "ly:score-header",
 	   1, 0, 0, (SCM score),
-	   "return score header.")
+	   "Return score header.")
 {
-  LY_ASSERT_FIRST_SMOB (Score, score);
+  LY_ASSERT_SMOB (Score, score, 1);
   Score *sc = unsmob_score (score);
   return sc->header_;
 }
@@ -56,9 +55,9 @@ 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_FIRST_SMOB (Score, score);
+  LY_ASSERT_SMOB (Score, score, 1);
   Score *sc = unsmob_score (score);
   return sc->get_music ();
 }
@@ -67,20 +66,20 @@ LY_DEFINE (ly_score_error_p, "ly:score-error?",
 	   1, 0, 0, (SCM score),
 	   "Was there an error in the score?")
 {
-  LY_ASSERT_FIRST_SMOB (Score, 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, 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_FIRST_SMOB (Score, score);
-  LY_ASSERT_SMOB (Output_def, 2);
+  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);