texlive[47107] Master/texmf-dist: luatexja (25mar18)
commits+karl at tug.org
commits+karl at tug.org
Sun Mar 25 23:24:56 CEST 2018
Revision: 47107
http://tug.org/svn/texlive?view=revision&revision=47107
Author: karl
Date: 2018-03-25 23:24:56 +0200 (Sun, 25 Mar 2018)
Log Message:
-----------
luatexja (25mar18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ivd_aj1.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-infomute.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-tangle.lua
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2018-03-25 21:24:56 UTC (rev 47107)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20180121.0
+The LuaTeX-ja Package 20180325.0
--------------------------------
Copyright (c) 2011--2018 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -40,9 +40,9 @@
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20180121.0 in the Git repository by
+ or tagged as 20180325.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20180121.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20180325.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -87,4 +87,4 @@
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Sun Jan 21 13:20:37 2018 +0900
+Last commit date: Sun Mar 25 15:58:04 2018 +0900
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2018-03-25 21:24:56 UTC (rev 47107)
@@ -2555,23 +2555,23 @@
%</en>
%<*ja>
ネイティブにUnicode全部の文字を扱える\XeTeX や\LuaTeX では，
-文字が制御綴内で使用できるかは通常の欧文文字と同じく \cs{catcode}
-で指定することとなる．plain \XeTeX における \cs{catcode} の初期設定は\
-\texttt{unicode-letters.tex} 中に記述されており，plain \LuaTeX ではそれを
-元にした \texttt{luatex-unicode-letters.tex} を用いている．
-\LaTeX では \cs{catcode} の設定はカーネルに \texttt{unicode-letters.def} として統合され．
+文字が制御綴内で使用できるかは通常の欧文文字と同じく\cs{catcode}%
+で指定することとなる．plain \XeTeX における\cs{catcode}の初期設定は%
+\texttt{unicode-letters.tex}中に記述されており，plain \LuaTeX ではそれを
+元にした\texttt{luatex-unicode-letters.tex}を用いている．
+\LaTeX では\cs{catcode}の設定はカーネルに\texttt{unicode-letters.def}として統合され．
このファイルを\XeLaTeX, \LuaLaTeX の両方が用いている．
-だが，\XeTeX における \cs{catcode} の初期設定と
+だが，\XeTeX における\cs{catcode}の初期設定と
\LuaTeX におけるそれは一致していない：
\begin{itemize}
- \item \texttt{luatex-unicode-letters.tex} の元になった\
-\texttt{unicode-letters.tex} が古い
- \item \texttt{unicode-letters.tex} 後半部や \texttt{unicode-letters.def} 後半部では
-\cs{XeTeXcharclass} の設定を行なっており，
-それによって漢字や仮名，および全角英数字の \cs{catcode} が11に設定されている．
-しかし，\texttt{luatex-unicode-letters.tex} ではこの「後半部」が
-まるごと省略されており，また\LuaLaTeX でも \texttt{unicode-letters.def} 後半部は実行されな
+ \item \texttt{luatex-unicode-letters.tex} の元になった
+ \texttt{unicode-letters.tex}が古い
+ \item \texttt{unicode-letters.tex} 後半部や\texttt{unicode-letters.def}後半部では
+\cs{XeTeXcharclass}の設定を行なっており，
+それによって漢字や仮名，および全角英数字の\cs{catcode}が11に設定されている．
+しかし，\texttt{luatex-unicode-letters.tex}ではこの「後半部」が
+まるごと省略されており，また\LuaLaTeX でも\texttt{unicode-letters.def}後半部は実行されな
い．
\end{itemize}
言い換えると，
@@ -2582,10 +2582,10 @@
\LuaLaTeX では漢字や仮名を制御綴内に
使用することが可能になったが，全角英数字は相変わらず使用できない，
\end{description}
-これでは \pTeX で使用できた \verb+\１年目西暦+\footnote{科研費\LaTeX で使用されているそうです．}などが使えないこととなり，
+これでは\pTeX で使用できた\verb+\１年目西暦+\footnote{科研費\LaTeX で使用されているそうです．}などが使えないこととなり，
\LuaTeX-jaへの移行で手間が生じる．そのため，\LuaTeX-jaでは
-\texttt{unicode-letters.tex} の後半部にあたる内容を自前でパッチし，
-結果として\textbf{\XeTeX における初期設定と同じになるようにしている．}
+\texttt{unicode-letters.tex}の後半部にあたる内容を自前でパッチし，
+結果として\emph{\XeTeX における初期設定と同じになるようにしている．}
%</ja>
\begin{table}
@@ -4313,6 +4313,9 @@
自然長・縮み量半角，伸び量0のグルー
となっているが，さらに\Param{kanjiskip}の伸び量に \texttt{kanjiskip\_stretch}（ここでは1）を掛け
た分だけ伸びることが許される．
+ \item 一方，開き括弧類と通常の文字の間，また通常の文字と閉じ括弧類の間は
+ 自然長・縮み量・伸び量0のグルーだが，\Param{kanjiskip}の縮み量に
+ \texttt{kanjiskip\_shrink}（ここでは1）を掛けた分だけ縮むことが許される．
\end{itemize}
となっている．従って，以下のような組版結果を得る．
@@ -4321,6 +4324,10 @@
\leavevmode
\ltjsetparameter{kanjiskip=0pt plus 3\zw}
\vrule\hbox to 15\zw{あ「い」う，えお}\vrule
+
+\vrule\hbox{あ「い」う，えお}\vrule\par
+\ltjsetparameter{kanjiskip=0pt minus \zw}
+\vrule\hbox to 6.5\zw{あ「い」う，えお}\vrule
\end{LTXexample}
\end{cslist}
@@ -4355,6 +4362,10 @@
Again, this glue also can be stretched
as much as the stretch part of \Param{kanjiskip} times the value of
\texttt{kanjiskip\_stretch} key (1 in this case).
+ \item Between an ideographic opening bracket and an ordinal letter
+ and between an ordinal letter and an ideographic closing bracket,
+ we have a glue whose natural part and stretch part are both zero, while its shrink part as much as
+ the shrink part of \Param{kanjiskip}.
\end{itemize}
Hence we have the following result:
@@ -4363,6 +4374,10 @@
\leavevmode
\ltjsetparameter{kanjiskip=0pt plus 3\zw}
\vrule\hbox to 15\zw{あ「い」う，えお}\vrule
+
+\vrule\hbox{あ「い」う，えお}\vrule\par
+\ltjsetparameter{kanjiskip=0pt minus \zw}
+\vrule\hbox to 6.5\zw{あ「い」う，えお}\vrule
\end{LTXexample}
\end{cslist}
@@ -4382,7 +4397,7 @@
\item[end\_adjust=\{<kern>, <kern>, ...\}]
%<*ja>
-（任意，バージョン2のみ）
+（任意，バージョン2以降）
優先順位付き行長調整が有効であり，かつ現在の文字クラスの文字が
行末に来た時に，この文字と行末の間には指定された値のいずれかの大きさのカーンが
@@ -4392,7 +4407,7 @@
\begin{lstlisting}[escapechar=\$]
end_stretch = $a$, end_shrink = $b$
\end{lstlisting}
-という指定は，バージョン2では次の指定と同じになる．
+という指定は，バージョン2以降では次の指定と同じになる．
\begin{lstlisting}[escapechar=\$]
end_adjust = {$-b$, 0.0, $a$}
\end{lstlisting}
@@ -4399,7 +4414,7 @@
もし真ん中の \texttt{0.0} がない場合は，$a$か$-b$かいずれかのカーンが常に行末に追加される．
%</ja>
%<*en>
-(optional, version~2 only)
+(optional, version~2 or~later)
%</en>
\end{cslist}
@@ -4544,7 +4559,7 @@
\item['glue']
%<en>(version 3~or~later) A boundary between \textbf{JAchar}, and, a glue or kern.
-%<ja>（バージョン3以降））\textbf{JAchar}とglue，kernとの境界．
+%<ja>（バージョン3以降）\textbf{JAchar}とglue，kernとの境界．
\item[$-1$]
%<en>The left/right boundary of an inline math formula.
@@ -5457,6 +5472,56 @@
\end{itemize}
+
+%<*en>
+\subsection{Alternative Commands to \cs{ltjsetparameter}}
+The basic method to set parameters of \LuaTeX-ja is to use
+\cs{ltjsetparameter}~or~\cs{ltjglobalsetparameter}.
+However, these commands are slow, because they parse a key-value list,
+so several alternative commands are used in \LuaTeX-ja.
+\emph{This subsection is not for general \LuaTeX-ja users.}
+
+\paragraph{Setting \Param{kanjiskip}~or~\Param{xkanjiskip}}
+In \Pkg{ltjsclasses}, every size-changing command such as \cs{Large}
+changes \cs{kanjiskip}~and~\cs{xkanjiskip}.
+But a simple implementation, as the code below, is slow since
+two key-value lists are parsed by \cs{ltjsetparameter}:
+\begin{lstlisting}
+ \ltjsetparameter{kanjiskip=0\zw plus .1\zw minus .01\zw}
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if at slide
+ \ltjsetparameter{xkanjiskip=0.1em}
+ \else
+ \ltjsetparameter{xkanjiskip=0.25em plus 0.15em minus 0.06em}
+ \fi
+ \fi
+\end{lstlisting}
+
+Hence, \LuaTeX-ja defines more primitive commands, namely \cs{ltj at setpar@global},
+\cs{ltjsetkanjiskip}, and~\cs{ltjsetxkanjiskip}. Here
+\begin{quote}
+ \lstinline+\ltj at setpar@global\ltjsetkanjiskip 10pt+
+\end{quote}
+and \lstinline+\ltjsetparameter{kanjiskip=10pt}+ has the same effect.
+The actual code of \Pkg{ltjsclasses} is shown below:
+\begin{lstlisting}
+ \ltj at setpar@global
+ \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw}
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if at slide
+ \ltjsetxkanjiskip.1em
+ \else
+ \ltjsetxkanjiskip.25em plus .15em minus .06em
+ \fi
+ \fi
+\end{lstlisting}
+
+Note that using \cs{ltjsetkanjiskip}~or~\cs{ltjsetxkanjiskip} alone,
+that is, without executing \cs{ltj at setpar@global} in advance, is \emph{not} supported.
+%</en>
+
%<*ja>
\subsection{\cs{ltjsetparameter} の代替}
原則として各種内部パラメータの設定には \cs{ltjsetparameter} もしくは
@@ -5465,7 +5530,7 @@
\LuaTeX-ja の内部ではより高速に実行できる別の形式を用いている．
\emph{本節は一般利用者むけの内容ではない．}
-\paragraph{\Param{kanjiskip}, \Param{xkanjiskip} の設定}
+\paragraph{\Param{kanjiskip}, \Param{xkanjiskip}の設定}
\pLaTeXe 新ドキュメントクラスでは，
\begin{lstlisting}
\def\@setfontsize#1#2#3{%
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2018-03-25 21:24:56 UTC (rev 47107)
@@ -5,10 +5,10 @@
%
% Copyright 1995-2001 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016-2017 Japanese TeX Development Community
+% Copyright (c) 2016-2018 Japanese TeX Development Community
%
-% This file is part of the pLaTeX2e system.
-% -----------------------------------------
+% This file is part of the pLaTeX2e system (community edition).
+% -------------------------------------------------------------
%
% \fi
%
@@ -114,7 +114,7 @@
% それを用いるように変更（PDFサイズ削減のため）．}
% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更}
% \changes{v1.7g}{2017/09/19}{内部処理で使ったボックス0を空にした}
-% \changes{v1.7h}{2018/01/13}{和文スケール値\cs{Cjascale}を定義}
+% \changes{v1.7h}{2018/02/04}{和文スケール値\cs{Cjascale}を定義}
% \fi
%
% \iffalse
@@ -144,7 +144,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -174,7 +174,7 @@
%
% \section{はじめに}
% このファイルは、Lua\LaTeX-ja用の|jclasses|互換クラスファイルです。
-% v1.6をベースに作成しています。
+% コミュニティ版をベースに作成しています。
% \dst{}プログラムによって、横組用のクラスファイルと縦組用のクラスファイル
% を作成することができます。
%
@@ -850,15 +850,12 @@
% \end{macro}
%
% \begin{macro}{\Cjascale}
-% 和文スケール値（$1\,\mathrm{zw} \div \hbox{要求サイズ}$）を
+% このクラスファイルが意図する和文スケール値
+% （$1\,\mathrm{zw} \div \textmc{要求サイズ}$）を
% 表す実数値マクロ|\Cjascale|を定義します。
-% ^^A p\LaTeXe{}の標準クラスでは、フォーマット作成時に読み込まれた
-% ^^A フォント定義ファイル（\file{jy1mc.fd} / \file{jy1gt.fd} /
-% ^^A \file{jt1mc.fd} / \file{jt1gt.fd}）での和文スケール値がそのまま
-% ^^A 有効ですので、これは1です。
% この\texttt{jclasses}互換クラスでは、Lua\TeX-ja読み込み時の和文スケール値がそのまま
% 使用され、その値は0.962216です。
-% \changes{v1.7h}{2018/01/13}{和文スケール値\cs{Cjascale}を定義}
+% \changes{v1.7h}{2018/02/04}{和文スケール値\cs{Cjascale}を定義}
% \begin{macrocode}
%<*article|report|book>
\def\Cjascale{0.962216}
@@ -866,6 +863,8 @@
% \end{macrocode}
% \end{macro}
%
+%
+%
% \section{レイアウト}
%
% \subsection{用紙サイズの決定}
@@ -1542,7 +1541,7 @@
% |\marginparwidth|を計算します。
% ここで、|\@tempdima|の値は、\linebreak
% |\paperwidth| $-$ |\textwidth|です。
-% \changes{v1.1d}{1995/11/24}{typo: \cs{marginmarwidth} to \cs{marginparwidth}}
+% \changes{v1.1d}{1995/11/24}{\break typo: \cs{marginmarwidth} to \cs{marginparwidth}}
% \begin{macrocode}
%<*yoko>
\if at twoside
@@ -2048,9 +2047,9 @@
%<*report|book>
\def\chaptermark##1{\markboth{%
\ifnum \c at secnumdepth >\m at ne
-%<book> \if at mainmatter
+%<book> \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-%<book> \fi
+%<book> \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -2077,9 +2076,9 @@
%<*report|book>
\def\chaptermark##1{\markright{%
\ifnum \c at secnumdepth >\m at ne
-%<book> \if at mainmatter
+%<book> \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-%<book> \fi
+%<book> \fi
\fi
##1}}%
%</report|book>
@@ -2124,9 +2123,9 @@
%<*report|book>
\def\chaptermark##1{\markboth{%
\ifnum \c at secnumdepth >\m at ne
-%<book> \if at mainmatter
+%<book> \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-%<book> \fi
+%<book> \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -2155,9 +2154,9 @@
%<*report|book>
\def\chaptermark##1{\markright{%
\ifnum \c at secnumdepth >\m at ne
-%<book> \if at mainmatter
+%<book> \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-%<book> \fi
+%<book> \fi
\fi
##1}}%
%</report|book>
@@ -2302,7 +2301,7 @@
\if at compatibility
\newenvironment{titlepage}
{%
-%<book> \cleardoublepage
+%<book> \cleardoublepage
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\newpage\fi
\thispagestyle{empty}%
@@ -2774,11 +2773,11 @@
% \end{description}
%
% |\secdef|は次のようにして使うことができます。
-% \begin{verbatim}
+%\begin{verbatim}
% \def\chapter {... \secdef \CMDA \CMDB }
% \def\CMDA [#1]#2{....} % \chapter[...]{...} の定義
% \def\CMDB #1{....} % \chapter*{...} の定義
-% \end{verbatim}
+%\end{verbatim}
%
%
% \subsubsection{partレベル}
@@ -4311,7 +4310,7 @@
\renewcommand\theenumiv{\@arabic\c at enumiv}}%
\sloppy
% \end{macrocode}
-% \changes{v1.1a}{1997/01/23}{\LaTeX\ \texttt{!<1996/12/01!>}に合わせて修正}
+% \changes{v1.1a}{1997/01/23}{\break\LaTeX\ \texttt{!<1996/12/01!>}に合わせて修正}
% \begin{macrocode}
\clubpenalty4000
\@clubpenalty\clubpenalty
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-03-25 21:24:56 UTC (rev 47107)
@@ -12,7 +12,7 @@
%
% Copyright 1995-1999 ASCII Corporation.
% Copyright 1999-2016 Haruhiko Okumura
-% Copyright 2016-2017 Japanese TeX Development Community
+% Copyright 2016-2018 Japanese TeX Development Community
% -----------------------------------------
%
% \fi
@@ -44,7 +44,7 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2018/01/14 ltjsclasses ]
+ [2018/03/22 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass{ltjsarticle}
@@ -69,10 +69,10 @@
\addtolength{\marginparwidth}{1in}
\setlength\marginparpush{0pt}
% \OnlyDescription
+\CodelineNumbered
\EnableCrossrefs
\setcounter{StandardModuleDepth}{1}
\GetFileInfo{ltjsclasses.dtx}
-\CodelineNumbered
\begin{document}
\DocInput{ltjsclasses.dtx}
\end{document}
@@ -418,8 +418,6 @@
This \jsc at clsname\space cls does not support `usemag'\MessageBreak
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\jsc at mag@xrealtrue}
-
-
% \end{macrocode}
%
%
@@ -787,7 +785,7 @@
%
% [2016-04-04 LTJ] NFSSへのパッチを修正。
%
-% [2017-01-23] \LaTeXe\ 2017-01-01以降ではTUエンコーディングが標準なので，
+% [2017-01-23 LTJ] \LaTeXe\ 2017-01-01以降ではTUエンコーディングが標準なので，
% \texttt{type1cm}パッケージは読み込まないようにしました．
%
% [2017-02-17 LTJ] |\directlua|中で出力される数字のカテゴリーコードが12になるようにしました．
@@ -1332,10 +1330,10 @@
%
% |\small| も |\normalsize| と同様に設定します。
% 行送りは，|\normalsize| が16ポイントなら，
-% 割合からすれば $16 \times 0.9 = 14.4$ ポイントになりますが，
+% 割合からすれば$16 \times 0.9 = 14.4$ポイントになりますが，
% |\small| の使われ方を考えて，ここでは和文13ポイント，
% 欧文11ポイントとします。
-% また，|\topsep| と |\parsep| は，元はそれぞれ $4 \pm 2$，$2 \pm 1$
+% また，|\topsep| と |\parsep| は，元はそれぞれ$4 \pm 2$，$2 \pm 1$
% ポイントでしたが，ここではゼロ（|\z@|）にしました。
%
% \begin{macrocode}
@@ -1587,7 +1585,6 @@
% 計算では |\headheight| ではなく |\topskip| を使う
% ことにしました。
%
-%
% [2016-08-17] 圏点やルビが一行目に来た場合に下がるのを防ぐた
% め，|\topskip| を10ptから1.38zwに増やしました。
% |\headheight| は従来と同じ20ptのままとします。
@@ -1844,8 +1841,8 @@
%
% \begin{macrocode}
\def\flushbottom{%
- \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
- \let\@texttop\relax}
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
% \end{macrocode}
% \end{macro}
%
@@ -1924,6 +1921,7 @@
% |\topmargin| は従来の値から変わらないように調節しました。
% …のつもりでしたが，|\textheight| を増やし忘れていたので
% 変わってしまっていました（2016-08-26修正済み）。
+%
% \begin{macrocode}
\setlength\topmargin{\paperheight}
\addtolength\topmargin{-\textheight}
@@ -1969,8 +1967,8 @@
%
% フロート（図，表）関連のパラメータは\LaTeXe 本体で定義されていますが，
% ここで設定変更します。本文ページ（本文とフロートが共存するページ）
+% とフロートだけのページで設定が異なります。
% ちなみに，カウンタは内部では |\c@| を名前に冠したマクロになっています。
-% とフロートだけのページで設定が異なります。
%
% \begin{macro}{\c at topnumber}
%
@@ -2483,6 +2481,10 @@
% 和文のものでは |\Large| になっていましたが，ここでは |\large|
% にしました。
%
+% [2016-11-16] スペーシングを元の |jsclasses| に合わせるため，|\smallskip| を
+% |\jsc at smallskip| に置き換えました。|\smallskip| のままでは
+% \texttt{nomag(*)} の場合にスケールしなくなり，レイアウトが変わってしまいます。
+%
% \begin{macrocode}
%<*article|book|report|kiyou>
\if at titlepage
@@ -2814,7 +2816,7 @@
\if at slide
{\vskip\if at twocolumn-5\jsc at mpt\else-6\jsc at mpt\fi
\maybeblue\hrule height0\jsc at mpt depth1\jsc at mpt
- \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}
+ \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}%
\fi
\par % 2000-12-18
\ignorespaces}
@@ -2977,6 +2979,15 @@
%
% ページ番号をローマ数字にし，章番号を付けないようにします。
%
+% [2017-03-05] |\frontmatter| と |\mainmatter| の2つの命令は，
+% 改丁または改ページした後で |\pagenumbering{...}| でノンブルを1に
+% リセットします。長い間 |\frontmatter| は \texttt{openany} のときに
+% 単なる改ページとしていましたが，これではノンブルをリセットする際に
+% 偶奇逆転が起こる場合がありました。\texttt{openany} かどうかに依らず
+% 奇数ページまで繰るように修正することで，問題を解消しました。
+% 実は，\LaTeX の標準クラスでは1998年に修正されていた問題です
+% （コミュニティ版\pLaTeX の標準クラス2017/03/05も参照）。
+%
% \begin{macrocode}
%<*book>
\newcommand\frontmatter{%
@@ -2990,15 +3001,6 @@
%
% ページ番号を算用数字にし，章番号を付けるようにします。
%
-% [2017-03-05] |\frontmatter| と |\mainmatter| の2つの命令は，
-% 改丁または改ページした後で |\pagenumbering{...}| でノンブルを1に
-% リセットします。長い間 |\frontmatter| は \texttt{openany} のときに
-% 単なる改ページとしていましたが，これではノンブルをリセットする際に
-% 偶奇逆転が起こる場合がありました。\texttt{openany} かどうかに依らず
-% 奇数ページまで繰るように修正することで，問題を解消しました。
-% 実は，\LaTeX の標準クラスでは1998年に修正されていた問題です
-% （コミュニティ版\pLaTeX の標準クラス2017/03/05も参照）。
-%
% \begin{macrocode}
\newcommand\mainmatter{%
\pltx at cleartooddpage
@@ -3014,7 +3016,7 @@
% \begin{macrocode}
\newcommand\backmatter{%
\if at openleft
- \cleardoublepage
+ \cleardoublepage
\else\if at openright
\cleardoublepage
\else
@@ -3070,7 +3072,7 @@
%<*book|report>
\newcommand\part{%
\if at openleft
- \cleardoublepage
+ \cleardoublepage
\else\if at openright
\cleardoublepage
\else
@@ -5063,7 +5065,7 @@
% 「注1」の形式にするには次のようにしてください。
%
% \begin{macrocode}
-% \def\thefootnote{\ifnum\c at footnote>\z@注\kern0.1\zw\@arabic\c at footnote\fi}
+% \def\thefootnote{\ifnum\c at footnote>\z@ 注\kern0.1\zw\@arabic\c at footnote\fi}
% \end{macrocode}
%
% \end{macro}
@@ -5084,6 +5086,8 @@
%
% 脚注番号は章ごとにリセットされます。
%
+% [2018-03-11] |\next|などいくつかの内部命令を |\jsc at ...| 付きの
+% ユニークな名前にしました。
% \begin{macrocode}
%<book|report>\@addtoreset{footnote}{chapter}
% \end{macrocode}
@@ -5095,6 +5099,8 @@
% Jeremy Gibbons, \textit{\TeX\ and TUG NEWS},
% Vol.~2, No.~4 (1993), p.~9）
%
+% [2018-03-11] |\next|などいくつかの内部命令を |\jsc at ...| 付きの
+% ユニークな名前にしました。
% \begin{macrocode}
\long\def\@footnotetext{%
\insert\footins\bgroup
@@ -5109,12 +5115,12 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces}%
- \futurelet\next\fo at t}
-\def\fo at t{\ifcat\bgroup\noexpand\next \let\next\f@@t
- \else \let\next\f at t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f at t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color at endgroup\egroup}
+ \futurelet\jsc at next\jsc at fo@t}
+\def\jsc at fo@t{\ifcat\bgroup\noexpand\jsc at next \let\jsc at next\jsc at f@@t
+ \else \let\jsc at next\jsc at f@t\fi \jsc at next}
+\def\jsc at f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc at next}
+\def\jsc at f@t#1{#1\jsc@@foot}
+\def\jsc@@foot{\@finalstrut\strutbox\color at endgroup\egroup}
% \end{macrocode}
% \end{macro}
%
@@ -5167,7 +5173,7 @@
% する機能がありますが，|\item| 直後ではラベル用のボックスが段落先頭になる
% ため，うまく働きませんでした。形を変えて復活させます。
%
-% [2017-04-03 LTJ] 従来クラフファイルで定義していた |\@inhibitglue| は，
+% [2017-04-03 LTJ] 従来クラスファイルで定義していた |\@inhibitglue| は，
% Lua\TeX-jaのコアに |\ltjfakeparbegin| として正式に追加されたのでリネームします．
%
% |\item| 命令の直後です。
@@ -5256,7 +5262,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue\ignorespaces
+ \inhibitglue \ignorespaces
\fi}
% \end{macrocode}
%
@@ -5266,7 +5272,6 @@
%
% [2016-07-14] ロゴの定義は\texttt{jslogo}パッケージに移転しました。
% 後方互換のため，\texttt{jsclasses}ではデフォルトでこれを読み込みます。
-%
% \texttt{nojslogo}オプションが指定されている場合は読み込みません。
%
% [2016-07-21 LTJ] \texttt{jsclasses} とLua\TeX-jaの更新タイミングが一致しない可能性を考慮し，
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -101,7 +101,7 @@
\def\boutenchar{\char\euc"A1A2}%"
\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
\def\@bou#1{%
- \ifx#1\end \let\next=\relax
+ \ifx#1\end \let\ltj@@next=\relax
\else
\ifnum\ltjgetparameter{direction}=3\relax
\hbox to\z@{\vbox to\z@{\boxmaxdepth\maxdimen
@@ -112,8 +112,8 @@
\vss\moveleft-0.2\zw\hbox{\boutenchar}\nointerlineskip
\hbox{\char\euc"A1A1}}\hss}\nobreak#1\relax
\fi
- \let\next=\@bou
- \fi\next}
+ \let\ltj@@next=\@bou
+ \fi\ltj@@next}
\long\def\mbox#1{\leavevmode\hbox{#1}}
\fi %</LaTeX>
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -78,7 +78,7 @@
},
[3] = { -- 中点類
- chars = {'・', '：', '；'},
+ chars = {'・', '：', '；', '·'},
align = 'middle', left = 0.0, down = 0.0,
width = 0.5, height = 0.88, depth = 0.12, italic=0.0,
--end_stretch = 0.25,
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -78,7 +78,7 @@
},
[3] = { -- 中点類
- chars = {'・', '：', '；'},
+ chars = {'・', '：', '；', '·'},
align = 'middle', left = 0.0, down = 0.0,
width = 0.5, height = 0.50, depth = 0.50, italic=0.0,
--end_stretch = 0.25,
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -618,7 +618,7 @@
\def\boutenchar{\char\euc"A1A2}%"
\def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end}
\def\@bou#1{%
- \ifx#1\end \let\next=\relax
+ \ifx#1\end \let\ltj@@next=\relax
\else
\ifnum\ltjgetparameter{direction}=3\relax
\hbox to\z@{\vbox to\z@{\boxmaxdepth\maxdimen
@@ -629,8 +629,8 @@
\vss\moveleft-0.2\zw\hbox{\boutenchar}\nointerlineskip
\hbox{\char\euc"A1A1}}\hss}\nobreak#1\relax
\fi
- \let\next=\@bou
- \fi\next}
+ \let\ltj@@next=\@bou
+ \fi\ltj@@next}
%%% kasen
\def\kasen#1{%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -447,16 +447,16 @@
\protected\def\ltj at afterbox#1{%
\def\ltj at afb@xarg{#1}%
\afterassignment\ltj at afb@x
- \chardef\next`.}
-\def\ltj at afb@x{\futurelet\next\ltj at afb@xtest}
+ \chardef\ltj@@next`.}
+\def\ltj at afb@x{\futurelet\ltj@@next\ltj at afb@xtest}
\def\ltj at afb@xtest{%
- \ifcase\ifx\next\hbox\tw@\fi
- \ifx\next\vbox\tw@\fi
- \ifx\next\vtop\tw@\fi
- \ifx\next\box\@ne\fi
- \ifx\next\copy\@ne\fi
- \ifx\next\vsplit\@ne\fi
- \ifx\next\lastbox\@ne\fi
+ \ifcase\ifx\ltj@@next\hbox\tw@\fi
+ \ifx\ltj@@next\vbox\tw@\fi
+ \ifx\ltj@@next\vtop\tw@\fi
+ \ifx\ltj@@next\box\@ne\fi
+ \ifx\ltj@@next\copy\@ne\fi
+ \ifx\ltj@@next\vsplit\@ne\fi
+ \ifx\ltj@@next\lastbox\@ne\fi
0% ``A <box> was ...'' error will be causes by \setbox later anyway.
\or\afterassignment\ltj at afb@xarg
\or\afterassignment\ltj at afb@xagarg
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-charrange.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,12 +3,10 @@
--
luatexbase.provides_module({
name = 'luatexja.charrange',
- date = '2017/05/05',
+ date = '2018/02/18',
description = 'Handling the range of Japanese characters',
})
-module('luatexja.charrange', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
+luatexja.charrange = {}
luatexja.load_module('base'); local ltjb = luatexja.base
local getchar = node.direct.getchar
@@ -16,7 +14,8 @@
local has_attr_node = node.has_attribute
local tex_getattr = tex.getattribute
-ATTR_RANGE = 7
+local ATTR_RANGE = 7
+luatexja.charrange.ATTR_RANGE = ATTR_RANGE
local jcr_cjk, jcr_noncjk = 0, 1
local floor = math.floor
local pow = math.pow
@@ -40,8 +39,7 @@
-- external 217, 1 2 216, 217 and (out of range): 'other'
-- initialize
-jcr_table_main = {}
-local jcr_table_main = jcr_table_main
+local jcr_table_main = {}
local ucs_out = 0x110000
for i=0x0 ,0x7F do jcr_table_main[i]=-1 end
@@ -49,7 +47,7 @@
for i=0x100,ucs_out-1 do jcr_table_main[i]=0 end
-- EXT: add characters to a range
-function add_char_range(b,e,ind) -- ind: external range number
+function luatexja.charrange.add_char_range(b,e,ind) -- ind: external range number
if not ind or ind<0 or ind>31*ATTR_RANGE then -- 0 はエラーにしない（隠し）
ltjb.package_error('luatexja',
"invalid character range number (" .. ind .. ")",
@@ -70,32 +68,30 @@
end
end
-function char_to_range(c) -- return the external range number
+function luatexja.charrange.char_to_range(c) -- return the external range number
local r = jcr_table_main[ltjb.in_unicode(c, false)] or 217
return (r~=0) and r or 217
end
-function get_range_setting(i) -- i: internal range number
+local function get_range_setting(i) -- i: internal range number
return floor(tex_getattr(kcat_attr_table[i])/pow_table[i])%2
end
-- glyph_node p は和文文字か？
-function is_ucs_in_japanese_char_node(p)
+function luatexja.charrange.is_ucs_in_japanese_char(p)
return nfn_table[jcr_table_main[c or p.char]](p)
end
-is_ucs_in_japanese_char = is_ucs_in_japanese_char_node
--- only ltj-otf.lua uses this version
-function is_ucs_in_japanese_char_direct(p ,c)
+function luatexja.charrange.is_ucs_in_japanese_char_direct(p ,c)
return fn_table[jcr_table_main[c or getchar(p)]](p)
end
-function is_japanese_char_curlist(c) -- assume that c>=0x80
+function luatexja.charrange.is_japanese_char_curlist(c) -- assume that c>=0x80
return get_range_setting(jcr_table_main[c])~= jcr_noncjk
end
-- EXT
-function toggle_char_range(g, i) -- i: external range number
+function luatexja.charrange.toggle_char_range(g, i) -- i: external range number
if type(i)~='number' then
ltjb.package_error('luatexja',
"invalid character range number (" .. tostring(i).. ")",
@@ -112,4 +108,6 @@
end
end
+luatexja.charrange.get_range_setting=get_range_setting
+
-- EOF
Deleted: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-infomute.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-infomute.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-infomute.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -1,58 +0,0 @@
---
--- luatexja/infomute.lua
---
-luatexbase.provides_module({
- name = 'luatexja.infomute',
- date = '2011/06/05',
- description = '',
-})
-module('luatexja.infomute', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
---------------------
---! luatexbase.module_info() で特定のモジュールの情報出力だけ
---! 抑止したい.
-
-local org_texio = texio
-local patch_applied = false
-local info_mute = {}
-
-local function pick_module_name(line)
- local mod
- if line:sub(1, 7) == "Module " then
- local s, e = line:find(" ", 8, true)
- if s then mod = line:sub(8, s - 1) end
- elseif line:sub(1, 1) == "(" then
- local s, e = line:find(")", 2, true)
- if s then mod = line:sub(2, s - 1) end
- end
- return mod
-end
-
-local function patched_write_nl(line, ...)
- local mod = pick_module_name(line)
- if not (mod and info_mute[mod]) then
- org_texio.write_nl(line, ...)
- end
-end
-
-local new_texio = setmetatable({ write_nl = patched_write_nl },
- { __index = org_texio })
-local org_fenv = getfenv(luatexbase.module_info)
-
-local function apply_patch()
- setfenv(luatexbase.module_info,
- setmetatable({ texio = new_texio }, { __index = org_fenv }))
- patch_applied = true
-end
-
---! モジュール mod の情報出力を抑止する.
-function add_mute(mod)
- info_mute[mod] = true
- if not patch_applied then
- apply_patch()
- end
-end
-
--------------------- all done
--- EOF
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ivd_aj1.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ivd_aj1.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ivd_aj1.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -5,6 +5,11 @@
-- #
-- # History:
-- #
+-- # 2017-12-12 Registration of additional sequences in the Adobe-Japan1
+-- # collection. Combined registration of the KRName collection
+-- # and of sequences in that collection. Registration of
+-- # additional sequences in the Moji_Joho collection.
+-- #
-- # 2016-08-15 Combined registration of the MSARG collection and of
-- # sequences in that collection.
-- #
@@ -27,7 +32,7 @@
-- # For more details on the IVD, see UTS #37:
-- # http://www.unicode.org/reports/tr37/
-- #
--- # Copyright 2006-2016 Unicode, Inc.
+-- # Copyright 2006-2017 Unicode, Inc.
-- # For terms of use, see: http://www.unicode.org/terms_of_use.html
-- #
-- # EOF
@@ -13864,7 +13869,7 @@
4217781,
2120710,
4217871,
- 6315023,
+ 2282820,
2120729,
4222344,
4225117,
@@ -13893,7 +13898,7 @@
4229642,
6326794,
4231109,
- 4229232,
+ 2286953,
6328386,
2110751,
2275153,
@@ -14217,7 +14222,7 @@
6323765,
4226627,
4226700,
- 4226896,
+ 2286200,
2229567,
2253418,
4350576,
@@ -14256,7 +14261,7 @@
4230553,
2115558,
4230708,
- 4230730,
+ 2287338,
4231151,
4231303,
4231162,
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,11 +3,10 @@
--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2017/05/05',
- description = 'Insertion process of JFM glues and kanjiskip',
+ date = '2018/02/18',
+ description = 'Insertion process of JFM glues, [x]kanjiskip and others',
})
-module('luatexja.jfmglue', package.seeall)
-local err, warn, info, log = luatexbase .errwarinf(_NAME)
+luatexja.jfmglue = luatexja.jfmglue or {}
luatexja.load_module('base'); local ltjb = luatexja.base
luatexja.load_module('stack'); local ltjs = luatexja.stack
@@ -16,9 +15,8 @@
luatexja.load_module('setwidth'); local ltjw = luatexja.setwidth
local pairs = pairs
-local nullfunc = function(n) return n end
-local to_node = node.direct.tonode
-local to_direct = node.direct.todirect
+--local to_node = node.direct.tonode
+--local to_direct = node.direct.todirect
local setfield = node.direct.setfield
local setglue = luatexja.setglue
@@ -88,7 +86,7 @@
local capsule_glyph
local tex_dir
local attr_ablshift
-local set_np_xspc_jachar
+local set_np_xspc_jachar, set_np_xspc_alchar
local set_np_xspc_jachar_hbox
local ltjs_orig_char_table = ltjs.orig_char_table
@@ -147,7 +145,7 @@
end
-- 「異なる JFM」の間の調整方法
-diffmet_rule = math.two_paverage
+luatexja.jfmglue.diffmet_rule = math.two_paverage
function math.two_add(a,b) return a+b end
function math.two_average(a,b) return (a+b)*0.5 end
function math.two_paverage(a,b) return (a+b)/2 end
@@ -165,6 +163,7 @@
-------------------- hlist 内の文字の検索
local first_char, last_char, find_first_char
+local check_box_high
do
local ltjd_glyph_from_packed = ltjd.glyph_from_packed
local function check_box(box_ptr, box_end)
@@ -235,7 +234,7 @@
return found_visible_node
end
-function check_box_high(Nx, box_ptr, box_end)
+check_box_high = function (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
@@ -555,7 +554,7 @@
-- We think that "Np is a Japanese character" if Np.met~=nil,
-- "Np is an alphabetic character" if Np.pre~=nil,
-- "Np is not a character" otherwise.
-after_hlist = nil -- global
+local after_hlist = nil -- global
local after_alchar, extract_np
do
local PRE = luatexja.stack_table_index.PRE
@@ -601,6 +600,7 @@
-- 欧文文字のデータを取得
local floor = math.floor
+ local nullfunc = function(n) return n end
function set_np_xspc_alchar(Nx, c,x, lig)
if c~=-1 then
local f = (lig ==1) and nullfunc or node_tail
@@ -648,7 +648,7 @@
-------------------- 最下層の処理
-luatexbase.create_callback('luatexja.adjust_jfmglue', 'simple', nullfunc)
+luatexbase.create_callback('luatexja.adjust_jfmglue', 'simple', function(n) return n end)
-- change penalties (or create a new penalty, if needed)
local function handle_penalty_normal(post, pre, g)
@@ -749,11 +749,11 @@
local bk_ak = 2*id_kern - id_kern
local function blend_diffmet(b, a, rb, ra)
- return round(diffmet_rule((1-rb)*b+rb*a, (1-ra)*b+ra*a))
+ return round(luatexja.jfmglue.diffmet_rule((1-rb)*b+rb*a, (1-ra)*b+ra*a))
end
calc_ja_ja_aux = function (gb, ga, db, da)
- if diffmet_rule ~= math.two_pleft and diffmet_rule ~= math.two_pright
- and diffmet_rule ~= math.two_paverage then
+ if luatexja.jfmglue.diffmet_rule ~= math.two_pleft and diffmet_rule ~= math.two_pright
+ and luatexja.jfmglue.diffmet_rule ~= math.two_paverage then
db, da = 0, 1
end
if not gb then
@@ -808,6 +808,7 @@
local null_skip_table = {0, 0, 0}
-- get kanjiskip
local get_kanjiskip, kanjiskip_jfm_flag
+local get_kanjiskip_low
local calc_ja_ja_glue
do
local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP
@@ -891,6 +892,7 @@
-- get xkanjiskip
local get_xkanjiskip, xkanjiskip_jfm_flag
local get_xkanjiskip_normal, get_xkanjiskip_jfm
+local get_xkanjiskip_low
do
local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP
local XKANJI_SKIP_JFM = luatexja.icflag_table.XKANJI_SKIP_JFM
@@ -1063,6 +1065,7 @@
-- Nq が前側のクラスタとなることによる修正
+local adjust_nq
do
local adjust_nq_aux = {
[id_glyph] = function() after_alchar(Nq) end, -- after_alchar(Nq)
@@ -1075,7 +1078,7 @@
end,
}
- function adjust_nq()
+ adjust_nq=function()
local x = adjust_nq_aux[Nq.id]
if x then x() end
end
@@ -1213,7 +1216,7 @@
-------------------- 外部から呼ばれる関数
-- main interface
-function main(ahead, mode, dir)
+function luatexja.jfmglue.main(ahead, mode, dir)
if not ahead then return ahead end
--luatexja.ext_show_node_list(to_node(ahead ), '>B ', print)
--print()
@@ -1254,7 +1257,7 @@
local node_write = node.direct.write
-- \inhibitglue
- function create_inhibitglue_node()
+ function luatexja.jfmglue.create_inhibitglue_node()
local tn = node_new(id_whatsit, sid_user)
setfield(tn, 'user_id', IHB)
setfield(tn, 'type', 100)
@@ -1264,7 +1267,7 @@
-- Node for indicating beginning of a paragraph
-- (for ltjsclasses)
- function create_beginpar_node()
+ function luatexja.jfmglue.create_beginpar_node()
local tn = node_new(id_whatsit, sid_user)
setfield(tn, 'user_id', BPAR)
setfield(tn, 'type', 100)
@@ -1273,7 +1276,7 @@
end
-- Node for indicating a head/end of a box
- function create_boxbdd_node()
+ function luatexja.jfmglue.create_boxbdd_node()
local tn = node_new(id_whatsit, sid_user)
setfield(tn, 'user_id', BOXB)
setfield(tn, 'type', 100)
@@ -1336,3 +1339,6 @@
"luatexja.beginpar.np_info_after", 1)
end
+
+luatexja.jfmglue.after_hlist = after_hlist
+luatexja.jfmglue.check_box_high = check_box_high
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,10 +3,9 @@
--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2017/09/04',
+ date = '2018/02/18',
description = 'Loader for Japanese fonts',
})
-module('luatexja.jfont', package.seeall)
luatexja.load_module('base'); local ltjb = luatexja.base
luatexja.load_module('charrange'); local ltjc = luatexja.charrange
@@ -31,12 +30,14 @@
local id_kern = node.id('kern')
local cat_lp = luatexbase.catcodetables['latex-package']
local FROM_JFM = luatexja.icflag_table.FROM_JFM
+
+luatexja.jfont = luatexja.jfont or {}
------------------------------------------------------------------------
-- LOADING JFM
------------------------------------------------------------------------
-metrics={} -- this table stores all metric informations
-font_metric_table={} -- [font number] -> jfm_name, jfm_var, size
+local metrics={} -- this table stores all metric informations
+local font_metric_table={} -- [font number] -> jfm_name, jfm_var, size
luatexbase.create_callback("luatexja.load_jfm", "data", function (ft, jn) return ft end)
@@ -54,7 +55,7 @@
end
end
-function define_jfm(t)
+function luatexja.jfont.define_jfm(t)
local real_char -- Does current character class have the 'real' character?
if t.dir~=jfm_dir then
defjfm_res= nil; return
@@ -234,7 +235,8 @@
luatexbase.create_callback("luatexja.find_char_class", "data",
function (arg, fmtable, char)
return 0
- end)
+ end)
+local find_char_class
do
local start_time_measure = ltjb.start_time_measure
local stop_time_measure = ltjb.stop_time_measure
@@ -287,7 +289,7 @@
-- EXT
local utf8 = unicode.utf8
- function jfontdefX(g, dir, csname)
+ function luatexja.jfont.jfontdefX(g, dir, csname)
jfm_dir, is_def_jfont = dir, true
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)
@@ -301,7 +303,7 @@
-- EXT
local identifiers = fonts.hashes.identifiers
local provides_feature = luaotfload.aux.provides_feature
- function jfontdefY()
+ function luatexja.jfont.jfontdefY()
local j = load_jfont_metric(jfm_dir)
local fn = font.id(cstemp)
local f = font_getfont(fn)
@@ -352,12 +354,12 @@
local dir_tate = luatexja.dir_table.dir_tate
local tex_get_attr = tex.getattribute
-- PUBLIC function
- function get_zw()
+ function luatexja.jfont.get_zw()
local a = font_metric_table[
tex_get_attr((get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)]
return a and a.zw or 0
end
- function get_zh()
+ function luatexja.jfont.get_zh()
local a = font_metric_table[
tex_get_attr((get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)]
return a and a.zw or 0
@@ -451,25 +453,25 @@
do
-- these function are called from ltj-latex.sty
local fenc_list, kyenc_list, ktenc_list = {}, {}, {}
- function add_fenc_list(enc) fenc_list[enc] = 'true ' end
- function add_kyenc_list(enc) kyenc_list[enc] = 'true ' end
- function add_ktenc_list(enc) ktenc_list[enc] = 'true ' end
- function is_kyenc(enc)
+ function luatexja.jfont.add_fenc_list(enc) fenc_list[enc] = 'true ' end
+ function luatexja.jfont.add_kyenc_list(enc) kyenc_list[enc] = 'true ' end
+ function luatexja.jfont.add_ktenc_list(enc) ktenc_list[enc] = 'true ' end
+ function luatexja.jfont.is_kyenc(enc)
tex.sprint(cat_lp, '\\let\\ifin@\\if' .. (kyenc_list[enc] or 'false '))
end
- function is_ktenc(enc)
+ function luatexja.jfont.is_ktenc(enc)
tex.sprint(cat_lp, '\\let\\ifin@\\if' .. (ktenc_list[enc] or 'false '))
end
- function is_kenc(enc)
+ function luatexja.jfont.is_kenc(enc)
tex.sprint(cat_lp, '\\let\\ifin@\\if'
.. (kyenc_list[enc] or ktenc_list[enc] or 'false '))
end
local kfam_list, Nkfam_list = {}, {}
- function add_kfam(fam)
+ function luatexja.jfont.add_kfam(fam)
kfam_list[fam]=true
end
- function search_kfam(fam, use_fd)
+ function luatexja.jfont.search_kfam(fam, use_fd)
if kfam_list[fam] then
tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
elseif Nkfam_list[fam] then
@@ -491,13 +493,13 @@
end
end
local ffam_list, Nffam_list = {}, {}
- function is_ffam(fam)
+ function luatexja.jfont.is_ffam(fam)
tex.sprint(cat_lp, '\\let\\ifin@\\if' .. (ffam_list[fam] or 'false '))
end
- function add_ffam(fam)
+ function luatexja.jfont.add_ffam(fam)
ffam_list[fam]='true '
end
- function search_ffam_declared()
+ function luatexja.jfont.search_ffam_declared()
local s = ''
for i,_ in pairs(fenc_list) do
s = s .. '\\cdp at elt{' .. i .. '}'
@@ -504,7 +506,7 @@
end
tex.sprint(cat_lp, s)
end
- function search_ffam_fd(fam)
+ function luatexja.jfont.search_ffam_fd(fam)
if Nffam_list[fam] then
tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
else
@@ -521,14 +523,13 @@
------------------------------------------------------------------------
-- ALTERNATE FONTS
------------------------------------------------------------------------
-alt_font_table = {}
-local alt_font_table = alt_font_table
+local alt_font_table = {}
local attr_curaltfnt = {}
local ucs_out = 0x110000
------ for TeX interface
-- EXT
-function set_alt_font(b,e,ind,bfnt)
+function luatexja.jfont.set_alt_font(b,e,ind,bfnt)
-- ind: 新フォント, bfnt: 基底フォント
if b>e then b, e = e, b end
if b*e<=0 then
@@ -562,7 +563,7 @@
end
-- EXT
-function clear_alt_font(bfnt)
+function luatexja.jfont.clear_alt_font(bfnt)
if alt_font_table[bfnt] then
local t = alt_font_table[bfnt]
for i,_ in pairs(t) do t[i]=nil; end
@@ -570,7 +571,7 @@
end
------ used in ltjp.suppress_hyphenate_ja callback
-function replace_altfont(pf, pc)
+function luatexja.jfont.replace_altfont(pf, pc)
local a = alt_font_table[pf]
return a and a[pc] or pf
end
@@ -580,7 +581,7 @@
local alt_font_table_latex = {}
-- EXT
-function clear_alt_font_latex(bbase)
+function luatexja.jfont.clear_alt_font_latex(bbase)
local t = alt_font_table_latex[bbase]
if t then
for j,v in pairs(t) do t[j] = nil end
@@ -588,7 +589,7 @@
end
-- EXT
-function set_alt_font_latex(b,e,ind,bbase)
+function luatexja.jfont.set_alt_font_latex(b,e,ind,bbase)
-- ind: Alt font の enc/fam/ser/shape, bbase: 基底フォントの enc/fam/ser/shape
if b>e then b, e = e, b end
if b*e<=0 then
@@ -630,17 +631,17 @@
local alt_font_base, alt_font_base_num
local aftl_base
-- EXT
- function does_alt_set(bbase)
+ function luatexja.jfont.does_alt_set(bbase)
aftl_base = alt_font_table_latex[bbase]
tex.sprint(cat_lp, '\\if' .. (aftl_base and 'true' or 'false'))
end
-- EXT
- function print_aftl_address()
+ function luatexja.jfont.print_aftl_address()
tex.sprint(cat_lp, ';ltjaltfont' .. tostring(aftl_base):sub(8))
end
-- EXT
- function output_alt_font_cmd(dir, bbase)
+ function luatexja.jfont.output_alt_font_cmd(dir, bbase)
alt_font_base = bbase
if dir == 't' then
alt_font_base_num = tex.getattribute(attr_curtfnt)
@@ -660,7 +661,7 @@
end
-- EXT
- function pickup_alt_font_a(size_str)
+ function luatexja.jfont.pickup_alt_font_a(size_str)
local t = alt_font_table_latex[alt_font_base]
if t then
for i,v in pairs(t) do
@@ -679,7 +680,7 @@
end
-- EXT
- function pickup_alt_font_b(afnt_num, afnt_base)
+ function luatexja.jfont.pickup_alt_font_b(afnt_num, afnt_base)
local t = alt_font_table[alt_font_base_num]
local ac = font_getfont(afnt_num).characters
if not t then t = {}; alt_font_table[alt_font_base_num] = t end
@@ -703,7 +704,7 @@
-- 終了時に各種ノードを破棄
------------------------------------------------------------------------
do
- function cleanup_size_cache()
+ function luatexja.jfont.cleanup_size_cache()
--local gs, ke = 0, 0
for _,n in pairs(metrics) do
for i,t in pairs(n.size_cache) do
@@ -724,8 +725,8 @@
------------------------------------------------------------------------
-- 追加のフォント情報
------------------------------------------------------------------------
-font_extra_info = {}
-local font_extra_info = font_extra_info -- key: fontnumber
+local font_extra_info = {}
+luatexja.jfont.font_extra_info= font_extra_info -- key: fontnumber
local font_extra_basename = {} -- key: basename
local list_rotate_glyphs
@@ -1154,7 +1155,7 @@
end
end
-- EXT: italic correction
- function append_italic()
+ function luatexja.jfont.append_italic()
local p = to_direct(tex.nest[tex.nest.ptr].tail)
local TEMP = node_new(id_kern)
if p and getid(p)==id_glyph then
@@ -1181,3 +1182,7 @@
end
end
+luatexja.jfont.metrics = metrics
+luatexja.jfont.font_metric_table = font_metric_table
+luatexja.jfont.find_char_class = find_char_class
+
Deleted: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -1,1039 +0,0 @@
-return {
- [0]=500,
- {
- ["shrink"]=26214,
- ["shrink_order"]=0,
- ["stretch"]=26214,
- ["stretch_order"]=0,
- ["width"]=0,
- },
- {
- ["shrink"]=65536,
- ["shrink_order"]=0,
- ["stretch"]=65536,
- ["stretch_order"]=0,
- ["width"]=157649,
- },
- [256]=51,
- [512]=52,
- [768]=53,
- [1024]=12295,
- [1025]=19968,
- [1026]=20108,
- [1027]=19977,
- [1028]=22235,
- [1029]=20116,
- [1030]=20845,
- [1031]=19971,
- [1032]=20843,
- [1033]=20061,
- [2097185]=10000,
- [2097186]=10000,
- [2097189]=500,
- [2097190]=500,
- [2097191]=10000,
- [2097193]=10000,
- [2097194]=500,
- [2097195]=500,
- [2097196]=10000,
- [2097197]=10000,
- [2097198]=10000,
- [2097199]=500,
- [2097210]=10000,
- [2097211]=10000,
- [2097215]=10000,
- [2097245]=10000,
- [2097322]=10000,
- [2097330]=10000,
- [2097331]=10000,
- [2097332]=10000,
- [2097335]=10000,
- [2097337]=10000,
- [2097338]=10000,
- [2097339]=10000,
- [2097872]=10000,
- [2105369]=10000,
- [2105373]=10000,
- [2105381]=250,
- [2105382]=250,
- [2105404]=10000,
- [2105415]=10000,
- [2105416]=10000,
- [2105417]=10000,
- [2105634]=10000,
- [2105874]=200,
- [2107782]=10000,
- [2109441]=10000,
- [2109442]=10000,
- [2109445]=10000,
- [2109449]=10000,
- [2109451]=10000,
- [2109453]=10000,
- [2109455]=10000,
- [2109457]=10000,
- [2109461]=10000,
- [2109463]=10000,
- [2109465]=10000,
- [2109471]=10000,
- [2109491]=10000,
- [2109492]=10000,
- [2109493]=10000,
- [2109499]=10000,
- [2109505]=150,
- [2109507]=150,
- [2109509]=150,
- [2109511]=150,
- [2109513]=150,
- [2109539]=150,
- [2109571]=150,
- [2109573]=150,
- [2109575]=150,
- [2109582]=150,
- [2109589]=150,
- [2109590]=150,
- [2109595]=10000,
- [2109596]=10000,
- [2109597]=10000,
- [2109598]=10000,
- [2109601]=150,
- [2109603]=150,
- [2109605]=150,
- [2109607]=150,
- [2109609]=150,
- [2109635]=150,
- [2109667]=150,
- [2109669]=150,
- [2109671]=150,
- [2109678]=150,
- [2109685]=150,
- [2109686]=150,
- [2109691]=10000,
- [2109692]=10000,
- [2109693]=10000,
- [2109694]=10000,
- [2109936]=150,
- [2109937]=150,
- [2109938]=150,
- [2109939]=150,
- [2109940]=150,
- [2109941]=150,
- [2109942]=150,
- [2109943]=150,
- [2109944]=150,
- [2109945]=150,
- [2109946]=150,
- [2109947]=150,
- [2109948]=150,
- [2109949]=150,
- [2109950]=150,
- [2109951]=150,
- [2162433]=10000,
- [2162437]=200,
- [2162438]=200,
- [2162441]=10000,
- [2162443]=200,
- [2162444]=10000,
- [2162445]=200,
- [2162446]=10000,
- [2162458]=10000,
- [2162459]=10000,
- [2162461]=200,
- [2162463]=10000,
- [2162493]=10000,
- [2162525]=10000,
- [2162528]=10000,
- [2162529]=10000,
- [2162531]=10000,
- [2162532]=10000,
- [2162590]=10000,
- [2162591]=10000,
- [4194339]=500,
- [4194340]=500,
- [4194341]=500,
- [4194342]=500,
- [4194344]=10000,
- [4194395]=10000,
- [4194400]=10000,
- [4194465]=10000,
- [4194475]=10000,
- [4194495]=10000,
- [4202520]=10000,
- [4202524]=10000,
- [4202668]=10000,
- [4204933]=10000,
- [4206600]=10000,
- [4206602]=10000,
- [4206604]=10000,
- [4206606]=10000,
- [4206608]=10000,
- [4206612]=10000,
- [4206614]=10000,
- [4206616]=10000,
- [4206621]=10000,
- [4259587]=200,
- [4259588]=200,
- [4259589]=200,
- [4259590]=200,
- [4259592]=10000,
- [4259643]=10000,
- [4259648]=10000,
- [4259675]=10000,
- [4259679]=10000,
- [4259682]=10000,
- [6299648]=1,
- [6299649]=1,
- [6299650]=1,
- [6299651]=1,
- [6299652]=1,
- [6299653]=1,
- [6299654]=1,
- [6299655]=1,
- [6299656]=1,
- [6299657]=1,
- [6299658]=1,
- [6299659]=1,
- [6299660]=1,
- [6299661]=1,
- [6299662]=1,
- [6299663]=1,
- [6299664]=1,
- [6299665]=1,
- [6299666]=1,
- [6299667]=1,
- [6299668]=1,
- [6299669]=1,
- [6299670]=1,
- [6299671]=1,
- [6299672]=1,
- [6299673]=1,
- [6299674]=1,
- [6299675]=1,
- [6299676]=1,
- [6299677]=1,
- [6299678]=1,
- [6299679]=1,
- [6299680]=1,
- [6299681]=1,
- [6299682]=1,
- [6299683]=1,
- [6299684]=1,
- [6299685]=1,
- [6299686]=1,
- [6299687]=1,
- [6299688]=1,
- [6299689]=1,
- [6299690]=1,
- [6299691]=1,
- [6299692]=1,
- [6299693]=1,
- [6299694]=1,
- [6299695]=1,
- [6299696]=1,
- [6299697]=1,
- [6299698]=1,
- [6299699]=1,
- [6299700]=1,
- [6299701]=1,
- [6299702]=1,
- [6299703]=1,
- [6299704]=1,
- [6299705]=1,
- [6299706]=1,
- [6299707]=1,
- [6299708]=1,
- [6299709]=1,
- [6299710]=1,
- [6299711]=1,
- [6299712]=1,
- [6299713]=1,
- [6299714]=1,
- [6299715]=1,
- [6299716]=1,
- [6299717]=1,
- [6299718]=1,
- [6299719]=1,
- [6299720]=1,
- [6299721]=1,
- [6299722]=1,
- [6299723]=1,
- [6299724]=1,
- [6299725]=1,
- [6299726]=1,
- [6299727]=1,
- [6299728]=1,
- [6299729]=1,
- [6299730]=1,
- [6299731]=1,
- [6299732]=1,
- [6299733]=1,
- [6299734]=1,
- [6299735]=1,
- [6299736]=1,
- [6299737]=1,
- [6299738]=1,
- [6299739]=1,
- [6299740]=1,
- [6299741]=1,
- [6299742]=1,
- [6299743]=1,
- [6299744]=1,
- [6299745]=1,
- [6299746]=1,
- [6299747]=1,
- [6299748]=1,
- [6299749]=1,
- [6299750]=1,
- [6299751]=1,
- [6299752]=1,
- [6299753]=1,
- [6299754]=1,
- [6299755]=1,
- [6299756]=1,
- [6299757]=1,
- [6299758]=1,
- [6299759]=1,
- [6303744]=1,
- [6303745]=1,
- [6303746]=1,
- [6303747]=1,
- [6303748]=1,
- [6303749]=1,
- [6303750]=1,
- [6303751]=1,
- [6303752]=1,
- [6303753]=1,
- [6303754]=1,
- [6303755]=1,
- [6303756]=1,
- [6303757]=1,
- [6303758]=1,
- [6303759]=1,
- [6303760]=1,
- [6303761]=1,
- [6303762]=1,
- [6303763]=1,
- [6303764]=1,
- [6303765]=1,
- [6303766]=1,
- [6303767]=1,
- [6303768]=1,
- [6303769]=1,
- [6303770]=1,
- [6303771]=1,
- [6303772]=1,
- [6303773]=1,
- [6303774]=1,
- [6303775]=1,
- [6303776]=1,
- [6303777]=1,
- [6303778]=1,
- [6303779]=1,
- [6303780]=1,
- [6303781]=1,
- [6303782]=1,
- [6303783]=1,
- [6303784]=1,
- [6303785]=1,
- [6303786]=1,
- [6303787]=1,
- [6303788]=1,
- [6303789]=1,
- [6303790]=1,
- [6303791]=1,
- [6303792]=1,
- [6303793]=1,
- [6303794]=1,
- [6303795]=1,
- [6303796]=1,
- [6303797]=1,
- [6303798]=1,
- [6303799]=1,
- [6303800]=1,
- [6303801]=1,
- [6303802]=1,
- [6303803]=1,
- [6303804]=1,
- [6303805]=1,
- [6303806]=1,
- [6303807]=1,
- [6356736]=1,
- [6356737]=1,
- [6356738]=1,
- [6356739]=1,
- [6356740]=1,
- [6356741]=1,
- [6356742]=1,
- [6356743]=1,
- [6356744]=1,
- [6356745]=1,
- [6356746]=1,
- [6356747]=1,
- [6356748]=1,
- [6356749]=1,
- [6356750]=1,
- [6356751]=1,
- [6356752]=1,
- [6356753]=1,
- [6356754]=1,
- [6356755]=1,
- [6356756]=1,
- [6356757]=1,
- [6356758]=1,
- [6356759]=1,
- [6356760]=1,
- [6356761]=1,
- [6356762]=1,
- [6356763]=1,
- [6356764]=1,
- [6356765]=1,
- [6356766]=1,
- [6356767]=1,
- [6356768]=1,
- [6356769]=1,
- [6356770]=1,
- [6356771]=1,
- [6356772]=1,
- [6356773]=1,
- [6356774]=1,
- [6356775]=1,
- [6356776]=1,
- [6356777]=1,
- [6356778]=1,
- [6356779]=1,
- [6356780]=1,
- [6356781]=1,
- [6356782]=1,
- [6356783]=1,
- [6356784]=1,
- [6356785]=1,
- [6356786]=1,
- [6356787]=1,
- [6356788]=1,
- [6356789]=1,
- [6356790]=1,
- [6356791]=1,
- [6356792]=1,
- [6356793]=1,
- [6356794]=1,
- [6356795]=1,
- [6356796]=1,
- [6356797]=1,
- [6356798]=1,
- [6356799]=1,
- [6356800]=1,
- [6356801]=1,
- [6356802]=1,
- [6356803]=1,
- [6356804]=1,
- [6356805]=1,
- [6356806]=1,
- [6356807]=1,
- [6356808]=1,
- [6356809]=1,
- [6356810]=1,
- [6356811]=1,
- [6356812]=1,
- [6356813]=1,
- [6356814]=1,
- [6356815]=1,
- [6356816]=1,
- [6356817]=1,
- [6356818]=1,
- [6356819]=1,
- [6356820]=1,
- [6356821]=1,
- [6356822]=1,
- [6356823]=1,
- [6356824]=1,
- [6356825]=1,
- [6356826]=1,
- [6356827]=1,
- [6356828]=1,
- [6356829]=1,
- [6356830]=1,
- [6356831]=1,
- [6356832]=1,
- [6356833]=1,
- [6356834]=1,
- [6356835]=1,
- [6356836]=1,
- [6356837]=1,
- [6356838]=1,
- [6356839]=1,
- [6356840]=1,
- [6356841]=1,
- [6356842]=1,
- [6356843]=1,
- [6356844]=1,
- [6356845]=1,
- [6356846]=1,
- [6356847]=1,
- [6356848]=1,
- [6356849]=1,
- [6356850]=1,
- [6356851]=1,
- [6356852]=1,
- [6356853]=1,
- [6356854]=1,
- [6356855]=1,
- [6356856]=1,
- [6356857]=1,
- [6356858]=1,
- [6356859]=1,
- [6356860]=1,
- [6356861]=1,
- [6356862]=1,
- [6356863]=1,
- [6356864]=1,
- [6356865]=1,
- [6356866]=1,
- [6356867]=1,
- [6356868]=1,
- [6356869]=1,
- [6356870]=1,
- [6356871]=1,
- [6356872]=1,
- [6356873]=1,
- [6356874]=1,
- [6356875]=1,
- [6356876]=1,
- [6356877]=1,
- [6356878]=1,
- [6356879]=1,
- [6356880]=1,
- [6356881]=1,
- [6356882]=1,
- [6356883]=1,
- [6356884]=1,
- [6356885]=1,
- [6356886]=1,
- [6356887]=1,
- [6356888]=1,
- [6356889]=1,
- [6356890]=1,
- [6356891]=1,
- [6356892]=1,
- [6356893]=1,
- [6356894]=1,
- [6356895]=1,
- [6356896]=1,
- [6356897]=1,
- [6356898]=1,
- [6356899]=1,
- [6356900]=1,
- [6356901]=1,
- [6356902]=1,
- [6356903]=1,
- [6356904]=1,
- [6356905]=1,
- [6356906]=1,
- [6356907]=1,
- [6356908]=1,
- [6356909]=1,
- [6356910]=1,
- [6356911]=1,
- [6356912]=1,
- [6356913]=1,
- [6356914]=1,
- [6356915]=1,
- [6356916]=1,
- [6356917]=1,
- [6356918]=1,
- [6356919]=1,
- [6356920]=1,
- [6356921]=1,
- [6356922]=1,
- [6356923]=1,
- [6356924]=1,
- [6356925]=1,
- [6356926]=1,
- [6356927]=1,
- [6356928]=1,
- [6356929]=1,
- [6356930]=1,
- [6356931]=1,
- [6356932]=1,
- [6356933]=1,
- [6356934]=1,
- [6356935]=1,
- [6356936]=1,
- [6356937]=1,
- [6356938]=1,
- [6356939]=1,
- [6356940]=1,
- [6356941]=1,
- [6356942]=1,
- [6356943]=1,
- [6356944]=1,
- [6356945]=1,
- [6356946]=1,
- [6356947]=1,
- [6356948]=1,
- [6356949]=1,
- [6356950]=1,
- [6356951]=1,
- [6356952]=1,
- [6356953]=1,
- [6356954]=1,
- [6356955]=1,
- [6356956]=1,
- [6356957]=1,
- [6356958]=1,
- [6356959]=1,
- [6356960]=1,
- [6356961]=1,
- [6356962]=1,
- [6356963]=1,
- [6356964]=1,
- [6356965]=1,
- [6356966]=1,
- [6356967]=1,
- [6356968]=1,
- [6356969]=1,
- [6356970]=1,
- [6356971]=1,
- [6356972]=1,
- [6356973]=1,
- [6356974]=1,
- [6356975]=1,
- [8388608]=0,
- [8388609]=0,
- [8388610]=0,
- [8388611]=0,
- [8388612]=0,
- [8388613]=0,
- [8388614]=0,
- [8388615]=0,
- [8388616]=0,
- [8388617]=0,
- [8388618]=0,
- [8388619]=0,
- [8388620]=0,
- [8388621]=0,
- [8388622]=0,
- [8388623]=0,
- [8388624]=0,
- [8388625]=0,
- [8388626]=0,
- [8388627]=0,
- [8388628]=0,
- [8388629]=0,
- [8388630]=0,
- [8388631]=0,
- [8388632]=0,
- [8388633]=0,
- [8388634]=0,
- [8388635]=0,
- [8388636]=0,
- [8388637]=0,
- [8388638]=0,
- [8388639]=0,
- [8388640]=0,
- [8388641]=0,
- [8388642]=0,
- [8388643]=0,
- [8388644]=0,
- [8388645]=0,
- [8388646]=0,
- [8388647]=2,
- [8388648]=1,
- [8388649]=2,
- [8388650]=0,
- [8388651]=0,
- [8388652]=2,
- [8388653]=0,
- [8388654]=2,
- [8388655]=0,
- [8388656]=3,
- [8388657]=3,
- [8388658]=3,
- [8388659]=3,
- [8388660]=3,
- [8388661]=3,
- [8388662]=3,
- [8388663]=3,
- [8388664]=3,
- [8388665]=3,
- [8388666]=0,
- [8388667]=2,
- [8388668]=0,
- [8388669]=0,
- [8388670]=0,
- [8388671]=0,
- [8388672]=0,
- [8388673]=3,
- [8388674]=3,
- [8388675]=3,
- [8388676]=3,
- [8388677]=3,
- [8388678]=3,
- [8388679]=3,
- [8388680]=3,
- [8388681]=3,
- [8388682]=3,
- [8388683]=3,
- [8388684]=3,
- [8388685]=3,
- [8388686]=3,
- [8388687]=3,
- [8388688]=3,
- [8388689]=3,
- [8388690]=3,
- [8388691]=3,
- [8388692]=3,
- [8388693]=3,
- [8388694]=3,
- [8388695]=3,
- [8388696]=3,
- [8388697]=3,
- [8388698]=3,
- [8388699]=1,
- [8388700]=0,
- [8388701]=2,
- [8388702]=0,
- [8388703]=0,
- [8388704]=1,
- [8388705]=3,
- [8388706]=3,
- [8388707]=3,
- [8388708]=3,
- [8388709]=3,
- [8388710]=3,
- [8388711]=3,
- [8388712]=3,
- [8388713]=3,
- [8388714]=3,
- [8388715]=3,
- [8388716]=3,
- [8388717]=3,
- [8388718]=3,
- [8388719]=3,
- [8388720]=3,
- [8388721]=3,
- [8388722]=3,
- [8388723]=3,
- [8388724]=3,
- [8388725]=3,
- [8388726]=3,
- [8388727]=3,
- [8388728]=3,
- [8388729]=3,
- [8388730]=3,
- [8388731]=0,
- [8388732]=0,
- [8388733]=0,
- [8388734]=0,
- [8388735]=0,
- [8388736]=3,
- [8388737]=3,
- [8388738]=3,
- [8388739]=3,
- [8388740]=3,
- [8388741]=3,
- [8388742]=3,
- [8388743]=3,
- [8388744]=3,
- [8388745]=3,
- [8388746]=3,
- [8388747]=3,
- [8388748]=3,
- [8388749]=3,
- [8388750]=3,
- [8388751]=3,
- [8388752]=3,
- [8388753]=3,
- [8388754]=3,
- [8388755]=3,
- [8388756]=3,
- [8388757]=3,
- [8388758]=3,
- [8388759]=3,
- [8388760]=3,
- [8388761]=3,
- [8388762]=3,
- [8388763]=3,
- [8388764]=3,
- [8388765]=3,
- [8388766]=3,
- [8388767]=3,
- [8388768]=3,
- [8388769]=1,
- [8388770]=3,
- [8388771]=3,
- [8388772]=3,
- [8388773]=0,
- [8388774]=3,
- [8388775]=3,
- [8388776]=3,
- [8388777]=3,
- [8388778]=2,
- [8388779]=1,
- [8388780]=3,
- [8388781]=3,
- [8388782]=3,
- [8388783]=3,
- [8388784]=2,
- [8388785]=3,
- [8388786]=2,
- [8388787]=2,
- [8388788]=3,
- [8388789]=3,
- [8388790]=3,
- [8388791]=3,
- [8388792]=3,
- [8388793]=2,
- [8388794]=2,
- [8388795]=2,
- [8388796]=3,
- [8388797]=3,
- [8388798]=3,
- [8388799]=1,
- [8388800]=3,
- [8388801]=3,
- [8388802]=3,
- [8388803]=3,
- [8388804]=3,
- [8388805]=3,
- [8388806]=3,
- [8388807]=3,
- [8388808]=3,
- [8388809]=3,
- [8388810]=3,
- [8388811]=3,
- [8388812]=3,
- [8388813]=3,
- [8388814]=3,
- [8388815]=3,
- [8388816]=3,
- [8388817]=3,
- [8388818]=3,
- [8388819]=3,
- [8388820]=3,
- [8388821]=3,
- [8388822]=3,
- [8388823]=3,
- [8388824]=3,
- [8388825]=3,
- [8388826]=3,
- [8388827]=3,
- [8388828]=3,
- [8388829]=3,
- [8388830]=3,
- [8388831]=3,
- [8388832]=3,
- [8388833]=3,
- [8388834]=3,
- [8388835]=3,
- [8388836]=3,
- [8388837]=3,
- [8388838]=3,
- [8388839]=3,
- [8388840]=3,
- [8388841]=3,
- [8388842]=3,
- [8388843]=3,
- [8388844]=3,
- [8388845]=3,
- [8388846]=3,
- [8388847]=3,
- [8388848]=3,
- [8388849]=3,
- [8388850]=3,
- [8388851]=3,
- [8388852]=3,
- [8388853]=3,
- [8388854]=3,
- [8388855]=3,
- [8388856]=3,
- [8388857]=3,
- [8388858]=3,
- [8388859]=3,
- [8388860]=3,
- [8388861]=3,
- [8388862]=3,
- [8388863]=3,
- [8396820]=0,
- [8396821]=0,
- [8396824]=1,
- [8396825]=2,
- [8396828]=1,
- [8396829]=2,
- [8396838]=0,
- [8396850]=2,
- [8396851]=2,
- [8396860]=2,
- [8396871]=2,
- [8396872]=2,
- [8396873]=2,
- [8396972]=1,
- [8397090]=2,
- [8398080]=0,
- [8398081]=0,
- [8398082]=0,
- [8398083]=0,
- [8398084]=0,
- [8398085]=0,
- [8398086]=0,
- [8398087]=0,
- [8398088]=0,
- [8398089]=0,
- [8398090]=0,
- [8398091]=0,
- [8398092]=0,
- [8398093]=0,
- [8398094]=0,
- [8398095]=0,
- [8398096]=0,
- [8398097]=0,
- [8398098]=0,
- [8398099]=0,
- [8398100]=0,
- [8398101]=0,
- [8398102]=0,
- [8398103]=0,
- [8398104]=0,
- [8398105]=0,
- [8398106]=0,
- [8398107]=0,
- [8398108]=0,
- [8398109]=0,
- [8398110]=0,
- [8398111]=0,
- [8398112]=0,
- [8398113]=0,
- [8398114]=0,
- [8398115]=0,
- [8398116]=0,
- [8398117]=0,
- [8398118]=0,
- [8398119]=0,
- [8398120]=0,
- [8398121]=0,
- [8398122]=0,
- [8398123]=0,
- [8398124]=0,
- [8398125]=0,
- [8398126]=0,
- [8398127]=0,
- [8398128]=0,
- [8398129]=0,
- [8398130]=0,
- [8398131]=0,
- [8398132]=0,
- [8398133]=0,
- [8398134]=0,
- [8398135]=0,
- [8398136]=0,
- [8398137]=0,
- [8398138]=0,
- [8398139]=0,
- [8398140]=0,
- [8398141]=0,
- [8398142]=0,
- [8398143]=0,
- [8398144]=0,
- [8398145]=0,
- [8398146]=0,
- [8398147]=0,
- [8398148]=0,
- [8398149]=0,
- [8398150]=0,
- [8398151]=0,
- [8398152]=0,
- [8398153]=0,
- [8398154]=0,
- [8398155]=0,
- [8398156]=0,
- [8398157]=0,
- [8398158]=0,
- [8398159]=0,
- [8398160]=0,
- [8398161]=0,
- [8398162]=0,
- [8398163]=0,
- [8398164]=0,
- [8398165]=0,
- [8398166]=0,
- [8398167]=0,
- [8398168]=0,
- [8398169]=0,
- [8398170]=0,
- [8398171]=0,
- [8398172]=0,
- [8398173]=0,
- [8398174]=0,
- [8398175]=0,
- [8398176]=0,
- [8398177]=0,
- [8398178]=0,
- [8398179]=0,
- [8398180]=0,
- [8398181]=0,
- [8398182]=0,
- [8398183]=0,
- [8398184]=0,
- [8398185]=0,
- [8398186]=0,
- [8398187]=0,
- [8398188]=0,
- [8398189]=0,
- [8398190]=0,
- [8398191]=0,
- [8398192]=0,
- [8398193]=0,
- [8398194]=0,
- [8398195]=0,
- [8398196]=0,
- [8398197]=0,
- [8398198]=0,
- [8398199]=0,
- [8398200]=0,
- [8398201]=0,
- [8398202]=0,
- [8398203]=0,
- [8398204]=0,
- [8398205]=0,
- [8398206]=0,
- [8398207]=0,
- [8399237]=1,
- [8399238]=2,
- [8400897]=2,
- [8400898]=2,
- [8400904]=1,
- [8400905]=2,
- [8400906]=1,
- [8400907]=2,
- [8400908]=1,
- [8400909]=2,
- [8400910]=1,
- [8400911]=2,
- [8400912]=1,
- [8400913]=2,
- [8400916]=1,
- [8400917]=2,
- [8400918]=1,
- [8400919]=2,
- [8400920]=1,
- [8400921]=2,
- [8400924]=0,
- [8400925]=1,
- [8400927]=2,
- [8453896]=1,
- [8453897]=2,
- [8453900]=2,
- [8453902]=2,
- [8453915]=2,
- [8453919]=2,
- [8453947]=1,
- [8453949]=2,
- [8453979]=1,
- [8453981]=2,
- [8453982]=0,
- [8453983]=1,
- [8453984]=2,
- [8453985]=2,
- [8453986]=1,
- [8453987]=2,
- [8453988]=2,
- [8454117]=0,
-}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,13 +3,12 @@
--
luatexbase.provides_module({
name = 'luatexja.ruby',
- date = '2017/05/05',
+ date = '2018/02/18',
description = 'Ruby annotation',
})
-module('luatexja.ruby', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
+luatexja.ruby = {}
luatexja.load_module('stack'); local ltjs = luatexja.stack
+luatexja.load_module('base'); local ltjb = luatexja.base
local to_node = node.direct.tonode
local to_direct = node.direct.todirect
@@ -74,7 +73,7 @@
----------------------------------------------------------------
do
local getbox = node.direct.getbox
- function cpbox() return node_copy(getbox(0)) end
+ function luatexja.ruby.cpbox() return node_copy(getbox(0)) end
end
----------------------------------------------------------------
@@ -119,9 +118,10 @@
-- 実行回数 + ルビ中身 から uniq_id を作る関数
-old_break_info = {} -- public, 前 run 時の分割情報
+luatexja.ruby.old_break_info = {} -- public, 前 run 時の分割情報
+local old_break_info = luatexja.ruby.old_break_info
local cache_handle
-function read_old_break_info()
+function luatexja.ruby.read_old_break_info()
if tex.jobname then
local fname = tex.jobname .. '.ltjruby'
local real_file = kpse.find_file(fname)
@@ -269,11 +269,11 @@
end
-- rst: table
-function texiface(rst, rtlr, rtlp)
+function luatexja.ruby.texiface(rst, rtlr, rtlp)
if #rtlr ~= #rtlp then
for i=1, #rtlr do node_free(rtlr[i]) end
for i=1, #rtlp do node_free(rtlp[i]) end
- luatexja.base.package_error('luatexja-ruby',
+ ltjb.package_error('luatexja-ruby',
'Group count mismatch between the ruby and\n' ..
'the body (' .. #rtlr .. ' != ' .. #rtlp .. ').',
'')
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,12 +3,11 @@
--
luatexbase.provides_module({
name = 'luatexja.stack',
- date = '2017/05/05',
+ date = '2018/02/18',
description = 'LuaTeX-ja stack system',
})
-module('luatexja.stack', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
+luatexja.stack = {}
+local ltjs=luatexja.stack
luatexja.load_module('base'); local ltjb = luatexja.base
--------------------------------------------------------------------------------
@@ -21,14 +20,14 @@
local fastcopy = table.fastcopy
local setcount = tex.setcount
local scan_int, scan_keyword = token.scan_int, token.scan_keyword
-hmode = 0 -- dummy
+ltjs.hmode = 0 -- dummy
-charprop_stack_table={};
-local charprop_stack_table = charprop_stack_table
+local charprop_stack_table={};
+ltjs.charprop_stack_table = charprop_stack_table
charprop_stack_table[0]={}
-function get_stack_level()
+local function get_stack_level()
local i = tex.getcount('ltj@@stack')
local j = tex.currentgrouplevel
if j > tex.getcount('ltj@@group at level') then
@@ -43,7 +42,7 @@
charprop_stack_table[i] = fastcopy(charprop_stack_table[i-1])
setcount('ltj@@stack', i)
if gd~=0 then tex.globaldefs = gd end
- if tex.nest[tex.nest.ptr].mode == -hmode then -- rest. hmode のみ
+ if tex.nest[tex.nest.ptr].mode == -ltjs.hmode then -- rest. hmode のみ
local g = node_new(id_whatsit, sid_user)
g.user_id=STCK; g.type=100; g.value=j; node.write(g)
end
@@ -50,8 +49,9 @@
end
return i
end
+ltjs.get_stack_level = get_stack_level
-function set_stack_table(m, p)
+local function set_stack_table(m, p)
local i = get_stack_level()
charprop_stack_table[i][m] = p
if luatexja.isglobal=='global' then
@@ -60,10 +60,10 @@
end
end
end
-local set_stack_table = set_stack_table
+ltjs.set_stack_table = set_stack_table
-- EXT
-function set_stack_perchar(m,lb,ub, getter)
+function ltjs.set_stack_perchar(m,lb,ub, getter)
local c = scan_int()
scan_keyword(',')
local p = tonumber((getter or scan_int)())
@@ -79,7 +79,7 @@
end
-- EXT
-function set_stack_font(m,c,p)
+function ltjs.set_stack_font(m,c,p)
if type(c)~='number' or c<0 or c>255 then
ltjb.package_error('luatexja',
"invalid family number (".. tostring(c) .. ")",
@@ -91,7 +91,7 @@
end
-- EXT: sp: glue_spec
-function set_stack_skip(m,sp)
+function ltjs.set_stack_skip(m,sp)
local i = get_stack_level()
if not sp then return end
if not charprop_stack_table[i][m] then
@@ -116,24 +116,25 @@
-- These three functions are used in ltj-jfmglue.lua.
-- list_dir and orig_char_table are used in other lua files.
-orig_char_table = {}
-list_dir = nil -- dummy
-table_current_stack = nil -- dummy
-function report_stack_level(bsl)
- table_current_stack = charprop_stack_table[bsl]
+local orig_char_table = {}
+ltjs.orig_char_table = orig_char_table
+ltjs.list_dir = nil -- dummy
+ltjs.table_current_stack = nil -- dummy
+function ltjs.report_stack_level(bsl)
+ ltjs.table_current_stack = charprop_stack_table[bsl]
return bsl
end
-function fast_get_stack_skip(m)
- return table_current_stack[m]
+function ltjs.fast_get_stack_skip(m)
+ return ltjs.table_current_stack[m]
or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
end
-- For other situations, use the following instead:
-function get_stack_skip(m, idx)
+function ltjs.get_stack_skip(m, idx)
return charprop_stack_table[idx][m]
or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
end
-function get_stack_table(mc, d, idx)
+function ltjs.get_stack_table(mc, d, idx)
local i = charprop_stack_table[idx][mc]
return i or d
end
Deleted: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-tangle.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-tangle.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-tangle.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -1,76 +0,0 @@
---
--- luatexja/tangle.lua
---
-luatexbase.provides_module({
- name = 'luatexja.tangle',
- date = '2011/05/14',
- description = '',
-})
-module('luatexja.tangle', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
---! ixbase0 からの移植
-
-local _DONE, _TEX, _STOP = 0, 1, 2
-local _current_co, _interrupted
-local _resume, _check
-
-local resume_code =
- "\\directlua{".._NAME..".resume()}\\relax"
-
-function execute(func, ...)
- if _current_co then
- err("tangle is going now")
- end
- local args = { ... }
- local co = coroutine.create(function()
- return _DONE, { func(unpack(args)) }
- end)
- _current_co = co
- _interrupted = false
- return _check(coroutine.resume(co, ...))
-end
-
-function resume()
- return _resume(false)
-end
-
-function interrupt()
- return _resume(true)
-end
-
-function run_tex()
- coroutine.yield(_TEX, {})
-end
-
-function suspend(...)
- local intr = coroutine.yield(_STOP, { ... })
- if intr then
- _interrupted = true
- error("*INTR*") -- this error is caught later
- end
-end
-
-function _resume(intr)
- if not _current_co then
- err("tangle is not going")
- end
- local co = _current_co
- return _check(coroutine.resume(co, intr))
-end
-
-function _check(costat, tstat, extra)
- if not costat then -- error in coroutine
- _current_co = nil
- if _interrupted then return end
- err(tstat)
- elseif tstat == _DONE then
- _current_co = nil
- elseif tstat == _TEX then
- tex.print(resume_code)
- end
- return unpack(extra)
-end
-
--- EOF
-
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -1,5 +1,5 @@
-- Do not edit this file!
--- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on 2015年 10月 24日 土曜日 16:45:46 JST.
+-- Created from LineBreak.txt by ltj-unicode-ccfix_make.pl on 2018年 3月 25日 日曜日 12:00:25 JST.
-- In case of errors, fix the Perl script instead.
local tex_catcode = tex.setcatcode
local tex_getcc = tex.getcatcode
@@ -13,7 +13,8 @@
set_letter(0x2600,0x2603)
set_letter(0x2614,0x2615)
set_letter(0x2618,0x2618)
-set_letter(0x261A,0x261F)
+set_letter(0x261A,0x261C)
+set_letter(0x261E,0x261F)
set_letter(0x2639,0x263B)
set_letter(0x2668,0x2668)
set_letter(0x267F,0x267F)
@@ -26,10 +27,12 @@
set_letter(0x26DF,0x26E1)
set_letter(0x26EA,0x26EA)
set_letter(0x26F1,0x26F5)
-set_letter(0x26F7,0x26FA)
+set_letter(0x26F7,0x26F8)
+set_letter(0x26FA,0x26FA)
set_letter(0x26FD,0x26FF)
set_letter(0x2700,0x2704)
-set_letter(0x2708,0x270D)
+set_letter(0x2708,0x2709)
+set_letter(0x2764,0x2764)
set_letter(0x2E80,0x2E99)
set_letter(0x2E9B,0x2EF3)
set_letter(0x2F00,0x2FD5)
@@ -70,7 +73,7 @@
set_letter(0x30EF,0x30F4)
set_letter(0x30F7,0x30FA)
set_letter(0x30FF,0x30FF)
-set_letter(0x3105,0x312D)
+set_letter(0x3105,0x312E)
set_letter(0x3131,0x318E)
set_letter(0x3190,0x3191)
set_letter(0x3192,0x3195)
@@ -90,8 +93,8 @@
set_letter(0x3300,0x33FF)
set_letter(0x3400,0x4DB5)
set_letter(0x4DB6,0x4DBF)
-set_letter(0x4E00,0x9FD5)
-set_letter(0x9FD6,0x9FFF)
+set_letter(0x4E00,0x9FEA)
+set_letter(0x9FEB,0x9FFF)
set_letter(0xA000,0xA014)
set_letter(0xA016,0xA48C)
set_letter(0xA490,0xA4C6)
@@ -130,44 +133,116 @@
set_letter(0xFF41,0xFF5A)
set_letter(0xFF5C,0xFF5C)
set_letter(0xFF5E,0xFF5E)
+set_letter(0xFF66,0xFF66)
+set_letter(0xFF71,0xFF9D)
+set_letter(0xFFA0,0xFFBE)
+set_letter(0xFFC2,0xFFC7)
+set_letter(0xFFCA,0xFFCF)
+set_letter(0xFFD2,0xFFD7)
+set_letter(0xFFDA,0xFFDC)
set_letter(0xFFE2,0xFFE2)
set_letter(0xFFE3,0xFFE3)
set_letter(0xFFE4,0xFFE4)
-set_letter(0x1B000,0x1B001)
+set_letter(0x17000,0x187EC)
+set_letter(0x18800,0x18AF2)
+set_letter(0x1B000,0x1B0FF)
+set_letter(0x1B100,0x1B11E)
+set_letter(0x1B170,0x1B2FB)
set_letter(0x1F000,0x1F02B)
+set_letter(0x1F02C,0x1F02F)
set_letter(0x1F030,0x1F093)
+set_letter(0x1F094,0x1F09F)
set_letter(0x1F0A0,0x1F0AE)
+set_letter(0x1F0AF,0x1F0B0)
set_letter(0x1F0B1,0x1F0BF)
+set_letter(0x1F0C0,0x1F0C0)
set_letter(0x1F0C1,0x1F0CF)
+set_letter(0x1F0D0,0x1F0D0)
set_letter(0x1F0D1,0x1F0F5)
+set_letter(0x1F0F6,0x1F0FF)
+set_letter(0x1F10D,0x1F10F)
+set_letter(0x1F12F,0x1F12F)
+set_letter(0x1F16C,0x1F16F)
+set_letter(0x1F1AD,0x1F1E5)
set_letter(0x1F200,0x1F202)
-set_letter(0x1F210,0x1F23A)
+set_letter(0x1F203,0x1F20F)
+set_letter(0x1F210,0x1F23B)
+set_letter(0x1F23C,0x1F23F)
set_letter(0x1F240,0x1F248)
+set_letter(0x1F249,0x1F24F)
set_letter(0x1F250,0x1F251)
-set_letter(0x1F300,0x1F39B)
+set_letter(0x1F252,0x1F25F)
+set_letter(0x1F260,0x1F265)
+set_letter(0x1F266,0x1F2FF)
+set_letter(0x1F300,0x1F384)
+set_letter(0x1F386,0x1F39B)
set_letter(0x1F39E,0x1F3B4)
set_letter(0x1F3B7,0x1F3BB)
-set_letter(0x1F3BD,0x1F3FA)
-set_letter(0x1F400,0x1F49F)
+set_letter(0x1F3BD,0x1F3C1)
+set_letter(0x1F3C5,0x1F3C6)
+set_letter(0x1F3C8,0x1F3C9)
+set_letter(0x1F3CD,0x1F3FA)
+set_letter(0x1F400,0x1F441)
+set_letter(0x1F444,0x1F445)
+set_letter(0x1F451,0x1F465)
+set_letter(0x1F46A,0x1F46D)
+set_letter(0x1F46F,0x1F46F)
+set_letter(0x1F479,0x1F47B)
+set_letter(0x1F47D,0x1F480)
+set_letter(0x1F484,0x1F484)
+set_letter(0x1F488,0x1F49F)
set_letter(0x1F4A1,0x1F4A1)
set_letter(0x1F4A3,0x1F4A3)
-set_letter(0x1F4A5,0x1F4AE)
+set_letter(0x1F4A5,0x1F4A9)
+set_letter(0x1F4AB,0x1F4AE)
set_letter(0x1F4B0,0x1F4B0)
set_letter(0x1F4B3,0x1F4FF)
set_letter(0x1F507,0x1F516)
set_letter(0x1F525,0x1F531)
-set_letter(0x1F54A,0x1F579)
-set_letter(0x1F57B,0x1F5A3)
-set_letter(0x1F5A5,0x1F5D3)
+set_letter(0x1F54A,0x1F573)
+set_letter(0x1F576,0x1F579)
+set_letter(0x1F57B,0x1F58F)
+set_letter(0x1F591,0x1F594)
+set_letter(0x1F597,0x1F5D3)
set_letter(0x1F5DC,0x1F5F3)
set_letter(0x1F5FA,0x1F5FF)
-set_letter(0x1F600,0x1F64F)
-set_letter(0x1F680,0x1F6D0)
+set_letter(0x1F600,0x1F644)
+set_letter(0x1F648,0x1F64A)
+set_letter(0x1F680,0x1F6A2)
+set_letter(0x1F6A4,0x1F6B3)
+set_letter(0x1F6B7,0x1F6BF)
+set_letter(0x1F6C1,0x1F6CB)
+set_letter(0x1F6CD,0x1F6D4)
+set_letter(0x1F6D5,0x1F6DF)
set_letter(0x1F6E0,0x1F6EC)
-set_letter(0x1F6F0,0x1F6F3)
-set_letter(0x1F910,0x1F918)
-set_letter(0x1F980,0x1F984)
+set_letter(0x1F6ED,0x1F6EF)
+set_letter(0x1F6F0,0x1F6F8)
+set_letter(0x1F6F9,0x1F6FF)
+set_letter(0x1F774,0x1F77F)
+set_letter(0x1F7D5,0x1F7FF)
+set_letter(0x1F80C,0x1F80F)
+set_letter(0x1F848,0x1F84F)
+set_letter(0x1F85A,0x1F85F)
+set_letter(0x1F888,0x1F88F)
+set_letter(0x1F8AE,0x1F8FF)
+set_letter(0x1F90C,0x1F90F)
+set_letter(0x1F910,0x1F917)
+set_letter(0x1F91D,0x1F91D)
+set_letter(0x1F920,0x1F925)
+set_letter(0x1F927,0x1F92F)
+set_letter(0x1F93A,0x1F93C)
+set_letter(0x1F93F,0x1F93F)
+set_letter(0x1F940,0x1F94C)
+set_letter(0x1F94D,0x1F94F)
+set_letter(0x1F950,0x1F96B)
+set_letter(0x1F96C,0x1F97F)
+set_letter(0x1F980,0x1F997)
+set_letter(0x1F998,0x1F9BF)
set_letter(0x1F9C0,0x1F9C0)
+set_letter(0x1F9C1,0x1F9CF)
+set_letter(0x1F9D0,0x1F9D0)
+set_letter(0x1F9DE,0x1F9E6)
+set_letter(0x1F9E7,0x1FFFD)
set_letter(0x20000,0x2A6D6)
set_letter(0x2A6D7,0x2A6FF)
set_letter(0x2A700,0x2B734)
@@ -175,7 +250,9 @@
set_letter(0x2B740,0x2B81D)
set_letter(0x2B81E,0x2B81F)
set_letter(0x2B820,0x2CEA1)
-set_letter(0x2CEA2,0x2F7FF)
+set_letter(0x2CEA2,0x2CEAF)
+set_letter(0x2CEB0,0x2EBE0)
+set_letter(0x2EBE1,0x2F7FF)
set_letter(0x2F800,0x2FA1D)
set_letter(0x2FA1E,0x2FFFD)
set_letter(0x30000,0x3FFFD)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -248,9 +248,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -264,9 +264,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markright{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}}%
}
@@ -280,9 +280,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -296,9 +296,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markright{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}}%
}
@@ -314,7 +314,7 @@
\if at compatibility
\newenvironment{titlepage}
{%
- \cleardoublepage
+ \cleardoublepage
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\newpage\fi
\thispagestyle{empty}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2018/01/14 ltjsclasses ]
+ [2018/03/22 ltjsclasses ]
\def\jsc at clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -127,7 +127,6 @@
This \jsc at clsname\space cls does not support `usemag'\MessageBreak
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\jsc at mag@xrealtrue}
-
\hour\time \divide\hour by 60\relax
\@tempcnta\hour \multiply\@tempcnta 60\relax
\minute\time \advance\minute-\@tempcnta
@@ -513,8 +512,8 @@
\addtolength{\textheight}{\topskip}
\addtolength{\textheight}{0.1\jsc at mpt}
\def\flushbottom{%
- \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
- \let\@texttop\relax}
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
\setlength\marginparsep{\columnsep}
\setlength\marginparpush{\baselineskip}
\setlength{\oddsidemargin}{\paperwidth}
@@ -842,7 +841,7 @@
\if at slide
{\vskip\if at twocolumn-5\jsc at mpt\else-6\jsc at mpt\fi
\maybeblue\hrule height0\jsc at mpt depth1\jsc at mpt
- \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}
+ \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}%
\fi
\par % 2000-12-18
\ignorespaces}
@@ -1383,12 +1382,12 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces}%
- \futurelet\next\fo at t}
-\def\fo at t{\ifcat\bgroup\noexpand\next \let\next\f@@t
- \else \let\next\f at t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f at t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color at endgroup\egroup}
+ \futurelet\jsc at next\jsc at fo@t}
+\def\jsc at fo@t{\ifcat\bgroup\noexpand\jsc at next \let\jsc at next\jsc at f@@t
+ \else \let\jsc at next\jsc at f@t\fi \jsc at next}
+\def\jsc at f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc at next}
+\def\jsc at f@t#1{#1\jsc@@foot}
+\def\jsc@@foot{\@finalstrut\strutbox\color at endgroup\egroup}
\newcommand\@makefntext[1]{%
\advance\leftskip 3\zw
\parindent 1\zw
@@ -1462,7 +1461,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue\ignorespaces
+ \inhibitglue \ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2018/01/14 ltjsclasses ]
+ [2018/03/22 ltjsclasses ]
\def\jsc at clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -129,7 +129,6 @@
This \jsc at clsname\space cls does not support `usemag'\MessageBreak
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\jsc at mag@xrealtrue}
-
\hour\time \divide\hour by 60\relax
\@tempcnta\hour \multiply\@tempcnta 60\relax
\minute\time \advance\minute-\@tempcnta
@@ -529,8 +528,8 @@
\addtolength{\textheight}{\topskip}
\addtolength{\textheight}{0.1\jsc at mpt}
\def\flushbottom{%
- \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
- \let\@texttop\relax}
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
\setlength\marginparsep{\columnsep}
\setlength\marginparpush{\baselineskip}
\setlength{\oddsidemargin}{\paperwidth}
@@ -857,7 +856,7 @@
\if at slide
{\vskip\if at twocolumn-5\jsc at mpt\else-6\jsc at mpt\fi
\maybeblue\hrule height0\jsc at mpt depth1\jsc at mpt
- \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}
+ \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}%
\fi
\par % 2000-12-18
\ignorespaces}
@@ -904,7 +903,7 @@
\pagenumbering{arabic}}
\newcommand\backmatter{%
\if at openleft
-\cleardoublepage
+ \cleardoublepage
\else\if at openright
\cleardoublepage
\else
@@ -913,7 +912,7 @@
\@mainmatterfalse}
\newcommand\part{%
\if at openleft
-\cleardoublepage
+ \cleardoublepage
\else\if at openright
\cleardoublepage
\else
@@ -1476,12 +1475,12 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces}%
- \futurelet\next\fo at t}
-\def\fo at t{\ifcat\bgroup\noexpand\next \let\next\f@@t
- \else \let\next\f at t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f at t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color at endgroup\egroup}
+ \futurelet\jsc at next\jsc at fo@t}
+\def\jsc at fo@t{\ifcat\bgroup\noexpand\jsc at next \let\jsc at next\jsc at f@@t
+ \else \let\jsc at next\jsc at f@t\fi \jsc at next}
+\def\jsc at f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc at next}
+\def\jsc at f@t#1{#1\jsc@@foot}
+\def\jsc@@foot{\@finalstrut\strutbox\color at endgroup\egroup}
\newcommand\@makefntext[1]{%
\advance\leftskip 3\zw
\parindent 1\zw
@@ -1555,7 +1554,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue\ignorespaces
+ \inhibitglue \ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2018/01/14 ltjsclasses ]
+ [2018/03/22 ltjsclasses ]
\def\jsc at clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -126,7 +126,6 @@
This \jsc at clsname\space cls does not support `usemag'\MessageBreak
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\jsc at mag@xrealtrue}
-
\hour\time \divide\hour by 60\relax
\@tempcnta\hour \multiply\@tempcnta 60\relax
\minute\time \advance\minute-\@tempcnta
@@ -494,8 +493,8 @@
\addtolength{\textheight}{\topskip}
\addtolength{\textheight}{0.1\jsc at mpt}
\def\flushbottom{%
- \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
- \let\@texttop\relax}
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
\setlength\marginparsep{\columnsep}
\setlength\marginparpush{\baselineskip}
\setlength{\oddsidemargin}{\paperwidth}
@@ -804,7 +803,7 @@
\if at slide
{\vskip\if at twocolumn-5\jsc at mpt\else-6\jsc at mpt\fi
\maybeblue\hrule height0\jsc at mpt depth1\jsc at mpt
- \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}
+ \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}%
\fi
\par % 2000-12-18
\ignorespaces}
@@ -1348,12 +1347,12 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces}%
- \futurelet\next\fo at t}
-\def\fo at t{\ifcat\bgroup\noexpand\next \let\next\f@@t
- \else \let\next\f at t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f at t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color at endgroup\egroup}
+ \futurelet\jsc at next\jsc at fo@t}
+\def\jsc at fo@t{\ifcat\bgroup\noexpand\jsc at next \let\jsc at next\jsc at f@@t
+ \else \let\jsc at next\jsc at f@t\fi \jsc at next}
+\def\jsc at f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc at next}
+\def\jsc at f@t#1{#1\jsc@@foot}
+\def\jsc@@foot{\@finalstrut\strutbox\color at endgroup\egroup}
\newcommand\@makefntext[1]{%
\advance\leftskip 3\zw
\parindent 1\zw
@@ -1427,7 +1426,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue\ignorespaces
+ \inhibitglue \ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2018/01/14 ltjsclasses ]
+ [2018/03/22 ltjsclasses ]
\def\jsc at clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -126,7 +126,6 @@
This \jsc at clsname\space cls does not support `usemag'\MessageBreak
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\jsc at mag@xrealtrue}
-
\hour\time \divide\hour by 60\relax
\@tempcnta\hour \multiply\@tempcnta 60\relax
\minute\time \advance\minute-\@tempcnta
@@ -485,8 +484,8 @@
\addtolength{\textheight}{0.1\jsc at mpt}
\setlength{\mathindent}{10\jsc at mmm}
\def\flushbottom{%
- \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
- \let\@texttop\relax}
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
\setlength\marginparsep{\columnsep}
\setlength\marginparpush{\baselineskip}
\setlength{\oddsidemargin}{\paperwidth}
@@ -732,7 +731,7 @@
\if at slide
{\vskip\if at twocolumn-5\jsc at mpt\else-6\jsc at mpt\fi
\maybeblue\hrule height0\jsc at mpt depth1\jsc at mpt
- \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}
+ \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}%
\fi
\par % 2000-12-18
\ignorespaces}
@@ -1242,12 +1241,12 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces}%
- \futurelet\next\fo at t}
-\def\fo at t{\ifcat\bgroup\noexpand\next \let\next\f@@t
- \else \let\next\f at t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f at t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color at endgroup\egroup}
+ \futurelet\jsc at next\jsc at fo@t}
+\def\jsc at fo@t{\ifcat\bgroup\noexpand\jsc at next \let\jsc at next\jsc at f@@t
+ \else \let\jsc at next\jsc at f@t\fi \jsc at next}
+\def\jsc at f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc at next}
+\def\jsc at f@t#1{#1\jsc@@foot}
+\def\jsc@@foot{\@finalstrut\strutbox\color at endgroup\egroup}
\newcommand\@makefntext[1]{%
\advance\leftskip 3\zw
\parindent 1\zw
@@ -1321,7 +1320,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue\ignorespaces
+ \inhibitglue \ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2018/01/14 ltjsclasses ]
+ [2018/03/22 ltjsclasses ]
\def\jsc at clsname{ltjsreport}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -128,7 +128,6 @@
This \jsc at clsname\space cls does not support `usemag'\MessageBreak
option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\jsc at mag@xrealtrue}
-
\hour\time \divide\hour by 60\relax
\@tempcnta\hour \multiply\@tempcnta 60\relax
\minute\time \advance\minute-\@tempcnta
@@ -503,8 +502,8 @@
\addtolength{\textheight}{\topskip}
\addtolength{\textheight}{0.1\jsc at mpt}
\def\flushbottom{%
- \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
- \let\@texttop\relax}
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
\setlength\marginparsep{\columnsep}
\setlength\marginparpush{\baselineskip}
\setlength{\oddsidemargin}{\paperwidth}
@@ -830,7 +829,7 @@
\if at slide
{\vskip\if at twocolumn-5\jsc at mpt\else-6\jsc at mpt\fi
\maybeblue\hrule height0\jsc at mpt depth1\jsc at mpt
- \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}
+ \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at mpt\fi\relax}%
\fi
\par % 2000-12-18
\ignorespaces}
@@ -869,7 +868,7 @@
\newcommand{\@chappos}{\postchaptername}
\newcommand\part{%
\if at openleft
-\cleardoublepage
+ \cleardoublepage
\else\if at openright
\cleardoublepage
\else
@@ -1469,12 +1468,12 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces}%
- \futurelet\next\fo at t}
-\def\fo at t{\ifcat\bgroup\noexpand\next \let\next\f@@t
- \else \let\next\f at t\fi \next}
-\def\f@@t{\bgroup\aftergroup\@foot\let\next}
-\def\f at t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color at endgroup\egroup}
+ \futurelet\jsc at next\jsc at fo@t}
+\def\jsc at fo@t{\ifcat\bgroup\noexpand\jsc at next \let\jsc at next\jsc at f@@t
+ \else \let\jsc at next\jsc at f@t\fi \jsc at next}
+\def\jsc at f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc at next}
+\def\jsc at f@t#1{#1\jsc@@foot}
+\def\jsc@@foot{\@finalstrut\strutbox\color at endgroup\egroup}
\newcommand\@makefntext[1]{%
\advance\leftskip 3\zw
\parindent 1\zw
@@ -1548,7 +1547,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue\ignorespaces
+ \inhibitglue \ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -260,9 +260,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -276,9 +276,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markright{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}}%
}
@@ -292,9 +292,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -308,9 +308,9 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markright{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+ \if at mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
- \fi
+ \fi
\fi
##1}}%
}
@@ -326,7 +326,7 @@
\if at compatibility
\newenvironment{titlepage}
{%
- \cleardoublepage
+ \cleardoublepage
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\newpage\fi
\thispagestyle{empty}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2018-03-25 21:24:56 UTC (rev 47107)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2018/01/13 v1.7h-ltj-15
+ [2018/02/04 v1.7h-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -122,11 +122,20 @@
\ltj@@decl at array@param{kansujichar}
\ifltj at in@latex
+% \pltx at next@inhibitglue (pLaTeX 2018-03-09)
+\protected\def\pltx at next@inhibitglue{%
+ \ifhmode\inhibitglue\else
+ \edef\@tempa{\everypar{%
+ \everypar{\unexpanded\expandafter{\the\everypar}}%
+ \unexpanded\expandafter{\the\everypar}\inhibitglue}}%
+\@tempa\fi}
\newcommand\printglossary{\@input@{\jobname.gls}}
+% \hour, \minute: define only
+ \newcount\hour
+ \newcount\minute
\fi
-\newcount\hour
-\newcount\minute
+
%%------------------ all done
\ltj at compat@AtEnd
\endinput
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -422,10 +422,10 @@
\define at key[ltj]{japaram}{jacharrange}{\expandafter\ltj@@scrange#1,,}
\def\ltj@@scrange#1,{%
\edef\ltj at temp{#1}%
- \ifx\ltj at temp\empty\let\next=\relax\else\let\next=\ltj@@scrange
+ \ifx\ltj at temp\empty\let\ltj@@next=\relax\else\let\ltj@@next=\ltj@@scrange
\directlua{luatexja.charrange.toggle_char_range(%
luatexja.is_global,\ltj at safe@num at or{nil}{#1})}%
- \fi\next
+ \fi\ltj@@next
}
\protected\def\ltj at setpar@global{%
@@ -574,7 +574,7 @@
\let\orig at insert=\insert
\protected\def\insert{\begingroup\afterassignment\ltj@@insert at A\ltj at tempcnta}
\protected\def\ltj@@insert at A{\orig at insert\ltj at tempcnta\bgroup
- \aftergroup\ltj@@insert at B\let\next}
+ \aftergroup\ltj@@insert at B\let\ltj@@next}
\protected\def\ltj@@insert at B{\directlua{luatexja.direction.populate_insertion_dir_whatsit()}\endgroup}
%%%% vadjust
@@ -582,7 +582,7 @@
\protected\def\vadjust{%
\ltj@@orig at vadjust\bgroup
\directlua{luatexja.direction.set_list_direction_hook('adj')}%
- \aftergroup\ltj@@vadjust at check@dir\let\next}
+ \aftergroup\ltj@@vadjust at check@dir\let\ltj@@next}
\protected\def\ltj@@vadjust at check@dir{%
\directlua{luatexja.direction.check_adjust_direction()}%
}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,14 +3,7 @@
tableunpack = table.unpack
------------------------------------------------------------------------
--- naming:
--- ext_... : called from \directlua{}
--- int_... : called from other Lua codes, but not from \directlua{}
--- (other) : only called from this file
-function luatexja.load_module(name)
- require('ltj-' .. name.. '.lua')
-end
-function luatexja.load_lua(fn)
+local function load_lua(fn)
local found = kpse.find_file(fn, 'tex')
if not found then
tex.error("LuaTeX-ja error: File `" .. fn .. "' not found")
@@ -19,6 +12,10 @@
dofile(found)
end
end
+luatexja.load_lua = load_lua
+function luatexja.load_module(name)
+ require('ltj-' .. name.. '.lua')
+end
do
local setfield = node.direct.setfield
@@ -111,7 +108,7 @@
load_module('setwidth'); local ltjw = luatexja.setwidth
load_module('jfmglue'); local ltjj = luatexja.jfmglue -- +1 glue +1 gs +1 attr_list
load_module('math'); local ltjm = luatexja.math
-load_module('tangle'); local ltjb = luatexja.base
+load_module('base'); local ltjb = luatexja.base
local attr_jchar_class = luatexbase.attributes['ltj at charclass']
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -34,10 +34,10 @@
\expandafter\let\csname ifltj at in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2018/01/21 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2018/03/25 Japanese Typesetting with Lua(La)TeX]
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20180121.0}
+\def\LuaTeXjaversion{20180325.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2017/11/12 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2018/03/25 Patch to LaTeX2e Kernel for LuaTeX-ja]
\RequirePackage{etoolbox}
\def\cleardoublepage{\clearpage\if at twoside
@@ -196,8 +196,6 @@
\@ifstar\@sverb\@verb}
\fi
\gdef\@stopfield{\null\color at endgroup\egroup}
-\newcount\hour
-\newcount\minute
\pretocmd{\footnote}{\inhibitglue}{}{}
\pretocmd{\footnotemark}{\inhibitglue}{}{}
\patchcmd{\@footnotemark}{\@makefnmark}{%
@@ -204,9 +202,6 @@
\unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark%
\else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi%
}{}{}
-\patchcmd{\@tabular}{\leavevmode}{\leavevmode\null}{}{}
-\apptocmd{\endtabular}{\null}{}{}
-\expandafter \let \csname endtabular*\endcsname = \endtabular
\let\@parboxto\@empty
\long\def\@iiiparbox#1#2[#3]#4#5{%
\leavevmode
@@ -291,7 +286,7 @@
%%%%%% tabular (platex/#43) \@tabclassz
-\def\ltj at sharp{\ltjfakeboxbdd\ignorespaces\@sharp\unskip\ltjfakeboxbdd}
+\def\ltj at sharp{\relax\pltx at next@inhibitglue\ltjfakeboxbdd\ignorespaces\@sharp\unskip\ltjfakeboxbdd}
\def\@tabclassz{%
\ifcase\@lastchclass
\@acolampacol
@@ -320,6 +315,9 @@
}{%
\everypar\expandafter{\the\everypar\ltjfakeboxbdd}\ignorespaces\@sharp\unskip
}{}{}
+\patchcmd{\@tabular}{\leavevmode}{\leavevmode\null}{}{}
+\apptocmd{\endtabular}{\null}{}{}
+\expandafter \let \csname endtabular*\endcsname = \endtabular
%%%%%% tabbing (platex/#53)
\patchcmd\@startline{\strut}{\strut\inhibitglue}{}{}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty 2018-03-25 21:23:05 UTC (rev 47106)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty 2018-03-25 21:24:56 UTC (rev 47107)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-array}[2017/06/18 Patch to array for LuaTeX-ja]
+\ProvidesPackage{lltjp-array}[2018/03/25 Patch to array for LuaTeX-ja]
\RequirePackage{etoolbox,array,luatexja}
@@ -13,4 +13,13 @@
\ltj at sharp
}{}{}
+%% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
+\def\@tabular{%
+ \leavevmode \null
+ \hbox \bgroup $\col at sep\tabcolsep \let\d at llarbegin\begingroup
+ \let\d at llarend\endgroup
+ \@tabarray}
+\def\endtabular{\endarray $\egroup\null}
+\expandafter \let \csname endtabular*\endcsname = \endtabular
+
\endinput
More information about the tex-live-commits
mailing list