summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-12 22:22:37 +0000
committerKarl Berry <karl@freefriends.org>2017-11-12 22:22:37 +0000
commit6e968d3c70d693304b8e3669f22c21d2559d2c29 (patch)
tree5074a87398472d6d2e626c43096604dbcec71939 /Master/texmf-dist/tex/luatex/luatexja
parent61ef516740ec5cbb3e2cbc5b5c37821a46ac0e11 (diff)
luatexja (12nov17)
git-svn-id: svn://tug.org/texlive/trunk@45761 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua19
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/max_perf_pct1
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty5
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty27
33 files changed, 91 insertions, 71 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
index 182a682e8f5..029ff96cd37 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
@@ -280,5 +280,15 @@ for i,v in pairs(t) do
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)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index d33f032251d..ef05a671686 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -272,12 +272,12 @@ do
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 @@ do
local attr_jchar_code = luatexbase.attributes['ltj@charcode']
local attr_autospc = luatexbase.attributes['ltj@autospc']
local attr_autoxspc = luatexbase.attributes['ltj@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 @@ do
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
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
index 5bb91ec9c56..df7ebc5a020 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
@@ -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}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
index 93182b4a259..2731a1548ef 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
index c4f6ae9a0aa..585d5261476 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
index d737478c2c5..9c194c33747 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
index 522c2a06bce..f357985c342 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
@@ -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}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls
index 4ed46e11492..fc84c7f3423 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls
@@ -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@noligs \verbatim@nolig@list
+ \ttfamily \verb@eol@error \let\do\@makeother \dospecials
+ \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}}
\ltjsetparameter{alxspmode={"5C,3}} %% \
\ltjsetparameter{alxspmode={"22,3}} %% "
\def\mod@math@codes{\mathcode`\|="207C \mathcode`\&="2026
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
index f7acbcbdab3..4b81d838911 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
@@ -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}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index 372b3e08a6d..861be3783bd 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc@clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -415,12 +415,13 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\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@x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc@setfontsize\small\@ixpt{11}}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index c4bed839049..1974bb06d5c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc@clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -423,12 +423,13 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\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@x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc@setfontsize\small\@ixpt{11}}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
index e40a86288aa..43046857039 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
index 2ac58bbc647..8bfe83bd051 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
index 690b0e3dcc1..1cdef3d91fe 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index f0a3ee5ede6..4e30619f49f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -415,12 +415,13 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\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@x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc@setfontsize\small{8.8888}{11}}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index 238df1f09d8..29b846b93c1 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc@clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -414,12 +414,13 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\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@x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc@setfontsize\small\@ixpt{11}}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
index 7217c163465..bfd8c2b11b9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2017/09/04 ltjsclasses ]
+ [2017/09/19 ltjsclasses ]
\def\jsc@clsname{ltjsreport}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -419,12 +419,13 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\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@x
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
{\jsc@setfontsize\small\@ixpt{11}}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
index a7d1beaf9db..d8c7c11e33f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
@@ -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}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
index 520ecc4853a..77939b06991 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
index 5f60a8c54b1..d81230e0f65 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
index 94459f8ff38..30477ba0b9e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
index 161b643181d..3fad717d826 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
@@ -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}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
index de1ecbd0593..1e585703bec 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
@@ -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}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
index cbe302abed4..1fd238e2980 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
index 7d9e009fc99..181a556a2ff 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
index b495f23d838..13366afa2df 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
@@ -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@x
\newcommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
index 3ea21ca76e4..ee8012854b8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
@@ -65,7 +65,7 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2017/05/05 Core of LuaTeX-ja]
+ \ProvidesPackage{luatexja-core}[2017/11/12 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index 1df8d034f7b..422035edcce 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -410,9 +410,9 @@ local function debug_show_node_X(p,print_fn, limit)
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)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 2b6e459f393..f6946ebff59 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -34,10 +34,10 @@
\expandafter\let\csname ifltj@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
diff --git a/Master/texmf-dist/tex/luatex/luatexja/max_perf_pct b/Master/texmf-dist/tex/luatex/luatexja/max_perf_pct
deleted file mode 100644
index 29d6383b52c..00000000000
--- a/Master/texmf-dist/tex/luatex/luatexja/max_perf_pct
+++ /dev/null
@@ -1 +0,0 @@
-100
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
index 55c15372392..34ca8d3f613 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
@@ -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@twoside
@@ -183,8 +183,9 @@
\@latex@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@compatibility\else
\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index 22e0f9d565d..a592e731ea2 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
@@ -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@stdmcfont{IPAExMincho}
\def\ltj@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}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
index ec5aecfdd77..2642dd1e4f9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
@@ -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@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@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@bgroup