summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-17 22:31:42 +0000
committerKarl Berry <karl@freefriends.org>2019-11-17 22:31:42 +0000
commitcf554d8c8993b20aeebb087684a1f51ed227e8d8 (patch)
treee95a24443e62fafc4a65d60fc1bf91211de099c6 /Master/texmf-dist/tex
parent096213420278bb5e9cae4a535d87522aafd0f2c0 (diff)
luatexja (17nov19)
git-svn-id: svn://tug.org/texlive/trunk@52837 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty357
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty412
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty8
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty8
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty13
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua27
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo20
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo20
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo20
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo20
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty76
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty42
30 files changed, 276 insertions, 975 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
deleted file mode 100644
index 9c67b70358c..00000000000
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
+++ /dev/null
@@ -1,357 +0,0 @@
-%
-% luatexja-fontspec-25c.sty
-%
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-25c}[2019/05/14 fontspec support of LuaTeX-ja]
-\RequirePackage{l3keys2e}
-\ExplSyntaxOn
-
-%%%%%%%% Change Japanese font family by \rmfamily or not
-\cs_new:Npn \ltj_fontspec_match_cmd {
- \renewcommand\jttdefault{\gtdefault}
- \@ltj@match@familytrue
- \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
- \ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
- \normalfont
- }
-}
-\bool_if:NT \__ltj_fontspec_match_bool \ltj_fontspec_match_cmd
-
-%%%%%%%% Messages
-\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
-{
- \string\addjfontfeature (s)~ ignored;\\
- it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec.
-}
-
-\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-norange}
-{
- ignored~ sublist~ `#1'~ in~ AltFont~ (no~ range~ is~ specified).
-}
-
-\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly}
-{
- ignored~ sublist~ `#1'~ in~ AltFont~ (only~ range~ is~ specified).
-}
-
-\cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx}
-
-%%%%%%%% Internal control sequences
-%% Each CS is ltj_fontspec version that corresponds to original CS of fontspec.
-\cs_new:Nn \ltj_fontspec_define_option:nn {
- \__fontspec_keys_define_code:nnn {fontspec} {#1} {#2}
-}
-\cs_new:Nn \ltj_fontspec_define_preparse_external:nn {
- \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {#1} {#2}
-}
-\cs_new:Nn \ltj_fontspec_define_altfont_option:nn {
- \__fontspec_keys_define_code:nnn {fontspec-ltjaltfont} {#1} {#2}
-}
-
-%% Alternate Fonts
-%% Spec: AltFont = {
-%% ...
-%% { Range = <range>, <font features> },
-%% { Range = <range>, Font = <font name>, <font features> },
-%% { Range = <range>, Font = <font name> },
-%% ...
-%% }
-\tl_new:N \l_ltj_fontspec_altname_tl
-\tl_new:N \l_ltj_fontspec_altrange_tl
-\clist_new:N \l_ltj_fontspec_altfont_clist
-\clist_new:N \l_ltj_fontspec_altfont_leftover_clist
-\int_new:N \g_ltj_fontspec_altnumber_int
-
-\ltj_fontspec_define_altfont_option:nn {Range} {
- \tl_set:Nn \l_ltj_fontspec_altrange_tl {#1}
-}
-\ltj_fontspec_define_altfont_option:nn {Font} {
- \fontspec_complete_fontname:Nn \l_ltj_fontspec_altname_tl {#1}
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {AltFont} {
- \clist_put_right:Nn \l_ltj_fontspec_altfont_clist { #1 }
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {YokoFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { #1 }
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { #1 }
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFont} {
- \tl_if_empty:nF {#1} {
- \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {#1}
- }
-}
-%%
-\clist_new:N \l_ltj_fontspec_fontfeat_yoko_clist
-\clist_new:N \l_ltj_fontspec_fontfeat_tate_clist
-\tl_new:N \l_ltj_fontspec_fontname_tate_tl
-
-\cs_new:Npn \ltj_fontspec_DeclareFontFamily #1 #2 #3 {
- \DeclareKanjiFamily {JY3} {#2} {#3}
- \DeclareKanjiFamily {JT3} {#2} {#3}
-}
-
-\cs_set_eq:NN \__ltj_orig_fontspec_select_font_family:nn \__fontspec_select_font_family:nn
-\cs_new_protected:Nn \ltj_fontspec_select_font_family:nn {
- \group_begin:
- \ltj_fontspec_define_option:nn {NoEmbed} {}
- \ltj_fontspec_define_option:nn {AltFont} {
- \clist_put_right:Nn \l_ltj_fontspec_altfont_clist { ##1 }
- }
- \ltj_fontspec_define_option:nn {CID} {
- \__fontspec_update_featstr:n {cid=##1}
- }
- \ltj_fontspec_define_option:nn {Kanjiskip} {
- \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
- \__fontspec_update_featstr:n {-ltjksp}
- } {
- \__fontspec_update_featstr:n {+ltjksp}
- }
- }
- \ltj_fontspec_define_option:nn {JFM} {
- \__fontspec_update_featstr:n {jfm=##1}
- }
- % vary by shape
- \ltj_fontspec_define_option:nn {YokoFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { ##1 }
- }
- \ltj_fontspec_define_option:nn {TateFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { ##1 }
- }
- \ltj_fontspec_define_option:nn {TateFont}
- {
- \tl_if_empty:nF {##1} {
- \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {##1}
- }
- }
- \ltj_fontspec_define_option:nn {JFM-var} {
- \__fontspec_update_featstr:n {jfmvar=##1}
- }
- \ltj_fontspec_define_preparse_external:nn {NoEmbed} {
- \cs_set:Npn \__fontspec_fontname_wrap:n ##1 {psft:##1}
- }
-
- %% Omit the warning message
- %% "OpenType feature 'Kerning=Off' (-kern) not available ..."
- \keys_define:nn {fontspec-opentype} {
- Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
- }
- \clist_set:Nx \g__fontspec_default_fontopts_clist {
- YokoFeatures = { JFM=\ltj@stdyokojfm }, TateFeatures = { JFM=\ltj@stdtatejfm },
- Scale=\Cjascale, Kerning=Off, Script=CJK,
- \g__ltj_fontspec_default_fontopts_clist
- }
- \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
- \cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \ltj_fontspec_make_font_shapes:Nnnnn
- \cs_set_eq:NN \DeclareFontFamily \ltj_fontspec_DeclareFontFamily
- \tl_set:Nn \g_fontspec_encoding_tl {JY3}
- \__ltj_orig_fontspec_select_font_family:nn{#1}{#2}
- \group_end:
-}
-
-%% declare_shape
-
-\cs_new:Nn \ltj_fontspec_declare_shape_yoko:nnnn {
- \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l_ltj_fontspec_fontfeat_yoko_clist }
-}
-\cs_new:Nn \ltj_fontspec_declare_shape_tate:nnnn {
- \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l_ltj_fontspec_fontfeat_tate_clist }
-}
-\cs_new:Nn \ltj_fontspec_declare_shape:nnnn {
- \ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4}
- \ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4}
-}
-\cs_generate_variant:Nn \ltj_fontspec_declare_shape:nnnn {nnxx}
-\cs_generate_variant:Nn \ltj_fontspec_declare_shape_yoko:nnnn {nnxx}
-\cs_generate_variant:Nn \ltj_fontspec_declare_shape_tate:nnnn {nnxx}
-
-\cs_new:Nn \ltj_fontspec_declare_shape_aux:nnnnnn
- {
- \tl_clear:N \l__fontspec_nfss_tl
- \tl_clear:N \l__fontspec_nfss_sc_tl
- \tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
-
- \tl_set:Nn \g_fontspec_encoding_tl {#5}
- \tl_set:Nn \l__fontspec_nfss_enc_tl {#5}
- \exp_args:Nx \clist_map_inline:nn {#4}
- {
- \tl_clear:N \l__fontspec_size_tl
- \tl_set_eq:NN \l__fontspec_sizedfont_tl \l__fontspec_saved_fontname_tl % in case not spec'ed
-
- \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n ##1 }
- \l__fontspec_sizing_leftover_clist
- \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
-
- \str_if_eq:nnTF { #5 } { JY3 } {
- % "normal"
- \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
- } {
- \tl_if_empty:NTF \l_ltj_fontspec_fontname_tate_tl
- { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} }
- { \__fontspec_load_fontname:n {\l_ltj_fontspec_fontname_tate_tl} }
- }
- \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#3} {#6} {}
- }
- \bool_set_true:N \l__fontspec_nosc_bool
- \__fontspec_declare_shapes_normal:nn {#1} {#2}
- \__fontspec_declare_shape_slanted:nn {#1} {#2}
- }
-
-\cs_new:Nn \ltj_fontspec_set_family:Nnn {
- \cs_set_eq:NN \__fontspec_select_font_family:nn \ltj_fontspec_select_font_family:nn
- \__ltj_orig_fontspec_set_family:Nnn #1 {#2} {#3}
- \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_orig_fontspec_select_font_family:nn
-}
-\cs_set_eq:NN \__ltj_orig_fontspec_set_family:Nnn \fontspec_set_family:Nnn
-\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:Nnnnn \__fontspec_make_font_shapes:Nnnnn
-\cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape
-
-\cs_new:Nn \ltj_fontspec_make_font_shapes:Nnnnn {
- \group_begin:
- %% 基底フォント
- \cs_set_eq:NN \__fontspec_font_set:Nnn \use_none:nnn
- \cs_set_eq:NN \__fontspec_font_if_null:NT \use_none:nn
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape:nnxx
- \__ltj_orig_fontspec_make_font_shapes:Nnnnn {#1} {#2} {#3} {#4} {#5}
- %%
- \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
- {#4, \l_ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 }
- \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
- {#4, \l_ltj_fontspec_fontfeat_tate_clist}{#5} {JT3}
- \group_end:
- }
-
-%%% Altfont 内部処理部
-\cs_new:Nn \ltj_fontspec_make_font_shapes_alt:Nnnnnn {
- \group_begin:
- \str_if_eq:nnTF { #6 } { JY3 } {
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_yoko:nnxx
- }{
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_tate:nnxx
- }
- \keys_set_known:nn {fontspec-ltjaltfont-reparse} { #4 }
- \clist_if_empty:NF \l_ltj_fontspec_altfont_clist {
- \int_gzero:N \g_ltj_fontspec_altnumber_int
- \clist_map_inline:Nn \l_ltj_fontspec_altfont_clist {
- \tl_clear:N \l_ltj_fontspec_altrange_tl
- \tl_set:Nn \l_ltj_fontspec_altname_tl { #1 }
- \tl_set:Nn \l_tmpa_tl { #1 }
-
- \keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 }
- \l_ltj_fontspec_altfont_leftover_clist
- \keys_set_known:nn {fontspec-ltjaltfont-reparse} { \exp_after:wN \use:n ##1 }
-
- \tl_if_empty:NT \l_ltj_fontspec_altrange_tl {
- \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 }
- } {
- \bool_if:nTF {
- \tl_if_eq_p:NN \l_ltj_fontspec_altname_tl \l_tmpa_tl
- &&
- \tl_if_empty_p:N \l_ltj_fontspec_altfont_leftover_clist
- } {
- \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 }
- } {
- \__ltj_orig_fontspec_make_font_shapes:Nnnnn
- { \l_ltj_fontspec_altname_tl } {#2}
- {#3 _ alt \int_use:N \g_ltj_fontspec_altnumber_int }
- {#4, \l_ltj_fontspec_altfont_leftover_clist }
- {#5}
- \DeclareAlternateKanjiFont
- { #6 }{ \l_fontspec_family_tl }{#2}{#3}%
- { #6 }{ \l_fontspec_family_tl }{#2}
- { #3 _alt \int_use:N \g_ltj_fontspec_altnumber_int }
- { \l_ltj_fontspec_altrange_tl }
- \int_gincr:N \g_ltj_fontspec_altnumber_int
- }
- }
- }
- }
- \group_end:
-}
-
-
-%%%%%%%% User commands
-\DeclareDocumentCommand \jfontspec { O{} m O{} } {
- \ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2}
- \selectfont
- \ignorespaces
-}
-
-\DeclareDocumentCommand \setmainjfont { O{} m O{} } {
- \ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
- \unless\ifltj@disablejfam
- \DeclareSymbolFont{mincho}{JY3}{\l_fontspec_family_tl}{\mddefault}{n}
- \SetSymbolFont{mincho}{bold}{JY3}{\l_fontspec_family_tl}{\bfdefault}{n}
- \fi
- \normalfont
-}
-
-\DeclareDocumentCommand \setsansjfont { O{} m O{} } {
- \ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
- \unless\ifltj@disablejfam
- \DeclareMathAlphabet{\mathgt}{JY3}{\l_fontspec_family_tl}{\mddefault}{n}
- \fi
- \normalfont
-}
-
-\DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
- \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn
- \newfontfamily #1 [#2,#4] {#3}
- \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
-}
-
-\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
- \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
-}
-
-\clist_new:N \g__ltj_fontspec_default_fontopts_clist
-\prop_new:N \g__ltj_fontspec_fontopts_prop
-\DeclareDocumentCommand \defaultjfontfeatures { t+ o m }
- {
- \IfNoValueTF {#2}
- { \__ltj_fontspec_set_default_features:nn {#1} {#3} }
- { \__ltj_fontspec_set_font_default_features:nnn {#1} {#2} {#3} }
- \ignorespaces
- }
-\cs_new:Nn \__ltj_fontspec_set_default_features:nn
- {
- \clist_set_eq:NN \l__ltj_fontspec_tmp_clist \g__fontspec_default_fontopts_clist
- \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_default_fontopts_clist
- \__fontspec_set_default_features:nn {#1} {#2}
- \clist_set_eq:NN \g__ltj_fontspec_default_fontopts_clist \g__fontspec_default_fontopts_clist
- \clist_set_eq:NN \g__fontspec_default_fontopts_clist \l__ltj_fontspec_tmp_clist
- }
-\cs_new:Nn \__ltj_fontspec_set_font_default_features:nnn
- {
- \prop_set_eq:NN \l__ltj_fontspec_tmp_prop \g__fontspec_fontopts_prop
- \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
- \__fontspec_set_font_default_features:nnn {#1} {#2} {#3}
- \prop_set_eq:NN \g__ltj_fontspec_fontopts_prop \g__fontspec_fontopts_prop
- \prop_set_eq:NN \g__fontspec_fontopts_prop \l__ltj_fontspec_tmp_prop
- }
-
-\DeclareDocumentCommand \addjfontfeatures {m} {
- \ltj_fontspec_if_fontspec_font:TF
- {
- \group_begin:
- \tl_set_eq:NN \f@family \k@family
- \cs_set_eq:NN \__fontspec_select_font_family:nn \ltj_fontspec_select_font_family:nn
- \addfontfeatures {#1}
- \group_end:
- \fontfamily\l_fontspec_family_tl\selectfont
- }{
- \msg_warning:nn {luatexja-fontspec} {addjfontfeatures-ignored}
- }
- \ignorespaces
-}
-
-\cs_set_eq:NN \addjfontfeature \addjfontfeatures
-
-\prg_new_conditional:Nnn \ltj_fontspec_if_fontspec_font: {TF,T,F}
-{
- \cs_if_exist:cTF {g__fontspec_ \k@family _prop} \prg_return_true: \prg_return_false:
-}
-
-\endinput
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
deleted file mode 100644
index 1472633bb0f..00000000000
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
+++ /dev/null
@@ -1,412 +0,0 @@
-%
-% luatexja-fontspec-26h.sty
-%
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-26h}[2019/05/14 fontspec support of LuaTeX-ja]
-\RequirePackage{l3keys2e}
-\ExplSyntaxOn
-
-%%%%%%%% Change Japanese font family by \rmfamily or not
-\cs_new:Npn \__ltj_fontspec_match_cmd {
- \renewcommand\jttdefault{\gtdefault}
- \@ltj@match@familytrue
- \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
- \__ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
- \normalfont
- }
-}
-\bool_if:NT \__ltj_fontspec_match_bool \__ltj_fontspec_match_cmd
-
-%%%%%%%% Messages
-\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
-{
- \string\addjfontfeature (s)~ ignored;\\
- it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec.
-}
-
-\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-norange}
-{
- ignored~ sublist~ `#1'~ in~ AltFont~ (no~ range~ is~ specified).
-}
-
-\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly}
-{
- ignored~ sublist~ `#1'~ in~ AltFont~ (only~ range~ is~ specified).
-}
-
-\cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx}
-
-%%%%%%%% Internal control sequences
-%% Each CS is ltj_fontspec version that corresponds to original CS of fontspec.
-\cs_new:Nn \__ltj_fontspec_define_option:nn {
- \__fontspec_keys_define_code:nnn {fontspec} {#1} {#2}
-}
-\cs_new:Nn \__ltj_fontspec_define_preparse_external:nn {
- \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {#1} {#2}
-}
-\cs_new:Nn \__ltj_fontspec_define_altfont_option:nn {
- \__fontspec_keys_define_code:nnn {fontspec-ltjaltfont} {#1} {#2}
-}
-
-%% Alternate Fonts
-%% Spec: AltFont = {
-%% ...
-%% { Range = <range>, <font features> },
-%% { Range = <range>, Font = <font name>, <font features> },
-%% { Range = <range>, Font = <font name> },
-%% ...
-%% }
-\tl_new:N \l__ltj_fontspec_altname_tl
-\tl_new:N \l__ltj_fontspec_altrange_tl
-\clist_new:N \l__ltj_fontspec_altfont_clist
-\clist_new:N \l__ltj_fontspec_altfont_leftover_clist
-\int_new:N \g__ltj_fontspec_altnumber_int
-
-\__ltj_fontspec_define_altfont_option:nn {Range} {
- \tl_set:Nn \l__ltj_fontspec_altrange_tl {#1}
-}
-\__ltj_fontspec_define_altfont_option:nn {Font} {
- \fontspec_complete_fontname:Nn \l__ltj_fontspec_altname_tl {#1}
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {AltFont} {
- \clist_put_right:Nn \l__ltj_fontspec_altfont_clist { #1 }
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {YokoFeatures} {
- \clist_put_right:Nn \l__ltj_fontspec_fontfeat_yoko_clist { #1 }
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFeatures} {
- \clist_put_right:Nn \l__ltj_fontspec_fontfeat_tate_clist { #1 }
-}
-\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFont} {
- \tl_if_empty:nF {#1} {
- \fontspec_complete_fontname:Nn \l__ltj_fontspec_fontname_tate_tl {#1}
- }
-}
-%%
-\clist_new:N \l__ltj_fontspec_fontfeat_yoko_clist
-\clist_new:N \l__ltj_fontspec_fontfeat_tate_clist
-\tl_new:N \l__ltj_fontspec_fontname_tate_tl
-
-\cs_new:Npn \__ltj_fontspec_DeclareFontFamily #1 #2 #3 {
- \DeclareKanjiFamily {JY3} {#2} {#3}
- \DeclareKanjiFamily {JT3} {#2} {#3}
-}
-
-%% save and restore global variable
-\tl_new:N \g__ltj_fontspec_kanji_nfss_family_tl
-\tl_new:N \g__ltj_fontspec_orig_nfss_family_tl
-\seq_new:N \g__ltj_fontspec_kanji_bf_series_seq
-\seq_new:N \g__ltj_fontspec_orig_bf_series_seq
-\clist_new:N \g__ltj_fontspec_kanji_default_fontopts_clist
-\clist_new:N \g__ltj_fontspec_orig_default_fontopts_clist
-
-\cs_new:Nn \__ltj_set_global_variable_for_kanji: {
- \tl_gset_eq:NN \g__ltj_fontspec_orig_nfss_family_tl \g__fontspec_nfss_family_tl
- \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_kanji_nfss_family_tl
- \seq_gset_eq:NN \g__ltj_fontspec_orig_bf_series_seq \g__fontspec_bf_series_seq
- \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_kanji_bf_series_seq
- %\seq_gclear:N \g__fontspec_bf_series_seq
- \clist_set_eq:NN \g__ltj_fontspec_orig_default_fontopts_clist \g__fontspec_default_fontopts_clist
- \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_kanji_default_fontopts_clist
-}
-
-\cs_new:Nn \__ltj_restore_global_variable: {
- \tl_gset_eq:NN \g__ltj_fontspec_kanji_nfss_family_tl \g__fontspec_nfss_family_tl
- \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_orig_nfss_family_tl
- \seq_gset_eq:NN \g__ltj_fontspec_kanji_bf_series_seq \g__fontspec_bf_series_seq
- \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_orig_bf_series_seq
- \clist_set_eq:NN \g__ltj_fontspec_kanji_default_fontopts_clist \g__fontspec_default_fontopts_clist
- \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_orig_default_fontopts_clist
-}
-
-\cs_set_eq:NN \__ltj_orig_fontspec_select_font_family:nn \__fontspec_select_font_family:nn
-\cs_new_protected:Nn \__ltj_fontspec_select_font_family:nn {
- \group_begin:
- \__ltj_fontspec_define_option:nn {NoEmbed} {}
- \__ltj_fontspec_define_option:nn {AltFont} {
- \clist_put_right:Nn \l__ltj_fontspec_altfont_clist { ##1 }
- }
- \__ltj_fontspec_define_option:nn {CID} {
- \__fontspec_update_featstr:n {cid=##1}
- }
- \__ltj_fontspec_define_option:nn {Kanjiskip} {
- \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
- \__fontspec_update_featstr:n {-ltjksp}
- } {
- \__fontspec_update_featstr:n {+ltjksp}
- }
- }
- \__ltj_fontspec_define_option:nn {JFM} {
- \__fontspec_update_featstr:n {jfm=##1}
- }
- % vary by shape
- \__ltj_fontspec_define_option:nn {YokoFeatures} {
- \clist_put_right:Nn \l__ltj_fontspec_fontfeat_yoko_clist { ##1 }
- }
- \__ltj_fontspec_define_option:nn {TateFeatures} {
- \clist_put_right:Nn \l__ltj_fontspec_fontfeat_tate_clist { ##1 }
- }
- \__ltj_fontspec_define_option:nn {TateFont}
- {
- \tl_if_empty:nF {##1} {
- \fontspec_complete_fontname:Nn \l__ltj_fontspec_fontname_tate_tl {##1}
- }
- }
- \__ltj_fontspec_define_option:nn {JFM-var} {
- \__fontspec_update_featstr:n {jfmvar=##1}
- }
- \__ltj_fontspec_define_preparse_external:nn {NoEmbed} {
- \cs_set:Npn \__fontspec_fontname_wrap:n ##1 {psft:##1}
- }
-
- %% Omit the warning message
- %% "OpenType feature 'Kerning=Off' (-kern) not available ..."
- \keys_define:nn {fontspec-opentype} {
- Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
- }
- \clist_set:Nx \g__fontspec_default_fontopts_clist {
- YokoFeatures = { JFM=\ltj@stdyokojfm }, TateFeatures = { JFM=\ltj@stdtatejfm },
- Scale=\Cjascale, Kerning=Off, Script=CJK,
- \g__ltj_fontspec_kanji_default_fontopts_clist
- }
- \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
- \cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \__ltj_fontspec_make_font_shapes:Nnnnn
- \cs_set_eq:NN \DeclareFontFamily \__ltj_fontspec_DeclareFontFamily
- \tl_set:Nn \g_fontspec_encoding_tl {JY3}
- \__ltj_orig_fontspec_select_font_family:nn{#1}{#2}
-
- \cs_gset:Npx \__ltj_fontspec_aftergroup {
- \exp_not:N \tl_set:Nn \exp_not:N \l_fontspec_family_tl { \l_fontspec_family_tl }
- }
- \aftergroup \__ltj_fontspec_aftergroup
- \group_end:
-}
-
-%% declare_shape
-
-\cs_new:Nn \__ltj_fontspec_declare_shape_yoko:nnnn {
- \__ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l__ltj_fontspec_fontfeat_yoko_clist }
-}
-\cs_new:Nn \__ltj_fontspec_declare_shape_tate:nnnn {
- \__ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l__ltj_fontspec_fontfeat_tate_clist }
-}
-\cs_new:Nn \__ltj_fontspec_declare_shape:nnnn {
- \__ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4}
- \__ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4}
-}
-\cs_generate_variant:Nn \__ltj_fontspec_declare_shape:nnnn {nnxx}
-\cs_generate_variant:Nn \__ltj_fontspec_declare_shape_yoko:nnnn {nnxx}
-\cs_generate_variant:Nn \__ltj_fontspec_declare_shape_tate:nnnn {nnxx}
-
-\cs_new:Nn \__ltj_fontspec_declare_shape_aux:nnnnnn
- {
- \tl_clear:N \l__fontspec_nfss_tl
- \tl_clear:N \l__fontspec_nfss_sc_tl
- \tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
-
- \tl_set:Nn \g_fontspec_encoding_tl {#5}
- \tl_set:Nn \g__fontspec_nfss_enc_tl {#5}
- \exp_args:Nx \clist_map_inline:nn {#4}
- {
- \tl_clear:N \l__fontspec_size_tl
- \tl_set_eq:NN \l__fontspec_sizedfont_tl \l__fontspec_saved_fontname_tl % in case not spec'ed
-
- \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n ##1 }
- \l__fontspec_sizing_leftover_clist
- \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
-
- \cs_if_exist:NTF \__fontspec_load_fontname:Nn
- { %% >= v2.7
- \str_if_eq:nnTF { #5 } { JY3 } {
- % "normal"
- \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__fontspec_sizedfont_tl}
- } {
- \tl_if_empty:NTF \l__ltj_fontspec_fontname_tate_tl
- { \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__fontspec_sizedfont_tl} }
- { \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__ltj_fontspec_fontname_tate_tl} }
- }
- } { %% < v2.7
- \str_if_eq:nnTF { #5 } { JY3 } {
- % "normal"
- \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
- } {
- \tl_if_empty:NTF \l__ltj_fontspec_fontname_tate_tl
- { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} }
- { \__fontspec_load_fontname:n {\l__ltj_fontspec_fontname_tate_tl} }
- }
- }
- \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#3} {#6} {}
- }
- \bool_set_true:N \l__fontspec_nosc_bool
- \__fontspec_declare_shapes_normal:nn {#1} {#2}
- \__fontspec_declare_shape_slanted:nn {#1} {#2}
- }
-
-\cs_new:Nn \__ltj_fontspec_set_family:Nnn {
- \__ltj_set_global_variable_for_kanji:
- \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_fontspec_select_font_family:nn
- \__ltj_orig_fontspec_set_family:Nnn #1 {#2} {#3}
- \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_orig_fontspec_select_font_family:nn
- \__ltj_restore_global_variable:
-}
-\cs_set_eq:NN \__ltj_orig_fontspec_set_family:Nnn \fontspec_set_family:Nnn
-\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:Nnnnn \__fontspec_make_font_shapes:Nnnnn
-\cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape
-
-\cs_new:Nn \__ltj_fontspec_make_font_shapes:Nnnnn {
- \group_begin:
- %% 基底フォント
- \cs_set_eq:NN \__fontspec_font_set:Nnn \use_none:nnn
- \cs_set_eq:NN \__fontspec_font_if_null:NT \use_none:nn
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape:nnxx
- \__ltj_orig_fontspec_make_font_shapes:Nnnnn {#1} {#2} {#3} {#4} {#5}
- %%
- \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
- {#4, \l__ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 }
- \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
- {#4, \l__ltj_fontspec_fontfeat_tate_clist}{#5} {JT3}
- \group_end:
- }
-
-%%% Altfont 内部処理部
-\cs_new:Nn \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {
- \group_begin:
- \str_if_eq:nnTF { #6 } { JY3 } {
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_yoko:nnxx
- }{
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_tate:nnxx
- }
- \keys_set_known:nn {fontspec-ltjaltfont-reparse} { #4 }
- \clist_if_empty:NF \l__ltj_fontspec_altfont_clist {
- \int_gzero:N \g__ltj_fontspec_altnumber_int
- \clist_map_inline:Nn \l__ltj_fontspec_altfont_clist {
- \tl_clear:N \l__ltj_fontspec_altrange_tl
- \tl_set:Nn \l__ltj_fontspec_altname_tl { #1 }
- \tl_set:Nn \l_tmpa_tl { #1 }
-
- \keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 }
- \l__ltj_fontspec_altfont_leftover_clist
- \keys_set_known:nn {fontspec-ltjaltfont-reparse} { \exp_after:wN \use:n ##1 }
-
- \tl_if_empty:NT \l__ltj_fontspec_altrange_tl {
- \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 }
- } {
- \bool_if:nTF {
- \tl_if_eq_p:NN \l__ltj_fontspec_altname_tl \l_tmpa_tl
- &&
- \tl_if_empty_p:N \l__ltj_fontspec_altfont_leftover_clist
- } {
- \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 }
- } {
- \__ltj_orig_fontspec_make_font_shapes:Nnnnn
- { \l__ltj_fontspec_altname_tl } {#2}
- {#3 _ alt \int_use:N \g__ltj_fontspec_altnumber_int }
- {#4, \l__ltj_fontspec_altfont_leftover_clist }
- {#5}
- \DeclareAlternateKanjiFont
- { #6 }{ \g__fontspec_nfss_family_tl }{#2}{#3}%
- { #6 }{ \g__fontspec_nfss_family_tl }{#2}
- { #3 _alt \int_use:N \g__ltj_fontspec_altnumber_int }
- { \l__ltj_fontspec_altrange_tl }
- \int_gincr:N \g__ltj_fontspec_altnumber_int
- }
- }
- }
- }
- \group_end:
-}
-
-
-%%%%%%%% User commands
-\DeclareDocumentCommand \jfontspec { O{} m O{} } {
- \__ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2}
- \selectfont
- \ignorespaces
-}
-
-\DeclareDocumentCommand \setmainjfont { O{} m O{} } {
- \__ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
- \unless\ifltj@disablejfam
- \DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n}
- \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{\bfdefault}{n}
- \fi
- \normalfont
-}
-
-\DeclareDocumentCommand \setsansjfont { O{} m O{} } {
- \__ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
- \unless\ifltj@disablejfam
- \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n}
- \fi
- \normalfont
-}
-
-\DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
- \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
- \newfontfamily #1 [#2,#4] {#3}
- \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
-}
-\DeclareDocumentCommand \renewjfontfamily { m O{} m O{} } {
- \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
- \renewfontfamily #1 [#2,#4] {#3}
- \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
-}
-\DeclareDocumentCommand \setjfontfamily { m O{} m O{} } {
- \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
- \setfontfamily #1 [#2,#4] {#3}
- \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
-}
-
-\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
- \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
-}
-
-\prop_new:N \g__ltj_fontspec_fontopts_prop
-\DeclareDocumentCommand \defaultjfontfeatures { t+ o m }
- {
- \IfNoValueTF {#2}
- { \__ltj_fontspec_set_default_features:nn {#1} {#3} }
- { \__ltj_fontspec_set_font_default_features:nnn {#1} {#2} {#3} }
- \ignorespaces
- }
-\cs_new:Nn \__ltj_fontspec_set_default_features:nn
- {
- \__ltj_set_global_variable_for_kanji:
- \__fontspec_set_default_features:nn {#1} {#2}
- \__ltj_restore_global_variable:
- }
-\cs_new:Nn \__ltj_fontspec_set_font_default_features:nnn
- {
- \prop_set_eq:NN \l__ltj_fontspec_tmp_prop \g__fontspec_fontopts_prop
- \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
- \__fontspec_set_font_default_features:nnn {#1} {#2} {#3}
- \prop_set_eq:NN \g__ltj_fontspec_fontopts_prop \g__fontspec_fontopts_prop
- \prop_set_eq:NN \g__fontspec_fontopts_prop \l__ltj_fontspec_tmp_prop
- }
-
-\DeclareDocumentCommand \addjfontfeatures {m} {
- \__ltj_fontspec_if_fontspec_font:TF
- {
- \__ltj_set_global_variable_for_kanji:
- \group_begin:
- \tl_set_eq:NN \f@family \k@family
- \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_fontspec_select_font_family:nn
- \addfontfeatures {#1}
- \group_end:
- \kanjifamily\g__fontspec_nfss_family_tl\selectfont
- \__ltj_restore_global_variable:
- }{
- \msg_warning:nn {luatexja-fontspec} {addjfontfeatures-ignored}
- }
- \ignorespaces
-}
-
-\cs_set_eq:NN \addjfontfeature \addjfontfeatures
-
-\prg_new_conditional:Nnn \__ltj_fontspec_if_fontspec_font: {TF,T,F}
-{
- \cs_if_exist:cTF {g__fontspec_fontinfo_ \k@family _prop} \prg_return_true: \prg_return_false:
-}
-
-\endinput
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
index 88d6b37b58c..bb6b5f0bd12 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-27c}[2019/05/14 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-27c}[2019/11/15 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e}
\ExplSyntaxOn
@@ -131,7 +131,7 @@
\__fontspec_update_featstr:n {cid=##1}
}
\__ltj_fontspec_define_option:nn {Kanjiskip} {
- \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+ \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
\__fontspec_update_featstr:n {-ltjksp}
} {
\__fontspec_update_featstr:n {+ltjksp}
@@ -226,7 +226,7 @@
\l__fontspec_sizing_leftover_clist
\tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
- \str_if_eq:nnTF { \g__fontspec_nfss_enc_tl } { JY3 } {
+ \str_if_eq:eeTF { \g__fontspec_nfss_enc_tl } { JY3 } {
% "normal"
\__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__fontspec_sizedfont_tl}
} {
@@ -266,7 +266,7 @@
%%% Altfont 内部処理部
\cs_new:Nn \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {
\group_begin:
- \str_if_eq:nnTF { #6 } { JY3 } {
+ \str_if_eq:eeTF { #6 } { JY3 } {
\cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_yoko:nnxx
}{
\cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_tate:nnxx
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 b967926cb7d..e32d20ab38a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -27,12 +27,8 @@
}
\ProcessKeysOptions{ luatexja-fontspec }
-\RequirePackage{fontspec}[2017/01/01]% v2.5c
-\@ifpackagelater{fontspec}{2018/07/29}%
- {\@ifpackagelater{fontspec}{2019/03/15}%
- {\RequirePackage{luatexja-fontspec-27c}} % v2.7c
- {\RequirePackage{luatexja-fontspec-26h}}}% v2.6h
- {\RequirePackage{luatexja-fontspec-25c}} % v2.5c
+\RequirePackage{fontspec}[2019/03/15]% v2.7c
+\RequirePackage{luatexja-fontspec-27c} % v2.7c
\ExplSyntaxOff
%%%%%%%% Now we completely ignore kanjifont definition file.
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 2eb38c83842..e126f6f90f9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -312,6 +312,19 @@
__custom = false, __office = false, __noembed = false,
}
+% HaranoAji {Mincho, Gothic}
+\ltjpreset_declare_preset:nx{haranoaji}{
+ mc-m = HaranoAjiMincho-Regular.otf,
+ mc-bx = HaranoAjiMincho-Bold.otf,
+ gt-d = HaranoAjiGothic-Regular.otf,
+ gt-bx = HaranoAjiGothic-Bold.otf,
+ gt-u = HaranoAjiGothic-Medium.otf,
+ gt-eb = HaranoAjiGothic-Heavy.otf,
+ mg-m = HaranoAjiGothic-Heavy.otf,
+ mc-l = HaranoAjiMincho-Light.otf,
+ __custom = false, __office = false, __noembed = false,
+}
+
% ipa, ipaex, ms
\ltjpreset_declare_preset:nx{ipa}{
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua
index a069215b099..3f4a0ba1f82 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua
@@ -185,7 +185,7 @@ end
-- not used in current LuaTeX-ja
do
--! ixbase.counter と同じ
- counter = {}
+ local counter = {}
local mt_counter = {}
setmetatable(counter, mt_counter)
@@ -373,10 +373,10 @@ function ltjb.add_to_callback(name,fun,description,priority)
"resetting exclusive callback: " .. name)
luatexbase.reset_callback(name)
end
- local saved_callback={},ff,dd
+ local saved_callback={}
for k,v in ipairs(luatexbase.callback_descriptions(name)) do
if k >= priority then
- ff,dd= luatexbase.remove_from_callback(name, v)
+ local ff,dd = luatexbase.remove_from_callback(name, v)
saved_callback[#saved_callback+1]={ff,dd}
end
end
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index dc832e9836c..d63da294478 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -773,16 +773,18 @@ do
if rotate_in_uax50(i) then rot[i] = true end
end
ltju.loop_over_feat(tfmdata, vert_vrt2, function (i,k) rot[i] = nil end)
- -- 同じグリフが複数の Unicode ポイントを持っている場合.
- -- いずれかの Unicode ポイントで rot = true ならば全体で rotate
- ltju.loop_over_duplicates(tfmdata,
- function (i, v)
- local f = rot[i]
- if not f then
- for j,_ in pairs(v) do if rot[j] then f=true; break end end
- end
- rot[i]=f; for j,_ in pairs(v) do rot[j]=f end
- end)
+ -- ↓「TeX Live 2019のLuaLaTeXで縦書きの三点リーダーが横書きになる」
+ -- (https://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=2722) により無効化
+ -- -- 同じグリフが複数の Unicode ポイントを持っている場合.
+ -- -- いずれかの Unicode ポイントで rot = true ならば全体で rotate
+ --ltju.loop_over_duplicates(tfmdata,
+ -- function (i, v)
+ -- local f = rot[i]
+ -- if not f then
+ -- for j,_ in pairs(v) do if rot[j] then f=true; break end end
+ -- end
+ -- rot[i]=f; for j,_ in pairs(v) do rot[j]=f end
+ -- end)
for i,_ in pairs(rot) do
dest = dest or {}; dest.rotation = dest.rotation or {}
dest.rotation[i] = true
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua
index 613291f7a94..04cae9d2f15 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-lotf_aux.lua
@@ -10,10 +10,6 @@ luatexja.lotf_aux = aux
local font_metric_table = {}
aux.font_metric_table = font_metric_table
-local function is_harf(t)
- return luaharfbuzz and package.loaded['harf'] and require("harf-base")
-end
-
local getfont = font.getfont
local provides_feature = luaotfload.aux.provides_feature
function aux.exist_feature(id, name)
@@ -28,15 +24,15 @@ function aux.enable_feature(id, name)
local t = getfont(id)
if t and t.shared and t.shared.features then
t.shared.features[name] = true
- elseif t and is_harf(t) then -- HARFLOAD
- local hb, tf = require("harf-base"), t.hb.spec.features
+ elseif t and t.hb then -- HARF
+ local hb, tf = luaotfload.harfbuzz, t.hb.spec.hb_features
tf[#tf+1] = hb.Feature.new(name)
end
end
function aux.specified_feature(id, name)
local t = getfont(id)
return t and (t.shared and t.shared.features and t.shared.features[name])
- or (t.hb and t.hb.spec and t.hb.spec.options and t.hb.spec.options[name]) -- HARFLOAD
+ or (t.hb and t.hb.spec and t.hb.spec.features.raw and t.hb.spec.features.raw[name]) -- HARF
end
@@ -53,14 +49,18 @@ end
local function get_asc_des(id)
local t, v = getfont(id), font_metric_table[id]
local a, d
- if t and t.shared then
+ if t and t.shared and t.shared.rawdata then
local u = t.units
local t2 = t.shared.rawdata.metadata
if t2 then
a, d = t2.ascender and t2.ascender/u, t2.descender and -t2.descender/u
end
- -- HARFLOAD h_extents() returns "too large" value...?
- -- rawdata.metadata.horizontalmetrics is same
+ elseif t.hb then -- HARF
+ local hbfont, u = t.hb.shared.font, t.hb.shared.upem
+ local h = hbfont:get_h_extents()
+ if h and u then
+ a, d = h.ascender and h.ascender/u, h.descender and -h.descender/u
+ end
end
v.ascender, v.descender = (a or 0.88)*t.size, (d or 0.12)*t.size
end
@@ -80,9 +80,10 @@ local dummy_vht, dummy_vorg = {}, {}
setmetatable(dummy_vht, {__index = function () return 1 end } )
setmetatable(dummy_vorg, {__index = function () return 0.88 end } )
local function get_vmet_table(tfmdata, dest)
- if (not tfmdata) or (not tfmdata.shared) then
+ if (not tfmdata) or (not tfmdata.shared) or (not tfmdata.shared.rawdata) then
dest = dest or {}
dest.vorigin, dest.vheight = dummy_vorg, dummy_vht
+ dest.ind_to_uni = {}
return dest
end
local rawdata = tfmdata.shared.rawdata
@@ -115,7 +116,7 @@ end
local function loop_over_duplicates(id, func)
-- func: return non-nil iff abort this fn
local t = (type(id)=="table") and id or getfont(id)
- if t and t.resources and t.resources.duplicates then
+ if t and t.resources and t.resources.duplicates then -- HARF: not executed
for i,v in pairs(t.resources.duplicates) do
func(i,v)
end
@@ -128,7 +129,7 @@ local function loop_over_feat(id, feature_name, func, universal)
-- func: return non-nil iff abort this fn
-- universal: true iff look up all (script, lang) pair
local t = (type(id)=="table") and id or getfont(id)
- if t and t.resources and t.resources.sequences then
+ if t and t.resources and t.resources.sequences then -- HARF: not executed
for _,i in pairs(t.resources.sequences) do
if i.order[1] and feature_name[i.order[1]] then
local f = i.features and i.features[i.order[1]]
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
index 7fc5eb11af8..bd3110fd7fa 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
@@ -210,7 +210,9 @@ do
end
-- Save
- k.characters[46].width = math.floor(655360/14);
+ if k and k.characters and k.characters[46] then
+ k.characters[46].width = math.floor(655360/14);
+ end
ltjb.save_cache( "ltj-cid-auto-" .. string.lower(cid_name),
{
version = cache_ver,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
index 98945f49c56..5315ef960d9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
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 ab672939790..615066a5eee 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -34,6 +33,7 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -51,7 +51,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{.25in}
\setlength\topskip{1\Cht}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
index 86ddc448394..1735984fdf2 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -34,6 +33,7 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{.275in}
\setlength\topskip{1\Cht}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
index df2a6c90f9d..2515d98a0df 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -34,6 +33,7 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -61,12 +61,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\setlength\headsep{.275in}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
index 280da3aca8e..25248a48850 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
index 4b46fb51ffa..25aca810f2c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
index 601be87f600..dabde72b25d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -34,6 +33,7 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -51,7 +51,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{25\p@}
\setlength\topskip{1\Cht}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
index fcc0f724de9..85abf6f4b92 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -34,6 +33,7 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -61,13 +61,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{25\p@}
\setlength\topskip{1\Cht}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
index 4e1ad8790cc..ada3335ef0e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -34,6 +33,7 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -41,7 +41,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -51,7 +51,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -61,12 +61,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\setlength\headsep{25\p@}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
index 4f542359a27..7cebfa28355 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
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 60ee4fac2ad..48aebd8601c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -36,6 +35,7 @@
\def\kanjiencodingdefault{JT3}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -53,7 +53,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
index 9b4067ce23c..902ed5d4d3c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -36,6 +35,7 @@
\def\kanjiencodingdefault{JT3}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
index 1b3f553d255..7546847293e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -36,6 +35,7 @@
\def\kanjiencodingdefault{JT3}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -63,12 +63,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\if@stysize
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
index 328fd0ffc4d..30427923f14 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
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 041e935548f..f95d4594fa0 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
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 1bb6c8b7978..4e1e4dee760 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -36,6 +35,7 @@
\def\kanjiencodingdefault{JT3}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -53,7 +53,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
index 2258dbcdf32..7e86a5a6909 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -36,6 +35,7 @@
\def\kanjiencodingdefault{JT3}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -63,13 +63,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
index 645f6ce72fd..03fa123b32e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
@@ -21,10 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2019/08/12 v1.8b-ltj-17
+ [2019/10/17 v1.8c-ltj-17
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -36,6 +35,7 @@
\def\kanjiencodingdefault{JT3}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\MakeRobust\normalsize
\setbox0\hbox{漢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -43,7 +43,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -53,7 +53,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -63,12 +63,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\if@stysize
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 2dfee28a50f..3956193af06 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -41,7 +41,7 @@
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20190926.0}
+\def\LuaTeXjaversion{20191117.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
index 6f469fc08ff..9f630754bd9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
@@ -1,5 +1,5 @@
%
-% lltjp-fontspec.sty 2018-08-24
+% lltjp-fontspec.sty 2019-10-21
%
\NeedsTeXFormat{LaTeX2e}
@@ -13,7 +13,65 @@
\fi
%%%%%%%% fontspec v2.5c overwrites \rmfamily etc. in \setmainfont
-\@ifpackagelater{fontspec}{2018/07/29}{ %% 2.6h or later
+\@ifpackagelater{fontspec}{2019/10/19}{ %% 2.7d or later
+\cs_set:Nn \__fontspec_main_setmainfont:nn
+ {
+ \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2}
+ \tl_set_eq:NN \rmdefault \l__fontspec_rmfamily_family_tl
+ \use:x
+ {
+ \exp_not:n { \DeclareRobustCommand \rmfamily }
+ {
+ \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
+ \exp_not:N \fontfamily { \exp_not:N \rmdefault }
+ \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\mcdefault\exp_not:N\fi%%%
+ \exp_not:N \selectfont
+ }
+ }
+ \str_if_eq:eeT {\familydefault} {\rmdefault}
+ { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
+ \__fontspec_setmainfont_hook:nn {#1} {#2}
+ \normalfont
+ }
+\cs_set:Nn \__fontspec_main_setsansfont:nn
+ {
+ \fontspec_set_family:Nnn \l__fontspec_sffamily_family_tl {#1} {#2}
+ \tl_set_eq:NN \sfdefault \l__fontspec_sffamily_family_tl
+ \use:x
+ {
+ \exp_not:n { \DeclareRobustCommand \sffamily }
+ {
+ \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
+ \exp_not:N \fontfamily { \exp_not:N \sfdefault }
+ \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\gtdefault\exp_not:N\fi%%%
+ \exp_not:N \selectfont
+ }
+ }
+ \str_if_eq:eeT {\familydefault} {\sfdefault}
+ { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
+ \__fontspec_setsansfont_hook:nn {#1} {#2}
+ \normalfont
+ }
+\cs_set:Nn \__fontspec_main_setmonofont:nn
+ {
+ \fontspec_set_family:Nnn \l__fontspec_ttfamily_family_tl {#1} {#2}
+ \tl_set_eq:NN \ttdefault \l__fontspec_ttfamily_family_tl
+ \use:x
+ {
+ \exp_not:n { \DeclareRobustCommand \ttfamily }
+ {
+ \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
+ \exp_not:N \fontfamily { \exp_not:N \ttdefault }
+ \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\jttdefault\exp_not:N\fi%%%
+ \exp_not:N \selectfont
+ }
+ }
+ \str_if_eq:eeT {\familydefault} {\ttdefault}
+ { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
+ \__fontspec_setmonofont_hook:nn {#1} {#2}
+ \normalfont
+ }
+}{\@ifpackagelater{fontspec}{2018/07/29}{ %% 2.6h <= and <= 2.7c
\cs_set:Nn \__fontspec_main_setmainfont:nn
{
\fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2}
@@ -28,7 +86,7 @@
\exp_not:N \selectfont
}
}
- \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+ \str_if_eq:eeT {\familydefault} {\rmdefault}
{ \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\__fontspec_setmainfont_hook:nn {#1} {#2}
\normalfont
@@ -47,7 +105,7 @@
\exp_not:N \selectfont
}
}
- \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+ \str_if_eq:eeT {\familydefault} {\sfdefault}
{ \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\__fontspec_setsansfont_hook:nn {#1} {#2}
\normalfont
@@ -66,7 +124,7 @@
\exp_not:N \selectfont
}
}
- \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+ \str_if_eq:eeT {\familydefault} {\ttdefault}
{ \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\__fontspec_setmonofont_hook:nn {#1} {#2}
\normalfont
@@ -84,7 +142,7 @@
\exp_not:N \selectfont
}
}
- \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+ \str_if_eq:eeT {\familydefault} {\rmdefault}
{ \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\normalfont
\ignorespaces
@@ -101,7 +159,7 @@
\exp_not:N \selectfont
}
}
- \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+ \str_if_eq:eeT {\familydefault} {\sfdefault}
{ \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\normalfont
\ignorespaces
@@ -118,12 +176,12 @@
\exp_not:N \selectfont
}
}
- \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+ \str_if_eq:eeT {\familydefault} {\ttdefault}
{ \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\normalfont
\ignorespaces
}
-}
+}}
\cs_set:Nn \fontspec_visible_space:
{
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
index db2fac84813..5663551bea4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
@@ -1,33 +1,37 @@
%
-% lltjp-microtype.sty 2019-08-12
+% lltjp-microtype.sty
%
% (Work in Progress)
%
\NeedsTeXFormat{LaTeX2e}
-
\RequirePackage{etoolbox}
\makeatletter
-\def\MT@register@font{%
- \xdef\MT@font@list{\expandonce{\MT@font@list\MT@font},}% !!!
-}
-\def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list
- \ifMT@inlist@\else
- \xdef\MT@font@list{\expandonce{\MT@font@list\font@name},}% !!!
- \fi}
+\PackageWarningNoLine{luatexja}%
+ {LuaTeX-ja's patch against the microtype package \MessageBreak
+ (lltjp-microtype.sty, 2019-11-08) may not work}
+\patchcmd\MT@register@font
+ {\xdef\MT@font@list{\MT@font@list\MT@font,}}%
+ {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
+ \unless\ifin@
+ \xdef\MT@font@list{\MT@font@list\MT@font,}
+ \fi
+ }{}{}
+\patchcmd\MT@register@subst@font
+ {\xdef\MT@font@list{\MT@font@list\font@name,}}%
+ {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
+ \unless\ifin@
+ \xdef\MT@font@list{\MT@font@list\font@name,}
+ \fi}{}{}
\let\ltj@MT@tracking@\MT@tracking@
-\def\MT@tracking@{%
- \MT@exp@one@n\MT@in@clist\MT@font\MT@tr@font@list
- \ifMT@inlist@\else
- \MT@maybe@do{tr}%
- \ifMT@do\else
- \xdef\MT@tr@font@list{\expandonce{\MT@tr@font@list\MT@font,}}% !!!
- \fi
- \fi
-}
+\patchcmd\MT@tracking@
+ {\xdef\MT@tr@font@list{\MT@tr@font@list\MT@font,}}%
+ {\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
+ \unless\ifin@
+ \xdef\MT@tr@font@list{\MT@tr@font@list\MT@font,}
+ \fi}{}{}
\ifx\MT@tracking\ltj@MT@tracking@\let\MT@tracking\MT@tracking@\fi
-
%\endinput
\begingroup
\catcode`\/=\z@