Fix \ltj@@IsFontJapaneseX; the oid definition doesn't work with listings.sty.

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index ea75d3e..7baab1e 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -569,7 +569,7 @@
   \expandafter\ltj@@IsFontJapaneseX#1//:%
   \expandafter\expandafter\expandafter
   \inlist@\expandafter\tmp@item\expandafter{\kenc@list}}
-\def\ltj@@IsFontJapaneseX#1/#2/:{\edef\tmp@item{{\directlua{tex.print('#1')}}}}
+\def\ltj@@IsFontJapaneseX#1/#2/:{\edef\tmp@item{{\directlua{tex.write('#1')}}}}
 
 
 \let\extract@afont\extract@font

diff --git a/src/patches/lltjp-listings.sty b/src/patches/lltjp-listings.sty
index 27ef8cf..3e3f86b 100644 (file)
--- a/src/patches/lltjp-listings.sty
+++ b/src/patches/lltjp-listings.sty
@@ -74,7 +74,6 @@
       \lst@ifprint \def\lst@next{\lst@get@filecontents{#1}}%
       \else        \let\lst@next\@empty
       \fi
-      \catcode"FFFFF=12%"
       \lst@next
       \lst@DeInit
    \endgroup}
@@ -163,5 +162,5 @@
 %    \ifnot@nil #1-> \def\reserved@a{#1}... の \reserved@a=\set@size@funct@args@
 %    がなぜか実行される？
 %    ad hoc な対策として事前に必要な (s)sub は実行しておくことにする．
-\lst@AddToHook{Init}{\begingroup\itshape\bfseries\upshape\endgroup}
+%\lst@AddToHook{Init}{\begingroup\itshape\bfseries\upshape\bfseries\mdseries\endgroup}
 \endinput

diff --git a/src/patches/lltjp-lstmisc.sty b/src/patches/lltjp-lstmisc.sty
index 4eada36..25b5422 100644 (file)
--- a/src/patches/lltjp-lstmisc.sty
+++ b/src/patches/lltjp-lstmisc.sty
@@ -29,6 +29,7 @@
     \fi}
 \endgroup
 \gdef\lst@frameBlock#1#2#3#4{%
+    %\typeout{FB: \string#1, \the#2, \the#3, \the#4.}%
     \color@begingroup
       #1%
       \setbox\z@\hbox{\vrule\@height#3\@depth#4%