%<*en>
Some fonts have information for inter-glyph spacing.
\LuaTeX-ja 20140324.0 or later treats kerning spaces like an italic correction;
-any glue and/or kern from the JFM and a kerning space can coexist.
+any glue and/or kern from the JFM and a kerning space from the font can coexist.
See \autoref{fig:kern-jfm} for detail.
-Note that in \cs{setmainjfont} etc.\ which are provided by \Pkg{luatexja-fontspec}
-package, kerning option is set \emph{off} (\texttt{Kerning=Off}) by default,
-because of the compatibility with previous versions of \LuaTeX-ja.
+At version~20220411.0, defaults Japanese fonts which are defined
+at the loading of \LuaTeX-ja, \Pkg{ltjclasses},~and~\Pkg{ltjsclasses}
+do not insert font-derived kerning spaces by default.
+This is because standard JFMs do not expect font-derived kerning spaces
+between Japanese characters.
+
+Also note that in \cs{setmainjfont} etc.\ which are provided by \Pkg{luatexja-fontspec}
+package, kerning option is set \emph{off} (\texttt{Kerning=Off}) by default.
+This means the following two lines have the same meaning:
+\begin{lstlisting}
+\setmainjfont{HaranoAjiMincho-Regular}
+\setmainjfont[Kerning=Off]{HaranoAjiMincho-Regular}
+\end{lstlisting}
+
%</en>
%<*ja>
いくつかのフォントはグリフ間のスペースについての情報を持っている．
このカーニング情報は以前の\LuaTeX-ja とはあまり相性が良くなかったが，
バージョン20140324.0以降ではカーニングによる空白はイタリック補正と同様に扱うことになっている．
-ã\81¤ã\81¾ã\82\8aï¼\8cã\82«ã\83¼ã\83\8bã\83³ã\82°ç\94±æ\9d¥ã\81®ç©ºç\99½ã\81¨JFMç\94±æ\9d¥ã\81®ã\82°ã\83«ã\83¼ã\83»ã\82«ã\83¼ã\83³ã\81¯å\90\8cæ\99\82ã\81«å\85¥ã\82\8aã\81\86る．
+ã\81¤ã\81¾ã\82\8aï¼\8cã\82«ã\83¼ã\83\8bã\83³ã\82°ç\94±æ\9d¥ã\81®ç©ºç\99½ã\81¨JFMç\94±æ\9d¥ã\81®ã\82°ã\83«ã\83¼ã\83»ã\82«ã\83¼ã\83³ã\81¯å\90\8cæ\99\82ã\81«å\85¥ã\82\8bã\81\93ã\81¨ã\81\8cã\81\82る．
\autoref{fig:kern-jfm}を参照．
\begin{itemize}
- \item \emph{\cs{jfont} や，
-NFSS2用の命令（\ref{ssec:chgfnt}節，\ref{ssec:nfsspat}節）における指定では
-カーニング情報は標準で使用する}ことになっているようである．
-言い換えれば，カーニング情報を使用しない設定にするには，面倒でも
+ \item \emph{\cs{jfont} や，NFSS2用の命令（\ref{ssec:chgfnt}節，\ref{ssec:nfsspat}節）では，
+カーニング情報を使用する設定（OpenType機能\texttt{kern}）はとくに指定しなくても有効になる}．
+すなわち，以下の2行目と3行目，5行目と6行目はそれぞれ等価である：
+\begin{lstlisting}[numbers=left]
+\jfont\hoge=hogem:jfm=ujis;-kern at 3.5mm % ==> kern 無効（明示）
+\jfont\hoge=hogem:jfm=ujis at 3.5mm % ==> kern 有効（暗黙）
+\jfont\hoge=hogem:jfm=ujis;+kern at 3.5mm % ==> kern 有効（明示）
+\DeclareFontShape{JY3}{fuga}{m}{n}{<-> s*hogem:jfm=-ujis}{} % ==> kern 無効（明示）
+\DeclareFontShape{JY3}{fuga}{m}{n}{<-> s*hogem:jfm=ujis}{} % ==> kern 有効（暗黙）
+\DeclareFontShape{JY3}{fuga}{m}{n}{<-> s*hogem:jfm=ujis+kern}{}% ==> kern 有効（明示）
+\end{lstlisting}
+
+\item バージョン20220411.0以降では，\LuaTeX-ja読み込み時や，\Pkg{ltjclasses}, \Pkg{ltjsclasses}において
+ 和文フォントを
\begin{lstlisting}
-\jfont\hoge=HaranoAjiMincho-Regular:jfm=ujis;-kern at 3.5mm
-\DeclareFontShape{JY3}{fuga}{m}{n} {<-> s*HaranoAjiMincho-Regular:jfm=ujis;-kern}{}
+\jfont\tenmin=\ltj@stdmcfont:-kern;jfm=\ltj@stdyokojfm\space at 9.62216pt
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
+ \ltj@stdmcfont:-kern;jfm=\ltj@stdyokojfm}{}
\end{lstlisting}
-のように，\texttt{-kern} という指定を自分で追加しなければいけない．
+ とOpenType機能\texttt{kern}を明示的に無効化した状態で定義する．
+ これは標準JFM(\texttt{jfm-ujis.lua}, \texttt{jfm-ujisv.lua})が
+ フォント由来のカーニングが入ることを期待していないためである．
+
\item
一方，\emph{\Pkg{luatexja-fontspec} の提供する \cs{setmainjfont}\
-などの命令の標準設定ではカーニング情報は使用しない}（\texttt{Kerning=Off}）
-ことになっている．これは以前のバージョンの\LuaTeX-jaとの互換性のためである．
+などの命令の標準設定ではカーニング情報は使用しない}(\texttt{Kerning=Off})．
+すなわち，次の2行は等価である：
+\begin{lstlisting}
+\setmainjfont{HaranoAjiMincho-Regular}
+\setmainjfont[Kerning=Off]{HaranoAjiMincho-Regular}
+\end{lstlisting}
+これは前項目の理由の他に，以前のバージョンの\LuaTeX-jaとの互換性のためもある．
\end{itemize}
%</ja>
\texttt{kanjiskip\_shrink}キー（\pageref{pg:ksp_nat}ページ）の使用によって，
「JFM由来のグルーの他に，\Param{kanjiskip}の自然長/伸び量/縮み量の一部が
同じ場所に挿入される」という状況が起こりうる．
-この機能を無効化し，バージョン20150922.0以前と同じような組版を得るためには
+この機能を無効化し，バージョン20150922.0以前と同じような組版を得るためには，
他のOpenType機能と同じように\texttt{-ltjksp}指定を行えば良い（\autoref{fig:ltjksp}参照）．
なお，
\begin{lstlisting}
%</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.
\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>
新たに<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>は，プリセット名や以下のキー達のコンマ区切りリストを指定する：
\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})
\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
\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>
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,
}
local semicolon = P';'
local comma = P','
local equals = P'='
- local jf_field_char = 1 - S'/{};,='
+ local jf_field_char = 1 - S'/{};,= \t\v'
local jf_field = C(jf_field_char^1)
- local jf_assignment = jf_field * equals * jf_field
- local jf_switch = P'-' * jf_field * Cc(false) + P'+'^-1 * jf_field * Cc(true)
- local jf_feature_expr = Cg(jf_assignment + jf_switch) * comma^0
- local jf_feature_list = P'{' * jf_feature_expr^0 * P'}' + jf_feature_expr^0
+ local jf_assignment = jf_field * ws * equals * ws * jf_field
+ local jf_switch = P'-' * jf_field * Cc(false) + P'+'^-1 * jf_field * Cc(true)
+ local jf_feature_expr = Cg(jf_assignment + jf_switch) * ws * comma^0 * ws
+ local jf_feature_list = ws * ( P'{' * ws * jf_feature_expr^0 * P'}' + jf_feature_expr^0 )
local jf_list = C((1-slash)^1) * (slash * Cf(Ct'' * jf_feature_list, rawset))^-1
local jf_value = (1 - semicolon)^1
local function rem(name,value)
\fi
\let\ltj@@cfgread\relax\advance\count16\m@ne\relax
-\jfont\tenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 9.62216pt
-\jfont\sevenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 6.73551pt
-\jfont\fivemin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 4.81108pt
-\jfont\tengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 9.62216pt
-\jfont\sevengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 6.73551pt
-\jfont\fivegt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 4.81108pt
+\jfont\tenmin=\ltj@stdmcfont:-kern;jfm=\ltj@stdyokojfm\space at 9.62216pt
+\jfont\sevenmin=\ltj@stdmcfont:-kern;jfm=\ltj@stdyokojfm\space at 6.73551pt
+\jfont\fivemin=\ltj@stdmcfont:-kern;jfm=\ltj@stdyokojfm\space at 4.81108pt
+\jfont\tengt=\ltj@stdgtfont:-kern;jfm=\ltj@stdyokojfm\space at 9.62216pt
+\jfont\sevengt=\ltj@stdgtfont:-kern;jfm=\ltj@stdyokojfm\space at 6.73551pt
+\jfont\fivegt=\ltj@stdgtfont:-kern;jfm=\ltj@stdyokojfm\space at 4.81108pt
-\tfont\tentmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 9.62216pt
-\tfont\seventmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 6.73551pt
-\tfont\fivetmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 4.81108pt
-\tfont\tentgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 9.62216pt
-\tfont\seventgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 6.73551pt
-\tfont\fivetgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 4.81108pt
+\tfont\tentmin=\ltj@stdmcfont:-kern;jfm=\ltj@stdtatejfm\space at 9.62216pt
+\tfont\seventmin=\ltj@stdmcfont:-kern;jfm=\ltj@stdtatejfm\space at 6.73551pt
+\tfont\fivetmin=\ltj@stdmcfont:-kern;jfm=\ltj@stdtatejfm\space at 4.81108pt
+\tfont\tentgt=\ltj@stdgtfont:-kern;jfm=\ltj@stdtatejfm\space at 9.62216pt
+\tfont\seventgt=\ltj@stdgtfont:-kern;jfm=\ltj@stdtatejfm\space at 6.73551pt
+\tfont\fivetgt=\ltj@stdgtfont:-kern;jfm=\ltj@stdtatejfm\space at 4.81108pt
\def\mc{\tenmin\tentmin}
\def\gt{\tengt\tentgt}
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
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
'ltj.jclasses_load_jfm', 1)}
{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:-kern;jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:-kern;jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
\fi
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
'ltj.jclasses_load_jfm', 1)}
{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:-kern;jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:-kern;jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
\fi
% hyperref compability
% (sync with ltsect.dtx 2020/07/27 v1.1e)}
% \changes{v1.8f-ltj-21}{2021-12-22}{余計なコメントの削除．}
+% \changes{v1.8f-ltj-22}{2022-04-11}{kern featureが有効になっていたのを修正．}
% \fi
%
% \iffalse
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
%
% [2020-05-30 LTJ] 「フォントメトリックの変更」の節の内容の処理をここで行います。
%
+% [2022-04-11 LTJ] kern featureを無効にするのを忘れていました．
+%
% \begin{macrocode}
\ifptexmin
\directlua{luatexbase.add_to_callback('luatexja.load_jfm',
'ltj.jclasses_load_jfm', 1)}
{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:-kern;jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:-kern;jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
\fi
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
'ltj.jclasses_load_jfm', 1)}
{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:-kern;jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:-kern;jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
\fi
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2020/12/23 ltjsclasses ]
+ [2022/04/11 ltjsclasses ]
\def\jsc@clsname{ltjsarticle}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=min}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=min}{}
\else
\ifptexjis
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=jis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=jis}{}
\fi
\fi
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2020/12/23 ltjsclasses ]
+ [2022/04/11 ltjsclasses ]
\def\jsc@clsname{ltjsbook}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=min}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=min}{}
\else
\ifptexjis
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=jis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=jis}{}
\fi
\fi
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2020/12/23 ltjsclasses ]
+ [2022/04/11 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass[disablejfam]{ltjsarticle}
% [2018-09-23 LTJ] |\Cjascale|の設定を前倒ししたことに伴い，実際の再定義は
% \texttt{mingoth}, \texttt{ptexjis}のときしか必要なくなりました。
%
+% [2022-04-11 LTJ] kern featureを無効にするのを忘れていました．
% \begin{macrocode}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=min}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=min}{}
\else
\ifptexjis
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=jis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=jis}{}
\fi
\fi
% \end{macrocode}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2020/12/23 ltjsclasses ]
+ [2022/04/11 ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=min}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=min}{}
\else
\ifptexjis
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=jis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=jis}{}
\fi
\fi
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2020/12/23 ltjsclasses ]
+ [2022/04/11 ltjsclasses ]
\def\jsc@clsname{ltjspf}
\def\Cjascale{0.903375}
\RequirePackage{luatexja}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=min}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=min}{}
\else
\ifptexjis
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=jis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=jis}{}
\fi
\fi
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2020/12/23 ltjsclasses ]
+ [2022/04/11 ltjsclasses ]
\def\jsc@clsname{ltjsreport}
\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=min}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=min}{}
\else
\ifptexjis
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:-kern;jfm=jis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:-kern;jfm=jis}{}
\fi
\fi
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
'ltj.jclasses_load_jfm', 1)}
{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:-kern;jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:-kern;jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
\fi
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
'ltj.jclasses_load_jfm', 1)}
{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:-kern;jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:-kern;jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
\fi
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
'ltj.jclasses_load_jfm', 1)}
{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:-kern;jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:-kern;jfm=min;jfmvar=goth}{}
\ltjglobalsetparameter{differentjfm=both}
\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
\fi
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2021-12-22 v1.8f-ltj-21
+ [2022-04-11 v1.8f-ltj-22
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
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)
\newif\ifltj@disablejfam
%%%% VERSION
-\def\LuaTeXjaversion{20220211.0}
+\def\LuaTeXjaversion{20220530.0}
%% Check if LaTeX is used.
\begingroup\expandafter\expandafter\expandafter\endgroup
\fi
\DeclareKanjiFamily{JY3}{mc}{}
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=\ltj@stdyokojfm}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
+ \ltj@stdmcfont:-kern;jfm=\ltj@stdyokojfm}{}
\DeclareKanjiFamily{JY3}{gt}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=\ltj@stdyokojfm}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
+ \ltj@stdgtfont:-kern;jfm=\ltj@stdyokojfm}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{b}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/m/n}{}
\DeclareKanjiFamily{JT3}{mc}{}
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=\ltj@stdtatejfm}{}
+\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
+ \ltj@stdmcfont:-kern;jfm=\ltj@stdtatejfm}{}
\DeclareKanjiFamily{JT3}{gt}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=\ltj@stdtatejfm}{}
+\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
+ \ltj@stdgtfont:-kern;jfm=\ltj@stdtatejfm}{}
\DeclareFontShape{JT3}{mc}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JT3}{mc}{b}{n}{<-> ssub*gt/m/n}{}
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-footmisc}[2021-03-25 Patch to footmisc for LuaTeX-ja]
-\RequirePackage{footmisc}
+\ProvidesPackage{lltjp-footmisc}[2022-02-19 Patch to footmisc for LuaTeX-ja]
+\@ifpackagelater{footmisc}{2022-02-10}{%% v6.0a or later
+ \patchcmd{\@makenormalcolbox}{\vskip -\@outputbox@depth\@textbottom}%
+ {\pltx@adjust@wd@outputbox\vskip -\@outputbox@depth\@textbottom}{}{}%
+ \let\ltj@next\endinput
+}{\let\ltj@next\relax}
+\ltj@next
+
+% old (v5.5)
\let \if@tempswa \ifFN@bottom
\ifFN@para \@tempswatrue \fi
\if@tempswa
%
-% 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
\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}
\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'.
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
\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
%#!lualatex
\documentclass{article}
-\usepackage{luatexja-fontspec,amsmath}
\usepackage{listings,color,showexpl,comment}
+\lstMakeShortInline÷
+\usepackage{luatexja-fontspec,amsmath}
\usepackage{luatexja-otf}\directlua{luatexja.otf.enable_ivs()}
\usepackage
[
\fi
}{}
\DeclareKanjiFamily{JY3}{koz}{}
-\DeclareFontShape{JY3}{koz}{m}{n}{<-> s * [1.2] HaranoAjiMincho-Regular:jfm=ujis}{}
+\DeclareFontShape{JY3}{koz}{m}{n}{<-> s * [1.2] KozMinPr6N-Regular:jfm=ujis}{}
\DeclareFontShape{JY3}{koz}{m}{sl}{<-> s * [1.2] psft:Ryumin-Light:jfm=ujis;slant=0.167}{}
\DeclareFontShape{JY3}{koz}{m}{it}{<-> ssub* koz/m/sl}{}
\def\mcdefault{koz}
foo \lstinline[basicstyle=\tt]!ba{}#shr! baz あ
-あ\lstinline[basicstyle=\tt]{bar s}hoge
+1あ\lstinline[basicstyle=\tt]{bar s}hoge
+
+2あ\lstinline[basicstyle=\tt]{bar..{a}hoge
-あ\lstinline[basicstyle=\tt]{bar..{a}hoge
+foo \lstinline[basicstyle=\tt\gtfamily]!exit 0; #shbar! baz あ
-foo \lstinline[basicstyle=\tt\gtfamily]!あexit 0; #shbar! baz あ
+foo \lstinline[basicstyle=\tt\gtfamily]!あreturn 0; #shbar! baz あ
-あ\lstinline[basicstyle=\tt]{いbexit #sh$ar}hoge
+3あ\lstinline[basicstyle=\tt]{fexit #sh$ar}hoge
+
+4あ\lstinline[basicstyle=\tt]{いbexit #sh$ar}hoge
\bigskip
\textbf{Ticket \#35484}
\colorbox{red}{\lstinline!あいexit 0;#shうえお!}
-\colorbox{red}{\lstinline{aiu#sheoxyz}}
-\colorbox{red}{\lstinline{あいexit 0;#shうえお}}
+\colorbox{red}{\lstinline{aGiu#sheoxyz}}
+\colorbox{red}{\lstinline{あGいexit 0;#shうえお}}
あおいうえお
\begin{lstlisting}[frame=single]
1234567890123457890
aiu# \textcolor{red}{e} #o#\textcolor{red}{ka}#ki
\end{lstlisting}
+\typeout{AAAA}
-
-\newpage
-\lstset{basewidth=0.75\zw,basicstyle=\ttfamily,doubleletterspace,backgroundcolor=}
-\noindent
-\def\A{\leavevmode\smash{\hbox to 0.75\zw{\kern-.0625mm\vrule height 0pt depth 200pt width 0.125mm\hss}}}%
-\textcolor{cyan}{\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A\A}%
-
-\begin{lstlisting}
-a.b.c.d.e.f.g.h.i.j.k.l.m.
-123（あいう@（ｶﾝｼﾞabc
-a.b.c.d.e.f.g.h.i.j.k.l.m.
-123あいう）@（ｶﾝｼﾞabc
-a.b.c.d.e.f.g.h.i.j.k.l.m.
-123あい：う@（ｶﾝｼﾞabc
-\end{lstlisting}
-
-\begin{lstlisting}[columns={[l]flexible}]
-a.b.c.d.e.f.g.h.i.j.k.l.m.
-123（あいう@（ｶﾝｼﾞabc
-a.b.c.d.e.f.g.h.i.j.k.l.m.
-123あいう）@（ｶﾝｼﾞabc
-a.b.c.d.e.f.g.h.i.j.k.l.m.
-123あい：う@（ｶﾝｼﾞabc
-\end{lstlisting}
+\bigskip
+\textbf{Ticket \#44426}\lstset{basicstyle=\itshape}
+Foo ÷fo#shbarあ{#}o÷ Foo
+\colorbox{green}{÷fo#shbarあ{#}o÷}
+
+\lstMakeShortInline あ
+÷いfo#shbarあ{#}}o÷
+あえbazあ
+あbaxあ
\end{document}
}\par
}
-\jfont\testP=KozMinPr6N-Regular:jfm=ujis/h,-p,l=g,z=true;jfm=testf/q,-d,l=f,z=h,e,hwid;trad at 9pt
+\jfont\testP="KozMinPr6N-Regular:jfm=ujis/h,-p,l=g,z=true;jfm=testf/ -so , lw = tr ,q,-d,-po, l=f,z=h,e, hwid;trad" at 9pt
\printjfmfeat\testP
\testP イ医学
OSDN Git Service
