texlive[48793] Master/texmf-dist: luatexja (30sep18)
commits+karl at tug.org
commits+karl at tug.org
Sun Sep 30 23:24:35 CEST 2018
Revision: 48793
http://tug.org/svn/texlive?view=revision&revision=48793
Author: karl
Date: 2018-09-30 23:24:35 +0200 (Sun, 30 Sep 2018)
Log Message:
-----------
luatexja (30sep18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
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/ltjsclasses.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
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/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/luatexja.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2018-09-30 21:24:35 UTC (rev 48793)
@@ -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 @@
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 @@
* 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
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2018-09-30 21:24:35 UTC (rev 48793)
@@ -7465,9 +7465,14 @@
%</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 @@
\end{lstlisting}
のようにすれば，このオプションを指定すれば
欧文フォントを\Pkg{fontspec}パッケージの機能を使って指定することができる．
-一方，
-パッケージ読み込み時に既に\Pkg{luatexja-fontspec}パッケージが読み込まれて
- いる場合は \texttt{nfssonly} オプションは無視される．
+
+一方，\Pkg{luatexja-preset}パッケージ読み込み時に
+既に\Pkg{luatexja-fontspec}パッケージが読み込まれている場合は
+\texttt{nfssonly}オプションは無視される．
%</ja>
\item[match]
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-09-30 21:24:35 UTC (rev 48793)
@@ -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 at stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=ujisv}{}
% \end{macrocode}
%
% 和文でイタリック体，斜体，サンセリフ体，
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty 2018-09-30 21:24:35 UTC (rev 48793)
@@ -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 at math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont
+ \not at 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:
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2018-09-30 21:24:35 UTC (rev 48793)
@@ -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 at ext@dir
\let\ltj at lltjext@orig at tabular=\tabular
@@ -670,13 +670,27 @@
{\ltj at ext@dir=\ltjgetparameter{direction}\relax}{}{}
\expandafter\let\csname tabular*\endcsname=\ltj at lltjext@orig at tabularS
\patchcmd{\p at stabular}{\p at tabular}{\@tabular}{}{}
+ \@ifpackagelater{array}{2018/09/13}
+ {\expandafter\@firstoftwo}
+ {\expandafter\@secondoftwo}
+ {% = for 2018/09/13 v2.4i or newer
\def\@startpbox##1{\bgroup
- \box at dir\adjustbaseline%%% これを追加
- \setlength\hsize{##1}\@arrayparboxrestore
- \everypar{%
- \vrule \@height \ltjgetht\@arstrutbox \@width \z@
- \everypar{}}%
- }
+ \color at begingroup
+ \box at 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 at dir\adjustbaseline%%% これを追加
+ \setlength\hsize{##1}\@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ltjgetht\@arstrutbox \@width \z@
+ \everypar{}}%
+ }%
+ }%
\def\@tabarray{\@ifnextchar<\p at tabarray{\p at tabarray<z>}}
\def\p at array<##1>[##2]##3{%
\let\box at dir\relax
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua 2018-09-30 21:24:35 UTC (rev 48793)
@@ -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_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 @@
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 @@
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)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2018-09-30 21:24:35 UTC (rev 48793)
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc at clsname{ltjsarticle}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -307,7 +308,6 @@
\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 at stdmcfont:jfm=min}{}
@@ -316,13 +316,8 @@
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at 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}{}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-09-30 21:24:35 UTC (rev 48793)
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc at clsname{ltjsbook}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -315,7 +316,6 @@
\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 at stdmcfont:jfm=min}{}
@@ -324,13 +324,8 @@
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at 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}{}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2018-09-30 21:24:35 UTC (rev 48793)
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc at clsname{ltjskiyou}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -307,7 +308,6 @@
\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 at stdmcfont:jfm=min}{}
@@ -316,13 +316,8 @@
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at 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}{}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-09-30 21:24:35 UTC (rev 48793)
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc at clsname{ltjspf}
+\def\Cjascale{0.903375}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -306,7 +307,6 @@
\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 at stdmcfont:jfm=min}{}
@@ -315,13 +315,8 @@
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at 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}{}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-09-30 21:24:35 UTC (rev 48793)
@@ -38,8 +38,9 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsreport}
- [2018/07/30 ltjsclasses ]
+ [2018/09/23 ltjsclasses ]
\def\jsc at clsname{ltjsreport}
+\def\Cjascale{0.924715}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -311,7 +312,6 @@
\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 at stdmcfont:jfm=min}{}
@@ -320,13 +320,8 @@
\ifptexjis
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=jis}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=jis}{}
- \else
- \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujis}{}
- \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at stdgtfont:jfm=ujis}{}
\fi
\fi
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [\Cjascale] \ltj at stdmcfont:jfm=ujisv}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [\Cjascale] \ltj at 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}{}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-09-30 21:24:35 UTC (rev 48793)
@@ -34,10 +34,10 @@
\expandafter\let\csname ifltj at 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
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2018-09-30 21:23:18 UTC (rev 48792)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2018-09-30 21:24:35 UTC (rev 48793)
@@ -29,9 +29,9 @@
\newcommand\kanjishapedefault{\updefault}
\DeclareKanjiFamily{JY3}{mc}{}
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[0.962216] \ltj at stdmcfont:jfm=ujis}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj at stdmcfont:jfm=ujis}{}
\DeclareKanjiFamily{JY3}{gt}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[0.962216] \ltj at stdgtfont:jfm=ujis}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj at 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}{}
@@ -38,9 +38,9 @@
\DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/bx/n}{}
\DeclareKanjiFamily{JT3}{mc}{}
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[0.962216] \ltj at stdmcfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj at stdmcfont:jfm=ujisv}{}
\DeclareKanjiFamily{JT3}{gt}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[0.962216] \ltj at stdgtfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj at 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}{}
More information about the tex-live-commits
mailing list