diff options
author | Norbert Preining <norbert@preining.info> | 2020-01-28 03:01:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-01-28 03:01:26 +0000 |
commit | fdd916a9e0d94bbf49f74c3b796e1bab88964d4c (patch) | |
tree | 606c1be4716998b353277312e85239fb2739d7c8 /macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty | |
parent | 685e467506870702d416d2317ce1d808e8f3fb60 (diff) |
CTAN sync 202001280301
Diffstat (limited to 'macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty')
-rw-r--r-- | macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty | 100 |
1 files changed, 27 insertions, 73 deletions
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty index 9f630754bd..617eedaf9d 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty @@ -1,5 +1,5 @@ % -% lltjp-fontspec.sty 2019-10-21 +% lltjp-fontspec.sty 2020-01-13 % \NeedsTeXFormat{LaTeX2e} @@ -7,13 +7,30 @@ \RequirePackage{fontspec} \ExplSyntaxOn -% <= v2.6g uses \l__fontspec_nfss_enc_tl instead of \g__fontspec_nfss_enc_tl -\ifdefined \g__fontspec_nfss_enc_tl \else - \def \g__fontspec_nfss_enc_tl { \l__fontspec_nfss_enc_tl } -\fi - %%%%%%%% fontspec v2.5c overwrites \rmfamily etc. in \setmainfont -\@ifpackagelater{fontspec}{2019/10/19}{ %% 2.7d or later +\@ifpackagelater{fontspec}{2020/01/09}{ %% 2.7e or later + \tl_replace_all:cnn { rmfamily~ } { \fontfamily }{ \romanfamily } + \tl_replace_all:cnn { sffamily~ } { \fontfamily }{ \romanfamily } + \tl_replace_all:cnn { ttfamily~ } { \fontfamily }{ \romanfamily } + \cs_if_exist:NF \@rmfamilyhook { + \tl_replace_all:cnn { rmfamily~ } { \selectfont } { + \if@ltj@match@family + \prepare@family@series@update@kanji{mc}\mcdefault + \fi\selectfont + } + \tl_replace_all:cnn { sffamily~ } { \selectfont } { + \if@ltj@match@family + \prepare@family@series@update@kanji{gt}\gtdefault + \fi\selectfont + } + \tl_replace_all:cnn { ttfamily~ } { \selectfont } { + \if@ltj@match@family + \prepare@family@series@update@kanji{jtt}\jttdefault + \fi\selectfont + } + } +%% end of 2.7e (or later) +}{\@ifpackagelater{fontspec}{2019/10/19}{ %% 2.7d \cs_set:Nn \__fontspec_main_setmainfont:nn { \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2} @@ -71,7 +88,8 @@ \__fontspec_setmonofont_hook:nn {#1} {#2} \normalfont } -}{\@ifpackagelater{fontspec}{2018/07/29}{ %% 2.6h <= and <= 2.7c +%% end of 2.7d +}{%% 2.7c \cs_set:Nn \__fontspec_main_setmainfont:nn { \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2} @@ -129,58 +147,7 @@ \__fontspec_setmonofont_hook:nn {#1} {#2} \normalfont } -}{ %% <= 2.6g -\DeclareDocumentCommand \setmainfont { O{} m O{} } - { - \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1,#3} {#2} - \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family - \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily } - { - \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__fontspec_rmfamily_family } - \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 } - \normalfont - \ignorespaces - } -\DeclareDocumentCommand \setsansfont { O{} m O{} } - { - \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1,#3} {#2} - \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family - \use:x { \exp_not:n { \DeclareRobustCommand \sffamily } - { - \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__fontspec_sffamily_family } - \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 } - \normalfont - \ignorespaces - } -\DeclareDocumentCommand \setmonofont { O{} m O{} } - { - \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1,#3} {#2} - \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family - \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily } - { - \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__fontspec_ttfamily_family } - \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 } - \normalfont - \ignorespaces - } +%% end of 2.7d }} \cs_set:Nn \fontspec_visible_space: @@ -190,19 +157,6 @@ { \fontspec_visible_space_fallback: } } -\AtBeginDocument{ - \cs_if_exist:NF \verbvisiblespace { - % >= LaTeX2e <2018-12-01> does not need the following patch - \def\verb - { - \relax\ifmmode\hbox\else\leavevmode\fi % same as lltjcore - \bgroup - \verb@eol@error \let\do\@makeother \dospecials - \verbatim@font\@noligs - \@ifstar\__fontspecsverb\@verb - } - } -} \cs_set:Npn \emshape { \gtfamily \itshape } \cs_set:Npn \eminnershape { \mcfamily \upshape } |