summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-30 21:24:35 +0000
committerKarl Berry <karl@freefriends.org>2018-09-30 21:24:35 +0000
commitc322d486f6c0e00e12b18e89864114f99f5e7196 (patch)
treedd85c01165b42b3c4994a2186216f82c5f236c0f
parent0e00fb64c271b0107e65fdf601df25e39f61b57f (diff)
luatexja (30sep18)
git-svn-id: svn://tug.org/texlive/trunk@48793 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/README8
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdfbin460985 -> 460977 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdfbin835037 -> 835356 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx18
-rw-r--r--Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx24
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty55
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/lltjext.sty28
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua8
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty8
15 files changed, 106 insertions, 92 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index b0871f76975..795335d28ba 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20180922.1
+The LuaTeX-ja Package 20180930.0
--------------------------------
Copyright (c) 2011--2018 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -40,9 +40,9 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20180922.1 in the Git repository by
+ or tagged as 20180930.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20180922.1;sf=tgz>
+ ;a=snapshot;h=refs/tags/20180930.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -87,4 +87,4 @@ Notes
* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
-Last commit date: Sat Sep 22 20:26:32 2018 +0900
+Last commit date: Sun Sep 30 20:54:11 2018 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index d6fc5743d98..ab4b5a87290 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index 7c289c89e48..7ebd389671e 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
index 7c27d29b680..5f8441f36be 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
@@ -7465,9 +7465,14 @@ In this case, one can use \cs{setmainfont} etc.\ to select \emph{alphabetic} fon
%</en>
%<*ja>
\LaTeX 標準のフォント選択機構(NFSS2)を用いて
-\texttt{ltjpm}(明朝),\texttt{ltjpg}(ゴシック),それに後に述べる \texttt{deluxe} オプ
- ションが指定された場合には \texttt{ltjpmg}(丸ゴシック)という
-3つの和文フォントファミリを定義し,これらを用いる.
+\texttt{ltjpm}$n$(明朝),\texttt{ltjpg}$n$(ゴシック),
+それに後に述べる\texttt{deluxe}オプションが指定された場合には
+\texttt{ltjpmg}$n$(丸ゴシック)という
+和文フォントファミリを定義%
+\footnote{%
+ $n$は自然数であり,\cs{ltjapplypreset}の実行(この命令は\Pkg{luatexja-preset}パッケージ
+ 読み込み時に自動的に実行される)ごとに増加していく.
+}し,これらを用いる.
本オプション指定時には\Pkg{fontspec}・\Pkg{luatexja-fontspec}パッケージは
自動では読み込まれない,しかし,
@@ -7477,9 +7482,10 @@ In this case, one can use \cs{setmainfont} etc.\ to select \emph{alphabetic} fon
\end{lstlisting}
のようにすれば,このオプションを指定すれば
欧文フォントを\Pkg{fontspec}パッケージの機能を使って指定することができる.
-一方,
-パッケージ読み込み時に既に\Pkg{luatexja-fontspec}パッケージが読み込まれて
- いる場合は \texttt{nfssonly} オプションは無視される.
+
+一方,\Pkg{luatexja-preset}パッケージ読み込み時に
+既に\Pkg{luatexja-fontspec}パッケージが読み込まれている場合は
+\texttt{nfssonly}オプションは無視される.
%</ja>
\item[match]
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
index 8709f418693..ebe2c0c1c8a 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
@@ -44,7 +44,7 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass{ltjsarticle}
@@ -188,8 +188,10 @@
%
% \section{Lua\TeX-jaの読み込み}
%
-% まず,Lua\TeX-jaを読み込みます。
+% 和文スケール値を設定した後に,Lua\TeX-jaを読み込みます。
% \begin{macrocode}
+%<!jspf>\def\Cjascale{0.924715}
+%<jspf>\def\Cjascale{0.903375}
\RequirePackage{luatexja}
% \end{macrocode}
%
@@ -954,9 +956,6 @@
% [2017-12-31] 和文スケール($1\,\mathrm{zw} \div \hbox{要求サイズ}$)を
% 表す実数値マクロ |\Cjascale| を定義しました。
%
-% \begin{macrocode}
-%<!jspf> \def\Cjascale{0.924715}
-% \end{macrocode}
%
% これにより,公称10ポイントの和文フォントを0.924715倍したことにより,
% 約9.25ポイント,
@@ -967,12 +966,16 @@
% 和文フォントをPostScriptの9ポイントにするために,
% $0.9*72.27/72 \simeq 0.903375$ 倍します。
%
-% \begin{macrocode}
-%<jspf> \def\Cjascale{0.903375}
-% \end{macrocode}
+% [2018-09-23 LTJ] 実際の|\Cjascale|の定義はLua\TeX-jaの読み込み前に移動しました.
+% こうすることによって「0.962216倍された和文フォント」という実際には使われない和文フォントを
+% 読み込む必要がなくなります.
+%
%
% 実際にフォントの再定義を行う部分です.
%
+% [2018-09-23 LTJ] |\Cjascale|の設定を前倒ししたことに伴い,実際の再定義は
+% \texttt{mingoth}, \texttt{ptexjis}のときしか必要なくなりました.
+%
% \begin{macrocode}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
@@ -982,13 +985,8 @@
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{}
% \end{macrocode}
%
% 和文でイタリック体,斜体,サンセリフ体,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index c3a121b8c26..b4681e91997 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
% luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2018/09/09 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2018/09/30 Japanese font presets]
\RequirePackage{expl3,l3keys2e}
\RequirePackage{luatexja}
@@ -109,7 +109,8 @@
\prop_put:Nnn \g_ltjpreset_font_prop { gt-u } {#1}
\prop_put:Nnn \g_ltjpreset_font_prop { gt-d } {#1},
% gt-d, gt-u は隠し
- gt .groups:n = { preset }, gt .value_required:n = true,
+ gt .groups:n = { preset }, gt .value_required:n = true,
+ gt-m .groups:n = { preset }, gt-m .value_required:n = true,
}
\cs_set:Nn \g_ltjpreset_tmp_cs:n {
\keys_define:nn { luatexja-preset } {
@@ -447,6 +448,8 @@
\cs_set_eq:NN \ltjpreset_check_deluxe_existence: \prg_do_nothing:
}
+\int_new:N \g_ltjpreset_applycount_int
+
\bool_if:NTF \g_ltjpreset_nfssonly_bool {
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%% nfss only
@@ -460,46 +463,56 @@
\msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale }
\cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn {
- \cs_if_exist:cT { #1/#2/#3/#4/10 } { \cs_undefine:c { #1/#2/#3/#4/10 } }
\DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\Cjascale]
{ \bool_if:NT \g_ltjpreset_noembed_bool {psft:} #5
;-kern \tl_use:N \l_ltjpreset_kanji_shape_tl; #6 } } {}
}
\cs_new:Nn \ltj_preset_define_family:nnn {
- \ltj_preset_declare_font_shape:nnnnnn { JY3 } { #1 } { #2 } { n }
+ \ltj_preset_declare_font_shape:nnnnnn { JY3 }
+ { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { n }
{ "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl }
{ script=hani \bool_if:NT \g_ltjpreset_expert_bool { ;+hkna } }
- \ltj_preset_declare_font_shape:nnnnnn { JT3 } { #1 } { #2 } { n }
+ \ltj_preset_declare_font_shape:nnnnnn { JT3 }
+ { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { n }
{ "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl }
{ script=hani \bool_if:NT \g_ltjpreset_expert_bool { ;+vkna } }
\bool_if:NT \g_ltjpreset_expert_bool {
- \ltj_preset_declare_font_shape:nnnnnn { JY3 } { #1 } { #2 } { rb }
+ \ltj_preset_declare_font_shape:nnnnnn { JY3 }
+ { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { rb }
{ "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl } { script=kana; +ruby }
- \ltj_preset_declare_font_shape:nnnnnn { JT3 } { #1 } { #2 } { rb }
+ \ltj_preset_declare_font_shape:nnnnnn { JT3 }
+ { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { rb }
{ "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl } { script=kana; +ruby }
}
}
-
- \DeclareKanjiFamily{JY3}{ltjpm}{}\DeclareKanjiFamily{JT3}{ltjpm}{}
- \DeclareKanjiFamily{JY3}{ltjpg}{}\DeclareKanjiFamily{JT3}{ltjpg}{}
- \def\mcdefault{ltjpm}\def\gtdefault{ltjpg}
- \SetSymbolFont{mincho}{normal}{JY3}{ltjpm}{m}{n}
- \SetSymbolFont{mincho}{bold}{JY3}{ltjpm}{bx}{n}
- \DeclareMathAlphabet{\mathgt}{JY3}{ltjpg}{m}{n}
- \bool_if:NT \g_ltjpreset_expert_bool {
- \DeclareRobustCommand\rubyfamily { \kanjishape{rb}\selectfont }
- }
-
\bool_if:NT \g_ltjpreset_deluxe_bool {
- \DeclareKanjiFamily{JY3}{ltjpmg}{}\DeclareKanjiFamily{JT3}{ltjpmg}{}
\let\mgfamily\undefined
\DeclareRobustCommand\mgfamily {
- \not@math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont
+ \not@math@alphabet\mgfamily\relax
+ \kanjifamily{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}\selectfont
}
\DeclareTextFontCommand{\textmg}{\mgfamily}
}
+ \bool_if:NT \g_ltjpreset_expert_bool {
+ \DeclareRobustCommand\rubyfamily { \kanjishape{rb}\selectfont }
+ }
%
\cs_new:Nn \ltjpreset_do_fontset: { \group_begin:
+ % ======
+ \xdef\mcdefault{ltjpm \int_to_arabic:n { \g_ltjpreset_applycount_int }}
+ \xdef\gtdefault{ltjpg \int_to_arabic:n { \g_ltjpreset_applycount_int }}
+ \DeclareKanjiFamily{JY3}{\mcdefault}{}
+ \DeclareKanjiFamily{JT3}{\mcdefault}{}
+ \DeclareKanjiFamily{JY3}{\gtdefault}{}
+ \DeclareKanjiFamily{JT3}{\gtdefault}{}
+ \SetSymbolFont{mincho}{normal}{JY3}{\mcdefault}{m}{n}
+ \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{bx}{n}
+ \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{m}{n}
+ \bool_if:NT \g_ltjpreset_deluxe_bool {
+ \DeclareKanjiFamily{JY3}{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}{}
+ \DeclareKanjiFamily{JT3}{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}{}
+ }
+ % ======
\tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
\tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
\tl_set:Nn \l_ltjpreset_kanji_shape_tl { ;+jp90 }
@@ -601,7 +614,9 @@
}
}
+
\cs_set:Npn \ltjapplypreset #1 {
+ \int_gincr:N \g_ltjpreset_applycount_int
\keys_set_groups:nnn { luatexja-preset } { preset } { #1 }
% \prop_map_inline:Nn \g_ltjpreset_font_prop {\typeout{ [##1] = "##2" } }
\ltjpreset_extract_fonts:
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
index 49151f5517d..9c6867f2264 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2018/09/22 v1.2j-ltj-9 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2018/09/29 v1.2j-ltj-10 Macros for vertical writing]
\RequirePackage{luatexja}
\newcount\ltj@ext@dir
\let\ltj@lltjext@orig@tabular=\tabular
@@ -670,13 +670,27 @@
{\ltj@ext@dir=\ltjgetparameter{direction}\relax}{}{}
\expandafter\let\csname tabular*\endcsname=\ltj@lltjext@orig@tabularS
\patchcmd{\p@stabular}{\p@tabular}{\@tabular}{}{}
+ \@ifpackagelater{array}{2018/09/13}
+ {\expandafter\@firstoftwo}
+ {\expandafter\@secondoftwo}
+ {% = for 2018/09/13 v2.4i or newer
\def\@startpbox##1{\bgroup
- \box@dir\adjustbaseline%%% これを追加
- \setlength\hsize{##1}\@arrayparboxrestore
- \everypar{%
- \vrule \@height \ltjgetht\@arstrutbox \@width \z@
- \everypar{}}%
- }
+ \color@begingroup
+ \box@dir\adjustbaseline%%% これを追加
+ \setlength\hsize{##1}\@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ltjgetht\@arstrutbox \@width \z@
+ \everypar{}}%
+ }%
+ }{ % = for 2018/04/30 v2.4h or older
+ \def\@startpbox##1{\bgroup
+ \box@dir\adjustbaseline%%% これを追加
+ \setlength\hsize{##1}\@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ltjgetht\@arstrutbox \@width \z@
+ \everypar{}}%
+ }%
+ }%
\def\@tabarray{\@ifnextchar<\p@tabarray{\p@tabarray<z>}}
\def\p@array<##1>[##2]##3{%
\let\box@dir\relax
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
index b1688235ab8..3dff4e6848c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
@@ -3,7 +3,7 @@
--
luatexbase.provides_module({
name = 'luatexja.ruby',
- date = '2018/02/18',
+ date = '2018/09/29',
description = 'Ruby annotation',
})
luatexja.ruby = {}
@@ -67,6 +67,7 @@ luatexja.userid_table.RUBY_PRE = luatexbase.newuserwhatsitid('ruby_pre', 'luate
luatexja.userid_table.RUBY_POST = luatexbase.newuserwhatsitid('ruby_post', 'luatexja')
local RUBY_PRE = luatexja.userid_table.RUBY_PRE
local RUBY_POST = luatexja.userid_table.RUBY_POST
+local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
----------------------------------------------------------------
-- TeX interface 0
@@ -144,6 +145,9 @@ end
local concat
do
local node_prev = node.direct.getprev
+ local function get_attr_icflag(p)
+ return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+ end
function concat(f, b)
if f then
if b then
@@ -151,6 +155,8 @@ do
if getid(nh)==id_whatsit and getsubtype(nh)==sid_user then
nh=node_next(nh); node_free(node_prev(nh))
end
+ set_attr(nh, attr_icflag,
+ get_attr_icflag(nh) + PROCESSED_BEGIN_FLAG)
setfield(node_tail(h), 'next', nh)
setfield(f, 'head', nil); node_free(f)
setfield(b, 'head', nil); node_free(b)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index d844d1260dd..56cd0c76ec3 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc@clsname{ltjsarticle}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -307,7 +308,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength{\pageheight}{\paperheight}
\fi
\fi
- \def\Cjascale{0.924715}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
@@ -316,13 +316,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index 60112800f80..4032c340aa9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc@clsname{ltjsbook}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -315,7 +316,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength{\pageheight}{\paperheight}
\fi
\fi
- \def\Cjascale{0.924715}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
@@ -324,13 +324,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index e3ca08f93b6..755718014d0 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -307,7 +308,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength{\pageheight}{\paperheight}
\fi
\fi
- \def\Cjascale{0.924715}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
@@ -316,13 +316,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index 1e5210afa2e..a380ba9c670 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc@clsname{ltjspf}
+\def\Cjascale{0.903375}
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -306,7 +307,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength{\pageheight}{\paperheight}
\fi
\fi
- \def\Cjascale{0.903375}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
@@ -315,13 +315,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
index 70f8dd0b89f..ec151b4aa1b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc@clsname{ltjsreport}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -311,7 +312,6 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\setlength{\pageheight}{\paperheight}
\fi
\fi
- \def\Cjascale{0.924715}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=min}{}
@@ -320,13 +320,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj@stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj@stdgtfont:jfm=ujisv}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{b}{n}{<->ssub*gt/m/n}{}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 5398a0f8d8a..fb37eed3a8f 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}[2018/09/22 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2018/09/30 Japanese Typesetting with Lua(La)TeX]
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20180922.0}
+\def\LuaTeXjaversion{20180930.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index 09c54eaf94e..c497f215f06 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
@@ -29,18 +29,18 @@
\newcommand\kanjishapedefault{\updefault}
\DeclareKanjiFamily{JY3}{mc}{}
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[0.962216] \ltj@stdmcfont:jfm=ujis}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=ujis}{}
\DeclareKanjiFamily{JY3}{gt}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujis}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=ujis}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{b}{n}{<-> ssub*mc/bx/n}{}
\DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/bx/n}{}
\DeclareKanjiFamily{JT3}{mc}{}
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[0.962216] \ltj@stdmcfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=ujisv}{}
\DeclareKanjiFamily{JT3}{gt}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=ujisv}{}
\DeclareFontShape{JT3}{mc}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
\DeclareFontShape{JT3}{mc}{b}{n}{<-> ssub*mc/bx/n}{}