From 5255c37137345163348d22ab46af2304cf9f55a6 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Fri, 2 Oct 2020 21:49:18 +0000
Subject: latex2e (2oct20)

git-svn-id: svn://tug.org/texlive/trunk@56514 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/base/tuenc.def | 56 +++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 16 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/base/tuenc.def')

diff --git a/Master/texmf-dist/tex/latex/base/tuenc.def b/Master/texmf-dist/tex/latex/base/tuenc.def
index 88093dba94a..a9f8a27eb35 100644
--- a/Master/texmf-dist/tex/latex/base/tuenc.def
+++ b/Master/texmf-dist/tex/latex/base/tuenc.def
@@ -43,7 +43,7 @@
 %% extension .ins) which are part of the distribution.
 %%% From File: ltoutenc.dtx
 \ProvidesFile{tuenc.def}
- [2020/02/11 v2.0o
+ [2020/08/10 v2.0s
       Standard LaTeX file]
 \providecommand\UnicodeEncodingName{TU}
 \begingroup\expandafter\expandafter\expandafter\endgroup
@@ -58,20 +58,44 @@
     \expandafter\expandafter\expandafter\endinput
   \else
     \def\UnicodeFontTeXLigatures{+tlig;}
-    \def\reserved@a#1{%
-      \def\@remove@tlig##1{\@remove@tlig@##1\@nil#1\@nil\relax}
-      \def\@remove@tlig@##1#1{\@remove@tlig@@##1}}
-    \edef\reserved@b{\detokenize{+tlig;}}
-    \expandafter\reserved@a\expandafter{\reserved@b}
-    \def\@remove@tlig@@#1\@nil#2\relax{#1}
-    \def\remove@tlig#1{%
-      \begingroup
-      \font\remove@tlig
-      \expandafter\@remove@tlig\expandafter{\fontname\font}%
-      \remove@tlig
-      \char#1\relax
-      \endgroup
-    }
+    \ifnum\luatexversion<110
+      \def\reserved@a#1{%
+        \def\@remove@tlig##1{\@remove@tlig@##1\@nil#1\@nil\relax}
+        \def\@remove@tlig@##1#1{\@remove@tlig@@##1}}
+      \edef\reserved@b{\detokenize{+tlig;}}
+      \expandafter\reserved@a\expandafter{\reserved@b}
+      \def\@remove@tlig@@#1\@nil#2\relax{#1}
+      \def\remove@tlig#1{%
+        \begingroup
+        \font\remove@tlig
+        \expandafter\@remove@tlig\expandafter{\fontname\font}%
+        \remove@tlig
+        \char#1\relax
+        \endgroup
+      }
+    \else
+      \newluafunction\@remove@tlig@@@@
+      \now@and@everyjob{\directlua{
+        local rawchar_func = token.create'@remove@tlig@@@@'.index
+        local forcehmode = tex.forcehmode
+        local put_next = token.put_next
+        local glyph_id = node.id'glyph'
+        local rawchar_token = token.new(rawchar_func, token.command_id'lua_call')
+        lua.get_functions_table()[rawchar_func] = function()
+          local mode = tex.nest.top.mode
+          if mode == 1 or mode == -1 then
+            put_next(rawchar_token)
+            return forcehmode(true)
+          end
+          local n = node.new(glyph_id, 256)
+          n.font = font.current()
+          n.char = token.scan_int()
+          return node.write(n)
+        end
+        token.set_lua('@remove@tlig@@@', rawchar_func, 'global', 'protected')
+      }}
+      \def\remove@tlig#1{\@remove@tlig@@@#1\relax}
+    \fi
   \fi
 \else
   \def\UnicodeFontTeXLigatures{mapping=tex-text;}
@@ -475,7 +499,7 @@
 \DeclareUnicodeComposite{\textcommabelow}{T}{"021A}
 \DeclareUnicodeComposite{\textcommabelow}{t}{"021B}
 \DeclareUnicodeComposite{\=}             {Y}{"0232}
-\DeclareUnicodeComposite{\=}             {y}{"0232}
+\DeclareUnicodeComposite{\=}             {y}{"0233}
 \DeclareUnicodeComposite{\.}             {B}{"1E02}
 \DeclareUnicodeComposite{\.}             {b}{"1E03}
 \DeclareUnicodeComposite{\d}             {B}{"1E04}
-- 
cgit v1.2.3

