• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: Commit

ソースコードの管理場所


Commit MetaInfo

Revision65fc98d725bcfc2ddd740d172189d9bf74cd6e93 (tree)
Time2018-08-04 07:07:50
AuthorHironori Kitagawa <h_kitagawa2001@yaho...>
CommiterHironori Kitagawa

Log Message

Merge branch 'master' into kitagawa_test

Change Summary

Incremental Difference

Binary files a/doc/luatexja-en.pdf and b/doc/luatexja-en.pdf differ
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -72,7 +72,12 @@
7272 \usepackage{luatexja-adjust}%\ltjdisableadjust
7373 \advance\leftmargini-1\zw\advance\leftmarginii-1\zw
7474 %</ja>
75-
75+%<en>\long\def\fakefn#1#2{\par\noindent{\footnotesize\hbox to1.8em{\hss#1}#2\par}}
76+%<*ja>
77+\long\def\fakefn#1#2{%
78+ \par{\footnotesize\advance\leftskip 3\zw\parindent1\zw\noindent
79+ \llap{#1\hskip.3\zw}#2\par}}
80+%</ja>
7681 %%%%%%%% listings
7782
7883 %%%%%%%% IVS
@@ -1414,16 +1419,21 @@ TrueType・OpenTypeフォントを容易に扱うためのパッケージであ
14141419 %</ja>
14151420
14161421 %<*en>
1417-In the \Pkg{luatexja-fontspec} package, the following seven~commands are defined as
1418-counterparts of original commands in the \Pkg{fontspec} package:
1422+In the \Pkg{luatexja-fontspec} package, several commands are defined as
1423+counterparts of original commands in the \Pkg{fontspec} package
1424+(see \autoref{tab:ltj_fntspc}):
14191425 %</en>
14201426 %<*ja>
1421-\Pkg{luatexja-fontspec}パッケージでは,以下の7つのコマンドを\Pkg{fontspec}
1422-パッケージの元のコマンドに対応するものとして定義している:
1427+\Pkg{luatexja-fontspec}パッケージでは,\autoref{tab:ltj_fntspc}の
1428+「和文」行に示した命令を\Pkg{fontspec}パッケージの元のコマンド(「欧文」行)
1429+に対応するものとして定義している:
14231430 %</ja>
14241431 %<*en>
1425-\begin{center}\small
1426-\begin{tabular}{ccccc}
1432+\begin{table}
1433+\caption{Commands of \Pkg{luatexja-fontspec}}\label{tab:ltj_fntspc}
1434+\medskip
1435+{\centering\small
1436+\begin{tabular}{cllll}
14271437 \toprule
14281438 Japanese fonts
14291439 &\cs{jfontspec}&\cs{setmainjfont}&\cs{setsansjfont}&\cs{setmonojfont}$^*$\\
@@ -1431,18 +1441,33 @@ alphabetic fonts
14311441 &\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\
14321442 \midrule
14331443 Japanese fonts
1434-&\cs{newjfontfamily}&\cs{newjfontface}
1435-&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
1444+&\cs{newjfontfamily}&\cs{renewjfontfamily}$^{**}$&\cs{setjfontfamily}$^{**}$\\
14361445 alphabetic fonts
1437-&\cs{newfontfamily}&\cs{newfontface}
1438-&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
1446+&\cs{newfontfamily}&\cs{renewfontfamily}$^{**}$&\cs{setfontfamily}$^{**}$\\
1447+\midrule
1448+Japanese fonts
1449+&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
1450+alphabetic fonts
1451+&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
14391452 \bottomrule
1440-\end{tabular}
1441-\end{center}
1453+\end{tabular}\par}
1454+\medskip
1455+\fakefn{$^*$}{%
1456+ \cs{setmonojfont} is defined if and only if \texttt{match} option is specified.}
1457+\fakefn{$^{**}$}{%
1458+ \cs{renewfontfamily}~and~\cs{setfontfamily} are new commands
1459+ in \Pkg{fontspec}~v2.6h (2018/7/30).
1460+ Hence, \Pkg{luatexja-fontspec} define \cs{renewjfontfamily}~and~\cs{setjfontfamily}
1461+ only when \Pkg{fontspec}~v2.6h (or later) is used.
1462+}
1463+\end{table}
14421464 %</en>
14431465 %<*ja>
1444-\begin{center}\small
1445-\begin{tabular}{ccccc}
1466+\begin{table}
1467+\caption{\Pkg{luatexja-fontspec}で定義される命令}\label{tab:ltj_fntspc}
1468+\medskip
1469+{\centering\small
1470+\begin{tabular}{cllll}
14461471 \toprule
14471472 和文
14481473 &\cs{jfontspec}&\cs{setmainjfont}&\cs{setsansjfont}&\cs{setmonojfont}$^*$\\
@@ -1450,14 +1475,28 @@ alphabetic fonts
14501475 &\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\
14511476 \midrule
14521477 和文
1453-&\cs{newjfontfamily}&\cs{newjfontface}
1454-&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
1478+&\cs{newjfontfamily}&\cs{renewjfontfamily}$^{**}$&\cs{setjfontfamily}$^{**}$\\
14551479 欧文
1456-&\cs{newfontfamily}&\cs{newfontface}
1457-&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
1480+&\cs{newfontfamily}&\cs{renewfontfamily}$^{**}$&\cs{setfontfamily}$^{**}$\\
1481+\midrule
1482+和文
1483+&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\
1484+欧文
1485+&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\
14581486 \bottomrule
1459-\end{tabular}
1460-\end{center}
1487+\end{tabular}\par}
1488+
1489+\medskip
1490+\fakefn{$^*$}{\cs{setmonojfont} は \texttt{match} オプションが
1491+指定された時のみ定義される.}
1492+\fakefn{$^{**}$}{%
1493+ \cs{renewfontfamily} と \cs{setfontfamily} は
1494+ \Pkg{fontspec}~v2.6h (2018/7/30)で新たに追加された命令である.
1495+ そのため,\Pkg{luatexja-fontspec}が \cs{renewjfontfamily} と \cs{setjfontfamily} を
1496+ 定義するのはv2.6h以降の\Pkg{fontspec}を使用した時のみになっている.
1497+}
1498+
1499+\end{table}
14611500 %</ja>
14621501
14631502 %<en> 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
63636402
63646403 \begin{table}[t]
63656404 \centering\small
6366- \caption{strut}\label{tab:strutbox}
6405+ \caption{strut}\label{tab:strutbox}\medskip
63676406 \begin{tabular}{llcccl}
63686407 \toprule
63696408 \textbf{box}&\textbf{direction}&\textbf{width}&\textbf{height}&\textbf{depth}
@@ -6780,11 +6819,11 @@ with priority&%
67806819 \\
67816820 \bottomrule
67826821 \end{tabular}\par}
6783-\smallskip
6822+\medskip
67846823
6785-Note: the value of
6824+\fakefn{}{The value of
67866825 \Param{kanjiskip} is 0\,pt${}^{+1/5\,\mathrm{em}}_{-1/5\,\mathrm{em}}$ in this figure,
6787-for making the difference obvious.
6826+for making the difference obvious.}
67886827 %<ja>\caption{行長調整}\label{fig:adj}
67896828 %<en>\caption{Line adjustment}\label{fig:adj}
67906829 \end{figure}
Show on old repository browser