3 files changed, 39 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/base/docstrip.dtx b/Master/texmf-dist/source/latex/base/docstrip.dtx
index 29afc6f6267..be3dda6d32d 100644
--- a/Master/texmf-dist/source/latex/base/docstrip.dtx
+++ b/Master/texmf-dist/source/latex/base/docstrip.dtx
@@ -29,9 +29,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}
 %%
 %
 %\iffalse
@@ -1031,6 +1031,19 @@ Z
 \newlinechar=`\^^J
 %    \end{macrocode}
 %
+% \changes{2.58}{2018/05/03}{Read 8bit raw to leave high bits in the
+%   .ins files unchanged}
+% Reset the catcodes of 8-bit characters so that processing a \texttt{.ins}
+% file with plain \TeX\ or \LaTeX\ both work.
+%    \begin{macrocode}
+\count@=128\relax
+\loop
+  \catcode\count@ 12\relax
+\ifnum\count@ <255\relax
+    \advance\count@\@ne
+\repeat
+%    \end{macrocode}
+%
 % \subsubsection{Switches}
 % \begin{macro}{\ifGenerate}
 %    The program will check if a
diff --git a/Master/texmf-dist/source/latex/base/ltluatex.dtx b/Master/texmf-dist/source/latex/base/ltluatex.dtx
index 180fb7bc290..4686785cf57 100644
--- a/Master/texmf-dist/source/latex/base/ltluatex.dtx
+++ b/Master/texmf-dist/source/latex/base/ltluatex.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2015 2017
+% Copyright 2015 2017 2018
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -24,7 +24,7 @@
 \ProvidesFile{ltluatex.dtx}
 %</driver>
 %<*tex>
-[2017/04/28 v1.1f
+[2018/05/02 v1.1g
 %</tex>
 %<plain>  LuaTeX support for plain TeX (core)
 %<*tex>
@@ -1230,6 +1230,7 @@ local types = {
 local callbacktypes = callbacktypes or {
 %    \end{macrocode}
 %   Section 8.2: file discovery callbacks.
+% \changes{v1.1g}{2018/05/02}{find\_sfd\_file removed}
 %    \begin{macrocode}
   find_read_file     = exclusive,
   find_write_file    = exclusive,
@@ -1239,7 +1240,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,
@@ -1247,14 +1247,13 @@ local callbacktypes = callbacktypes or {
   find_type1_file    = data,
   find_image_file    = data,
 %    \end{macrocode}
-%
+% \changes{v1.1g}{2018/05/02}{read\_sfd\_file removed}
 %    \begin{macrocode}
   open_read_file     = exclusive,
   read_font_file     = exclusive,
   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,
@@ -1303,19 +1302,21 @@ local callbacktypes = callbacktypes or {
 % Section 8.5: information reporting callbacks.
 % \changes{v1.0m}{2016/02/11}{show\_warning\_message added}
 % \changes{v1.0p}{2016/11/17}{call\_edit added}
-%    \begin{macrocode}
-  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,
+% \changes{v1.1g}{2018/05/02}{finish\_synctex\_callback added}
+%    \begin{macrocode}
+  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,
 %    \end{macrocode}
 % Section 8.6: PDF-related callbacks.
 %    \begin{macrocode}
@@ -1324,8 +1325,10 @@ local callbacktypes = callbacktypes or {
 %    \end{macrocode}
 % Section 8.7: font-related callbacks.
 % \changes{v1.1e}{2017/03/28}{glyph\_stream\_provider added}
+% \changes{v1.1g}{2018/05/02}{glyph\_not\_found added}
 %    \begin{macrocode}
-  define_font = exclusive,
+  define_font           = exclusive,
+  glyph_not_found       = exclusive, 
   glyph_stream_provider = exclusive,
 %    \end{macrocode}
 % \changes{v1.0m}{2016/02/11}{pdf\_stream\_filter\_callback removed}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index bc8c1866451..05f2361b026 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -115,7 +115,7 @@
    {2018-04-01}
 %</2ekernel|latexrelease>
 %<*2ekernel>
-\def\patch@level{3}
+\def\patch@level{4}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}