Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / book-scheme.cc

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index 32bcb0e1586fca4cdb3b388633f3c47407ea7a04..23237dbb0d7559e9cfa877d85f7a28596835a3d8 100644 (file)
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -3,37 +3,94 @@
 
   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"
+
 #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 \\book of @var{paper} and @var{header} (which may be #f as well)  "
+          "containing @code{\\scores}.")
 {
-  Output_def * odef = unsmob_output_def (paper);
+  Output_def *odef = unsmob_output_def (paper);
   SCM_ASSERT_TYPE (odef, paper,
                   SCM_ARG1, __FUNCTION__, "Output_def");
 
   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_parser_print_book, "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).")
+{
+  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");
+
+  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_parser_print_book_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).")
+{
+  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");
+
+  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;
+}
+