texlive[45761] Master/texmf-dist: luatexja (12nov17)
commits+karl at tug.org
commits+karl at tug.org
Sun Nov 12 23:22:38 CET 2017
Revision: 45761
http://tug.org/svn/texlive?view=revision&revision=45761
Author: karl
Date: 2017-11-12 23:22:37 +0100 (Sun, 12 Nov 2017)
Log Message:
-----------
luatexja (12nov17)
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/ltjltxdoc.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.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/ltjltxdoc.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-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/lltjdefs.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/luatex/luatexja/max_perf_pct
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2017-11-12 22:22:37 UTC (rev 45761)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20170904.0
+The LuaTeX-ja Package 20171112.0
--------------------------------
Copyright (c) 2011--2017 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 20170904.0 in the Git repository by
+ or tagged as 20171112.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20170904.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20171112.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: Mon Sep 4 21:02:03 2017 +0900
+Last commit date: Sun Nov 12 20:54:59 2017 +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 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2017-11-12 22:22:37 UTC (rev 45761)
@@ -1086,7 +1086,16 @@
\renewcommand{\kanjifamilydefault}{\gtdefault}
\end{lstlisting}
+%<*ja>
+\item \pLaTeX と同様に，\texttt{mc},~\texttt{gt}両ファミリには「従属欧文」書体が定義されている．
+ これらは\cs{userelfont}を\cs{selectfont}（や，その他の「実際に」
+ フォントを変更する命令）の前で実行することにより使うことができる．
+ \pLaTeX では標準の欧文フォントはOT1エンコーディングのComputer Modern Roman (\texttt{cmr})%
+ であったが，2017年以降の\LuaLaTeX ではTUエンコーディングのlatin Modern Roman (\texttt{lmr})%
+ に変更されている．そのため，前段落で述べた「従属欧文」も，Latin Modern Romanに設定している．
+%</ja>
+
\end{itemize}
%<*en>
@@ -5932,17 +5941,16 @@
\item[\cs{userelfont}]
%<*en>
-Change current alphabetic font encoding/family/\dots\ to the `accompanied' alphabetic
- font family with respect to current Japanese font family,
- which was set by
- \cs{DeclareRelationFont} or \cs{SetRelationFont}.
-Like \cs{fontfamily}, \cs{selectfont} is required to take an effect.
+(Only)~at the next call of \cs{selectfont},
+ change current alphabetic font encoding/family/\dots\ to the `accompanied' alphabetic
+ font family with respect to current Japanese font family,
+ which was set by
+ \cs{DeclareRelationFont} or \cs{SetRelationFont}.
%</en>
%<*ja>
-現在の欧文フォントのエンコーディング／ファミリ／…… を，
+次回（のみ）の\cs{selectfont}の実行時に，現在の欧文フォントのエンコーディング／ファミリ／…… を，
\cs{DeclareRelationFont} か \cs{SetRelationFont} で指定された
現在の和文フォントに対応する「従属欧文」フォントに変更する．
-\cs{fontfamily} のように，有効にするためには \cs{selectfont} が必要である．
%</ja>
\item[\cs{adjustbaseline}]
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2017-11-12 22:22:37 UTC (rev 45761)
@@ -113,6 +113,7 @@
% \changes{v1.7e-ltj-15}{2017/08/31}{本ドキュメントのタイプセットで，小塚フォントが存在するときには
% それを用いるように変更（PDFサイズ削減のため）．}
% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更}
+% \changes{v1.7g}{2017/09/19}{内部処理で使ったボックス0を空にした}
% \fi
%
% \iffalse
@@ -142,7 +143,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -708,6 +709,7 @@
% されています。基準とする文字を「全角空白」（EUCコード\texttt{0xA1A1}）から
% 「漢」（JISコード\texttt{0x3441}）へ変更しました。
% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更}
+% \changes{v1.7g}{2017/09/19}{内部処理で使ったボックス0を空にした}
% \begin{macrocode}
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
@@ -715,6 +717,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1954,7 +1957,7 @@
%
% \pstyle{jpl at in}スタイルは、クラスファイル内部で使用するものです。
% \LaTeX{}では、bookクラスを\pstyle{headings}としています。
-% しかし、\cs{tableofcontnts}コマンドの内部では\pstyle{plain}として
+% しかし、\cs{tableofcontents}コマンドの内部では\pstyle{plain}として
% 設定されるため、一つの文書でのページ番号の位置が上下に出力される
% ことになります。
%
@@ -2520,8 +2523,8 @@
%\newcommand*{\sectionmark}[1]{}
%\newcommand*{\subsectionmark}[1]{}
%\newcommand*{\subsubsectionmark}[1]{}
-%\newcommand*{\paragraph}[1]{}
-%\newcommand*{\subparagraph}[1]{}
+%\newcommand*{\paragraphmark}[1]{}
+%\newcommand*{\subparagraphmark}[1]{}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2589,10 +2592,10 @@
% |\alph{|\Lcount{COUNTER}|}|は、\Lcount{COUNTER}の値を
% $1=$~a, $2=$~b のようにして出力します。
%
-% |\Roman{|\Lcount{COUNTER}|}|は、\Lcount{COUNTER}の値を
+% |\Alph{|\Lcount{COUNTER}|}|は、\Lcount{COUNTER}の値を
% $1=$~A, $2=$~B のようにして出力します。
%
-% |\kansuji{|\Lcount{COUNTER}|}|は、\Lcount{COUNTER}の値を
+% |\Kanji{|\Lcount{COUNTER}|}|は、\Lcount{COUNTER}の値を
% 漢数字で出力します。
%
% |\rensuji{|\meta{obj}|}|は、\meta{obj}を横に並べて出力します。
@@ -4000,10 +4003,12 @@
% |\@tempdima|にしていますが、この変数はいろいろな箇所で使われますので、
% 期待した値が入らない場合があります。
%
-% たとえば、|lltjfont.sty|での|\selectfont|は、和欧文のベースラインを調整する
-% ために|\@tempdima|変数を用いています。そのため、|\l at ...|マクロの中で
-% フォントを切替えると、|\numberline|マクロのボックス
-% の幅が、ベースラインを調整するときに計算した値になってしまいます。
+% ^^A たとえば、|lltjfont.sty|での|\selectfont|は、和欧文のベースラインを調整する
+% ^^A ために|\@tempdima|変数を用いています。そのため、|\l at ...|マクロの中で
+% ^^A フォントを切替えると、|\numberline|マクロのボックス
+% ^^A の幅が、ベースラインを調整するときに計算した値になってしまいます。
+% ^^A →修正(texjporg)：最近の|\adjustbaseline|では|\adjust at dimen|が使われて
+% ^^A いるため、記述をコメントアウトしました。
%
% フォント選択コマンドの後、あるいは|\numberline|マクロの中でフォントを
% 切替えてもよいのですが、一時変数を意識したくないので、
@@ -4042,9 +4047,9 @@
% \end{macro}
%
% \begin{macro}{\addcontentsline}
-% ページ番号を|\rensuji|で囲むように変更します。
-% 横組のときにも`|\rensuji|'コマンドが出力されますが、
-% このコマンドによる影響はありません。
+% 縦組の場合にページ番号を|\rensuji|で囲むように変更します。
+% ^^A 横組のときにも`|\rensuji|'コマンドが出力されますが、
+% ^^A このコマンドによる影響はありません。
%
% このマクロは\file{ltsect.dtx}で定義されています。
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx 2017-11-12 22:22:37 UTC (rev 45761)
@@ -37,12 +37,14 @@
% \changes{v1.0b}{1997/07/29}{\cs{}と\texttt{"}の\cs{xspcode}を変更}
% \changes{v1.0b-ltj}{2011/09/27}{Lua\LaTeX-ja 用に修正}
% \changes{v1.0b-ltj-2}{2014/07/03}{orを意味する縦棒の出力が異常だったので修正}
+% \changes{v1.0c}{2016/07/25}{docパッケージが上書きする\cs{verb}を再々定義}
+% \changes{v1.0d}{2017/09/24}{\cs{vadjust\{\}}を追加}
% \fi
%
% \iffalse
%<class>
%<class>\NeedsTeXFormat{LaTeX2e}
-%<class>\ProvidesClass{ltjltxdoc}[2011/10/03 v1.0b-ltj Standard LuaLaTeX-ja file]
+%<class>\ProvidesClass{ltjltxdoc}[2017/09/24 v1.0d-ltj-2 Standard LuaLaTeX-ja file]
%<*driver>
\documentclass{ltjltxdoc}
\GetFileInfo{ltjltxdoc.cls}
@@ -178,6 +180,28 @@
% \end{macrocode}
% \end{environment}
%
+% \begin{macro}{\verb}
+% p\LaTeX{}では、|\verb|コマンドを修正して直前に|\xkanjiskip|が入るように
+% しています。しかし、\file{ltxdoc.cls}が読み込む\file{doc.sty}が上書き
+% してしまいますので、これを再々定義します。\file{doc.sty}での定義は
+%\begin{verbatim}
+% \def\verb{\relax\ifmmode\hbox\else\leavevmode\null\fi
+% \bgroup \let\do\do at noligs \verbatim at nolig@list
+% \ttfamily \verb at eol@error \let\do\@makeother \dospecials
+% \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
+%\end{verbatim}
+% となっていますので、\file{plcore.dtx}と同様に|\null|を外して|\vadjust{}|を
+% 入れます。
+% \changes{v1.0c}{2016/07/25}{docパッケージが上書きする\cs{verb}を再々定義}
+% \changes{v1.0d}{2017/09/24}{\cs{vadjust\{\}}を追加}
+% \begin{macrocode}
+\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
+ \bgroup \let\do\do at noligs \verbatim at nolig@list
+ \ttfamily \verb at eol@error \let\do\@makeother \dospecials
+ \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{alxspmode}
% コマンド名の|\|と16進数を示すための|"|の前にもスペースが入るよう、
% これらの|alxspmode|の値を変更します。
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2017-11-12 22:22:37 UTC (rev 45761)
@@ -57,7 +57,7 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass{ltjsarticle}
@@ -1336,13 +1336,18 @@
% パラメータに実際の値を設定します。
% たとえば |\Cwd| は |\normalfont| の全角幅（|1\zw|）です。
%
+% [2017-08-31] 基準とする文字を「全角空白」（EUCコード\texttt{0xA1A1}）から
+% 「漢」（JISコード\texttt{0x3441}）へ変更しました。
+%
+% [2017-09-19] 内部的に使った |\box0| を空にします。
% \begin{macrocode}
-\setbox0\hbox{\char"3000}% 全角スペース
+\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
% \end{macrocode}
% \end{macro}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2017-11-12 22:22:37 UTC (rev 45761)
@@ -280,5 +280,15 @@
if v.kern and v.kern[0] then v.kern[100] = v.kern[0] end
end
end
+t[200]=table.fastcopy(t[0])
+t[200].chars={'〱', '〲'}
+t[200].width = 2.0
+t[200].left=-0.5
+for i,v in pairs(t) do
+ if type(v)=='table' then
+ if v.glue and v.glue[0] then v.glue[200] = v.glue[0] end
+ if v.kern and v.kern[0] then v.kern[200] = v.kern[0] end
+ end
+end
luatexja.jfont.define_jfm(t)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2017-11-12 22:22:37 UTC (rev 45761)
@@ -272,12 +272,12 @@
local traverse = node.direct.traverse
local function check_next_ickern(lp)
- if lp and getid(lp) == id_kern and ( getsubtype(lp)==3 or ITALIC == get_attr_icflag(lp)) then
- set_attr(lp, attr_icflag, IC_PROCESSED);
- Np.last = lp; return node_next(lp)
- else
- Np.last = Np.nuc; return lp
+ local lx = Np.nuc
+ while lp and getid(lp) == id_kern and ( getsubtype(lp)==3 or ITALIC == get_attr_icflag(lp)) do
+ set_attr(lp, attr_icflag, IC_PROCESSED);
+ lx, lp = lp, node_next(lp)
end
+ Np.last = lx; return lp
end
local function calc_np_pbox(lp, last)
@@ -569,16 +569,17 @@
local attr_jchar_code = luatexbase.attributes['ltj at charcode']
local attr_autospc = luatexbase.attributes['ltj at autospc']
local attr_autoxspc = luatexbase.attributes['ltj at autoxspc']
+ local getcomponents = node.direct.getcomponents
--local ltjf_get_vert_glyph = ltjf.get_vert_glyph
function set_np_xspc_jachar(Nx, x)
local m = ltjf_font_metric_table[getfont(x)]
- local c, c_glyph = ltjs_orig_char_table[x], getchar(x)
+ local c, c_glyph = (not getcomponents(x) and ltjs_orig_char_table[x]), getchar(x)
+ if c and c~=c_glyph then set_attr(x, attr_jchar_code, c) end
c = c or c_glyph
local cls = slow_find_char_class(c, m, c_glyph)
Nx.met, Nx.class, Nx.char = m, cls, c;
local mc = m.char_type; Nx.char_type = mc
if cls~=0 then set_attr(x, attr_jchar_class, cls) end
- if c~=c_glyph then set_attr(x, attr_jchar_code, c) end
Nx.pre = table_current_stack[PRE + c] or 0
Nx.post = table_current_stack[POST + c] or 0
Nx.xspc = table_current_stack[XSP + c] or 3
@@ -603,9 +604,9 @@
function set_np_xspc_alchar(Nx, c,x, lig)
if c~=-1 then
local f = (lig ==1) and nullfunc or node_tail
- local xc, xs = getfield(x, 'components'), getsubtype(x)
+ local xc, xs = getcomponents(x), getsubtype(x)
while xc and xs and xs%4>=2 do
- x = f(xc); xc, xs = getfield(x, 'components'), getsubtype(x)
+ x = f(xc); xc, xs = getcomponents(x), getsubtype(x)
end
c = getchar(x)
Nx.pre = table_current_stack[PRE + c] or 0
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-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 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -39,6 +39,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -39,6 +39,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -39,6 +39,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ltjltxdoc}[2011/10/03 v1.0b-ltj Standard LuaLaTeX-ja file]
+\ProvidesClass{ltjltxdoc}[2017/09/24 v1.0d-ltj-2 Standard LuaLaTeX-ja file]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ltxdoc}}
\ProcessOptions
\LoadClass{ltxdoc}
@@ -82,6 +82,10 @@
\vskip.5\baselineskip
\hrule height.1pt\egroup
\hss\vrule width.1pt\egroup}
+\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
+ \bgroup \let\do\do at noligs \verbatim at nolig@list
+ \ttfamily \verb at eol@error \let\do\@makeother \dospecials
+ \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
\ltjsetparameter{alxspmode={"5C,3}} %% \
\ltjsetparameter{alxspmode={"22,3}} %% "
\def\mod at math@codes{\mathcode`\|="207C \mathcode`\&="2026
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-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 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc at clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -415,12 +415,13 @@
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
\mcfamily\selectfont\normalsize
-\setbox0\hbox{\char"3000}% 全角スペース
+\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc at setfontsize\small\@ixpt{11}}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc at clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -423,12 +423,13 @@
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
\mcfamily\selectfont\normalsize
-\setbox0\hbox{\char"3000}% 全角スペース
+\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc at setfontsize\small\@ixpt{11}}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -39,6 +39,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -39,6 +39,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -39,6 +39,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc at clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -415,12 +415,13 @@
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
\mcfamily\selectfont\normalsize
-\setbox0\hbox{\char"3000}% 全角スペース
+\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc at setfontsize\small{8.8888}{11}}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc at clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -414,12 +414,13 @@
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
\mcfamily\selectfont\normalsize
-\setbox0\hbox{\char"3000}% 全角スペース
+\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc at setfontsize\small\@ixpt{11}}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc at clsname{ltjsreport}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -419,12 +419,13 @@
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
\mcfamily\selectfont\normalsize
-\setbox0\hbox{\char"3000}% 全角スペース
+\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc at setfontsize\small\@ixpt{11}}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-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 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -41,6 +41,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -41,6 +41,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -41,6 +41,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-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 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -41,6 +41,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -41,6 +41,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2017-11-12 22:22:37 UTC (rev 45761)
@@ -23,7 +23,7 @@
%% File: ltjclasses.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2017/08/31 v1.7f-ltj-15
+ [2017/09/19 v1.7g-ltj-15
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -41,6 +41,7 @@
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb at x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2017-11-12 22:22:37 UTC (rev 45761)
@@ -65,7 +65,7 @@
\expandafter\let\csname ifltj at in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2017/05/05 Core of LuaTeX-ja]
+ \ProvidesPackage{luatexja-core}[2017/11/12 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua 2017-11-12 22:22:37 UTC (rev 45761)
@@ -410,9 +410,9 @@
local base = prefix .. string.format('%X', get_attr_icflag(p))
.. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' '
if pt == 'glyph' then
- s = base .. ' ' .. utf.char(p.char) .. ' '
- .. tostring(p.font)
- .. ' (' .. print_scaled(p.height) .. '+'
+ s = base .. ' ' ..
+ (p.char>=0xF0000 and string.format('(U+%X)', p.char) or utf.char(p.char)) .. ' '
+ .. tostring(p.font) .. ' (' .. print_scaled(p.height) .. '+'
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
if p.xoffset~=0 or p.yoffset~=0 then
s = s .. ' off: (' .. print_scaled(p.xoffset)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2017-11-12 22:22:37 UTC (rev 45761)
@@ -34,10 +34,10 @@
\expandafter\let\csname ifltj at in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2017/05/05 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2017/11/12 Japanese Typesetting with Lua(La)TeX]
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20170904.0}
+\def\LuaTeXjaversion{20171112.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
Deleted: trunk/Master/texmf-dist/tex/luatex/luatexja/max_perf_pct
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/max_perf_pct 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/max_perf_pct 2017-11-12 22:22:37 UTC (rev 45761)
@@ -1 +0,0 @@
-100
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2017-11-12 22:22:37 UTC (rev 45761)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2017/08/27 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2017/11/12 Patch to LaTeX2e Kernel for LuaTeX-ja]
\RequirePackage{etoolbox}
\def\cleardoublepage{\clearpage\if at twoside
@@ -183,8 +183,9 @@
\@latex at warning{Reference `#3' on page \thepage \space
undefined}%
\else
- \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{}
+ \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{}
\fi}
+\gdef\@setref@{\ifhmode\spacefactor\@m\fi}
\endgroup
\if at compatibility\else
\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2017-11-12 22:22:37 UTC (rev 45761)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2017/05/05 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2017/11/12 Default font settings of LuaTeX-ja]
\def\ltj at stdmcfont{IPAExMincho}
\def\ltj at stdgtfont{IPAExGothic}
@@ -43,6 +43,13 @@
\DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
\KanjiEncodingPair{JY3}{JT3}
+\DeclareRelationFont{JY3}{gt}{m}{}{TU}{lmr}{bx}{}
+\DeclareRelationFont{JY3}{mc}{m}{}{TU}{lmr}{m}{}
+\DeclareRelationFont{JY3}{mc}{bx}{}{TU}{lmr}{bx}{}
+\DeclareRelationFont{JT3}{gt}{m}{}{TU}{lmr}{bx}{}
+\DeclareRelationFont{JT3}{mc}{m}{}{TU}{lmr}{m}{}
+\DeclareRelationFont{JT3}{mc}{bx}{}{TU}{lmr}{bx}{}
+
\kanjiencoding{JY3}\selectfont\adjustbaseline
\DeclareTextFontCommand{\textmc}{\mcfamily}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty 2017-11-12 22:22:03 UTC (rev 45760)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty 2017-11-12 22:22:37 UTC (rev 45761)
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-unicode-math}[2017/05/05 Patch to unicode-math for LuaTeX-ja]
+\ProvidesPackage{lltjp-unicode-math}[2017/11/12 Patch to unicode-math for LuaTeX-ja]
\RequirePackage{unicode-math,luatexja}
@@ -11,9 +11,9 @@
\group_begin:
\bool_new:N \lltjp_um_patch_mathgroup_bool
-\@ifpackagelater{unicode-math}{2015/09/24}{%
-%%%%%%%% 2015/09/24 0.8c
\bool_set_true:N \lltjp_um_patch_mathgroup_bool
+%% Recent unicode-math (2017-10-02, v0.8g) does not have \ProvidesPackage,
+%% So we can't use the date option of \@ifpackageloaded.
\cs_gset:Nn \__um_define_math_chars: {
\group_begin:
\cs_set:Npn \__um_sym:nnn ##1##2##3
@@ -29,30 +29,11 @@
\__um_input_math_symbol_table:
\group_end:
}
-}{
- \cs_if_exist:cTF { __um_cs_set_eq_active_char:Nw } {
- \tl_set:Nn \l_tmpa_tl { __um_cs_set_eq_active_char:Nw }
- \bool_set_true:N \lltjp_um_patch_mathgroup_bool
- }{
- \tl_set:Nn \l_tmpa_tl { um_cs_set_eq_active_char:Nw }
- }
- \cs_gset:cpn { \tl_use:N \l_tmpa_tl } #1 = "#2 \q_nil {%"
- \group_begin:
- %\typeout {um: \string#1, \int_from_hex:n {#2}, #2}% <- for debug
- \char_set_lccode:nn { `! } { "#2 }%"
- \tex_lowercase:D {
- \tl_set:Nn \l_tmpa_tl { \relax
- \ifmmode!\else{\directlua{tex.globaldefs = 0}\ltj at allalchar!}\fi}
- \cs_gset_eq:NN #1 \l_tmpa_tl
- }
- \ltjsetmathletter{ \int_from_hex:n {#2} }
- \group_end:
- }
-}
\bool_if:NT \lltjp_um_patch_mathgroup_bool {
\cs_gset:Npn \use at mathgroup #1 #2
{
+ %\typeout{UM <#1><#2>}
\mode_if_math:T % <- not sure if this is really necessary since we've just checked for mmode and raised an error if not!
{
\math at bgroup
More information about the tex-live-commits
mailing list