From 0c95c4de261d864abea50e6bf8da4da13a9b1c7c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 May 2020 22:34:22 +0000 Subject: luatexja (18may20) git-svn-id: svn://tug.org/texlive/trunk@55192 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +- .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 685486 -> 689335 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 1101330 -> 1109921 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 94 ++++++++++++++------- 4 files changed, 69 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/doc/luatex') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 6916b1a7151..b87dcbdd980 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 20200412.0 +The LuaTeX-ja Package 20200517.0 -------------------------------- Copyright (c) 2011--2020 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -45,9 +45,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20200412.0 in the Git repository by + or tagged as 20200517.0 in the Git repository by + ;a=snapshot;h=refs/tags/20200517.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -95,4 +95,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Sun Apr 12 18:04:02 2020 +0900 +Last commit date: Sun May 17 10:43:32 2020 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 5d9d6fc11aa..4cb0c4d8d36 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index c263107d773..f336e82bfdc 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index d2ec828f7e3..09df86b3611 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -1,5 +1,6 @@ %<*!showexpl> %#! lualatex -shell-escape +%% KozMinPr6N-Regular.otf is needed to typeset this document. %%%%% section ==> 章 %%%%% subsection => 節 @@ -33,6 +34,7 @@ \usepackage{unicode-math} \setmonojfont{HaranoAjiGothic-Regular.otf} \setmathfont[Scale=MatchLowercase]{XITSMath} +\newjfontface\KOZM{KozMinPr6N-Regular.otf} \setLaTeXa{\scshape a} %<*ja> @@ -151,6 +153,7 @@ \theoremstyle{definition} %\newtheorem{defn}{Definition} %\newtheorem{defn}{定義} +\DeclareMathOperator\nint{nint} %%%%%%%% logo \usepackage{metalogo} @@ -1966,7 +1969,7 @@ these eight ranges belongs to the character range~217. \centering\footnotesize \def\ch#1{% {\fboxsep0pt\fcolorbox{cyan}{white}% - {\normalsize\char"20#1}}\ (\texttt{U+20#1})} %" + {\normalsize\KOZM\UTF{20#1}}}\ (\texttt{U+20#1})} %" % 13: JIS X0213, AJ, Adobe-Japan-1 only \begin{tabular}{ll>{\color{white}}lll>{\color{white}}l} \ch{02}&{En space}&AJ& @@ -3465,7 +3468,7 @@ subsection. At the calling of \cs{jfont}, you must specify which JFM will be used for this font by the following keys: % %<*ja> -JFMは文字と和文組版で自動的に挿入される +JFMは文字の寸法情報と和文組版で自動的に挿入される グルー/カーンの寸法情報を持っている.JFMの構造は次の節で述べる. \cs{jfont} 命令の呼び出しの際には,どのJFMを用いるのかを以下のキーで 指定する必要がある: @@ -3540,7 +3543,7 @@ The following horizontal JFMs are shipped with \LuaTeX-ja: %<*en> \item[\texttt{jfm-ujis.lua}] A standard horizontal JFM in \LuaTeX-ja. This JFM is based on \verb+upnmlminr-h.tfm+, a metric for UTF/OTF package that - is used in \upTeX. When you use the \Pkg{luatexja-otf} package, you should use this JFM. + is used in \upTeX. When you are going to use the \Pkg{luatexja-otf} package, you should use this JFM. % %<*ja> \item[\texttt{jfm-ujis.lua}] \LuaTeX-jaの標準JFMである.このJFMは\upTeX で @@ -3598,6 +3601,20 @@ The difference among these three~JFMs is shown in \autoref{tab-difjfm}. \label{fig:jfmvar} \end{figure} +%<*ja> +また,プロポーショナル組用に\texttt{jfm-prop.lua}と\texttt{jfm-propw.lua}も用意されている. +どちらのJFMも文字幅の情報と自動挿入されるグルー・カーンの情報は持たない(つまりグリフの文字幅をそのまま採用する). +\texttt{jfm-prop.lua}と\texttt{jfm-propw.lua}の差は,前者が +文字の高さ・深さ情報も持たないのに対し,後者は持っている点である +\footnote{プロポーショナル組の状況でルビをつけたい,などという状況では\texttt{jfm-propw.lua}が有用かもしれない.}. +% +%<*en> +Furthermore, \LuaTeX-ja also ship two JFMs, namely \texttt{jfm-prop.lua}~and~\texttt{jfm-propw.lua}, + for ``proportional typesetting''. +Both JFMs don't have any character width information, nor glues/kerns information. +\texttt{jfm-prop.lua} also also not have character height and depth information, while \texttt{jfm-propw.lua} has them. +% + %<*en> \item[jfmvar=] Sometimes there is a need that \ldots. @@ -3673,6 +3690,7 @@ NFSS2用の命令(\ref{ssec:chgfnt}節,\ref{ssec:nfsspat}節)における % %<*ja> +\newpage \paragraph{\texttt{extend}と\texttt{slant}} OpenType機能と見かけ上同じような形式で指定できるものに, \begin{description} @@ -3693,7 +3711,7 @@ The following setting can be specified as OpenType font features: \item[\texttt{slant=}] slant the font. \end{cslist} Note that \LuaTeX-ja doesn't adjust JFMs by these \texttt{extend} and \texttt{slant} -settings; you have to write new JFMs on purpose. +settings; one have to write new JFMs on purpose. For example, the following example uses the standard JFM \texttt{jfm-ujis.lua}, hence letter-spacing and the width of italic correction are not correct: % @@ -3704,30 +3722,21 @@ letter-spacing and the width of italic correction are not correct: \end{LTXexample} %<*ja> -\paragraph{\texttt{ltjksp} 指定} +\paragraph{\texttt{ltjksp}指定} \label{pg:ltjksp} \LuaTeX-ja標準では, -JFM中における \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\ +JFM中における\texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\ \texttt{kanjiskip\_shrink}キー(\pageref{pg:ksp_nat}ページ)の使用によって, 「JFM由来のグルーの他に,\Param{kanjiskip}の自然長/伸び量/縮み量の一部が 同じ場所に挿入される」という状況が起こりうる. この機能を無効化し,バージョン20150922.0以前と同じような組版を得るためには -他のOpenType機能と同じように\ \texttt{-ltjksp}\ 指定を行えば良い. -\begin{LTXexample}[width=16\zw] -\leavevmode -\ltjsetparameter{kanjiskip=0pt plus 3\zw} -\vrule\hbox to 15\zw{あ「い」う,えお}\vrule\\ -\jfont\G=HaranoAjiMincho-Regular% - :jfm=ujis;-ltjksp at \zw -\G\leavevmode% -\vrule\hbox to 15\zw{あ「い」う,えお}\vrule -\end{LTXexample} +他のOpenType機能と同じように\texttt{-ltjksp}指定を行えば良い(\autoref{fig:ltjksp}参照). なお, \begin{lstlisting} \jfont\G=HaranoAjiMincho-Regular:jfm=ujis;-ltjksp;+ltjksp at \zw \end{lstlisting} -のように \texttt{+ltjksp} 指定を行った場合は,\texttt{kanjiskip\_natural} など -3キーは再び有効化される.\texttt{-ltjksp}, \texttt{+ltjksp} を複数回指定した場合は, +のように\texttt{+ltjksp}指定を行った場合は,\texttt{kanjiskip\_natural}など +3キーは再び有効化される.\texttt{-ltjksp}, \texttt{+ltjksp}を複数回指定した場合は, 最後に指定したものが有効となる. % %<*en> @@ -3737,8 +3746,10 @@ JFM中における \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\ \texttt{kanjiskip\_shrink} keys (Page~\pageref{pg:ksp_nat}) makes tha \LuaTeX-ja inserts not only a glue which is specified by a JFM, and also the natural width/stretch part/shrink part of \Param{kanjiskip}. - -This functionality is disabled by \texttt{-ltjksp} specification. +This functionality is disabled by \texttt{-ltjksp} specification, +as shown in~\autoref{fig:ltjksp}. +% +\begin{figure} \begin{LTXexample}[width=16\zw] \leavevmode \ltjsetparameter{kanjiskip=0pt plus 3\zw} @@ -3748,7 +3759,9 @@ This functionality is disabled by \texttt{-ltjksp} specification. \G\leavevmode% \vrule\hbox to 15\zw{あ「い」う,えお}\vrule \end{LTXexample} -% +\caption{\texttt{ltjksp}} +\label{fig:ltjksp} +\end{figure} @@ -3812,7 +3825,7 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont \begin{itemize} \item OpenType Feature~\texttt{vrt2}% \footnote{If the font does not define \texttt{vrt2} feature, - use \texttt{vert} instead.} is automatically activated, + \texttt{vert} is used instead.} is automatically activated, unless \texttt{vert}~and//or~\texttt{vrt2} are explicitly activated or deactivated (as the second line in the example below). \begin{lstlisting} @@ -3857,6 +3870,8 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont By default, it substitutes ideographic comma/period for fullwidth comma/period, and double prime quotation marks for double quotation marks (See~\autoref{fig:jpotf}). + One can customize substitutions by lua~function \verb+luatexja.jfont.register_vert_replace+\ % + (see Japanese version of this manual). \end{itemize} % %<*ja> @@ -4727,6 +4742,26 @@ Hence we have the following result: (optional, version~2 or~later) % + \item[round\_threshold=] +%<*ja> +(任意,バージョン3以降,文字クラス0のみ) + +「実際のグリフの幅に合わせて文字幅を整数倍する」際のしきい値を指定する. +より正確に述べると,次のようになる.このフィールドに正の数$r$が指定されていたとし, +文字クラス0で指定されている文字幅が$w$,文字クラス0に属する文字のグリフの幅が$w'$であったとする. +$n=\nint(w/w')$とした +\footnote{ここで,$\nint(a)=\lfloor a+0.5\rfloor$は$a$に「もっとも近い整数」を表す.} +とき,もし$w'>w$かつ$|w/w'-n|\char` +%<*en> +(optional, version~3 or~later, only available in character class~0) +% + + \end{cslist} %<*ja> @@ -4817,7 +4852,7 @@ as follows: %\paragraph{仮想的な文字} %\paragraph{Imaginary characters} %<*en> -As described before, you can specify several ``imaginary characters'' in +As described before, one can specify several ``imaginary characters'' in \texttt{chars} field. The most of these characters are regarded as the characters of class 0 in \pTeX. As a result, \LuaTeX-ja can control typesetting finer than \pTeX. @@ -4967,7 +5002,7 @@ an external package is needed to support this in plain \TeX\ and \autoref{tab-math} shows counterparts to \TeX's primitives for math font families. There is no relation between the value of \cs{fam} and that of \cs{jfam}; with appropriate settings, -you can set both \cs{fam} and \cs{jfam} to the same value. +one can set both \cs{fam} and \cs{jfam} to the same value. Here in the argument of \Param{jatextfont} etc.\ is a control sequence which is defined by \cs{jfont}, i.e., a \emph{horizontal} Japanese font. @@ -5018,7 +5053,7 @@ be accessed via \verb+luatexbase.add_to_callback+ function and so on, as other c %\item[\texttt{luatexja.load\_jfm} callback] %\item[\texttt{luatexja.load\_jfm}コールバック] %<*en> -With this callback you can overwrite JFMs. +With this callback, one can overwrite JFMs. This callback is called when a new JFM is loaded. % %<*ja> @@ -8343,7 +8378,7 @@ Std/StdNフォントであり,その他はAdobe-Japan1-5対応である. \midrule %\textit{rounded gothic} %\textgt{丸ゴシック} -&&\AD{Sans}{Heavy}\\ +&&\AD{Sans}{Medium}\\ \bottomrule \end{tabular} \end{center} @@ -8375,7 +8410,7 @@ Std/StdNフォントであり,その他はAdobe-Japan1-5対応である. \midrule %\textit{rounded gothic} %\textgt{丸ゴシック} -&&\AD{Sans}{Black}\\ +&&\AD{Sans}{Medium}\\ \bottomrule \end{tabular} \end{center} @@ -8411,7 +8446,7 @@ There is not rounded gothic family in Harano Aji Fonts. \midrule %\textit{rounded gothic} %\textgt{丸ゴシック} -&&HaranoAjiGothic-Heavy.otf\\ +&&HaranoAjiGothic-Medium.otf\\ \bottomrule \end{tabular} \end{center} @@ -11366,10 +11401,11 @@ direction~whatsit内部のノードリストに,\textit{dir\_box}として格 縦組時には,「\hbox to \zw{、}」(\texttt{U+3001})から「\ltjjachar"FE11」(\texttt{U+FE11})%" のように縦組用字形への置き換えに関係する処理は,以下のようになっている. + \begin{table}[t] \def\D#1#2#3#4{% {\fboxsep0pt\fcolorbox{cyan}{white}% - {\large\char"#1#2#3#4}}\ (\texttt{U+#1#2#3#4})%" + {\large\KOZM\ltjjachar"#1#2#3#4}}\ (\texttt{U+#1#2#3#4})%" } \caption{\LuaTeX-ja標準で行われる縦組形への置換} \label{tab:vert_replace}\small\centering -- cgit v1.2.3