*** empty log message ***

diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc
index c3b30bd8e7031319c17fb9f7a0b60e0da298ce6b..f430377fce47f2ffd3c291ff9bec6d573b2818b0 100644 (file)
--- a/lily/book-scheme.cc
+++ b/lily/book-scheme.cc
@@ -36,7 +36,7 @@ LY_DEFINE (ly_make_book, "ly:make-book",
 }
 
 LY_DEFINE (ly_parser_print_book, "ly:book-process",
-          3, 0, 0, (SCM book_smob,
+          4, 0, 0, (SCM book_smob,
                     SCM default_paper,
                     SCM default_layout,
                     SCM basename),

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index f71e0c3ed57dc985e23f43013ecf5c91cd8a9e0c..9a2fd02f6386e88261ba858e412db7c379e6533b 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -41,9 +41,6 @@ public:
   Duration default_duration_;
   String output_basename_;
 
-  int score_count_;
-  int book_count_;
-
   int fatal_error_;
   int error_level_;
   bool ignore_version_b_;

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 28f8b5146cdc9620fc5809043ffbeda3b76e6719..2c39ea6da347edb371a7553a071cb85d61025859 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -25,8 +25,6 @@
 
 Lily_parser::Lily_parser (Sources *sources)
 {
-  book_count_ = 0;
-  score_count_ = 0;
   lexer_ = 0;
   sources_ = sources;
   default_duration_ = Duration (2, 0);
@@ -40,8 +38,6 @@ Lily_parser::Lily_parser (Sources *sources)
 
 Lily_parser::Lily_parser (Lily_parser const &src)
 {
-  book_count_ = src.book_count_;
-  score_count_ = src.score_count_;
   lexer_ = 0;
   sources_ = src.sources_;
   default_duration_ = src.default_duration_;

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index ddd97e3a0dc8c58fba814ca8db2faf9c17ae9d72..9690a6cfea1c4190c2e8c74ca44323d3293a1085 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -74,20 +74,19 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
 }
 
 LY_DEFINE (ly_score_process, "ly:score-process",
-          2, 0, 0,
+          5, 0, 0,
           (SCM score_smob,
            SCM default_header,
            SCM default_paper,
            SCM default_layout,
            SCM basename),
-          "Print score, i.e., the classic way.")
+          "Print score without page-layout: just print the systems.")
 {
   Score *score = unsmob_score (score_smob);
 
   SCM_ASSERT_TYPE (score, score_smob, SCM_ARG1, __FUNCTION__, "score");
 
-  SCM_ASSERT_TYPE (ly_is_module (default_header),
-                  default_header, SCM_ARG2, __FUNCTION__, "module");
+  // allow header to be undefined.
   SCM_ASSERT_TYPE (unsmob_output_def (default_paper),
                   default_header, SCM_ARG3, __FUNCTION__, "\\paper block");
   SCM_ASSERT_TYPE (unsmob_output_def (default_layout),

diff --git a/ly/init.ly b/ly/init.ly
index 29694bb3d8a3d6a63ca76f4815ea1de3938c12de..c17531f6b6d51ec32c668b6a89d0ba728a845c4e 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -14,6 +14,7 @@
 
 #(ly:set-option 'old-relative #f)
 #(define toplevel-scores '())
+#(define output-count 0) 
 #(define $globalheader #f)
 #(define version-seen? #f)
 

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index f14f3d7b42f1937a94ce9c53c735940e933b9a48..8ea362a19843422bd0dec05a8227dea4c972c76c 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -61,7 +61,7 @@
     (ly:parser-print-score parser book)))
                
 (define-public (collect-scores-for-book parser score)
-  (ly:parser-define
+  (ly:parser-define!
    parser 'toplevel-scores
    (cons score (ly:parser-lookup parser 'toplevel-scores))))
 
@@ -82,7 +82,7 @@
   (let*
       ((paper (ly:parser-lookup parser '$defaultpaper))
        (layout (ly:parser-lookup parser '$defaultlayout))
-       (count (ly:parser-lookup parser 'book-count))
+       (count (ly:parser-lookup parser 'output-count))
        (base (ly:parser-output-name parser)))
 
     (if (not (integer? count))
@@ -91,7 +91,7 @@
     (if (> count 0)
        (set! (base (format #f "~a-~a" count))))
 
-    (ly:parser-define! book-count (1+ count))
+    (ly:parser-define! parser 'output-count (1+ count))
     
 
     (ly:book-process book paper layout base)
@@ -101,8 +101,8 @@
   (let*
       ((paper (ly:parser-lookup parser '$defaultpaper))
        (layout (ly:parser-lookup parser '$defaultlayout))
-       (layout (ly:parser-lookup parser '$globalheader))
-       (count (ly:parser-lookup parser 'book-count))i
+       (header (ly:parser-lookup parser '$globalheader))
+       (count (ly:parser-lookup parser 'output-count))
        (base (ly:parser-output-name parser)))
 
     (if (not (integer? count))
@@ -111,7 +111,7 @@
     (if (> count 0)
        (set! (base (format #f "~a-~a" count))))
 
-    (ly:parser-define! book-count (1+ count))
+    (ly:parser-define! parser 'output-count (1+ count))
     
 
     (ly:score-process score header paper layout base)

diff --git a/scm/ly-from-scheme.scm b/scm/ly-from-scheme.scm
index 00aab05b282f3cfe450d4394f8867a1b2d9281a8..79267499bd2a5a184af4ca7af4b89f56974a685e 100644 (file)
--- a/scm/ly-from-scheme.scm
+++ b/scm/ly-from-scheme.scm
@@ -83,7 +83,7 @@ character."
          (result
           `(let ((parser-clone (ly:clone-parser parser)))
              ,@(map (lambda (binding)
-                      `(ly:parser-define parser-clone ',(car binding) ,(cdr binding)))
+                      `(ly:parser-define! parser-clone ',(car binding) ,(cdr binding)))
                     (reverse bindings))
              (ly:parse-string-result ,lily-string parser-clone))
          ))