From 7a7ea7aa5948c4be61b65cd43bd4d3a899ba2b75 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 May 2018 22:03:45 +0000 Subject: latex2e (4may18) git-svn-id: svn://tug.org/texlive/trunk@47612 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/base/docstrip.tex | 12 ++++++++--- Master/texmf-dist/tex/latex/base/latex.ltx | 2 +- Master/texmf-dist/tex/latex/base/ltluatex.lua | 30 +++++++++++++-------------- Master/texmf-dist/tex/latex/base/ltluatex.tex | 2 +- 4 files changed, 26 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/latex/base') diff --git a/Master/texmf-dist/tex/latex/base/docstrip.tex b/Master/texmf-dist/tex/latex/base/docstrip.tex index e2031f3d189..58eb8a1488c 100644 --- a/Master/texmf-dist/tex/latex/base/docstrip.tex +++ b/Master/texmf-dist/tex/latex/base/docstrip.tex @@ -44,9 +44,9 @@ \catcode`\{=1 \catcode`\}=2 \def\filename{docstrip.dtx} -\def\fileversion{2.5f} -\def\filedate{2018/04/10} -\def\docdate {2018/04/10} +\def\fileversion{2.5g} +\def\filedate{2018/05/03} +\def\docdate {2018/05/03} %% %% The docstrip program for use with TeX. %% Copyright (C) 1989-1991 Frank Mittelbach @@ -111,6 +111,12 @@ Z \let\bgroup={ \let\egroup=} \catcode`\@=11 \newlinechar=`\^^J +\count@=128\relax +\loop + \catcode\count@ 12\relax +\ifnum\count@ <255\relax + \advance\count@\@ne +\repeat \newif\ifGenerate \newif\ifContinue \newif\ifForlist diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 55eebb2bd46..df97702703f 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -701,7 +701,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2018-04-01} -\def\patch@level{3} +\def\patch@level{4} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua index 3ca87ef1aec..1f88541c5f8 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua @@ -243,7 +243,6 @@ local callbacktypes = callbacktypes or { find_vf_file = data, find_map_file = data, find_enc_file = data, - find_sfd_file = data, find_pk_file = data, find_data_file = data, find_opentype_file = data, @@ -255,7 +254,6 @@ local callbacktypes = callbacktypes or { read_vf_file = exclusive, read_map_file = exclusive, read_enc_file = exclusive, - read_sfd_file = exclusive, read_pk_file = exclusive, read_data_file = exclusive, read_truetype_file = exclusive, @@ -284,21 +282,23 @@ local callbacktypes = callbacktypes or { kerning = simple, insert_local_par = simple, mlist_to_hlist = list, - pre_dump = simple, - start_run = simple, - stop_run = simple, - start_page_number = simple, - stop_page_number = simple, - show_error_hook = simple, - show_warning_message = simple, - show_error_message = simple, - show_lua_error_hook = simple, - start_file = simple, - stop_file = simple, - call_edit = simple, + pre_dump = simple, + start_run = simple, + stop_run = simple, + start_page_number = simple, + stop_page_number = simple, + show_error_hook = simple, + show_warning_message = simple, + show_error_message = simple, + show_lua_error_hook = simple, + start_file = simple, + stop_file = simple, + call_edit = simple, + finish_synctex_callback = simple, finish_pdffile = data, finish_pdfpage = data, - define_font = exclusive, + define_font = exclusive, + glyph_not_found = exclusive, glyph_stream_provider = exclusive, } luatexbase.callbacktypes=callbacktypes diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex index 54880ca181d..eda191ab532 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.tex +++ b/Master/texmf-dist/tex/latex/base/ltluatex.tex @@ -47,7 +47,7 @@ #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}} \fi \ProvidesFile{ltluatex.tex} -[2017/04/28 v1.1f +[2018/05/02 v1.1g LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} -- cgit v1.2.3