Fix a crash by "\ruby{Weierstraß}{ワイエルシュトラス}"

[luatex-ja/luatexja.git] / src / patches / lltjp-listings.sty

diff --git a/src/patches/lltjp-listings.sty b/src/patches/lltjp-listings.sty
index 253bf5b..3f7c220 100644 (file)
--- a/src/patches/lltjp-listings.sty
+++ b/src/patches/lltjp-listings.sty
@@ -1,9 +1,8 @@
 %
-% lltjp-listings.sty
+% lltjp-listings.sty 2018-09-17
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-listings}[2016/03/02 Patch to listings for LuaTeX-ja]
 \RequirePackage{listings,luatexbase-cctb}
 
 %%%%%%%%%%%%%%%% Japanese support
@@ -368,11 +367,13 @@
          #3\catcode\ltjlineendcomment=9\lst@escapebegin\expandafter\lst@next%"
          \fi}%
         {}}
+\def\ltj@lst@emptygrp{{}}
 \def\ltj@lst@escape@setup#1{%
   \begingroup\lccode`\~=`#1\lowercase{%
   \gdef\lst@next##1~{%
      \let\lst@arg\@empty\ltj@lst@remove@jacmd{##1}%
-     \expandafter\expandafter\expandafter\scantokens\expandafter{\lst@arg}%
+     \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter
+          \scantokens\expandafter\expandafter\expandafter{\expandafter\ltj@lst@emptygrp\lst@arg\empty}%
      ~}%
   }\endgroup
 }
@@ -387,6 +388,13 @@
     \fi}}
 \endgroup
 
+%%%%%%%%%%%%%%%% texcl
+\lst@AddToHook{AfterBeginComment}
+   {\ifnum\lst@mode=\lst@TeXLmode
+      \catcode`\^^M=13\relax
+      \catcode\ltjlineendcomment=9\relax
+    \fi}
+
 %%%%%%%%%%%%%%%%
 \lstloadaspects{writefile}
 \begingroup \catcode`\^^I=11