print/texlive: Update to version 2022.

Partial bulk tested on amd64. A fix for textproc/lgrind will follow.

Tested and "seems to work alright" tb@. Thanks.
This commit is contained in:
edd 2022-11-24 20:01:11 +00:00
parent f580c8e1f3
commit abc42810ab
23 changed files with 15013 additions and 16721 deletions

View File

@ -7,8 +7,8 @@ PERMIT_PACKAGE ?= Yes
EXTRACT_SUFX ?= .tar.xz
V ?= 2021
DIST_V ?= ${V}0325
V ?= 2022
DIST_V ?= ${V}0321
# Note: The TUG FTP server is frequently overloaded and doesn't work with
# ftp(1)'s keepalive implementation.

View File

@ -6,31 +6,27 @@ DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
WRKDIST = ${WRKDIR}/texlive-${DIST_V}-source
REVISION-main = 3
MULTI_PACKAGES = -main -mktexlsr -synctex
PKGNAME-mktexlsr = texlive_mktexlsr-${V}
PKGNAME-main = ${PKGNAME}
PKGNAME-synctex = texlive_synctex-${V}
REVISION-mktexlsr = 0
REVISION-synctex = 0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX}
SHARED_LIBS = kpathsea 9.0 # 9.2
SHARED_LIBS += ptexenc 5.3 # 4.8
SHARED_LIBS += ptexenc 6.0 # 5.0
SHARED_LIBS += synctex 3.0 # 2.0
SHARED_LIBS += texlua53 0.1 # 8.5
WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xau Xaw Xdmcp Xext Xi
WANTLIB += Xmu Xpm Xrender Xt avahi-client avahi-common c cairo
WANTLIB += cups dbus-1 expat fontconfig freetype gd glib-2.0
WANTLIB += graphite2 gs harfbuzz iconv icudata crypto ssl
WANTLIB += icui18n icuio icuuc ijs intl jbig2dec jpeg kpathsea
WANTLIB += lzma m paper pcre2-8 pixman-1 png
WANTLIB += tiff webp xcb xcb-render xcb-shm z zstd zzip
WANTLIB += execinfo idn openjp2
WANTLIB += crypto cups dbus-1 execinfo expat fontconfig freetype
WANTLIB += gd glib-2.0 graphite2 gs harfbuzz iconv icudata icui18n
WANTLIB += icuio icuuc idn ijs intl jbig2dec jpeg kpathsea lzma
WANTLIB += m openjp2 paper pcre2-8 pixman-1 png ssl tiff webp
WANTLIB += xcb xcb-render xcb-shm z zstd zzip
WANTLIB-mktexlsr += c
@ -54,6 +50,7 @@ LIB_DEPENDS-main = converters/libiconv \
textproc/icu4c \
graphics/graphite2 \
devel/harfbuzz \
devel/pcre2 \
print/libpaper \
archivers/zziplib \
print/ghostscript/gnu \

View File

@ -1,4 +1,4 @@
SHA256 (texlive-20210325-extra.tar.xz) = RqPzhdCzCJPuxrOTUhNdKSnuGaCoHfJEG/yqn2x4M5w=
SHA256 (texlive-20210325-source.tar.xz) = eu/ZZgjXIGGXDy1z8nW+VkjqiugVrwcwFtMQaswNWEs=
SIZE (texlive-20210325-extra.tar.xz) = 1751632
SIZE (texlive-20210325-source.tar.xz) = 54837368
SHA256 (texlive-20220321-extra.tar.xz) = AoTPNolHvozHvs1hyBZDKn0wHbPB5oLdwKGAvTttkpY=
SHA256 (texlive-20220321-source.tar.xz) = X/o0heUessRJBJZFD8abnXvXy55TNX2S20vNT9YXm1Y=
SIZE (texlive-20220321-extra.tar.xz) = 1805372
SIZE (texlive-20220321-source.tar.xz) = 67975836

View File

@ -1,7 +1,7 @@
Index: texk/dvisvgm/dvisvgm-src/src/Makefile.in
--- texk/dvisvgm/dvisvgm-src/src/Makefile.in.orig
+++ texk/dvisvgm/dvisvgm-src/src/Makefile.in
@@ -495,7 +495,7 @@ KPATHSEA_LIBS = @KPATHSEA_LIBS@
@@ -498,7 +498,7 @@ KPATHSEA_LIBS = @KPATHSEA_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBGS_INCLUDES = @LIBGS_INCLUDES@

View File

