[latex3-commits] [git/LaTeX3-latex3-latex2e] master: try to get 1.07 passing again, fails but doesn't segfault with 1.09 (1403de9)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/1403de9ef12f8f738653a14b720454088d017ec9

>---------------------------------------------------------------

commit 1403de9ef12f8f738653a14b720454088d017ec9
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Sep 8 18:38:52 2018 +0100

    try to get 1.07 passing again, fails but doesn't segfault with 1.09


>---------------------------------------------------------------

1403de9ef12f8f738653a14b720454088d017ec9
 support/test2e.tex |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/support/test2e.tex b/support/test2e.tex
index 86c6ae6..fe1c894 100644
--- a/support/test2e.tex
+++ b/support/test2e.tex
@@ -193,7 +193,10 @@
 % Arrange that duplicate fonts share internal font id
 % so they are shown with the same csname in luatex
 % to match (pdf)tex and xetex.
+
+% disable this for now on development builds of luatex
 \ifx\directlua\undefined\else
+\ifnum\luatexversion<108
 \directlua{
 local original_fontloader=font.read_tfm
 if (luatexbase==nil) then
@@ -204,15 +207,11 @@ else
   else
     local cbl=luatexbase.callback_descriptions('define_font')
     if(cbl[1]\string~=nil) then
-      % disable this in formats that already have a lua fontloader, segfaults in 1.09 development branches
-      % only really needed for compatibility with pdftex in base tests.
-      % original_fontloader=luatexbase.remove_from_callback('define_font',cbl[1])
-        original_fontloader=nil
+      original_fontloader=luatexbase.remove_from_callback('define_font',cbl[1])
     end
   end
 end
 
-if(original_fontloader \string~=nil) then
 function latexDefineFont(n,s,i)
   local f = nil
   for ii,vv in font.each() do
@@ -231,7 +230,6 @@ function latexDefineFont(n,s,i)
       end
     end
   end
-print('>>>', type(f) .. (f or '?'))
   return f or original_fontloader(n,s,i)
 end
 if (luatexbase==nil) then
@@ -239,9 +237,9 @@ if (luatexbase==nil) then
 else
   luatexbase.add_to_callback('define_font',latexDefineFont,"latexDefineFont")
 end
-end
 }
 \fi
+\fi
 
 % Load the map file early so it does not appear in the log.
 \ifdefined\pdfoutput