| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 %% Toplevel initialisation file.· | 1 %% Toplevel initialisation file.· |
| 2 | 2 |
| 3 %% switch on debugging. | 3 %% switch on debugging. |
| 4 #(if (and #t (defined? 'set-debug-cell-accesses!)) | 4 #(if (and #t (defined? 'set-debug-cell-accesses!)) |
| 5 (set-debug-cell-accesses! 5000)) | 5 (set-debug-cell-accesses! 5000)) |
| 6 | 6 |
| 7 \version "2.12.0" | 7 \version "2.12.0" |
| 8 | 8 |
| 9 \include "declarations-init.ly" | 9 \include "declarations-init.ly" |
| 10 | 10 |
| 11 | 11 |
| 12 #(ly:set-option 'old-relative #f) | 12 #(ly:set-option 'old-relative #f) |
| 13 #(define toplevel-scores (list)) | 13 #(define toplevel-scores (list)) |
| 14 #(define toplevel-bookparts (list)) | 14 #(define toplevel-bookparts (list)) |
| 15 #(define $defaultheader #f) | 15 #(define $defaultheader #f) |
| 16 #(define $current-book #f) | 16 #(define $current-book #f) |
| 17 #(define $current-bookpart #f) | 17 #(define $current-bookpart #f) |
| 18 #(define version-seen #f) | 18 #(define version-seen #f) |
| 19 #(define expect-error #f) | 19 #(define expect-error #f) |
| 20 #(define output-empty-score-list #f) | 20 #(define output-empty-score-list #f) |
| 21 #(define output-suffix #f) | 21 #(define output-suffix #f) |
| 22 #(define book-filename #f) | 22 #(define book-filename #f) |
| 23 #(define book-output-suffix #f) | 23 #(define book-output-suffix #f) |
| 24 #(use-modules (scm clip-region)) | 24 #(use-modules (scm clip-region)) |
| 25 | |
| 26 #(if (ly:get-option 'user-init) | |
|
Neil Puttock
2010/07/27 20:16:58
user-include ?
Reinhold
2010/07/28 00:43:08
Hmm, actually, I don't like either user-init (indi
| |
| 27 (begin | |
|
Neil Puttock
2010/07/27 20:16:58
remove
Reinhold
2010/07/28 00:43:08
Oops, right. I had a debug statement there, too, w
| |
| 28 (ly:parser-include-string parser | |
|
Neil Puttock
2010/07/27 20:16:58
indent
| |
| 29 (format "\\include \"~a\"" (ly:get-option 'user-init))) | |
| 30 )) | |
| 31 | |
| 25 \maininput | 32 \maininput |
| 26 %% there is a problem at the end of the input file | 33 %% there is a problem at the end of the input file |
| 27 | 34 |
| 28 %% | 35 %% |
| 29 %% Above and below comments compensate for the parser's look-ahead. | 36 %% Above and below comments compensate for the parser's look-ahead. |
| 30 %% | 37 %% |
| 31 | 38 |
| 32 #(if (and (ly:get-option 'old-relative) | 39 #(if (and (ly:get-option 'old-relative) |
| 33 (defined? 'input-file-name) | 40 (defined? 'input-file-name) |
| 34 (not (ly:get-option 'old-relative-used))) | 41 (not (ly:get-option 'old-relative-used))) |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 59 ((or (pair? toplevel-scores) output-empty-score-list) | 66 ((or (pair? toplevel-scores) output-empty-score-list) |
| 60 (let ((book (apply ly:make-book $defaultpaper· | 67 (let ((book (apply ly:make-book $defaultpaper· |
| 61 $defaultheader toplevel-scores))) | 68 $defaultheader toplevel-scores))) |
| 62 (set! toplevel-scores (list)) | 69 (set! toplevel-scores (list)) |
| 63 (book-handler parser book))))) | 70 (book-handler parser book))))) |
| 64 | 71 |
| 65 #(if (eq? expect-error (ly:parser-has-error? parser)) | 72 #(if (eq? expect-error (ly:parser-has-error? parser)) |
| 66 (ly:parser-clear-error parser) | 73 (ly:parser-clear-error parser) |
| 67 (if expect-error | 74 (if expect-error |
| 68 (ly:parser-error parser (_ "expected error, but none found")))) | 75 (ly:parser-error parser (_ "expected error, but none found")))) |
| OLD | NEW |
