4 files changed, 160 insertions, 69 deletions

diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index 2eb1b5a83143..0ac93168d18b 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -1,16 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	luatex
-PORTVERSION=	0.79.1
-PORTREVISION=	5
+PORTVERSION=	0.80.0
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
-DISTNAME=	texlive-${DISTVERSION_TEXMF}-source
+DISTNAME=	texlive-${DISTVERSION_TEXLIVE_SOURCE}-source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME_TEXMF}${EXTRACT_SUFX}
 DIST_SUBDIR=	TeX
-EXTRACT_ONLY=	texlive-${DISTVERSION_TEXMF}-source${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Extended version of pdfTeX using Lua
@@ -23,23 +22,24 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libTECkit.so:${PORTSDIR}/textproc/teckit \
 		libzzip.so:${PORTSDIR}/devel/zziplib
 
-USE_TEX=	kpathsea web2c texmf formats fmtutil
+USE_TEX=	kpathsea web2c texmf formats texlua texluajit fmtutil
 USE_XORG=	pixman
-USES=		pkgconfig tar:xz gmake
+USE_GONME=	cairo
+USE_LDCONFIG=	yes
+USES=		pkgconfig tar:xz gmake libtool
+TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
-EXTRACT_FILES=	\
-	build-aux \
-	libs/xpdf \
-	libs/cairo \
-	libs/pixman \
-	libs/lua52 \
-	libs/luajit \
-	texk/web2c
+EXTRACT_FILES=	build-aux \
+		libs/xpdf \
+		libs/lua52 \
+		libs/luajit \
+		texk/web2c
 EXTRACT_AFTER_ARGS_TEXMF=| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
-DISTVERSION_TEXMF=20140525
-DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXMF}-texmf
+DISTVERSION_TEXLIVE_SOURCE=	20150521
+DISTVERSION_TEXLIVE_TEXMF=	20150523
+DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
 EXTRACT_FILES_TEXMF= \
 	texmf-dist/doc/lualatex \
 	texmf-dist/doc/luatex \
@@ -63,7 +63,7 @@ EXTRACT_FILES_TEXMF= \
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 GNU_CONFIGURE=	yes
 EXCLUDE_ENGINES=aleph etex pdftex mf mf-nowin mp ptex eptex uptex euptex \
-		xetex tex
+		xetex tex synctex
 CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--enable-luatex \
 		--enable-luajittex \
@@ -73,35 +73,35 @@ CONFIGURE_ARGS=	${EXCLUDE_ENGINES:S/^/--disable-/} \
 		--with-freetype2-includes=${LOCALBASE}/include/freetype2 \
 		--with-freetype2-libdir=${LOCALBASE}/lib \
 		--with-system-gd \
-		--with-system-icu \
-		--with-icu-includes=${LOCALBASE}/include \
-		--with-icu-libdir=${LOCALBASE}/lib \
-		--with-system-kpathsea \
-		--with-kpathsea-includes=${LOCALBASE}/include \
-		--with-kpathsea-libdir=${LOCALBASE}/lib \
-		--with-system-libpng \
-		--with-libpng-includes=${LOCALBASE}/include \
-		--with-libpng-libdir=${LOCALBASE}/lib \
 		--with-system-poppler \
 		--with-system-t1lib \
 		--with-system-teckit \
 		--with-teckit-includes=${LOCALBASE}/include/teckit \
 		--with-teckit-libdir=${LOCALBASE}/lib \
-		--with-system-pixman \
 		--with-system-zziplib \
 		--with-system-zlib
-CFLAGS+=	-I${LOCALBASE}/include
+.for L in cairo gmp kpathsea libpng mpfr pixman ptexenc icu
+CONFIGURE_ARGS+=--with-system-$L \
+		--with-$L-include=${LOCALBASE}/include \
+		--with-$L-libdir=${LOCALBASE}/lib
+.endfor
+CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 TEX_FORMATS=	luatex
 
+# buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
+post-extract:
+	cd ${WRKSRC}/.. && \
+	    ${LN} -s -f ${LOCALBASE}/${TEXMFDISTDIR}/web2c kpathsea
+
 pre-configure:
-	for D in libs/xpdf libs/cairo libs/lua52 libs/luajit; do \
+	for D in libs/xpdf; do \
 		cd ${WRKDIR}/${DISTNAME}/$$D && \
 		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
 	done
 
 pre-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXMF}-texmf${EXTRACT_SUFX} \
-		${EXTRACT_AFTER_ARGS_TEXMF}
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
+	    ${EXTRACT_AFTER_ARGS_TEXMF}
 
 .include <bsd.port.mk>
