texlive-{bin,core,fontsextra,latexextra}: update to 2017.44... versions

8 files changed, 215 insertions, 57 deletions

diff --git a/libre/texlive-core/PKGBUILD b/libre/texlive-core/PKGBUILD
index 7e7e9cc16..f38aac735 100644
--- a/libre/texlive-core/PKGBUILD
+++ b/libre/texlive-core/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 281688 2016-11-21 06:23:47Z remy $
 # Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>
 # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 _pkgname=texlive-core-libre
 pkgname=texlive-core
-pkgver=2016.43757
-_revnr=${pkgver#2016.}
+pkgver=2017.44918
+_revnr=${pkgver#2017.}
 pkgrel=1.parabola1
 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)"
 license=('GPL')
@@ -24,18 +24,44 @@ optdepends=(
   't1utils:     can be useful when installing Type1 fonts'
 )
 groups=('texlive-most')
-conflicts=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-core-libre')
-provides=('tetex' 'texlive-latex3' 'pdfjam')
-replaces=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-core-libre')
+conflicts=('tetex' 'texlive-latex3' 'pdfjam'
+           'texlive-genericextra'
+           'texlive-plainextra'
+           'texlive-core-libre')
+provides=('tetex' 'texlive-latex3' 'pdfjam'
+          'texlive-genericextra'
+          'texlive-plainextra')
+replaces=('tetex' 'texlive-latex3' 'pdfjam'
+          'texlive-genericextra'
+          'texlive-plainextra'
+          'texlive-core-libre')
 url='http://tug.org/texlive/'
 mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
 noextract=("$pkgname-$pkgver-src.zip")
 source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"
         "$pkgname.maps"
         "$pkgname.fmts"
+        "mktexlsr.hook"
+        "mktexlsr.script"
+        "texlive-updmap.hook"
+        "texlive-updmap.script"
+        "texlive-fmtutil.hook"
+        "texlive-fmtutil.script"
         "texmf.cnf"
         "texmfcnf.lua"
         "09-texlive-fonts.conf")
