From 6448b726ded4b6f912a588e8f0bafb6182ca5db1 Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 9 Apr 2013 17:40:14 +0300 Subject: beta 2013.04.09 16:22 --- web2c/contextcnf.lua | 3 ++- web2c/texlive2011cnf.lua | 49 ------------------------------------------------ web2c/texlive2013cnf.lua | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 web2c/texlive2011cnf.lua create mode 100644 web2c/texlive2013cnf.lua (limited to 'web2c') diff --git a/web2c/contextcnf.lua b/web2c/contextcnf.lua index 553d3a4ee..4c5a40b67 100644 --- a/web2c/contextcnf.lua +++ b/web2c/contextcnf.lua @@ -65,6 +65,7 @@ return { TEXMFOS = "selfautodir:", TEXMFSYSTEM = "selfautoparent:texmf-$SELFAUTOSYSTEM", TEXMFMAIN = "selfautoparent:texmf", + TEXMFDIST = "selfautoparent:texmf-dist", TEXMFCONTEXT = "selfautoparent:texmf-context", TEXMFLOCAL = "selfautoparent:texmf-local", TEXMFFONTS = "selfautoparent:texmf-fonts", @@ -76,7 +77,7 @@ return { -- We need texmfos for a few rare files but as I have a few more bin trees -- a hack is needed. Maybe other users also have texmf-platform-new trees. - TEXMF = "{$TEXMFHOME,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}", + TEXMF = "{$TEXMFHOME,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFDIST,!!$TEXMFMAIN}", TEXFONTMAPS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//", ENCFONTS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//", diff --git a/web2c/texlive2011cnf.lua b/web2c/texlive2011cnf.lua deleted file mode 100644 index 024e04205..000000000 --- a/web2c/texlive2011cnf.lua +++ /dev/null @@ -1,49 +0,0 @@ -local liveyear = string.match(resolvers.prefixes.selfautoparent(),"(20%d%d)") or "2011" - ---~ return { -inspect { - - type = "configuration", - version = "1.1.1", - date = "2011-06-02", - time = "14:59:00", - comment = "TeX Live differences", - - parent = "contextcnf.lua", - - content = { - - -- Keep in mind that MkIV is is relatively new and there is zero change that - -- (configuration) files will be found on older obsolete locations. - - variables = { - - -- This needs testing and if it works, then we can remove the texmflocal setting later on - -- - -- TEXMFCNF = "{selfautodir:{/share,}/texmf-local/web2c,selfautoparent:{/share,}/texmf{-local,}/web2c}", - - TEXMFCACHE = string.format("selfautoparent:texmf-var;~/.texlive%s/texmf-cache",liveyear), - - TEXMFSYSTEM = "selfautoparent:$SELFAUTOSYSTEM", - TEXMFCONTEXT = "selfautoparent:texmf-dist", - - -- TEXMFLOCAL = "selfautoparent:../texmf-local"), -- should also work - TEXMFLOCAL = string.gsub(resolvers.prefixes.selfautoparent(),"20%d%d$","texmf-local"), - - TEXMFSYSCONFIG = "selfautoparent:texmf-config", - TEXMFSYSVAR = "selfautoparent:texmf-var", - TEXMFCONFIG = string.format("home:.texlive%s/texmf-config",liveyear), - TEXMFVAR = string.format("home:.texlive%s/texmf-var",liveyear), - - -- We have only one cache path but there can be more. The first writable one - -- will be chosen but there can be more readable paths. - - TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", - - TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}", - - FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf", - - }, - }, -} diff --git a/web2c/texlive2013cnf.lua b/web2c/texlive2013cnf.lua new file mode 100644 index 000000000..5c58c4505 --- /dev/null +++ b/web2c/texlive2013cnf.lua @@ -0,0 +1,48 @@ +local liveyear = string.match(resolvers.prefixes.selfautoparent(),"(20%d%d)") or "2013" + +return { + + type = "configuration", + version = "1.1.2", + date = "2013-06-02", + time = "16:15:00", + comment = "TeX Live differences", + + parent = "contextcnf.lua", + + content = { + + -- Keep in mind that MkIV is is relatively new and there is zero change that + -- (configuration) files will be found on older obsolete locations. + + variables = { + + -- This needs testing and if it works, then we can remove the texmflocal setting later on + -- + -- TEXMFCNF = "{selfautodir:{/share,}/texmf-local/web2c,selfautoparent:{/share,}/texmf{-local,}/web2c}", + + TEXMFCACHE = string.format("selfautoparent:texmf-var;~/.texlive%s/texmf-cache",liveyear), + + TEXMFSYSTEM = "selfautoparent:$SELFAUTOSYSTEM", + TEXMFCONTEXT = "selfautoparent:texmf-dist", + + -- TEXMFLOCAL = "selfautoparent:../texmf-local"), -- should also work + TEXMFLOCAL = string.gsub(resolvers.prefixes.selfautoparent(),"20%d%d$","texmf-local"), + + TEXMFSYSCONFIG = "selfautoparent:texmf-config", + TEXMFSYSVAR = "selfautoparent:texmf-var", + TEXMFCONFIG = string.format("home:.texlive%s/texmf-config",liveyear), + TEXMFVAR = string.format("home:.texlive%s/texmf-var",liveyear), + + -- We have only one cache path but there can be more. The first writable one + -- will be chosen but there can be more readable paths. + + TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", + + TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFDIST,!!$TEXMFMAIN}", + + FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf", + + }, + }, +} -- cgit v1.2.3