From 0e9654fedc389811d7b81b1d05f8a4a986caec1c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 Jan 2019 22:06:04 +0000 Subject: luatexja (28jan19) git-svn-id: svn://tug.org/texlive/trunk@49852 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +- .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 468936 -> 469986 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 854263 -> 854139 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 146 ++++++++++++--------- 4 files changed, 90 insertions(+), 64 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 f8ff7a69640..720756d0793 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 20190107.0 +The LuaTeX-ja Package 20190128.0 -------------------------------- Copyright (c) 2011--2019 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -40,9 +40,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20190107.0 in the Git repository by + or tagged as 20190128.0 in the Git repository by + ;a=snapshot;h=refs/tags/20190128.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 Jan 7 17:43:21 2019 +0900 +Last commit date: Mon Jan 28 17:51:48 2019 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index c91da6367d8..6563638364f 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 4b62b39883d..d41522d100d 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 f00243bc811..1d7748dbb7a 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -196,6 +196,15 @@ \def\cs#1{\texttt{\upshape \texorpdfstring{\textbackslash\hbox{\ltjsetparameter{autoxspacing=false}#1}}{\textbackslash#1}}} \ltjsetparameter{alxspmode={`\\,allow}} +\def\text@#1{% + \ifnum\mathstyle<\scriptstyle + \mbox{#1} + \else\ifnum\mathstyle<\scriptscriptstyle + \mbox{\let\f@size\sf@size\selectfont#1} + \else + \mbox{\let\f@size\ssf@size\selectfont#1} + \fi\fi +} %%%%%%%% \makeatother %%%%%%%% @@ -917,12 +926,14 @@ and finally delete the temporary directory. % \begin{itemize} %<*en> -\item With \texttt{luatexja.cfg}, one can use other fonts -as ``default'' Japanese fonts (Subsection~\ref{ssec:cfg}). +\item The ``default'' Japanese fonts (and~JFMs for them) can be + modified by defining \cs{ltj@stdmcfont} etc.\ \emph{before} + one inputs \texttt{luatexja.sty} (Subsection~\ref{ssec:cfg}). % %<*ja> -\item \texttt{luatexja.cfg} を用いることによって,標準和文フォントを -IPAexフォントから別のフォントに置き換えることができる.\ref{ssec:cfg}節を参照. +\item 標準和文フォントやJFMをIPAexフォントから別のものに置き換えるには, + \cs{ltj@stdmcfont}等を\texttt{luatexja.sty}読み込み\emph{前}に定義すればよい. + \ref{ssec:cfg}節を参照. % %<*en> @@ -1703,60 +1714,6 @@ as an external package \Pkg{luatexja-otf}. \ref{ssec:fontspec}節 (\Pkg{fontspec}) の方法で手動で指定する必要がある. % -%\subsection{Changing default Japanese fonts} -%\subsection{標準和文フォントの変更} -\label{ssec:cfg} -%<*en> -If \texttt{luatexja.cfg} can be seen from \LuaTeX, \LuaTeX-ja automatically reads it. -The main use of \texttt{luatexja.cfg} is for changing default Japanese fonts, -when IPAex fonts cannot be installed in \TeX~system. -One should not overuse this \texttt{luatexja.cfg}; fonts which will be used in -a document should be specified in its source. - -For example, -\begin{lstlisting} -\def\ltj@stdmcfont{IPAMincho} -\def\ltj@stdgtfont{IPAGothic} -\end{lstlisting} -makes that IPA~Mincho and IPA~Gothic will be used as default Japanese fonts, instead of -IPAex~Mincho and IPAex~Gothic. - -For another example, the following two lines makes that -non-embedded fonts Ryumin-Light~and~GothicBBB-Medium as default Japanese fonts -(as the earlier version of \LuaTeX-ja): -\begin{lstlisting} -\def\ltj@stdmcfont{psft:Ryumin-Light} -\def\ltj@stdgtfont{psft:GothicBBB-Medium} -\end{lstlisting} -% -%<*ja> -\LuaTeX から見える位置に \texttt{luatexja.cfg} があれば,\LuaTeX-jaはそれを読み込む. -このファイルを用いるとplain~\TeX, \LaTeXe における標準和文フォントを -IPAex明朝・IPAexゴシックから変更することができる. -しかし,基本的には\emph{文章中で用いるフォントは(例えば \Pkg{luatexja-preset} などで) -文書ソース内で指定するべき}であり,この \texttt{luatexja.cfg} は, -「IPAexフォントがインストールできない」など,IPAexフォントが使用できない場合にのみ -応急処置的に用いるべきである. - -例えば -\begin{lstlisting} -\def\ltj@stdmcfont{IPAMincho} -\def\ltj@stdgtfont{IPAGothic} -\end{lstlisting} -と記述しておけば,標準和文フォントがIPA明朝・IPAゴシックへと変 -更される. - - -なお,20140906.0以前のバージョンのように, -Ryumin-Light, GothicBBB-Mediumという名前の非埋込フォントを用いる場合は -\begin{lstlisting} -\def\ltj@stdmcfont{psft:Ryumin-Light} -\def\ltj@stdgtfont{psft:GothicBBB-Medium} -\end{lstlisting} -と記述すればよい. -% - - %\section{Changing Internal Parameters} %\section{パラメータの変更} @@ -3815,6 +3772,77 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont ト・縦組用和文フォントの定義が可能であったが,\LuaTeX-jaではそうでないので注意. % +%\subsection{Default Japanese fonts and JFMs} +%\subsection{標準和文フォント・JFMの変更} +\label{ssec:cfg} +%<*en> +If following commands are defined at loading \LuaTeX-ja package, these change +default Japanese fonts and JFMs for them: +% +%<*ja> +\LuaTeX-jaが読み込まれる前に以下の命令が定義されていた場合は, +それらが標準和文フォントやそれらに用いるJFMとして使われる. +% + +\begin{cslist}[style=standard] + \item[\cs{ltj@stdmcfont}] +%The default Japanese font for the mincho family. +%明朝体として用いるフォント. + \item[\cs{ltj@stdgtfont}] +%The default Japanese font for the gothic family. +%ゴシック体として用いるフォント. + \item[\cs{ltj@stdyokojfm}] +%The default JFM for horizontal direction. +%標準で用いる横組用JFM. + \item[\cs{ltj@stdyokojfm}] +%The default JFM for vertical direction. +%標準で用いる縦組用JFM. +\end{cslist} + +%<*en> +For example, +\begin{lstlisting} +\def\ltj@stdmcfont{IPAMincho} +\def\ltj@stdgtfont{IPAGothic} +\end{lstlisting} +makes that IPA~Mincho and IPA~Gothic will be used as default Japanese fonts, instead of +IPAex~Mincho and IPAex~Gothic. + +This feature is intended for classes which use special JFMs +\footnote{This is because commands has \texttt{@} in their names.}. +It is recommended to use \cs{luatexja-preset}~or~\cs{luatexja-fontspec} package +to select standard fonts in ordinary \LaTeX\ sources. +% +%<*ja> +例えば +\begin{lstlisting} +\def\ltj@stdmcfont{IPAMincho} +\def\ltj@stdgtfont{IPAGothic} +\end{lstlisting} +と記述しておけば,標準和文フォントがIPA明朝・IPAゴシックへと変 +更される. + +この機能は,特別のJFMを用いるクラス +\footnote{例えば阿部紀行氏によるjlreqがそれにあたる.}% +などでの使用を意図しており,命令名に\texttt{@}が含まれることから +通常の\TeX/\LaTeX 文書での使用は意図していない. +通常の\LaTeX 文書では\Pkg{luatexja-preset}や\Pkg{luatexja-fontspec}などで +使用フォントを選択することを推奨する. +% + +%<*en> +For compatibility with earlier versions, +\LuaTeX-ja reads \texttt{luatexja.cfg} automatically if it is found by \LuaTeX. +One should not overuse this \texttt{luatexja.cfg}; it will overwrite +the definition of \cs{ltj@stdmcfont} and others. +% +%<*ja> +旧バージョンとの互換性のため, +\LuaTeX から見える位置に\texttt{luatexja.cfg}があれば,\LuaTeX-jaはそれを読み込む. +しかし,\texttt{luatexja.cfg}内で\cs{ltj@stdmcfont}等が定義されていた場合はそちらが +優先されるので,もはや\texttt{luatexja.cfg}は使わないほうが良いだろう. +% + %\subsection{Prefix \texttt{psft}} %\subsection{\texttt{psft}プリフィックス} \label{ssec:psft} @@ -5060,8 +5088,6 @@ Then, the position of glyphs is shifted up by \] \end{description} - - %\section{Parameters} %\section{パラメータ} \subsection{\cs{ltjsetparameter}} -- cgit v1.2.3