X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook-scheme.cc;h=58a05650611adeb383276f44953f3a93cc62b747;hb=c6554467b0a9beddf0d7ef12746ae31a25fe36e7;hp=23d728edf202b2e50f21a143ff999bd3c7a933a0;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index 23d728edf2..58a0565061 100644
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "book.hh"
@@ -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;
@@ -35,23 +34,32 @@ LY_DEFINE (ly_make_book, "ly:make-book",
   return x;
 }
 
-LY_DEFINE (ly_parser_print_book, "ly:book-process",
+LY_DEFINE (ly_make_book_part, "ly:make-book-part",
+	   1, 0, 0, (SCM scores),
+	   "Make a @code{\\bookpart} containing @code{\\scores}.")
+{
+  Book *book = new Book;
+  book->scores_ = scm_append (scm_list_2 (scores, book->scores_));
+
+  SCM x = book->self_scm ();
+  book->unprotect ();
+  return x;
+}
+
+LY_DEFINE (ly_book_process, "ly:book-process",
 	   4, 0, 0, (SCM book_smob,
 		     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));
@@ -65,23 +73,20 @@ LY_DEFINE (ly_parser_print_book, "ly:book-process",
 }
 
 
-LY_DEFINE (ly_parser_print_book_to_systems, "ly:book-process-to-systems",
+LY_DEFINE (ly_book_process_to_systems, "ly:book-process-to-systems",
 	   4, 0, 0, (SCM book_smob,
 		     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 +99,22 @@ LY_DEFINE (ly_parser_print_book_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;
+}
+
+LY_DEFINE (ly_book_add_bookpart_x, "ly:book-add-bookpart!",
+	   2, 0, 0, (SCM book_smob, SCM book_part),
+	   "Add @var{book_part} to @var{book-smob} book part list.")
+{
+  LY_ASSERT_SMOB (Book, book_smob, 1);
+  Book *book = unsmob_book (book_smob); 
+  book->add_bookpart (book_part);
+  return SCM_UNSPECIFIED;
+}