CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/11 12:59:30
Modified files:
lily : book-scheme.cc lily-parser.cc score-scheme.cc
lily/include : lily-parser.hh
ly : init.ly
scm : lily-library.scm ly-from-scheme.scm
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/book-scheme.cc.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-parser.cc.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/score-scheme.cc.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-parser.hh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/init.ly.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily-library.scm.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/ly-from-scheme.scm.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: lilypond/lily/book-scheme.cc
diff -u lilypond/lily/book-scheme.cc:1.5 lilypond/lily/book-scheme.cc:1.6
--- lilypond/lily/book-scheme.cc:1.5 Mon Jul 11 12:51:13 2005
+++ lilypond/lily/book-scheme.cc Mon Jul 11 12:59:29 2005
@@ -36,7 +36,7 @@
}
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),
Index: lilypond/lily/include/lily-parser.hh
diff -u lilypond/lily/include/lily-parser.hh:1.8
lilypond/lily/include/lily-parser.hh:1.9
--- lilypond/lily/include/lily-parser.hh:1.8 Fri Jun 10 10:58:50 2005
+++ lilypond/lily/include/lily-parser.hh Mon Jul 11 12:59:29 2005
@@ -41,9 +41,6 @@
Duration default_duration_;
String output_basename_;
- int score_count_;
- int book_count_;
-
int fatal_error_;
int error_level_;
bool ignore_version_b_;
Index: lilypond/lily/lily-parser.cc
diff -u lilypond/lily/lily-parser.cc:1.43 lilypond/lily/lily-parser.cc:1.44
--- lilypond/lily/lily-parser.cc:1.43 Fri Jul 8 11:37:29 2005
+++ lilypond/lily/lily-parser.cc Mon Jul 11 12:59:29 2005
@@ -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 (Lily_parser const &src)
{
- book_count_ = src.book_count_;
- score_count_ = src.score_count_;
lexer_ = 0;
sources_ = src.sources_;
default_duration_ = src.default_duration_;
Index: lilypond/lily/score-scheme.cc
diff -u lilypond/lily/score-scheme.cc:1.10 lilypond/lily/score-scheme.cc:1.11
--- lilypond/lily/score-scheme.cc:1.10 Mon Jul 11 12:51:13 2005
+++ lilypond/lily/score-scheme.cc Mon Jul 11 12:59:29 2005
@@ -74,20 +74,19 @@
}
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),
Index: lilypond/ly/init.ly
diff -u lilypond/ly/init.ly:1.78 lilypond/ly/init.ly:1.79
--- lilypond/ly/init.ly:1.78 Mon Jul 11 12:51:13 2005
+++ lilypond/ly/init.ly Mon Jul 11 12:59:29 2005
@@ -14,6 +14,7 @@
#(ly:set-option 'old-relative #f)
#(define toplevel-scores '())
+#(define output-count 0)
#(define $globalheader #f)
#(define version-seen? #f)
Index: lilypond/scm/lily-library.scm
diff -u lilypond/scm/lily-library.scm:1.40 lilypond/scm/lily-library.scm:1.41
--- lilypond/scm/lily-library.scm:1.40 Mon Jul 11 12:51:13 2005
+++ lilypond/scm/lily-library.scm Mon Jul 11 12:59:30 2005
@@ -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)
Index: lilypond/scm/ly-from-scheme.scm
diff -u lilypond/scm/ly-from-scheme.scm:1.9 lilypond/scm/ly-from-scheme.scm:1.10
--- lilypond/scm/ly-from-scheme.scm:1.9 Fri Jun 10 10:58:50 2005
+++ lilypond/scm/ly-from-scheme.scm Mon Jul 11 12:59:30 2005
@@ -83,7 +83,7 @@
(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))
))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
