X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook-scheme.cc;h=e00f1ded496965f1882390f31976f613b26debb7;hb=fc273c71061c4859cebc95bb91d86c9373d94f64;hp=f430377fce47f2ffd3c291ff9bec6d573b2818b0;hpb=84c9074729c7a0b36d27be81794ca25a8829f9f3;p=lilypond.git

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index f430377fce..e00f1ded49 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.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;
@@ -31,37 +30,69 @@ LY_DEFINE (ly_make_book, "ly:make-book",
   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_parser_print_book, "ly:book-process",
+LY_DEFINE (ly_book_process, "ly:book-process",
 	   4, 0, 0, (SCM book_smob,
 		     SCM default_paper,
 		     SCM default_layout,
-		     SCM basename),
-	   "Print book.")
+		     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);
 
-  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");
-  SCM_ASSERT_TYPE (scm_is_string (basename), basename, SCM_ARG4, __FUNCTION__, "string");
-
-  String base = ly_scm2string (basename);
-  Paper_book *pb = book->process (base,
-				  unsmob_output_def (default_paper),
-				  unsmob_output_def (default_layout)
-				  );
+  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->output (base);
-      scm_gc_unprotect_object (pb->self_scm ());
+      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;
+}