summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-18 22:35:48 +0000
committerKarl Berry <karl@freefriends.org>2013-03-18 22:35:48 +0000
commitd40cbce1401307dacf242faddc54bc3eb8651595 (patch)
tree35f82af7bfd3f3afc76fa87f0d255071422af922 /Master
parent8cd524f9b8baa45ef34f1683ca7b2aa151af9098 (diff)
luatexja (18mar13)
git-svn-id: svn://tug.org/texlive/trunk@29424 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/README8
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdfbin563239 -> 586423 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdfbin647611 -> 681539 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdfbin636716 -> 648268 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx228
-rw-r--r--Master/texmf-dist/source/luatex/luatexja/luatexja-kinsoku_make.tex8
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty72
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua1
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua293
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.luabin32052 -> 14687 bytes
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua57
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty32
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.lua50
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty6
23 files changed, 510 insertions, 308 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 1a13b3a1bf0..bbfaa876057 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 20121209.0
+The LuaTeX-ja Package 20130318.1
--------------------------------
Copyright (c) 2011--2012 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -29,9 +29,9 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20121209.0 in the Git repository by
+ or tagged as 20130318.1 in the Git repository by
<http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20121209.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20130318.1;sf=tgz>
b. Extract the archive and put src/ into your TEXMF tree.
An example location is TEXMF/tex/luatex/luatexja.
@@ -55,5 +55,5 @@ Simply loading luatexja.sty by \input or \usepackage does the minimal setting.
\jfontspec, which can be used for specifying Japanese fonts.
-Last commit date: Sun Dec 9 10:06:33 2012 +0900
+Last commit date: Mon Mar 18 14:38:26 2013 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index 04cc5ef8996..0e534cd19a6 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index e6fc11c70bc..72e8235e6e1 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf
index 5b563f8801e..5ce5eb87287 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
index c57030fb430..2c2ba63bff0 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
@@ -58,7 +58,7 @@
\DeclareFontShape{ZH}{hei}{m}{n}{<->name:SimHei:jfm=jis}{}
\DeclareFontShape{ZH}{hei}{bx}{n}{<->ssub*hei/m/n}{}
\DeclareKanjiFamily{ZH}{mincho}{}
-\DeclareFontShape{ZH}{mincho}{m}{n}{<->psft:KozMinPr6N-Regular:cid=Adobe-Japan1-6;jfm=jis}{}
+\DeclareFontShape{ZH}{mincho}{m}{n}{<->name:KozMinPr6N-Regular:cid=Adobe-Japan1-6;jfm=jis}{}
\fontencoding{ZH}\selectfont
\DeclareTextFontCommand{\textsong}{\songfamily}
\DeclareTextFontCommand{\texthei}{\heifamily}
@@ -133,7 +133,7 @@
%%%%%%%% fonts
\usepackage{luatexja-otf}
-\usepackage[jis2004]{luatexja-preset}
+\usepackage[jis2004,ipa]{luatexja-preset}
%<!en>\usepackage{amssymb}
%<*en>
\usepackage{unicode-math}
@@ -573,15 +573,6 @@ We say `alphabetic fonts' for fonts used in \textbf{ALchar}, and `Japanese fonts
\item 用下划线表示的词(如:\Pkg{fontspec})表示\LaTeX 的宏包或者文档类。
%</zh>
-%<*en>
-\item The word `primitive' is used not only for primitives in \LuaTeX,
- but also for control sequences that defined in the core module of
- \LuaTeX-ja.
-%</en>
-%<*ja>
-\item 「プリミティブ」という語を,\LuaTeX のプリミティブだけではなく \LuaTeX-ja
- のコアモジュールで定義されたコントロールシーケンスに対しても用いる.
-%</ja>
%<*zh>
\item “primitive”,该词在本文档中不仅表示\LuaTeX 的基本控制命令,也包括\LuaTeX-ja的相关的基本控制命令
%</zh>
@@ -692,16 +683,59 @@ To install the \LuaTeX-ja\ package, you will need:
%</zh>
\begin{itemize}
%<*en>
-\item \LuaTeX\ (version 0.65.0-beta or later) and its supporting packages.\\
-If you are using \TeX~Live~2011 or current W32\TeX, you don't have to worry.
+\item \LuaTeX\ (version 0.65.0-beta or later) and its supporting packages.
+
+You might need to add the following lines to
+\texttt{lualatex.ini} (just before \verb+\dump+ in the last line),
+if you are using recent \LuaTeX\ whose Lua is 5.2.
%</en>
%<*ja>
-\item \LuaTeX(バージョン 0.65.0-beta 以降)とその支援パッケージ.
- \TeX~Live~2011やW32\TeX の最新版ならば問題ない.
+\item \LuaTeX(バージョン 0.65.0-beta以降)とその支援パッケージ.
+
+Lua 5.2を用いた\LuaTeX(バージョン0.74.0-beta以降)では,\texttt{lualatex.ini}\
+に次の行を加える必要があるかもしれない(\verb+\dump+ の前に).
%</ja>
+%<*!zh>
+\begin{lstlisting}
+{\catcode`\#=12\catcode`\~=12%
+\global\everyjob\expandafter{\the\everyjob%
+ \directlua{%
+ if not table.maxn then
+ table.maxn = function(t)
+ local r = 0
+ for i,_ in pairs(t) do
+ if type(i)=='number' then
+ if i>r then r=i end
+ end
+ end
+ return r
+ end
+ end
+ if not package.loaders then package.loaders=package.searchers end
+ if not string.explode then
+ string.explode = function (str, separator)
+ if not separator then separator=" +" end
+ local t, nexti, pos = { }, 1, 1
+ while true do
+ local st, sp = str:find (separator, pos)
+ if not st then break end
+ if pos ~= st then
+ t [ nexti ] = str:sub ( pos , st - 1 )
+ nexti = nexti + 1
+ end
+ pos = sp + 1
+ end
+ t [ nexti ] = str:sub ( pos )
+ return t
+ end
+ end
+ }%
+}}%
+\end{lstlisting}
+%</!zh>
%<*zh>
-\item \LuaTeX(版本号为大于0.65)和相关支持宏包。\\
-如果用户使用的是\TeX Live2011以及最新版本的W32\TeX,可不考虑此项。
+\item \LuaTeX(版本号为大于0.65)和相关支持宏包。
+%如果用户使用的是\TeX Live2011以及最新版本的W32\TeX,可不考虑此项。
%</zh>
%<*en>
\item The source archive of \LuaTeX-ja, of course\texttt{:)}
@@ -806,7 +840,7 @@ $ git clone git://git.sourceforge.jp/gitroot/luatex-ja/luatexja.git
\end{flushleft}
\item 现在\LuaTeX-ja可以在下列仓库和发行版中获取::
\begin{itemize}
- \item CTAN ( \texttt{macros/luatex/generic/luatexja})
+ \item CTAN (\texttt{macros/luatex/generic/luatexja})
\item MiK\TeX\ (\texttt{luatexja.tar.lzma})
\item \TeX\ Live (\texttt{texmf-dist/tex/luatex/luatexja})
\item W32\TeX\ (\texttt{luatexja.tar.xz})
@@ -878,6 +912,13 @@ But only the contents in \texttt{src/} are needed to work \LuaTeX-ja.
%<*zh>
\item 源文档编码必须是UTF-8。其他的编码,如EUC-JP和Shift-JIS都不被支持。
%</zh>
+%<*en>
+\item \LuaTeX-ja is very slower than \pTeX. Using LuaJIT\TeX slightly improve the situation.
+%</en>
+%<*ja>
+\item \LuaTeX-jaは動作が\pTeX に比べて非常に遅い.コードを変更して徐々に速くしているが,
+まだ満足できる速度ではない.LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようである.
+%</ja>
\end{itemize}
%<en>\subsection{Using in plain \TeX}
@@ -947,7 +988,7 @@ This does minimal settings (like \texttt{ptex.tex}) for typesetting Japanese doc
\begin{itemize}
%<*en>
\item It is widely accepted that the font `Ryumin-Light' and
- `GothicBBB-Medium' aren't embedded into PDF files, and PDF reader
+ `GothicBBB-Medium' aren't embedded into PDF files, and a PDF reader
substitute them by some external Japanese fonts (\textit{e.g.},
Kozuka Mincho is used for Ryumin-Light in Adobe Reader). We adopt this custom to
the default setting.
@@ -1138,11 +1179,11 @@ Okumura), namely, \Pkg{ltjclasses} and \Pkg{ltjsclasses}.
\paragraph{plain \TeX}
%<*en>
-To change Japanese fonts in plain \TeX, you must use the primitive
+To change Japanese fonts in plain \TeX, you must use the control sequence
\verb+\jfont+. So please see Subsection~\ref{ssec-jfont}.
%</en>
%<*ja>
-plain \TeX で和文フォントを変更するためには,\verb+\jfont+ プリミティブを直接用いる.
+plain \TeX で和文フォントを変更するためには,\pTeX のように \verb+\jfont+ 命令を直接用いる.
\ref{ssec-jfont}節を参照.
%</ja>
%<*zh>
@@ -1843,10 +1884,14 @@ If you want to use these functions, load \Pkg{luatexja-otf} package.
%</zh>
\begin{LTXexample}
+\jfontspec{KozMinPr6N-Regular.otf}
森\UTF{9DD7}外と内田百\UTF{9592}とが\UTF{9AD9}島屋に行く。
\CID{7652}飾区の\CID{13706}野家,
-葛飾区の吉野家
+\CID{1481}城市,葛西駅,
+高崎と\CID{8705}\UTF{FA11}
+
+\aj半角{はんかくカタカナ}
\end{LTXexample}
%<*zh>
\egroup
@@ -1899,13 +1944,13 @@ parameters, you have to use commands \verb+\ltjsetparameter+ and
%<*en>
To edit the range of \textbf{JAchar}s, you have to assign a non-zero
natural number which is less than 217 to the character range first. This
-can be done by using \verb+\ltjdefcharrange+ primitive. For example, the
+can be done by using \verb+\ltjdefcharrange+. For example, the
next line assigns whole characters in Supplementary Ideographic Plane
and the character `漢' to the range number~100.
%</en>
%<*ja>
\textbf{JAchar}の範囲を設定するためには,まず各文字に0より大きく217より小さいindexを
-割り当てる必要がある.これには \verb+\ltjdefcharrange+ プリミティブを用いる.
+割り当てる必要がある.これには \verb+\ltjdefcharrange+ を用いる.
例えば,次のように書くことで追加漢字面(SIP)にある全ての文字と`漢'が
「100番の文字範囲」に属するように設定される.
%</ja>
@@ -2693,22 +2738,22 @@ xyz漢字
%<en>\section{Font Metric and Japanese Font}
%<ja>\section{フォントメトリックと和文フォント}
%<zh>\section{字体测度和日文字体}
-%<en>\subsection{\texttt{\char92jfont} primitive}
-%<ja>\subsection{\texttt{\char92jfont}プリミティブ}
+%<en>\subsection{\texttt{\char92jfont}}
+%<ja>\subsection{\texttt{\char92jfont} 命令}
%<zh>\subsection{\texttt{\char92jfont}基本语句}
\label{ssec-jfont}
%<*en>
To load a font as a Japanese font, you must use the
-\verb+\jfont+ primitive instead of~\verb+\font+, while
+\verb+\jfont+ instead of~\verb+\font+, while
\verb+\jfont+ admits the same syntax used in~\verb+\font+.
\LuaTeX-ja automatically loads \Pkg{luaotfload} package,
so TrueType/OpenType fonts with features can be used for Japanese fonts:
%</en>
%<*ja>
-フォントを和文フォントとして読み込むためには,\verb+\jfont+ プリミティブを
+フォントを和文フォントとして読み込むためには,\verb+\jfont+ を
\verb+\font+ プリミティブの代わりに用いる.
-\verb+\jfont+ プリミティブの文法は \verb+\font+ と同じである.
+\verb+\jfont+ の文法は \verb+\font+ と同じである.
\LuaTeX-jaは\Pkg{luaotfload}パッケージを自動的に読み込むので,
TrueType/OpenTypeフォントにfeatureを指定したものを和文フォントとして用いる
ことができる:
@@ -2747,13 +2792,13 @@ causes a error. We denote control sequences which are defined in
As noted in Introduction, a JFM has measurements of characters and
glues/kerns that are automatically inserted for Japanese
typesetting. The structure of JFM will be described in the next
-subsection. At the calling of \verb+\jfont+ primitive, you must specify
+subsection. At the calling of \verb+\jfont+, you must specify
which JFM will be used for this font by the following keys:
%</en>
%<*ja>
「はじめに」の節で述べたように,JFMは文字と和文組版で自動的に挿入される
グルー/カーンの寸法情報を持っている.JFMの構造は次の小節で述べる.
-\verb+\jfont+ プリミティブの呼び出しの際には,どのJFMを用いるのかを以下のキーで
+\verb+\jfont+ 命令の呼び出しの際には,どのJFMを用いるのかを以下のキーで
指定する必要がある:
%</ja>
%<*zh>
@@ -2842,13 +2887,13 @@ JFMの名前を指定する.もし以前に指定されたJFMが読み込ま
\label{tab-difjfm}
\ltjsetparameter{jacharrange={+3}}
\begin{center}\small
-\def\r#1{{\jfont\g=psft:Ryumin-Light:jfm=#1 at 14.43324pt \g
+\def\r#1{{\jfont\g=name:IPAMincho:jfm=#1 at 14.43324pt \g
\setbox0=\vtop{\hsize=7\zw\noindent ◆◆◆◆◆◆◆
ある日モモちゃんがお使いで迷子になって泣きました.}\copy0
\vrule height 0pt depth \dp0}}
-\def\s#1{{\jfont\g=psft:Ryumin-Light:jfm=#1 at 14.43324pt \g
+\def\s#1{{\jfont\g=name:IPAMincho:jfm=#1 at 14.43324pt \g
\setbox0=\vtop{\hsize=7\zw\noindent ちょっと!何}\copy0}}
-\def\t#1{{\jfont\g=psft:Ryumin-Light:jfm=#1 at 19.24432pt \g
+\def\t#1{{\jfont\g=name:IPAMincho:jfm=#1 at 19.24432pt \g
\setbox0=\hbox{漢}%
\vrule width 0.4pt height\ht0 depth\dp0\kern-.2pt\copy0
\kern-\wd0\vrule width\wd0height .2pt depth .2pt
@@ -2901,12 +2946,12 @@ JFMに基づくグルー/カーンも挿入される場合には2文字間の
\begin{itemize}
%<*en>
\item You should specify \texttt{-kern} in
- \verb+jfont+ primitive, when you want to use other font features,
+ \verb+jfont+ when you want to use other font features,
such as \texttt{script=...}\,.
%</en>
%<*ja>
\item \texttt{script=...}といったfeatureを使いたい場合には,\verb+\jfont+
- プリミティブに\texttt{-kern}を指定するべきである.
+ に\texttt{-kern}を指定するべきである.
%</ja>
%<*zh>
\item 当你想使用其他字体特性如\texttt{script=...}的时候,可以在\verb!jfont!基本语句中设置\texttt{-kern}
@@ -2931,29 +2976,36 @@ TODO: kanjiskip?
%<zh>\subsection{\texttt{psft}前缀}
\label{ssec-psft}
%<*en>
-Besides \texttt{file:}\ and \texttt{name:}\ prefixes, one can use \texttt{psft:}\
-prefix in \verb+\jfont+ (and~\verb+\font+) primitive,
+Besides `\texttt{file:}'\ and `\texttt{name:}'\ prefixes, one can use `\texttt{psft:}'\
+prefix in \verb+\jfont+ (and~\verb+\font+),
to specify a `name-only' Japanese font which
will not be embedded to PDF. Typical use of this prefix is to specify
the `standard' Japanese fonts, namely, `Ryumin-Light' and
`GothicBBB-Medium'.
+\emph{You should not specify any font features, such as `{\tt +jp90}',
+in the definition of `name-only' fonts using this `{\tt psft:}'\ prefix.}
%</en>
%<*ja>
-\texttt{file:}と\texttt{name:}のプリフィックスに加えて,
-\verb+\jfont+ プリミティブ(と \verb+\font+ プリミティブ)では
+\texttt{file:} と \texttt{name:} のプリフィックスに加えて,
+\verb+\jfont+(と \verb+\font+ プリミティブ)では
\texttt{psft:}プリフィックスを用いることができる.
このプリフィックスを用いることで,PDFには埋め込まれない「名前だけの」
和文フォントを指定することができる.「標準的な」和文フォント,
つまり`Ryumin-Light'と`GothicBBB-Medium'の指定でこのプリフィックスが使われる.
+\textbf{非埋込フォントをPDFに使用すると,実際にどのようなフォントが表示に用いられるか予測できない.
+そのため,本プリフィックス指定時には,\texttt{+jp90} などのfont featureは指定すべきでない.}
%</ja>
%<*zh>
除使用\texttt{file:}和\texttt{name:}外,我们还可以在\verb!\jfont!(以及\verb!\font!)
中使用\texttt{psft:}来设定一个“名义上”的并不嵌入PDF中的日文字体。
此前缀的典型使用是定义“标准”日文字体,即“Ryumin-Light”和“GothicBBB-Medium”。
-\paragraph{\texttt{cid}键} 默认使用\texttt{psft:}前缀定义的字体是为Adobe-Japan1-6 CID字体。
-也可以使用\texttt{cid}键来使用其他的CID字体,如中文和韩文。
%</zh>
+%<*zh>
+\paragraph{\texttt{cid}键}
+默认使用\texttt{psft:}前缀定义的字体是为Adobe-Japan1-6 CID字体。
+也可以使用\texttt{cid}键来使用其他的CID字体,如中文和韩文。
+%</zh>
%<en>\paragraph{\texttt{cid} key}
%<ja>\paragraph{\texttt{cid}キー}
\label{para-cid}
@@ -3172,8 +3224,8 @@ This field is a list of characters which are in this character
\textbf{JAchar}s). In the list, character(s) can be specified in the following form:
\begin{itemize}
\item a Unicode code point
-\item the character itself (as a Lua string, like \verb+'あ'+)
-\item a string like \verb+'あ*'+ (the character followed by an asterisk)
+\item the character itself (as a Lua string, like \hbox{\ltjsetparameter{autoxspacing=false}\verb+'あ'+})
+\item a string like \hbox{\ltjsetparameter{autoxspacing=false}\verb+'あ*'+} (the character followed by an asterisk)
\item several ``imaginary'' characters (We will describe these later.)
\end{itemize}
%</en>
@@ -3183,8 +3235,8 @@ This field is a list of characters which are in this character
除いた全ての\textbf{JAchar}が属するから).このリスト中で文字を指定するには,以下の方法がある:
\begin{itemize}
\item Unicode におけるコード番号
-\item 「\verb+'あ'+」のような,文字それ自体
-\item 「\verb+'あ*'+」のような,文字それ自体の後にアスタリスクをつけたもの
+\item 「\hbox{\ltjsetparameter{autoxspacing=false}\verb+'あ'+}」のような,文字それ自体
+\item 「\hbox{\ltjsetparameter{autoxspacing=false}\verb+'あ*'+}」のような,文字それ自体の後にアスタリスクをつけたもの
\item いくつかの「仮想的な文字」(後に説明する)
\end{itemize}
%</ja>
@@ -3210,7 +3262,7 @@ But there is one exception: if \texttt{'prop'} is specified in \texttt{width} fi
文字クラス$i$に属する文字の幅,高さ,深さ,イタリック補正の量を指定する.
文字クラス$i$に属する全ての文字は,その幅,高さ,深さがこのフィールドで指定した
値であるものとして扱われる.
-しかし,例外が一つある:もし\texttt{'prop'}が\texttt{width}フィールドに
+しかし,例外が一つある:もし \texttt{'prop'} が \texttt{width} フィールドに
指定された場合,文字の幅はその「実際の」グリフの幅となる.
%</ja>
%<*zh>
@@ -3378,7 +3430,7 @@ Furthermore, the glyph is shifted according to values of fields
\label{fig-pos}
\end{figure}
-\item[kern={\{[$j$]=<kern>, [$j'$]=\{<kern>, [<ratio>]\}...\}}]
+\item[kern={\{[$j$]=<kern>, [$j'$]=\{<kern>, [<ratio>]\}, ...\}}]
\item[glue={\{[$j$]=\{<width>, <stretch>, <shrink>, [<priority>], [<ratio>]\}, ...\}}]
%<*ja>
@@ -3442,7 +3494,7 @@ Furthermore, the glyph is shifted according to values of fields
\end{lstlisting}
句点「。」の幅は二分であるので
\begin{LTXexample}
-\jfont\a=psft:Ryumin-Light:jfm=test;+vert
+\jfont\a=name:IPAMincho:jfm=test;+vert
\setbox0\hbox{\a 。\inhibitglue 漢}
\the\wd0
\end{LTXexample}
@@ -3458,7 +3510,7 @@ Furthermore, the glyph is shifted according to values of fields
一方,「\texttt{'、*'}」のようにアスタリスクつきの指定があると,
状況は異なってくる.
\begin{LTXexample}
-\jfont\a=psft:Ryumin-Light:jfm=test;+vert
+\jfont\a=name:IPAMincho:jfm=test;+vert
\a 漢、\inhibitglue 漢
\end{LTXexample}
ここで,読点「、」の文字クラスは,以下のようにして決まる.
@@ -3472,7 +3524,7 @@ Furthermore, the glyph is shifted according to values of fields
なお,置換後のグリフで判定した文字クラスの値が0でなければ,そちらをそのまま作用する.
\begin{LTXexample}
-\jfont\a=psft:Ryumin-Light:jfm=test;+hwid
+\jfont\a=name:IPAMincho:jfm=test;+hwid
\a 漢ヒひ
\end{LTXexample}
上の例では,
@@ -3576,7 +3628,7 @@ The following is the list of `imaginary characters':
\texttt{'parbdd'}を入れれば全角下がりとなる.
\begin{LTXexample}
-\jfont\g=psft:Ryumin-Light:jfm=test \g
+\jfont\g=name:IPAMincho:jfm=test \g
\parindent1\zw\noindent{}◆◆◆◆◆
\par 「◆◆←二分下がり
\par 【◆◆←全角下がり
@@ -3629,8 +3681,8 @@ you can set both \verb+\fam+ and \verb+\jfam+ to the same value.
%</ja>
\begin{table}[!tb]
-%<en>\caption{Primitives for Japanese math fonts.}
-%<ja>\caption{和文数式フォントに対するプリミティブ.}
+%<en>\caption{Control sequences for Japanese math fonts}
+%<ja>\caption{和文数式フォントに対する命令}
%<zh>\caption{日语数学字体基本语句}
\label{tab-math}
\begin{center}
@@ -3895,13 +3947,13 @@ Then, the position of glyphs is shifted up by
%<en>\section{Parameters}
%<ja>\section{パラメータ}
%<zh>\section{参数}
-%<en>\subsection{\texttt{\char92 ltjsetparameter} primitive}
-%<ja>\subsection{\texttt{\char92 ltjsetparameter}プリミティブ}
+%<en>\subsection{\texttt{\char92 ltjsetparameter}}
+%<ja>\subsection{\texttt{\char92 ltjsetparameter}命令}
%<zh>\subsection{\texttt{\char92 ltjsetparameter}基本参数}
%<*en>
As noted before, \verb+\ltjsetparameter+ and \verb+\ltjgetparameter+ are
-primitives for accessing most parameters of \LuaTeX-ja. One of the main
+control sequences for accessing most parameters of \LuaTeX-ja. One of the main
reason that \LuaTeX-ja didn't adopted the syntax similar to that of \pTeX\
(\textit{e.g.},~\verb+\prebreakpenalty`)=10000+)
is the position of \verb+hpack_filter+ callback in the source
@@ -3909,14 +3961,14 @@ of \LuaTeX, see Section~\ref{sec-para}.
%</en>
%<*ja>
先に述べたように,\verb+\ltjsetparameter+ と \verb+\ltjgetparameter+ は
-\LuaTeX-jaのほとんどのパラメータにアクセスするためのプリミティブである.
+\LuaTeX-jaのほとんどのパラメータにアクセスするための命令である.
\LuaTeX-jaが\pTeX のような文法(例えば,\verb+\prebreakpenalty`)=10000+)を
採用しない理由の一つは,\LuaTeX のソースにおける \verb+hpack_filter+
コールバックの位置にある.\ref{sec-para}節を参照.
%</ja>
%<*en>
-\verb+\ltjsetparameter+ and \verb+\ltjglobalsetparameter+ are primitives
+\verb+\ltjsetparameter+ and \verb+\ltjglobalsetparameter+ are control sequences
for assigning parameters. These take one argument which is a
\texttt{<key>=<value>} list. Allowed keys are described in the next
subsection.
@@ -3930,7 +3982,7 @@ like other assignment.
%</en>
%<*ja>
\verb+\ltjsetparameter+ と \verb+\ltjglobalsetparameter+ はパラメータを
-指定するためのプリミティブである.これらは\texttt{<key>=<value>}のリストを
+指定するための命令である.これらは\texttt{<key>=<value>}のリストを
引数としてとる.許されるキーは次の節に記述する.
\verb+\ltjsetparameter+ と \verb+\ltjglobalsetparameter+ の違いはスコープの
違いのみである.
@@ -3940,12 +3992,12 @@ like other assignment.
%</ja>
%<*en>
-\verb+\ltjgetparameter+ is the primitive for acquiring parameters. It
+\verb+\ltjgetparameter+ is for acquiring parameters. It
always takes a parameter name as first argument, and also takes the
additional argument---a character code, for example---in some cases.
%</en>
%<*ja>
-\verb+\ltjgetparameter+ はパラメータの値を取得するためのプリミティブであり,
+\verb+\ltjgetparameter+ はパラメータの値を取得するための命令であり,
常にパラメータの名前を第一引数にとる.
そして,いくつかの場合には加えてさらに引数(例えば文字コード)をとる.
%</ja>
@@ -4195,19 +4247,20 @@ JFM(もしくはサイズ)が異なる2つの\textbf{JAchar}の間にグル
\end{list}
-%<en>\section{Other Primitives}
-%<ja>\section{その他のプリミティブ}
+%<en>\section{Other Control Sequences}
+%<ja>\section{その他の命令}
%<zh>\section{其他基本语句}
-%<en>\subsection{Primitives for Compatibility}
-%<ja>\subsection{互換プリミティブ}
+%<en>\subsection{Control Sequences for Compatibility}
+%<ja>\subsection{\pTeX 互換用命令}
%<zh>\subsection{基本语句兼容性}
%<*en>
-The following primitives are implemented for compatibility with \pTeX.
-Note that these primitives don't support JIS~X~0213, but only JIS~X~0208.
+The following control sequences are implemented for compatibility with \pTeX.
+Note that these don't support JIS~X~0213, but only JIS~X~0208.
%</en>
%<*ja>
-以下のプリミティブは\pTeX との互換性のために実装されている:
+以下の命令は\pTeX との互換性のために実装されている.そのため,JIS~X~0213には対応せず,
+\pTeX と同じようにJIS~X~0208の範囲しかサポートしていない.
%</ja>
%<*zh>
下列基本语句的实现与\pTeX 兼容:
@@ -4221,16 +4274,16 @@ Note that these primitives don't support JIS~X~0213, but only JIS~X~0208.
\item[kansuji]
\end{list}
-%<en>\subsection{\texttt{\char92 inhibitglue} primitive}
-%<ja>\subsection{\texttt{\char92 inhibitglue}プリミティブ}
+%<en>\subsection{\texttt{\char92 inhibitglue}}
+%<ja>\subsection{\texttt{\char92 inhibitglue}}
%<zh>\subsection{\texttt{\char92 inhibitglue}基本语句}
%<*en>
-The primitive \verb+\inhibitglue+ suppresses the insertion of \textbf{JAglue}.
+\verb+\inhibitglue+ suppresses the insertion of \textbf{JAglue}.
The following is an example, using a special JFM that there will be a glue between
the beginning of a box and `あ', and also between `あ' and `ウ'.
%</en>
%<*ja>
-\verb+\inhibitglue+ プリミティブは\textbf{JAglue}の挿入を抑制する.
+\verb+\inhibitglue+ は\textbf{JAglue}の挿入を抑制する.
以下は,ボックスの始めと`あ'の間,`あ'と`ウ'の間にグルーが入る特別なJFMを用いた例で
ある.
%</ja>
@@ -4240,7 +4293,7 @@ the beginning of a box and `あ', and also between `あ' and `ウ'.
%</zh>
\begin{LTXexample}
-\jfont\g=psft:Ryumin-Light:jfm=test \g
+\jfont\g=name:IPAMincho:jfm=test \g
\fbox{\hbox{あウあ\inhibitglue ウ}}
\inhibitglue\par\noindent あ1
\par\inhibitglue\noindent あ2
@@ -4294,7 +4347,7 @@ With the help of this example, we remark the specification of \verb+\inhibitglue
\end{itemize}
%<en>\section{Control Sequences for \LaTeXe}
-%<ja>\section{\LaTeXe 用のコントロールシーケンス}
+%<ja>\section{\LaTeXe 用の命令}
%<zh>\section{\LaTeXe 下使用的控制序列}
%<en>\subsection{Patch for NFSS2}
@@ -4306,12 +4359,12 @@ With the help of this example, we remark the specification of \verb+\inhibitglue
As described in Subsection~\ref{ssec-ltx}, \LuaTeX-ja simply adopted
\texttt{plfonts.dtx} in \pLaTeXe\ for the Japanese patch for NFSS2.
For an convenience, we will describe
-commands which are not described in Subsection~\ref{ssub-chgfnt}.
+control sequences which are not described in Subsection~\ref{ssub-chgfnt}.
%</en>
%<*ja>
\ref{ssec-ltx}節で述べたように,\LuaTeX-jaはNFSS2への日本語パッチである
\pLaTeXe の\texttt{plfonts.dtx}を単純に取り入れている.
-便宜のため,ここでは\ref{ssub-chgfnt}節で述べていなかったコマンドについて
+便宜のため,ここでは\ref{ssub-chgfnt}節で述べていなかった命令について
記述しておく.
%</ja>
@@ -4436,21 +4489,21 @@ to <family>. Which family will be changed is determined as follows:
%</ja>
\begin{itemize}
%<*en>
-\item The family <fam> under the encoding <ja-enc> has been already defined by
+\item The family <family> under the encoding <ja-enc> has been already defined by
\verb+\DeclareKanijFamily+.
%</en>
%<*ja>
-\item エンコーディング<ja-enc>におけるファミリ<fam>が既に \verb+\DeclareKanjiFamily+ によって定義されている.
+\item エンコーディング<ja-enc>におけるファミリ<family>が既に \verb+\DeclareKanjiFamily+ によって定義されている.
%</ja>
%<*en>
-\item A font definition named \texttt{<enc><ja-enc>.fd} (the file name is
+\item A font definition named \texttt{<ja-enc><family>.fd} (the file name is
all lowercase) exists.
%</en>
%<*zh>
\item
%</zh>
%<*ja>
-\item フォント定義ファイル\texttt{<enc><ja-enc>.fd}(ファイル名は全て小文字)が存在する.
+\item フォント定義ファイル\texttt{<ja-enc><family>.fd}(ファイル名は全て小文字)が存在する.
%</ja>
\end{itemize}
%<*en>
@@ -4522,13 +4575,13 @@ the commands of Japanese version:
%<*en>
These 3 font features correspond to \texttt{cid}, \texttt{jfm} and
-\texttt{jfmvar} keys for \verb+\jfont+ primitive, respectively.
+\texttt{jfmvar} keys for \verb+\jfont+ respectively.
\texttt{CID} is effective only when with \texttt{NoEmbed}
described below.
See Subsections~\ref{ssec-jfont} and \ref{ssec-psft} for details.
%</en>
%<*ja>
-これら3つのキーはそれぞれ \verb+\jfont+ プリミティブに対する
+これら3つのキーはそれぞれ \verb+\jfont+ に対する
\texttt{cid}, \texttt{jfm}, \texttt{jfmvar}キーとそれぞれ対応する.
\texttt{CID} は下の \texttt{NoEmbed} と合わせて用いられたときのみ有効である.
\verb+\jfont+ プリミティブに対する
@@ -4547,6 +4600,13 @@ will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}.
%</ja>
\end{list}
+%<*ja>
+なお,\texttt{luatexja-fontspec.sty} 読み込み時には和文フォント定義ファイル%
+\texttt{<ja-enc><family>.fd}は全く参照されなくなる.
+%</ja>
+
+
+
\subsection{\texttt{luatexja-otf.sty}}
%<*en>
@@ -6837,9 +6897,9 @@ JIS~X~0208にないため\pTeX では使用不能と考えて良いものであ
\test{1}\test{2}\test{3}\test{4}\test{5}\test{6}\test{7}\test{8}
\test{9}\test{10}\test{11}\test{12}\test{13}
+%</!zh>
\errorstopmode
-%</!zh>
\section{Package versions used in this document}
This document was typeset using the following packages:
diff --git a/Master/texmf-dist/source/luatex/luatexja/luatexja-kinsoku_make.tex b/Master/texmf-dist/source/luatex/luatexja/luatexja-kinsoku_make.tex
index 8ae1973321f..be36d2ffddc 100644
--- a/Master/texmf-dist/source/luatex/luatexja/luatexja-kinsoku_make.tex
+++ b/Master/texmf-dist/source/luatex/luatexja/luatexja-kinsoku_make.tex
@@ -1,4 +1,4 @@
-%#!lualatex --shell-escape luatexja-kinsoku_make.tex
+%#!lualatex luatexja-kinsoku_make.tex
\documentclass{article}
\usepackage{luatexja}
\makeatletter
@@ -6,10 +6,8 @@
\usepackage{luacode}
\begin{luacode}
s = table.copy(luatexja.stack.charprop_stack_table[0])
- s[0].jwp, s[0].xsp = nil, nil
s.kanjiskip = nil; s.xkanjiskip = nil
- table.tofile('ltj-kinsoku.out', s, 'return', false, true, false)
+ table.tofile('ltj-kinsoku.lua', s, 'return', false, true, false)
\end{luacode}
-\immediate\write18{texluac -o ltj-kinsoku.lua ltj-kinsoku.out}
\begin{document}
-\end{document} \ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
index 4a037d640cd..056ae0cc6f9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -149,4 +149,76 @@
\cs_set_eq:NN \addjfontfeature \addjfontfeatures
+\ExplSyntaxOff
+%%%%%%%% Now we completely ignore kanjifont definition file.
+
+\DeclareRobustCommand\fontfamily[1]{%
+ \@notkfamfalse\@notffamfalse\edef\tmp@item{{#1}}%
+ \ifcsname \k@encoding+#1\endcsname % if \k@encoding+#1 is already defined
+ \edef\k@family{#1}%
+ \else
+ \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\k@encoding+%
+ \@notkfamtrue
+ \fi
+ \ifcsname \f@encoding+#1\endcsname
+ \edef\f@family{#1}%
+ \else % search font definition file...
+ \ifcsname ffam@list@\f@encoding\endcsname\else
+ \expandafter\gdef\csname ffam@list@\f@encoding\endcsname{}%
+ \expandafter\gdef\csname notffam@list@\f@encoding\endcsname{}%
+ \fi
+ \edef\@templist{\@nameuse{ffam@list@\f@encoding}}%
+ \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
+ \ifin@\edef\f@family{#1}\else
+ \edef\@templist{\@nameuse{notffam@list@\f@encoding}}%
+ \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
+ \ifin@\@notffamtrue\else
+ \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
+ \message{(I search font definition file. \@@temp)}%
+ \IfFileExists{\@@temp}{\@tempswztrue}{\@tempswzfalse}%
+ \if@tempswz
+ \expandafter\xdef\csname ffam@list@\f@encoding\endcsname
+ {\@nameuse{ffam@list@\f@encoding}\fam@elt<#1>}\edef\f@family{#1}%
+ \else
+ \expandafter\xdef\csname notffam@list@\f@encoding\endcsname
+ {\@nameuse{notffam@list@\f@encoding}\fam@elt<#1>}\@notffamtrue%
+ \fi
+ \fi
+ \fi
+ \fi
+ \if@notkfam\if@notffam
+ {\ifcsname D@\k@encoding\endcsname\@nameuse{D@\k@encoding}\fi
+ \xdef\@@temp{\default@family}}\edef\k@family{\@@temp}%
+ {\ifcsname D@\f@encoding\endcsname\@nameuse{D@\f@encoding}\fi
+ \xdef\@@temp{\default@family}}\edef\f@family{\@@temp}%
+ \fi\fi
+}
+
+% We must redefine \try@load@fontshape to ignore kanjifont definitions at all.
+\def\try@load@fontshape{%
+ \expandafter
+ \ifx\csname \f@encoding+\f@family\endcsname\relax
+ \edef\tmp@item{{\directlua{%
+ tex.print(luatexbase.catcodetables["latex-package"], '\f@encoding')}%
+ }}% \f@encoding の展開結果の catcode は 12 であるため,これで補正.
+ \expandafter\expandafter\expandafter
+ \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
+\ifin@ % Japanese font: we don't search fd.
+ \@font@warning{We don't search kanjifont definition
+ \MessageBreak for \f@encoding/\f@family}%
+\else % Alphabetic font
+ \@font@info{Try loading font information for
+ \f@encoding+\f@family}%
+ \global\expandafter\let
+ \csname\f@encoding+\f@family\endcsname\@empty
+ \nfss@catcodes
+ \let\nfss@catcodes\relax
+ \edef\reserved@a{%
+ \lowercase{%
+ \noexpand\InputIfFileExists{\f@encoding\f@family.fd}}}%
+ \reserved@a\relax
+ {\@input@{\f@encoding\f@family.fd}}%
+\fi
+ \fi}
+
\endinput
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
index db92b2a345f..e8b5bdda78b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
@@ -157,7 +157,7 @@ local function aw_step1(p, res, total)
return false-- それ以外は対象外.
end
local xk = ltjf_font_metric_table --
- [xc.font].size_cache.char_type[has_attr(xc, attr_jchar_class) or 0]
+ [xc.font].char_type[has_attr(xc, attr_jchar_class) or 0]
['end_' .. res.name] or 0
--print(res.name, total, xk, unicode.utf8.char(xc.char))
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua
index 6e1da777226..acb37ec604b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-compat.lua
@@ -22,7 +22,7 @@ function to_kansuji(num)
local s = ""
while num~=0 do
s = utf.char(
- ltjs.get_penalty_table('ksj', num%10,
+ ltjs.get_penalty_table(luatexja.stack_table_index.KSJ + num%10,
'', tex.getcount('ltj@@stack'))) .. s
num=math.floor(num/10)
end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
index d23d21c8648..f527f341c71 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
@@ -12,6 +12,7 @@ local err, warn, info, log = luatexbase.errwarinf(_NAME)
luatexja.load_module('charrange'); local ltjc = luatexja.charrange
+local utf = unicode.utf8
local node_new = node.new
local id_glyph = node.id('glyph')
local getcatcode = tex.getcatcode
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index 0dc28f7c35d..aca606e5d6e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -19,7 +19,6 @@ local set_attr = node.set_attribute
local insert_before = node.insert_before
local node_next = node.next
local round = tex.round
-local ltjs_fast_get_penalty_table = ltjs.fast_get_penalty_table
local ltjf_font_metric_table = ltjf.font_metric_table
local ltjf_find_char_class = ltjf.find_char_class
local node_new = node.new
@@ -43,10 +42,10 @@ local id_kern = node.id('kern')
local id_penalty = node.id('penalty')
local id_glue_spec = node.id('glue_spec')
-local id_jglyph = node.id('glyph') + 256 -- Japanese character
-local id_box_like = node.id('hlist') + 256 -- vbox, shifted hbox
-local id_pbox = node.id('hlist') + 512 -- already processed nodes (by \unhbox)
-local id_pbox_w = node.id('hlist') + 513 -- cluster which consists of a whatsit
+local id_jglyph = 512 -- Japanese character
+local id_box_like = 256 -- vbox, shifted hbox
+local id_pbox = 257 -- already processed nodes (by \unhbox)
+local id_pbox_w = 258 -- cluster which consists of a whatsit
local sid_user = node.subtype('user_defined')
local sid_start_link = node.subtype('pdf_start_link')
@@ -66,10 +65,10 @@ local BOXBDD = luatexja.icflag_table.BOXBDD
local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
local kanji_skip
local xkanji_skip
+local table_current_stack
local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
local attr_icflag = luatexbase.attributes['ltj@icflag']
-local max_dimen = 1073741823
local function get_attr_icflag(p)
return (has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG
@@ -83,14 +82,14 @@ end
-- This function is called only for acquiring `special' characters.
local function fast_find_char_class(c,m)
- return m.size_cache.chars[c] or 0
+ return m.chars[c] or 0
end
-- 文字クラスの決定
local function slow_find_char_class(c, m, oc)
local xc = c or oc
local cls = ltjf_find_char_class(oc, m)
- if xc ~= oc and cls==0 then cls, xc = ltjf_find_char_class(-xc, m) end
+ if xc ~= oc and cls==0 then cls = ltjf_find_char_class(-xc, m) end
return cls, xc
end
@@ -162,12 +161,26 @@ local function check_box(box_ptr, box_end)
first_char = p; find_first_char = false
end
last_char = p; found_visible_node = true; p=node_next(p)
- if (not p) or p==box_end then return found_visible_node end
+ if (not p) or p==box_end then
+ return found_visible_node
+ end
until p.id~=id_glyph
pid = p.id -- p must be non-nil
end
- if pid==id_kern and get_attr_icflag(p)==IC_PROCESSED then
- p = node_next(p);
+ if pid==id_kern then
+ if get_attr_icflag(p)==IC_PROCESSED then
+ -- do nothing
+ elseif p.subtype==2 then
+ p = node_next(node_next(p));
+ -- Note that another node_next will be executed outside this if-statement.
+ else
+ found_visible_node = true
+ if find_first_char then
+ find_first_char = false
+ else
+ last_char = nil
+ end
+ end
elseif pid==id_hlist then
if PACKED == get_attr_icflag(p) then
if find_first_char then
@@ -184,6 +197,11 @@ local function check_box(box_ptr, box_end)
end
end
end
+ elseif pid==id_math then
+ if find_first_char then
+ first_char = p; find_first_char = false
+ end
+ last_char = p; found_visible_node = true
elseif not (pid==id_ins or pid==id_mark
or pid==id_adjust or pid==id_whatsit
or pid==id_penalty) then
@@ -202,11 +220,16 @@ end
function check_box_high(Nx, box_ptr, box_end)
first_char = nil; last_char = nil; find_first_char = true
if check_box(box_ptr, box_end) then
+ local first_char = first_char
if first_char then
- if first_char.font == (has_attr(first_char, attr_curjfnt) or -1) then
- set_np_xspc_jachar(Nx, first_char)
- else
- set_np_xspc_alchar(Nx, first_char.char,first_char, ligature_head)
+ if first_char.id==id_glyph then
+ if first_char.font == (has_attr(first_char, attr_curjfnt) or -1) then
+ set_np_xspc_jachar(Nx, first_char)
+ else
+ set_np_xspc_alchar(Nx, first_char.char,first_char, ligature_head)
+ end
+ else -- math_node
+ set_np_xspc_alchar(Nx, -1,first_char)
end
end
end
@@ -257,7 +280,7 @@ end
local calc_np_auxtable = {
- [id_glyph] = function (lp)
+ [id_glyph] = function (lp)
Np.first, Np.nuc = (Np.first or lp), lp;
Np.id = (lp.font == (has_attr(lp, attr_curjfnt) or -1)) and id_jglyph or id_glyph
--set_attr_icflag_processed(lp) treated in ltj-setwidth.lua
@@ -265,26 +288,31 @@ local calc_np_auxtable = {
end,
[id_hlist] = function(lp)
Np.first = Np.first or lp; Np.last = lp; Np.nuc = lp;
- set_attr_icflag_processed(lp)
+ set_attr(lp, attr_icflag, PROCESSED)
+ --set_attr_icflag_processed(lp)
Np.id = (lp.shift~=0) and id_box_like or id_hlist
return true, node_next(lp)
end,
box_like = function(lp)
Np.first = Np.first or lp; Np.nuc = lp; Np.last = lp;
- Np.id = id_box_like; set_attr_icflag_processed(lp);
+ Np.id = id_box_like; set_attr(lp, attr_icflag, PROCESSED)
+ -- set_attr_icflag_processed(lp);
return true, node_next(lp);
end,
skip = function(lp)
- set_attr_icflag_processed(lp); return false, node_next(lp)
+ set_attr(lp, attr_icflag, PROCESSED)
+ -- set_attr_icflag_processed(lp);
+ return false, node_next(lp)
end,
[id_whatsit] = function(lp)
if lp.subtype==sid_user then
- if lp.user_id==30111 then
+ if lp.user_id==luatexja.userid_table.IHB then
local lq = node_next(lp);
head = node.remove(head, lp); node.free(lp); ihb_flag = true
return false, lq;
else
- set_attr_icflag_processed(lp)
+ set_attr(lp, attr_icflag, PROCESSED)
+ -- set_attr_icflag_processed(lp)
luatexbase.call_callback("luatexja.jfmglue.whatsit_getinfo",
Np, lp, Nq)
if Np.nuc then
@@ -301,39 +329,44 @@ local calc_np_auxtable = {
elseif lp.subtype == sid_end_link or lp.subtype == sid_end_thread then
Np.first, Nq.last = nil, lp;
end
- set_attr_icflag_processed(lp); return false, node_next(lp)
+ set_attr(lp, attr_icflag, PROCESSED)
+ -- set_attr_icflag_processed(lp);
+ return false, node_next(lp)
end
end,
[id_math] = function(lp)
Np.first, Np.nuc = (Np.first or lp), lp;
- set_attr_icflag_processed(lp); lp = node_next(lp)
+ set_attr(lp, attr_icflag, PROCESSED) -- set_attr_icflag_processed(lp);
+ lp = node_next(lp)
while lp.id~=id_math do
- set_attr_icflag_processed(lp); lp = node_next(lp)
+ set_attr(lp, attr_icflag, PROCESSED) -- set_attr_icflag_processed(lp);
+ lp = node_next(lp)
end
- set_attr_icflag_processed(lp);
+ set_attr(lp, attr_icflag, PROCESSED) -- set_attr_icflag_processed(lp);
Np.last, Np.id = lp, id_math;
return true, node_next(lp);
end,
discglue = function(lp)
Np.first, Np.nuc, Np.last = (Np.first or lp), lp, lp;
- Np.id = lp.id; set_attr_icflag_processed(lp); return true, node_next(lp)
+ Np.id = lp.id; set_attr(lp, attr_icflag, PROCESSED) -- set_attr_icflag_processed(lp);
+ return true, node_next(lp)
end,
[id_kern] = function(lp)
Np.first = Np.first or lp
if lp.subtype==2 then
- set_attr_icflag_processed(lp); lp = node_next(lp)
- set_attr_icflag_processed(lp); lp = node_next(lp)
- set_attr_icflag_processed(lp); lp = node_next(lp)
- set_attr_icflag_processed(lp); Np.nuc = lp
+ set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp)
+ set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp)
+ set_attr(lp, attr_icflag, PROCESSED); lp = node_next(lp)
+ set_attr(lp, attr_icflag, PROCESSED); Np.nuc = lp
Np.id = (lp.font == (has_attr(lp, attr_curjfnt) or -1)) and id_jglyph or id_glyph
return true, check_next_ickern(node_next(lp));
else
- Np.id = id_kern; set_attr_icflag_processed(lp);
+ Np.id = id_kern; set_attr(lp, attr_icflag, PROCESSED); -- set_attr_icflag_processed(lp);
Np.last = lp; return true, node_next(lp)
end
end,
[id_penalty] = function(lp)
- Bp[#Bp+1] = lp; set_attr_icflag_processed(lp);
+ Bp[#Bp+1] = lp; set_attr(lp, attr_icflag, PROCESSED); -- set_attr_icflag_processed(lp);
return false, node_next(lp)
end,
}
@@ -350,7 +383,7 @@ local pairs = pairs
function calc_np(lp, last)
local k
-- We assume lp = node_next(Np.last)
- Np, Nq, ihb_flag = Nq, Np, false
+ Np, Nq, ihb_flag = Nq, Np, nil
-- We clear `predefined' entries of Np before pairs() loop,
-- because using only pairs() loop is slower.
Np.post, Np.pre, Np.xspc = nil, nil, nil
@@ -361,9 +394,9 @@ function calc_np(lp, last)
for k = 1,#Bp do Bp[k] = nil end
while lp ~= last do
local lpa = has_attr(lp, attr_icflag) or 0
- -- unbox 由来ノードの検出
+ -- unbox 由来ノードの検出
if lpa>=PACKED then
- if lpa == BOXBDD then
+ if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then
local lq = node_next(lp)
head = node.remove(head, lp); node.free(lp); lp = lq
else return calc_np_pbox(lp, last)
@@ -384,6 +417,10 @@ local calc_np = calc_np
-- "Np is an alphabetic character" if Np.pre~=nil,
-- "Np is not a character" otherwise.
do
+ local PRE = luatexja.stack_table_index.PRE
+ local POST = luatexja.stack_table_index.POST
+ local KCAT = luatexja.stack_table_index.KCAT
+ local XSP = luatexja.stack_table_index.XSP
-- 和文文字のデータを取得
local attr_jchar_class = luatexbase.attributes['ltj@charclass']
@@ -395,11 +432,10 @@ do
local cls, c = slow_find_char_class(has_attr(x, attr_orig_char), m, x.char)
Nx.class = cls; set_attr(x, attr_jchar_class, cls)
Nx.met, Nx.char = m, c
- local t = ltjs.fast_get_penalty_table_parent(c)
- Nx.pre = t.pre or 0
- Nx.post = t.post or 0
- Nx.xspc = t.xsp or 3
- Nx.kcat = t.kcat or 0
+ Nx.pre = table_current_stack[PRE + c] or 0
+ Nx.post = table_current_stack[POST + c] or 0
+ Nx.xspc = table_current_stack[XSP + c] or 3
+ Nx.kcat = table_current_stack[KCAT + c] or 0
Nx.auto_kspc, Nx.auto_xspc = (has_attr(x, attr_autospc)==1), (has_attr(x, attr_autoxspc)==1)
end
local set_np_xspc_jachar = set_np_xspc_jachar
@@ -409,7 +445,7 @@ do
function set_np_xspc_alchar(Nx, c,x, lig)
if c~=-1 then
local xc, xs = x.components, x.subtype
- if lig == ligature_head then
+ if lig == 1 then
while xc and xs and xs%4>=2 do
x = xc; xc, xs = x.components, x.subtype
end
@@ -420,14 +456,13 @@ do
end
c = x.char
end
- local t = ltjs.fast_get_penalty_table_parent(c)
- Nx.pre = t.pre or 0
- Nx.post = t.post or 0
- Nx.xspc = t.xsp or 3
- Nx.char = 'jcharbdd'
+ Nx.pre = table_current_stack[PRE + c] or 0
+ Nx.post = table_current_stack[POST + c] or 0
+ Nx.xspc = table_current_stack[XSP + c] or 3
+ Nx.char = 'jcharbdd'
else
Nx.pre, Nx.post, Nx.char = 0, 0, -1
- Nx.xspc = ltjs_fast_get_penalty_table('xsp', -1) or 3
+ Nx.xspc = table_current_stack[XSP - 1] or 3
end
Nx.met = nil
Nx.auto_xspc = (has_attr(x, attr_autoxspc)==1)
@@ -451,10 +486,14 @@ do
function after_hlist(Nx)
local s = Nx.last_char
if s then
- if s.font == (has_attr(s, attr_curjfnt) or -1) then
- set_np_xspc_jachar(Nx, s)
+ if s.id==id_glyph then
+ if s.font == (has_attr(s, attr_curjfnt) or -1) then
+ set_np_xspc_jachar(Nx, s)
+ else
+ set_np_xspc_alchar(Nx, s.char, s, ligature_tail)
+ end
else
- set_np_xspc_alchar(Nx, s.char, s, ligature_tail)
+ set_np_xspc_alchar(Nx, -1, s)
end
else
Nx.pre, Nx.met = nil, nil
@@ -518,7 +557,7 @@ end
-- 和文文字間の JFM glue を node 化
local function new_jfm_glue(m, bc, ac)
-- bc, ac: char classes
- local z = m.size_cache.char_type[bc]
+ local z = m.char_type[bc]
local g, d = z.glue[ac], 0
if g then
g,d = node_copy(g[1]), g[2];
@@ -535,7 +574,7 @@ local function new_jfm_glue(m, bc, ac)
end
-- Nq.last (kern w) .... (glue/kern g) Np.first
-local function real_insert(w, g)
+local function real_insert(g)
if g then
head = insert_before(head, Np.first, g)
Np.first = g
@@ -564,11 +603,11 @@ local function get_kanjiskip_jfm()
local gx = node_new(id_glue_spec);
gx.stretch_order, gx.shrink_order = 0, 0
local pm, qm = Np.met, Nq.met
- local bk = qm.size_cache.kanjiskip or {0, 0, 0}
- if (pm.size_cache==qm.size_cache) and (qm.var==pm.var) then
+ local bk = qm.kanjiskip or {0, 0, 0}
+ if (pm.char_type==qm.char_type) and (qm.var==pm.var) then
gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3]
else
- local ak = pm.size_cache.kanjiskip or {0, 0, 0}
+ local ak = pm.kanjiskip or {0, 0, 0}
gx.width = round(diffmet_rule(bk[1], ak[1]))
gx.stretch = round(diffmet_rule(bk[2], ak[2]))
gx.shrink = -round(diffmet_rule(-bk[3], -ak[3]))
@@ -644,7 +683,7 @@ local function calc_ja_ja_glue()
if ihb_flag then return nil
else
local qm, pm = Nq.met, Np.met
- if (qm.size_cache==pm.size_cache) and (qm.var==pm.var) then
+ if (qm.char_type==pm.char_type) and (qm.var==pm.var) then
return new_jfm_glue(qm, Nq.class, Np.class)
else
local npn, nqn = Np.nuc, Nq.nuc
@@ -677,7 +716,7 @@ local function get_xkanjiskip_jfm(Nn)
g = node_new(id_glue); --copy_attr(g, Nn.nuc)
local gx = node_new(id_glue_spec);
gx.stretch_order, gx.shrink_order = 0, 0
- local bk = Nn.met.size_cache.xkanjiskip or {0, 0, 0}
+ local bk = Nn.met.xkanjiskip or {0, 0, 0}
gx.width = bk[1]; gx.stretch = bk[2]; gx.shrink = bk[3]
g.spec = gx
else
@@ -713,21 +752,20 @@ local function handle_np_jachar(mode)
local qid = Nq.id
if qid==id_jglyph or ((qid==id_pbox or qid==id_pbox_w) and Nq.met) then
local g = calc_ja_ja_glue() or get_kanjiskip() -- M->K
- handle_penalty_normal(Nq.post, Np.pre, g); real_insert(0, g)
+ handle_penalty_normal(Nq.post, Np.pre, g); real_insert(g)
elseif Nq.met then -- qid==id_hlist
local g = get_OA_skip() or get_kanjiskip() -- O_A->K
- handle_penalty_normal(0, Np.pre, g); real_insert(0, g)
+ handle_penalty_normal(0, Np.pre, g); real_insert(g)
elseif Nq.pre then
local g = get_OA_skip() or get_xkanjiskip(Np) -- O_A->X
- if qid==id_hlist then Nq.post = 0 end
- handle_penalty_normal(Nq.post, Np.pre, g); real_insert(0, g)
+ handle_penalty_normal((qid==id_hlist and 0 or Nq.post), Np.pre, g); real_insert(g)
else
local g = get_OA_skip() -- O_A
if qid==id_glue then handle_penalty_normal(0, Np.pre, g)
elseif qid==id_kern then handle_penalty_suppress(0, Np.pre, g)
else handle_penalty_always(0, Np.pre, g)
end
- real_insert(0, g)
+ real_insert(g)
end
if mode and Np.kcat%2~=1 then
widow_Np.first, widow_Bp, Bp = Np.first, Bp, widow_Bp
@@ -738,16 +776,15 @@ end
-- jachar .. (anything)
local function handle_nq_jachar()
if Np.pre then
- if Np.id==id_hlist then Np.pre = 0 end
local g = get_OB_skip() or get_xkanjiskip(Nq) -- O_B->X
- handle_penalty_normal(Nq.post, Np.pre, g); real_insert(0, g)
+ handle_penalty_normal(Nq.post, (Np.id==id_hlist and 0 or Np.pre), g); real_insert(g)
else
local g = get_OB_skip() -- O_B
if Np.id==id_glue then handle_penalty_normal(Nq.post, 0, g)
elseif Np.id==id_kern then handle_penalty_suppress(Nq.post, 0, g)
else handle_penalty_always(Nq.post, 0, g)
end
- real_insert(0, g)
+ real_insert(g)
end
end
@@ -756,13 +793,13 @@ local function handle_np_ja_hlist()
local qid = Nq.id
if qid==id_jglyph or ((qid==id_pbox or Nq.id == id_pbox_w) and Nq.met) then
local g = get_OB_skip() or get_kanjiskip() -- O_B->K
- handle_penalty_normal(Nq.post, 0, g); real_insert(0, g)
+ handle_penalty_normal(Nq.post, 0, g); real_insert(g)
elseif Nq.met then -- Nq.id==id_hlist
local g = get_kanjiskip() -- K
- handle_penalty_suppress(0, 0, g); real_insert(0, g)
+ handle_penalty_suppress(0, 0, g); real_insert(g)
elseif Nq.pre then
local g = get_xkanjiskip(Np) -- X
- handle_penalty_suppress(0, 0, g); real_insert(0, g)
+ handle_penalty_suppress(0, 0, g); real_insert(g)
end
end
@@ -770,23 +807,38 @@ end
local function handle_nq_ja_hlist()
if Np.pre then
local g = get_xkanjiskip(Nq) -- X
- handle_penalty_suppress(0, 0, g); real_insert(0, g)
+ handle_penalty_suppress(0, 0, g); real_insert(g)
end
end
+
-- Nq が前側のクラスタとなることによる修正
-local function adjust_nq()
- if Nq.id==id_glyph then after_alchar(Nq)
- elseif Nq.id==id_hlist or Nq.id==id_pbox or Nq.id==id_disc then after_hlist(Nq)
- elseif Nq.id == id_pbox_w then
- luatexbase.call_callback("luatexja.jfmglue.whatsit_after",
- false, Nq, Np)
+do
+ local adjust_nq_aux = {
+ [id_glyph] = function()
+ local x = Nq.nuc
+ return set_np_xspc_alchar(Nq, x.char,x, 2)
+ end, -- after_alchar(Nq)
+ [id_hlist] = function() after_hlist(Nq) end,
+ [id_pbox] = function() after_hlist(Nq) end,
+ [id_disc] = function() after_hlist(Nq) end,
+ [id_pbox_w] = function()
+ luatexbase.call_callback("luatexja.jfmglue.whatsit_after",
+ false, Nq, Np)
+ end,
+ }
+
+ function adjust_nq()
+ local x = adjust_nq_aux[Nq.id]
+ if x then x() end
end
end
+
-------------------- 開始・終了時の処理
-- リスト末尾の処理
+local JWP = luatexja.stack_table_index.JWP
local function handle_list_tail(mode)
adjust_nq(); Np = Nq
if mode then
@@ -795,7 +847,7 @@ local function handle_list_tail(mode)
Bp = widow_Bp; Np = widow_Np
if Np.first then
handle_penalty_normal(0,
- ltjs_fast_get_penalty_table('jwp', 0) or 0)
+ table_current_stack[JWP] or 0)
end
else
-- the current list is the contents of a hbox
@@ -831,18 +883,20 @@ end
-- initialize
-- return value: (the initial cursor lp), (last node)
local function init_var(mode)
+ -- 1073741823: max_dimen
Bp, widow_Bp, widow_Np = {}, {}, {first = nil}
-
+ table_current_stack = ltjs.table_current_stack
+
kanji_skip = node_new(id_glue)
kanji_skip.spec = skip_table_to_spec('kanjiskip')
set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
- get_kanjiskip = (kanji_skip.spec.width == max_dimen)
+ get_kanjiskip = (kanji_skip.spec.width == 1073741823)
and get_kanjiskip_jfm or get_kanjiskip_normal
xkanji_skip = node_new(id_glue)
xkanji_skip.spec = skip_table_to_spec('xkanjiskip')
set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
- get_xkanjiskip = (xkanji_skip.spec.width == max_dimen)
+ get_xkanjiskip = (xkanji_skip.spec.width == 1073741823)
and get_xkanjiskip_jfm or get_xkanjiskip_normal
Np = {
@@ -908,7 +962,8 @@ function main(ahead, mode)
end
lp = calc_np(lp, last)
while Np do
- extract_np(); adjust_nq()
+ extract_np();
+ adjust_nq();
local pid, pm = Np.id, Np.met
-- 挿入部
if pid == id_jglyph then
@@ -926,50 +981,50 @@ function main(ahead, mode)
return cleanup(mode, last)
end
--- \inhibitglue
-
-function create_inhibitglue_node()
- local tn = node_new(id_whatsit, sid_user)
- tn.user_id=30111; tn.type=100; tn.value=1
- node.write(tn)
-end
-
--- Node for indicating beginning of a paragraph
--- (for ltjsclasses)
-function create_beginpar_node()
- local tn = node_new(id_whatsit, sid_user)
- tn.user_id=30114; tn.type=100; tn.value=1
- node.write(tn)
-end
-
do
+ local IHB = luatexja.userid_table.IHB
+ local BPAR = luatexja.userid_table.BPAR
+
+ -- \inhibitglue
+ function create_inhibitglue_node()
+ local tn = node_new(id_whatsit, sid_user)
+ tn.user_id=IHB; tn.type=100; tn.value=1
+ node.write(tn)
+ end
-local function whatsit_callback(Np, lp, Nq)
- if Np and Np.nuc then return Np
- elseif Np and lp.user_id == 30114 then
- Np.first = lp; Np.nuc = lp; Np.last = lp
- Np.char = 'parbdd'
- Np.met = nil
- Np.pre = 0; Np.post = 0
- Np.xspc = 0
- Np.auto_xspc = false
- return Np
+ -- Node for indicating beginning of a paragraph
+ -- (for ltjsclasses)
+ function create_beginpar_node()
+ local tn = node_new(id_whatsit, sid_user)
+ tn.user_id=BPAR; tn.type=100; tn.value=1
+ node.write(tn)
end
-end
+ local function whatsit_callback(Np, lp, Nq)
+ if Np and Np.nuc then return Np
+ elseif Np and lp.user_id == BPAR then
+ Np.first = lp; Np.nuc = lp; Np.last = lp
+ Np.char = 'parbdd'
+ Np.met = nil
+ Np.pre = 0; Np.post = 0
+ Np.xspc = 0
+ Np.auto_xspc = false
+ return Np
+ end
+ end
-local function whatsit_after_callback(s, Nq, Np)
- if not s and Nq.nuc.user_id == 30114 then
- local x, y = node.prev(Nq.nuc), Nq.nuc
- Nq.first, Nq.nuc, Nq.last = x, x, x
- head = node.remove(head, y)
+ local function whatsit_after_callback(s, Nq, Np)
+ if not s and Nq.nuc.user_id == BPAR then
+ local x, y = node.prev(Nq.nuc), Nq.nuc
+ Nq.first, Nq.nuc, Nq.last = x, x, x
+ head = node.remove(head, y)
+ end
+ return s
end
- return s
-end
-luatexbase.add_to_callback("luatexja.jfmglue.whatsit_getinfo", whatsit_callback,
- "luatexja.beginpar.np_info", 1)
-luatexbase.add_to_callback("luatexja.jfmglue.whatsit_after", whatsit_after_callback,
- "luatexja.beginpar.np_info_after", 1)
+ luatexbase.add_to_callback("luatexja.jfmglue.whatsit_getinfo", whatsit_callback,
+ "luatexja.beginpar.np_info", 1)
+ luatexbase.add_to_callback("luatexja.jfmglue.whatsit_after", whatsit_after_callback,
+ "luatexja.beginpar.np_info_after", 1)
-end \ No newline at end of file
+end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index c360a6e80dd..abadb63b39d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -173,7 +173,9 @@ luatexbase.create_callback("luatexja.find_char_class", "data",
function find_char_class(c,m)
-- c: character code, m:
if not m then return 0 end
- return m.size_cache.chars[c] or
+-- print("**")
+-- for i,v in pairs(m) do print(i,v) end
+ return m.chars[c] or
luatexbase.call_callback("luatexja.find_char_class", 0, m, c)
end
@@ -229,8 +231,12 @@ function jfontdefY() -- for horizontal font
return
end
update_jfm_cache(j, f.size)
+ local sz = metrics[j].size_cache[f.size]
local fmtable = { jfm = j, size = f.size, var = jfm_var,
- size_cache = metrics[j].size_cache[f.size] }
+ zw = sz.zw, zh = sz.zh,
+ chars = sz.chars, char_type = sz.char_type,
+ kanjiskip = sz.kanjiskip, xkanjiskip = sz.xkanjiskip,
+ }
fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn)
font_metric_table[fn]=fmtable
tex.sprint(cat_lp, luatexja.is_global .. '\\protected\\expandafter\\def\\csname '
@@ -241,7 +247,7 @@ end
function load_zw()
local a = font_metric_table[tex.attribute[attr_curjfnt]]
if a then
- tex.setdimen('ltj@zw', a.size_cache.zw)
+ tex.setdimen('ltj@zw', a.zw)
else
tex.setdimen('ltj@zw',0)
end
@@ -250,7 +256,7 @@ end
function load_zh()
local a = font_metric_table[tex.attribute[attr_curjfnt]]
if a then
- tex.setdimen('ltj@zh', a.size_cache.zh)
+ tex.setdimen('ltj@zh', a.zh)
else
tex.setdimen('ltj@zh',0)
end
@@ -306,7 +312,7 @@ function append_italic()
f = has_attr(p, attr_curjfnt)
local j = font_metric_table[f]
local c = find_char_class(p.char, j)
- g.kern = j.size_cache.char_type[c].italic
+ g.kern = j.char_type[c].italic
else
g.kern = font.fonts[f].characters[p.char].italic
end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua
index c22760e5b9f..328bf99b75b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua
Binary files differ
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua
index 793d6586aa0..14281045797 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua
@@ -89,6 +89,10 @@ local function conv_jchar_to_hbox(head, sty)
return head
end
+local MJT = luatexja.stack_table_index.MJT
+local MJS = luatexja.stack_table_index.MJS
+local MJSS = luatexja.stack_table_index.MJSS
+
conv_jchar_to_hbox_A =
function (p, sty)
if not p then return nil
@@ -99,11 +103,7 @@ function (p, sty)
elseif p.id == id_mchar then
local fam = has_attr(p, attr_jfam) or -1
if (not is_math_letters[p.char]) and ltjc.is_ucs_in_japanese_char(p) and fam>=0 then
- local mode = 'mjss'
- if sty == 0 then mode = 'mjtext'
- elseif sty == 1 then mode = 'mjscr'
- end
- local f = ltjs.get_penalty_table(mode, fam, -1, tex_getcount('ltj@@stack'))
+ local f = ltjs.get_penalty_table(MJT + 0x100 * sty + fam, -1, tex_getcount('ltj@@stack'))
if f ~= -1 then
local q = node_new(id_sub_box)
local r = node_new(id_glyph); r.next = nil
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
index 71f974979e9..c16e15b8f9c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
@@ -33,13 +33,14 @@ local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
local ltjf_font_metric_table = ltjf.font_metric_table
local ltjf_find_char_class = ltjf.find_char_class
+local OTF = luatexja.userid_table.OTF
-- Append a whatsit node to the list.
-- This whatsit node will be extracted to a glyph_node
function append_jglyph(char)
local p = node_new(id_whatsit,sid_user)
local v = tex.attribute[attr_curjfnt]
- p.user_id=30113; p.type=100; p.value=char
+ p.user_id=OTF; p.type=100; p.value=char
set_attr(p, attr_yablshift, tex.attribute[attr_ykblshift])
node.write(p)
end
@@ -52,7 +53,7 @@ function cid(key)
curjfnt.cidinfo.ordering ~= "Korea1" then
ltjb.package_error('luatexja-otf',
'Current Japanese font (or other CJK font) "'..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)',
- 'Select a CID-Keyed font using \jfont.')
+ 'Select a CID-Keyed font using \\jfont.')
return
end
local char = curjfnt.unicodes[curjfnt.cidinfo.ordering..'.'..tostring(key)]
@@ -70,7 +71,7 @@ function extract(head)
local v
while p do
if p.id==id_whatsit then
- if p.subtype==sid_user and p.user_id==30113 then
+ if p.subtype==sid_user and p.user_id==OTF then
local g = node_new(id_glyph)
g.subtype = 0; g.char = p.value
v = has_attr(p, attr_curjfnt); g.font = v
@@ -112,7 +113,7 @@ local function cid_to_char(fmtable, fn)
local fi = fonts.ids[fn]
if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then
fmtable.cid_char_type = {}
- for i, v in pairs(fmtable.size_cache.chars) do
+ for i, v in pairs(fmtable.chars) do
local j = string.match(i, "^AJ1%-([0-9]*)")
if j then
j = tonumber(fi.unicodes['Japan1.'..tostring(j)])
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
index d0ea84da1be..896b93f5e2b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
@@ -35,6 +35,7 @@ local attr_icflag = luatexbase.attributes['ltj@icflag']
local ltjf_font_metric_table = ltjf.font_metric_table
local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char
local attr_orig_char = luatexbase.attributes['ltj@origchar']
+local STCK = luatexja.userid_table.STCK
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
@@ -55,7 +56,7 @@ local function suppress_hyphenate_ja(head)
elseif pid == id_math then
p = node_next(p) -- skip math on
while p and p.id~=id_math do p = node_next(p) end
- elseif pid == id_whatsit and p.subtype==sid_user and p.user_id==30112 then
+ elseif pid == id_whatsit and p.subtype==sid_user and p.user_id==STCK then
wt[#wt+1] = p; head = node_remove(head, p)
end
p = node_next(p)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
index 5b3ad291521..668996dba22 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
@@ -23,7 +23,6 @@ local node_insert_before = node.insert_before
local node_insert_after = node.insert_after
local round = tex.round
-
local id_glyph = node.id('glyph')
local id_kern = node.id('kern')
local id_hlist = node.id('hlist')
@@ -64,7 +63,7 @@ local fshift = { down = 0, left = 0}
-- mode: true iff p will be always encapsuled by a hbox
function capsule_glyph(p, dir, mode, met, class)
- local char_data = met.size_cache.char_type[class]
+ local char_data = met.char_type[class]
if not char_data then return node_next(p) end
local fwidth, pwidth = char_data.width, p.width
fwidth = (fwidth ~= 'prop') and fwidth or pwidth
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
index de985d59175..f77d5b71f7e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
@@ -15,32 +15,13 @@ luatexja.load_module('base'); local ltjb = luatexja.base
local node_new = node.new
local id_whatsit = node.id('whatsit')
local sid_user = node.subtype('user_defined')
-local hmode = 118 -- in luatexref-t.pdf, this must be 127
+local STCK = luatexja.userid_table.STCK
+hmode = 0 -- dummy
charprop_stack_table={};
local charprop_stack_table = charprop_stack_table
charprop_stack_table[0]={}
--- modified from table.fastcopy
-local next = next
-local function stack_table_copy_aux(old)
- local new = {}
- for i,v in next, old do
- new[i] = v
- end
- return new
-end
-local function stack_table_copy(old)
- if old then
- local new = {}
- for i,v in next, old do
- new[i] = stack_table_copy_aux(v)
- end
- return new
- else
- return {}
- end
-end
function get_stack_level()
local i = tex.getcount('ltj@@stack')
@@ -54,13 +35,13 @@ function get_stack_level()
for k,v in pairs(charprop_stack_table) do -- clear the stack above i
if k>=i then charprop_stack_table[k]=nil end
end
- charprop_stack_table[i] = stack_table_copy(charprop_stack_table[i-1])
+ charprop_stack_table[i] = table.fastcopy(charprop_stack_table[i-1])
tex.setcount('ltj@@stack', i)
if gd>0 then tex.globaldefs = gd end
if tex.nest[tex.nest.ptr].mode == hmode or
tex.nest[tex.nest.ptr].mode == -hmode then
local g = node_new(id_whatsit, sid_user)
- g.user_id=30112; g.type=100; g.value=j; node.write(g)
+ g.user_id=STCK; g.type=100; g.value=j; node.write(g)
end
end
return i
@@ -98,14 +79,11 @@ function set_stack_table(g,m,c,p,lb,ub)
"(-1 is used for denoting `math boundary')\n" ..
'So I changed this one to zero.')
c=0
- elseif not charprop_stack_table[i][c] then
- charprop_stack_table[i][c] = {}
end
- charprop_stack_table[i][c][m] = p
+ charprop_stack_table[i][c+m] = p
if g=='global' then
for j,v in pairs(charprop_stack_table) do
- if not charprop_stack_table[j][c] then charprop_stack_table[j][c] = {} end
- charprop_stack_table[j][c][m] = p
+ charprop_stack_table[j][c+m] = p
end
end
end
@@ -119,14 +97,11 @@ function set_stack_font(g,m,c,p)
"The family number should in the range 0 .. 255.\n" ..
"I'm going to use 0 instead of that illegal family number.")
c=0
- elseif not charprop_stack_table[i][c] then
- charprop_stack_table[i][c] = {}
end
- charprop_stack_table[i][c][m] = p
+ charprop_stack_table[i][c+m] = p
if g=='global' then
for j,v in pairs(charprop_stack_table) do
- if not charprop_stack_table[j][c] then charprop_stack_table[j][c] = {} end
- charprop_stack_table[j][c][m] = p
+ charprop_stack_table[j][c+m] = p
end
end
end
@@ -156,7 +131,6 @@ function set_stack_skip(g,m,sp)
end
-- These three functions are used in ltj-jfmglue.lua.
-local table_current_stack
function report_stack_level(bsl)
table_current_stack = charprop_stack_table[bsl]
end
@@ -164,24 +138,15 @@ function fast_get_skip_table(m)
return table_current_stack[m]
or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
end
-function fast_get_penalty_table(m,c)
- local i = table_current_stack[c]
- return (i and i[m])
-end
-
-local empty_table = {}
-function fast_get_penalty_table_parent(c)
- return table_current_stack[c] or empty_table
-end
-- For other situations, use the following instead:
function get_skip_table(m, idx)
return charprop_stack_table[idx][m]
or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
end
-function get_penalty_table(m,c,d, idx)
- local i = charprop_stack_table[idx][c]
- return (i and i[m]) or d
+function get_penalty_table(mc, d, idx)
+ local i = charprop_stack_table[idx][mc]
+ return i or d
end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty
index bc298286c80..77befdff811 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty
@@ -133,7 +133,7 @@
\directlua{luatexja.compat.to_kansuji(\ltj@safe@num{#1}) }%
}
\define@key[ltj]{japaram}{kansujichar}{%
- \expandafter\ltj@@set@stack#1:{ksj}{0}{0x7FFFFFFF}}
+ \expandafter\ltj@@set@stack#1:{KSJ}{0}{0x7FFFFFFF}}
\ltjsetparameter{kansujichar={0,`〇}}
\ltjsetparameter{kansujichar={1,`一}}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
index ea54c3e5e9e..c6ef2ef3120 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
@@ -184,7 +184,6 @@
\input ltj-base.sty %
\fi %</LaTeX>
-
%%%%%%%% \asluastring
\def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
@@ -241,24 +240,30 @@
\newcount\ltj@@stack \newcount\ltj@@group@level
\ltj@@group@level=0 \ltj@@stack=0
+\setbox0\hbox{%
+ \directlua{% This value depends on the version of LuaTeX.
+ luatexja.stack.hmode = -tex.nest[tex.nest.ptr].mode
+ }
+}
+
% prebreakpenalty = {<char_code>, <penalty>}
\define@key[ltj]{japaram}{kcatcode}{%
- \expandafter\ltj@@set@stack#1:{kcat}{0}{0x7FFFFFFF}}
+ \expandafter\ltj@@set@stack#1:{KCAT}{0}{0x7FFFFFFF}}
\define@key[ltj]{japaram}{prebreakpenalty}{%
- \expandafter\ltj@@set@stack#1:{pre}{-10000}{10000}}
+ \expandafter\ltj@@set@stack#1:{PRE}{-10000}{10000}}
\define@key[ltj]{japaram}{postbreakpenalty}{%
- \expandafter\ltj@@set@stack#1:{post}{-10000}{10000}}
+ \expandafter\ltj@@set@stack#1:{POST}{-10000}{10000}}
\def\ltj@@set@stack#1,#2:#3#4#5{%
- \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, \asluastring{#3},
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, luatexja.stack_table_index.#3,
\ltj@safe@num@or{nil}{#1},\ltj@safe@num@or{nil}{#2},#4,#5)}}
% jatextfont = {<char_code>, <font_cs>}
\define@key[ltj]{japaram}{jatextfont}{%
- \expandafter\ltj@@set@stackfont#1:{mjtext}}
+ \expandafter\ltj@@set@stackfont#1:{MJT}}
\define@key[ltj]{japaram}{jascriptfont}{%
- \expandafter\ltj@@set@stackfont#1:{mjscr}}
+ \expandafter\ltj@@set@stackfont#1:{MJS}}
\define@key[ltj]{japaram}{jascriptscriptfont}{%
- \expandafter\ltj@@set@stackfont#1:{mjss}}
+ \expandafter\ltj@@set@stackfont#1:{MJSS}}
\protected\def\ltj@@set@stackfont#1,#2:#3{%
\ltj@reset@globaldefs
\ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
@@ -267,7 +272,8 @@
{\string#2 is not a control sequence that represents \MessageBreak
a Japanese font}{}%
\else
- \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, \asluastring{#3},
+ \directlua{luatexja.stack.set_stack_font(luatexja.isglobal,
+ luatexja.stack_table_index.#3,
\ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}%
\fi
\ltj@curjfnt=\ltj@tempcnta
@@ -296,7 +302,8 @@
\def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
\def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
- \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, 'xsp',
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
+ luatexja.stack_table_index.XSP,
\ltj@safe@num@or{nil}{#1},
\ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
@@ -311,7 +318,8 @@
\def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
\def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
- \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, 'xsp',
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
+ luatexja.stack_table_index.XSP,
\ltj@safe@num@or{nil}{#1},
\ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
@@ -339,7 +347,7 @@
% jcharwidowpenalty = <count>
\define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT
- \ltj@@set@stack0,#1:{jwp}{-10000}{10000}}
+ \ltj@@set@stack0,#1:{JWP}{-10000}{10000}}
% differentjfm = { large | small | average | pleft | pright | paverage | both}
\define@choicekey*+[ltj]{japaram}{differentjfm}[\ltj@temp\ltj@tempr]%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index adf741f1938..83bfed33b56 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -19,7 +19,7 @@ function luatexja.load_module(name)
luatexja.error("File `" .. fn .. "' not found",
{'This file ' .. fn .. ' is required for LuaTeX-ja.', 'Please check your installation.'})
else
- texio.write('(' .. found .. ')\n')
+ texio.write_nl('(' .. found .. ')')
dofile(found)
end
end
@@ -29,11 +29,12 @@ function luatexja.load_lua(fn)
if not found then
error("File `" .. fn .. "' not found")
else
- texio.write('(' .. found .. ')\n')
+ texio.write_nl('(' .. found .. ')')
dofile(found)
end
end
+--- 以下は全ファイルで共有される定数
local icflag_table = {}
luatexja.icflag_table = icflag_table
icflag_table.ITALIC = 1
@@ -49,6 +50,27 @@ icflag_table.IC_PROCESSED = 12
icflag_table.BOXBDD = 15
icflag_table.PROCESSED_BEGIN_FLAG = 32
+local stack_table_index = {}
+luatexja.stack_table_index = stack_table_index
+stack_table_index.PRE = 0x200000 -- characterごと
+stack_table_index.POST = 0x400000 -- characterごと
+stack_table_index.KCAT = 0x600000 -- characterごと
+stack_table_index.XSP = 0x800000 -- characterごと
+stack_table_index.JWP = 0 -- 0のみ
+stack_table_index.MJT = 0x100 -- 0--255
+stack_table_index.MJS = 0x200 -- 0--255
+stack_table_index.MJSS = 0x300 -- 0--255
+stack_table_index.KSJ = 0x400 -- 0--9
+
+local userid_table = {}
+luatexja.userid_table = userid_table
+userid_table.IHB = 30111 -- \inhibitglue
+userid_table.STCK = 30112 -- スタック管理
+userid_table.OTF = 30113 -- luatexja-otf
+userid_table.BPAR = 30114 -- 「段落始め」
+
+
+--- 定義終わり
local load_module = luatexja.load_module
load_module('base'); local ltjb = luatexja.base
@@ -144,16 +166,17 @@ end
-- EXT: print parameters that don't need arguments
function luatexja.ext_get_parameter_unary(k)
+ local t = tex.getcount('ltj@@stack')
if k == 'yalbaselineshift' then
tex.write(print_scaled(tex.getattribute('ltj@yablshift'))..'pt')
elseif k == 'yjabaselineshift' then
tex.write(print_scaled(tex.getattribute('ltj@ykblshift'))..'pt')
elseif k == 'kanjiskip' then
- tex.write(print_spec(ltjs.get_skip_table('kanjiskip', tex.getcount('ltj@@stack'))))
+ tex.write(print_spec(ltjs.get_skip_table('kanjiskip', t)))
elseif k == 'xkanjiskip' then
- tex.write(print_spec(ltjs.get_skip_table('xkanjiskip', tex.getcount('ltj@@stack'))))
+ tex.write(print_spec(ltjs.get_skip_table('xkanjiskip', t)))
elseif k == 'jcharwidowpenalty' then
- tex.write(ltjs.get_penalty_table('jwp', 0, 0, tex.getcount('ltj@@stack')))
+ tex.write(ltjs.get_penalty_table(stack_table_index.JWP, 0, t))
elseif k == 'autospacing' then
tex.write(tex.getattribute('ltj@autospc'))
elseif k == 'autoxspacing' then
@@ -165,6 +188,12 @@ function luatexja.ext_get_parameter_unary(k)
tex.write('small')
elseif luatexja.jfmglue.diffmet_rule == math.two_average then
tex.write('average')
+ elseif luatexja.jfmglue.diffmet_rule == math.two_paverage then
+ tex.write('paverage')
+ elseif luatexja.jfmglue.diffmet_rule == math.two_pleft then
+ tex.write('pleft')
+ elseif luatexja.jfmglue.diffmet_rule == math.two_pright then
+ tex.write('pright')
elseif luatexja.jfmglue.diffmet_rule == math.two_add then
tex.write('both')
else -- This can't happen.
@@ -176,6 +205,7 @@ end
-- EXT: print parameters that need arguments
function luatexja.ext_get_parameter_binary(k,c)
+ local t = tex.getcount('ltj@@stack')
if type(c)~='number' then
ltjb.package_error('luatexja',
'invalid the second argument (' .. tostring(c) .. ')',
@@ -203,15 +233,15 @@ function luatexja.ext_get_parameter_binary(k,c)
c=0
end
if k == 'prebreakpenalty' then
- tex.write(ltjs.get_penalty_table('pre', c, 0, tex.getcount('ltj@@stack')))
+ tex.write(ltjs.get_penalty_table(stack_table_index.PRE + c, 0, t))
elseif k == 'postbreakpenalty' then
- tex.write(ltjs.get_penalty_table('post', c, 0, tex.getcount('ltj@@stack')))
+ tex.write(ltjs.get_penalty_table(stack_table_index.POST+ c, 0, t))
elseif k == 'kcatcode' then
- tex.write(ltjs.get_penalty_table('kcat', c, 0, tex.getcount('ltj@@stack')))
+ tex.write(ltjs.get_penalty_table(stack_table_index.KCAT+ c, 0, t))
elseif k == 'chartorange' then
tex.write(ltjc.char_to_range(c))
elseif k == 'jaxspmode' or k == 'alxspmode' then
- tex.write(ltjs.get_penalty_table('xsp', c, 3, tex.getcount('ltj@@stack')))
+ tex.write(ltjs.get_penalty_table(stack_table_index.XSP + c, 3, t))
end
end
end
@@ -247,7 +277,7 @@ luatexbase.add_to_callback('hpack_filter',
-- debug
local function get_attr_icflag(p)
- return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+ return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG
end
local debug_depth
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 936b6253b66..515e0a0f7c5 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2011/11/22 Patch to NFSS2 for LuaLaTeX-ja]
+\ProvidesPackage{lltjfont}[2013/01/01 Patch to NFSS2 for LuaLaTeX-ja]
\let\k@encoding\@empty
\let\ck@encoding\@empty
@@ -461,8 +461,8 @@
\edef\@templist{\@nameuse{notkfam@list@\k@encoding}}%
\expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
\ifin@\@notkfamtrue\else%
- \def\@temp##1+{\lowercase{\def\@@temp{##1}}}\expandafter\@temp\k@encoding+%
- \message{(I search kanjifont definition file: \@@temp#1.fd)}%
+ \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\k@encoding+%
+ \message{(I search kanjifont definition file: \@@temp)}%
\IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
\if@tempswz
\expandafter\xdef\csname kfam@list@\k@encoding\endcsname
@@ -487,8 +487,8 @@
\edef\@templist{\@nameuse{notffam@list@\f@encoding}}%
\expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
\ifin@\@notffamtrue\else
- \def\@temp##1+{\lowercase{\def\@@temp{##1}}}\expandafter\@temp\f@encoding+%
- \message{(I search font definition file: \@@temp#1.fd)}%
+ \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
+ \message{(I search font definition file: \@@temp)}%
\IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
\if@tempswz
\expandafter\xdef\csname ffam@list@\f@encoding\endcsname
@@ -622,9 +622,9 @@
\xdef\font@name{\csname \string#2/\ssf@size\endcsname}%
\pickup@jfont
\edef\math@fonts{\math@fonts\ltj@setpar@global%
- \ltj@@set@stackfont#1,\textfont@name:{mjtext}%
- \ltj@@set@stackfont#1,\scriptfont@name:{mjscr}%
- \ltj@@set@stackfont#1,\font@name:{mjss}%
+ \ltj@@set@stackfont#1,\textfont@name:{MJT}%
+ \ltj@@set@stackfont#1,\scriptfont@name:{MJS}%
+ \ltj@@set@stackfont#1,\font@name:{MJSS}%
}%
}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
index 74df57bc2c7..63cb21d9887 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
@@ -86,4 +86,10 @@
\let\hbar\ltj@tmpa
\let\iftipaonetoken\ltj@tmpb
\let\ltj@tmpb\relax % no more an if-token
+
+%% ticket 30501
+{\catcode`\!0\catcode`\\11!catcode`!2 11!catcode`!?11!catcode`!-11
+ !gdef!EU2\nobreakspace{!?-\nobreakspace}%
+}
+
\endinput