| リビジョン | 30954aa3527ab6fe40b8572c91f4c2f6b6b8917b (tree) |
|---|---|
| 日時 | 2018-01-14 16:50:42 |
| 作者 | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| コミッター | Hironori Kitagawa |
Merge branch 'cjascale' into kitagawa_test
doc/ltjclasses.pdf (diff) doc/ltjltxdoc.pdf (diff) doc/ltjsclasses.pdf (diff) doc/luatexja-en.pdf (diff) doc/luatexja-ja.pdf (diff)
doc/luatexja.dtx (diff)
src/addons/luatexja-fontspec-25c.sty (diff) src/addons/luatexja-fontspec.sty (diff) src/addons/luatexja-preset.sty (diff) src/ltjarticle.cls (diff) src/ltjbk10.clo (diff) src/ltjbk11.clo (diff) src/ltjbk12.clo (diff) src/ltjbook.cls (diff) src/ltjclasses.dtx (diff) src/ltjltxdoc.cls (diff) src/ltjltxdoc.dtx (diff) src/ltjreport.cls (diff) src/ltjsarticle.cls (diff) src/ltjsbook.cls (diff) src/ltjsclasses.dtx (diff) src/ltjsize10.clo (diff) src/ltjsize11.clo (diff) src/ltjsize12.clo (diff) src/ltjskiyou.cls (diff) src/ltjspf.cls (diff) src/ltjsreport.cls (diff) src/ltjtarticle.cls (diff) src/ltjtbk10.clo (diff) src/ltjtbk11.clo (diff) src/ltjtbk12.clo (diff) src/ltjtbook.cls (diff) src/ltjtreport.cls (diff) src/ltjtsize10.clo (diff) src/ltjtsize11.clo (diff) src/ltjtsize12.clo (diff)| @@ -482,7 +482,7 @@ Japanese characters in discretionary break (\cs{discretionary}) is not supported | ||
| 482 | 482 | By default, \LuaTeX-ja uses Japanese fonts to typeset Greek and Cyrillic letters, |
| 483 | 483 | To change this behavior, |
| 484 | 484 | put \verb!\ltjsetparameter{jacharrange={-2,-3}}! in the preamble. |
| 485 | - For the detailed description, see Subsection~\ref{ssec-setrange}. | |
| 485 | + For the detailed description, see Subsection~\ref{ssec:setrange}. | |
| 486 | 486 | |
| 487 | 487 | From version~20150906.0, characters which belongs both ISO~8859-1 and JIS~X~0208, |
| 488 | 488 | such as \P~and~\S, are now typeset in alphabetic fonts. |
| @@ -499,7 +499,7 @@ without the \cs{fontspec} (and~\Pkg{luatexja-fontspec}) package. | ||
| 499 | 499 | \end{lstlisting} |
| 500 | 500 | を入れると |
| 501 | 501 | 上記種類の文字は欧文フォントを用いて組まれるようになる． |
| 502 | - 詳しい説明は\ref{ssec-setrange}節を参照してほしい． | |
| 502 | + 詳しい説明は\ref{ssec:setrange}節を参照してほしい． | |
| 503 | 503 | |
| 504 | 504 | また，\P,~\S といったISO~8859-1の上位領域とJIS~X~0208の共通部分の文字は |
| 505 | 505 | バージョン20150906.0から標準で欧文扱いとなった．\LaTeXe\ 2017/01/01以降では |
| @@ -524,11 +524,11 @@ In this document, the following terms and notations are used: | ||
| 524 | 524 | %<*en> |
| 525 | 525 | \item Characters are classified into following two types. |
| 526 | 526 | Note that the classification can be customized by a user |
| 527 | - (see Subsection~\ref{ssec-setrange}). | |
| 527 | + (see Subsection~\ref{ssec:setrange}). | |
| 528 | 528 | %</en> |
| 529 | 529 | %<*ja> |
| 530 | 530 | \item 文字は次の2種類に分けられる．この類別は固定されているものではなく，ユーザが後から変更可能である |
| 531 | - （\ref{ssec-setrange}節を参照）． | |
| 531 | + （\ref{ssec:setrange}節を参照）． | |
| 532 | 532 | %</ja> |
| 533 | 533 | \begin{itemize} |
| 534 | 534 | %<*en> |
| @@ -874,7 +874,7 @@ and finally delete the temporary directory. | ||
| 874 | 874 | |
| 875 | 875 | %<en>\subsection{Using in plain \TeX} |
| 876 | 876 | %<ja>\subsection{plain \TeX で使う} |
| 877 | -\label{ssec-plain} | |
| 877 | +\label{ssec:plain} | |
| 878 | 878 | |
| 879 | 879 | %<en>To use \LuaTeX-ja in plain \TeX, simply put the following at the beginning of the document: |
| 880 | 880 | %<ja>\LuaTeX-jaを plain \TeX で使うためには，単に次の行をソースファイルの冒頭に追加すればよい： |
| @@ -923,11 +923,11 @@ and finally delete the temporary directory. | ||
| 923 | 923 | \begin{itemize} |
| 924 | 924 | %<*en> |
| 925 | 925 | \item With \texttt{luatexja.cfg}, one can use other fonts |
| 926 | -as ``default'' Japanese fonts (Subsection~\ref{ssec-cfg}). | |
| 926 | +as ``default'' Japanese fonts (Subsection~\ref{ssec:cfg}). | |
| 927 | 927 | %</en> |
| 928 | 928 | %<*ja> |
| 929 | 929 | \item \texttt{luatexja.cfg} を用いることによって，標準和文フォントを |
| 930 | -IPAexフォントから別のフォントに置き換えることができる．\ref{ssec-cfg}節を参照． | |
| 930 | +IPAexフォントから別のフォントに置き換えることができる．\ref{ssec:cfg}節を参照． | |
| 931 | 931 | %</ja> |
| 932 | 932 | |
| 933 | 933 | %<*en> |
| @@ -960,7 +960,7 @@ IPAexフォントから別のフォントに置き換えることができる． | ||
| 960 | 960 | |
| 961 | 961 | %<en>\subsection{Using in \LaTeX} |
| 962 | 962 | %<ja>\subsection{\LaTeX で使う} |
| 963 | -\label{ssec-ltx} | |
| 963 | +\label{ssec:ltx} | |
| 964 | 964 | |
| 965 | 965 | %<*en> |
| 966 | 966 | Using in \LaTeXe\ is basically same. To set up the minimal environment |
| @@ -1213,17 +1213,17 @@ This patch \Pkg{lltjp-geometry} also can be used in \pLaTeX; for the detail, ple | ||
| 1213 | 1213 | %<ja>\section{フォントの変更} |
| 1214 | 1214 | |
| 1215 | 1215 | \subsection{plain \TeX~and~\LaTeXe} |
| 1216 | -\label{ssec-chgfnt} | |
| 1216 | +\label{ssec:chgfnt} | |
| 1217 | 1217 | |
| 1218 | 1218 | \paragraph{plain \TeX} |
| 1219 | 1219 | %<*en> |
| 1220 | 1220 | To change Japanese fonts in plain \TeX, you must use the command |
| 1221 | -\cs{jfont}~and~\cs{tfont}. So please see Subsection~\ref{ssec-jfont}. | |
| 1221 | +\cs{jfont}~and~\cs{tfont}. So please see Subsection~\ref{ssec:jfont}. | |
| 1222 | 1222 | %</en> |
| 1223 | 1223 | %<*ja> |
| 1224 | 1224 | plain \TeX で和文フォントを変更するためには， |
| 1225 | 1225 | \pTeX のように \cs{jfont} 命令や \cs{tfont} 命令を直接用いる． |
| 1226 | -\ref{ssec-jfont}節を参照． | |
| 1226 | +\ref{ssec:jfont}節を参照． | |
| 1227 | 1227 | %</ja> |
| 1228 | 1228 | |
| 1229 | 1229 | \paragraph{\LaTeXe\ (NFSS2)} |
| @@ -1286,7 +1286,7 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\ | ||
| 1286 | 1286 | alphabetic fonts to \texttt{T1}. |
| 1287 | 1287 | \cs{fontfamily} also changes the current Japanese font family, |
| 1288 | 1288 | the current alphabetic font family, \emph{or both}. |
| 1289 | - For the detail, see Subsection~\ref{ssec-nfsspat}. | |
| 1289 | + For the detail, see Subsection~\ref{ssec:nfsspat}. | |
| 1290 | 1290 | %</en> |
| 1291 | 1291 | %<*ja> |
| 1292 | 1292 | ここで，\verb+\fontencoding{+<encoding>\verb+}+ は，引数により和文側か欧文 |
| @@ -1295,7 +1295,7 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\ | ||
| 1295 | 1295 | \texttt{JY3}に変更し，\verb+\fontencoding{T1}+ は欧文フォント側を |
| 1296 | 1296 | \texttt{T1}へと変更する．\cs{fontfamily} も引数により和文側，欧文 |
| 1297 | 1297 | 側，\emph{あるいは両方}のフォントファミリを変更する．詳細は |
| 1298 | - \ref{ssec-nfsspat}節を参照すること． | |
| 1298 | + \ref{ssec:nfsspat}節を参照すること． | |
| 1299 | 1299 | %</ja> |
| 1300 | 1300 | |
| 1301 | 1301 | %<*en> |
| @@ -1319,8 +1319,8 @@ auto select&\cs{fontencoding}&\cs{fontfamily}&---&---&\cs{usefont}\\ | ||
| 1319 | 1319 | \end{lstlisting} |
| 1320 | 1320 | %<*ja> |
| 1321 | 1321 | 仮名書体を使う場合など，複数の和文フォントを組み合わせて使いたい場合は |
| 1322 | -\ref{ssec-altfont}節の \cs{ltjdeclarealtfont} と，その\LaTeX 版の\ | |
| 1323 | -\cs{DeclareAlternateKanjiFont}（\ref{ssec-nfsspat}節）を参照せよ． | |
| 1322 | +\ref{ssec:altfont}節の \cs{ltjdeclarealtfont} と，その\LaTeX 版の\ | |
| 1323 | +\cs{DeclareAlternateKanjiFont}（\ref{ssec:nfsspat}節）を参照せよ． | |
| 1324 | 1324 | %</ja> |
| 1325 | 1325 | |
| 1326 | 1326 | \end{itemize} |
| @@ -1376,17 +1376,17 @@ $5\in 素:=\{\,p\in\mathbb N:\text{$p$ is a prime}\,\}$. | ||
| 1376 | 1376 | %<*en> |
| 1377 | 1377 | We also believe that using Japanese characters as identifiers is rare, |
| 1378 | 1378 | hence we don't describe how to change Japanese fonts in math mode in |
| 1379 | -this chapter. For the method, please see Subsection~\ref{ssec-math}. | |
| 1379 | +this chapter. For the method, please see Subsection~\ref{ssec:math}. | |
| 1380 | 1380 | %</en> |
| 1381 | 1381 | %<*ja> |
| 1382 | 1382 | また\LuaTeX-jaプロジェクトでは，和文文字が識別子として用いられることはほとんどない |
| 1383 | 1383 | と考えており，したがってこの節では数式モード中の和文フォントを変更する方法については |
| 1384 | -記述しない．この方法については\ref{ssec-math}節を参照のこと． | |
| 1384 | +記述しない．この方法については\ref{ssec:math}節を参照のこと． | |
| 1385 | 1385 | %</ja> |
| 1386 | 1386 | |
| 1387 | 1387 | %<en>\subsection{\Pkg{luatexja-fontspec} package} |
| 1388 | 1388 | %<ja>\subsection{\Pkg{luatexja-fontspec}パッケージ} |
| 1389 | -\label{ssec-fontspec} | |
| 1389 | +\label{ssec:fontspec} | |
| 1390 | 1390 | %<*en> |
| 1391 | 1391 | To use the functionality of the \Pkg{fontspec} package to Japanese fonts, |
| 1392 | 1392 | it is needed to load the \Pkg{luatexja-fontspec} package in the preamble, as follows: |
| @@ -1487,13 +1487,23 @@ if and only if this \texttt{\textup{match}} option is specified}. | ||
| 1487 | 1487 | \item[scale=<float>] |
| 1488 | 1488 | %<*en> |
| 1489 | 1489 | Override the ratio of the font size of Japanese fonts to that of alphabetic fonts. |
| 1490 | -The default value is calculated automatically (for~example, about~0.924865 when | |
| 1491 | - the \Pkg{ltjsarticle} class is used). | |
| 1490 | +The default value is determined as follows: | |
| 1491 | + \begin{itemize} | |
| 1492 | + \item The value of \cs{Cjascale} is used, if this control sequence is already defined. | |
| 1493 | + \item It is calculated automatically from the current Japanese font at the loading of the | |
| 1494 | + package, if \cs{Cjascale} is not defined. | |
| 1495 | + \end{itemize} | |
| 1496 | +\cs{Cjascale} is defined in \Pkg{ltjclasses} and \Pkg{ltjsclasses}. | |
| 1492 | 1497 | %</en> |
| 1493 | 1498 | %<*ja> |
| 1494 | -欧文に対する和文の比率は，標準では \Pkg{luatexja-fontspec}読み込み時の和欧文比率から | |
| 1495 | -自動計算される（例えば，\Pkg{ltjsarticle}クラス使用時には和文は欧文の約0.924865倍となる）が， | |
| 1496 | -それを手動で上書きするときに使用する． | |
| 1499 | +欧文に対する和文の比率を手動で上書きするときに使用する． | |
| 1500 | +標準では | |
| 1501 | +\begin{itemize} | |
| 1502 | + \item \cs{Cjascale}が定義されている場合 | |
| 1503 | + \footnote{\LuaTeX-ja が用意しているクラスファイル(\Pkg{ltjclasses},~\Pkg{ltjsclasses})を | |
| 1504 | + 使う場合はこちらに当てはまる．}は，それを用いる． | |
| 1505 | + \item \cs{Cjascale}が未定義の場合は，\Pkg{luatexja-fontspec}読み込み時の和文フォントから自動計算される． | |
| 1506 | +\end{itemize} | |
| 1497 | 1507 | %</ja> |
| 1498 | 1508 | \end{cslist} |
| 1499 | 1509 |
| @@ -1613,13 +1623,13 @@ as an external package \Pkg{luatexja-otf}. | ||
| 1613 | 1623 | |
| 1614 | 1624 | これら3オプションについては， |
| 1615 | 1625 | \Pkg{luatexja-preset} パッケージにプリセットを使う時に一緒に指定するか， |
| 1616 | -あるいは対応する内容を\ref{ssec-chgfnt}節，\ref{ssec-nfsspat}節 (NFSS2) や | |
| 1617 | -\ref{ssec-fontspec}節 (\Pkg{fontspec}) の方法で手動で指定する必要がある． | |
| 1626 | +あるいは対応する内容を\ref{ssec:chgfnt}節，\ref{ssec:nfsspat}節 (NFSS2) や | |
| 1627 | +\ref{ssec:fontspec}節 (\Pkg{fontspec}) の方法で手動で指定する必要がある． | |
| 1618 | 1628 | %</ja> |
| 1619 | 1629 | |
| 1620 | 1630 | %<en>\subsection{Changing default Japanese fonts} |
| 1621 | 1631 | %<ja>\subsection{標準和文フォントの変更} |
| 1622 | -\label{ssec-cfg} | |
| 1632 | +\label{ssec:cfg} | |
| 1623 | 1633 | %<*en> |
| 1624 | 1634 | If \texttt{luatexja.cfg} can be seen from \LuaTeX, \LuaTeX-ja automatically reads it. |
| 1625 | 1635 | The main use of \texttt{luatexja.cfg} is for changing default Japanese fonts, |
| @@ -1690,7 +1700,7 @@ parameters, you have to use commands \cs{ltjsetparameter} and | ||
| 1690 | 1700 | |
| 1691 | 1701 | %<en>\subsection{Range of \textbf{JAchar}s} |
| 1692 | 1702 | %<ja>\subsection{\textbf{JAchar}の範囲} |
| 1693 | -\label{ssec-setrange} | |
| 1703 | +\label{ssec:setrange} | |
| 1694 | 1704 | |
| 1695 | 1705 | %<*en> |
| 1696 | 1706 | \LuaTeX-ja divides the Unicode codespace \texttt{U+0080}--\texttt{U+10FFFF} |
| @@ -2156,10 +2166,10 @@ as follows: | ||
| 2156 | 2166 | \ltjsetparameter{alxspmode={`あ,preonly}, jaxspmode={`\!,postonly}} |
| 2157 | 2167 | \end{lstlisting} |
| 2158 | 2168 | %<*en> |
| 2159 | -One can use also numbers to specify these two parameters (see Subsection~\ref{ssec-param}). | |
| 2169 | +One can use also numbers to specify these two parameters (see Subsection~\ref{ssec:param}). | |
| 2160 | 2170 | %</en> |
| 2161 | 2171 | %<*ja> |
| 2162 | -また，これら2パラメータには数値で値を指定することもできる（\ref{ssec-param}節を参照）． | |
| 2172 | +また，これら2パラメータには数値で値を指定することもできる（\ref{ssec:param}節を参照）． | |
| 2163 | 2173 | %</ja> |
| 2164 | 2174 | |
| 2165 | 2175 | %<*en> |
| @@ -2367,7 +2377,7 @@ However, the penalty inserted after it is 10 which is the \Param{postbreakpenalt | ||
| 2367 | 2377 | \end{quote} |
| 2368 | 2378 | は，文字コードごとに設定する量である． |
| 2369 | 2379 | |
| 2370 | -\Pkg{fontspec}パッケージを使う（\ref{ssec-fontspec}節）場合など， | |
| 2380 | +\Pkg{fontspec}パッケージを使う（\ref{ssec:fontspec}節）場合など， | |
| 2371 | 2381 | 各種のOpenType featureを適用することもあると思うが，前段落に述べたパラメータ類は， |
| 2372 | 2382 | \emph{OpenType featureの適用前の文字コードによって適用される．} |
| 2373 | 2383 | 例えば，以下の例において10行目の「ア」は，\verb+hwid+ featureの適用により半角カタカナの「ｱ」 |
| @@ -2476,7 +2486,7 @@ and \LuaTeX-ja can control these four kinds separately: | ||
| 2476 | 2486 | \begin{itemize} |
| 2477 | 2487 | \item |
| 2478 | 2488 | \emph{Distinction between \textbf{JAchar} or \textbf{ALchar}} |
| 2479 | -is controlled by the character range, see Subsection~\ref{ssec-setrange}. | |
| 2489 | +is controlled by the character range, see Subsection~\ref{ssec:setrange}. | |
| 2480 | 2490 | \item |
| 2481 | 2491 | \emph{Whether the character can be used in a control word} |
| 2482 | 2492 | is controlled by setting \cs{catcode} to 11~(enabled) or 12~(disabled), as usual. |
| @@ -2493,7 +2503,7 @@ is controlled by the lowermost bit of the \Param{kcatcode} parameter. | ||
| 2493 | 2503 | 分割している： |
| 2494 | 2504 | \begin{description} |
| 2495 | 2505 | \item[欧文/和文の区別 (\upTeX)] |
| 2496 | -\cs{ltjdefcharrange} と\textsf{jacharrange}パラメータ（\ref{ssec-setrange}節） | |
| 2506 | +\cs{ltjdefcharrange} と\textsf{jacharrange}パラメータ（\ref{ssec:setrange}節） | |
| 2497 | 2507 | \item[制御綴中に使用可か] |
| 2498 | 2508 | \LuaTeX 自身の \cs{catcode} でよい |
| 2499 | 2509 | \item[\Param{jcharwidowpenalty}が挿入可か] |
| @@ -3252,7 +3262,7 @@ overridden by \LuaTeX-ja, using~\verb+\protected\def+. | ||
| 3252 | 3262 | %<ja>\section{フォントメトリックと和文フォント} |
| 3253 | 3263 | %<en>\subsection{\cs{jfont}} |
| 3254 | 3264 | %<ja>\subsection{\cs{jfont} 命令} |
| 3255 | -\label{ssec-jfont} | |
| 3265 | +\label{ssec:jfont} | |
| 3256 | 3266 | |
| 3257 | 3267 | %<*en> |
| 3258 | 3268 | To load a font as a Japanese font (for horizontal direction), you must use the |
| @@ -3489,7 +3499,7 @@ because of the compatibility with previous versions of \LuaTeX-ja. | ||
| 3489 | 3499 | \autoref{fig:kern-jfm}を参照． |
| 3490 | 3500 | \begin{itemize} |
| 3491 | 3501 | \item \emph{\cs{jfont} や， |
| 3492 | -NFSS2用の命令（\ref{ssec-chgfnt}節，\ref{ssec-nfsspat}節）における指定では | |
| 3502 | +NFSS2用の命令（\ref{ssec:chgfnt}節，\ref{ssec:nfsspat}節）における指定では | |
| 3493 | 3503 | カーニング情報は標準で使用する}ことになっているようである． |
| 3494 | 3504 | 言い換えれば，カーニング情報を使用しない設定にするには，面倒でも |
| 3495 | 3505 | \begin{lstlisting} |
| @@ -3686,7 +3696,7 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont | ||
| 3686 | 3696 | }． |
| 3687 | 3697 | \item さらに，「いかなるscript,~languageでも\texttt{vert}により置換されない」グリフ |
| 3688 | 3698 | のうち，UAX~\#50で``r''もしくは``Tr''と指定されているものは90度自動回転させる． |
| 3689 | - \item \ref{ssec-math}節で述べる，数式中の和文フォントには縦組用和文フォントは指定できない． | |
| 3699 | + \item \ref{ssec:math}節で述べる，数式中の和文フォントには縦組用和文フォントは指定できない． | |
| 3690 | 3700 | \item \texttt{jfm=<name>}\ の部分には縦組用JFMを指定する． |
| 3691 | 3701 | 以下の縦組用JFMが\LuaTeX-jaには同梱されている．%おり，違いを\autoref{tab-difjfm-tate}に示した． |
| 3692 | 3702 | \begin{description} |
| @@ -3705,7 +3715,7 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont | ||
| 3705 | 3715 | |
| 3706 | 3716 | %<en>\subsection{Prefix \texttt{psft}} |
| 3707 | 3717 | %<ja>\subsection{\texttt{psft}プリフィックス} |
| 3708 | -\label{ssec-psft} | |
| 3718 | +\label{ssec:psft} | |
| 3709 | 3719 | %<*en> |
| 3710 | 3720 | Besides ``\texttt{file:}''\ and ``\texttt{name:}''\ prefixes which |
| 3711 | 3721 | are introduced in the \Pkg{luaotfload} package, |
| @@ -3808,7 +3818,7 @@ Please contact the LuaTeX-ja project team. | ||
| 3808 | 3818 | |
| 3809 | 3819 | %<en>\subsection{Structure of a JFM file} |
| 3810 | 3820 | %<ja>\subsection{JFMファイルの構造} |
| 3811 | -\label{ssec-jfm-str} | |
| 3821 | +\label{ssec:jfm-str} | |
| 3812 | 3822 | %<en>A JFM file is a Lua script which has only one function call: |
| 3813 | 3823 | %<ja>JFMファイルはただ一つの関数呼び出しを含むLuaスクリプトである： |
| 3814 | 3824 | \begin{lstlisting} |
| @@ -4266,7 +4276,7 @@ we specify <ratio> to $0.25/(0.5+0.25)=1/3$. | ||
| 4266 | 4276 | \begin{cslist}[style=standard] |
| 4267 | 4277 | \item[priority=<priority>] |
| 4268 | 4278 | \Pkg{luatexja-adjust}による優先順位付き |
| 4269 | - 行長調整（\ref{ssec-adj}節）において，このグルーの優先度を指定する．許される値は以下の通り： | |
| 4279 | + 行長調整（\ref{ssec:adj}節）において，このグルーの優先度を指定する．許される値は以下の通り： | |
| 4270 | 4280 | \begin{description} |
| 4271 | 4281 | \item[バージョン1] $-4$から$+3$の間の整数 |
| 4272 | 4282 | \item[バージョン2以降] $-4$から$+3$の間の整数の2つ組\texttt{\{<stretch>, <shrink>\}}か， |
| @@ -4315,7 +4325,7 @@ An integer in $[-4,3]$ (treated as 0 if omitted), or | ||
| 4315 | 4325 | a pair of these integers \texttt{\{<stretch>, <shrink>\}} (version 2~or~later). |
| 4316 | 4326 | This is |
| 4317 | 4327 | used only in line adjustment with priority by \Pkg{luatexja-adjust} |
| 4318 | -(see Subsection~\ref{ssec-adj}). Higher value means the glue is easy to stretch, | |
| 4328 | +(see Subsection~\ref{ssec:adj}). Higher value means the glue is easy to stretch, | |
| 4319 | 4329 | and is also easy to shrink. |
| 4320 | 4330 | \item[kanjiskip\_natural=<num>\textrm{, }% |
| 4321 | 4331 | kanjiskip\_stretch=<num>\textrm{, }kanjiskip\_shrink=<num>]\leavevmode |
| @@ -4367,7 +4377,7 @@ Hence we have the following result: | ||
| 4367 | 4377 | |
| 4368 | 4378 | 優先順位付き行長調整が有効であり，かつ現在の文字クラスの文字が |
| 4369 | 4379 | 行末に来た時に，この文字と行末の間には指定された値のいずれかの大きさのカーンが |
| 4370 | - 挿入される（\autoref{ssec-adj}参照）． | |
| 4380 | + 挿入される（\autoref{ssec:adj}参照）． | |
| 4371 | 4381 | |
| 4372 | 4382 | バージョン1における |
| 4373 | 4383 | \begin{lstlisting}[escapechar=\$] |
| @@ -4593,7 +4603,7 @@ JFM側で一部の対処ができることにより，\Pkg{jsclasses}のよう | ||
| 4593 | 4603 | |
| 4594 | 4604 | %<en>\subsection{Math font family} |
| 4595 | 4605 | %<ja>\subsection{数式フォントファミリ} |
| 4596 | -\label{ssec-math} | |
| 4606 | +\label{ssec:math} | |
| 4597 | 4607 | |
| 4598 | 4608 | %<*en> |
| 4599 | 4609 | \TeX\ handles fonts in math formulas by 16~font families\footnote{Omega, |
| @@ -4938,7 +4948,7 @@ Then, the position of glyphs is shifted up by | ||
| 4938 | 4948 | %<en>\section{Parameters} |
| 4939 | 4949 | %<ja>\section{パラメータ} |
| 4940 | 4950 | \subsection{\cs{ltjsetparameter}} |
| 4941 | -\label{ssec-param} | |
| 4951 | +\label{ssec:param} | |
| 4942 | 4952 | |
| 4943 | 4953 | %<*en> |
| 4944 | 4954 | As described before, \cs{ltjsetparameter} and \cs{ltjgetparameter} are |
| @@ -5168,7 +5178,7 @@ The default glue which inserted between two \textbf{JAchar}s. | ||
| 5168 | 5178 | Changing current Japanese font does not alter this parameter, as \pTeX. |
| 5169 | 5179 | |
| 5170 | 5180 | If the natural width of this parameter is \cs{maxdimen}, \LuaTeX-ja uses |
| 5171 | -the value which is specified in the JFM for current Japanese font (See Subsection~\ref{ssec-jfm-str}). | |
| 5181 | +the value which is specified in the JFM for current Japanese font (See Subsection~\ref{ssec:jfm-str}). | |
| 5172 | 5182 | %</en> |
| 5173 | 5183 | |
| 5174 | 5184 | \item[\DParam{xkanjiskip}\,=<skip>$^\ast$] [\cs{xkanjiskip}]\ |
| @@ -5184,7 +5194,7 @@ The default glue which inserted between a \textbf{JAchar} and an | ||
| 5184 | 5194 | Changing current font does not alter this parameter, as \pTeX. |
| 5185 | 5195 | |
| 5186 | 5196 | As \Param{kanjiskip}, if the natural width of this parameter is \cs{maxdimen}, \LuaTeX-ja uses |
| 5187 | -the value which is specified in the JFM for current Japanese font (See Subsection~\ref{ssec-jfm-str}). | |
| 5197 | +the value which is specified in the JFM for current Japanese font (See Subsection~\ref{ssec:jfm-str}). | |
| 5188 | 5198 | %</en> |
| 5189 | 5199 | |
| 5190 | 5200 |
| @@ -5213,7 +5223,7 @@ The default value is \texttt{paverage}. \dots | ||
| 5213 | 5223 | %</en> |
| 5214 | 5224 | %<*ja> |
| 5215 | 5225 | デフォルト値は \texttt{paverage} である． |
| 5216 | -各々の値による差異の詳細は\ref{ssec-cluster-wa}節の「『右空白』の算出」を参照してほしい． | |
| 5226 | +各々の値による差異の詳細は\ref{ssec:cluster-wa}節の「『右空白』の算出」を参照してほしい． | |
| 5217 | 5227 | %</ja> |
| 5218 | 5228 | |
| 5219 | 5229 | \item[\DParam{jacharrange}\,=<ranges>] |
| @@ -5239,7 +5249,7 @@ the behavior of this assignment is undefined. | ||
| 5239 | 5249 | |
| 5240 | 5250 | |
| 5241 | 5251 | \subsection{\cs{ltjgetparameter}} |
| 5242 | -\label{ssec-getpar} | |
| 5252 | +\label{ssec:getpar} | |
| 5243 | 5253 | %<*en> |
| 5244 | 5254 | \cs{ltjgetparameter} is a control sequence for acquiring parameters. It |
| 5245 | 5255 | always takes a parameter name as first argument. |
| @@ -5709,7 +5719,7 @@ As an example, the example above can be improved as follows: | ||
| 5709 | 5719 | |
| 5710 | 5720 | |
| 5711 | 5721 | \subsection{\cs{ltjdeclarealtfont}} |
| 5712 | -\label{ssec-altfont} | |
| 5722 | +\label{ssec:altfont} | |
| 5713 | 5723 | %<*en> |
| 5714 | 5724 | Using \cs{ltjdeclarealtfont}, one can ``compose'' more than one Japanese fonts. |
| 5715 | 5725 | This \cs{ltjdeclarealtfont} uses in the following form: |
| @@ -5778,7 +5788,7 @@ are typeset by \cs{piyo}. | ||
| 5778 | 5788 | \subsection{\cs{ltjalchar} と \cs{ltjjachar}} |
| 5779 | 5789 | 文字コードが$\text{<chr\_code>}~(\geq 128=\mathtt{0x80})$の文字を |
| 5780 | 5790 | \ \cs{char} プリミティブを使い \cs{char}<chr\_code> として出力させると， |
| 5781 | -その文字の属する文字範囲（\ref{ssec-setrange}節参照）によって | |
| 5791 | +その文字の属する文字範囲（\ref{ssec:setrange}節参照）によって | |
| 5782 | 5792 | \textbf{ALchar}か\textbf{JAchar}か，つまり欧文フォントで出力されるか和文フォントで出力され |
| 5783 | 5793 | るかが決まる． |
| 5784 | 5794 |
| @@ -5789,7 +5799,7 @@ are typeset by \cs{piyo}. | ||
| 5789 | 5799 | <chr\_code>が127以下の場合は，\cs{ltjjachar} であっても\textbf{ALchar}として出力されること |
| 5790 | 5800 | に注意． |
| 5791 | 5801 | |
| 5792 | -以下は\ref{ssec-setrange}節に載せた例に，\cs{char} の動作を追加したものである． | |
| 5802 | +以下は\ref{ssec:setrange}節に載せた例に，\cs{char} の動作を追加したものである． | |
| 5793 | 5803 | \begin{LTXexample}[width=0.25\textwidth] |
| 5794 | 5804 | \gtfamily\large % default, ALchar, JAchar |
| 5795 | 5805 | ¶, \char`¶, \ltjalchar`¶, \ltjjachar`¶\\ % default: ALchar |
| @@ -5802,19 +5812,19 @@ are typeset by \cs{piyo}. | ||
| 5802 | 5812 | |
| 5803 | 5813 | %<en>\subsection{Patch for NFSS2} |
| 5804 | 5814 | %<ja>\subsection{NFSS2へのパッチ} |
| 5805 | -\label{ssec-nfsspat} | |
| 5815 | +\label{ssec:nfsspat} | |
| 5806 | 5816 | |
| 5807 | 5817 | %<*en> |
| 5808 | 5818 | Japanese patch for NFSS2 in \LuaTeX-ja |
| 5809 | 5819 | is based on \texttt{plfonts.dtx} which plays the same role in \pLaTeXe. |
| 5810 | 5820 | We will describe |
| 5811 | -commands which are not described in Subsection~\ref{ssec-chgfnt}. | |
| 5821 | +commands which are not described in Subsection~\ref{ssec:chgfnt}. | |
| 5812 | 5822 | %</en> |
| 5813 | 5823 | %<*ja> |
| 5814 | 5824 | \LuaTeX-jaのNFSS2への日本語パッチは |
| 5815 | 5825 | \pLaTeXe で同様の役割を果たす \texttt{plfonts.dtx} をベースに， |
| 5816 | 5826 | 和文エンコーディングの管理等をLuaで書きなおしたものである． |
| 5817 | -ここでは\ref{ssec-chgfnt}節で述べていなかった命令について | |
| 5827 | +ここでは\ref{ssec:chgfnt}節で述べていなかった命令について | |
| 5818 | 5828 | 記述しておく． |
| 5819 | 5829 | %</ja> |
| 5820 | 5830 |
| @@ -5991,11 +6001,11 @@ character whose character class is zero, instead of `あ'. | ||
| 5991 | 6001 | \item[\cs{fontfamily}\{<family>\}] |
| 5992 | 6002 | %<*en> |
| 5993 | 6003 | As in \LaTeXe, this command changes current font family (alphabetic, Japanese,~\emph{or both}) |
| 5994 | -to <family>. See Subsection~\ref{ssec-fontfamilycmd} for detail. | |
| 6004 | +to <family>. See Subsection~\ref{ssec:fontfamilycmd} for detail. | |
| 5995 | 6005 | %</en> |
| 5996 | 6006 | %<*ja> |
| 5997 | 6007 | 元々の\LaTeXe におけるものと同様に，このコマンドは現在のフォントファミリ（欧文， |
| 5998 | -和文，\emph{もしくは両方}）を<family>に変更する．詳細は\ref{ssec-fontfamilycmd}節を参照すること． | |
| 6008 | +和文，\emph{もしくは両方}）を<family>に変更する．詳細は\ref{ssec:fontfamilycmd}節を参照すること． | |
| 5999 | 6009 | %</ja> |
| 6000 | 6010 | |
| 6001 | 6011 |
| @@ -6018,7 +6028,7 @@ to <family>. See Subsection~\ref{ssec-fontfamilycmd} for detail. | ||
| 6018 | 6028 | \item[\cs{DeclareAlternateKanjiFont}\{<base-encoding>\}\{<base-family>\}\{<base-series>\}\{<base-shape>\}\\ |
| 6019 | 6029 | \null\hfill\{<alt-encoding>\}\{<alt-family>\}\{<alt-series>\}\{<alt-shape>\}\{<range>\}] |
| 6020 | 6030 | %<*ja> |
| 6021 | -\ref{ssec-altfont}節の\ | |
| 6031 | +\ref{ssec:altfont}節の\ | |
| 6022 | 6032 | \cs{ltjdeclarealtfont} と同様に，前半の4引数の |
| 6023 | 6033 | 和文フォント（基底フォント）のうち<range>中の文字を |
| 6024 | 6034 | 第5から第8引数の和文フォントを使って組むように指示する． |
| @@ -6038,7 +6048,7 @@ to <family>. See Subsection~\ref{ssec-fontfamilycmd} for detail. | ||
| 6038 | 6048 | \end{itemize}% |
| 6039 | 6049 | %</ja> |
| 6040 | 6050 | %<*en> |
| 6041 | -As \cs{ltjdeclarealtfont}~(Subsection~\ref{ssec-altfont}), | |
| 6051 | +As \cs{ltjdeclarealtfont}~(Subsection~\ref{ssec:altfont}), | |
| 6042 | 6052 | characters in <range> of the Japanese font (we say the \emph{base font}) |
| 6043 | 6053 | which specified by first 4 arguments are typeset |
| 6044 | 6054 | by the Japanese font which specified by fifth to eighth arguments |
| @@ -6075,7 +6085,7 @@ Avant Garde (OT1/pag/m/n) に変わっていることがわかる． | ||
| 6075 | 6085 | |
| 6076 | 6086 | %<en>\subsection{Detail of \cs{fontfamily} command} |
| 6077 | 6087 | %<ja>\subsection{\cs{fontfamily}コマンドの詳細} |
| 6078 | -\label{ssec-fontfamilycmd} | |
| 6088 | +\label{ssec:fontfamilycmd} | |
| 6079 | 6089 | %<*en> |
| 6080 | 6090 | In this subsection, we describe when \cs{fontfamily}<family> changes current |
| 6081 | 6091 | Japanese/alphabetic font family. Basically, current Japanese fotn family is changed to |
| @@ -6312,9 +6322,9 @@ by \cs{input}. | ||
| 6312 | 6322 | \cs{input} で読み込み可能である． |
| 6313 | 6323 | %</ja> |
| 6314 | 6324 | \subsection{\Pkg{luatexja-fontspec}} |
| 6315 | -\label{ssec-fontspec2} | |
| 6325 | +\label{ssec:fontspec2} | |
| 6316 | 6326 | %<*en> |
| 6317 | -As described in Subsection~\ref{ssec-fontspec}, this optional package | |
| 6327 | +As described in Subsection~\ref{ssec:fontspec}, this optional package | |
| 6318 | 6328 | provides the counterparts for several commands defined in the |
| 6319 | 6329 | \Pkg{fontspec} package (requires \Pkg{fontspec}~v2.4). |
| 6320 | 6330 | In addition to OpenType font features in the original \Pkg{fontspec}, |
| @@ -6322,7 +6332,7 @@ the following ``font features'' specifications are allowed for | ||
| 6322 | 6332 | the commands of Japanese version: |
| 6323 | 6333 | %</en> |
| 6324 | 6334 | %<*ja> |
| 6325 | -\ref{ssec-fontspec}節で述べたように，この追加パッケージは\Pkg{fontspec}% | |
| 6335 | +\ref{ssec:fontspec}節で述べたように，この追加パッケージは\Pkg{fontspec}% | |
| 6326 | 6336 | パッケージで定義されているコマンドに対応する和文フォント用のコマンドを提供する． |
| 6327 | 6337 | |
| 6328 | 6338 | \Pkg{fontspec}パッケージで指定可能な各種OpenType機能に加えて，和文版のコマンドには |
| @@ -6336,7 +6346,7 @@ the commands of Japanese version: | ||
| 6336 | 6346 | %<*en> |
| 6337 | 6347 | These 3 keys correspond to \texttt{cid}, \texttt{jfm} and |
| 6338 | 6348 | \texttt{jfmvar} keys for \cs{jfont}~and~\cs{tfont} respectively. |
| 6339 | -See Subsections~\ref{ssec-jfont} and \ref{ssec-psft} for details | |
| 6349 | +See Subsections~\ref{ssec:jfont} and \ref{ssec:psft} for details | |
| 6340 | 6350 | of \texttt{cid}, \texttt{jfm} and |
| 6341 | 6351 | \texttt{jfmvar} keys. |
| 6342 | 6352 |
| @@ -6348,8 +6358,8 @@ will be actually used in \texttt{YokoFeatures}~and~\texttt{TateFeatures} keys. | ||
| 6348 | 6358 | %<*ja> |
| 6349 | 6359 | これら3つのキーはそれぞれ \cs{jfont},~\cs{tfont}に対する |
| 6350 | 6360 | \texttt{cid}, \texttt{jfm}, \texttt{jfmvar}キーとそれぞれ対応する． |
| 6351 | -\texttt{cid}, \texttt{jfm}, \texttt{jfmvar}キーの詳細は\ref{ssec-jfont}節 | |
| 6352 | - と\ref{ssec-psft}節を参照． | |
| 6361 | +\texttt{cid}, \texttt{jfm}, \texttt{jfmvar}キーの詳細は\ref{ssec:jfont}節 | |
| 6362 | + と\ref{ssec:psft}節を参照． | |
| 6353 | 6363 | |
| 6354 | 6364 | \texttt{CID} キーは下の \texttt{NoEmbed} と合わせて用いられたときのみ有効である． |
| 6355 | 6365 | また，横組用JFMと縦組用JFMは共用できないため，実際に \texttt{JFM} キーを用いる際は |
| @@ -6360,11 +6370,11 @@ will be actually used in \texttt{YokoFeatures}~and~\texttt{TateFeatures} keys. | ||
| 6360 | 6370 | \item[NoEmbed] |
| 6361 | 6371 | %<*en> |
| 6362 | 6372 | By specifying this key, one can use ``name-only'' Japanese font which |
| 6363 | -will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}. | |
| 6373 | +will not be embedded in the output PDF file. See Subsection~\ref{ssec:psft}. | |
| 6364 | 6374 | %</en> |
| 6365 | 6375 | %<*ja> |
| 6366 | 6376 | これを指定することで，PDFに埋め込まれない「名前だけ」のフォントを指定することが |
| 6367 | -できる．\ref{ssec-psft}節を参照． | |
| 6377 | +できる．\ref{ssec:psft}節を参照． | |
| 6368 | 6378 | %</ja> |
| 6369 | 6379 | |
| 6370 | 6380 | \begin{figure}[!tb] |
| @@ -6436,16 +6446,16 @@ A demonstrarion is shown in \autoref{fig:yokotate-fontspec}. | ||
| 6436 | 6446 | \item[AltFont] |
| 6437 | 6447 | |
| 6438 | 6448 | %<*en> |
| 6439 | -As \cs{ltjdeclarealtfont}~(Subsection~\ref{ssec-altfont}) and | |
| 6440 | -\cs{DeclareAlternateKanjiFont}~(Subsection~\ref{ssec-nfsspat}), | |
| 6449 | +As \cs{ltjdeclarealtfont}~(Subsection~\ref{ssec:altfont}) and | |
| 6450 | +\cs{DeclareAlternateKanjiFont}~(Subsection~\ref{ssec:nfsspat}), | |
| 6441 | 6451 | with this key, one can typeset some Japanese characters |
| 6442 | 6452 | by a different font and/or using different features. |
| 6443 | 6453 | The \texttt{AltFont} feature takes a comma-separated list of comma-separated lists, |
| 6444 | 6454 | as the following: |
| 6445 | 6455 | %</en> |
| 6446 | 6456 | %<*ja> |
| 6447 | -\ref{ssec-altfont}節の \cs{ltjdeclarealtfont} や， | |
| 6448 | -\ref{ssec-nfsspat}節の \cs{DeclareAlternateKanjiFont} と同様に， | |
| 6457 | +\ref{ssec:altfont}節の \cs{ltjdeclarealtfont} や， | |
| 6458 | +\ref{ssec:nfsspat}節の \cs{DeclareAlternateKanjiFont} と同様に， | |
| 6449 | 6459 | このキーを用いると一部の文字を異なったフォントや機能たちを使って組むことができる． |
| 6450 | 6460 | \texttt{AltFont} キーに指定する値は，次のように二重のコンマ区切りリストである： |
| 6451 | 6461 | %</ja> |
| @@ -6545,7 +6555,7 @@ OpenType機能指定は | ||
| 6545 | 6555 | |
| 6546 | 6556 | |
| 6547 | 6557 | \subsection{\Pkg{luatexja-otf}} |
| 6548 | -\label{ssec-ltjotf} | |
| 6558 | +\label{ssec:ltjotf} | |
| 6549 | 6559 | %<*en> |
| 6550 | 6560 | This optional package supports typesetting glyphs |
| 6551 | 6561 | by specifying a CID number. |
| @@ -6651,7 +6661,7 @@ JFMの\texttt{chars}テーブルのエントリとして \verb+'AJ1-xxx'+ の形 | ||
| 6651 | 6661 | %</ja> |
| 6652 | 6662 | |
| 6653 | 6663 | \subsection{\Pkg{luatexja-adjust}} |
| 6654 | -\label{ssec-adj} | |
| 6664 | +\label{ssec:adj} | |
| 6655 | 6665 | \begin{figure}[t] |
| 6656 | 6666 | \def\sq{% |
| 6657 | 6667 | \hbox to 1\zw{\hss\fboxsep=-.5\fboxrule\fbox{% |
| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{luatexja-fontspec-25c}[2017/05/05 fontspec support of LuaTeX-ja] | |
| 6 | +\ProvidesPackage{luatexja-fontspec-25c}[2017/12/15 fontspec support of LuaTeX-ja] | |
| 7 | 7 | \RequirePackage{l3keys2e,luatexja} |
| 8 | 8 | \ExplSyntaxOn |
| 9 | 9 |
| @@ -140,7 +140,7 @@ | ||
| 140 | 140 | } |
| 141 | 141 | \clist_set:Nx \g__fontspec_default_fontopts_clist { |
| 142 | 142 | YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv }, |
| 143 | - Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, Script=CJK, | |
| 143 | + Scale=\Cjascale, Kerning=Off, Script=CJK, | |
| 144 | 144 | \g__ltj_fontspec_default_fontopts_clist |
| 145 | 145 | } |
| 146 | 146 | \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop |
| @@ -3,17 +3,19 @@ | ||
| 3 | 3 | % |
| 4 | 4 | |
| 5 | 5 | \NeedsTeXFormat{LaTeX2e} |
| 6 | -\ProvidesPackage{luatexja-fontspec}[2017/06/25 fontspec support of LuaTeX-ja] | |
| 6 | +\ProvidesPackage{luatexja-fontspec}[2017/12/31 fontspec support of LuaTeX-ja] | |
| 7 | 7 | \RequirePackage{l3keys2e,luatexja} |
| 8 | 8 | \ExplSyntaxOn |
| 9 | 9 | |
| 10 | -%%%%%%%% \g_ltj_fontspec_scale_fp | |
| 11 | -%% Default scale value for jfont. | |
| 12 | -\fp_new:N \g_ltj_fontspec_scale_fp | |
| 13 | -\group_begin: | |
| 14 | -\fontsize{16}{16}\selectfont | |
| 15 | -\fp_gset:Nn \g_ltj_fontspec_scale_fp {\zw / 16} | |
| 16 | -\group_end: | |
| 10 | +\cs_if_exist:NF \Cjascale { | |
| 11 | + %%%%%%%% \g_ltj_fontspec_scale_fp | |
| 12 | + %% Default scale value for jfont. | |
| 13 | + \fp_new:N \g_ltj_fontspec_scale_fp | |
| 14 | + \group_begin: | |
| 15 | + \fontsize{16}{16}\selectfont | |
| 16 | + \cs_gset:Npx \Cjascale { \fp_to_decimal:n {\zw / 16} } | |
| 17 | + \group_end: | |
| 18 | +} | |
| 17 | 19 | |
| 18 | 20 | \bool_new:N \ltj_fontspec_match_bool |
| 19 | 21 | \keys_define:nn { luatexja-fontspec } |
| @@ -22,10 +24,11 @@ | ||
| 22 | 24 | match .default:n = true, |
| 23 | 25 | pass .code:n = \PassOptionsToPackage{#1} {fontspec}, |
| 24 | 26 | % 互換性のために残したオプション |
| 25 | - scale .fp_gset:N = \g_ltj_fontspec_scale_fp, | |
| 27 | + scale .code:n = \gdef\Cjascale{#1}, | |
| 26 | 28 | unknown .code:n = \PassOptionsToPackage { \l_keys_key_tl } {fontspec}, |
| 27 | 29 | } |
| 28 | 30 | \ProcessKeysOptions{ luatexja-fontspec } |
| 31 | + | |
| 29 | 32 | \RequirePackage{fontspec}[2017/01/01]% v2.5c |
| 30 | 33 | \RequirePackage{luatexja-fontspec-25c} |
| 31 | 34 | %\@ifpackagelater{fontspec}{2017/01/01}% |
| @@ -1,16 +1,10 @@ | ||
| 1 | 1 | % luatexja-preset.sty |
| 2 | -\ProvidesPackage{luatexja-preset}[2017/09/04 Japanese font presets] | |
| 2 | +\ProvidesPackage{luatexja-preset}[2017/12/15 Japanese font presets] | |
| 3 | 3 | |
| 4 | 4 | \RequirePackage{expl3,l3keys2e} |
| 5 | 5 | \RequirePackage{luatexja} |
| 6 | 6 | \ExplSyntaxOn |
| 7 | 7 | |
| 8 | -\fp_new:N \g_ltjpreset_scale_fp | |
| 9 | -\group_begin: | |
| 10 | -\fontsize{10}{10}\selectfont | |
| 11 | -\fp_gset:Nn \g_ltjpreset_scale_fp {\zw / 10} | |
| 12 | -\group_end: | |
| 13 | - | |
| 14 | 8 | %% messages |
| 15 | 9 | \msg_new:nnn { luatexja-preset }{ ltj-fontspec }{ |
| 16 | 10 | The~ luatexja-fontspec~ package~ is~ loaded~ already.~ |
| @@ -44,7 +38,7 @@ | ||
| 44 | 38 | \tl_if_empty:NT \l_tmpa_tl { |
| 45 | 39 | \PassOptionsToPackage { \l_tmpa_tl } { luatexja-fontspec } |
| 46 | 40 | }, |
| 47 | - scale .fp_gset:N = \g_ltjpreset_scale_fp, | |
| 41 | + scale .code:n = \gdef\Cjascale{#1}, | |
| 48 | 42 | match .code: n = |
| 49 | 43 | \renewcommand\jttdefault{\gtdefault}\@ltj@match@familytrue |
| 50 | 44 | \PassOptionsToPackage { match } { luatexja-fontspec }, |
| @@ -450,11 +444,11 @@ | ||
| 450 | 444 | \bool_if:NTF \g_ltjpreset_nfssonly_bool { |
| 451 | 445 | %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |
| 452 | 446 | %%%%%%%% nfss only |
| 453 | - \msg_warning:nnx { luatexja-preset }{ scale }{ \fp_use:N \g_ltjpreset_scale_fp } | |
| 447 | + \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale } | |
| 454 | 448 | |
| 455 | 449 | \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn { |
| 456 | 450 | \cs_if_exist:cT { #1/#2/#3/#4/10 } { \cs_undefine:c { #1/#2/#3/#4/10 } } |
| 457 | - \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\fp_use:N \g_ltjpreset_scale_fp] | |
| 451 | + \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\Cjascale] | |
| 458 | 452 | { \bool_if:NT \g_ltjpreset_noembed_bool {psft:} #5 |
| 459 | 453 | ;-kern \tl_use:N \l_ltjpreset_kanji_shape_tl; #6 } } {} |
| 460 | 454 | } |
| @@ -515,10 +509,9 @@ | ||
| 515 | 509 | %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |
| 516 | 510 | %%%%%%%% fontspec |
| 517 | 511 | } { |
| 518 | - \PassOptionsToPackage { scale = \fp_use:N \g_ltjpreset_scale_fp } { luatexja-fontspec } | |
| 519 | 512 | \RequirePackage{luatexja-fontspec} |
| 520 | 513 | % scale |
| 521 | - \msg_warning:nnx { luatexja-preset }{ scale }{ \fp_use:N \g_ltj_fontspec_scale_fp } | |
| 514 | + \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale } | |
| 522 | 515 | \tl_new:N \l_ltjpreset_add_features_tl |
| 523 | 516 | |
| 524 | 517 | \bool_if:NT \g_ltjpreset_expert_bool { |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesClass{ltjarticle} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja class] |
| 28 | 28 | \RequirePackage{luatexja} |
| 29 | 29 | \newcounter{@paper} |
| @@ -133,6 +133,7 @@ | ||
| 133 | 133 | 'ltj.jclasses_load_jfm', 1)} |
| 134 | 134 | {\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua |
| 135 | 135 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 136 | +\def\Cjascale{0.962216} | |
| 136 | 137 | \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} |
| 137 | 138 | \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} |
| 138 | 139 | \ltjglobalsetparameter{differentjfm=both} |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjbk10.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xpt{15}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjbk11.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xipt{15.5}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjbk12.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xiipt{16.5}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesClass{ltjbook} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja class] |
| 28 | 28 | \RequirePackage{luatexja} |
| 29 | 29 | \newcounter{@paper} |
| @@ -143,6 +143,7 @@ | ||
| 143 | 143 | 'ltj.jclasses_load_jfm', 1)} |
| 144 | 144 | {\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua |
| 145 | 145 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 146 | +\def\Cjascale{0.962216} | |
| 146 | 147 | \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} |
| 147 | 148 | \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} |
| 148 | 149 | \ltjglobalsetparameter{differentjfm=both} |
| @@ -114,6 +114,7 @@ | ||
| 114 | 114 | % それを用いるように変更（PDFサイズ削減のため）．} |
| 115 | 115 | % \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更} |
| 116 | 116 | % \changes{v1.7g}{2017/09/19}{内部処理で使ったボックス0を空にした} |
| 117 | +% \changes{v1.7g-ltj-16}{2017/12/31}{\cs{Cjascale}追加} | |
| 117 | 118 | % \fi |
| 118 | 119 | % |
| 119 | 120 | % \iffalse |
| @@ -143,7 +144,7 @@ | ||
| 143 | 144 | %<11pt&bk>\ProvidesFile{ltjtbk11.clo} |
| 144 | 145 | %<12pt&bk>\ProvidesFile{ltjtbk12.clo} |
| 145 | 146 | %</tate> |
| 146 | - [2017/09/19 v1.7g-ltj-15 | |
| 147 | + [2017/12/31 v1.7g-ltj-16 | |
| 147 | 148 | %<article|report|book> Standard LuaLaTeX-ja class] |
| 148 | 149 | %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] |
| 149 | 150 | %<*driver> |
| @@ -583,6 +584,10 @@ | ||
| 583 | 584 | % \changes{v1.6-ltj-9}{2015/01/01}{サイズクラスのロード前にメトリックの変更を行わないと， |
| 584 | 585 | % \cs{Cht}等の値が反映されないのでこの場所に移動させました．} |
| 585 | 586 | % |
| 587 | +% \changes{v1.6g-ltj-16}{2017/12/31}{\cs{Cjascale}を追加しました。 | |
| 588 | +% これは、コミュニティ版p\kern-.05em\LaTeX で導入された、 | |
| 589 | +% 和文スケール（$1\,\cs{zw} \div \hbox{要求サイズ}$）を表す実数値マクロです。} | |
| 590 | +% | |
| 586 | 591 | % \begin{macrocode} |
| 587 | 592 | %<*article|report|book> |
| 588 | 593 | \directlua{luatexbase.add_to_callback('luatexja.load_jfm', |
| @@ -590,6 +595,7 @@ | ||
| 590 | 595 | 'ltj.jclasses_load_jfm', 1)} |
| 591 | 596 | {\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua |
| 592 | 597 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 598 | +\def\Cjascale{0.962216} | |
| 593 | 599 | \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} |
| 594 | 600 | \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} |
| 595 | 601 | \ltjglobalsetparameter{differentjfm=both} |
| @@ -39,11 +39,12 @@ | ||
| 39 | 39 | %% |
| 40 | 40 | |
| 41 | 41 | \NeedsTeXFormat{LaTeX2e} |
| 42 | -\ProvidesClass{ltjltxdoc}[2011/10/03 v1.0b-ltj Standard LuaLaTeX-ja file] | |
| 42 | +\ProvidesClass{ltjltxdoc}[2018/01/01 v1.0d-ltj-3 Standard LuaLaTeX-ja file] | |
| 43 | 43 | \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ltxdoc}} |
| 44 | 44 | \ProcessOptions |
| 45 | 45 | \LoadClass{ltxdoc} |
| 46 | 46 | \RequirePackage{luatexja} |
| 47 | +\def\Cjascale{0.962216} | |
| 47 | 48 | \renewcommand{\normalsize}{% |
| 48 | 49 | \@setfontsize\normalsize\@xpt{15}% |
| 49 | 50 | \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ |
| @@ -82,6 +83,10 @@ | ||
| 82 | 83 | \vskip.5\baselineskip |
| 83 | 84 | \hrule height.1pt\egroup |
| 84 | 85 | \hss\vrule width.1pt\egroup} |
| 86 | +\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi | |
| 87 | + \bgroup \let\do\do@noligs \verbatim@nolig@list | |
| 88 | + \ttfamily \verb@eol@error \let\do\@makeother \dospecials | |
| 89 | + \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} | |
| 85 | 90 | \ltjsetparameter{alxspmode={"5C,3}} %% \ |
| 86 | 91 | \ltjsetparameter{alxspmode={"22,3}} %% " |
| 87 | 92 | \def\mod@math@codes{\mathcode`\|="207C \mathcode`\&="2026 |
| @@ -10,24 +10,6 @@ | ||
| 10 | 10 | % |
| 11 | 11 | % \fi |
| 12 | 12 | % |
| 13 | -% \CheckSum{151} | |
| 14 | -%% \CharacterTable | |
| 15 | -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z | |
| 16 | -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z | |
| 17 | -%% Digits \0\1\2\3\4\5\6\7\8\9 | |
| 18 | -%% Exclamation \! Double quote \" Hash (number) \# | |
| 19 | -%% Dollar \$ Percent \% Ampersand \& | |
| 20 | -%% Acute accent \' Left paren \( Right paren \) | |
| 21 | -%% Asterisk \* Plus \+ Comma \, | |
| 22 | -%% Minus \- Point \. Solidus \/ | |
| 23 | -%% Colon \: Semicolon \; Less than \< | |
| 24 | -%% Equals \= Greater than \> Question mark \? | |
| 25 | -%% Commercial at \@ Left bracket \[ Backslash \\ | |
| 26 | -%% Right bracket \] Circumflex \^ Underscore \_ | |
| 27 | -%% Grave accent \` Left brace \{ Vertical bar \| | |
| 28 | -%% Right brace \} Tilde \~} | |
| 29 | -%% | |
| 30 | -% | |
| 31 | 13 | % \setcounter{StandardModuleDepth}{1} |
| 32 | 14 | % \StopEventually{} |
| 33 | 15 | % |
| @@ -39,12 +21,13 @@ | ||
| 39 | 21 | % \changes{v1.0b-ltj-2}{2014/07/03}{orを意味する縦棒の出力が異常だったので修正} |
| 40 | 22 | % \changes{v1.0c}{2016/07/25}{docパッケージが上書きする\cs{verb}を再々定義} |
| 41 | 23 | % \changes{v1.0d}{2017/09/24}{\cs{vadjust\{\}}を追加} |
| 24 | +% \changes{v1.0d-ltj-3}{2018/01/01}{\cs{Cjascale}を追加} | |
| 42 | 25 | % \fi |
| 43 | 26 | % |
| 44 | 27 | % \iffalse |
| 45 | 28 | %<class> |
| 46 | 29 | %<class>\NeedsTeXFormat{LaTeX2e} |
| 47 | -%<class>\ProvidesClass{ltjltxdoc}[2017/09/24 v1.0d-ltj-2 Standard LuaLaTeX-ja file] | |
| 30 | +%<class>\ProvidesClass{ltjltxdoc}[2018/01/01 v1.0d-ltj-3 Standard LuaLaTeX-ja file] | |
| 48 | 31 | %<*driver> |
| 49 | 32 | \documentclass{ltjltxdoc} |
| 50 | 33 | \GetFileInfo{ltjltxdoc.cls} |
| @@ -70,8 +53,14 @@ | ||
| 70 | 53 | \LoadClass{ltxdoc} |
| 71 | 54 | % \end{macrocode} |
| 72 | 55 | % \file{ltxdoc}の読み込み後に\file{luatexja}を読み込みます。 |
| 56 | +% | |
| 57 | +% \changes{v1.60d-ltj-3}{2018/01/01}{\cs{Cjascale}を追加しました。 | |
| 58 | +% これは、コミュニティ版p\kern-.05em\LaTeX で導入された、 | |
| 59 | +% 和文スケール（$1\,\cs{zw} \div \hbox{要求サイズ}$）を表す実数値マクロです。} | |
| 60 | +% | |
| 73 | 61 | % \begin{macrocode} |
| 74 | 62 | \RequirePackage{luatexja} |
| 63 | +\def\Cjascale{0.962216} | |
| 75 | 64 | % \end{macrocode} |
| 76 | 65 | % |
| 77 | 66 | % \begin{macro}{\normalsize} |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesClass{ltjreport} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja class] |
| 28 | 28 | \RequirePackage{luatexja} |
| 29 | 29 | \newcounter{@paper} |
| @@ -141,6 +141,7 @@ | ||
| 141 | 141 | 'ltj.jclasses_load_jfm', 1)} |
| 142 | 142 | {\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua |
| 143 | 143 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 144 | +\def\Cjascale{0.962216} | |
| 144 | 145 | \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} |
| 145 | 146 | \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} |
| 146 | 147 | \ltjglobalsetparameter{differentjfm=both} |
| @@ -318,21 +318,22 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% | ||
| 318 | 318 | \setlength{\pageheight}{\paperheight} |
| 319 | 319 | \fi |
| 320 | 320 | \fi |
| 321 | + \def\Cjascale{0.924715} | |
| 321 | 322 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 322 | 323 | \ifmingoth |
| 323 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} | |
| 324 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} | |
| 324 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} | |
| 325 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{} | |
| 325 | 326 | \else |
| 326 | 327 | \ifptexjis |
| 327 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} | |
| 328 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} | |
| 328 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} | |
| 329 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} | |
| 329 | 330 | \else |
| 330 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} | |
| 331 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} | |
| 331 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} | |
| 332 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} | |
| 332 | 333 | \fi |
| 333 | 334 | \fi |
| 334 | -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} | |
| 335 | -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} | |
| 335 | +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} | |
| 336 | +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} | |
| 336 | 337 | \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} |
| 337 | 338 | \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} |
| 338 | 339 | \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} |
| @@ -326,21 +326,22 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% | ||
| 326 | 326 | \setlength{\pageheight}{\paperheight} |
| 327 | 327 | \fi |
| 328 | 328 | \fi |
| 329 | + \def\Cjascale{0.924715} | |
| 329 | 330 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 330 | 331 | \ifmingoth |
| 331 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} | |
| 332 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} | |
| 332 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} | |
| 333 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{} | |
| 333 | 334 | \else |
| 334 | 335 | \ifptexjis |
| 335 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} | |
| 336 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} | |
| 336 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} | |
| 337 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} | |
| 337 | 338 | \else |
| 338 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} | |
| 339 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} | |
| 339 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} | |
| 340 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} | |
| 340 | 341 | \fi |
| 341 | 342 | \fi |
| 342 | -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} | |
| 343 | -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} | |
| 343 | +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} | |
| 344 | +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} | |
| 344 | 345 | \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} |
| 345 | 346 | \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} |
| 346 | 347 | \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} |
| @@ -966,23 +966,7 @@ | ||
| 966 | 966 | % |
| 967 | 967 | % [2016-03-21 LTJ] 拡大率の計算で1~ptを$1/72.27$インチでなく0.3514~mmと間違えて扱っていたのを修正。 |
| 968 | 968 | % \begin{macrocode} |
| 969 | -%<*!jspf> | |
| 970 | -\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax | |
| 971 | -\ifmingoth | |
| 972 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} | |
| 973 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} | |
| 974 | -\else | |
| 975 | - \ifptexjis | |
| 976 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} | |
| 977 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} | |
| 978 | - \else | |
| 979 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} | |
| 980 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} | |
| 981 | - \fi | |
| 982 | -\fi | |
| 983 | -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} | |
| 984 | -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} | |
| 985 | -%</!jspf> | |
| 969 | +%<!jspf> \def\Cjascale{0.924715} | |
| 986 | 970 | % \end{macrocode} |
| 987 | 971 | % |
| 988 | 972 | % これにより，公称10ポイントの和文フォントを0.924715倍したことにより， |
| @@ -995,23 +979,27 @@ | ||
| 995 | 979 | % $0.9*72.27/72 \simeq 0.903375$ 倍します。 |
| 996 | 980 | % |
| 997 | 981 | % \begin{macrocode} |
| 998 | -%<*jspf> | |
| 982 | +%<jspf> \def\Cjascale{0.903375} | |
| 983 | +% \end{macrocode} | |
| 984 | +% | |
| 985 | +% 実際にフォントの再定義を行う部分です． | |
| 986 | +% | |
| 987 | +% \begin{macrocode} | |
| 999 | 988 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 1000 | 989 | \ifmingoth |
| 1001 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=min}{} | |
| 1002 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=min}{} | |
| 990 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} | |
| 991 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{} | |
| 1003 | 992 | \else |
| 1004 | 993 | \ifptexjis |
| 1005 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=jis}{} | |
| 1006 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=jis}{} | |
| 994 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} | |
| 995 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} | |
| 1007 | 996 | \else |
| 1008 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=ujis}{} | |
| 1009 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=ujis}{} | |
| 997 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} | |
| 998 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} | |
| 1010 | 999 | \fi |
| 1011 | 1000 | \fi |
| 1012 | -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=ujisv}{} | |
| 1013 | -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=ujisv}{} | |
| 1014 | -%</jspf> | |
| 1001 | +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} | |
| 1002 | +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} | |
| 1015 | 1003 | % \end{macrocode} |
| 1016 | 1004 | % |
| 1017 | 1005 | % 和文でイタリック体，斜体，サンセリフ体， |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjsize10.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xpt{15}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjsize11.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xipt{15.5}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjsize12.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xiipt{16.5}% |
| @@ -318,21 +318,22 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% | ||
| 318 | 318 | \setlength{\pageheight}{\paperheight} |
| 319 | 319 | \fi |
| 320 | 320 | \fi |
| 321 | + \def\Cjascale{0.924715} | |
| 321 | 322 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 322 | 323 | \ifmingoth |
| 323 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} | |
| 324 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} | |
| 324 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} | |
| 325 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{} | |
| 325 | 326 | \else |
| 326 | 327 | \ifptexjis |
| 327 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} | |
| 328 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} | |
| 328 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} | |
| 329 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} | |
| 329 | 330 | \else |
| 330 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} | |
| 331 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} | |
| 331 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} | |
| 332 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} | |
| 332 | 333 | \fi |
| 333 | 334 | \fi |
| 334 | -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} | |
| 335 | -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} | |
| 335 | +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} | |
| 336 | +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} | |
| 336 | 337 | \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} |
| 337 | 338 | \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} |
| 338 | 339 | \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} |
| @@ -317,21 +317,22 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% | ||
| 317 | 317 | \setlength{\pageheight}{\paperheight} |
| 318 | 318 | \fi |
| 319 | 319 | \fi |
| 320 | + \def\Cjascale{0.903375} | |
| 320 | 321 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 321 | 322 | \ifmingoth |
| 322 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=min}{} | |
| 323 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=min}{} | |
| 323 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} | |
| 324 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{} | |
| 324 | 325 | \else |
| 325 | 326 | \ifptexjis |
| 326 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=jis}{} | |
| 327 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=jis}{} | |
| 327 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} | |
| 328 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} | |
| 328 | 329 | \else |
| 329 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=ujis}{} | |
| 330 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=ujis}{} | |
| 330 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} | |
| 331 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} | |
| 331 | 332 | \fi |
| 332 | 333 | \fi |
| 333 | -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=ujisv}{} | |
| 334 | -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=ujisv}{} | |
| 334 | +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} | |
| 335 | +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} | |
| 335 | 336 | \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} |
| 336 | 337 | \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} |
| 337 | 338 | \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} |
| @@ -322,21 +322,22 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% | ||
| 322 | 322 | \setlength{\pageheight}{\paperheight} |
| 323 | 323 | \fi |
| 324 | 324 | \fi |
| 325 | + \def\Cjascale{0.924715} | |
| 325 | 326 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 326 | 327 | \ifmingoth |
| 327 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} | |
| 328 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} | |
| 328 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{} | |
| 329 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=min}{} | |
| 329 | 330 | \else |
| 330 | 331 | \ifptexjis |
| 331 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} | |
| 332 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} | |
| 332 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{} | |
| 333 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{} | |
| 333 | 334 | \else |
| 334 | - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} | |
| 335 | - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} | |
| 335 | + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{} | |
| 336 | + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{} | |
| 336 | 337 | \fi |
| 337 | 338 | \fi |
| 338 | -\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} | |
| 339 | -\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} | |
| 339 | +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{} | |
| 340 | +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{} | |
| 340 | 341 | \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} |
| 341 | 342 | \DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} |
| 342 | 343 | \DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesClass{ltjtarticle} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja class] |
| 28 | 28 | \RequirePackage{luatexja} |
| 29 | 29 | \newcounter{@paper} |
| @@ -144,6 +144,7 @@ | ||
| 144 | 144 | 'ltj.jclasses_load_jfm', 1)} |
| 145 | 145 | {\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua |
| 146 | 146 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 147 | +\def\Cjascale{0.962216} | |
| 147 | 148 | \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} |
| 148 | 149 | \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} |
| 149 | 150 | \ltjglobalsetparameter{differentjfm=both} |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjtbk10.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xpt{17}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjtbk11.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xipt{17}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjtbk12.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xiipt{18}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesClass{ltjtbook} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja class] |
| 28 | 28 | \RequirePackage{luatexja} |
| 29 | 29 | \newcounter{@paper} |
| @@ -154,6 +154,7 @@ | ||
| 154 | 154 | 'ltj.jclasses_load_jfm', 1)} |
| 155 | 155 | {\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua |
| 156 | 156 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 157 | +\def\Cjascale{0.962216} | |
| 157 | 158 | \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} |
| 158 | 159 | \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} |
| 159 | 160 | \ltjglobalsetparameter{differentjfm=both} |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesClass{ltjtreport} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja class] |
| 28 | 28 | \RequirePackage{luatexja} |
| 29 | 29 | \newcounter{@paper} |
| @@ -152,6 +152,7 @@ | ||
| 152 | 152 | 'ltj.jclasses_load_jfm', 1)} |
| 153 | 153 | {\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua |
| 154 | 154 | \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax |
| 155 | +\def\Cjascale{0.962216} | |
| 155 | 156 | \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} |
| 156 | 157 | \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} |
| 157 | 158 | \ltjglobalsetparameter{differentjfm=both} |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjtsize10.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xpt{17}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjtsize11.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xipt{17}% |
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | %% File: ltjclasses.dtx |
| 24 | 24 | \NeedsTeXFormat{LaTeX2e} |
| 25 | 25 | \ProvidesFile{ltjtsize12.clo} |
| 26 | - [2017/09/19 v1.7g-ltj-15 | |
| 26 | + [2017/12/31 v1.7g-ltj-16 | |
| 27 | 27 | Standard LuaLaTeX-ja file (size option)] |
| 28 | 28 | \renewcommand{\normalsize}{% |
| 29 | 29 | \@setfontsize\normalsize\@xiipt{18}% |
Fork