summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/web2c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-12 15:20:30 +0000
committerKarl Berry <karl@freefriends.org>2015-04-12 15:20:30 +0000
commit70026c3c818170e14d1cea1156cf40f328ee9f6d (patch)
treec5ce24c224cea00478ed36dc11cc76f51436d537 /Master/texmf-dist/web2c
parentf4eeefac4175916b6911ae7e89f5ff898181340c (diff)
version/year updates for TeX Live 2015
git-svn-id: svn://tug.org/texlive/trunk@36787 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/web2c')
-rw-r--r--Master/texmf-dist/web2c/texmf.cnf12
-rw-r--r--Master/texmf-dist/web2c/texmfcnf.lua4
2 files changed, 10 insertions, 6 deletions
diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf
index 3951d211b9e..1b0df4b50c8 100644
--- a/Master/texmf-dist/web2c/texmf.cnf
+++ b/Master/texmf-dist/web2c/texmf.cnf
@@ -4,8 +4,8 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
-% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2014/texmf.cnf.
+% installed in /some/path/to/texlive/2015/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2015/texmf.cnf.
%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
@@ -76,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2014/texmf-var
+TEXMFVAR = ~/.texlive2015/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2014/texmf-config
+TEXMFCONFIG = ~/.texlive2015/texmf-config
% List all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
@@ -561,6 +561,7 @@ shell_escape = p
%
shell_escape_commands = \
bibtex,bibtex8,\
+extractbb,\
kpsewhich,\
makeindex,\
mpost,\
@@ -647,6 +648,9 @@ file_line_error_style = f
% Used by makempx to run TeX. We use "etex" because MetaPost is
% expecting DVI, and not "tex" because we want first line parsing.
TEX = etex
+#
+# Use Japanese eptex for Japanese pmpost.
+TEX.pmpost = eptex
% These variables specify the external program called for the
% interactive `e' option. %d is replaced by the line number and %s by
diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua
index 2b78187a036..da2a10ceca0 100644
--- a/Master/texmf-dist/web2c/texmfcnf.lua
+++ b/Master/texmf-dist/web2c/texmfcnf.lua
@@ -45,13 +45,13 @@ return {
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
TEXMFSYSVAR = "selfautoparent:texmf-var",
- TEXMFVAR = "home:.texlive2014/texmf-var",
+ TEXMFVAR = "home:.texlive2015/texmf-var",
-- 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",
- TEXMFCONFIG = "home:.texlive2014/texmf-config",
+ TEXMFCONFIG = "home:.texlive2015/texmf-config",
-- I don't like this texmf under home and texmf-home would make more
-- sense. One never knows what installers put under texmf anywhere and