diff --git a/src/fontloader/runtime/fontloader-basics-gen.lua b/src/fontloader/runtime/fontloader-basics-gen.lua index c79c3139..42b44ef3 100644 --- a/src/fontloader/runtime/fontloader-basics-gen.lua +++ b/src/fontloader/runtime/fontloader-basics-gen.lua @@ -197,18 +197,18 @@ do -- standard context tree setup - local cachepaths = kpse.expand_var('$TEXMFCACHE') or "" + local cachepaths = kpse.expand_braces('$TEXMFCACHE') or "" -- quite like tex live or so (the weird $TEXMFCACHE test seems to be needed on miktex) if cachepaths == "" or cachepaths == "$TEXMFCACHE" then - cachepaths = kpse.expand_var('$TEXMFVAR') or "" + cachepaths = kpse.expand_braces('$TEXMFVAR') or "" end -- this also happened to be used (the weird $TEXMFVAR test seems to be needed on miktex) if cachepaths == "" or cachepaths == "$TEXMFVAR" then - cachepaths = kpse.expand_var('$VARTEXMF') or "" + cachepaths = kpse.expand_braces('$VARTEXMF') or "" end -- and this is a last resort (hm, we could use TEMP or TEMPDIR) diff --git a/src/fontloader/runtime/fontloader-reference.lua b/src/fontloader/runtime/fontloader-reference.lua index 8cff7fb9..9de31613 100644 --- a/src/fontloader/runtime/fontloader-reference.lua +++ b/src/fontloader/runtime/fontloader-reference.lua @@ -4637,12 +4637,12 @@ if not caches.namespace or caches.namespace=="" or caches.namespace=="context" t caches.namespace='generic' end do - local cachepaths=kpse.expand_var('$TEXMFCACHE') or "" + local cachepaths=kpse.expand_braces('$TEXMFCACHE') or "" if cachepaths=="" or cachepaths=="$TEXMFCACHE" then - cachepaths=kpse.expand_var('$TEXMFVAR') or "" + cachepaths=kpse.expand_braces('$TEXMFVAR') or "" end if cachepaths=="" or cachepaths=="$TEXMFVAR" then - cachepaths=kpse.expand_var('$VARTEXMF') or "" + cachepaths=kpse.expand_braces('$VARTEXMF') or "" end if cachepaths=="" then local fallbacks={ "TMPDIR","TEMPDIR","TMP","TEMP","HOME","HOMEPATH" }