From 7da5606ecbf3e8a301701a35b86e5b304e4d3094 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Dec 2020 21:25:21 +0000 Subject: scholax (19dec20) git-svn-id: svn://tug.org/texlive/trunk@57169 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/scholax/LY1TeXGyreScholaX-Inf.fd | 74 ++++++++++------------ .../tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd | 74 ++++++++++------------ .../tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd | 72 ++++++++++----------- .../tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd | 72 ++++++++++----------- .../tex/latex/scholax/T1TeXGyreScholaX-Inf.fd | 72 ++++++++++----------- .../tex/latex/scholax/T1TeXGyreScholaX-Sup.fd | 70 ++++++++++---------- Master/texmf-dist/tex/latex/scholax/scholax.sty | 5 +- 7 files changed, 202 insertions(+), 237 deletions(-) (limited to 'Master/texmf-dist/tex/latex/scholax') diff --git a/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Inf.fd b/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Inf.fd index 120a00b2e09..e864fd248e8 100644 --- a/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Inf.fd +++ b/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{LY1TeXGyreScholaX-Inf.fd} - [2020/05/31 (autoinst) Font definitions for LY1/TeXGyreScholaX-Inf.] + [2020/12/18 (autoinst) Font definitions for LY1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{LY1}{TeXGyreScholaX-Inf}{} -% ---- regular ---- +% ---- b = bold ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{n}{ + <-> alias * TeXGyreScholaX-Inf/b/n }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ly1 }{} - -% ---- bold ---- - -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> alias * TeXGyreScholaX-Inf/b/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Inf/b/sl }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{sl}{ - <-> alias * TeXGyreScholaX-Inf/regular/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{n}{ - <-> alias * TeXGyreScholaX-Inf/regular/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{n}{ + <-> alias * TeXGyreScholaX-Inf/m/n }{} \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ly1 }{} - -% b --> bold - -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{sl}{ - <-> alias * TeXGyreScholaX-Inf/bold/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> alias * TeXGyreScholaX-Inf/m/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{n}{ - <-> alias * TeXGyreScholaX-Inf/bold/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Inf/m/sl }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{sl}{ <-> ssub * TeXGyreScholaX-Inf/b/sl }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{n}{ - <-> ssub * TeXGyreScholaX-Inf/b/n -}{} - \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{it}{ <-> ssub * TeXGyreScholaX-Inf/b/it }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{n}{ + <-> ssub * TeXGyreScholaX-Inf/b/n +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd b/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd index f48122759fb..959f68d1f53 100644 --- a/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd +++ b/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{LY1TeXGyreScholaX-Sup.fd} - [2020/05/31 (autoinst) Font definitions for LY1/TeXGyreScholaX-Sup.] + [2020/12/18 (autoinst) Font definitions for LY1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,76 +20,70 @@ \DeclareFontFamily{LY1}{TeXGyreScholaX-Sup}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ly1 }{} \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ly1 + <-> alias * TeXGyreScholaX-Sup/b/n }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ly1 +}{} -% ---- regular ---- - -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> alias * TeXGyreScholaX-Sup/b/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Sup/b/sl }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{sl}{ - <-> alias * TeXGyreScholaX-Sup/regular/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{n}{ - <-> alias * TeXGyreScholaX-Sup/regular/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{it}{ + <-> alias * TeXGyreScholaX-Sup/m/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{it}{ - <-> alias * TeXGyreScholaX-Sup/regular/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ly1 }{} - -% b --> bold - -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Sup/m/sl }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{n}{ - <-> alias * TeXGyreScholaX-Sup/bold/n +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{regular}{n}{ + <-> alias * TeXGyreScholaX-Sup/m/n }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{sl}{ - <-> ssub * TeXGyreScholaX-Sup/b/sl -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{n}{ <-> ssub * TeXGyreScholaX-Sup/b/n }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Sup/b/sl +}{} + \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{it}{ <-> ssub * TeXGyreScholaX-Sup/b/it }{} diff --git a/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd b/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd index 55bee262658..795deab2332 100644 --- a/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd +++ b/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{OT1TeXGyreScholaX-Inf.fd} - [2020/05/31 (autoinst) Font definitions for OT1/TeXGyreScholaX-Inf.] + [2020/12/18 (autoinst) Font definitions for OT1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{OT1}{TeXGyreScholaX-Inf}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{sl}{ +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{sl}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Inf/b/sl }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{it}{ +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{it}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ot1 }{} - -% ---- regular ---- - -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> alias * TeXGyreScholaX-Inf/b/it }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{n}{ + <-> alias * TeXGyreScholaX-Inf/b/n }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{sl}{ - <-> alias * TeXGyreScholaX-Inf/regular/sl +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{n}{ + <-> alias * TeXGyreScholaX-Inf/m/n }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{n}{ - <-> alias * TeXGyreScholaX-Inf/regular/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ot1 }{} - -% b --> bold - -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{sl}{ - <-> alias * TeXGyreScholaX-Inf/bold/sl +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> alias * TeXGyreScholaX-Inf/m/it }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{n}{ - <-> alias * TeXGyreScholaX-Inf/bold/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Inf/m/sl }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{n}{ <-> ssub * TeXGyreScholaX-Inf/b/n }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{sl}{ - <-> ssub * TeXGyreScholaX-Inf/b/sl -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{it}{ <-> ssub * TeXGyreScholaX-Inf/b/it }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Inf/b/sl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd b/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd index 49a06ad9769..3e6fb87e0ff 100644 --- a/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd +++ b/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{OT1TeXGyreScholaX-Sup.fd} - [2020/05/31 (autoinst) Font definitions for OT1/TeXGyreScholaX-Sup.] + [2020/12/18 (autoinst) Font definitions for OT1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,71 +20,61 @@ \DeclareFontFamily{OT1}{TeXGyreScholaX-Sup}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ot1 }{} \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ot1 + <-> alias * TeXGyreScholaX-Sup/m/n }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ot1 +}{} -% ---- bold ---- - -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Sup/m/sl }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{it}{ + <-> alias * TeXGyreScholaX-Sup/m/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{it}{ - <-> alias * TeXGyreScholaX-Sup/regular/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{sl}{ - <-> alias * TeXGyreScholaX-Sup/regular/sl +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{n}{ + <-> alias * TeXGyreScholaX-Sup/b/n }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{n}{ - <-> alias * TeXGyreScholaX-Sup/regular/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ot1 }{} - -% b --> bold - -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> alias * TeXGyreScholaX-Sup/b/it }{} \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{n}{ - <-> alias * TeXGyreScholaX-Sup/bold/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Sup/b/sl }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{it}{ - <-> ssub * TeXGyreScholaX-Sup/b/it -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{n}{ <-> ssub * TeXGyreScholaX-Sup/b/n @@ -94,4 +84,8 @@ <-> ssub * TeXGyreScholaX-Sup/b/sl }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{it}{ + <-> ssub * TeXGyreScholaX-Sup/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Inf.fd b/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Inf.fd index 9a3c1f1fb73..145220e8a88 100644 --- a/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Inf.fd +++ b/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{T1TeXGyreScholaX-Inf.fd} - [2020/05/31 (autoinst) Font definitions for T1/TeXGyreScholaX-Inf.] + [2020/12/18 (autoinst) Font definitions for T1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,72 +20,62 @@ \DeclareFontFamily{T1}{TeXGyreScholaX-Inf}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{it}{ +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{it}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> alias * TeXGyreScholaX-Inf/m/it }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-t1 }{} - -% ---- bold ---- - -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Inf/m/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{n}{ + <-> alias * TeXGyreScholaX-Inf/m/n }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular - -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it -}{} +% ---- b = bold ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{sl}{ - <-> alias * TeXGyreScholaX-Inf/regular/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{n}{ - <-> alias * TeXGyreScholaX-Inf/regular/n +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> alias * TeXGyreScholaX-Inf/b/it }{} - -% b --> bold - -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{sl}{ - <-> alias * TeXGyreScholaX-Inf/bold/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Inf/b/sl }{} \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{b}{n}{ - <-> alias * TeXGyreScholaX-Inf/bold/n + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{it}{ - <-> ssub * TeXGyreScholaX-Inf/b/it +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bold}{n}{ + <-> alias * TeXGyreScholaX-Inf/b/n }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{n}{ <-> ssub * TeXGyreScholaX-Inf/b/n }{} @@ -94,4 +84,8 @@ <-> ssub * TeXGyreScholaX-Inf/b/sl }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{it}{ + <-> ssub * TeXGyreScholaX-Inf/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Sup.fd b/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Sup.fd index b86f7795023..9977a63af29 100644 --- a/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Sup.fd +++ b/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/05/31 +%% Generated by autoinst on 2020/12/18 %% \ProvidesFile{T1TeXGyreScholaX-Sup.fd} - [2020/05/31 (autoinst) Font definitions for T1/TeXGyreScholaX-Sup.] + [2020/12/18 (autoinst) Font definitions for T1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{T1}{TeXGyreScholaX-Sup}{} -% ---- bold ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{sl}{ + <-> alias * TeXGyreScholaX-Sup/m/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-t1 }{} - -% ---- regular ---- - \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-t1 + <-> alias * TeXGyreScholaX-Sup/m/it }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{n}{ +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{n}{ + <-> alias * TeXGyreScholaX-Sup/m/n }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{it}{ - <-> alias * TeXGyreScholaX-Sup/regular/it +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{n}{ - <-> alias * TeXGyreScholaX-Sup/regular/n +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> alias * TeXGyreScholaX-Sup/b/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{sl}{ - <-> alias * TeXGyreScholaX-Sup/regular/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-t1 }{} - -% b --> bold - -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> alias * TeXGyreScholaX-Sup/b/it }{} \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{n}{ - <-> alias * TeXGyreScholaX-Sup/bold/n + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{n}{ + <-> alias * TeXGyreScholaX-Sup/b/n }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{n}{ <-> ssub * TeXGyreScholaX-Sup/b/n }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{sl}{ - <-> ssub * TeXGyreScholaX-Sup/b/sl -}{} - \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{it}{ <-> ssub * TeXGyreScholaX-Sup/b/it }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Sup/b/sl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/scholax/scholax.sty b/Master/texmf-dist/tex/latex/scholax/scholax.sty index b2d715049b6..a73208f97b2 100644 --- a/Master/texmf-dist/tex/latex/scholax/scholax.sty +++ b/Master/texmf-dist/tex/latex/scholax/scholax.sty @@ -1,7 +1,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.027} -\def\filedate{2020/11/30} +\def\fileversion{1.028} +\def\filedate{2020/12/18} \ProvidesPackage{scholax} [\filedate\space v\fileversion] @@ -9,6 +9,7 @@ \RequirePackage[LY1,T1]{fontenc} \RequirePackage{textcomp} +\DeclareEncodingSubset{TS1}{TeXGyreScholaX-*}{0} \RequirePackage{etoolbox} \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} \IfFileExists{fontaxes.sty}{ -- cgit v1.2.3