diff --git a/print/tex-luatex/distinfo b/print/tex-luatex/distinfo
index 656ebc2679e3..bf8979f82957 100644
--- a/print/tex-luatex/distinfo
+++ b/print/tex-luatex/distinfo
@@ -1,4 +1,4 @@
-SHA256 (TeX/texlive-20140525-source.tar.xz) = 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be
-SIZE (TeX/texlive-20140525-source.tar.xz) = 41657688
-SHA256 (TeX/texlive-20140525-texmf.tar.xz) = e0227251c5aa23f8b88973c298cc80b03bd238c645f7f82a6ce888a06b295963
-SIZE (TeX/texlive-20140525-texmf.tar.xz) = 1742817996
+SHA256 (TeX/texlive-20150521-source.tar.xz) = ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
+SIZE (TeX/texlive-20150521-source.tar.xz) = 45459552
+SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
+SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
diff --git a/print/tex-luatex/files/patch-Makefile.in b/print/tex-luatex/files/patch-Makefile.in
index afd644a6f6be..9e847e19cc3c 100644
--- a/print/tex-luatex/files/patch-Makefile.in
+++ b/print/tex-luatex/files/patch-Makefile.in
@@ -1,32 +1,69 @@
---- Makefile.in.orig	2014-03-17 20:00:59.000000000 +0900
-+++ Makefile.in	2014-08-21 15:45:36.000000000 +0900
-@@ -85,6 +85,7 @@
- 	pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
- 	txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_6) \
- 	aleph$(EXEEXT)
+--- Makefile.in.orig	2015-04-16 19:53:45 UTC
++++ Makefile.in
+@@ -99,6 +99,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EX
+ 	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
+ 	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
+ 	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
 +inst_bin_PROGRAMS = luatex$(EXEEXT) luajittex$(EXEEXT)
- bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_7) \
- 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_8) \
- 	$(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
-@@ -1973,7 +1974,7 @@
+ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+ 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
+ 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+@@ -1939,14 +1940,16 @@ LTLIBOBJS = @LTLIBOBJS@
+ LTLIBSYNCTEX = @LTLIBSYNCTEX@
+ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ LUA52_DEFINES = @LUA52_DEFINES@
+-LUA52_DEPEND = @LUA52_DEPEND@
+-LUA52_INCLUDES = @LUA52_INCLUDES@
+-LUA52_LIBS = @LUA52_LIBS@
++LUA52_DEPEND =
++LUA52_INCLUDES = -I${LOCALBASE}/include/texlua52 \
++    -I@top_srcdir@/../../libs/lua52/lua-5.2.4/src
++LUA52_LIBS = -L${LOCALBASE}/lib -ltexlua52
+ LUAJIT_DEFINES = @LUAJIT_DEFINES@
+-LUAJIT_DEPEND = @LUAJIT_DEPEND@
+-LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
++LUAJIT_DEPEND =
++LUAJIT_INCLUDES = -I${LOCALBASE}/include/texluajit \
++    -I@top_srcdir@/../../libs/luajit/LuaJIT-2.0.3/src
+ LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
+-LUAJIT_LIBS = @LUAJIT_LIBS@
++LUAJIT_LIBS = -L${LOCALBASE}/lib -ltexluajit
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+@@ -2081,7 +2084,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
  AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
  AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
  version = $(WEB2CVERSION)
 -SUBDIRS = doc lib man web2c . window omegafonts otps
 +SUBDIRS = .
  proglib = lib/lib.a
- dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
- nodist_man_MANS = 
-@@ -4439,7 +4440,7 @@
- 	$(AM_V_at)$(RANLIB) libxetex.a
- install-binPROGRAMS: $(bin_PROGRAMS)
+ EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
+ 	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
+@@ -2431,9 +2434,7 @@ TRIPTRAP_CLEAN = $(am__append_9) $(am__a
+ TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
+ 	$(am__append_42) $(am__append_48) $(am__append_54) \
+ 	$(am__append_60) $(am__append_66)
+-bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
+-	$(am__append_31) $(am__append_36) $(am__append_75) \
+-	$(am__append_80)
++bin_links = $(am__append_75) $(am__append_80)
+ install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
+ 	$(am__append_73) $(am__append_78)
+ uninstall_exe_links = $(am__append_21) $(am__append_30) \
+@@ -4739,9 +4740,9 @@ synctexdir/libsynctex_la-synctex_parser_
+ 
+ libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(libsynctex_la_LINK)  $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
+-install-binPROGRAMS: $(bin_PROGRAMS)
++install-binPROGRAMS: $(inst_bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 -	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 +	@list='$(inst_bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
  	if test -n "$$list"; then \
  	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
  	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-@@ -4469,7 +4470,7 @@
+@@ -4771,7 +4772,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
  
  uninstall-binPROGRAMS:
  	@$(NORMAL_UNINSTALL)
@@ -35,7 +72,7 @@
  	files=`for p in $$list; do echo "$$p"; done | \
  	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
  	      -e 's/$$/$(EXEEXT)/' \
-@@ -13649,7 +13650,7 @@
+@@ -14447,7 +14448,7 @@ install-data: install-data-recursive
  uninstall: uninstall-recursive
  
  install-am: all-am
@@ -44,3 +81,12 @@
  
  installcheck: installcheck-recursive
  install-strip:
+@@ -14668,8 +14669,6 @@ $(proglib): ${srcdir}/lib/*.c
+ @KPATHSEA_RULE@
+ @PTEXENC_RULE@
+ @ZLIB_RULE@
+-@LUA52_RULE@
+-@LUAJIT_RULE@
+ @LIBPNG_RULE@
+ @FREETYPE2_RULE@
+ @PIXMAN_RULE@
diff --git a/print/tex-luatex/pkg-plist b/print/tex-luatex/pkg-plist
index 0f905edd90ac..964afabdb675 100644
--- a/print/tex-luatex/pkg-plist
+++ b/print/tex-luatex/pkg-plist
@@ -75,13 +75,23 @@
 %%TEXMFDISTDIR%%/doc/lualatex/lualatex-doc/News
 %%TEXMFDISTDIR%%/doc/lualatex/lualatex-doc/README
 %%TEXMFDISTDIR%%/doc/lualatex/lualatex-doc/lualatex-doc.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/README
 %%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/lualatex-math-de.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/lualatex-math.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-amsmath.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-icomma-unicode.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-icomma.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-kernel-alloc.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-kernel-style.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-kernel.pdf
+%%TEXMFDISTDIR%%/doc/lualatex/lualatex-math/test-unicode.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/luasseq/luasseq.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/luatextra/News
 %%TEXMFDISTDIR%%/doc/lualatex/luatextra/README
 %%TEXMFDISTDIR%%/doc/lualatex/luatextra/luatextra.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/luatextra/test.tex
+%%TEXMFDISTDIR%%/doc/lualatex/luatodonotes/README.md
+%%TEXMFDISTDIR%%/doc/lualatex/luatodonotes/luatodonotes.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/odsfile/README
 %%TEXMFDISTDIR%%/doc/lualatex/odsfile/odsfile.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/odsfile/odsfile.tex
@@ -90,7 +100,6 @@
 %%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/SampleGff.gff
 %%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/SampleScf.scf
 %%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/SampleUniprot.txt
-%%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/pgfmolbio.lua
 %%TEXMFDISTDIR%%/doc/lualatex/pgfmolbio/pgfmolbio.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/placeat/README
 %%TEXMFDISTDIR%%/doc/lualatex/placeat/placeat.pdf
@@ -116,12 +125,6 @@
 %%TEXMFDISTDIR%%/doc/lualatex/simurgh/simurgh-doc.tex
 %%TEXMFDISTDIR%%/doc/lualatex/simurgh/simurgh-logo.pdf
 %%TEXMFDISTDIR%%/doc/lualatex/simurgh/simurgh-logo.tex
-%%TEXMFDISTDIR%%/doc/luatex/base/fdata.lua
-%%TEXMFDISTDIR%%/doc/luatex/base/fdata_epdf.lua
-%%TEXMFDISTDIR%%/doc/luatex/base/fdata_img.lua
-%%TEXMFDISTDIR%%/doc/luatex/base/functionref.pdf
-%%TEXMFDISTDIR%%/doc/luatex/base/functionref.tex
-%%TEXMFDISTDIR%%/doc/luatex/base/luatex.man
 %%TEXMFDISTDIR%%/doc/luatex/base/luatexref-env.tex
 %%TEXMFDISTDIR%%/doc/luatex/base/luatexref-t.pdf
 %%TEXMFDISTDIR%%/doc/luatex/base/luatexref-t.tex
@@ -214,6 +217,7 @@
 %%TEXMFDISTDIR%%/doc/luatex/luaintro/03-10-2.lualtx
 %%TEXMFDISTDIR%%/doc/luatex/luaintro/03-10-3.lualtx
 %%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-1.sh
+%%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-1.tex
 %%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-2.lualtx
 %%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-3.lualtx
 %%TEXMFDISTDIR%%/doc/luatex/luaintro/03-11-4.lualtx
@@ -362,10 +366,13 @@
 %%TEXMFDISTDIR%%/doc/luatex/luamplib/luamplib.pdf
 %%TEXMFDISTDIR%%/doc/luatex/luamplib/test-luamplib-latex.tex
 %%TEXMFDISTDIR%%/doc/luatex/luamplib/test-luamplib-plain.tex
+%%TEXMFDISTDIR%%/doc/luatex/luaotfload/COPYING
 %%TEXMFDISTDIR%%/doc/luatex/luaotfload/NEWS
 %%TEXMFDISTDIR%%/doc/luatex/luaotfload/README
 %%TEXMFDISTDIR%%/doc/luatex/luaotfload/filegraph.pdf
+%%TEXMFDISTDIR%%/doc/luatex/luaotfload/luaotfload.conf.example
 %%TEXMFDISTDIR%%/doc/luatex/luaotfload/luaotfload.pdf
+%%TEXMFDISTDIR%%/doc/luatex/luaotfload/valgrind-kpse-suppression.sup
 %%TEXMFDISTDIR%%/doc/luatex/luatexbase/NEWS
 %%TEXMFDISTDIR%%/doc/luatex/luatexbase/README
 %%TEXMFDISTDIR%%/doc/luatex/luatexbase/TODO
@@ -402,6 +409,8 @@
 %%TEXMFDISTDIR%%/doc/luatex/luatexja/README
 %%TEXMFDISTDIR%%/doc/luatex/luatexja/jfm-test.lua
 %%TEXMFDISTDIR%%/doc/luatex/luatexja/jfm-ujisc33.lua
+%%TEXMFDISTDIR%%/doc/luatex/luatexja/lltjp-geometry.pdf
+%%TEXMFDISTDIR%%/doc/luatex/luatexja/lltjp-geometry.tex
 %%TEXMFDISTDIR%%/doc/luatex/luatexja/ltjclasses.pdf
 %%TEXMFDISTDIR%%/doc/luatex/luatexja/ltjltxdoc.pdf
 %%TEXMFDISTDIR%%/doc/luatex/luatexja/ltjsclasses.pdf
@@ -488,6 +497,8 @@
 %%TEXMFDISTDIR%%/source/lualatex/luasseq/luasseq.ins
 %%TEXMFDISTDIR%%/source/lualatex/luatextra/Makefile
 %%TEXMFDISTDIR%%/source/lualatex/luatextra/luatextra.dtx
+%%TEXMFDISTDIR%%/source/lualatex/luatodonotes/luatodonotes.dtx
+%%TEXMFDISTDIR%%/source/lualatex/luatodonotes/luatodonotes.ins
 %%TEXMFDISTDIR%%/source/lualatex/pgfmolbio/pgfmolbio.dtx
 %%TEXMFDISTDIR%%/source/lualatex/pgfmolbio/pgfmolbio.ins
 %%TEXMFDISTDIR%%/source/lualatex/placeat/placeat.dtx
@@ -549,7 +560,11 @@
 %%TEXMFDISTDIR%%/source/luatex/luamplib/Makefile
 %%TEXMFDISTDIR%%/source/luatex/luamplib/luamplib.dtx
 %%TEXMFDISTDIR%%/source/luatex/luaotfload/Makefile
-%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload.dtx
+%%TEXMFDISTDIR%%/source/luatex/luaotfload/filegraph.dot
+%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload-latex.tex
+%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload-main.tex
+%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload-tool.rst
+%%TEXMFDISTDIR%%/source/luatex/luaotfload/luaotfload.conf.rst
 %%TEXMFDISTDIR%%/source/luatex/luatexbase/Makefile
 %%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-attr.dtx
 %%TEXMFDISTDIR%%/source/luatex/luatexbase/luatexbase-cctb.dtx
@@ -569,10 +584,12 @@
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/blocks2defcharrange.rb
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/chars2defcharrange.rb
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/ivslist.tex
+%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/jfm-convert.lua
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/jfm-readable.rb
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/jisx0208table.tex
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/kyoikukanji.txt
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/kyoikukanjiChars.tex
+%%TEXMFDISTDIR%%/source/luatex/luatexja/tool/ltj-unicode-ccfix_make2.pl
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/otf-AdobeMingStd-Light.txt
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/otf-AdobeMyungjoStd-Medium.txt
 %%TEXMFDISTDIR%%/source/luatex/luatexja/tool/otf-AdobeSongStd-Light.txt
@@ -591,6 +608,7 @@
 %%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-inj.lua
 %%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-lua.lua
 %%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-merged.lua
+%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-ota.lua
 %%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-otn.lua
 %%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-syn.lua
 %%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-tfm.lua
@@ -617,6 +635,9 @@
 %%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatex.ini
 %%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatexiniconfig.tex
 %%TEXMFDISTDIR%%/tex/latex/latexconfig/lualatexquotejobname.tex
+%%TEXMFDISTDIR%%/tex/lualatex/dad/OT1dad.fd
+%%TEXMFDISTDIR%%/tex/lualatex/dad/T1dad.fd
+%%TEXMFDISTDIR%%/tex/lualatex/dad/dad.sty
 %%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/README-tex
 %%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/README-commands
 %%TEXMFDISTDIR%%/tex/lualatex/lilyglyphs/commands/accidentals.inp
@@ -694,6 +715,11 @@
 %%TEXMFDISTDIR%%/tex/lualatex/lualatex-math/lualatex-math.sty
 %%TEXMFDISTDIR%%/tex/lualatex/luasseq/luasseq.sty
 %%TEXMFDISTDIR%%/tex/lualatex/luatextra/luatextra.sty
+%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/inspect.lua
+%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/luatodonotes.lua
+%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/luatodonotes.sty
+%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/path_line.lua
+%%TEXMFDISTDIR%%/tex/lualatex/luatodonotes/path_point.lua
 %%TEXMFDISTDIR%%/tex/lualatex/odsfile/odsfile.lua
 %%TEXMFDISTDIR%%/tex/lualatex/odsfile/odsfile.sty
 %%TEXMFDISTDIR%%/tex/lualatex/pgfmolbio/pgfmolbio.chromatogram.lua
@@ -790,12 +816,10 @@
 %%TEXMFDISTDIR%%/tex/luatex/interpreter/interpreter.tex
 %%TEXMFDISTDIR%%/tex/luatex/lua-visual-debug/lua-visual-debug.lua
 %%TEXMFDISTDIR%%/tex/luatex/lua-visual-debug/lua-visual-debug.sty
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-basic-merged.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-basic.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-boolean.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-compat.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-dir.lua
-%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-extended-merged.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-extended.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-file.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-function.lua
@@ -816,6 +840,7 @@
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-url.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-deb.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-dim.lua
+%%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-fmt.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-jsn.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-lua.lua
 %%TEXMFDISTDIR%%/tex/luatex/lualibs/lualibs-util-prs.lua
@@ -833,6 +858,7 @@
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-blacklist.cnf
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-characters.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-colors.lua
+%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-configuration.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-database.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-diagnostics.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-features.lua
@@ -841,18 +867,18 @@
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-def.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-enc.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-ext.lua
+%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-inj.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-lua.lua
+%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-otn.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-fonts-tfm.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-glyphlist.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-legacy-attributes.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-legacy-database.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-legacy-merged.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-legacy.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-letterspace.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-loaders.lua
+%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-log.lua
+%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-main.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-override.lua
+%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-parsers.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload-status.lua
-%%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload.lua
 %%TEXMFDISTDIR%%/tex/luatex/luaotfload/luaotfload.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexbase/attr.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexbase/cctb.lua
@@ -869,6 +895,7 @@
 %%TEXMFDISTDIR%%/tex/luatex/luatexbase/modutils.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-adjust.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-fontspec.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-otf.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -881,8 +908,12 @@
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-min.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-mono.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-prop.lua
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-propv.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-quanjiao.lua
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-tmin.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-ujis.lua
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/jfm-ujisv.lua
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/lltjext.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-adjust.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-base.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-base.sty
@@ -890,6 +921,7 @@
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-compat-ptex.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-compat.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-debug.lua
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-direction.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-infomute.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-inputbuf.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -906,7 +938,7 @@
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-setwidth.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-stack.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-tangle.lua
-%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-unicode-ccfix.tex
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltj-unicode-ccfix.lua
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjarticle.cls
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjbk10.clo
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjbk11.clo
@@ -921,6 +953,15 @@
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjsize12.clo
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjskiyou.cls
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjspf.cls
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtarticle.cls
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbk10.clo
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbk11.clo
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbk12.clo
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtbook.cls
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtreport.cls
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtsize10.clo
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtsize11.clo
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/ltjtsize12.clo
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/luatexja-compat.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/luatexja-core.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/luatexja.lua
@@ -929,7 +970,11 @@
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjdefs.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjfont.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-fontspec.sty
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-footmisc.sty
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-geometry.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-listings.sty
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-stfloats.sty
+%%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-tascmac.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexja/patches/lltjp-xunicode.sty
 %%TEXMFDISTDIR%%/tex/luatex/luatexko/luatexko-core.sty