[latex3-commits] [git/LaTeX3-latex3-latex2e] master: only modify the font loader if the tfm font loader is in force, modification causes segfaults in the 1.09 test release and test luaotfload code, this still allows compatibility with pdftex in the base tests (e851b3a)

[David Carlisle]

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

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

commit e851b3aba21cb4a7b55e140bf09fec4e9735a550
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Tue Sep 4 17:02:56 2018 +0100

    only modify the font loader if the tfm font loader is in force, modification causes segfaults in the 1.09 test release and test luaotfload code, this still allows compatibility with pdftex in the base tests


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

e851b3aba21cb4a7b55e140bf09fec4e9735a550
 support/test2e.tex |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/support/test2e.tex b/support/test2e.tex
index f45bd57..86c6ae6 100644
--- a/support/test2e.tex
+++ b/support/test2e.tex
@@ -204,10 +204,15 @@ else
   else
     local cbl=luatexbase.callback_descriptions('define_font')
     if(cbl[1]\string~=nil) then
-      original_fontloader=luatexbase.remove_from_callback('define_font',cbl[1])
+      % 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
     end
   end
 end
+
+if(original_fontloader \string~=nil) then
 function latexDefineFont(n,s,i)
   local f = nil
   for ii,vv in font.each() do
@@ -226,6 +231,7 @@ 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
@@ -233,6 +239,7 @@ if (luatexbase==nil) then
 else
   luatexbase.add_to_callback('define_font',latexDefineFont,"latexDefineFont")
 end
+end
 }
 \fi