X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=a8899e83f1b28023151212b57c503258fbb79c44;hb=cc949a9fd031c51e1106f47c138357c16d1e6c2e;hp=527e6fef95621d1be4d3d15735afa485093ae838;hpb=bd751630011a6fbfcf069ec1fc41a8eaed8a6b87;p=lilypond.git diff --git a/scm/backend-library.scm b/scm/backend-library.scm index 527e6fef95..a8899e83f1 100644 --- a/scm/backend-library.scm +++ b/scm/backend-library.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 2005--2012 Jan Nieuwenhuizen +;;;; Copyright (C) 2005--2014 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify @@ -83,7 +83,10 @@ "-dBATCH" "-r1200" "-sDEVICE=pdfwrite" - (string-append "-sOutputFile=" pdf-name) + (string-append "-sOutputFile=" + (string-join + (string-split pdf-name #\%) + "%%")) "-c.setpdfwrite" (string-append "-f" name))))) @@ -148,8 +151,7 @@ (define-public (output-scopes scopes fields basename) (define (output-scope scope) - (apply - string-append + (string-concatenate (module-map (lambda (sym var) (let ((val (if (variable-bound? var) (variable-ref var) ""))) @@ -157,7 +159,7 @@ (header-to-file basename sym val)) "")) scope))) - (apply string-append (map output-scope scopes))) + (string-concatenate (map output-scope scopes))) (define-public (relevant-book-systems book) (let ((systems (ly:paper-book-systems book))) @@ -187,15 +189,14 @@ (ly:warning (_ "missing stencil expression `~S'") name) "")) - (map (lambda (x) - (if (not (module-defined? output-module x)) - (begin - (module-define! output-module x - (lambda* (#:optional y . z) - (missing-stencil-expression x))) - (set! missing-stencil-list (append (list x) - missing-stencil-list))))) - (ly:all-stencil-commands))) + (for-each (lambda (x) + (if (not (module-defined? output-module x)) + (begin + (module-define! output-module x + (lambda* (#:optional y . z) + (missing-stencil-expression x))) + (set! missing-stencil-list (cons x missing-stencil-list))))) + (ly:all-stencil-commands))) (define-public (remove-stencil-warnings output-module) (for-each @@ -266,5 +267,5 @@ definition." (define-pango-pf pango-pf font-name scaling))) (string-append - (apply string-append (map font-load-command other-fonts)) - (apply string-append (map pango-font-load-command pango-only-fonts))))) + (string-concatenate (map font-load-command other-fonts)) + (string-concatenate (map pango-font-load-command pango-only-fonts)))))