From: Hironori Kitagawa Date: Thu, 23 Jan 2020 06:16:03 +0000 (+0900) Subject: typo X-Git-Tag: 20200127.0~8 X-Git-Url: http://git.osdn.net/view?p=luatex-ja%2Fluatexja.git;a=commitdiff_plain;h=00279d67904e93b8a93e5e855e44b23a75e0561c typo --- diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx index 63d08e3..d12ea01 100644 --- a/doc/luatexja.dtx +++ b/doc/luatexja.dtx @@ -653,27 +653,10 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. \Pkg{everysel} (if you want to use \LuaTeX-ja with \LaTeXe) \item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{filehook}, \Pkg{atbegshi} \item \href{https://github.com/wspr/fontspec/}{\Pkg{fontspec}} v2.7c (or later) -%\item IPAex fonts (\url{http://ipafont.ipa.go.jp/}) -%\item IPAexフォント(\url{http://ipafont.ipa.go.jp/}) +%\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/}) +%\item \emph{IPAexフォント(\url{http://ipafont.ipa.go.jp/})} \end{itemize} -%<*en> -Note that color specification in font~definitions, such as -\begin{lstlisting} -\font\test=file:lmromandunh10-regular.otf:color=FF0000BB % \font primitive -\addfontfeatures{Color=00FF00} % fontspec -\end{lstlisting} -are not compatible with \LuaTeX-ja in plain \LuaTeX\ and \LaTeX~2019-10-01~(or prior). -So we recommend to use \LaTeX~2020-02-02. -% -%<*ja> -なお,フォント定義の際の色指定,例えば -\begin{lstlisting} -\font\test=file:lmromandunh10-regular.otf:color=FF0000BB % \font primitive -\addfontfeatures{Color=00FF00} % fontspec -\end{lstlisting} -は,plain \LuaTeX や\LaTeX~2019-10-01以前において\LuaTeX-jaとは\emph{共存しない}. -そのため,\LaTeX~2020-02-02以降を用いることを勧める. -% + %<*en> Now \LuaTeX-ja is available from @@ -1441,7 +1424,7 @@ this chapter. For the method, please see Subsection~\ref{ssec:math}. と考えており,したがってこの節では数式モード中の和文フォントを変更する方法については 記述しない.この方法については\ref{ssec:math}節を参照のこと. -{\bfseries +{\gtfamily\bfseries 既に記述した通り,\texttt{disablejfam}オプションを指定して\LuaTeX-jaを読み込んだ場合は, \verb+$素$+ のように直接和文文字を数式モード中に記述することはできなくなる. \cs{mbox},あるいは\Pkg{amsmath}パッケージの提供する\cs{text}命令などを使うことになる. @@ -5014,17 +4997,6 @@ a \emph{horizontal} Japanese font. \end{tabular} \end{table} -%<*en> -Note that any OpenType features are not applied to Japanese characters in math mode. -Other features, such as \texttt{color}~and~\texttt{embolden} may be applied to these -characters, but one should not expect this. -% -%<*ja> -なお,数式中に直に記述した和文文字に対してはOpenType機能は適用されない. -\texttt{color}や\texttt{embolden}など他の「機能」は適用される可能性があるが, -ユーザは期待すべきではない. -% - %\subsection{Callbacks} %\subsection{コールバック} @@ -8654,7 +8626,7 @@ This \cs{jH} is the same \cs{dimen} register as \cs{jQ}. 等しい.この \cs{jH} は \cs{jQ} と同じ寸法レジスタを指す. % -\dim{ltj@zw} +\dim{ltj@dimen@zw} %<*en> A temporal register for the ``full-width'' of current Japanese font. The command \cs{zw} sets this register to the correct value, and @@ -8666,7 +8638,7 @@ The command \cs{zw} sets this register to the correct value, and 「このレジスタ自体を返す」. % -\dim{ltj@zh} +\dim{ltj@dimen@zh} %<*en> A temporal register for the ``full-height'' (usually the sum of height of imaginary body and its depth) of current Japanese font. The command \cs{zh} sets this register to the correct value, and diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty index a6bc90b..d870df0 100644 --- a/src/luatexja-core.sty +++ b/src/luatexja-core.sty @@ -124,10 +124,10 @@ \def\ltj@loaded{hoge} -\newdimen\ltj@zw -\newdimen\ltj@zh -\newdimen\jQ \jQ=0.25mm -\let\jH=\jQ +\newdimen\ltj@dimen@zw +\newdimen\ltj@dimen@zh +\newdimen\ltj@dimen@jQ \ltj@dimen@jQ=0.25mm +\let\jQ=\ltj@dimen@jQ \let\jH=\jQ %%%%%%%% error message \def\ltj@defnum{0} @@ -229,11 +229,11 @@ \newluafunction\ltj@zh@inner \directlua{ local t, setdimen, ltjf = lua.get_functions_table(), tex.setdimen, luatexja.jfont - t[\the\ltj@zw@inner] = function() setdimen('ltj@zw', ltjf.get_zw()) end - t[\the\ltj@zh@inner] = function() setdimen('ltj@zh', ltjf.get_zh()) end + t[\the\ltj@zw@inner] = function() setdimen('ltj@dimen@zw', ltjf.get_zw()) end + t[\the\ltj@zh@inner] = function() setdimen('ltj@dimen@zh', ltjf.get_zh()) end } -\protected\def\ltj@zw{\luafunction\ltj@zw@inner\ltj@zw} -\protected\def\ltj@zh{\luafunction\ltj@zh@inner\ltj@zh} +\protected\def\ltj@zw{\luafunction\ltj@zw@inner\ltj@dimen@zw} +\protected\def\ltj@zh{\luafunction\ltj@zh@inner\ltj@dimen@zh} \let\zw=\ltj@zw \let\zh=\ltj@zh