X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Flily.scm;h=9c9ae7a896b0d1ecbbcb03551997c238910f64ba;hb=refs%2Ftags%2Frelease%2F1.2.12;hp=f1431284bce8d48ddcfe92bf91701169f89bf231;hpb=1511ca507441cdaf8d1a644f058ff0eb39d07cf0;p=lilypond.git diff --git a/scm/lily.scm b/scm/lily.scm index f1431284bc..9c9ae7a896 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -410,20 +410,20 @@ ))) (define (select-font font-name magnification) - (if (not (equal? font-name current-font)) - (begin - (set! current-font font-name) - (define font-cmd (assoc font-name font-alist)) - (if (eq? font-cmd #f) - (begin - (set! font-cmd (cached-fontname font-count)) - (set! font-alist (acons font-name font-cmd font-alist)) - (set! font-count (+ 1 font-count)) - (string-append "\n/" font-cmd " {/" - font-name " findfont " - (mag-to-size magnification) - " scalefont setfont} bind def \n" - font-cmd " \n")) + (define font-cmd (assoc font-name font-alist)) + (if (not (equal? font-name current-font)) + (begin + (set! current-font font-name) + (if (eq? font-cmd #f) + (begin + (set! font-cmd (cached-fontname font-count)) + (set! font-alist (acons font-name font-cmd font-alist)) + (set! font-count (+ 1 font-count)) + (string-append "\n/" font-cmd " {/" + font-name " findfont " + (mag-to-size magnification) + " scalefont setfont} bind def \n" + font-cmd " \n")) (string-append (cdr font-cmd) " "))) ; font-name == current-font no switch needed ""