X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook-scheme.cc;h=e00f1ded496965f1882390f31976f613b26debb7;hb=890bf9e11a81a566d6387999a796c44edeeebe75;hp=3a162ac392d914ca65faaede6021a38ae27101b0;hpb=11164b5cb08da70748b1e431adbe907f4314e75b;p=lilypond.git

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index 3a162ac392..e00f1ded49 100644
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -15,12 +15,11 @@
 
 LY_DEFINE (ly_make_book, "ly:make-book",
 	   2, 0, 1, (SCM paper, SCM header, SCM scores),
-	   "Make a \\book of @var{paper} and @var{header} (which may be #f as well)  "
-	   "containing @code{\\scores}.")
+	   "Make a @code{\\book} of @var{paper} and @var{header}"
+	   " (which may be @code{#f} as well) containing @code{\\scores}.")
 {
   Output_def *odef = unsmob_output_def (paper);
-  SCM_ASSERT_TYPE (odef, paper,
-		   SCM_ARG1, __FUNCTION__, "Output_def");
+  LY_ASSERT_SMOB (Output_def, paper, 1);
 
   Book *book = new Book;
   book->paper_ = odef;
@@ -40,18 +39,15 @@ LY_DEFINE (ly_book_process, "ly:book-process",
 		     SCM default_paper,
 		     SCM default_layout,
 		     SCM output),
-	   "Print book. @var{output} is passed to the backend unchanged. "
-	   "Eg. it may be "
-	   "a string (for file based outputs) or a socket (for network based "
-	   "output).")
+	   "Print book.  @var{output} is passed to the backend unchanged."
+	   "  For example, it may be a string (for file based outputs)"
+	   " or a socket (for network based output).")
 {
   Book *book = unsmob_book (book_smob);
 
-  SCM_ASSERT_TYPE (book, book_smob, SCM_ARG1, __FUNCTION__, "Book");
-  SCM_ASSERT_TYPE (unsmob_output_def (default_paper),
-		   default_layout, SCM_ARG2, __FUNCTION__, "\\paper block");
-  SCM_ASSERT_TYPE (unsmob_output_def (default_layout),
-		   default_layout, SCM_ARG3, __FUNCTION__, "\\layout block");
+  LY_ASSERT_SMOB (Book, book_smob, 1);
+  LY_ASSERT_SMOB (Output_def, default_paper, 2);
+  LY_ASSERT_SMOB (Output_def, default_layout, 3);
 
   Paper_book *pb = book->process (unsmob_output_def (default_paper),
 				  unsmob_output_def (default_layout));
@@ -70,18 +66,15 @@ LY_DEFINE (ly_book_process_to_systems, "ly:book-process-to-systems",
 		     SCM default_paper,
 		     SCM default_layout,
 		     SCM output),
-	   "Print book. @var{output} is passed to the backend unchanged. "
-	   "Eg. it may be "
-	   "a string (for file based outputs) or a socket (for network based "
-	   "output).")
+	   "Print book.  @var{output} is passed to the backend unchanged."
+	   "  For example, it may be a string (for file based outputs)"
+	   " or a socket (for network based output).")
 {
-  Book *book = unsmob_book (book_smob);
+  LY_ASSERT_SMOB (Book, book_smob, 1);
+  LY_ASSERT_SMOB (Output_def, default_paper, 2);
+  LY_ASSERT_SMOB (Output_def, default_layout, 3);
 
-  SCM_ASSERT_TYPE (book, book_smob, SCM_ARG1, __FUNCTION__, "Book");
-  SCM_ASSERT_TYPE (unsmob_output_def (default_paper),
-		   default_layout, SCM_ARG2, __FUNCTION__, "\\paper block");
-  SCM_ASSERT_TYPE (unsmob_output_def (default_layout),
-		   default_layout, SCM_ARG3, __FUNCTION__, "\\layout block");
+  Book *book = unsmob_book (book_smob); 
 
   Paper_book *pb = book->process (unsmob_output_def (default_paper),
 				  unsmob_output_def (default_layout));
@@ -94,3 +87,12 @@ LY_DEFINE (ly_book_process_to_systems, "ly:book-process-to-systems",
   return SCM_UNSPECIFIED;
 }
 
+LY_DEFINE (ly_book_add_score_x, "ly:book-add-score!",
+	   2, 0, 0, (SCM book_smob, SCM score),
+	   "Add @var{score} to @var{book-smob} score list.")
+{
+  LY_ASSERT_SMOB (Book, book_smob, 1);
+  Book *book = unsmob_book (book_smob); 
+  book->add_score (score);
+  return SCM_UNSPECIFIED;
+}