Dr. Werner Fink 2013-10-28 14:37:37 +00:00 committed by Git OBS Bridge
parent 5ed3ac84e8
commit 1afe7f39cc
2 changed files with 5 additions and 68 deletions

View File

@ -1,68 +0,0 @@
--- texmf-dist/tex/luatex/luaotfload/luaotfload-legacy-merged.lua
+++ texmf-dist/tex/luatex/luaotfload/luaotfload-legacy-merged.lua 2013-10-28 13:58:12.000000000 +0000
@@ -77,11 +77,34 @@ if not caches.namespace or caches.namesp
end
do
local cachepaths
+ local mktex=kpse.find_file('mktex.cnf','cnf') or ""
if kpse.expand_var('$TEXMFCACHE')~='$TEXMFCACHE' then
cachepaths=kpse.expand_var('$TEXMFCACHE')
elseif kpse.expand_var('$TEXMFVAR')~='$TEXMFVAR' then
cachepaths=kpse.expand_var('$TEXMFVAR')
end
+ if mktex~="" then
+ local varfonts="no"
+ local features=io.open(mktex,'r')
+ local cache
+ for line in features:lines() do
+ if string.find(line, 'MT_FEATURES=') then
+ if string.find(line, 'varfonts') then
+ varfonts="yes"
+ end
+ break
+ end
+ end
+ features:close()
+ cache=kpse.expand_var('$VARTEXFONTS')
+ if varfonts=="yes" and cache~="" then
+ if false == file.is_writable(cache) then
+ cachepaths=os.getenv("HOME") .. "/.cache/texmf/fonts"
+ else
+ cachepaths=cache
+ end
+ end
+ end
if not cachepaths then
cachepaths="."
end
--- texmf-dist/tex/luatex/luaotfload/luaotfload-merged.lua
+++ texmf-dist/tex/luatex/luaotfload/luaotfload-merged.lua 2013-10-28 13:52:09.000000000 +0000
@@ -3012,6 +3012,28 @@ if not caches.namespace or caches.namesp
end
do
local cachepaths=kpse.expand_var('$TEXMFCACHE') or ""
+ local mktex=kpse.find_file('mktex.cnf','cnf') or ""
+ if mktex~="" then
+ local varfonts="no"
+ local features=io.open(mktex,'r')
+ for line in features:lines() do
+ if string.find(line, 'MT_FEATURES=') then
+ if string.find(line, 'varfonts') then
+ varfonts="yes"
+ end
+ break
+ end
+ end
+ features:close()
+ cachepaths=kpse.expand_var('$VARTEXFONTS')
+ if varfonts=="yes" and cachepaths~="" then
+ if false == file.is_writable(cachepaths) then
+ cachepaths=os.getenv("HOME") .. "/.cache/texmf/fonts"
+ end
+ else
+ cachepaths=""
+ end
+ end
if cachepaths=="" then
cachepaths=kpse.expand_var('$TEXMFVAR') or ""
end

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 28 14:07:37 UTC 2013 - werner@suse.de
- Make Lua(La)TeX knowing about varfonts from mktex.cnf (bnc#847102)
-------------------------------------------------------------------
Wed Sep 25 09:00:27 UTC 2013 - werner@suse.de