summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-05-30 20:07:11 +0000
committerKarl Berry <karl@freefriends.org>2022-05-30 20:07:11 +0000
commitfff67648afed7073ee306f42c470d95b978d2de5 (patch)
tree42f9e1a2c7afbd24038f9ad2cb9dbcc680c30d2d
parent5aca495564c2fa70381412599e45bd974378ae2c (diff)
luatexja (30may22)
git-svn-id: svn://tug.org/texlive/trunk@63447 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/README8
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdfbin456567 -> 456577 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdfbin717327 -> 717450 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdfbin1149069 -> 1149239 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx47
-rw-r--r--Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty1
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.lua3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty17
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty23
17 files changed, 64 insertions, 53 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 44e0e1e2802..d22404d6106 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20220411.0
+The LuaTeX-ja Package 20220530.0
--------------------------------
Copyright (c) 2011--2022 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -42,9 +42,9 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20220411.0 in the Git repository by
+ or tagged as 20220530.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20220411.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20220530.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -93,4 +93,4 @@ Notes
This file and ltj-kinsoku.lua are not used anymore.
(Do not remove ltj-kinsoku.tex.)
-Last commit date: Mon Apr 11 16:22:21 2022 +0900
+Last commit date: Mon May 30 12:00:10 2022 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
index 9993e10d728..08d50b5018f 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index 4a8064513ca..06cae0dffc2 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index 84997df76ae..f5a92ac497e 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
index 05c59fc21b5..89bdf863485 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
@@ -8404,15 +8404,13 @@ characters designed for ruby.
%</ja>
\item[bold]
%<*en>
-Substitute bold series of gothic for bold series of mincho.
+Substitute bold series of gothic for medium series of gothic and bold series of mincho.
If \texttt{nodeluxe} option is enabled, medium series of gothic is also changed,
since we use same font for both series of gothic.
%</en>
%<*ja>
-「明朝の太字」をゴシック体の太字によって代替する.
-もし\texttt{nodeluxe}オプションが指定されている場合は,ゴシック体は1ウェイトしか使用されな
- いため,
-「ゴシック体の中字」も同時に変更されることになる.
+\texttt{nodeluxe}オプション指定時には,「明朝の太字」をゴシック体と同じフォントにする.
+\texttt{deluxe}オプション指定時には,「明朝の太字」「ゴシック体の中字」をゴシック体の太字と同じフォントにする.
%</ja>
\item[jis90\textrm{,~}90jis]
%<en>Use JIS~X~0208:1990 glyph variants if possible.
@@ -8439,7 +8437,7 @@ Use the JFM \texttt{jfm-<jfm>.lua} for vertical direction, instead of \texttt{jf
\item[jis]
%<en>Same as \texttt{jfm\_yoko=jis}.
-%<ja>\texttt{jfm\_yoko=jis}と同じ.ここで用いるJFM\texttt{jfm-jis.lua}はJISフォントメトリックを元にしたものである.
+%<ja>\texttt{jfm\_yoko=jis}と同じ.ここで用いるJFM~\texttt{jfm-jis.lua}はJISフォントメトリックを元にしたものである.
\end{cslist}
%<*en>
@@ -8917,10 +8915,10 @@ and use them by \cs{ltjapplypreset}. These two commands can only be used in the
新たに<name>という名称のプリセットを定義する.この名称は,
すでに定義されているプリセット名や,
\ref{sssec:ltjpreset-general}で定義されているオプション,さらに
- 次の11個と重複してはならない.
+ 次の13個と重複してはならない.
\begin{quote}
\ttfamily
- mc mc-l mc-m mc-b mc-bx gt gt-m gt-b gt-bx gt-eb mg-m
+ mc mc-l mc-m mc-b mc-bx gt gt-u gt-d gt-m gt-b gt-bx gt-eb mg-m
\end{quote}
<specification>は,プリセット名や以下のキー達のコンマ区切りリストを指定する:
@@ -8929,8 +8927,12 @@ and use them by \cs{ltjapplypreset}. These two commands can only be used in the
\item[\ttfamily mc-m=<font>] 明朝体中字(\cs{mcfamily}\cs{mdseries})
\item[\ttfamily mc-b=<font>] 明朝体太字(\cs{mcfamily}\cs{bfseries})
\item[\ttfamily mc-bx=<font>] \texttt{mc-b=<font>}と同義.
- \item[\ttfamily gt-m=<font>] ゴシック体中字(\cs{gtfamily}\cs{mdseries})
- \item[\ttfamily gt-b=<font>] ゴシック体太字(\cs{gtfamily}\cs{bfseries})
+ \item[\ttfamily gt-u=<font>] \texttt{deluxe}オプション未指定時のゴシック体(\cs{gtfamily})・明朝体太字
+ \item[\ttfamily gt-d=<font>] \texttt{deluxe}オプション指定時のゴシック体中字(\cs{gtfamily}\cs{mdseries})
+ \item[\ttfamily gt-m=<font>] \texttt{deluxe}オプションの指定の有無に関係なく
+ ゴシック体中字(\cs{gtfamily}\cs{mdseries})を指定する.「\texttt{gt-u=<font>, gt-d<font>}」と同義.
+ \item[\ttfamily gt-b=<font>] ゴシック体太字(\cs{gtfamily}\cs{bfseries})\\
+ なお,パッケージ読み込み時に\texttt{bold}オプションが指定された場合は,\texttt{mc-b=<font>}を指定したことにもなる.
\item[\ttfamily gt-bx=<font>] \texttt{gt-b=<font>}と同義.
\item[\ttfamily gt-eb=<font>] ゴシック体太字(\cs{gtfamily}\cs{ebseries})
\item[\ttfamily mg-m=<font>] 丸ゴシック体(\cs{mgfamily})
@@ -8942,19 +8944,17 @@ and use them by \cs{ltjapplypreset}. These two commands can only be used in the
\item[\ttfamily gt=<font>] ゴシック体の中字・太字・極太全部を設定.
以下を指定したことと同じである:
\begin{quote}
- \ttfamily gt-m=<font>, gt-b=<font>, gt-eb=<font>
+ \ttfamily gt-u=<font>, gt-d=<font>, gt-b=<font>, gt-eb=<font>
\end{quote}
\end{description}
- なお,パッケージ読み込み時に \texttt{deluxe} が有効でない場合は,
- 上記11キーのうち\texttt{mc}, \texttt{gt}しか実質的に意味を持たない.
%</ja>
%<*en>
Define new preset~<name>. This <name> cannot be same as other presets,
options described in Subsubsection~\ref{sssec:ltjpreset-general}, nor
- following 11~strings:
+ following 13~strings:
\begin{quote}
- \ttfamily
- mc mc-l mc-m mc-b mc-bx gt gt-m gt-b gt-bx gt-eb mg-m
+ \ttfamily
+ mc mc-l mc-m mc-b mc-bx gt gt-u gt-d gt-m gt-b gt-bx gt-eb mg-m
\end{quote}
<specification> is a comma-separated list which consists of
@@ -8964,22 +8964,23 @@ and use them by \cs{ltjapplypreset}. These two commands can only be used in the
\item[\ttfamily mc-m=<font>] mincho medium
\item[\ttfamily mc-b=<font>] mincho bold
\item[\ttfamily mc-bx=<font>] synonym for \texttt{mc-b=<font>}
- \item[\ttfamily gt-m=<font>] gothic medium
- \item[\ttfamily gt-b=<font>] gothic bold
+ \item[\ttfamily gt-u=<font>] gothic, when \texttt{deluxe}~option is not specified.
+ \item[\ttfamily gt-d=<font>] gothic medium, when \texttt{deluxe}~option is specified.
+ \item[\ttfamily gt-m=<font>] gothic medium. This key is equivalent to ``\texttt{gt-u=<font>, gt-d<font>}''.
+ \item[\ttfamily gt-b=<font>] gothic bold\\
+ Note that this key also specifies mincho bold if \texttt{bold} option is specified.
\item[\ttfamily gt-bx=<font>] synonym for \texttt{gt-b=<font>}
\item[\ttfamily gt-eb=<font>] gothic extra~bold
\item[\ttfamily mg-m=<font>] rounded gothic
- \item[\ttfamily mc=<font>] Same as
+ \item[\ttfamily mc=<font>] Equivalent to
\begin{quote}
\ttfamily mc-l=<font>, mc-m=<font>, mc-b=<font>
\end{quote}
- \item[\ttfamily gt=<font>] Same as
+ \item[\ttfamily gt=<font>] Equivalent to
\begin{quote}
- \ttfamily gt-m=<font>, gt-b=<font>, gt-eb=<font>
+ \ttfamily gt-u=<font>, gt-d=<font>, gt-b=<font>, gt-eb=<font>
\end{quote}
\end{description}
- If \texttt{deluxe} is not specified at loading the package,
- only \texttt{mc}~and~\texttt{gt} keys (among above 11~keys) have a meaning.
%</en>
\item[\cs{ltjnewpreset}*\{<name>\}\{<specification>\}]
%<*ja>
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
index 049f9383af0..e190617c155 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
@@ -5164,12 +5164,13 @@
% |\@makefnmark| は脚注の番号を出力する命令です。
% ここでは脚注が左端から一定距離に来るようにしてあります。
%
+%
% \begin{macrocode}
\newcommand\@makefntext[1]{%
\advance\leftskip 3\zw
\parindent 1\zw
\noindent
- \llap{\@makefnmark\hskip0.3\zw}#1}
+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index b0ce39bf5d8..3da21dd1556 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -110,7 +110,6 @@
gt-m .code:n = % gtfamily , medium series
\prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
\prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1},
- % gt-d, gt-u は隠し
gt .groups:n = { preset }, gt .value_required:n = true,
gt-m .groups:n = { preset }, gt-m .value_required:n = true,
}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
index a4073936f07..0e8e39f0717 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
@@ -128,8 +128,7 @@ local function capsule_glyph_yoko(p, met, char_data, head, dir)
end
end
- local q
- head, q = node_remove(head, p)
+ local q; head, q = node_remove(head, p)
if pwidth > fwidth then
if char_data.round_threshold then
local frac = pwidth / fwidth
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index 1f19c60dd31..ea6dc8c455c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -1401,7 +1401,7 @@ class has defined the old font commands like\MessageBreak
\advance\leftskip 3\zw
\parindent 1\zw
\noindent
- \llap{\@makefnmark\hskip0.3\zw}#1}
+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
\let\@inhibitglue=\ltjfakeparbegin
\def\@item[#1]{%
\if@noparitem
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index bbe4025df3b..43bedbc8787 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
@@ -1494,7 +1494,7 @@ class has defined the old font commands like\MessageBreak
\advance\leftskip 3\zw
\parindent 1\zw
\noindent
- \llap{\@makefnmark\hskip0.3\zw}#1}
+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
\let\@inhibitglue=\ltjfakeparbegin
\def\@item[#1]{%
\if@noparitem
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index 09d94301be4..be94fcc2879 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
@@ -1365,7 +1365,7 @@ class has defined the old font commands like\MessageBreak
\advance\leftskip 3\zw
\parindent 1\zw
\noindent
- \llap{\@makefnmark\hskip0.3\zw}#1}
+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
\let\@inhibitglue=\ltjfakeparbegin
\def\@item[#1]{%
\if@noparitem
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index eb4b41e0a5a..f4f11d0de0e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
@@ -1259,7 +1259,7 @@ class has defined the old font commands like\MessageBreak
\advance\leftskip 3\zw
\parindent 1\zw
\noindent
- \llap{\@makefnmark\hskip0.3\zw}#1}
+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
\let\@inhibitglue=\ltjfakeparbegin
\def\@item[#1]{%
\if@noparitem
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
index 47e65c6ec90..6f5a71a175a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
@@ -1487,7 +1487,7 @@ class has defined the old font commands like\MessageBreak
\advance\leftskip 3\zw
\parindent 1\zw
\noindent
- \llap{\@makefnmark\hskip0.3\zw}#1}
+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
\let\@inhibitglue=\ltjfakeparbegin
\def\@item[#1]{%
\if@noparitem
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index f375d727dfb..f7957a116de 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -323,13 +323,14 @@ do
local to_node = node.direct.tonode
local to_direct = node.direct.todirect
local ensure_tex_attr = ltjb.ensure_tex_attr
-
+ local slide = node.slide
-- mode = true iff main_process is called from pre_linebreak_filter
local function main_process(head, mode, dir, gc)
ensure_tex_attr(attr_icflag, 0)
if gc == 'fin_row' then return head
else
start_time_measure('jfmglue')
+ slide(head);
local p = ltjj.main(to_direct(head),mode, dir)
stop_time_measure('jfmglue')
return to_node(p)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index adc6f2276ed..eae7d5040b8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -27,7 +27,7 @@
\newif\ifltj@disablejfam
%%%% VERSION
-\def\LuaTeXjaversion{20220411.0}
+\def\LuaTeXjaversion{20220530.0}
%% Check if LaTeX is used.
\begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
index 086771a200b..af49aef7faf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2022-01-17 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2022-05-30 Patch to LaTeX2e Kernel for LuaTeX-ja]
\RequirePackage{etoolbox}
%%% expl3
@@ -235,11 +235,16 @@
\hskip\@tempskipa\color@endgroup\egroup}
\pretocmd{\footnote}{\inhibitglue}{}{}
\pretocmd{\footnotemark}{\inhibitglue}{}{}
-\patchcmd{\@footnotemark}{\@makefnmark}{%
- \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark%
- \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi%
-}{}{}
-\let\@parboxto\@empty
+\def\@ltj@process@makefnmark#1{%
+ \unless\ifnum\ltjgetparameter{direction}=3 #1%
+ \else\hbox to\z@{\hskip-.25\zw\raise.9\zh#1\hss}\fi%
+}%
+\ifdefined\@kernel@process@makefnmark %% 2022-06-01 latex-lab?
+ \let\ltj@orig@kernel@process@makefnmark=\@kernel@process@makefnmark
+ \def\@kernel@process@makefnmark#1{\ltj@orig@kernel@process@makefnmark{\@ltj@process@makefnmark#1}}
+\else
+ \patchcmd{\@footnotemark}{\@makefnmark}{\@ltj@process@makefnmark\@makefnmark}{}{}
+\fi
\long\def\@iiiparbox#1#2[#3]#4#5{%
\leavevmode
\@pboxswfalse
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
index 173b1ed94bb..c0377159535 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty
@@ -1,10 +1,11 @@
%
-% lltjp-listings.sty 2020-03-23
+% lltjp-listings.sty 2022-05-22
%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{etoolbox,listings,luatexbase-cctb}
+\newcount\ltj@lst@japanese@min \ltj@lst@japanese@min=128
%%%%%%%%%%%%%%%% Japanese support
%% whether letter-space in a fixed mode box is doubled or not
\newif\if@ltj@lst@double
@@ -197,9 +198,6 @@
\lsthk@PreSet\lstset{flexiblecolumns,#1}%
\lsthk@TextStyle
\@ifnextchar\bgroup \ltj@lst@InlineG \ltj@lstinline@}
-\def\ltj@lstinline@#1{%
- \edef\ltj@lst@temp{\the\catcode`#1}\lst@Init\relax\catcode`#1\ltj@lst@temp
- \lst@InlineJ#1}
\def\ltj@lst@InlineG{%
\lst@Init\relax\edef\ltj@lst@temp{\the\catcode`\}}\catcode`\}=2 \catcode`\ =12\relax
\let\lst@arg\@empty\afterassignment\ltj@lst@InlineG@@\@temptokena}
@@ -207,9 +205,16 @@
\catcode`\}=\ltj@lst@temp%
\expandafter\expandafter\expandafter\lst@InsideConvert%
\expandafter{\the\@temptokena}\lst@arg\lst@DeInit\egroup}
-
-%%%%%%%%%%%%%%%% \lstMakeShortInline
-\patchcmd\lstMakeShortInline@{\lst@shortinlinedef#1}{\lst@shortinlinedef~}{}{}
+\def\ltj@lstinline@#1{%
+ \edef\ltj@lst@temp{\the\catcode`#1}
+ \lst@Init\relax\catcode`#1\ltj@lst@temp
+ \ifnum\ltj@lst@temp=\active
+ \begingroup\lccode`\~=`#1\relax
+ \lowercase{\xdef\lst@next{\noexpand\lst@InlineJ\noexpand~}}\endgroup%
+ \else
+ \edef\lst@next{\noexpand\lst@InlineJ\scantextokens{#1}}%
+ \fi\lst@next
+}
% We redefine \lst@BeginDropInput, since now we have
% two additional `process macros'.
@@ -239,7 +244,7 @@
for i = 1, utf.len(buf) do
local c = utf.sub(buf, i, i)
local cu = utf.byte(c)
- if cu >= 0x80 and tex.getcatcode(cu) \string~= 13 then
+ if cu >= \the\ltj@lst@japanese@min\space and tex.getcatcode(cu) \string~= 13 then
ret = ret .. utfchar(getcount('ltjlineendcomment'))
end
ret = ret .. c
@@ -283,7 +288,7 @@
\gdef\ltj@lst@MakeActive@#1{\let\lst@next\relax%
\ifx#1\relax
\else\let\lst@next\ltj@lst@MakeActive@
- \ifnum`#1>127
+ \ifnum`#1>\numexpr\ltj@lst@japanese@min-1
\lccode`\^^A=`#1
\lowercase{\lst@lAddTo\lst@temp{$^^A}}%$
\else