diff options
Diffstat (limited to 'Master/texmf-dist/doc/luatex/luatexja')
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/README | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | bin | 839012 -> 735460 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | bin | 853282 -> 861794 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | bin | 446484 -> 463467 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | bin | 839842 -> 863556 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 128 |
6 files changed, 95 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 68a9b0c6a15..ddb71a68cc9 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 20170109.0 +The LuaTeX-ja Package 20170124.0 -------------------------------- Copyright (c) 2011--2017 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -34,9 +34,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20170109.0 in the Git repository by + or tagged as 20170124.0 in the Git repository by <http://git.osdn.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20170109.0;sf=tgz> + ;a=snapshot;h=refs/tags/20170124.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -81,4 +81,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Jan 9 15:23:56 2017 +0900 +Last commit date: Tue Jan 24 17:16:00 2017 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf Binary files differindex 501c74708ad..99695e05568 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf Binary files differindex 3f9c5564e91..215c3dfb147 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf Binary files differindex 40f2fb15069..484cb2becaf 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf Binary files differindex 109286c7d59..77d70203368 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index ce67c8c3d38..ac42d21a161 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -23,6 +23,18 @@ \usepackage[all]{xy} \usepackage{lltjext,alltt} +%%%%%%%% Lua GC +\patchcmd\@outputpage{\stepcounter{page}}{% + \directlua{% + local k = collectgarbage("count") + if k>900000 then + collectgarbage("collect") + texio.write_nl("term and log", "GC: ", math.floor(k), math.floor(collectgarbage("count"))) + end + }% + \stepcounter{page}% +}{}{} + %%%%%%%% fonts \usepackage{luatexja-otf} \directlua{luatexja.otf.enable_ivs()} @@ -459,9 +471,10 @@ By default, \LuaTeX-ja uses Japanese fonts to typeset Greek and Cyrillic letters put \verb!\ltjsetparameter{jacharrange={-2,-3}}! in the preamble. For the detailed description, see Subsection~\ref{ssec-setrange}. -From this version, characters which belongs both ISO~8859-1 and JIS~X~0208, - such as \P~and~\S, are now typeset in alphabetic fonts. This means that - without the \cs{fontspec} (and~\Pkg{luatexja-fontspec}) package, these characters are not typeset correctly. +From version~20150906.0, characters which belongs both ISO~8859-1 and JIS~X~0208, +such as \P~and~\S, are now typeset in alphabetic fonts. +If you are using \LaTeXe\ prior to 2017/01/01, these characters are not typeset correctly +without the \cs{fontspec} (and~\Pkg{luatexja-fontspec}) package. %</en> %<*ja> \paragraph{ギリシャ文字・キリル文字とISO~8859-1の記号} @@ -476,10 +489,13 @@ From this version, characters which belongs both ISO~8859-1 and JIS~X~0208, 詳しい説明は\ref{ssec-setrange}節を参照してほしい． また，\P,~\S といったISO~8859-1の上位領域とJIS~X~0208の共通部分の文字は - 本バージョンから標準で欧文扱いとなり，\emph{ソース中に直接記述しても - \Pkg{fontspec}パッケージ（および\Pkg{luatexja-fontspec}パッケージ）非読み込みの状態では出力されなくなった}． - 和文扱いで出力するには \verb+\ltjjachar`§+ のように \cs{ltjjachar} 命令 - を使えばよい． + 20150906.0版から標準で欧文扱いとなった．\LaTeXe\ 2017/01/01以降では +標準でTUエンコーディングのLatin Modernフォントが使われるので， +特に何もせずソース中にそのまま記述してもこれらの文字が出力される +\footnote{\LaTeXe\ 2017/01/01より前では，ソース中に直接記述しても + \Pkg{fontspec}パッケージ（および\Pkg{luatexja-fontspec}パッケージ）非読み込みの状態では出力されない．}． +和文扱いで出力するには \verb+\ltjjachar`§+ のように \cs{ltjjachar} 命令 +を使えばよい． %</ja> %<en>\subsection{Notations} @@ -608,13 +624,14 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. \item \Pkg{luaotfload} v2.6 (or later) \item \Pkg{adobemapping} (Adobe cmap and pdfmapping files) \item \Pkg{everysel} (if you want to use \LuaTeX-ja with \LaTeXe) -\item \Pkg{fontspec} v2.4 +\item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{atbegshi} +\item \Pkg{fontspec} v2.4 (or later) %<en>\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/}) %<ja>\item \emph{IPAexフォント(\url{http://ipafont.ipa.go.jp/})} \end{itemize} -%<en>In summary, this version of \LuaTeX-ja no longer supports \TeX~Live~2015 (or older version). +%<en>In summary, \LuaTeX-ja version 20160404.0 (or~later) no longer supports \TeX~Live~2015. %<*ja> -要約すると，本バージョンの\LuaTeX-jaは\TeX~Live~2015以前では動作しない\footnote{% +要約すると，20160404.0版以降の\LuaTeX-jaは\TeX~Live~2015以前では動作しない\footnote{% もっとも，自分で\LuaTeX のバイナリをSubversionリポジトリからビルドしていれば話は別である． }． %</ja> @@ -782,14 +799,25 @@ For changes from \pTeX, see Subsection~\ref{ssec:chgptex}. %</ja> %<*en> \item \LuaTeX-ja is very slower than \pTeX. -Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja -about 30\% faster than \LuaTeX, but not always. + Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja + about 30\% faster than \LuaTeX, but not always% + \footnote{% + LuaJIT has the 1\,GB~(or~2\,GB) memory limitation. So typesetting a large source by LuaJIT\TeX\ + may cause an ``out of memory'' error. + }. %</en> %<*ja> \item \LuaTeX-jaは動作が\pTeX に比べて非常に遅い． コードを調整して徐々に速くしているが，まだ満足できる速度ではない． LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが， -IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある． +IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある + \footnote{% + LuaJITは1\,GB（あるいは2\,GB）のメモリ制限があることが知られている．そのため， + 大きいソースファイルをLuaJIT\TeX でタイプセットするとLuaの側で``out of memory''エラーが発生してしまう． + 本ドキュメントのように，「各ページごとにLuaで使っているメモリ容量をチェックし， + 必要なら\texttt{collectgarbage("collect")}でガベージコレクタを実行」すると + 状況が多少改善されるかもしれない． + }． %</ja> \item% @@ -850,7 +878,7 @@ and finally delete the temporary directory. \begin{tabular}{cccccc} \toprule \textbf{direction}& -\textbf{classification}&\textbf{font name}&\bf ``10\,pt''&\bf``7\,pt''&\bf``5\,pt''\\\midrule +\textbf{classification}&\textbf{font name}&\bfseries ``10\,pt''&\bfseries ``7\,pt''&\bfseries ``5\,pt''\\\midrule \smash{\raisebox{-1ex}{\emph{yoko} (horizontal)}}& \emph{mincho}&IPAex Mincho&\cs{tenmin}&\cs{sevenmin}&\cs{fivemin}\\ &\emph{gothic}&IPAex Gothic&\cs{tengt} &\cs{sevengt} &\cs{fivegt}\\ @@ -867,7 +895,7 @@ and finally delete the temporary directory. \begin{center}\small \begin{tabular}{cccccc} \toprule -\emph{組方向}&\emph{字体}&\emph{フォント名}&\bf ``10\,pt''&\bf``7\,pt''&\bf``5\,pt''\\\midrule +\emph{組方向}&\emph{字体}&\emph{フォント名}&\bfseries``10\,pt''&\bfseries``7\,pt''&\bfseries``5\,pt''\\\midrule \smash{\raisebox{-1ex}{横組}}& 明朝体&IPAex明朝&\cs{tenmin}&\cs{sevenmin}&\cs{fivemin}\\ &ゴシック体&IPAexゴシック&\cs{tengt} &\cs{sevengt} &\cs{fivegt}\\ @@ -1705,7 +1733,7 @@ There is not rounded gothic family in Kozuka fonts. \begin{center}\small \begin{tabular}{cllll} \toprule -\bf family&\bf series&\tt kozuka-pro&\tt kozuka-pr6&\tt kozuka-pr6n\\ +\bfseries family&\bfseries series&\ttfamily kozuka-pro&\ttfamily kozuka-pr6&\ttfamily kozuka-pr6n\\ \midrule &medium&KozMinPro-Regular&KozMinProVI-Regular&KozMinPr6N-Regular\\ %<en>\smash{\raisebox{1.5ex}{\textit{mincho}}}% @@ -1728,6 +1756,7 @@ There is not rounded gothic family in Kozuka fonts. \end{tabular} \end{center} +%<ja>\newpage \item[hiragino-pro] Hiragino Pro (Adobe-Japan1-5) fonts. %<en> \\*[-\dimexpr\medskipamount+\baselineskip\relax] \item[hiragino-pron] Hiragino ProN (Adobe-Japan1-5, JIS04-savvy) fonts. @@ -1769,12 +1798,9 @@ Std/StdNフォントであり，その他はAdobe-Japan1-5対応である． \end{tabular} \end{center} -%<ja>\newpage - \item[morisawa-pro] Morisawa Pro (Adobe-Japan1-4) fonts. %<en> \\*[-\dimexpr\medskipamount+\baselineskip\relax] \item[morisawa-pr6n] Morisawa Pr6N (Adobe-Japan1-6, JIS04-savvy) fonts. - \begin{center}\small \begin{tabular}{cl>{\tt}l>{\tt}l} \toprule @@ -1799,41 +1825,43 @@ Std/StdNフォントであり，その他はAdobe-Japan1-5対応である． \end{tabular} \end{center} +%<en>\newpage \item[yu-win] Yu fonts bundled with Windows~8.1. %<en> \\*[-\dimexpr\medskipamount+\baselineskip\relax] + \item[yu-win10] Yu fonts bundled with Windows~10. +%<en> \\*[-\dimexpr\medskipamount+\baselineskip\relax] \item[yu-osx] Yu fonts bundled with OSX~Mavericks. - \begin{center}\small -\begin{tabular}{clll} +\begin{tabular}{cllll} \toprule -\bf family&\bf series&\tt yu-win&\tt yu-osx\\ +\bf family&\bf series&\texttt{yu-win}&\texttt{yu-win10}&\texttt{yu-osx}\\ \midrule - &medium&YuMincho-Regular&YuMincho~Medium\\ + &medium&YuMincho-Regular&YuMincho-Regular&YuMincho~Medium\\ %<en>\smash{\raisebox{1.5ex}{\textit{mincho}}}% %<ja>\smash{\raisebox{1.5ex}{\gt 明朝}}% - &bold&YuMincho-Demibold&YuMincho~Demibold\\ + &bold&YuMincho-Demibold&YuMincho-Demibold&YuMincho~Demibold\\ \midrule - &&YuGothic-Regular*&YuGothic~Medium*\\ - &\smash{\raisebox{1.5ex}{medium}} - &YuGothic-Bold&YuGothic~Bold\\ -\cmidrule(l){2-4} + &&YuGothic-Regular*&YuGothic-Regular*&YuGothic~Medium*\\ + &\smash{\raisebox{1.5ex}{medium}}% + &YuGothic-Regular&YuGothic-Medium&YuGothic~Medium\\ +\cmidrule(l){2-5} %<en>\textit{gothic}% %<ja>\gt ゴシック - &bold&YuGothic-Bold&YuGothic~Bold\\ - &heavy&YuGothic-Bold&YuGothic~Bold\\ + &bold&YuGothic-Bold&YuGothic-Bold&YuGothic~Bold\\ + &heavy&YuGothic-Bold&YuGothic-Bold&YuGothic~Bold\\ \midrule %<en>\textit{rounded gothic} %<ja>\gt 丸ゴシック -&&YuGothic-Bold&YuGothic~Bold\\ +&&YuGothic-Bold&YuGothic-Bold&YuGothic~Bold\\ \bottomrule \end{tabular} \end{center} -%<en>\newpage +%<ja>\newpage \item[moga-mobo] MogaMincho, MogaGothic, and MoboGothic. +\item[moga-mobo-ex] MogaExMincho, MogaExGothic, and MoboExGothic. %<en>These fonts can be downloaded from\\\hfill \url{http://yozvox.web.fc2.com/}. %<ja>これらのフォントは \url{http://yozvox.web.fc2.com/} からダウンロードできる． - \begin{center}\small \begin{tabular}{clll} \toprule @@ -1844,10 +1872,7 @@ Std/StdNフォントであり，その他はAdobe-Japan1-5対応である． %<ja>\smash{\raisebox{1.5ex}{\gt 明朝}}% &bold&Moga90Mincho Bold&MogaMincho Bold\\ \midrule - &&Moga90Gothic*&MogaGothic*\\ - &\smash{\raisebox{1.5ex}{medium}} - &Moga90Gothic Bold&MogaGothic Bold\\ -\cmidrule(l){2-4} + &medium&Moga90Gothic&MogaGothic\\ %<en>\textit{gothic}% %<ja>\gt ゴシック &bold&Moga90Gothic Bold&MogaGothic Bold\\ @@ -1859,7 +1884,36 @@ Std/StdNフォントであり，その他はAdobe-Japan1-5対応である． \bottomrule \end{tabular} \end{center} +%<en>When \texttt{moga-mobo-ex} is specified, the font ``MogaEx90Mincho'' etc.\ are used. +%<ja>\texttt{moga-mobo-ex}オプション指定時にはMogaEx90MinchoなどのExが名前についたフォントが使われる． +\item[ume] Ume Mincho and Ume Gothic. +%<en>These fonts can be downloaded from\\\hfill \url{https://ja.osdn.net/projects/ume-font/wiki/FrontPage}. +%<ja>これらのフォントは \url{https://ja.osdn.net/projects/ume-font/wiki/FrontPage} からダウンロードできる． +\begin{center}\small +\begin{tabular}{cll} +\toprule +\bf family&\bf series&\bf default\\ +\midrule + &medium&Ume Mincho\\ +%<en>\smash{\raisebox{1.5ex}{\textit{mincho}}}% +%<ja>\smash{\raisebox{1.5ex}{\gt 明朝}}% + &bold&Ume Mincho\\ +\midrule + &&Ume Gothic*\\ + &\smash{\raisebox{1.5ex}{medium}}&Ume Gothic O5\\ +\cmidrule(l){2-3} +%<en>\textit{gothic}% +%<ja>\gt ゴシック + &bold&Ume Gothic O5\\ + &heavy&Ume Gothic O5\\ +\midrule +%<en>\textit{rounded gothic} +%<ja>\gt 丸ゴシック +&&Ume Gothic O5\\ +\bottomrule +\end{tabular} +\end{center} \end{cslist} %<en>\paragraph{Presets for single weight} |