X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Fluatexja.dtx;h=7c27d29b6805a2ea72c549414d757a5c678cd3a9;hb=55a3d0259d58f0ced648662986e92fc94c08f1f4;hp=15aaaac8c983e1fea31931af33320edea7b07e33;hpb=df161fdb098f5bb187412d7a7f9b13f3d3186624;p=luatex-ja%2Fluatexja.git
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 15aaaac..7c27d29 100644
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -72,7 +72,12 @@
\usepackage{luatexja-adjust}%\ltjdisableadjust
\advance\leftmargini-1\zw\advance\leftmarginii-1\zw
%
-
+%\long\def\fakefn#1#2{\par\noindent{\footnotesize\hbox to1.8em{\hss#1}#2\par}}
+%<*ja>
+\long\def\fakefn#1#2{%
+ \par{\footnotesize\advance\leftskip 3\zw\parindent1\zw\noindent
+ \llap{#1\hskip.3\zw}#2\par}}
+%
%%%%%%%% listings
%%%%%%%% IVS
@@ -202,10 +207,12 @@
width:\hfill\ #2\cr height:\hfill\ #3\cr depth:\hfill\ #4\cr
}}}}}\,}
+\makeatletter
\def\myghost{\ifmmode\else\ltjalchar"200C \fi}
-\protected\def\Param#1{\myghost\hyperlink{fld:#1}{\underline{\smash{\textsf{#1}}}}\myghost} % parameter name
+\def\Param#1{\texorpdfstring{\@Param{#1}}{#1}} % parameter name
+\protected\def\@Param#1{\myghost\hyperlink{fld:#1}{\underline{\smash{\textsf{#1}}}}\myghost}
\protected\def\DParam#1{\myghost\hypertarget{fld:#1}{\underline{\smash{\textsf{#1}}}}\myghost} % parameter name (definition)
-\protected\def\Pkg#1{\textsf{#1}} % packages/classes
+\def\Pkg#1{\texorpdfstring{\textsf{#1}}{#1}} % packages/classes
\ltjsetparameter{alxspmode={"200C,allow}}
\begin{document}
@@ -633,18 +640,18 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}.
%The following packages are needed for the \LuaTeX-ja\ package.
%\LuaTeX-jaããã±ã¼ã¸ã®åä½ã«ã¯æ¬¡ã®ããã±ã¼ã¸é¡ãå¿
è¦ã§ããï¼
\begin{itemize}
-\item \LuaTeX\ beta-0.85.0 (or later)
+\item \LuaTeX\ 1.0.0 (or later)
\item \Pkg{luaotfload} v2.6 (or later)
\item \Pkg{adobemapping} (Adobe cmap and pdfmapping files)
\item \Pkg{etoolbox}, \Pkg{everysel} (if you want to use \LuaTeX-ja with \LaTeXe)
\item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{filehook}, \Pkg{atbegshi}
-\item \Pkg{fontspec} v2.4 (or later)
+\item \Pkg{fontspec} v2.5c (or later)
%\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/})
%\item \emph{IPAexãã©ã³ã(\url{http://ipafont.ipa.go.jp/})}
\end{itemize}
-%In summary, \LuaTeX-ja version 20160404.0 (or~later) no longer supports \TeX~Live~2015.
+%In summary, \LuaTeX-ja version 20180825.0 (or~later) no longer supports \TeX~Live~2016.
%<*ja>
-è¦ç´ããã¨ï¼ãã¼ã¸ã§ã³20160404.0以éã®\LuaTeX-jaã¯\TeX~Live~2015以åã§ã¯åä½ããªã\footnote{%
+è¦ç´ããã¨ï¼ãã¼ã¸ã§ã³20180825.0以éã®\LuaTeX-jaã¯\TeX~Live~2016以åã§ã¯åä½ããªã\footnote{%
ãã£ã¨ãï¼èªåã§\LuaTeX ã®ãã¤ããªãSubversionãªãã¸ããªãããã«ããã¦ããã°è©±ã¯å¥ã§ããï¼
}ï¼
%
@@ -672,21 +679,6 @@ IPAex fonts are also available in these distributions.
W32\TeX ã«ããã¦ã¯IPAexãã©ã³ã㯠\texttt{luatexja.tar.xz} å
ã«ããï¼
%
-% %<*ja>
-% ä¾ãã°\TeX~Live~2015ãå©ç¨ãã¦ãããªãï¼\LuaTeX-jaã¯\TeX~Live manager (\texttt{tlmgr})ã
-% 使ã£ã¦ã¤ã³ã¹ãã¼ã«ãããã¨ãã§ããï¼
-% \begin{lstlisting}
-% $ tlmgr install luatexja
-% \end{lstlisting}
-% %
-% %<*en>
-% If you are using \TeX~Live~2015, you can install \LuaTeX-ja
-% from \TeX~Live manager (\texttt{tlmgr}):
-% \begin{lstlisting}
-% $ tlmgr install luatexja
-% \end{lstlisting}
-% %
-
%\paragraph{Manual installation}
%\paragraph{æåã¤ã³ã¹ãã¼ã«æ¹æ³}
@@ -1019,9 +1011,9 @@ By default, the following fonts are used for these two families.
\bottomrule
\end{tabular}
\end{center}
-Note that the bold series in both family are same as the medium series of gothic
- family. There is no italic nor slanted shape for
- these \texttt{mc}~and~\texttt{gt}.
+Note that the bold series (series \texttt{bx}~or~\texttt{b}) in both family
+ are same as the medium series of gothic family.
+ There is no italic nor slanted shape for these \texttt{mc}~and~\texttt{gt}.
%
%<*ja>
\item \pLaTeX ã¨åæ§ã«ï¼æ¨æºã§ã¯ãææä½ããã´ã·ãã¯ä½ãã®2種é¡ãç¨ããï¼
@@ -1047,6 +1039,11 @@ Note that the bold series in both family are same as the medium series of gothic
ã©ã¡ãã®ãã¡ããªã«ããã¦ãï¼å¤ªå(\cs{bfseries})ã®ãã©ã³ãã¯
ã´ã·ãã¯ä½ä¸å(\cs{gtfamily}\cs{mdseries})ã§ä½¿ããããã©ã³ãã¨åãã§ãããã¨ã«æ³¨æï¼
ã¾ãï¼ã©ã¡ãã®ãã¡ããªã§ãã¤ã¿ãªãã¯ä½ã»ã¹ã©ã³ãä½ã¯å®ç¾©ãããªãï¼
+
+ åæã®å¤ªåã表ãã·ãªã¼ãºåã¯ï¼ï¼å
ã
ã®Computer Modernã
+ 太åã«\texttt{bx}ãç¨ãã¦ãããã¨ããï¼ä¼çµ±çã«\texttt{bx}~(Bold Extended)ã使ããã¦ããï¼
+ ãããï¼å¤ªåã«ã·ãªã¼ãº\texttt{b}ã使ããã©ã³ããå¢ãã¦ããããï¼
+ ãã¼ã¸ã§ã³20180616.0以éã§ã¯åæã®å¤ªåã¨ãã¦\texttt{bx},~\texttt{b}ã®ä¸¡æ¹ãæ±ããããã«ããï¼
%
%\item Japanese characters in math mode are typeset by the font family \texttt{mc}.
@@ -1422,16 +1419,21 @@ TrueTypeã»OpenTypeãã©ã³ãã容æã«æ±ãããã®ããã±ã¼ã¸ã§ã
%
%<*en>
-In the \Pkg{luatexja-fontspec} package, the following seven~commands are defined as
-counterparts of original commands in the \Pkg{fontspec} package:
+In the \Pkg{luatexja-fontspec} package, several commands are defined as
+counterparts of original commands in the \Pkg{fontspec} package
+(see \autoref{tab:ltj_fntspc}):
%
%<*ja>
-\Pkg{luatexja-fontspec}ããã±ã¼ã¸ã§ã¯ï¼ä»¥ä¸ã®7ã¤ã®ã³ãã³ãã\Pkg{fontspec}
-ããã±ã¼ã¸ã®å
ã®ã³ãã³ãã«å¯¾å¿ãããã®ã¨ãã¦å®ç¾©ãã¦ããï¼
+\Pkg{luatexja-fontspec}ããã±ã¼ã¸ã§ã¯ï¼\autoref{tab:ltj_fntspc}ã®
+ãåæãè¡ã«ç¤ºããå½ä»¤ã\Pkg{fontspec}ããã±ã¼ã¸ã®å
ã®ã³ãã³ãï¼ã欧æãè¡ï¼
+ã«å¯¾å¿ãããã®ã¨ãã¦å®ç¾©ãã¦ããï¼
%
%<*en>
-\begin{center}\small
-\begin{tabular}{ccccc}
+\begin{table}
+\caption{Commands of \Pkg{luatexja-fontspec}}\label{tab:ltj_fntspc}
+\medskip
+{\centering\small
+\begin{tabular}{cllll}
\toprule
Japanese fonts
&\cs{jfontspec}&\cs{setmainjfont}&\cs{setsansjfont}&\cs{setmonojfont}$^*$\\
@@ -1439,18 +1441,33 @@ alphabetic fonts
&\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\
\midrule
Japanese fonts
-&\cs{newjfontfamily}&\cs{newjfontface}
-&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
+&\cs{newjfontfamily}&\cs{renewjfontfamily}$^{**}$&\cs{setjfontfamily}$^{**}$\\
+alphabetic fonts
+&\cs{newfontfamily}&\cs{renewfontfamily}$^{**}$&\cs{setfontfamily}$^{**}$\\
+\midrule
+Japanese fonts
+&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
alphabetic fonts
-&\cs{newfontfamily}&\cs{newfontface}
-&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
+&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
\bottomrule
-\end{tabular}
-\end{center}
+\end{tabular}\par}
+\medskip
+\fakefn{$^*$}{%
+ \cs{setmonojfont} is defined if and only if \texttt{match} option is specified.}
+\fakefn{$^{**}$}{%
+ \cs{renewfontfamily}~and~\cs{setfontfamily} are new commands
+ in \Pkg{fontspec}~v2.6h (2018/7/30).
+ Hence, \Pkg{luatexja-fontspec} define \cs{renewjfontfamily}~and~\cs{setjfontfamily}
+ only when \Pkg{fontspec}~v2.6h (or later) is used.
+}
+\end{table}
%
%<*ja>
-\begin{center}\small
-\begin{tabular}{ccccc}
+\begin{table}
+\caption{\Pkg{luatexja-fontspec}ã§å®ç¾©ãããå½ä»¤}\label{tab:ltj_fntspc}
+\medskip
+{\centering\small
+\begin{tabular}{cllll}
\toprule
åæ
&\cs{jfontspec}&\cs{setmainjfont}&\cs{setsansjfont}&\cs{setmonojfont}$^*$\\
@@ -1458,14 +1475,28 @@ alphabetic fonts
&\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\
\midrule
åæ
-&\cs{newjfontfamily}&\cs{newjfontface}
-&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
+&\cs{newjfontfamily}&\cs{renewjfontfamily}$^{**}$&\cs{setjfontfamily}$^{**}$\\
欧æ
-&\cs{newfontfamily}&\cs{newfontface}
-&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
+&\cs{newfontfamily}&\cs{renewfontfamily}$^{**}$&\cs{setfontfamily}$^{**}$\\
+\midrule
+åæ
+&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
+欧æ
+&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
\bottomrule
-\end{tabular}
-\end{center}
+\end{tabular}\par}
+
+\medskip
+\fakefn{$^*$}{\cs{setmonojfont} 㯠\texttt{match} ãªãã·ã§ã³ã
+æå®ãããæã®ã¿å®ç¾©ãããï¼}
+\fakefn{$^{**}$}{%
+ \cs{renewfontfamily} 㨠\cs{setfontfamily} ã¯
+ \Pkg{fontspec}~v2.6h (2018/7/30)ã§æ°ãã«è¿½å ãããå½ä»¤ã§ããï¼
+ ãã®ããï¼\Pkg{luatexja-fontspec}ã \cs{renewjfontfamily} 㨠\cs{setjfontfamily} ã
+ å®ç¾©ããã®ã¯v2.6h以éã®\Pkg{fontspec}ã使ç¨ããæã®ã¿ã«ãªã£ã¦ããï¼
+}
+
+\end{table}
%
% The package option of \Pkg{luatexja-fontspec} are the followings:
@@ -3584,6 +3615,28 @@ JFMä¸ã«ããã \texttt{kanjiskip\_natural}, \texttt{kanjiskip\_stretch},\
3ãã¼ã¯åã³æå¹åãããï¼\texttt{-ltjksp}, \texttt{+ltjksp} ãè¤æ°åæå®ããå ´åã¯ï¼
æå¾ã«æå®ãããã®ãæå¹ã¨ãªãï¼
%
+%<*en>
+\paragraph{\texttt{ltjksp}}
+\label{pg:ltjksp}
+\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.
+\begin{LTXexample}[width=16\zw]
+\leavevmode
+\ltjsetparameter{kanjiskip=0pt plus 3\zw}
+\vrule\hbox to 15\zw{ãããããï¼ãã}\vrule
+
+\jfont\G=file:KozMinPr6N-Regular.otf%
+ :jfm=ujis;-ltjksp at 9.2487pt
+\G\leavevmode%
+\vrule\hbox to 15\zw{ãããããï¼ãã}\vrule
+\end{LTXexample}
+%
+
+
%\subsection{\cs{tfont}}
@@ -4382,7 +4435,7 @@ Hence we have the following result:
\end{cslist}
%
-
+
\item[end\_stretch=, end\_shrink=]
%<*ja>
ï¼ä»»æï¼ãã¼ã¸ã§ã³1ã®ã¿ï¼
@@ -6148,11 +6201,11 @@ As closing this subsection, we shall introduce an example of
%<*ja>
ãã®ç¯ã®çµããã«ï¼\cs{SetRelationFont} 㨠\cs{userelfont} ã®ä¾ã
ç´¹ä»ãã¦ãããï¼\cs{userelfont} ã®ä½¿ç¨ã«ãã£ã¦ï¼ãabcãã®é¨åã®ãã©ã³ãã
-Avant Garde (OT1/pag/m/n) ã«å¤ãã£ã¦ãããã¨ããããï¼
+Latin Modern Sans Serif (TU/lmss/m/n) ã«å¤ãã£ã¦ãããã¨ããããï¼
%
\begin{LTXexample}[width=0.3\textwidth]
\makeatletter
-\SetRelationFont{JY3}{\k@family}{m}{n}{OT1}{pag}{m}{n}
+\SetRelationFont{JY3}{\k@family}{m}{n}{TU}{lmss}{m}{n}
% \k@family: current Japanese font family
\userelfont\selectfont ãããabc
\end{LTXexample}
@@ -6349,7 +6402,7 @@ for example, the meaning of \cs{TU\cs{textquotedblleft}} is \cs{ltjalchar8220\lt
\begin{table}[t]
\centering\small
- \caption{strut}\label{tab:strutbox}
+ \caption{strut}\label{tab:strutbox}\medskip
\begin{tabular}{llcccl}
\toprule
\textbf{box}&\textbf{direction}&\textbf{width}&\textbf{height}&\textbf{depth}
@@ -6766,11 +6819,11 @@ with priority&%
\\
\bottomrule
\end{tabular}\par}
-\smallskip
+\medskip
-Note: the value of
+\fakefn{}{The value of
\Param{kanjiskip} is 0\,pt${}^{+1/5\,\mathrm{em}}_{-1/5\,\mathrm{em}}$ in this figure,
-for making the difference obvious.
+for making the difference obvious.}
%\caption{è¡é·èª¿æ´}\label{fig:adj}
%\caption{Line adjustment}\label{fig:adj}
\end{figure}
@@ -6782,12 +6835,12 @@ for making the difference obvious.
%<*ja>
ãã®è¿½å ããã±ã¼ã¸ã¯ä»¥ä¸ã®æ©è½ãæä¾ããï¼è©³ç´°ãªä»æ§ã«ã¤ãã¦ã¯\ref{sec-adjspec}ç« ãåç
§ãã¦ã»ããï¼
\begin{description}
-\item[è¡æ«æåã®ä½ç½®èª¿æ´]
+ \item[è¡æ«æåã®ä½ç½®èª¿æ´]
\pTeX ã§ã¯ï¼ï¼æ¯éã¯ã¨ãããï¼ãè¡æ«ã®èªç¹ã¯ã¶ãä¸ããäºååããå
¨è§åãã®ããããã«ãã®ããã«
è¡æ«æåã¨å®éã®è¡æ«ã®ä½ç½®é¢ä¿ã2éã以ä¸ã«ãããã¨ã¯é¢åã§ãã£ãï¼
åæãã©ã³ãã¡ããªãã¯ã ãã§ã¯ã常ã«è¡æ«ã®èªç¹ã¯ã¶ãä¸ããã¨ãã£ããã¨ããã§ããï¼
åã®æã«æ¸ãããã¨ãå®ç¾ããã«ã¯
-\begin{lstlisting}
+ \begin{lstlisting}
\def\ã{%
\penalty10000 % ç¦åããã«ãã£
\hbox to0pt{ã\hss}\penalty0 % ã¶ãä¸ãã®å ´å
@@ -6797,48 +6850,184 @@ for making the difference obvious.
\end{lstlisting}
ã®ãããªå½ä»¤ãå®ç¾©ãï¼æä¸ã®å
¨ã¦ã®å¥ç¹ã \lstinline+\ã+ ã§æ¸ããã¨ãå¿
è¦ã ã£ãï¼
-\Pkg{luatexja-adjust}ããã±ã¼ã¸ã¯ï¼ä¸ã§è¿°ã¹ãè¡æ«æåã¨å®éã®è¡æ«ã¨ã®ä½ç½®é¢ä¿ã
-2éã以ä¸ããèªåçã«é¸æããæ©è½ãæä¾ããï¼
-\pdfTeX ã¨åãããã«ï¼ã\TeX ã«ããè¡åå²ã®å¾ã§è¡æ«æåã®ä½ç½®ãè£æ£ãããæ¹æ³ã¨
- ãè¡åå²ã®éç¨ã§è¡æ«æåã®ä½ç½®ãèæ
®ã«å
¥ãããæ¹æ³ãé¸ã¹ãããã«ããï¼
-\Pkg{luatexja-adjust}ããã±ã¼ã¸ã®æ¢å®ã§ã¯åè
ï¼ï¼
+ \Pkg{luatexja-adjust}ããã±ã¼ã¸ã¯ï¼ä¸ã§è¿°ã¹ãè¡æ«æåã¨å®éã®è¡æ«ã¨ã®ä½ç½®é¢ä¿ã
+ 2éã以ä¸ããèªåçã«é¸æããæ©è½ãæä¾ããï¼
+ \pdfTeX ã¨åãããã«ï¼ã\TeX ã«ããè¡åå²ã®å¾ã§è¡æ«æåã®ä½ç½®ãè£æ£ãããæ¹æ³ã¨
+ ãè¡åå²ã®éç¨ã§è¡æ«æåã®ä½ç½®ãèæ
®ã«å
¥ãããæ¹æ³ãé¸ã¹ãããã«ãã
+ ï¼\Pkg{luatexja-adjust}ããã±ã¼ã¸ã®æ¢å®ã§ã¯åè
ï¼ï¼
-\item[åªå
é ä½ä»ãã®è¡é·èª¿æ´]
-\pTeX ã§ã¯ï¼è¡é·èª¿æ´ã«ããã¦åªå
度ã®æ¦å¿µãåå¨ããªãã£ãããï¼å³
-\ref{fig:adj}ä¸æ®µã«ãããåè§åã®å端ã¯ï¼\autoref{fig:adj}ä¸æ®µã®ããã«ï¼éµ
-æ¬å¼§å¨è¾ºã®ç©ºç½ã¨åæé空ç½(\Param{kanjiskip})ã®ä¸¡æ¹ã«ãã£ã¦è² æ
ãããï¼ã
-ããï¼ãæ¥æ¬èªçµçå¦çã®è¦ä»¶ã\cite{jlreq}ãJIS~X~4051~\cite{x4051}ã«ãã
-ã¦ã¯ï¼ãã®ãããªç¶æ³ã§ã¯å端ã¯éµæ¬å¼§å¨è¾ºã®ç©ºç½ã®ã¿ã§è² æ
ãï¼ãã®ä»ã®åæ
-æåã¯ãã¿çµã§çµã¾ããï¼\autoref{fig:adj}ä¸æ®µï¼ãã¨ã«ãªã£ã¦ããï¼
-\Pkg{luatexja-adjust}ããã±ã¼ã¸ã®æä¾ãã第2ã®æ©è½ã¯ï¼
-\cite{jlreq}ã\cite{x4051}ã«ãããè¦å®ã®ãããªï¼åªå
é ä½ä»ã
-ã®è¡é·èª¿æ´ã§ããï¼
-\begin{itemize}
- \item åªå
度ä»ãè¡é·èª¿æ´ã¯ï¼æ®µè½ãè¡åå²ããå¾ã«åã
ã®è¡ã«ã¤ãã¦è¡ããããã®ã§ããï¼
-ãã®ããï¼è¡åå²ã®ä½ç½®ã¯å¤åãããã¨ã¯ãªãï¼
+ \item[åªå
é ä½ä»ãã®è¡é·èª¿æ´]
+ \pTeX ã§ã¯ï¼è¡é·èª¿æ´ã«ããã¦åªå
度ã®æ¦å¿µãåå¨ããªãã£ãããï¼å³
+ \ref{fig:adj}ä¸æ®µã«ãããåè§åã®å端ã¯ï¼\autoref{fig:adj}ä¸æ®µã®ããã«ï¼éµ
+ æ¬å¼§å¨è¾ºã®ç©ºç½ã¨åæé空ç½(\Param{kanjiskip})ã®ä¸¡æ¹ã«ãã£ã¦è² æ
ãããï¼ã
+ ããï¼ãæ¥æ¬èªçµçå¦çã®è¦ä»¶ã\cite{jlreq}ãJIS~X~4051~\cite{x4051}ã«ãã
+ ã¦ã¯ï¼ãã®ãããªç¶æ³ã§ã¯å端ã¯éµæ¬å¼§å¨è¾ºã®ç©ºç½ã®ã¿ã§è² æ
ãï¼ãã®ä»ã®åæ
+ æåã¯ãã¿çµã§çµã¾ããï¼\autoref{fig:adj}ä¸æ®µï¼ãã¨ã«ãªã£ã¦ããï¼
+ \Pkg{luatexja-adjust}ããã±ã¼ã¸ã®æä¾ãã第2ã®æ©è½ã¯ï¼
+ \cite{jlreq}ã\cite{x4051}ã«ãããè¦å®ã®ãããªï¼åªå
é ä½ä»ã
+ ã®è¡é·èª¿æ´ã§ããï¼
+ \begin{itemize}
+ \item åªå
度ä»ãè¡é·èª¿æ´ã¯ï¼æ®µè½ãè¡åå²ããå¾ã«åã
ã®è¡ã«ã¤ãã¦è¡ããããã®ã§ããï¼
+ ãã®ããï¼è¡åå²ã®ä½ç½®ã¯å¤åãããã¨ã¯ãªãï¼
+
+ \verb+\hbox{...}+ ã¨ãã£ããéä¸ã§æ¹è¡ã§ããªãæ°´å¹³ããã¯ã¹ãã§ã¯ï¼ãã¨ãå¹
ãæå®ããã¦ãã¦ãï¼ç¡å¹ã§ããï¼
+ \item åªå
度ä»ãè¡é·èª¿æ´ãè¡ãã¨ï¼åæå¦çã°ã«ã¼ã®èªç¶é·ã¯å¤åããªããï¼ä¼¸ã³éã縮ã¿éã¯
+ ä¸è¬ã«å¤åããï¼ãã®ããï¼æ¢ã«çµã¾ãã段è½ã \cs{unhbox} ãªã©ãå©ç¨ãã¦çµã¿ç´ãå¦çã
+ è¡ãå ´åã«ã¯æ³¨æãå¿
è¦ã§ããï¼
+ \end{itemize}
+
+ \item[ãä¸èº«ã¾ã§ã¿ããè¡éãè¨ç®]
+ è¤æ°è¡ã«æ¸¡ãæç« ãçµçããã¨ãã«ã¯è¡éã«ç©ºããå
¥ããã¨ãæ®éã§ããï¼
+ \TeX ã§ã¯åè¡ãä¸ã¤ãã¤ã®æ°´å¹³ããã¯ã¹ããªãã¦ãããã¨ãæãåºãã¨ï¼é£ãåã£ã
+ 2ã¤ã®è¡ï¼ã¤ã¾ãæ°´å¹³ããã¯ã¹ï¼ã®éã®ç©ºãã¯æ¬¡ã®ããã«ãã¦æ±ºã¾ãã®ã ã£ãï¼
+ \begin{itemize}
+ \item ãé常ã«çµãã ã¨ãã®è¡éã$d$ãï¼\cs{baselineskip}ãã
+ ãåã®è¡ãã®æ·±ãã¨ã次ã®è¡ãã®é«ããå ãããã®ãå¼ããå¤ã¨ããï¼
+ \item $d\ge\cs{lineskiplimit}$ã®å ´åï¼
+ æ¨æºã®è¡éã\cs{baselineskip}ã§çµãã§ãååãªééãããã¨å¤æããï¼
+ 2è¡ã®éã«ã¯é·ã$d$ã®ç©ºç½ãæ¿å
¥ãããï¼ã¤ã¾ãè¡éãã¯\cs{baselineskip}ï¼
+ \item {\catcode`\<=12$d<\cs{lineskiplimit}$}ã®å ´åï¼
+ 2è¡ã®éã«ã¯é·ã\cs{lineskip}ã®ç©ºç½ãæ¿å
¥ãããï¼
+ ãã®ããï¼è¨å®å¤ã«ãããï¼å¤ãã®å ´åï¼è¡éãã¯\cs{baselineskip}ããåºããï¼
+ \end{itemize}
-\verb+\hbox{...}+ ã¨ãã£ããéä¸ã§æ¹è¡ã§ããªãæ°´å¹³ããã¯ã¹ãã§ã¯ï¼ãã¨ãå¹
ãæå®ããã¦ãã¦ãï¼ç¡å¹ã§ããï¼
- \item åªå
度ä»ãè¡é·èª¿æ´ãè¡ãã¨ï¼åæå¦çã°ã«ã¼ã®èªç¶é·ã¯å¤åããªããï¼ä¼¸ã³éã縮ã¿éã¯
-ä¸è¬ã«å¤åããï¼ãã®ããï¼æ¢ã«çµã¾ãã段è½ã \cs{unhbox} ãªã©ãå©ç¨ãã¦çµã¿ç´ãå¦çã
-è¡ãå ´åã«ã¯æ³¨æãå¿
è¦ã§ããï¼
-\end{itemize}
+ \begin{figure}[t]
+ \noindent\centering
+ \begin{minipage}[b]{18\zw}
+ \ltjenableadjust[profile=false, linestep=false]
+ â¦â¦ã ããï¼â ãã$\dfrac{a^2}{b} = \dfrac{1+\sqrt{5}}2$ï¼\\
+ ãã£ã¦$b=\dfrac{1-\sqrt{5}}2$ã§ããï¼\\
+ ãããâ¡å¼ã«ä»£å
¥ããã¨â¦â¦
+ \par\vskip\abovecaptionskip
+ \ltjenableadjust[profile=false, linestep=false]
+ \par\centering\leavevmode{\small (a)}
+ \end{minipage}%
+ \kern2\zw
+ \begin{minipage}[b]{18\zw}
+ \ltjenableadjust[profile]
+ â¦â¦ã ããï¼â ãã$\dfrac{a^2}{b} = \dfrac{1+\sqrt{5}}2$ï¼\\
+ ãã£ã¦$b=\dfrac{1-\sqrt{5}}2$ã§ããï¼\\
+ ãããâ¡å¼ã«ä»£å
¥ããã¨â¦â¦
+ \par\vskip\abovecaptionskip
+ \ltjenableadjust[profile=false, linestep=false]
+ \par\centering\leavevmode{\small (b)}
+ \end{minipage}\par
+ \caption{é«ãè¡ãé£ç¶ããã¨ãã®ç¶æ³}\label{fig:linegap1}
+ \end{figure}
+
+ ããã§ï¼\TeX ã¯è¡éãã®æ±ºå®ã§ãé«ãã»æ·±ããåã£ã¦ãããã®ã
+ è¡ã®ã©ã®æ°´å¹³ä½ç½®ã«ããããã¯ä¸åèæ
®ããªããã¨ã«æ³¨æãã¦ã»ããï¼ãã®ããï¼
+ \autoref{fig:linegap1}~(a)ã®ããã«ãå¿
è¦ä»¥ä¸ã«è¡éã空ãã¦è¦ãããç¶æ³ãèµ·ãããã¨ãããï¼
+
+ \Pkg{luatexja-adjust}ããã±ã¼ã¸ã§ã¯ï¼ãé常ã«çµãã ã¨ãã®è¡éã$d$ã
+ åè¡ã®ä¸èº«ã®æåã»ã°ã«ã¼ã»ããã¯ã¹ã®å¯¸æ³ãåæ¡ãã¦è¨ç®ããã¨ããæ¹æ³ã
+ å©ç¨ã§ããããã«ããï¼ãã®æ©è½ã使ãã¨ï¼\autoref{fig:linegap1}~(b)ã®ããã«
+ è¡éã®ç©ºããå¿
è¦ä»¥ä¸ã«å¤§ãããªããã¨ãé¿ãããã¨ãã§ããï¼
+ \begin{itemize}
+ \item 段è½ä¸ã®é£ãåã£ãäºè¡ã ãã§ãªãï¼è¡éã®ç©ºãã¯
+ æ°ãã«æ°´å¹³ããã¯ã¹$h$ãï¼å
é¨ã»å¤é¨åããï¼åç´ã¢ã¼ãã§è¿½å ããæã«ãèªåã§æ¿å
¥ãããï¼
+ ãã®å ´åã«ã¯ï¼å段è½ã§è¿°ã¹ããä¸èº«ã¾ã§ã¿ããå¦çã¯
+ \begin{itemize}
+ \item ç¾å¨ã®ãªã¹ãã«ãããæå¾ã®ãã¼ã
+ \footnote{æå¾ã®ãã¼ãã\cs{parskip}ã«ããã°ã«ã¼ã§ãã£ãå ´åã®ã¿
+ ããã«ä¸ã¤åã®ãã¼ããåç
§ãã}ãæ°´å¹³ããã¯ã¹$h'$ã§ããï¼ãã¤
+ \item \cs{prevdepth}ã®å¤ã¨ãã®$h'$ã®æ·±ãã®å¤ãä¸è´ãã¦ãã
+ \end{itemize}
+ å ´åã«ã®ã¿çºåããããã«ãã¦ããï¼
+ \item è¡ã®ä¸èº«ã«æ°´å¹³ããã¯ã¹$h''$ãå
¥ã£ã¦ãããã¨ããããï¼ãã®å ´åã¯$h''$ã®ä¸èº«ã¾ã§ã¯åç
§ããªãï¼
+ åç
§ããããã«ãã¦ãã¾ãã¨ï¼\cs{smash}ãªã©æåã§è¡ã£ãé«ãã»æ·±ã調æ´ã®æå³ããªããªã£ã¦ãã¾ãããã§ããï¼
+ \end{itemize}
+
+ \begin{figure}[t]
+ \noindent\centering
+ \begin{minipage}[b]{16\zw}
+ \ltjenableadjust[profile]
+ â¦â¦ã ããï¼â ãã$\dfrac{a^2}{b}= \dfrac{1+\sqrt{5}}2$ï¼\\
+ ãã£ã¦$b=\dfrac{1-\sqrt{5}}2$ã§ããï¼\\
+ ãããâ¡å¼ã«ä»£å
¥ããã¨â¦â¦
+ \par\vskip\abovecaptionskip
+ \ltjenableadjust[profile=false, linestep=false]
+ \par\centering\leavevmode{\small (a): ç¡å¹}
+ \end{minipage}%
+ \kern2\zw
+ \begin{minipage}[b]{16\zw}
+ \ltjsetparameter{linestep_factor=0.25}
+ \ltjenableadjust[profile, linestep]
+ â¦â¦ã ããï¼â ãã$\dfrac{a^2}{b} = \dfrac{1+\sqrt{5}}2$ï¼\\
+ ãã£ã¦$b=\dfrac{1-\sqrt{5}}2$ã§ããï¼\\
+ ãããâ¡å¼ã«ä»£å
¥ããã¨â¦â¦
+ \par\vskip\abovecaptionskip
+ \ltjenableadjust[profile=false, linestep=false]
+ \par\centering\leavevmode{\small (b): $0.25$\cs{baselineskip}å»ã¿}
+ \end{minipage}\par\medskip
+ \begin{minipage}[b]{16\zw}
+ \ltjsetparameter{linestep_factor=0.5}
+ \ltjenableadjust[profile, linestep]
+ â¦â¦ã ããï¼â ãã$\dfrac{a^2}{b} = \dfrac{1+\sqrt{5}}2$ï¼\\
+ ãã£ã¦$b=\dfrac{1-\sqrt{5}}2$ã§ããï¼\\
+ ãããâ¡å¼ã«ä»£å
¥ããã¨â¦â¦
+ \par\vskip\abovecaptionskip
+ \ltjenableadjust[profile=false, linestep=false]
+ \par\centering\leavevmode{\small (c): 0.5\cs{baselineskip}å»ã¿}
+ \end{minipage}%
+ \kern2\zw
+ \begin{minipage}[b]{16\zw}
+ \ltjsetparameter{linestep_factor=1}
+ \ltjenableadjust[profile, linestep]
+ â¦â¦ã ããï¼â ãã$\dfrac{a^2}{b} = \dfrac{1+\sqrt{5}}2$ï¼\\
+ ãã£ã¦$b=\dfrac{1-\sqrt{5}}2$ã§ããï¼\\
+ ãããâ¡å¼ã«ä»£å
¥ããã¨â¦â¦
+ \par\vskip\abovecaptionskip
+ \ltjenableadjust[profile=false, linestep=false]
+ \par\centering\leavevmode{\small (d): \cs{baselineskip}å»ã¿}
+ \end{minipage}\par
+ \caption{段éçãªè¡éãå¢å }\label{fig:linegap2}
+ \end{figure}
+
+ \item[段éçãªè¡éã調æ´]
+ æ¢ã«è¿°ã¹ãããã«ï¼
+ ãé常ã«çµãã ã¨ãã®è¡éã$d$ã\cs{lineskiplimit}ããå°ããå ´åï¼\TeX æ¨æºã§ã¯
+ è¡éã¯\cs{lineskip}ã¨ãªãã®ã ã£ãï¼
+ ãã®ã¨ãè¡éãã¯ãåã®è¡ã®æ·±ããï¼ã次ã®è¡ã®é«ããï¼\cs{lineskip}ã®3ã¤ã®åã«ãªãããã ãï¼
+ å ´åã«ãã£ã¦ã¯è¡éããã\cs{baselineskip}ã®æ´æ°åããªã©ã¨åãã®ããå¤ã«æãããã¨ããç¶æ³ã
+ èããããªãããªãï¼
+
+ \Pkg{luatexja-adjust}ããã±ã¼ã¸ã§ã¯ï¼{\catcode`\<=12$d<\cs{lineskiplimit}$}ã®ã¨ãã«
+ è¡éãã\cs{baselineskip}ã®\Param{linestep\_factor}åãã¤å¢æ¸ããã¦
+ \begin{quote}
+ è¡éã\cs{lineskip}以ä¸ã¨ãªããããªï¼
+ æå°ã®$(1+k\cdot \Param{linestep\_factor})\cs{baselineskip}$ï¼$k$ã¯æ´æ°ï¼ã®å¤
+ \end{quote}
+ ã¨ããæ©è½ãå©ç¨ã§ããããã«ããï¼
+ \autoref{fig:linegap2}ã®(a)ããã®æ©è½ãç¡å¹ã«ããç¶æ³ã§ï¼(b),~(c),~(d)ã
+ ãããã\Param{linestep\_factor}ã0.25,~0.5,~1ã¨ããç¶æ³ã§ããï¼
+
+ ãªãï¼ãã®æ©è½ã¯è¡¨çµæ(\cs{halign},~\cs{valign})ã«ã¯ç¡å¹ã§ããï¼
+ \LaTeX ã«ããã表çµç°å¢ï¼tabular, arrayãªã©ï¼ã§ã¯ï¼\cs{baselineskip},~\cs{lineskip}ã¯ã©ã¡ãã0ã«è¨å®ããã¦ããã®ã§
+ ï¼ä»£ããã«åè¡ã«\cs{@arstrut}ã¨ããæ¯æ±ãå
¥ãï¼ããã«æå³ããªããã¨ã¨ï¼
+ æ°å¼ãå
é¨ã§è¡¨çµã使ã£ã¦çµãalignç°å¢ãªã©ã§ã¯ããã£ã¦è¡éãä¸æãã«ãªã£ã¦ãã¾ãããã§ããï¼
\end{description}
-\Pkg{luatexja-adjust}ããã±ã¼ã¸ã¯ï¼ä¸è¨ã§è¿°ã¹ã2æ©è½ãæå¹å/ç¡å¹åããããã®
+\Pkg{luatexja-adjust}ããã±ã¼ã¸ã¯ï¼ä¸è¨ã§è¿°ã¹ã4æ©è½ãæå¹å/ç¡å¹åããããã®
以ä¸ã®å½ä»¤ãæä¾ããï¼ãããã¯ãã¹ã¦ã°ãã¼ãã«ã«å¹åãçºæ®ããï¼
\begin{cslist}
\item[\cs{ltjenableadjust[...]}]
-\verb+...+ ã«æå®ããkey-valueãªã¹ãã«å¾ãï¼ãè¡æ«æåã®ä½ç½®èª¿æ´ããåªå
é ä½ä»ãã®è¡é·èª¿æ´ããæå¹å/ç¡å¹åããï¼
+\verb+...+ ã«æå®ããkey-valueãªã¹ãã«å¾ãï¼ãè¡æ«æåã®ä½ç½®èª¿æ´ããåªå
é ä½ä»ãã®è¡é·èª¿æ´ã
+ ããä¸èº«ã¾ã§ã¿ããè¡éãè¨ç®ãã段éçãªè¡éã調æ´ããæå¹å/ç¡å¹åããï¼
æå®ã§ãããã¼ã¯ä»¥ä¸ã®éãï¼
\begin{description}
\item[\texttt{lineend=[false,true,extended]}]
è¡æ«æåã®ä½ç½®èª¿æ´ã®æ©è½ãç¡å¹å(\texttt{false})ï¼ãè¡åå²å¾ã«èª¿æ´ãã®å½¢ã§æå¹å(\texttt{true})ï¼
- ãè¡åå²ã®ä»®å®ã§èæ
®ã(\texttt{extended})ããï¼
+ ãè¡åå²ã®ä»®å®ã§èæ
®ãã®å½¢ã§æå¹å(\texttt{extended})ããï¼
\item[\texttt{priority=[false,true]}]
- åªå
é ä½ä»ãã®è¡é·èª¿æ´ãç¡å¹å(\texttt{false})ï¼ã¾ãã¯æå¹å(\texttt{true})ããï¼
+ åªå
é ä½ä»ãã®è¡é·èª¿æ´ãç¡å¹å(\texttt{false})ï¼ã¾ãã¯æå¹å(\texttt{true})ï¼
+ \item[\texttt{profile=[false,true]}]
+ ãä¸èº«ã¾ã§ã¿ããè¡éãè¨ç®ãç¡å¹å(\texttt{false})ï¼ã¾ãã¯æå¹å(\texttt{true})ï¼
+ \item[\texttt{linestep=[false,true]}]
+ 段éçãªè¡éã調æ´ãç¡å¹å(\texttt{false})ï¼ã¾ãã¯æå¹å(\texttt{true})ï¼
\end{description}
-両ãã¼ã¨ããã¼åã®ã¿ãæå®ããå ´åã¯å¤ã¨ãã¦\texttt{true}ãæå®ããããã®ã¨æ±ãããï¼
+ã©ã®ãã¼ã¨ããã¼åã®ã¿ãæå®ããå ´åã¯å¤ã¨ãã¦\texttt{true}ãæå®ããããã®ã¨æ±ãããï¼
äºææ§ã®çºï¼ãªãã·ã§ã³ç¡ãã§ãã \cs{ltjenableadjust}ãå¼ã³åºãããå ´åã¯ï¼
\begin{lstlisting}
@@ -6849,13 +7038,13 @@ for making the difference obvious.
\item[\cs{ltjdisableadjust}]
\Pkg{luatexja-adjust}ããã±ã¼ã¸ã®æ©è½ãç¡å¹åããï¼
\begin{lstlisting}
-\ltjenableadjust[lineend=false,priority=false]
+\ltjenableadjust[lineend=false,priority=false,profile=false,linestep=false]
\end{lstlisting}
ã¨å義ï¼
\end{cslist}
-ã¾ãï¼åªå
é ä½ä»ãã®è¡é·èª¿æ´ã®ããã«ï¼æ¬¡ã®2ãã©ã¡ã¼ã¿ã\cs{ltjsetparameter}å
ã§
-追å ãããï¼ä¸¡ãã©ã¡ã¼ã¿ã¨ãã°ãã¼ãã«ã«å¹åãçºæ®ããï¼
+ã¾ãï¼åªå
é ä½ä»ãã®è¡é·èª¿æ´ã®ããã«ï¼æ¬¡ã®3ãã©ã¡ã¼ã¿ã\cs{ltjsetparameter}å
ã§
+追å ãããï¼ããããã°ãã¼ãã«ã«å¹åãçºæ®ããï¼
\begin{cslist}[style=standard]
\item[\DParam{stretch\_priority}\,=\{\}]
\Param{kanjiskip}, \Param{xkanjiskip}ï¼ããã³ã\textbf{JAglue}以å¤ã®ã°ã«ã¼ããï¼
@@ -6874,8 +7063,14 @@ stretch_priority={kanjiskip=-35,xkanjiskip=-25,others=50}
\item[\DParam{shrink\_priority}\,=\{\}]
åæ§ã«ï¼ãè¡ãèªç¶é·ãã縮ãããå ´åã®èª¿æ´ã«ç¨ããåªå
度ãæå®ããï¼
ãã以å¤ã¯\Param{stretch\_priority}ã¨æå®ã®å½¢å¼ã¯å¤ãããªãï¼
+
+ \item[\DParam{linestep\_factor}\,=]
+ 段éçãªè¡éã調æ´ã®éï¼\cs{baselineskip}ã®ä½ååä½ã§è¡éããå¤ããããæå®ããï¼
+ 0ãæå®ããã¨ç¡å¹ã«ãªãã®ã¨å¤ãããªãï¼ã¾ãè² æ°ãæå®ããã¨ï¼
+ ãã®çµ¶å¯¾å¤ãæå®ããããã®ããã«æ±ãããï¼
+ åæå¤ã¯0.5ï¼ã¤ã¾ãåè¡åä½ï¼ã§ããï¼
\end{cslist}
-åæå¤ã¯\Param{stretch\_priority}, \Param{shrink\_priority}ã¨ã
+\Param{stretch\_priority}, \Param{shrink\_priority}ã®åæå¤ã¯ã©ã¡ãã
\begin{lstlisting}
{kanjiskip=-35,xkanjiskip=-25,others=50}
\end{lstlisting}
@@ -7380,12 +7575,12 @@ since we use same font for both series of gothic.
ãããï¼
ãã´ã·ãã¯ä½ã®ä¸åããåæã«å¤æ´ããããã¨ã«ãªãï¼
%
-\item[90jis]
-%Use 90JIS glyph variants if possible.
-%åºæ¥ãéã90JISã®åå½¢ã使ãï¼
-\item[jis2004]
-%Use JIS2004 glyph variants if possible.
-%åºæ¥ãéãJIS2004ã®åå½¢ã使ãï¼
+\item[jis90\textrm{,~}90jis]
+%Use JIS~X~0208:1990 glyph variants if possible.
+%åºæ¥ãéãJIS~X~0208:1990ã®åå½¢ã使ãï¼
+\item[jis2004\textrm{,~}2004jis]
+%Use JIS~X~0213:2004 glyph variants if possible.
+%åºæ¥ãéãJIS~X~0213:2004ã®åå½¢ã使ãï¼
\item[jfm\_yoko=]
%<*en>
Use the JFM \texttt{jfm-.lua} for horizontal direction, instead of \texttt{jfm-ujis.lua}~(default JFM).
@@ -7409,14 +7604,14 @@ Use the JFM \texttt{jfm-.lua} for vertical direction, instead of \texttt{jf
\end{cslist}
%<*en>
-Note that \texttt{90jis} and \texttt{jis2004} only affect with mincho,
+Note that \texttt{jis90},~\texttt{90jis}, \texttt{jis2004}~and~\texttt{2004jis} only affect with mincho,
gothic (and, possibly rounded gothic) families defined by this package.
-We didn't taken account of when both \texttt{90jis} and \texttt{jis2004} are specified.
+We didn't taken account of when more than one options among them are specified.
%
%<*ja>
-\texttt{90jis}ã¨\texttt{jis2004}ã«ã¤ãã¦ã¯æ¬ããã±ã¼ã¸ã§å®ç¾©ããã
+\texttt{jis90},~\texttt{90jis}, \texttt{jis2004},~\texttt{2004jis}ã«ã¤ãã¦ã¯æ¬ããã±ã¼ã¸ã§å®ç¾©ããã
ææä½ã»ã´ã·ãã¯ä½ï¼ã»ä¸¸ã´ã·ãã¯ä½ï¼ã«ã®ã¿æå¹ã§ããï¼
-両ãªãã·ã§ã³ãåæã«æå®ãããå ´åã®åä½ã«ã¤ãã¦ã¯å
¨ãèæ
®ãã¦ããªãï¼
+ããã4ãªãã·ã§ã³ã®ãã¡è¤æ°ãåæã«æå®ãããå ´åã®åä½ã«ã¤ãã¦ã¯å
¨ãèæ
®ãã¦ããªãï¼
%
%\subsubsection{Presets which support multi weights}
@@ -7789,17 +7984,17 @@ Note that HG~Mincho~E, HG~Gothic~E, HG Soei Kaku Gothic UB, and HG Maru Gothic P
are internally specified by:
\begin{description}
\item[default] by font name (\texttt{HGMinchoE}, etc.).
-\item[{\tt 90jis}] by file name (\texttt{hgrme.ttc}, \texttt{hgrge.ttc}, \texttt{hgrsgu.ttc}, \texttt{hgrsmp.ttf}).
-\item[{\tt jis2004}] by file name (\texttt{hgrme04.ttc}, \texttt{hgrge04.ttc}, \texttt{hgrsgu04.ttc}, \texttt{hgrsmp04.ttf}).
+\item[\texttt{jis90}, \texttt{90jis}] by file name (\texttt{hgrme.ttc}, \texttt{hgrge.ttc}, \texttt{hgrsgu.ttc}, \texttt{hgrsmp.ttf}).
+\item[\texttt{jis2004}, \texttt{2004jis}] by file name (\texttt{hgrme04.ttc}, \texttt{hgrge04.ttc}, \texttt{hgrsgu04.ttc}, \texttt{hgrsmp04.ttf}).
\end{description}
%
%<*ja>
ãªãï¼HGææEã»HGã´ã·ãã¯Eã»HGåµè±è§ã´ã·ãã¯UBã»HG丸ã´ã·ãã¯ä½PROã®4ã¤ã«ã¤ãã¦ã¯ï¼å
é¨ã§
\begin{description}
\item[æ¨æº] ãã©ã³ãåï¼\texttt{HGMinchoE} ãªã©ï¼
-\item[{\tt 90jis}æå®æ] ãã¡ã¤ã«å (%
+\item[\texttt{jis90}, \texttt{90jis}æå®æ] ãã¡ã¤ã«å (%
\texttt{hgrme.ttc}, \texttt{hgrge.ttc}, \texttt{hgrsgu.ttc}, \texttt{hgrsmp.ttf})
-\item[{\tt jis2004}æå®æ] ãã¡ã¤ã«å (%
+\item[\texttt{jis2004}, \texttt{2004jis}æå®æ] ãã¡ã¤ã«å (%
\texttt{hgrme04.ttc}, \texttt{hgrge04.ttc}, \texttt{hgrsgu04.ttc}, \texttt{hgrsmp04.ttf})
\end{description}
ã¨ãã¦æå®ãè¡ã£ã¦ããã®ã§æ³¨æãããã¨ï¼
@@ -7809,11 +8004,11 @@ are internally specified by:
%\subsubsection{æ°ããªããªã»ããã®å®ç¾©}
%<*ja>
-ãã¼ã¸ã§ã³********.0以éã§ã¯ï¼èªåã§æ°ããªããªã»ãããå®ç¾©ãããã¨ãåºæ¥ãããã«ãªã£ãï¼
+ãã¼ã¸ã§ã³20170904.0以éã§ã¯ï¼èªåã§æ°ããªããªã»ãããå®ç¾©ãããã¨ãåºæ¥ãããã«ãªã£ãï¼
以ä¸ã«èª¬æãã2å½ä»¤ã¯ããªã¢ã³ãã«ã§ããå®è¡ã§ããªãï¼
%
%<*en>
-From version~********.0, one can define new presets using \cs{ltjnewpreset},
+From version~20170904.0, one can define new presets using \cs{ltjnewpreset},
and use them by \cs{ltjapplypreset}. These two commands can only be used in the preamble.
%
\begin{cslist}