diff options
14 files changed, 105 insertions, 83 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index dd4d20afef8..b8cb7092096 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 20150420.0 +The LuaTeX-ja Package 20150513.0 -------------------------------- Copyright (c) 2011--2015 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -11,11 +11,10 @@ and specifications are subject to change. Documentations are located at doc/luatexja-en.pdf (en), doc/luatexja-ja.pdf (ja). LuaTeX-ja is developed on - <http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage(en)>. + <https://osdn.jp/projects/luatex-ja/wiki/FrontPage(en)>. If you have questions or recognize bugs/have feature requests, we would like you to create a thread in the forum or a ticket -in the way which SourceForge.JP supplies, via links found in -the page above. +in the way which OSDN supplies, via links found in the page above. Installation @@ -35,9 +34,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20150420.0 in the Git repository by - <http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20150420.0;sf=tgz> + or tagged as 20150513.0 in the Git repository by + <http://git.osdn.jp/view?p=luatex-ja/luatexja.git + ;a=snapshot;h=refs/tags/20150513.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -82,4 +81,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Apr 20 10:16:46 2015 +0900 +Last commit date: Wed May 13 19:55:56 2015 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf Binary files differindex f895981687f..9481dda0f62 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex index 23f32a91579..b9e300a8e76 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex +++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex @@ -33,7 +33,7 @@ \title{\textsf{lltjp-geometry}パッケージ} \author{\LuaTeX-jaプロジェクト% - \thanks{\url{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage}}} + \thanks{\url{http://osdn.jp/projects/luatex-ja/wiki/FrontPage}}} \begin{document} \maketitle @@ -46,7 +46,7 @@ \section{利用方法} \textsf{lltjp-geometry}パッケージは，\LuaTeX-jaに標準で含まれている． -本パッケージの動作には\href{http://www.ctan.org/pkg/ifluatex}{\textsf{ifluatex}}, +本パッケージの動作には\href{http://www.ctan.org/pkg/ifluatex}{\textsf{ifluatex}}, \href{http://www.ctan.org/pkg/filehook}{\textsf{filehook}}パッケージが必要である． \subsection{\LuaTeX-ja} @@ -233,7 +233,7 @@ $5\,\textrm{pt} + 3.41666\,\textrm{pt}=8.41666\,\textrm{pt}$である．} と指定すると，実際には以下のように設定される． \begin{itemize} \item \cs{topskip} は \cs{tstrutbox} の高さ8.5\,ptに設定される． - \item 本文領域の「高さ」 \cs{textheight} は + \item 本文領域の「高さ」 \cs{textheight} は \[ \cs{topskip} + (30-1)\cs{baselineskip} = 530.5\,\textrm{pt}. \] diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf Binary files differindex e03481ba244..1bce235b70f 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 05d2cf41d27..4b7241b4fb4 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 71d50eb3858..2cafee0b9c3 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 f1b85036d3e..7516f0ee2cf 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 702d60021be..b95b4d60b97 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -274,8 +274,8 @@ scripts for appropriate callbacks. %<*en> The \LuaTeX-ja package is under much influence of \pTeX\ engine. The initial -target of development was to implement features of \pTeX. However, -implementing all feature of \pTeX\ is impossible, +target of development was to implement features of \pTeX. However, +implementing all feature of \pTeX\ is impossible, since all process of \LuaTeX-ja must be implemented only by Lua and \TeX\ macros. Hence \emph{\LuaTeX-ja is not a just porting of \pTeX; unnatural specifications/behaviors of \pTeX\ were not adopted}. @@ -300,7 +300,7 @@ For more detailed information, see Part~\ref{part-imp} or other sections of this %</ja> %<*en> -\paragraph{Command names} \pTeX\ addes several primitives, such as \cs{kanjiskip}, +\paragraph{Command names} \pTeX\ addes several primitives, such as \cs{kanjiskip}, \cs{prebreakpenalty},~and,~\cs{ifydir}. They can be used as follows: %</en> %<*ja> @@ -313,7 +313,7 @@ For more detailed information, see Part~\ref{part-imp} or other sections of this \prebreakpenalty`ぁ=100 \ifydir ... \fi \end{verbatim} -%<en> However, we cannot use them under \LuaTeX-ja. +%<en> However, we cannot use them under \LuaTeX-ja. %<en> Instead of them, we have to write as the following. %<ja> は\LuaTeX-jaには存在しない．\LuaTeX-jaでは以下のように記述することになる． \begin{verbatim} @@ -323,7 +323,7 @@ For more detailed information, see Part~\ref{part-imp} or other sections of this \ltjsetparameter{prebreakpenalty={`ぁ,100}} \ifnum\ltjgetparemeter{direction}=4 ... \fi \end{verbatim} -%<*en> +%<*en> Note that \pTeX\ adds new two useful units, namely \texttt{zw}~and~\texttt{zh}. As shown above, they are changed by \cs{zw}~and~\cs{zh} respectively, in \LuaTeX-ja. %</en> @@ -418,13 +418,13 @@ The insertion process of glues/kerns between two Japanese %<*en> \paragraph{Directions} -From this version, \LuaTeX-ja supports vertical writing; +From version~20150420.0, \LuaTeX-ja supports vertical writing; but this feature must \emph{not} be confused with $\Omega$-style direction support of \LuaTeX\ itself. ... %</en> %<*ja> \paragraph{組方向} -本版からは，不安定ながらも\LuaTeX-ja における縦組みをサポートしている． +20150420.0版からは，不安定ながらも\LuaTeX-ja における縦組みをサポートしている． なお，\LuaTeX 本体も，$\Omega$流の組方向をサポートしているが，それとは全くの別物であること に注意してほしい． \LuaTeX のコールバックや実装により，特に異なった組方向のボックスを扱う場合には @@ -519,21 +519,21 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. %<ja>\paragraph{プロジェクトWiki} プロジェクトWikiは構築中である． %<*en> \begin{itemize} -\item \url{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage%28en%29} (English) -\item \url{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage} (Japanese) -\item \url{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage%28zh%29} (Chinese) +\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29} (English) +\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage} (Japanese) +\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28zh%29} (Chinese) \end{itemize} %</en> %<*ja> \begin{itemize} -\item \url{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage}（日本語） -\item \url{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage%28en%29}（英語） -\item \url{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage%28zh%29}（中国語） +\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage}（日本語） +\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29}（英語） +\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28zh%29}（中国語） \end{itemize} %</ja> -%<en>This project is hosted by SourceForge.JP. -%<ja>本プロジェクトはSourceForge.JPのサービスを用いて運営されている． +%<en>This project is hosted by OSDN. +%<ja>本プロジェクトはOSDNのサービスを用いて運営されている． %<en>\paragraph{Members}\ %<ja>\paragraph{開発メンバー}\ @@ -564,7 +564,7 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. %<ja>\subsection{インストール} %<en>The following packages are needed for the \LuaTeX-ja\ package. -%*ja>\LuaTeX-jaパッケージの動作には次のパッケージ類が必要である． +%<ja>\LuaTeX-jaパッケージの動作には次のパッケージ類が必要である． \begin{itemize} \item \LuaTeX\ beta-0.80.0 (or later) \item \Pkg{luaotfload} v2.5 (or later) @@ -630,11 +630,11 @@ W32\TeX においてはIPAexフォントは \texttt{luatexja.tar.xz} 内にあ \begin{itemize} \item Clone the Git repository: \begin{lstlisting} -$ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git +$ git clone git://git.osdn.jp/gitroot/luatex-ja/luatexja.git \end{lstlisting} \item Download the \texttt{tar.gz} archive of HEAD in the \texttt{master} branch from \begin{flushleft} -\url{http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}. +\url{http://git.osdn.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}. \end{flushleft} \end{itemize} @@ -648,11 +648,11 @@ the forefront of development is not the \texttt{master} branch. \begin{itemize} \item Gitリポジトリをクローンする： \begin{lstlisting} -$ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git +$ git clone git://git.osdn.jp/gitroot/luatex-ja/luatexja.git \end{lstlisting} \item \texttt{master}ブランチのスナップショット（\texttt{tar.gz}形式）をダウンロードする． \begin{flushleft} -\url{http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}. +\url{http://git.osdn.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}. \end{flushleft} \end{itemize} \texttt{master}ブランチ（従って，CTAN内のアーカイブも）はたまにしか更新されないことに注意． @@ -743,6 +743,20 @@ For changes from \pTeX, see Subsection~\ref{ssec:chgptex}. 従来日本語の文字コードとして用いられてきたEUC-JPやShift-JISは使用できない． %</ja> %<*en> +\item By default, \LuaTeX-ja uses Japanese fonts to typeset Greek and Cyrillic letters, + and some Unicode symbols such as \P~and~\S. To change this behavior, + put \lstinline!\ltjsetparameter{jacharrange={-2,-3,-8}}! in the preamble. + For the detailed description, see Subsection~\ref{ssec-setrange}. +%</en> +%<*ja> +\item +標準では，\LuaTeX-jaはギリシャ文字やキリル文字，それに\P や\S などの記号を和文フォントを使っ + て組む．ギリシャ語などを本格的に組むなどこの状況が望ましくない場合， + プリアンブルに \lstinline!\ltjsetparameter{jacharrange={-2,-3,-8}}! を入れると + 上記種類の文字は欧文フォントを用いて組まれるようになる． + 詳しい説明は\ref{ssec-setrange}節を参照してほしい． +%</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. @@ -753,9 +767,10 @@ about 30\% faster than \LuaTeX, but not always. LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが， IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある． %</ja> + \item% %<*en> -\textbf{Outdated note for MiK\TeX\ users}\quad +\textbf{(Outdated) note for MiK\TeX\ users}\quad \LuaTeX-ja requires that several CMap files% \footnote{\texttt{UniJIS2004-UTF32-\{H,V\}} and \texttt{Adobe-Japan1-UCS2}.} must be found from \LuaTeX. @@ -768,7 +783,7 @@ so you will encounter an error like the following: \LuaTeX-jaが動作するためには，\emph{導入・更新後の初回起動時に} \texttt{UniJIS2004-UTF32-\{H,V\}}, \texttt{Adobe-Japan1-UCS2}という3つのCMapが \LuaTeX によって見つけられることが必要である． -しかしやや古いMiK\TeX ではそのようになっていないので，次のエラーが発生するだろう： +しかし古いバージョンのMiK\TeX ではそのようになっていないので，次のエラーが発生するだろう： %</ja> \begin{lstlisting} ! LuaTeX error ...iles (x86)/MiKTeX 2.9/tex/luatex/luatexja/ltj-rmlgbm.lua @@ -777,13 +792,14 @@ bad argument #1 to 'open' (string expected, got nil) %<*en> If so, please execute a batch file which is written on -\href{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage%28en%29}{ the Project Wiki (English)}. +\href{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29}{ the Project Wiki (English)}. This batch file creates a temporary directory, copy CMaps in it, -run \LuaTeX-ja in this directory, and finally delete the temporary directory. +run a test file which loads \LuaTeX-ja in this directory, +and finally delete the temporary directory. %</en> %<*ja> そのような場合には， -\href{http://sourceforge.jp/projects/luatex-ja/wiki/FrontPage%28en%29}{% +\href{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29}{% プロジェクトWiki英語版トップページ}中に書かれているバッチファイルを 実行して欲しい．このバッチファイルは，作業用ディレクトリにCMap達を コピーし，その中で\LuaTeX-ja の初回起動を行い，作業用ディレクトリを消す作業をしている． @@ -1041,14 +1057,14 @@ vertical writing is used: %</ja> \begin{lstlisting} ! Incompatible direction list can't be unboxed. -\@begindvi ->\unvbox \@begindvibox - \global \let \@begindvi \@empty +\@begindvi ->\unvbox \@begindvibox + \global \let \@begindvi \@empty \end{lstlisting} %<*en> Now, \LuaTeX-ja automatically applies the patch \Pkg{lltjp-geometry} to the \Pkg{geometry} package, when the direction of the document is \emph{tate} (vertical writing). -This patch \Pkg{lltjp-geometry} also can be used in \pLaTeX; for the detail, please refer +This patch \Pkg{lltjp-geometry} also can be used in \pLaTeX; for the detail, please refer \url{lltjp-geometry.pdf}~(Japanese). %</en> %<*ja> @@ -1381,7 +1397,7 @@ package with several options. This package provides functions in a part of \item[fontspec] %<*en> -With this option, Japanese fonts are selected using functionality of +With this option, Japanese fonts are selected using functionality of the \Pkg{luatexja-fontspec} package. This means that the \Pkg{fontspec} package is automatically loaded by this package. \emph{This option is enabled by default.} @@ -1817,7 +1833,7 @@ are internally specified by: Under \pLaTeX, \Pkg{japanese-otf} package (developed by Shuzaburo Saito) is used for typesetting characters which is in Adobe-Japan1-6 CID but not in JIS~X~0208. Since this package is widely used, \LuaTeX-ja -supports some of functions in the \Pkg{japanese-otf} package, +supports some of functions in the \Pkg{japanese-otf} package, as an external package \Pkg{luatexja-otf}. %</en> %<*ja> @@ -1928,8 +1944,8 @@ parameters, you have to use commands \cs{ltjsetparameter} and 用いる． %</ja> -%<en>\subsection{Editing the Range of \textbf{JAchar}s} -%<ja>\subsection{\textbf{JAchar}の範囲の設定} +%<en>\subsection{Range of \textbf{JAchar}s} +%<ja>\subsection{\textbf{JAchar}の範囲} \label{ssec-setrange} %<*en> @@ -2515,13 +2531,13 @@ $\Phi\vdash F(x)\ \hbox{for all}\ x\in A$ \subsection{\emph{kinsoku} parameters and OpenType features} Among parameters which related to Japanese word-wrapping process (\emph{kinsoku shori}), \begin{quote} - \Param{jaxspmode},~\Param{alxspmode}, \Param{prebreakpenalty}, + \Param{jaxspmode},~\Param{alxspmode}, \Param{prebreakpenalty}, \Param{postbreakpenalty}~and~\Param{kcatcode} \end{quote} are stored by each character codes. ... For example, a fullwidth katakana ``ア'' on line~10 in the below input is replaced to -its halfwidth variant ``ｱ'', by \verb+hwid+ feature. +its halfwidth variant ``ｱ'', by \verb+hwid+ feature. However, the penalty inserted after it is 10 which is the \Param{postbreakpenalty} of ``ア'', not 20. %</en> @@ -3753,7 +3769,7 @@ letter-spacing and the width of italic correction are not correct: 但し，以下の例の3行目に示すように，明示的に \texttt{vert}, \texttt{vrt2}（のいずれか）の 有効・無効を指定した場合は別である． \begin{lstlisting} -\tfont\S=file:KozMinPr6N-Regular.otf:jfm=ujisv +\tfont\S=file:KozMinPr6N-Regular.otf:jfm=ujisv % vert and vrt2 are automatically activated \tfont\T=file:KozMinPr6N-Regular.otf:jfm=ujisv;-vert % vert and vrt2 are not activated \end{lstlisting} @@ -4723,7 +4739,7 @@ glueであれば，\texttt{[$j$]=\{false, <spec\_node>, <ratio>, <icflag>\}} で \end{itemize} \item[ascent\textrm{, }descent] …… -\item[chars\_cbcache] +\item[chars\_cbcache] …… \end{cslist} %</ja> @@ -5379,7 +5395,7 @@ The correct way is using a temporary register. \ltjsetparameter{kanjiskip=0\zw plus .1\zw minus .01\zw} \@tempskipa=\ltjgetparameter{xkanjiskip} \ifdim\@tempskipa>\z@ - \if@slide + \if@slide \ltjsetparameter{xkanjiskip=0.1em} \else \ltjsetparameter{xkanjiskip=0.25em plus 0.15em minus 0.06em} @@ -5399,7 +5415,7 @@ The correct way is using a temporary register. \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw} \@tempskipa=\ltjgetparameter{xkanjiskip} \ifdim\@tempskipa>\z@ - \if@slide + \if@slide \ltjsetxkanjiskip.1em \else \ltjsetxkanjiskip.25em plus .15em minus .06em @@ -5434,7 +5450,7 @@ The correct way is using a temporary register. さて，縦組の欧文ベースライン補正量\Param{talbaselineshift}は， 実際には \cs{ltj@tablshift} という属性レジスタに格納されている （\ref{sec-para}\nobreak 節参照）．属性レジスタは長さではなく整数値を格納する\footnote{% - 従って，\texttt{\textbackslash @savetbaselineshift=\textbackslash ltj@tablshift}\ + 従って，\texttt{\textbackslash @savetbaselineshift=\textbackslash ltj@tablshift}\ のように記述することはできない．属性レジスタを \cs{tbaselineshift} という名称にしなかっ たのはそのためである． }ものであり，\cs{ltj@tablshift} は補正量を sp 単位で保持することから， @@ -6046,7 +6062,7 @@ will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}. \item[TateFeatures=\{<features>\}\textrm{, }TateFont=<font>] %<*en> The \texttt{TateFeatures} key specifies font features which are only turned~on in -vertical writing, such as \texttt{Style=VerticalKana}~(\texttt{vkna} feature). +vertical writing, such as \texttt{Style=VerticalKana}~(\texttt{vkna} feature). Similarly, the \texttt{TateFont} key specifies the Japanese font which will be used only in vertical writing. A demonstrarion is shown in Figure~\ref{fig:yokotate-fontspec}. @@ -8327,10 +8343,10 @@ $\mathit{Nq}.\mathit{tail}$は無意味なので， 仮想ボディの高さ$h$，深さ$d$については \begin{description} \catcode`\<=12\catcode`\>=12 - \item[$\texttt{yoffset}\geq 0$のとき] -$h = \max(\texttt{height} + \texttt{yoffset}, 0)$, -$d = \max(\texttt{depth} - \texttt{yoffset}, 0)$, - \item[$\texttt{yoffset}<0$のとき] + \item[$\texttt{yoffset}\geq 0$のとき] +$h = \max(\texttt{height} + \texttt{yoffset}, 0)$, +$d = \max(\texttt{depth} - \texttt{yoffset}, 0)$, + \item[$\texttt{yoffset}<0$のとき] $h = \max(\texttt{height} + \texttt{yoffset}, 0)$, $d=\texttt{depth}$. \end{description} という仕様になっている．つまり，\texttt{yoffset} が負（グリフを下ける）の場合に深さは増加しな @@ -8472,9 +8488,9 @@ instead of ``\verb+\ほげ+''. %<*en> \paragraph{Variation selectors} \Pkg{lltjp-listings} add two keys, namely \texttt{vsraw}~and~\texttt{vscmd}, -which specify how variation selectors are treated in +which specify how variation selectors are treated in \texttt{lstlisting} or other enviroments. -Note that these additional keys are not usable in the preamble, +Note that these additional keys are not usable in the preamble, since \Pkg{lltjp-listings} is loaded at \verb+\begin{document}+. \texttt{vsraw} is a key which takes a boolean value, and its default value is @@ -8502,7 +8518,7 @@ variation selectors are ``combined'' with the previous character. \end{lstlisting} \end{LTXexample} %<*en> -\item If the \texttt{vsraw} key is false, then +\item If the \texttt{vsraw} key is false, then variation selectors are typeset by an appropriate command, which is specified by the \texttt{vscmd} key. The default setting of the \texttt{vscmd} key produces the following. @@ -9012,7 +9028,7 @@ as in Page~\pageref{para-cid}. This file stores the table which stores the following. \begin{itemize} \item unicode variants in a font ``\texttt{***}'' - \item vertical width of glyphs, if it is not equal to the sum of + \item vertical width of glyphs, if it is not equal to the sum of the height of ascender and the depth of descender \item vertical variants \end{itemize} @@ -9368,7 +9384,7 @@ TUG 2013, October 2013. \bibitem{jlisting} Thor Watanabe. \newblock Listings\ -\ MyTeXpert. %<en>\newblock %<ja>\\\null\hfill -\url{http://mytexpert.sourceforge.jp/index.php?Listings} +\url{http://mytexpert.osdn.jp/index.php?Listings} \bibitem{jlreq} W3C Japanese Layout Task Force~(ed). \newblock Requirements for Japanese Text Layout (W3C Working Group Note), 2011, 2012. \newblock \url{http://www.w3.org/TR/jlreq/}% diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index 19f9234868b..6332eab32b1 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -120,7 +120,8 @@ ] \documentclass{ltjltxdoc} \GetFileInfo{ltjclasses.dtx} -\usepackage[kozuka-pr6n]{luatexja-preset} +\usepackage{fontspec} +\usepackage[ipaex,nfssonly]{luatexja-preset} \usepackage{unicode-math} \setmathfont{Latin Modern Math} \usepackage[unicode]{hyperref} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index 6a5c905201c..d0ce6836b9d 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -54,7 +54,8 @@ %<*driver> \documentclass{ltjsarticle} \usepackage{doc} -\usepackage[kozuka-pr6n]{luatexja-preset} +\usepackage{fontspec} +\usepackage[ipaex,nfssonly]{luatexja-preset} \usepackage{unicode-math} \setmathfont{Latin Modern Math} \usepackage[unicode]{hyperref} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index e0cb298680c..e5fcd0c268a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2015/02/07', + date = '2015/05/03', description = 'Insertion process of JFM glues and kanjiskip', }) module('luatexja.jfmglue', package.seeall) @@ -384,7 +384,9 @@ local function calc_np_aux_glyph_common(lp) if r then local nf, nc = getfont(npn), getchar(npn) local ct = (font.getfont(nf) or font.fonts[nf] ).characters[nc] - if (ct.left_protruding or 0) == 0 then + if not ct then -- variation selector + node_free(r) + elseif (ct.left_protruding or 0) == 0 then head = insert_before(head, npn, r) Np.first = (Np.first==npn) and r or npn elseif (ct.right_protruding or 0) == 0 then diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index 76ca9ff7a54..cda9d1d33e0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2015/02/08', + date = '2015/05/03', description = 'Loader for Japanese fonts', }) module('luatexja.jfont', package.seeall) @@ -38,7 +38,7 @@ local id_glue_spec = node.id('glue_spec') local id_glue = node.id('glue') local cat_lp = luatexbase.catcodetables['latex-package'] local FROM_JFM = luatexja.icflag_table.FROM_JFM - +local tokenlib = luatexja.token ------------------------------------------------------------------------ -- LOADING JFM ------------------------------------------------------------------------ @@ -242,12 +242,14 @@ do end -- EXT - function jfontdefX(g, dir) + local utf8 = unicode.utf8 + function jfontdefX(g, dir, csname) jfm_dir, is_def_jfont = dir, true - local t = token.get_next() - cstemp=token.csname_name(t) + cstemp = csname:sub( (utf8.byte(csname,1,1) == tex.escapechar) and 2 or 1, -1) + cstemp = cstemp:sub(1, ((cstemp:sub(-1,-1)==' ') and (cstemp:len()>=2)) and -2 or -1) global_flag = g and '\\global' or '' - tex.sprint(cat_lp, '\\expandafter\\font\\csname ', cstemp, '\\endcsname') + tex.sprint(cat_lp, '\\expandafter\\font\\csname ', + (cstemp==' ') and '\\space' or cstemp, '\\endcsname') end luatexbase.create_callback("luatexja.define_jfont", "data", function (ft, fn) return ft end) @@ -263,7 +265,8 @@ do "bad JFM `" .. jfm_file_name .. "'", 'The JFM file you specified is not valid JFM file.\n'.. 'So defining Japanese font is cancelled.') - tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', cstemp, + tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', + (cstemp==' ') and '\\space' or cstemp, '\\endcsname=\\relax') return end @@ -282,7 +285,7 @@ do fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn) font_metric_table[fn]=fmtable tex.sprint(cat_lp, global_flag, '\\protected\\expandafter\\def\\csname ', - cstemp , '\\endcsname{\\ltj@cur'.. + (cstemp==' ') and '\\space' or cstemp, '\\endcsname{\\ltj@cur'.. (jfm_dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}') end end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty index 3d2095cc21d..62cfcf7b19d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty @@ -51,7 +51,7 @@ \def\mc{\tenmin\tentmin} \def\gt{\tengt\tentgt} -\mc\tentmin +\mc \directlua{ local s = kpse.find_file('ltj-kinsoku.lua', 'tex') diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index 753a8405082..dd20eeead9f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -65,7 +65,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-core}[2015/02/22 Core of LuaTeX-ja] + \ProvidesPackage{luatexja-core}[2015/05/03 Core of LuaTeX-ja] \fi %</LaTeX> %% Load prerequisite packages. @@ -196,23 +196,23 @@ \fi %</LaTeX> %%%%%%%% \asluastring -\def\asluastring#1{'\luaescapestring{\detokenize{#1}}'} +\def\asluastring#1{'\luatexluaescapestring{\detokenize{#1}}'} %%%%%%%% Redefine \/ \protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}} %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont -\protected\def\jfont{% - \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false, 'yoko')}} -\protected\def\globaljfont{% - \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true, 'yoko')}} +\protected\def\jfont#1{% + \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false, 'yoko','\luatexluaescapestring{\noexpand#1}')}} +\protected\def\globaljfont#1{% + \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true, 'yoko','\luatexluaescapestring{\noexpand#1}')}} \def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}} %%%%%%%% \tfont\CS={...:...;jfm=metric;...}, \globaltfont -\protected\def\tfont{% - \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false, 'tate')}} -\protected\def\globaltfont{% - \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true, 'tate')}} +\protected\def\tfont#1{% + \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false, 'tate','\luatexluaescapestring{\noexpand#1}')}} +\protected\def\globaltfont#1{% + \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true, 'tate','\luatexluaescapestring{\noexpand#1}')}} \def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY()}} %%%%%%%% \zw, \zh |