summaryrefslogtreecommitdiff
path: root/web2c
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-04-09 16:22:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-04-09 16:22:00 +0200
commita9441c9324d34a75086102dcb376f49b181d18db (patch)
tree185ae5980f84024dc48a27915643658764bdd1d2 /web2c
parent7477bb97a8046f35b982c114c797e00135c53f50 (diff)
downloadcontext-a9441c9324d34a75086102dcb376f49b181d18db.tar.gz
beta 2013.04.09 16:22
Diffstat (limited to 'web2c')
-rw-r--r--web2c/contextcnf.lua3
-rw-r--r--web2c/texlive2013cnf.lua (renamed from web2c/texlive2011cnf.lua)13
2 files changed, 8 insertions, 8 deletions
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/texlive2013cnf.lua
index 024e04205..5c58c4505 100644
--- a/web2c/texlive2011cnf.lua
+++ b/web2c/texlive2013cnf.lua
@@ -1,12 +1,11 @@
-local liveyear = string.match(resolvers.prefixes.selfautoparent(),"(20%d%d)") or "2011"
+local liveyear = string.match(resolvers.prefixes.selfautoparent(),"(20%d%d)") or "2013"
---~ return {
-inspect {
+return {
type = "configuration",
- version = "1.1.1",
- date = "2011-06-02",
- time = "14:59:00",
+ version = "1.1.2",
+ date = "2013-06-02",
+ time = "16:15:00",
comment = "TeX Live differences",
parent = "contextcnf.lua",
@@ -40,7 +39,7 @@ inspect {
TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
- TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}",
+ TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFDIST,!!$TEXMFMAIN}",
FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf",