summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-26 21:18:32 +0000
committerKarl Berry <karl@freefriends.org>2019-09-26 21:18:32 +0000
commitc909c2b26109b8e71e2eeb5023939e084b7c0a2c (patch)
treef9722e6e84ed29907cf8f9bd8bf7716485cc76dd /Master/texmf-dist/tex/luatex/luatexja/addons
parent44e800e61d69915cd708ddf60825ce84965b7281 (diff)
luatexja (26sep19)
git-svn-id: svn://tug.org/texlive/trunk@52180 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty11
3 files changed, 10 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
index e98fbc7b952..b967926cb7d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2019/03/20 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2019/09/26 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
@@ -44,7 +44,7 @@
\ifx\csname \f@encoding+\f@family\endcsname\relax
\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
\ifin@\else % Alphabetic font
- \@font@info{Try loading font information for \f@encoding+\f@family}%
+ \@font@info{Trying loading font information for \f@encoding+\f@family}%
\global\expandafter\let
\csname\f@encoding+\f@family\endcsname\@empty
\nfss@catcodes
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
index 082468b97bc..e8cb01e4bba 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
@@ -64,7 +64,7 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-otf}[2017/05/20]
+ \ProvidesPackage{luatexja-otf}[2019/09/26]
\fi %</LaTeX>
% Load core module if not yet.
@@ -114,7 +114,7 @@
\fi
\let\ltj@@next=\@bou
\fi\ltj@@next}
- \long\def\mbox#1{\leavevmode\hbox{#1}}
+ \protected\long\def\mbox#1{\leavevmode\hbox{#1}}
\fi %</LaTeX>
% macros from otf.sty
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
index 813ab31a430..518d6ec8bd8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
@@ -4,7 +4,7 @@
% LaTeX only!
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-ruby}[2017/05/05 v0.23]
+\ProvidesPackage{luatexja-ruby}[2017/09/26 v0.23a]
\RequirePackage{luatexja}
%%------------------
@@ -152,7 +152,8 @@
}
\def\ltj@@ruby[#1]#2#3{{% #1: option #2: 親文字群,#3: ルビ文字列群,共に| 区切り
\setkeys[ltj]{ruby}{#1}%
- \directlua{ruby_tmplist_r = \string{\string}; ruby_tmplist_p = \string{\string}}%
+ \directlua{luatexja.ruby.ruby_tmplist_r = \string{\string};
+ luatexja.ruby.ruby_tmplist_p = \string{\string}}%
\leavevmode\dimen0=\f@size pt\dimen1=\ltj@@rubyip@size\dimen0%
% 引数展開,テーブルにセット
\pxrr@decompbar{#2}{\let\ltj@@ruby@mark\ltj@@ruby@sp\pxrr@res}%
@@ -160,16 +161,16 @@
{\fontsize{\ltj@@rubyip@size\dimen0}\z@\selectfont\ltj@@rubyip@fontcmd\global\dimen1=\zw}%
\directlua{%
luatexja.ruby.texiface(\ltj@@ruby@create@table{\dimen1},
- ruby_tmplist_r, ruby_tmplist_p)}%
+ luatexja.ruby.ruby_tmplist_r, luatexja.ruby.ruby_tmplist_p)}%
}}
\def\ltj@@ruby@sr#1{%
\setbox0=\hbox{\fontsize{\dimen1}\z@\ltj@@rubyip@fontcmd\selectfont#1}%
- \directlua{table.insert(ruby_tmplist_r, luatexja.ruby.cpbox())}%
+ \directlua{table.insert(luatexja.ruby.ruby_tmplist_r, luatexja.ruby.cpbox())}%
}
\def\ltj@@ruby@sp#1{%
\setbox0=\hbox{\selectfont#1}%
- \directlua{table.insert(ruby_tmplist_p, luatexja.ruby.cpbox())}%
+ \directlua{table.insert(luatexja.ruby.ruby_tmplist_p, luatexja.ruby.cpbox())}%
}
\protected\def\ltjkenten{\@ifnextchar[\ltj@@kenten{\ltj@@kenten[]}}%]