Created
January 23, 2020 14:27
-
-
Save aminophen/178ef475e56b44edb280b319c14c3b14 to your computer and use it in GitHub Desktop.
luatexja-nfss.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/luatexja.sty b/src/luatexja.sty | |
index 82a5615..5b53dca 100644 | |
--- a/src/luatexja.sty | |
+++ b/src/luatexja.sty | |
@@ -35,13 +35,13 @@ | |
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname | |
\csname iftrue\endcsname | |
\NeedsTeXFormat{LaTeX2e} | |
- \ProvidesPackage{luatexja}[2019/09/26 Japanese Typesetting with Lua(La)TeX] | |
+ \ProvidesPackage{luatexja}[2020/01/27 Japanese Typesetting with Lua(La)TeX] | |
\DeclareOption{disablejfam}{\ltj@disablejfamtrue} | |
\DeclareOption*{} | |
\ProcessOptions\relax | |
\fi %</LaTeX> | |
%%%% VERSION | |
-\def\LuaTeXjaversion{20191118.0} | |
+\def\LuaTeXjaversion{20200127.0} | |
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs | |
diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty | |
index 204adbc..1006cce 100644 | |
--- a/src/patches/lltjdefs.sty | |
+++ b/src/patches/lltjdefs.sty | |
@@ -32,7 +32,13 @@ | |
\newcommand\kanjiencodingdefault{JY3} | |
\newcommand\kanjifamilydefault{\mcdefault} | |
\newcommand\kanjiseriesdefault{\mddefault} | |
-\newcommand\kanjishapedefault{\updefault} | |
+\ifdefined\shapedefault | |
+ %% LaTeX 2020-02-02 | |
+ \newcommand\kanjishapedefault{\shapedefault} | |
+\else | |
+ %% LaTeX 2019-10-01 | |
+ \newcommand\kanjishapedefault{\updefault} | |
+\fi | |
\DeclareKanjiFamily{JY3}{mc}{} | |
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=\ltj@stdyokojfm}{} | |
@@ -40,8 +46,8 @@ | |
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=\ltj@stdyokojfm}{} | |
\DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{} | |
\DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} | |
-\DeclareFontShape{JY3}{mc}{b}{n}{<-> ssub*mc/bx/n}{} | |
-\DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/bx/n}{} | |
+\DeclareFontShape{JY3}{mc}{b}{n}{<-> ssub*gt/m/n}{} | |
+\DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/m/n}{} | |
\DeclareKanjiFamily{JT3}{mc}{} | |
\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=\ltj@stdtatejfm}{} | |
@@ -49,8 +55,8 @@ | |
\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=\ltj@stdtatejfm}{} | |
\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}{} | |
-\DeclareFontShape{JT3}{gt}{b}{n}{<-> ssub*gt/bx/n}{} | |
+\DeclareFontShape{JT3}{mc}{b}{n}{<-> ssub*gt/m/n}{} | |
+\DeclareFontShape{JT3}{gt}{b}{n}{<-> ssub*gt/m/n}{} | |
\KanjiEncodingPair{JY3}{JT3} | |
\DeclareRelationFont{JY3}{gt}{m}{}{TU}{lmr}{bx}{} | |
@@ -77,25 +83,50 @@ | |
\DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} | |
\fi | |
+\ifdefined\fontseriesforce | |
+\edef\bfseries@mc{\bfdefault} | |
+\edef\bfseries@gt{\bfdefault} | |
+\def\bfseries@jtt{\bfseries@gt} | |
+\edef\mdseries@mc{\mddefault} | |
+\edef\mdseries@gt{\mddefault} | |
+\def\mdseries@jtt{\mdseries@gt} | |
+\fi | |
+ | |
\newif\if@ltj@match@family | |
\@ltj@match@familyfalse | |
\def\verbatim@font{\normalfont\ttfamily\kanjifamily\jttdefault\selectfont} | |
-\DeclareRobustCommand\rmfamily | |
- {\not@math@alphabet\rmfamily\mathrm | |
- \romanfamily\rmdefault | |
- \if@ltj@match@family\kanjifamily\mcdefault\fi\selectfont} | |
-\DeclareRobustCommand\sffamily | |
- {\not@math@alphabet\sffamily\mathsf | |
- \romanfamily\sfdefault | |
- \if@ltj@match@family\kanjifamily\gtdefault\fi\selectfont} | |
-\DeclareRobustCommand\ttfamily | |
- {\not@math@alphabet\ttfamily\mathtt | |
- \romanfamily\ttdefault | |
- \if@ltj@match@family\kanjifamily\jttdefault\fi\selectfont} | |
+ | |
+\def\@ltj@hook@family#1#2{ % #1: csname #2: contents | |
+ \ifcsname @#1hook\endcsname % LaTeX 2020-02-02 | |
+ \csappto{@#1hook}{#2}% | |
+ \else % LaTeX 2019-10-01 | |
+ \ifcsname #1 \endcsname | |
+ \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}% | |
+ \else | |
+ \PackageWarningNoLine{luatexja}{% | |
+ Patching to \expandafter\string\csname #1\endcsname\space failed | |
+ }% | |
+ \fi | |
+ \fi | |
+} | |
+\@ltj@hook@family{rmfamily}{% | |
+ \if@ltj@match@family | |
+ \prepare@family@series@update@kanji{mc}\mcdefault | |
+ \fi | |
+} | |
+\@ltj@hook@family{sffamily}{% | |
+ \if@ltj@match@family | |
+ \prepare@family@series@update@kanji{gt}\gtdefault | |
+ \fi | |
+} | |
+\@ltj@hook@family{ttfamily}{% | |
+ \if@ltj@match@family | |
+ \prepare@family@series@update@kanji{jtt}\jttdefault | |
+ \fi | |
+} | |
+ | |
%%% \eminnershape | |
-\DeclareRobustCommand\em | |
- {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ | |
- \eminnershape \else \gtfamily \itshape \fi} | |
+\expandafter\patchcmd\csname em \endcsname{\itshape}{\gtfamily\itshape}{}{} | |
\def\eminnershape{\mcfamily \upshape} | |
\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} | |
diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty | |
index 0f572b5..8ad7e45 100644 | |
--- a/src/patches/lltjfont.sty | |
+++ b/src/patches/lltjfont.sty | |
@@ -3,7 +3,7 @@ | |
% | |
\NeedsTeXFormat{LaTeX2e} | |
-\ProvidesPackage{lltjfont}[2019/09/25 Patch to NFSS2 for LuaTeX-ja] | |
+\ProvidesPackage{lltjfont}[2020/01/12 Patch to NFSS2 for LuaTeX-ja] | |
\def\ltj@chardef@text@cmd#1{% | |
\let\@ifdefinable\@@ifdefinable% | |
@@ -568,12 +568,93 @@ | |
\edef\k@family{#1}\edef\f@family{#1}% | |
\fi\fi | |
} | |
+ | |
+\ifdefined\fontseriesforce | |
+%%%% LaTeX 2020-02-02 | |
+\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}} | |
+\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}} | |
+\DeclareRobustCommand\fontseriesforce[1]{\kanjiseries{#1}\romanseries{#1}} | |
+\DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} | |
+\DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} | |
+\DeclareRobustCommand\fontshapeforce[1]{\kanjishape{#1}\romanshape{#1}} | |
+ | |
+\def\merge@font@kanji@series#1{% | |
+ \expandafter\expandafter\expandafter | |
+ \merge@font@kanji@series@ | |
+ \csname series@\k@series @#1\endcsname | |
+ {#1}% | |
+ \@nil | |
+} | |
+\def\set@target@kanji@series#1{% | |
+ \edef\k@series{#1}% | |
+ \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}% | |
+} | |
+\def\merge@font@kanji@series@#1#2#3\@nil{% | |
+ \def\@reserveda{#3}% | |
+ \ifx\@reserveda\@empty | |
+ \set@target@kanji@series{#2}% | |
+ \else | |
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family | |
+ \maybe@load@fontshape\endgroup | |
+ \edef\@reserveda{\k@encoding /\k@family /#1/\k@shape}% | |
+ \ifcsname \@reserveda \endcsname | |
+ \set@target@kanji@series{#1}% | |
+ \else | |
+ \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname | |
+ \set@target@kanji@series{#2}% | |
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% | |
+ \else | |
+ \set@target@kanji@series{#3}% | |
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% | |
+ \fi | |
+ \fi | |
+ \fi | |
+} | |
+\def\merge@font@kanji@shape#1{% | |
+ \expandafter\expandafter\expandafter | |
+ \merge@font@kanji@shape@ | |
+ \csname shape@\k@shape @#1\endcsname | |
+ {#1}% | |
+ \@nil | |
+} | |
+\def\merge@font@kanji@shape@#1#2#3\@nil{% | |
+ \def\@reserveda{#3}% | |
+ \ifx\@reserveda\@empty | |
+ \edef\k@shape{#2}% | |
+ \else | |
+ \maybe@load@fontshape | |
+ \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}% | |
+ \ifcsname \@reserveda\endcsname | |
+ \edef\k@shape{#1}% | |
+ \else | |
+ \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname | |
+ \edef\k@shape{#2}% | |
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% | |
+ \else | |
+ \edef\k@shape{#3}% | |
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}% | |
+ \fi | |
+ \fi | |
+ \fi | |
+} | |
+\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}} | |
+\DeclareRobustCommand\kanjiseries[1]{\merge@font@kanji@series{#1}} | |
+\DeclareRobustCommand\fontseries[1]{% | |
+ \merge@font@series{#1}\merge@font@kanji@series{#1}} | |
+\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} | |
+\DeclareRobustCommand\kanjishape[1]{\merge@font@kanji@shape{#1}} | |
+\DeclareRobustCommand\fontshape[1]{% | |
+ \merge@font@shape{#1}\merge@font@kanji@shape{#1}} | |
+\else | |
+%%%% LaTeX 2019-10-01 | |
\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} | |
\DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} | |
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} | |
\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} | |
\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} | |
\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}} | |
+\fi | |
+%%%% | |
\DeclareRobustCommand\usekanji[4]{% | |
\kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}% | |
\selectfont\ignorespaces} | |
@@ -586,22 +667,90 @@ | |
\else\useroman{#1}{#2}{#3}{#4}% | |
\fi} | |
\DeclareRobustCommand\normalfont{% | |
- \kanjiencoding{\kanjiencodingdefault}% | |
- \kanjifamily{\kanjifamilydefault}% | |
- \kanjiseries{\kanjiseriesdefault}% | |
- \kanjishape{\kanjishapedefault}% | |
- \romanencoding{\encodingdefault}% | |
- \romanfamily{\familydefault}% | |
- \romanseries{\seriesdefault}% | |
- \romanshape{\shapedefault}% | |
- \selectfont\ignorespaces} | |
+ \useroman\encodingdefault\familydefault\seriesdefault\shapedefault | |
+ \usekanji\kanjiencodingdefault\kanjifamilydefault\kanjiseriesdefault\kanjishapedefault | |
+ \ignorespaces} | |
\let\reset@font\normalfont | |
+ | |
+\ifdefined\fontseriesforce | |
+%%%% LaTeX 2020-02-02 | |
+\let\prepare@family@series@update@kanji=\prepare@family@series@update | |
+\patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{} | |
+\patchcmd\prepare@family@series@update@kanji{\fontfamily}{\kanjifamily}{}{} | |
+\patchcmd\prepare@family@series@update@kanji{\f@series}{\k@series}{}{} | |
+\patchcmd\prepare@family@series@update@kanji{\maybe@load@fontshape} | |
+ {\begingroup\let\f@encoding\k@encoding\let\f@family\k@family | |
+ \maybe@load@fontshape\endgroup}{}{} | |
+\patchcmd\prepare@family@series@update@kanji{\@meta@family@list}{\@meta@family@kanji@list}{}{} | |
+\def\@meta@family@kanji@list{\@elt{mc}\@elt{gt}\@elt{jtt}} | |
+%%\appto\@meta@family@list{\@elt{mc}\@elt{gt}\@elt{jtt}} | |
+\DeclareRobustCommand\bfseries{% | |
+ \not@math@alphabet\bfseries\mathbf | |
+ \expand@font@defaults | |
+ \romanseries{% | |
+ \ifx\f@family\rmdef@ult \bfseries@rm | |
+ \else\ifx\f@family\sfdef@ult \bfseries@sf | |
+ \else\ifx\f@family\ttdef@ult \bfseries@tt | |
+ \else \bfdefault | |
+ \fi\fi\fi | |
+ }% | |
+ \kanjiseries{% | |
+ \ifx\k@family\mcdef@ult \bfseries@mc | |
+ \else\ifx\k@family\gtdef@ult \bfseries@gt | |
+ \else\ifx\k@family\jttdef@ult\bfseries@jtt | |
+ \else \bfdefault | |
+ \fi\fi\fi | |
+ }% | |
+ \selectfont | |
+} | |
+\DeclareRobustCommand\mdseries{% | |
+ \not@math@alphabet\mdseries\relax | |
+ \expand@font@defaults | |
+ \romanseries{% | |
+ \ifx\f@family\rmdef@ult \mdseries@rm | |
+ \else\ifx\f@family\sfdef@ult \mdseries@sf | |
+ \else\ifx\f@family\ttdef@ult \mdseries@tt | |
+ \else \mddefault | |
+ \fi\fi\fi | |
+ }% | |
+ \kanjiseries{% | |
+ \ifx\k@family\mcdef@ult \mdseries@mc | |
+ \else\ifx\k@family\gtdef@ult \mdseries@gt | |
+ \else\ifx\k@family\jttdef@ult\mdseries@jtt | |
+ \else \mddefault | |
+ \fi\fi\fi | |
+ }% | |
+ \selectfont | |
+} | |
+\appto\expand@font@defaults{% | |
+ \edef\mcdef@ult{\mcdefault}% | |
+ \edef\gtdef@ult{\gtdefault}% | |
+ \edef\jttdef@ult{\jttdefault}% | |
+ \edef\kanjidef@ult{\kanjifamilydefault}% | |
+} | |
+\appto\init@series@setup{% | |
+ \ifx\kanjidef@ult\mcdef@ult \mcfamily | |
+ \else\ifx\kanjidef@ult\gtdef@ult \gtfamily | |
+ \else\ifx\kanjidef@ult\jttdef@ult \jttfamily | |
+ \fi\fi\fi | |
+} | |
+\fi | |
+\ifdefined\prepare@family@series@update@kanji\else | |
+%%%% LaTeX 2019-10-01 | |
+\def\prepare@family@series@update@kanji#1{\kanjifamily} | |
+\fi | |
+ | |
\DeclareRobustCommand\mcfamily{% | |
\unless\ifltj@disablejfam\not@math@alphabet\mcfamily\mathmc\fi | |
- \kanjifamily\mcdefault\selectfont} | |
+ \prepare@family@series@update@kanji{mc}\mcdefault | |
+ \selectfont} | |
\DeclareRobustCommand\gtfamily{% | |
\unless\ifltj@disablejfam\not@math@alphabet\gtfamily\mathgt\fi | |
- \kanjifamily\gtdefault\selectfont} | |
+ \prepare@family@series@update@kanji{gt}\gtdefault | |
+ \selectfont} | |
+ | |
+ | |
+ | |
\let\romanprocess@table\process@table | |
\def\kanjiprocess@table{% | |
\kanjiencoding{\kanjiencodingdefault}% | |
diff --git a/src/patches/lltjp-fontspec.sty b/src/patches/lltjp-fontspec.sty | |
index 9f63075..13e8786 100644 | |
--- a/src/patches/lltjp-fontspec.sty | |
+++ b/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,31 @@ | |
\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 } | |
+ \typeout{LATEX~ 2019-10-01!} | |
+ \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 +89,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 +148,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 +158,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 } | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2020-01-23 時点の
から,明らかに「新 NFSS」と無関係な変更を省いた差分。