From 6dddb9db47abe97ad6955d2d04f339ca96389e48 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Aug 2019 21:07:07 +0000 Subject: luatexja (26aug19) git-svn-id: svn://tug.org/texlive/trunk@51963 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 12 ++-- .../texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | Bin 408168 -> 408511 bytes .../texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | Bin 503494 -> 504124 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 475635 -> 474968 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 864583 -> 863227 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 66 ++++++++++++--------- 6 files changed, 44 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 25046e71682..ab88e3cb75e 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20190708.0 +The LuaTeX-ja Package 20190826.0 -------------------------------- Copyright (c) 2011--2019 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -23,7 +23,7 @@ Installation 0. Please make sure that your TeX distribution is up-to-date. This version of LuaTeX-ja requires - LuaTeX 1.0.0 or later - - luaotfload v2.6 + - luaotfload (v2.98 or later recommended) - adobemapping (Adobe CMap files) - everysel package - etoolbox package @@ -35,14 +35,14 @@ Installation - IPAex fonts (http://ipafont.ipa.go.jp/) Hence this version does not work in TeX Live 2016 (or earlier). -1. If you are using TeX Live 2018 or later, you can install LuaTeX-ja via tlmgr. +1. If you are using TeX Live 2019 or later, you can install LuaTeX-ja via tlmgr. 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20190708.0 in the Git repository by + or tagged as 20190826.0 in the Git repository by + ;a=snapshot;h=refs/tags/20190826.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -87,4 +87,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Jul 8 15:23:01 2019 +0900 +Last commit date: Mon Aug 26 09:29:22 2019 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf index 35711733799..872598852f8 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf index 299c6fb040f..06aa0a88da6 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 7a96dccb4bb..ed027605465 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 1688589de04..eb9c60bca0e 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index b2c53a818a5..d65b7165b8b 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -40,11 +40,12 @@ %%%%%%%% fonts \usepackage{luatexja-otf} \usepackage[no-math]{fontspec} -\setmainfont[Ligatures=TeX]{Linux Libertine O} +\setmainfont[Ligatures=TeX,RawFeature=-notdef]{Linux Libertine O} \setmonofont[Scale=MatchLowercase, ItalicFont=lmmono10-italic.otf, - BoldFont=lmmonolt10-bold.otf, BoldItalicFont=lmmonolt10-boldoblique.otf + BoldFont=lmmonolt10-bold.otf, BoldItalicFont=lmmonolt10-boldoblique.otf, + RawFeature=-notdef ]{lmmono10-regular.otf} -\setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Linux Biolinum O} +\setsansfont[Scale=MatchLowercase,Ligatures=TeX,RawFeature=-notdef]{Linux Biolinum O} \usepackage[match]{luatexja-fontspec} \usepackage[kozuka-pr6n]{luatexja-preset} \usepackage{unicode-math} @@ -650,11 +651,11 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. %\LuaTeX-jaパッケージの動作には次のパッケージ類が必要である. \begin{itemize} \item \LuaTeX\ 1.0.0 (or later) -\item \Pkg{luaotfload} v2.6 (or later) +\item recent \Pkg{luaotfload} (v2.98 or later recommended) \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.5c (or later) +\item \Pkg{fontspec} v2.7c (or later) %\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/}) %\item \emph{IPAexフォント(\url{http://ipafont.ipa.go.jp/})} \end{itemize} @@ -813,28 +814,28 @@ For changes from \pTeX, see Subsection~\ref{ssec:chgptex}. % %<*en> \item \LuaTeX-ja is very slower than \pTeX. - Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja - about 30\% faster than \LuaTeX, but not always% - \footnote{% - LuaJIT has several limitations such as 1\,GB~(or~2\,GB) memory limitation. - So typesetting a large source by LuaJIT\TeX may cause an ``out of memory'' error, - or failure of loading/saving font cache of \Pkg{luaotfload}. - }. + % Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja + % about 30\% faster than \LuaTeX, but not always% + % \footnote{% + % LuaJIT has several limitations such as 1\,GB~(or~2\,GB) memory limitation. + % So typesetting a large source by LuaJIT\TeX may cause an ``out of memory'' error, + % or failure of loading/saving font cache of \Pkg{luaotfload}. + % }. % %<*ja> \item \LuaTeX-jaは動作が\pTeX に比べて非常に遅い. コードを調整して徐々に速くしているが,まだ満足できる速度ではない. -LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが, -IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある - \footnote{% - LuaJITは1\,GB(あるいは2\,GB)のメモリ制限など,いくつかの制限事項があることが知られている.そのため, - 大きいソースファイルをLuaJIT\TeX でタイプセットするとLuaの側で``out of memory''エラーが発生してしまう. - 本ドキュメントのように,「各ページごとにLuaで使っているメモリ容量をチェックし, - 必要なら\texttt{collectgarbage("collect")}でガベージコレクタを実行」すると - 状況が多少改善されるかもしれない. - また,LuaJIT\TeX でIPA mj明朝などの「大きい」フォントを利用した場合はフォントキャッシュの保存に失敗し, - 毎回フォントを読み込まなければならず結果的に時間がかかることがある. - }. +% LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが, +% IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある +% \footnote{% +% LuaJITは1\,GB(あるいは2\,GB)のメモリ制限など,いくつかの制限事項があることが知られている.そのため, +% 大きいソースファイルをLuaJIT\TeX でタイプセットするとLuaの側で``out of memory''エラーが発生してしまう. +% 本ドキュメントのように,「各ページごとにLuaで使っているメモリ容量をチェックし, +% 必要なら\texttt{collectgarbage("collect")}でガベージコレクタを実行」すると +% 状況が多少改善されるかもしれない. +% また,LuaJIT\TeX でIPA mj明朝などの「大きい」フォントを利用した場合はフォントキャッシュの保存に失敗し, +% 毎回フォントを読み込まなければならず結果的に時間がかかることがある. +% }. % \item% @@ -3856,7 +3857,7 @@ default Japanese fonts and JFMs for them: \item[\cs{ltj@stdyokojfm}] %The default JFM for horizontal direction. %標準で用いる横組用JFM. - \item[\cs{ltj@stdyokojfm}] + \item[\cs{ltj@stdtatejfm}] %The default JFM for vertical direction. %標準で用いる縦組用JFM. \end{cslist} @@ -4692,7 +4693,7 @@ as follows: %\paragraph{仮想的な文字} %\paragraph{Imaginary characters} %<*en> -As described before, you can specify several \emph{imaginary characters} in +As described before, you can specify several ``imaginary characters'' in \texttt{chars} field. The most of these characters are regarded as the characters of class 0 in \pTeX. As a result, \LuaTeX-ja can control typesetting finer than \pTeX. @@ -4711,8 +4712,17 @@ The following is the list of imaginary characters: %%JFMやサイズが異なる2つの\textbf{JAchar}の間の境界として用いられる. \item['boxbdd'] -%The beginning/ending of a hbox, and the beginning of a noindented (i.e., began by \cs{noindent}) paragraph. -%hboxの先頭と末尾,及びインデントされていない(\cs{noindent} で開始された)段落の先頭を表す. +%<*en> +The beginning/ending of a hbox, and the beginning of a noindented (i.e., began by \cs{noindent}) paragraph. +If a hbox~$b$ begins (resp.~ends) a glue or kern between this ``charater'' and a \textbf{JAchar}, +\textbf{JAglue} won't be inserted before(resp.~after) the hbox~$b$. +\Param{kanjiskip}~and~\Param{xkanjiskip} around a hbox. +% +%<*ja> +hboxの先頭と末尾,及びインデントされていない(\cs{noindent} で開始された)段落の先頭を表す. +この「文字」との間に設定したグルー・カーンがボックス$b$の先頭(もしくは末尾)に来た場合, + そのボックス$b$の直前(もしくは直後)には和文処理グルーは入らない. +% \item['parbdd'] %The beginning of an (indented) paragraph. @@ -7260,7 +7270,7 @@ for making the difference obvious.} \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}). \item[\texttt{profile=[false,true]}] -- cgit v1.2.3