Re: lilypond scm/framework-ps.scm lily/tuplet-brack...

[Graham Percival]

Are you certain about this change?  When I tried it on my OSX
10.3.9 system (after doing a make distclean), I lost the fonts -- no
noteheads, no staff symbols, etc.  When I reverted to the previous
version of scm/framework-ps.scm, the fonts were back again.

HTH,
- Graham

On 6-Aug-05, at 2:57 PM, Jan Nieuwenhuizen wrote:
> Log message:
>         * scm/framework-ps.scm (munge-lily-font-name): Bugfix: Munge only
>         plain emmentaler/aybabtu.  Backportme.
>         
> CVSWeb URLs:
> http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/ 
> framework-ps.scm.diff?tr1=1.127&tr2=1.128&r1=text&r2=text
> Index: lilypond/scm/framework-ps.scm
> diff -u lilypond/scm/framework-ps.scm:1.127  
> lilypond/scm/framework-ps.scm:1.128
> --- lilypond/scm/framework-ps.scm:1.127 Mon Jul 11 13:30:57 2005
> +++ lilypond/scm/framework-ps.scm       Sat Aug  6 21:57:45 2005
> @@ -189,8 +189,11 @@
>     "%%EndSetup\n"))
>
>  (define-public (munge-lily-font-name name)
> -  (regexp-substitute/global #f "([eE]mmentaler|[aA]ybabtu)"
> -                           name 'pre "PFA" 1 'post))
> +  ;; FIXME: this fixes PFAPAFemmentaler.pfapfa, and also
> +  ;; PFAaybabtu.otf.pfa, but the second case now produces aybabtu.otf,
> +  ;; which still fails because .otf files cannot be embedded.
> +  (regexp-substitute/global #f "^([eE]mmentaler|[aA]ybabtu)"
> +                           name 'pre "PFA" 1 'post ".pfa"))
>
>  (define (cff-font? font)
>    (let*
> @@ -249,7 +252,7 @@
>         (cond
>         ((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
>          (ps-load-file (ly:find-file
> -                       (format "~a.pfa" (munge-lily-font-name file-name)))))
> +                       (munge-lily-font-name file-name))))
>         ((string? bare-file-name)
>          (ps-load-file (munge-lily-font-name file-name)))
>         (else
> @@ -325,15 +328,13 @@
>      (let* ((font (car font-name-filename))
>            (name (cadr font-name-filename))
>            (file-name (caddr font-name-filename))
> -          (bare-file-name (ly:find-file file-name))
> -          )
> -
> +          (bare-file-name (ly:find-file file-name)))
> +
>        (cons
>         (munge-lily-font-name name)
>         (cond
>         ((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
> -        (cached-file-contents
> -         (format "~a.pfa" (munge-lily-font-name file-name))))
> +        (cached-file-contents (munge-lily-font-name file-name)))
>         ((and
>           (eq? PLATFORM 'darwin)
>           bare-file-name (string-match "\\.dfont" bare-file-name))
>
>
> _______________________________________________
> Lilypond-cvs mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/lilypond-cvs