@ -1,7 +1,7 @@
@conflict teTeX_base-*
@conflict pdfjam-*
@conflict ht-<2
@conflict texlive_texmf-buildset-<2021
@conflict texlive_texmf-buildset-<2022
@pkgpath print/teTeX/base
@pkgpath print/pdfjam
@pkgpath print/teTeX/base,-fmt
@ -13,6 +13,7 @@ bin/adhocfilelist
bin/afm2afm
@bin bin/afm2pl
@bin bin/afm2tfm
bin/albatross
@bin bin/aleph
bin/allcm
bin/allec
@ -55,6 +56,7 @@ bin/checklistings
bin/chklref
@bin bin/chktex
bin/chkweb
bin/citeproc
bin/cjk-gs-integrate
bin/cllualatex
bin/cluttex
@ -136,9 +138,13 @@ bin/getmapdl
@bin bin/gftodvi
@bin bin/gftopk
@bin bin/gftype
bin/git-latexdiff
@bin bin/gregorio
@bin bin/gsftopk
@bin bin/hbf2gf
@bin bin/hishrink
@bin bin/histretch
@bin bin/hitex
bin/ht
bin/htcontext
bin/htlatex
@ -147,6 +153,7 @@ bin/httex
bin/httexi
bin/htxelatex
bin/htxetex
bin/hyperxmp-add-bytecount
bin/inimf
bin/initex
bin/installfont-tl
@ -182,9 +189,11 @@ bin/lily-image-commands
bin/lily-rebuild-pdfs
bin/listbib
bin/listings-ext.sh
bin/llmk
bin/ltx2crossrefxml
bin/ltxfileinfo
bin/ltximg
bin/luafindfont
@bin bin/luahbtex
@comment bin/luajitlatex
bin/lualatex
@ -235,6 +244,7 @@ bin/musixtex
bin/ofm2opl
@bin bin/omfonts
bin/opl2ofm
bin/optexcount
bin/ot2kpx
@bin bin/otangle
@bin bin/otp2ocp
@ -302,6 +312,7 @@ bin/simpdftex
@bin bin/sjisconv
bin/sjislatex
bin/sjispdflatex
bin/spix
bin/splitindex
bin/srcredact
bin/sty2dtx
@ -328,6 +339,8 @@ bin/texhash
bin/texlinks
bin/texliveonfly
bin/texloganalyser
bin/texlogfilter
bin/texlogsieve
bin/texlua
bin/texluac
bin/texmfstart
@ -338,6 +351,7 @@ bin/texplate
@bin bin/tftopl
bin/thumbpdf
@bin bin/tie
bin/tikztosvg
bin/tlcockpit
bin/tlshell
bin/tpic2pdftex
@ -346,6 +360,7 @@ bin/ttf2kotexfont
@bin bin/ttf2pk
@bin bin/ttf2tfm
@bin bin/ttfdump
@bin bin/twill
bin/typeoutfileinfo
bin/ulqda
@bin bin/upbibtex
@ -376,9 +391,12 @@ bin/webquiz
bin/xdvi
@bin bin/xdvi-xaw
@bin bin/xdvipdfmx
bin/xelatex-unsafe
@bin bin/xetex
bin/xetex-unsafe
bin/xhlatex
bin/xindex
@bin bin/xml2pmx
bin/yplan
include/ptexenc/
include/ptexenc/ptexenc.h

View File

@ -1,8 +1,8 @@
@conflict teTeX_base-*
@conflict pdfjam-*
@conflict ht-<2
@conflict texlive_texmf-buildset-<2021
@conflict texlive_base-<2021
@conflict texlive_texmf-buildset-<2022
@conflict texlive_base-<2022
@define-tag mktexlsr at-end %D/bin/mktexlsr >/dev/null 2>&1
@define-tag mktexlsr-local at-end %D/bin/mktexlsr %D/share/texmf-local >/dev/null 2>&1
@define-tag mktexlsr supersedes mktexlsr-local

View File

@ -1,4 +1,4 @@
@conflict texlive_base-<2021
@conflict texlive_base-<2022
@bin bin/synctex
include/synctex/
include/synctex/synctex_parser.h

View File

@ -9,14 +9,14 @@ There are a number of texmf trees in the OpenBSD packages:
texmf-buildset:
The smallest of the subsets. This is primarily for building OpenBSD
ports (approx 180M).
ports (approx 190M).
texmf-minimal:
A teTeX like tree, suitable for casual TeX users who do not need many
extra macros or ConTeXt (approx 260MB).
extra macros or ConTeXt (approx 310MB).
texmf-full:
Extra macros (approx 1.2GB).
Extra macros (approx 1.1GB).
texmf-context:
Macros for the conTeXt typesetter (approx 15MB).
@ -25,8 +25,8 @@ texmf-context:
from that of libkpse. As 99% of users don't use this, these hashes are
generated only when the conTeXt macros are installed.
texmf-doc:
Documentation (approx 1.2GB).
texmf-docs:
Documentation (approx 1.3GB).
To take load off the OpenBSD mirrors this is only the documentation
for the texmf-minimal and texmf-buildset trees. This should include

View File

