X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Fluatexja.dtx;h=7c27d29b6805a2ea72c549414d757a5c678cd3a9;hb=55a3d0259d58f0ced648662986e92fc94c08f1f4;hp=9f4f0de046a39a93e302eb3e2dcb0d3fb05ee975;hpb=fce58171f9b6a4efc22a260d9542e07c7325482e;p=luatex-ja%2Fluatexja.git
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 9f4f0de..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
@@ -644,9 +649,9 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}.
%\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 2018****.0 (or~later) no longer supports \TeX~Live~2016.
+%In summary, \LuaTeX-ja version 20180825.0 (or~later) no longer supports \TeX~Live~2016.
%<*ja>
-è¦ç´ããã¨ï¼ãã¼ã¸ã§ã³2018****.0以éã®\LuaTeX-jaã¯\TeX~Live~2016以åã§ã¯åä½ããªã\footnote{%
+è¦ç´ããã¨ï¼ãã¼ã¸ã§ã³20180825.0以éã®\LuaTeX-jaã¯\TeX~Live~2016以åã§ã¯åä½ããªã\footnote{%
ãã£ã¨ãï¼èªåã§\LuaTeX ã®ãã¤ããªãSubversionãªãã¸ããªãããã«ããã¦ããã°è©±ã¯å¥ã§ããï¼
}ï¼
%
@@ -1414,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}$^*$\\
@@ -1431,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}$^*$\\
@@ -1450,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:
@@ -6363,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}
@@ -6780,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}
@@ -6962,6 +7001,11 @@ for making the difference obvious.
ã¨ããæ©è½ãå©ç¨ã§ããããã«ããï¼
\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}ããã±ã¼ã¸ã¯ï¼ä¸è¨ã§è¿°ã¹ã4æ©è½ãæå¹å/ç¡å¹åããããã®
@@ -7531,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).
@@ -7560,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}
@@ -7940,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}
ã¨ãã¦æå®ãè¡ã£ã¦ããã®ã§æ³¨æãããã¨ï¼
@@ -7960,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}