update manuals

diff --git a/doc/luatexja-en.pdf b/doc/luatexja-en.pdf
index 9b4b7e1..4a80645 100644 (file)
Binary files a/doc/luatexja-en.pdf and b/doc/luatexja-en.pdf differ

diff --git a/doc/luatexja-ja.pdf b/doc/luatexja-ja.pdf
index 0ecc245..84997df 100644 (file)
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index bdd6f3a..05c59fc 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -3759,33 +3759,63 @@ See \autoref{tab-difjfm} for the difference among \texttt{jfm-ujis.lua}, \texttt
 %<*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>
 
@@ -3828,7 +3858,7 @@ JFM中における\texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
 \texttt{kanjiskip\_shrink}キー（\pageref{pg:ksp_nat}ページ）の使用によって，
 「JFM由来のグルーの他に，\Param{kanjiskip}の自然長/伸び量/縮み量の一部が
 同じ場所に挿入される」という状況が起こりうる．
-この機能を無効化し，バージョン20150922.0以前と同じような組版を得るためには
+この機能を無効化し，バージョン20150922.0以前と同じような組版を得るためには，
 他のOpenType機能と同じように\texttt{-ltjksp}指定を行えば良い（\autoref{fig:ltjksp}参照）．
 なお，
 \begin{lstlisting}

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index dbf9bf6..54e4a93 100644 (file)
--- a/src/ltj-plain.sty
+++ b/src/ltj-plain.sty
@@ -54,19 +54,19 @@
 \fi
 \let\ltj@@cfgread\relax\advance\count16\m@ne\relax
 
-\jfont\tenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm;-kern\space at 9.62216pt
-\jfont\sevenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm;-kern\space at 6.73551pt
-\jfont\fivemin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm;-kern\space at 4.81108pt
-\jfont\tengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm;-kern\space at 9.62216pt
-\jfont\sevengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm;-kern\space at 6.73551pt
-\jfont\fivegt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm;-kern\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;-kern\space at 9.62216pt
-\tfont\seventmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm;-kern\space at 6.73551pt
-\tfont\fivetmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm;-kern\space at 4.81108pt
-\tfont\tentgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm;-kern\space at 9.62216pt
-\tfont\seventgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm;-kern\space at 6.73551pt
-\tfont\fivetgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm;-kern\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}

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index bbee7e5..fe5479e 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -137,8 +137,8 @@
   '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;-kern}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth;-kern}{}
+\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

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index 9f26f8a..57a12a9 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -147,8 +147,8 @@
   '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;-kern}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth;-kern}{}
+\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

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 1b68232..e2d4dd9 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -655,8 +655,8 @@
   '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;-kern}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth;-kern}{}
+\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

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index 2e5fea9..4fcb494 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -145,8 +145,8 @@
   '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;-kern}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth;-kern}{}
+\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

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index f47b454..1f19c60 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -309,12 +309,12 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \fi
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
-  \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min;-kern}{}
-  \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min;-kern}{}
+  \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;-kern}{}
-    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis;-kern}{}
+    \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}{}

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index cac549b..bbe4025 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -317,12 +317,12 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \fi
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
-  \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min;-kern}{}
-  \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min;-kern}{}
+  \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;-kern}{}
-    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis;-kern}{}
+    \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}{}

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index bcb44fb..049f938 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -979,12 +979,12 @@
 %    \begin{macrocode}
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
-  \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min;-kern}{}
-  \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min;-kern}{}
+  \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;-kern}{}
-    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis;-kern}{}
+    \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}

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index ed2d571..09d9430 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -308,12 +308,12 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \fi
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
-  \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min;-kern}{}
-  \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min;-kern}{}
+  \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;-kern}{}
-    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis;-kern}{}
+    \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}{}

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index 4a5b613..eb4b41e 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -307,12 +307,12 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \fi
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
-  \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min;-kern}{}
-  \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min;-kern}{}
+  \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;-kern}{}
-    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis;-kern}{}
+    \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}{}

diff --git a/src/ltjsreport.cls b/src/ltjsreport.cls
index dc8a207..47e65c6 100644 (file)
--- a/src/ltjsreport.cls
+++ b/src/ltjsreport.cls
@@ -313,12 +313,12 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \fi
 \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
-  \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min;-kern}{}
-  \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min;-kern}{}
+  \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;-kern}{}
-    \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis;-kern}{}
+    \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}{}

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index a6454f6..dda265d 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -137,8 +137,8 @@
   '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;-kern}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth;-kern}{}
+\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

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 6e91e68..ab69121 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -147,8 +147,8 @@
   '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;-kern}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth;-kern}{}
+\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

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index aa9f317..7042c0a 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -145,8 +145,8 @@
   '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;-kern}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth;-kern}{}
+\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

diff --git a/src/luatexja.sty b/src/luatexja.sty
index f8c20af..adc6f22 100644 (file)
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -27,7 +27,7 @@
 \newif\ifltj@disablejfam
 
 %%%% VERSION
-\def\LuaTeXjaversion{20220311.0}
+\def\LuaTeXjaversion{20220411.0}
 
 %% Check if LaTeX is used.
 \begingroup\expandafter\expandafter\expandafter\endgroup

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 87e48c3..bb63ac6 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -46,10 +46,10 @@
 
 \DeclareKanjiFamily{JY3}{mc}{}
 \DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
-  \ltj@stdmcfont:jfm=\ltj@stdyokojfm;-kern}{}
+  \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;-kern}{}
+  \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}{}
@@ -57,10 +57,10 @@
 
 \DeclareKanjiFamily{JT3}{mc}{}
 \DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi]
-  \ltj@stdmcfont:jfm=\ltj@stdtatejfm;-kern}{}
+  \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;-kern}{}
+  \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}{}