@ -15,7 +15,7 @@ DISTNAME = texlive-${DIST_V}-texmf
MASTER_SITES0 = http://theunixzoo.co.uk/distfiles/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX} \
texlive-${DIST_V}-tlpdb-full.tar.gz \
texlive-20220325-tlpdb-full.tar.gz \
texmf-var-pregen-${V}${EXTRACT_SUFX}:0
PKGNAME-main = texlive_texmf-minimal-${V}
@ -24,8 +24,6 @@ PKGNAME-docs = texlive_texmf-docs-${V}
PKGNAME-context = texlive_texmf-context-${V}
PKGNAME-buildset = texlive_texmf-buildset-${V}
REVISION-context = 0
NO_BUILD = Yes
NO_TEST = Yes
PKG_ARCH = *
@ -34,7 +32,6 @@ BUILD_DEPENDS = archivers/xz
# We dont use auto module deps for these, as MODULES is not per SUBPACKAGE
MODULES += lang/lua lang/ruby lang/python x11/tk perl
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODLUA_RUNDEP = No
MODLUA_BUILDDEP = No
MODRUBY_BUILDDEP = No
@ -177,6 +174,8 @@ post-install:
# Generating PLISTs is special for TeX Live.
update-plist: plist
@true
plist: fake
env WRKINST=${WRKINST} TRUEPREFIX=${TRUEPREFIX} \
python${MODPY_DEFAULT_VERSION_3} \

View File

@ -1,8 +1,8 @@
SHA256 (texlive-20210325-extra.tar.xz) = RqPzhdCzCJPuxrOTUhNdKSnuGaCoHfJEG/yqn2x4M5w=
SHA256 (texlive-20210325-texmf.tar.xz) = /xLUNsI+mfswqtVZJCZhBDVoR+sCOMGT6DnBUNlnDxw=
SHA256 (texlive-20210325-tlpdb-full.tar.gz) = IdIY3PVhYAgejDduyda0z8dQ4qD+oU7iSISx1QOfJWY=
SHA256 (texmf-var-pregen-2021.tar.xz) = 9gN6bw2j2EPpcmvyKyJceEgyxhPI8PyxWHAewSzJfUU=
SIZE (texlive-20210325-extra.tar.xz) = 1751632
SIZE (texlive-20210325-texmf.tar.xz) = 3474113420
SIZE (texlive-20210325-tlpdb-full.tar.gz) = 3093230
SIZE (texmf-var-pregen-2021.tar.xz) = 82532948
SHA256 (texlive-20220321-extra.tar.xz) = AoTPNolHvozHvs1hyBZDKn0wHbPB5oLdwKGAvTttkpY=
SHA256 (texlive-20220321-texmf.tar.xz) = NysrB7H30d0Sdmz8f2ZW4iw0paINA8H+gFEBKTYaPxY=
SHA256 (texlive-20220325-tlpdb-full.tar.gz) = 0UnQ4nHv9Nk5An6Fshz00aBmvUuyT3ZOZ9f9y62kuMQ=
SHA256 (texmf-var-pregen-2022.tar.xz) = v3GbE320Upiuzv3tyRfdbZWNnhRNuwTumwU5xjAPrMw=
SIZE (texlive-20220321-extra.tar.xz) = 1805372
SIZE (texlive-20220321-texmf.tar.xz) = 3646738208
SIZE (texlive-20220325-tlpdb-full.tar.gz) = 3197986
SIZE (texmf-var-pregen-2022.tar.xz) = 88466672

View File

