X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily-library.scm;h=c925a808f17c0704598ccd452e38bd7432f256c3;hb=8e9c45b266a90b7b01c2e3f88dfde452fffdf52c;hp=068bbb2873688b478fd0cd31ca75a0200ab5bc1b;hpb=157d98c1870868bf59c1691577444e3c3d533bc4;p=lilypond.git diff --git a/scm/lily-library.scm b/scm/lily-library.scm index 068bbb2873..c925a808f1 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -117,9 +117,13 @@ (let* ((paper (ly:parser-lookup parser '$defaultpaper)) (layout (ly:parser-lookup parser '$defaultlayout)) - (count (ly:parser-lookup parser 'output-count)) - (base (ly:parser-output-name parser))) + (base (ly:parser-output-name parser)) + (output-suffix (ly:parser-lookup parser 'output-suffix)) ) + + (if (string? output-suffix) + (set! base (format "~a-~a" base (string-regexp-substitute + "[^a-zA-Z0-9-]" "_" output-suffix)))) ;; must be careful: output-count is under user control. (if (not (integer? count)) @@ -127,7 +131,6 @@ (if (> count 0) (set! base (format #f "~a-~a" base count))) - (ly:parser-define! parser 'output-count (1+ count)) (process-procedure book paper layout base) ))