From 9e0d77f11634a037f609ca44ed3cc8d6762ea32b Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Tue, 16 Apr 2019 22:25:07 +0900
Subject: [PATCH] #39138

---
 src/patches/lltjp-fontspec.sty | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/patches/lltjp-fontspec.sty b/src/patches/lltjp-fontspec.sty
index 32e4ef0..40f8c1e 100644
--- a/src/patches/lltjp-fontspec.sty
+++ b/src/patches/lltjp-fontspec.sty
@@ -132,15 +132,19 @@
    { \fontspec_visible_space_fallback: }
  }
 
-\def\verb
- {
-  \relax\ifmmode\hbox\else\leavevmode\fi % same as lltjcore
-  \bgroup
-    \verb@eol@error \let\do\@makeother \dospecials
-    \verbatim@font\@noligs
-    \@ifstar\__fontspecsverb\@verb
- }
-
+\AtBeginDocument{
+  \cs_if_exist:NF \verbvisiblespace {
+    % >= LaTeX2e <2018-12-01> does not need the following patch
+    \def\verb
+    {
+      \relax\ifmmode\hbox\else\leavevmode\fi % same as lltjcore
+      \bgroup
+        \verb@eol@error \let\do\@makeother \dospecials
+        \verbatim@font\@noligs
+        \@ifstar\__fontspecsverb\@verb
+    }
+  }
+}
 \cs_set:Npn \emshape { \gtfamily \itshape }
 \cs_set:Npn \eminnershape { \mcfamily \upshape }
 
-- 
2.11.0