@ -10,7 +10,7 @@ import os
import sys
import re
YEAR = 2021
YEAR = 2022
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
PLIST_DIR = os.path.abspath(os.path.join(THIS_DIR, "..", "pkg"))
PLISTS = "-buildset", "-main", "-context", "-full", "-docs"
@ -77,7 +77,6 @@ BOTTOM_MATTER = {
"-buildset": ["@tag mktexlsr"],
"-main": ["@tag mktexlsr"],
"-context": [
"@unexec rm -Rf %D/share/texmf-var/luatex-cache/",
"@exec %D/bin/mtxrun --generate > /dev/null 2>&1",
"@tag mktexlsr"
],

View File

@ -55,4 +55,6 @@ MAN_SYMLINKS_CMD = \
ln -sf ../man1/ptftopl.1 uptftopl.1 && \
ln -sf ../man1/dvipdfmx.1 xdvipdfmx.1 && \
ln -sf ../man1/latex-dev.1 xelatex-dev.1 && \
ln -sf ../man1/latex.1 xelatex.1
ln -sf ../man1/latex.1 xelatex.1 && \
ln -sf ../man1/xetex-unsafe.1 xelatex-unsafe.1 && \
ln -sf ../man1/pbibtex.1 upbibtex.1

View File

@ -0,0 +1,12 @@
Index: texmf-dist/doc/man/man1/bib2gls.1
--- texmf-dist/doc/man/man1/bib2gls.1.orig
+++ texmf-dist/doc/man/man1/bib2gls.1
@@ -134,6 +134,8 @@
.\"
.IX Title "BIB2GLS 1"
.TH BIB2GLS 1 "2021-11-06" "perl v5.32.1" "bib2gls"
+.SH NAME
+bib2gls \(en glossary tool
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

View File

@ -0,0 +1,12 @@
Index: texmf-dist/doc/man/man1/convertgls2bib.1
--- texmf-dist/doc/man/man1/convertgls2bib.1.orig
+++ texmf-dist/doc/man/man1/convertgls2bib.1
@@ -134,6 +134,8 @@
.\"
.IX Title "CONVERTGLS2BIB 1"
.TH CONVERTGLS2BIB 1 "2020-02-11" "perl v5.32.1" "convertgls2bib"
+.SH NAME
+convertgls2bib \(en convert glossary definitions
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

View File

@ -0,0 +1,17 @@
Index: texmf-dist/doc/man/man1/texlogfilter.1
--- texmf-dist/doc/man/man1/texlogfilter.1.orig
+++ texmf-dist/doc/man/man1/texlogfilter.1
@@ -138,11 +138,9 @@
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
-.SH "texlogfilter"
+.SH NAME
+texlogfilter \(en filter latex engines output or log file
.IX Header "texlogfilter"
-.SS "\s-1NAME\s0"
-.IX Subsection "NAME"
-texlogfilter \- filter latex engines output or log file
.SS "\s-1SYNOPSIS\s0"
.IX Subsection "SYNOPSIS"
.Vb 1

View File

@ -34,7 +34,7 @@ Index: texmf-dist/web2c/texmf.cnf
% TEXMFSYSVAR, where *-sys store cached runtime data.
TEXMFSYSVAR = $TEXMFROOT/texmf-var
@@ -511,7 +518,7 @@ LUAINPUTS.harflatex-dev = $TEXMFDOTDIR;$TEXMF/scripts/
@@ -519,7 +526,7 @@ LUAINPUTS.harflatex-dev = $TEXMFDOTDIR;$TEXMF/scripts/
LUAINPUTS = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,latex,}//
% Lua needs to look for binary lua libraries distributed with packages.

View File

@ -26,8 +26,8 @@ Index: texmf-dist/web2c/texmfcnf.lua
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
- TEXMFSYSVAR = "selfautoparent:texmf-var",
+ TEXMFSYSVAR = "${TEXMFROOT}/texmf-var",
TEXMFVAR = "home:.texlive2021/texmf-var",
+ TEXMFSYSVAR = "${TEXMFROOT}/texmf-var",
TEXMFVAR = "home:.texlive2022/texmf-var",
-- We have only one cache path but there can be more. The first writable one
@@ -61,13 +61,13 @@ return {

View File

@ -1,9 +1,9 @@
@conflict teTeX_texmf-*
@conflict texlive_base-<2021
@conflict texlive_texmf-docs-<2021
@conflict texlive_texmf-minimal-<2021
@conflict texlive_texmf-full-<2021
@conflict texlive_texmf-context-<2021
@conflict texlive_base-<2022
@conflict texlive_texmf-docs-<2022
@conflict texlive_texmf-minimal-<2022
@conflict texlive_texmf-full-<2022
@conflict texlive_texmf-context-<2022
@pkgpath print/texlive/texmf-minimal
@pkgpath print/teTeX/texmf
share/texmf-local/
@ -5861,6 +5861,7 @@ share/texmf-dist/scripts/texlive/updmap-sys.sh
share/texmf-dist/scripts/texlive/updmap-user.sh
share/texmf-dist/scripts/texlive/updmap.pl
share/texmf-dist/scripts/tlshell/
share/texmf-dist/scripts/tlshell/help-w64.txt
share/texmf-dist/scripts/tlshell/tlshell.tcl
share/texmf-dist/tex/
share/texmf-dist/tex/context/
@ -5893,6 +5894,7 @@ share/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua
share/texmf-dist/tex/generic/babel/babel-bidi-basic.lua
share/texmf-dist/tex/generic/babel/babel-data-bidi.lua
share/texmf-dist/tex/generic/babel/babel-data-cjk.lua
share/texmf-dist/tex/generic/babel/babel-transforms.lua
share/texmf-dist/tex/generic/babel/babel.def
share/texmf-dist/tex/generic/babel/babel.sty
share/texmf-dist/tex/generic/babel/bahasa.sty
@ -6232,6 +6234,7 @@ share/texmf-dist/tex/generic/babel/locale/hsb/babel-usorbian.tex
share/texmf-dist/tex/generic/babel/locale/hu/
share/texmf-dist/tex/generic/babel/locale/hu/babel-hu.ini
share/texmf-dist/tex/generic/babel/locale/hu/babel-hungarian.tex
share/texmf-dist/tex/generic/babel/locale/hu/babel-magyar.tex
share/texmf-dist/tex/generic/babel/locale/hy/
share/texmf-dist/tex/generic/babel/locale/hy/babel-armenian.tex
share/texmf-dist/tex/generic/babel/locale/hy/babel-hy.ini
@ -6437,7 +6440,6 @@ share/texmf-dist/tex/generic/babel/locale/naq/babel-nama.tex
share/texmf-dist/tex/generic/babel/locale/naq/babel-naq.ini
share/texmf-dist/tex/generic/babel/locale/nb/
share/texmf-dist/tex/generic/babel/locale/nb/babel-nb.ini
share/texmf-dist/tex/generic/babel/locale/nb/babel-norsk.tex
share/texmf-dist/tex/generic/babel/locale/nb/babel-norwegianbokmal.tex
share/texmf-dist/tex/generic/babel/locale/nd/
share/texmf-dist/tex/generic/babel/locale/nd/babel-nd.ini
@ -6458,6 +6460,10 @@ share/texmf-dist/tex/generic/babel/locale/nn/babel-nynorsk.tex
share/texmf-dist/tex/generic/babel/locale/nnh/
share/texmf-dist/tex/generic/babel/locale/nnh/babel-ngiemboon.tex
share/texmf-dist/tex/generic/babel/locale/nnh/babel-nnh.ini
share/texmf-dist/tex/generic/babel/locale/no/
share/texmf-dist/tex/generic/babel/locale/no/babel-no.ini
share/texmf-dist/tex/generic/babel/locale/no/babel-norsk.tex
share/texmf-dist/tex/generic/babel/locale/no/babel-norwegian.tex
share/texmf-dist/tex/generic/babel/locale/nus/
share/texmf-dist/tex/generic/babel/locale/nus/babel-nuer.tex
share/texmf-dist/tex/generic/babel/locale/nus/babel-nus.ini
@ -7177,9 +7183,9 @@ share/texmf-dist/tex/latex/base/cp852.def
share/texmf-dist/tex/latex/base/cp858.def
share/texmf-dist/tex/latex/base/cp865.def
share/texmf-dist/tex/latex/base/decmulti.def
share/texmf-dist/tex/latex/base/doc-v3beta.sty
share/texmf-dist/tex/latex/base/doc.sty
share/texmf-dist/tex/latex/base/docstrip.tex
share/texmf-dist/tex/latex/base/everyshi-ltx.sty
share/texmf-dist/tex/latex/base/exscale.sty
share/texmf-dist/tex/latex/base/fix-cm.sty
share/texmf-dist/tex/latex/base/fixltx2e.sty
@ -7376,6 +7382,7 @@ share/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
share/texmf-dist/tex/latex/fancyvrb/hbaw.sty
share/texmf-dist/tex/latex/fancyvrb/hcolor.sty
share/texmf-dist/tex/latex/firstaid/
share/texmf-dist/tex/latex/firstaid/everysel-ltx.sty
share/texmf-dist/tex/latex/firstaid/filehook-ltx.sty
share/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
share/texmf-dist/tex/latex/fix2col/
@ -7383,6 +7390,7 @@ share/texmf-dist/tex/latex/fix2col/fix2col.sty
share/texmf-dist/tex/latex/float/
share/texmf-dist/tex/latex/float/float.sty
share/texmf-dist/tex/latex/footmisc/
share/texmf-dist/tex/latex/footmisc/footmisc-2011-06-06.sty
share/texmf-dist/tex/latex/footmisc/footmisc.sty
share/texmf-dist/tex/latex/geometry/
share/texmf-dist/tex/latex/geometry/geometry.sty
@ -7450,7 +7458,7 @@ share/texmf-dist/tex/latex/hyperref/hvtex.def
share/texmf-dist/tex/latex/hyperref/hvtexhtm.def
share/texmf-dist/tex/latex/hyperref/hvtexmrk.def
share/texmf-dist/tex/latex/hyperref/hxetex.def
share/texmf-dist/tex/latex/hyperref/hyperref-langpatches.def
share/texmf-dist/tex/latex/hyperref/hyperref-patches.sty
share/texmf-dist/tex/latex/hyperref/hyperref.sty
share/texmf-dist/tex/latex/hyperref/hypertex.def
share/texmf-dist/tex/latex/hyperref/minitoc-hyper.sty
@ -7519,7 +7527,6 @@ share/texmf-dist/tex/latex/l3kernel/expl3.ltx
share/texmf-dist/tex/latex/l3kernel/expl3.lua
share/texmf-dist/tex/latex/l3kernel/expl3.sty
share/texmf-dist/tex/latex/l3kernel/l3debug.def
share/texmf-dist/tex/latex/l3kernel/l3deprecation.def
share/texmf-dist/tex/latex/l3kernel/l3doc.cls
share/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
share/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88591.def
@ -7695,7 +7702,6 @@ share/texmf-dist/tex/latex/oberdiek/flags.sty
share/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
share/texmf-dist/tex/latex/oberdiek/hypbmsec.sty
share/texmf-dist/tex/latex/oberdiek/hypcap.sty
share/texmf-dist/tex/latex/oberdiek/hypdoc.sty
share/texmf-dist/tex/latex/oberdiek/hypgotoe.sty
share/texmf-dist/tex/latex/oberdiek/ifdraft.sty
share/texmf-dist/tex/latex/oberdiek/pagegrid.sty
@ -7884,6 +7890,7 @@ share/texmf-dist/tex/latex/tools/h.tex
share/texmf-dist/tex/latex/tools/hhline.sty
share/texmf-dist/tex/latex/tools/indentfirst.sty
share/texmf-dist/tex/latex/tools/layout.sty
share/texmf-dist/tex/latex/tools/longtable-2020-01-07.sty
share/texmf-dist/tex/latex/tools/longtable.sty
share/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty
share/texmf-dist/tex/latex/tools/multicol.sty
@ -7928,6 +7935,12 @@ share/texmf-dist/tex/luatex/
share/texmf-dist/tex/luatex/hyph-utf8/
share/texmf-dist/tex/luatex/hyph-utf8/etex.src
share/texmf-dist/tex/luatex/hyph-utf8/luatex-hyphen.lua
share/texmf-dist/tex/luatex/lua-uni-algos/
share/texmf-dist/tex/luatex/lua-uni-algos/lua-uni-algos.lua
share/texmf-dist/tex/luatex/lua-uni-algos/lua-uni-case.lua
share/texmf-dist/tex/luatex/lua-uni-algos/lua-uni-graphemes.lua
share/texmf-dist/tex/luatex/lua-uni-algos/lua-uni-normalize.lua
share/texmf-dist/tex/luatex/lua-uni-algos/lua-uni-parse.lua
share/texmf-dist/tex/luatex/lualibs/
share/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua
share/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua
@ -7966,7 +7979,7 @@ share/texmf-dist/tex/luatex/lualibs/lualibs-util-tab.lua
share/texmf-dist/tex/luatex/lualibs/lualibs-util-tpl.lua
share/texmf-dist/tex/luatex/lualibs/lualibs.lua
share/texmf-dist/tex/luatex/luaotfload/
share/texmf-dist/tex/luatex/luaotfload/fontloader-2021-01-07.lua
share/texmf-dist/tex/luatex/luaotfload/fontloader-2022-02-24.lua
share/texmf-dist/tex/luatex/luaotfload/fontloader-basics-chr.lua
share/texmf-dist/tex/luatex/luaotfload/fontloader-basics-gen.lua
share/texmf-dist/tex/luatex/luaotfload/fontloader-basics-nod.lua
@ -8024,7 +8037,6 @@ share/texmf-dist/tex/luatex/luaotfload/fontloader-util-fil.lua
share/texmf-dist/tex/luatex/luaotfload/fontloader-util-str.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-blacklist.cnf
share/texmf-dist/tex/luatex/luaotfload/luaotfload-case-el.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-case.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-characters.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-colors.lua
@ -8033,13 +8045,15 @@ share/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-diagnostics.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-dvi.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-embolden.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-fakesc.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-fallback.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-filelist.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-glyphlist.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-define.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-plug.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-cff2.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-t2-writer.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-ttf.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-init.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-letterspace.lua
share/texmf-dist/tex/luatex/luaotfload/luaotfload-loaders.lua
@ -8174,6 +8188,9 @@ share/texmf-var/web2c/euptex/
share/texmf-var/web2c/euptex/euptex.fmt
share/texmf-var/web2c/euptex/uplatex-dev.fmt
share/texmf-var/web2c/euptex/uplatex.fmt
share/texmf-var/web2c/hitex/
share/texmf-var/web2c/hitex/hilatex.fmt
share/texmf-var/web2c/hitex/hitex.fmt
share/texmf-var/web2c/luahbtex/
share/texmf-var/web2c/luahbtex/luahbtex.fmt
share/texmf-var/web2c/luahbtex/lualatex-dev.fmt

View File

@ -1,9 +1,9 @@
@conflict teTeX_texmf-*
@conflict texlive_base-<2021
@conflict texlive_texmf-docs-<2021
@conflict texlive_texmf-full-<2021
@conflict texlive_texmf-buildset-<2021
@conflict texlive_texmf-minimal-<2021
@conflict texlive_base-<2022
@conflict texlive_texmf-docs-<2022
@conflict texlive_texmf-full-<2022
@conflict texlive_texmf-buildset-<2022
@conflict texlive_texmf-minimal-<2022
@man man/man1/context.1
@man man/man1/luatools.1
@man man/man1/mtx-babel.1
@ -459,6 +459,8 @@ share/texmf-dist/scripts/context/lua/third/rst/
share/texmf-dist/scripts/context/lua/third/rst/mtx-t-rst.lua
share/texmf-dist/scripts/context/lua/third/simpleslides/
share/texmf-dist/scripts/context/lua/third/simpleslides/mtx-simpleslides.lua
share/texmf-dist/scripts/context/lua/third/transliterator/
share/texmf-dist/scripts/context/lua/third/transliterator/mtx-t-transliterate.lua
share/texmf-dist/scripts/context/perl/
share/texmf-dist/scripts/context/perl/makempy.pl
share/texmf-dist/scripts/context/perl/path_tre.pm
@ -3691,6 +3693,7 @@ share/texmf-dist/tex/context/third/fancybreak/t-fancybreak.mkvi
share/texmf-dist/tex/context/third/filter/
share/texmf-dist/tex/context/third/filter/t-filter.mkii
share/texmf-dist/tex/context/third/filter/t-filter.mkiv
share/texmf-dist/tex/context/third/filter/t-filter.mkxl
share/texmf-dist/tex/context/third/filter/t-module-catcodes.mkii
share/texmf-dist/tex/context/third/filter/t-module-catcodes.mkiv
share/texmf-dist/tex/context/third/french/
@ -3717,58 +3720,31 @@ share/texmf-dist/tex/context/third/layout/t-layout.tex
share/texmf-dist/tex/context/third/letter/
share/texmf-dist/tex/context/third/letter/base/
share/texmf-dist/tex/context/third/letter/base/s-cor-00.lua
share/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii
share/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi
share/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii
share/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi
share/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii
share/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi
share/texmf-dist/tex/context/third/letter/base/s-cor-03.mkvi
share/texmf-dist/tex/context/third/letter/base/s-cor-06.mkvi
share/texmf-dist/tex/context/third/letter/base/t-letter.mkii
share/texmf-dist/tex/context/third/letter/base/t-letter.mkiv
share/texmf-dist/tex/context/third/letter/base/t-memo.mkii
share/texmf-dist/tex/context/third/letter/base/t-memo.mkiv
share/texmf-dist/tex/context/third/letter/style/
share/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-blockstyle.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-dina.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-dinb.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-dutch.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-french.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-fullblock.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-gbrief.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-hanging.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-knuth.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-modified.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-semiblock.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-setups.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-simplified.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-swiss.mkiv
share/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkii
share/texmf-dist/tex/context/third/letter/style/letter-imp-swissleft.mkiv
share/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii
share/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv
share/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii
share/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv
share/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii
share/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv
share/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii
share/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv
share/texmf-dist/tex/context/third/letter/style/resume-imp-casual-blue.mkiv
share/texmf-dist/tex/context/third/letter/style/resume-imp-casual-green.mkiv
@ -3832,15 +3808,9 @@ share/texmf-dist/tex/context/third/simpleslides/t-simpleslides.mkiv
share/texmf-dist/tex/context/third/title/
share/texmf-dist/tex/context/third/title/t-title.mkvi
share/texmf-dist/tex/context/third/transliterator/
share/texmf-dist/tex/context/third/transliterator/t-transliterator.ctl
share/texmf-dist/tex/context/third/transliterator/t-transliterator.log
share/texmf-dist/tex/context/third/transliterator/t-transliterator.mkii
share/texmf-dist/tex/context/third/transliterator/t-transliterator.mkiv
share/texmf-dist/tex/context/third/transliterator/t-transliterator.mkiv.prep
share/texmf-dist/tex/context/third/transliterator/t-transliterator.pdf
share/texmf-dist/tex/context/third/transliterator/t-transliterator.run
share/texmf-dist/tex/context/third/transliterator/t-transliterator.tex
share/texmf-dist/tex/context/third/transliterator/t-transliterator.tuc
share/texmf-dist/tex/context/third/transliterator/trans_tables_bg.lua
share/texmf-dist/tex/context/third/transliterator/trans_tables_glag.lua
share/texmf-dist/tex/context/third/transliterator/trans_tables_gr.lua
@ -3848,86 +3818,50 @@ share/texmf-dist/tex/context/third/transliterator/trans_tables_iso9.lua
share/texmf-dist/tex/context/third/transliterator/trans_tables_scntfc.lua
share/texmf-dist/tex/context/third/transliterator/trans_tables_sr.lua
share/texmf-dist/tex/context/third/transliterator/trans_tables_trsc.lua
share/texmf-dist/tex/context/third/transliterator/transliterator.ctl
share/texmf-dist/tex/context/third/transliterator/transliterator.log
share/texmf-dist/tex/context/third/transliterator/transliterator.lua
share/texmf-dist/tex/context/third/transliterator/transliterator.run
share/texmf-dist/tex/context/third/transliterator/transliterator.tuc
share/texmf-dist/tex/context/third/typearea/
share/texmf-dist/tex/context/third/typearea/t-typearea.tex
share/texmf-dist/tex/context/third/typescripts/
share/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
share/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
share/texmf-dist/tex/context/third/typescripts/type-aller.mkii
share/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
share/texmf-dist/tex/context/third/typescripts/type-anivers.mkii
share/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv
share/texmf-dist/tex/context/third/typescripts/type-audimat.mkii
share/texmf-dist/tex/context/third/typescripts/type-audimat.mkiv
share/texmf-dist/tex/context/third/typescripts/type-axel.mkii
share/texmf-dist/tex/context/third/typescripts/type-axel.mkiv
share/texmf-dist/tex/context/third/typescripts/type-azuro.mkii
share/texmf-dist/tex/context/third/typescripts/type-azuro.mkiv
share/texmf-dist/tex/context/third/typescripts/type-calluna.mkii
share/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv
share/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
share/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
share/texmf-dist/tex/context/third/typescripts/type-charter.mkii
share/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
share/texmf-dist/tex/context/third/typescripts/type-delicious.mkii
share/texmf-dist/tex/context/third/typescripts/type-delicious.mkiv
share/texmf-dist/tex/context/third/typescripts/type-diavlo.mkii
share/texmf-dist/tex/context/third/typescripts/type-diavlo.mkiv
share/texmf-dist/tex/context/third/typescripts/type-droid.mkii
share/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
share/texmf-dist/tex/context/third/typescripts/type-ernestine.mkiv
share/texmf-dist/tex/context/third/typescripts/type-fertigo.mkii
share/texmf-dist/tex/context/third/typescripts/type-fertigo.mkiv
share/texmf-dist/tex/context/third/typescripts/type-fontin.mkii
share/texmf-dist/tex/context/third/typescripts/type-fontin.mkiv
share/texmf-dist/tex/context/third/typescripts/type-goudysans.mkii
share/texmf-dist/tex/context/third/typescripts/type-goudysans.mkiv
share/texmf-dist/tex/context/third/typescripts/type-junicode.mkii
share/texmf-dist/tex/context/third/typescripts/type-junicode.mkiv
share/texmf-dist/tex/context/third/typescripts/type-justus.mkii
share/texmf-dist/tex/context/third/typescripts/type-justus.mkiv
share/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii
share/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv
share/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkii
share/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkiv
share/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
share/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
share/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
share/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
share/texmf-dist/tex/context/third/typescripts/type-miso.mkii
share/texmf-dist/tex/context/third/typescripts/type-miso.mkiv
share/texmf-dist/tex/context/third/typescripts/type-museo.mkii
share/texmf-dist/tex/context/third/typescripts/type-museo.mkiv
share/texmf-dist/tex/context/third/typescripts/type-office.mkiv
share/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
share/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
share/texmf-dist/tex/context/third/typescripts/type-sabon.mkii
share/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv
share/texmf-dist/tex/context/third/typescripts/type-tallys.mkii
share/texmf-dist/tex/context/third/typescripts/type-tallys.mkiv
share/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii
share/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv
share/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkii
share/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkiv
share/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkii
share/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkiv
share/texmf-dist/tex/context/third/typescripts/type-vera.mkii
share/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
share/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
share/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
share/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
share/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-adobe.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-aller.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-anivers.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-audimat.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-axel.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-azuro.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-calluna.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-charissil.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-delicious.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-diavlo.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-droid.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-ernestine.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-fertigo.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-fontin.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-goudysans.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-itccharter.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-junicode.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-justus.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-kaffeesatz.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-kontrapunkt.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-luxi.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-miso.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-museo.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-office.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-pigiarniq.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-sabon.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-tallys.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-tuffy.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-ubuntu.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-uqammaq.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-vera.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-verajja.mkiv
share/texmf-dist/tex/context/third/typescripts/type-imp-vollkorn.mkiv
share/texmf-dist/tex/context/third/vim/
share/texmf-dist/tex/context/third/vim/2context.vim
share/texmf-dist/tex/context/third/vim/t-syntax-groups.mkii
share/texmf-dist/tex/context/third/vim/t-syntax-groups.mkiv
share/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkii
share/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkiv
share/texmf-dist/tex/context/third/vim/t-syntax-highlight.mkxl
share/texmf-dist/tex/context/third/vim/t-vim.tex
share/texmf-dist/tex/context/third/vim/vimtyping-default.css
share/texmf-dist/tex/context/third/visualcounter/

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -16,6 +16,7 @@ tl-symlinks-main:
ln -s pdftex cslatex && \
ln -s pdftex csplain && \
ln -s pdftex eplain && \
ln -s hitex hilatex && \
ln -s pdftex jadetex && \
ln -s tex lollipop && \
ln -s luatex luacsplain && \
@ -27,7 +28,11 @@ tl-symlinks-main:
ln -s pdftex pdfjadetex && \
ln -s pdftex pdfmex && \
ln -s pdftex pdfxmltex && \
ln -s eptex platex && \
ln -s eptex platex-dev && \
ln -s pdftex texsis && \
ln -s euptex uplatex && \
ln -s euptex uplatex-dev && \
ln -s pdftex utf8mex && \
ln -s xetex xelatex && \
ln -s pdftex xmltex
@ -39,10 +44,6 @@ tl-symlinks-full:
ln -s luahbtex lualatex-dev && \
ln -s luatex optex && \
ln -s pdftex pdflatex-dev && \
ln -s eptex platex && \
ln -s eptex platex-dev && \
ln -s euptex uplatex && \
ln -s euptex uplatex-dev && \
ln -s xetex xelatex-dev
tl-symlinks-context: