X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook-scheme.cc;h=58a05650611adeb383276f44953f3a93cc62b747;hb=def21b306e2b8fa2d5630fab0878e9922e197f0c;hp=ac296a6744e2debc3c888c231c7b62be0f3276db;hpb=7a26d44a642acff9cecd896d4a4b4eeb7ea2f76a;p=lilypond.git

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index ac296a6744..58a0565061 100644
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -1,31 +1,120 @@
+/*
+  book-scheme.cc -- implement Book bindings
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "book.hh"
+
 #include "output-def.hh"
 #include "score.hh"
+#include "paper-book.hh"
 #include "ly-module.hh"
 
-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}.")
+LY_DEFINE (ly_make_book, "ly:make-book",
+	   2, 0, 1, (SCM paper, SCM header, SCM 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");
+  Output_def *odef = unsmob_output_def (paper);
+  LY_ASSERT_SMOB (Output_def, paper, 1);
 
   Book *book = new Book;
   book->paper_ = odef;
 
-  if (ly_c_module_p (header))
+  if (ly_is_module (header))
     book->header_ = header;
-  
-  for (SCM s = scores; scm_is_pair (s); s = scm_cdr (s))
-    {
-      Score *score = unsmob_score (scm_car (s));
-      if (score)
-	book->scores_.push (score);
-    }
-  
+
+  book->scores_ = scm_append (scm_list_2 (scores, book->scores_));
+
   SCM x = book->self_scm ();
-  scm_gc_unprotect_object (x);
+  book->unprotect ();
   return x;
 }
+
+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."
+	   "  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);
+
+  Paper_book *pb = book->process (unsmob_output_def (default_paper),
+				  unsmob_output_def (default_layout));
+  if (pb)
+    {
+      pb->output (output);
+      pb->unprotect ();
+    }
+
+  return SCM_UNSPECIFIED;
+}
+
+
+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."
+	   "  For example, it may be a string (for file based outputs)"
+	   " or a socket (for network based output).")
+{
+  LY_ASSERT_SMOB (Book, book_smob, 1);
+  LY_ASSERT_SMOB (Output_def, default_paper, 2);
+  LY_ASSERT_SMOB (Output_def, default_layout, 3);
+
+  Book *book = unsmob_book (book_smob); 
+
+  Paper_book *pb = book->process (unsmob_output_def (default_paper),
+				  unsmob_output_def (default_layout));
+  if (pb)
+    {
+      pb->classic_output (output);
+      pb->unprotect ();
+    }
+
+  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;
+}