+sha256sums=('442852ef075b8851086eef4036f4494d6c128a69c9b2003e6e776d0bb499ffdf'
+            '275253728d884b2b75e01840b0824c1fe5afbdda91fafeacd33deb6cd92341a3'
+            '009ab6be9e4fa18709fc74d26a3777372f4b5af9313421ff0546ba94a9d5ff13'
+            '1d62d46d4d3a538ccad48d31192fccdfc8d6c0a60b331575a10a007d46812d46'
+            '05afeae62a5d4c9de79c838c9636e2aefe9ad1d6b787fed4e5930c13baf60eba'
+            '9a0e462ad44d2ced432860ff62288b1c2f55b04c8d0c92887672478752417cf4'
+            '539a6face78ba7c18c8001769f0047ab3248fc7db777832f8eecec33877f4944'
+            '1f2c67e3cab02398980008f3095257ade3bb79f188cf0815a2671af3080e21af'
+            'f96e9f815fa0a4b85e677f2a9215d9106b8abe46eceb3f3e36a6c76eda3e4a85'
+            '59236d61760bf89142a347d6d5b3e59c5daec4e430d12d25cc1d5c6528688f75'
+            '0b6c3ee516608ce04d7133db52cadfa1be5d885b3f82bb39dc5897b213847e0d'
+            '5e79c40cf3ab93348fc89e97890198601767ea2c8fea89ea76088c17a2b35962')
 install=texlive.install
 backup=(etc/texmf/web2c/texmf.cnf \
         etc/texmf/chktex/chktexrc \
@@ -48,13 +74,7 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/web2c/fmtutil.cnf \
 	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
-mksha256sums=('9dbff2097ca56b8a7f9aa8648b71f1dcbdf39bcdad4cc46afbe2d5b6e5f67edc')
-sha256sums=('0b2c8b35e323057cfa7e8aeea1e91947d60c8c9c16cef9ae4083da7ddef8732d'
-            '275253728d884b2b75e01840b0824c1fe5afbdda91fafeacd33deb6cd92341a3'
-            '009ab6be9e4fa18709fc74d26a3777372f4b5af9313421ff0546ba94a9d5ff13'
-            'cca1d0b92a103d43dff7fa3f1a40bdec879e9efc122ac415f54701c36a7c94ee'
-            '0b6c3ee516608ce04d7133db52cadfa1be5d885b3f82bb39dc5897b213847e0d'
-            '5e79c40cf3ab93348fc89e97890198601767ea2c8fea89ea76088c17a2b35962')
+mksha256sums=('2bc3d2afff271b7c28650aa6e398977597e85cb4850f97a41925e8f61f36d2e9')
 
 mksource() {
    mkdir $pkgname-$pkgver
@@ -73,20 +93,20 @@ mksource() {
 }
 
 prepare() {
-   cd $srcdir/$pkgname-$pkgver
+   cd "$srcdir/$pkgname-$pkgver"
    echo -n "   --> extracting all packages... "
-   for p in *.tar.xz; do
+   for p in *.tar.xz; do 
      bsdtar -xf $p
    done
    echo "done"
-   rm -rf {doc,source} || true
+   rm -rf source doc
 
    # remove nonfree packages references from updmap.cfg
    sed -i '/ccpl.map/d'       texmf-dist/web2c/updmap.cfg
    sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg
    sed -i '/csfonts.map/d'    texmf-dist/web2c/updmap.cfg
    sed -i '/plother.map/d'    texmf-dist/web2c/updmap.cfg
-   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg 
+   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg
 
    # remove nonfree packages references from texlive-core.maps
    sed -i '/ccpl.map/d'       $srcdir/$pkgname.maps
@@ -106,7 +126,9 @@ prepare() {
 }
 
 package() {
-   cd $srcdir/$pkgname-$pkgver
+   cd "$srcdir/$pkgname-$pkgver"
+
+   # Install packages.
    install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
    install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs
@@ -147,7 +169,7 @@ package() {
    cp -a "$pkgdir"/usr/share/texmf-dist/web2c/updmap-hdr.cfg \
    	  "$pkgdir"/etc/texmf/web2c/
    cp -a "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil-hdr.cnf \
-         "$pkgdir"/etc/texmf/web2c/fmtutil.cnf
+   	  "$pkgdir"/etc/texmf/web2c/fmtutil.cnf
    cp -a "$pkgdir"/usr/share/texmf-dist/dvips/config/config.ps \
    	  "$pkgdir"/etc/texmf/dvips/config/
    cp -a "$pkgdir"/usr/share/texmf-dist/dvipdfmx/dvipdfmx.cfg \
@@ -187,6 +209,14 @@ package() {
    mv "$pkgdir"/usr/share/texmf-dist/tlpkg "$pkgdir"/usr/share
    rm -rf "$pkgdir"/usr/share/tlpkg/tlpobj
 
+   ## install pacman hooks
+   install -D -m644 ${srcdir}/mktexlsr.hook "$pkgdir/usr/share/libalpm/hooks/mktexlsr.hook"
+   install -D -m644 ${srcdir}/texlive-updmap.hook "$pkgdir/usr/share/libalpm/hooks/texlive-updmap.hook"
+   install -D -m644 ${srcdir}/texlive-fmtutil.hook "$pkgdir/usr/share/libalpm/hooks/texlive-fmtutil.hook"
+   install -D -m755 ${srcdir}/mktexlsr.script "$pkgdir/usr/share/libalpm/scripts/mktexlsr"
+   install -D -m755 ${srcdir}/texlive-updmap.script "$pkgdir/usr/share/libalpm/scripts/texlive-updmap"
+   install -D -m755 ${srcdir}/texlive-fmtutil.script "$pkgdir/usr/share/libalpm/scripts/texlive-fmtutil"
+
    # copy config file to texmf-config
    #mkdir -p $pkgdir/etc/texmf/tex/context/config
    #cp -a $pkgdir/usr/share/texmf-dist/tex/context/config/cont-usr.tex \
@@ -229,6 +259,7 @@ de-macro/de-macro
 dosepsbin/dosepsbin.pl
 dtxgen/dtxgen
 dviasm/dviasm.py
+dviinfox/dviinfox.pl
 epstopdf/epstopdf.pl
 findhyph/findhyph
 fontools/afm2afm
@@ -237,7 +268,9 @@ fontools/ot2kpx
 fragmaster/fragmaster.pl
 installfont/installfont-tl
 latex-git-log/latex-git-log
+latex-papersize/latex-papersize.py
 latex2man/latex2man
+latex2nemeth/latex2nemeth
 latexdiff/latexdiff-vc.pl
 latexdiff/latexdiff.pl
 latexdiff/latexrevise.pl
@@ -249,6 +282,7 @@ ltxfileinfo/ltxfileinfo
 ltximg/ltximg.pl
 lua2dox/lua2dox_filter
 luaotfload/luaotfload-tool.lua
+lwarp/lwarpmk.lua
 make4ht/make4ht
 match_parens/match_parens
 mf2pt1/mf2pt1.pl
@@ -268,6 +302,7 @@ pdfjam/pdfjam-slides6up
 pdfjam/pdfjoin
 pdfjam/pdfnup
 pdfjam/pdfpun
+pdflatexpicscale/pdflatexpicscale.pl
 pdfxup/pdfxup
 pfarrei/a5toa4.tlu
 pfarrei/pfarrei.tlu
@@ -282,6 +317,16 @@ srcredact/srcredact.pl
 sty2dtx/sty2dtx.pl
 texcount/texcount.pl
 tex4ebook/tex4ebook
+tex4ht/ht.sh
+tex4ht/htcontext.sh
+tex4ht/htlatex.sh
+tex4ht/htmex.sh
+tex4ht/httex.sh
+tex4ht/httexi.sh
+tex4ht/htxelatex.sh
+tex4ht/htxetex.sh
+tex4ht/mk4ht.pl
+tex4ht/xhlatex.sh
 texdef/texdef.pl
 texdiff/texdiff
 texdirflatten/texdirflatten
@@ -294,6 +339,7 @@ texlive/dvi2fax.sh
 texlive/dvired.sh
 texlive/e2pall.pl
 texlive/fmtutil-sys.sh
+texlive/fmtutil-user.sh
 texlive/fmtutil.pl
 texlive/fontinst.sh
 texlive/kpsetool.sh
@@ -306,6 +352,7 @@ texlive/texconfig-sys.sh
 texlive/texconfig.sh
 texlive/texlinks.sh
 texlive/updmap-sys.sh
+texlive/updmap-user.sh
 texlive/updmap.pl
 texliveonfly/texliveonfly.py
 texloganalyser/texloganalyser
diff --git a/libre/texlive-core/mktexlsr.hook b/libre/texlive-core/mktexlsr.hook
new file mode 100644
index 000000000..f1a3b8b38
--- /dev/null
+++ b/libre/texlive-core/mktexlsr.hook
@@ -0,0 +1,16 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/bin/mktexlsr
+Target = etc/texmf/*
+Target = usr/share/texmf/*
+Target = usr/share/texmf-dist/*
+Target = var/lib/texmf/*
+
+[Action]
+Description = Updating TeXLive filename database...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/mktexlsr
+
diff --git a/libre/texlive-core/mktexlsr.script b/libre/texlive-core/mktexlsr.script
new file mode 100644
index 000000000..689441538
--- /dev/null
+++ b/libre/texlive-core/mktexlsr.script
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+/usr/bin/mktexlsr
+(cd /etc/texmf && /usr/bin/mtxrun --generate >/dev/null)
+# We need to remove directory "." from luatex cache to avoid absurd
+# behaviour.
+for item in /var/lib/texmf/luatex-cache/context/*/trees/*.lua; do
+    if grep -F '["root"]="."' "$item" >/dev/null; then
+        rm -f "$item" "${item%.lua}.luc"
+    fi
+done
+
diff --git a/libre/texlive-core/texlive-fmtutil.hook b/libre/texlive-core/texlive-fmtutil.hook
new file mode 100644
index 000000000..cb5bcc932
--- /dev/null
+++ b/libre/texlive-core/texlive-fmtutil.hook
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = var/lib/texmf/arch/installedpkgs/*.fmts
+
+[Action]
+Description = Updating TeXLive format files...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/texlive-fmtutil
+
diff --git a/libre/texlive-core/texlive-fmtutil.script b/libre/texlive-core/texlive-fmtutil.script
new file mode 100644
index 000000000..0e3b94393
--- /dev/null
+++ b/libre/texlive-core/texlive-fmtutil.script
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+FMTUTIL="etc/texmf/web2c/fmtutil.cnf"
+FMTUTILLOCAL="etc/texmf/web2c/fmtutil-local.cnf"
+
+cp usr/share/texmf-dist/web2c/fmtutil-hdr.cnf $FMTUTIL
+for file in var/lib/texmf/arch/installedpkgs/*.fmts; do
+    echo >> $FMTUTIL
+    echo "# $file" >> $FMTUTIL
+    cat $file >> $FMTUTIL
+done
+if [[ -f "$FMTUTILLOCAL" ]]; then
+    echo >> $FMTUTIL
+    echo "# $FMTUTILLOCAL" >> $FMTUTIL
+    cat "$FMTUTILLOCAL" >> $FMTUTIL
+fi
+
+/usr/bin/fmtutil-sys --all --cnffile $FMTUTIL > /dev/null
+
diff --git a/libre/texlive-core/texlive-updmap.hook b/libre/texlive-core/texlive-updmap.hook
new file mode 100644
index 000000000..8bacce9a1
--- /dev/null
+++ b/libre/texlive-core/texlive-updmap.hook
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/bin/tex
+Target = var/lib/texmf/arch/installedpkgs/*.maps
+
+[Action]
+Description = Updating TeXLive font maps...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/texlive-updmap
+
diff --git a/libre/texlive-core/texlive-updmap.script b/libre/texlive-core/texlive-updmap.script
new file mode 100644
index 000000000..1d79186ff
--- /dev/null
+++ b/libre/texlive-core/texlive-updmap.script
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+UPDMAP="etc/texmf/web2c/updmap.cfg"
+UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
+
+cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
+cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
+if [[ -f "$UPDMAPLOCAL" ]]; then
+    cat "$UPDMAPLOCAL" >> $UPDMAP
+fi
+
+/usr/bin/updmap-sys --quiet --nohash
+
diff --git a/libre/texlive-core/texmf.cnf b/libre/texlive-core/texmf.cnf
index a29aef739..695bfed93 100644
--- a/libre/texlive-core/texmf.cnf
+++ b/libre/texlive-core/texmf.cnf
@@ -4,16 +4,20 @@
 % 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/2013/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2013/texmf.cnf.
+% installed in /some/path/to/texlive/2017/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2017/texmf.cnf.
 % 
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
 %
+% Each statement in this file boils down to:
+%   <variable>[.<program>] [=] <value>
+%
+% Neither the <variable> nor the <value> may be empty.
 % Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
 % The `=' (and surrounding spaces) is optional.
 % $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
+% Lines can be continued with a \; no whitespace removal is done.
 %
 % Earlier entries (in the same or another file) override later ones, and
 % an environment variable foo overrides any texmf.cnf definition of foo.
@@ -36,8 +40,7 @@
 %   expanded into the compile-time default. Probably not what you want.
 %
 % Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  We make extensive
-% use of this.
+% expands to /usr/local/mytex:/usr/local/othertex.
 
 
 %  Part 1: Search paths and directories.
@@ -81,16 +84,25 @@ TEXMFVAR = ~/.texlive/texmf-var
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
 TEXMFCONFIG = ~/.texlive/texmf-config
 
+% This is the value manipulated by tlmgr's auxtrees subcommand in the
+% root texmf.cnf. Kpathsea warns about a literally empty string for a
+% value, hence the empty braces.
+TEXMFAUXTREES = {}
+
 % List all the texmf trees. For an explanation of what they are, see the
 % TeX Live manual.
 %
 % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
-% explicitly and before all other trees.
+% explicitly and before other trees.
 % 
 % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions
 % should take precedence over distribution files -- although it is
 % generally a source of confusion to have different versions of a
 % package installed, whatever the trees, so try to avoid it.
+% 
+% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
+% ever defined (the 99% common case), no extra elements will be added to
+% the search paths. tlmgr takes care to end any value with a trailing comma.
 TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
 
 % Where to look for ls-R files.  There need not be an ls-R in the
@@ -99,7 +111,7 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T
 % does not create ls-R files in the non-!! elements -- because if an
 % ls-R is present, it will be used, and the disk will not be searched.
 % This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
 
 % The system trees.  These are the trees that are shared by all users.
 % If a tree appears in this list, the mktex* scripts will use
@@ -189,16 +201,13 @@ TEXINPUTS.pdfamstex     = .;$TEXMF/tex/{amstex,plain,generic,}//
 TEXINPUTS.pdfelatex     = .;$TEXMF/tex/{latex,generic,}//
 TEXINPUTS.pdfetex       = .;$TEXMF/tex/{plain,generic,}//
 
-% pdfxTeX.
-TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
-
 % LuaTeX.
-TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
 TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luajittex     = .;$TEXMF/tex/{luatex,plain,generic,}//
 TEXINPUTS.dviluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
+TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luajitlatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
 
 % XeTeX.
 TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
@@ -221,17 +230,22 @@ TEXINPUTS.platex        = .;$TEXMF/tex/{platex,latex,generic,}//
 TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,plain,generic,}//
 TEX.pmpost = eptex
 
-% (e)up(La)TeX.
+% p(La)TeX-ng
+TEXINPUTS.ptex-ng   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
+TEXINPUTS.platex-ng = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
+
+% (e)up(La)TeX, and for upmpost
 TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
 TEXINPUTS.uptex   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
-TEXINPUTS.euptex  = .;$TEXMF/tex/{uptex,ptex,plain,generic}//
+TEXINPUTS.euptex  = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
+TEX.upmpost = euptex
 
 % pBibTeX bibliographies and style files.
 BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
 BSTINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bst//
 
 % ConTeXt.
-TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic}//
+TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
 
 % jadetex.
 TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
@@ -315,8 +329,8 @@ MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
 MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
 
 % .ris and .bltxml bibliography formats.
-RISINPUTS = .;$TEXMF/bibtex/ris//
-BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
+RISINPUTS = .;$TEXMF/biber/ris//
+BLTXMLINPUTS = .;$TEXMF/biber/bltxml//
 
 % MFT style files.
 MFTINPUTS = .;$TEXMF/mft//
@@ -355,6 +369,10 @@ TEXCONFIG = $TEXMF/dvips//
 % Makeindex style (.ist) files.
 INDEXSTYLE = .;$TEXMF/makeindex//
 
+% mendex dictionary files. Used internally by mendex and upmendex.
+% It is not necessary to introduce a new format in Kpathsea.
+INDEXDICTIONARY = .;$TEXMF/makeindex//
+
 % Font encoding files (.enc).
 ENCFONTS = .;$TEXMF/fonts/enc//
 
@@ -553,24 +571,24 @@ shell_escape = p
 % 
 % The programs listed here are as safe as any we know: they either do
 % not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p.  They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs.  All to the best of our knowledge.  They also have practical use
-% for being called from TeX.
+% restrictions similar to or higher than openout_any=p.  They also have
+% no features to invoke arbitrary other programs, and no known
+% exploitable bugs.  All to the best of our knowledge.  They also have
+% practical use for being called from TeX.
 % 
 shell_escape_commands = \
 bibtex,bibtex8,\
+extractbb,\
+gregorio,\
 kpsewhich,\
 makeindex,\
 repstopdf,\
+texosquery-jre8,\
 
 % we'd like to allow:
 % dvips - but external commands can be executed, need at least -R1.
 % epspdf, ps2pdf, pstopdf - need to respect openout_any,
 %   and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-%   without Unix convert it hardly seems worth it, and Windows convert
-%   is something completely different that destroys filesystems, so skip.
 % pygmentize - but is the filter feature insecure?
 % ps4pdf - but it calls an unrestricted latex.
 % rpdfcrop - maybe ok, but let's get experience with repstopdf first.
@@ -578,7 +596,7 @@ repstopdf,\
 % ulqda - but requires optional SHA1.pm, so why bother.
 % tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
 
-% plain TeX should remain unenhanced.
+% plain "tex" should remain unenhanced.
 shell_escape.tex = f
 shell_escape.initex = f
 
@@ -588,16 +606,17 @@ shell_escape.initex = f
 TEXMF_RESTRICTED_SCRIPTS = \
   {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
 
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
+% Do we allow TeX \input or \openin (openin_any), or \openout
+% (openout_any) on filenames starting with `.' (e.g., .rhosts) or
+% outside the current tree (e.g., /etc/passwd)?
 % a (any)        : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
+% r (restricted) : disallow opening dot files
 % p (paranoid)   : as `r' and disallow going to parent directories, and
 %                  restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
 openin_any = a
+openout_any = p
 
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
+% Write .log/.dvi/.aux/etc. files here, if the current directory is unwritable.
 %TEXMFOUTPUT = /tmp
 
 % If a dynamic file creation fails, log the command to this file, in
@@ -611,7 +630,7 @@ MISSFONT_LOG = missfont.log
 % To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
 TEX_HUSH = none
 
-% Allow TeX, and MF to parse the first line of an input file for
+% Allow TeX and MF to parse the first line of an input file for
 % the %&format construct.
 parse_first_line = t
 
@@ -646,6 +665,9 @@ file_line_error_style = f
 % 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
 % the current filename.  The default is specified at compile-time, and
@@ -671,7 +693,7 @@ BIBTEX_CSFILE = 88591lat.csf
 %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
 
 
-%  Part 3: Array and other sizes for TeX (and Metafont).
+%  Part 3: Array and other sizes for TeX, Metafont, etc.
 %
 % If you want to change some of these sizes only for a certain TeX
 % variant, the usual dot notation works, e.g.,
@@ -770,12 +792,16 @@ screen_depth.mf = 1200
 % BibTeX only (max_strings also determines hash_size and hash_prime).
 ent_str_size =  250
 glob_str_size = 20000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
+max_strings.bibtex  = 100000
+max_strings.bibtex8 = 100000
+max_strings.bibtexu = 100000
+max_strings.pbibtex = 100000
 
 % GFtype only.
 line_length.gftype = 500
 max_rows.gftype = 8191
 max_cols.gftype = 8191
+
+% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
+% Default is 0, to not guess.
+guess_input_kanji_encoding = 1