From a5867a77a11af6061a2bd2e539dbf61fb18e77cb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 8 Aug 2020 22:18:16 +0000 Subject: luatexja (9aug20) git-svn-id: svn://tug.org/texlive/trunk@56076 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 21 ++++---- .../doc/luatex/luatexja/lltjp-geometry.pdf | Bin 164277 -> 166499 bytes .../doc/luatex/luatexja/lltjp-geometry.tex | 20 +++---- .../texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | Bin 400100 -> 400552 bytes .../texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | Bin 455647 -> 457743 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 687538 -> 687159 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 1104209 -> 1105103 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 58 ++++++++++----------- 8 files changed, 50 insertions(+), 49 deletions(-) (limited to 'Master/texmf-dist/doc/luatex') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 9998677f899..41528dbd955 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 20200802.0 +The LuaTeX-ja Package 20200808.0 -------------------------------- Copyright (c) 2011--2020 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -45,9 +45,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20200802.0 in the Git repository by + or tagged as 20200808.0 in the Git repository by + ;a=snapshot;h=refs/tags/20200808.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -55,16 +55,13 @@ Installation src/ltjltxdoc.ins src/ltjsclasses.ins - c. Process src/ltj-kinsoku_make.tex by (plain) LuaTeX to generate ltj-kinsoku.lua, - which stores default "kinsoku" parameters. - - d. Put src/ into your TEXMF tree. + c. Put src/ into your TEXMF tree. An example location is TEXMF/tex/luatex/luatexja. If you are updating from old version, you MUST remove it before extracting the new version of LuaTeX-ja. - e. You may need to update the filename database, by mktexlsr (or by another program). + d. You may need to update the filename database, by mktexlsr (or by another program). Basic Usage @@ -93,6 +90,10 @@ Notes No .{dtx,ins} pair generates .sty files of LuaTeX-ja package. -* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. +* src/*.{ins.dtx} are not needed in regular use. + +* ltj-kinsoku_make.tex is removed in version 20200808.0. + This file and ltj-kinsoku.lua are not used anymore. + (Do not remove ltj-kinsoku.tex.) -Last commit date: Sun Aug 2 19:53:42 2020 +0900 +Last commit date: Sat Aug 8 18:25:40 2020 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf index 92ac414f9f6..20c4edb88f8 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf and b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex index 1b2aa5ed596..28be8dad3cc 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex +++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex @@ -1,6 +1,6 @@ %#! lualatex -\documentclass[a4paper,10pt]{ltjsarticle} -\usepackage[textwidth=45\zw, lines=45, footskip=2\zh, verbose]{geometry} +\documentclass[a4paper,10ptj]{ltjsarticle} +\usepackage[textwidth=42\zw, lines=42, footskip=2\zh, verbose]{geometry} \usepackage{listings,amsmath,booktabs,lltjext,bxghost} \usepackage{unicode-math} \setmathfont{Latin Modern Math} @@ -48,10 +48,10 @@ \section{利用方法} \Pkg{lltjp-geometry}パッケージは,\LuaTeX-jaに標準で含まれている. 本パッケージの動作には\href{http://www.ctan.org/pkg/ifluatex}{\Pkg{ifluatex}}, -\href{http://www.ctan.org/pkg/filehook}{\Pkg{filehook}}パッケージが必要である. +\href{https://www.ctan.org/pkg/etoolbox}{\Pkg{etoolbox}}パッケージが必要である. +また,\LaTeXe~2020\nobreakdash-02\nobreakdash-02以前では\href{http://www.ctan.org/pkg/filehook}{\Pkg{filehook}}パッケージも必要である. -\LuaTeX-jaでは,\Pkg{geometry}パッケージ読み込み時に -自動的に\Pkg{lltjp-geometry}パッケージが読み込まれる. +\LuaTeX-jaでは,自動的に\Pkg{lltjp-geometry}パッケージが読み込まれる. 縦組クラスか否かの自動判定(\ref{ssec:auto}節)を上書きしたい場合は, \begin{lstlisting} % \PassOptionsToPackage{force}{lltjp-geometry} % 強制的に有効 @@ -60,7 +60,7 @@ \usepackage[...]{geometry} \end{lstlisting} のように\emph{\Pkg{luatexja}の読み込み前}に\cs{PassOptionsToPackage}で -本パッケージに渡すオプションを指定する(\cs{usepackage\{lltjp-geometry\}}\>は使えない). +本パッケージに渡すオプションを指定する(\cs{usepackage\{lltjp-geometry\}}\>を行っても意味がない). \pTeX 系列では,\Pkg{tarticle}, \Pkg{tbook}, \Pkg{treport}といった \emph{縦組クラスを使う場合}に, @@ -68,7 +68,7 @@ \usepackage[...]{lltjp-geometry} \usepackage[...]{geometry} \end{lstlisting} -と,\Pkg{geometry}パッケージの前に読み込む. +と,\Pkg{geometry}パッケージの\emph{前}に読み込む. \subsection{縦組クラスか否かの判定} \label{ssec:auto} @@ -76,10 +76,12 @@ \Pkg{geometry}パッケージ読み込み直後にパッチを当てる: \begin{enumerate} \item \Pkg{geometry}パッケージを読み込む際に,現在の組方向が縦組になっている. - \item \cs{AtBeginDocument}により指定される,\cs{begin\{document\}}\>時に実行される内容に - \cs{tate}(というトークン)が含まれている. + \item \cs{AtBeginDocument}により + \footnote{\LaTeXe~2020-10-01以降ではそれと同義な\>\cs{AddToHook\{begindocument\}}\>も含む.}指定される, + \cs{begin\{document\}}\>時に実行される内容に\cs{tate}(というトークン)が含まれている. \item 本パッケージを読み込む際に\texttt{force}オプションが指定されている. \end{enumerate} + \LuaTeX-jaで縦組クラスを利用する場合は主に1.の, \pTeX 系列で縦組クラスを利用する場合は主に2.の状況となる \footnote{% diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf index 46209980cc2..4184764810a 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 e7b415f52bd..b9edb1d5623 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 dbe97a5116f..ba86234554d 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 72227e28e73..69360223021 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 18ca18cdae5..34674985525 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -651,15 +651,16 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. \item \Pkg{adobemapping} (Adobe cmap and pdfmapping files) \item \LaTeX\ 2020-02-02 patch level 5 or later % (if you want to use \LuaTeX-ja with \LaTeXe) -% (\LaTeX 下で\LuaTeX-jaを使う場合) +% (\LaTeXe 下で\LuaTeX-jaを使う場合) \item \href{https://github.com/josephwright/etoolbox/}{\Pkg{etoolbox}}, \Pkg{everysel} % (if you want to use \LuaTeX-ja with \LaTeXe) -% (\LaTeX 下で\LuaTeX-jaを使う場合) -\item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{filehook}, \Pkg{atbegshi} +% (\LaTeXe 下で\LuaTeX-jaを使う場合) +\item \Pkg{ltxcmds}, \Pkg{pdftexcmds} +\item \Pkg{filehook}, \Pkg{atbegshi} +% (not needed if you want to use \LuaTeX-ja with \LaTeXe~2020-10-01 or later) +% (\LaTeXe 2020-10-01以降で\LuaTeX-jaを使う場合はどちらも不要) \item \href{https://github.com/wspr/fontspec/}{\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/})} %<*en> \item \emph{Harano Aji fonts} (\url{https://github.com/trueroad/HaranoAjiFonts})\\ More specifically, HaranoAjiMincho-Regular~and~HaranoAjiGothic-Medium. @@ -678,9 +679,10 @@ the following distributions: \begin{itemize} \item \href{https://www.tug.org/texlive/}{\TeX~Live} (in \texttt{texmf-dist/tex/luatex/luatexja}) \item \href{http://w32tex.org/}{W32\TeX}\ (in \texttt{luatexja.tar.xz}) - \item MiK\TeX\ (in \texttt{luatexja.tar.lzma}); see the next subsection + \item MiK\TeX\ (in \texttt{luatexja.tar.xz}) \end{itemize} -Harano Aji fonts are available in \TeX~Live and MiK\TeX. +Harano Aji fonts are also available in these distributions +(\texttt{haranoaji} in \TeX~Live and MiK\TeX, and \texttt{luatexja.tar.xz} in W32\TeX). % %<*ja> 現在,\LuaTeX-jaはCTAN (\texttt{macros/luatex/generic/luatexja})に収録されている他, @@ -690,7 +692,8 @@ Harano Aji fonts are available in \TeX~Live and MiK\TeX. \item \TeX~Live (\texttt{texmf-dist/tex/luatex/luatexja}) \item W32\TeX\ (\texttt{luatexja.tar.xz}) \end{itemize} -\TeX~Live, MiK\TeX は原ノ味フォントも収録している. +これらのディストリビューションは原ノ味フォントも収録している +(\TeX~Live, MiK\TeX では\texttt{haranoaji},W32\TeX では\texttt{luatexja.tar.xz}). % %<*en> @@ -766,13 +769,10 @@ But only the contents in \texttt{src/} are needed to work \LuaTeX-ja. %<*en> \item If you downloaded this package from CTAN, you have to run following commands - to generate classes - and \texttt{ltj-kinsoku.lua} (the file which stores default ``\textit{kinsoku}'' parameters): + to generate classes: % %<*ja> -\item もしCTANから本パッケージを取得したのであれば,日本語用クラスファイルや -標準の禁則処理用パラメータを -格納した \texttt{ltj-kinsoku.lua} を生成するために, +\item もしCTANから本パッケージを取得したのであれば,日本語用クラスファイルを生成するために, 以下を実行する必要がある: % \begin{lstlisting} @@ -780,19 +780,7 @@ $ cd src $ lualatex ltjclasses.ins $ lualatex ltjsclasses.ins $ lualatex ltjltxdoc.ins -$ luatex ltj-kinsoku_make.tex \end{lstlisting} -%<*en> -\emph{Do not forget processing \texttt{ltj-kinsoku\_make.tex}}. -\texttt{*.\{dtx,ins\}} and \texttt{ltj-kinsoku\_make.tex} used here are not needed in regular use. -% -%<*ja> -\emph{最後の \texttt{ltj-kinsoku\_make.tex} の実行を忘れないように注意}. -ここで使用した \texttt{*.\{dtx,ins\}} と \texttt{ltj-kinsoku\_make.tex} は -通常の使用にあたっては必要ない. -% - - %<*en> \item Copy all the contents of \texttt{src/} into one of your \texttt{TEXMF} tree. @@ -1149,7 +1137,7 @@ By default, the following fonts are used for these two families. フォントを変更する命令)の前で実行することにより使うことができる. \pLaTeX では標準の欧文フォントはOT1エンコーディングのComputer Modern Roman (\texttt{cmr})% - であったが,2017年以降の\LuaLaTeX ではTUエンコーディングのlatin Modern Roman (\texttt{lmr})% + であったが,2017年以降の\LuaLaTeX ではTUエンコーディングのLatin Modern Roman (\texttt{lmr})% に変更されている.そのため,前段落で述べた「従属欧文」も,Latin Modern Romanに設定している. % @@ -1694,7 +1682,8 @@ as an external package \Pkg{luatexja-otf}. % \begin{LTXexample}[width=0.4\textwidth] -森\UTF{9DD7}外と内田百\UTF{9592}とが\UTF{9AD9}島屋に\\ +森\UTF{9DD7}外と\CID{13966}田百\UTF{9592}とが +\UTF{9AD9}島屋に\\ \CID{7652}飾区の\CID{13706}野家, \CID{1481}城市,葛西駅,\\ 高崎と\CID{8705}\UTF{FA11},濱と\ajMayuHama\\ @@ -1827,7 +1816,7 @@ determined from the following data: %\item Blocks in Unicode~12.0.0. %\item Unicode~12.0のブロック. %\item The \texttt{Adobe-Japan1-UCS2} mapping between a CID Adobe-Japan1- and Unicode. -%\item Adobe-Japan1-7のCIDとUnicodeの間の対応表\texttt{Adobe-Japan1-UCS2}7. +%\item Adobe-Japan1-7のCIDとUnicodeの間の対応表\texttt{Adobe-Japan1-UCS2}. %\item The \Pkg{PXbase} bundle for \upTeX\ by Takayuki Yato. %\item 八登崇之氏による\upTeX 用の\Pkg{PXbase}バンドル. \end{itemize} @@ -2019,12 +2008,12 @@ these eight ranges belongs to the character range~217. で構成されている.したがって,ブロックのリストを示す 代わりに,範囲の定義そのものを示す. % -\begin{lstlisting} +\begin{lstlisting}[escapechar=\!] \ltjdefcharrange{4}{% "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF, "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF, - "1F300-"1FFFF, ... (characters in "2000-"206F which are not in range 9) + "1F300-"1FFFF, ... !\rmfamily (and characters in \texttt{U+2000}--\texttt{U+206F} which are not in range 9)! } % non-Japanese \end{lstlisting} %\item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas. @@ -11104,6 +11093,15 @@ Adobe-CNS1-*<j-cid-auto-adobe-cns1.\{lua.gz,luc\}&UniCNS-UTF32-*&Adobe-CNS1-UC \end{tabular} \end{table} +%<*ja> +\item[ltj-kinsoku\_default.\{lua.gz,luc\}] +禁則処理,\Param{kansujichar}などの標準設定が格納されたファイルである. +% +%<*en> +\item[ltj-kinsoku.luc] +The bytecode cache which default \textit{kinsoku} parameters are stored. +% + %<*ja> \item[ltj-jisx0208.luc] \LuaTeX-ja配布中の\texttt{ltj-jisx0208.lua}をバイトコード化したものである. -- cgit v1.2.3