X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook-scheme.cc;h=7864736463ba0cdbd71ef372ba3240947ad1cce9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=516ad6fbe40f2705e235826ec84f4b5de2dbafdc;hpb=14c5f7683efc21f5cd168a713a34b3362f8c6d67;p=lilypond.git diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc index 516ad6fbe4..7864736463 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--2007 Han-Wen Nienhuys + (c) 2004--2008 Han-Wen Nienhuys */ #include "book.hh" @@ -15,8 +15,8 @@ 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); LY_ASSERT_SMOB (Output_def, paper, 1); @@ -34,21 +34,32 @@ LY_DEFINE (ly_make_book, "ly:make-book", 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. " - "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); + 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)); @@ -67,14 +78,13 @@ 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).") { LY_ASSERT_SMOB (Book, book_smob, 1); - LY_ASSERT_SMOB(Output_def, default_paper, 2); - LY_ASSERT_SMOB(Output_def, default_layout, 3); + LY_ASSERT_SMOB (Output_def, default_paper, 2); + LY_ASSERT_SMOB (Output_def, default_layout, 3); Book *book = unsmob_book (book_smob); @@ -89,3 +99,22 @@ 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; +} + +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; +}