[latex3-commits] [latex2e-public] r1342 - luaotfload

[noreply at latex-project.org]

Author: carlisle
Date: 2017-01-20 12:24:44 +0100 (Fri, 20 Jan 2017)
New Revision: 1342

Modified:
   trunk/base/changes.txt
   trunk/base/ltluatex.dtx
Log:
luaotfload

Modified: trunk/base/changes.txt
===================================================================
--- trunk/base/changes.txt	2017-01-18 00:06:24 UTC (rev 1341)
+++ trunk/base/changes.txt	2017-01-20 11:24:44 UTC (rev 1342)
@@ -10,6 +10,10 @@
 #########################
 
 
+2017-01-20  David Carlisle  <latex-bugs at latex-project.org>
+
+	* ltluatex.dtx: work around luaotfload issues 382 and 387
+
 2017-01-10  David Carlisle  <latex-bugs at latex-project.org>
 
 	* ltfssbas.dtx: Add version of \showhyphens that works in XeTeX.

Modified: trunk/base/ltluatex.dtx
===================================================================
--- trunk/base/ltluatex.dtx	2017-01-18 00:06:24 UTC (rev 1341)
+++ trunk/base/ltluatex.dtx	2017-01-20 11:24:44 UTC (rev 1342)
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2015 2016
+% Copyright 2015 2017
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -24,7 +24,7 @@
 \ProvidesFile{ltluatex.dtx}
 %</driver>
 %<*tex>
-[2016/12/30 v1.1a
+[2017/01/20 v1.1b
 %</tex>
 %<plain>  LuaTeX support for plain TeX (core)
 %<*tex>
@@ -812,6 +812,14 @@
 %<2ekernel>  \the\everyjob
 %<*2ekernel,latexrelease>
   \directlua{%
+%% Horrible hack, locally reset the luatex version number
+%% This is not required for the source version of luaotfload
+%% but is required due to an error in the version check in the
+%% public version (January 2017)
+%% https://github.com/lualatex/luaotfload/issues/387
+%% It is expected that this will be removed before TeXLive 2017
+  local tmp_version=tex.luatexversion %
+  tex.luatexversion=199 %
   if xpcall(function ()%
              require('luaotfload-main')%
             end,texio.write_nl) then %
@@ -819,7 +827,9 @@
   else %
   texio.write_nl('Error in luaotfload: reverting to OT1')%
   tex.print('\string\\def\string\\encodingdefault{OT1}')%
-  end}%
+  end %
+  tex.luatexversion=tmp_version%
+  }%
   \let\f at encoding\encodingdefault
   \expandafter\let\csname ver at luaotfload.sty\endcsname\fmtversion
 %</2ekernel,latexrelease>