From 2fc3d4bb7b0130f4314146c017ffef4869e27245 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 Mar 2020 21:04:52 +0000 Subject: scholax (10mar20) git-svn-id: svn://tug.org/texlive/trunk@54223 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/scholax/LY1TeXGyreScholaX-Inf.fd | 56 +++++++++++----------- .../tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd | 28 +++++------ .../tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd | 36 +++++++------- .../tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd | 44 ++++++++--------- .../tex/latex/scholax/T1TeXGyreScholaX-Inf.fd | 28 +++++------ .../tex/latex/scholax/T1TeXGyreScholaX-Sup.fd | 44 ++++++++--------- Master/texmf-dist/tex/latex/scholax/scholax.sty | 45 +++++++++-------- 7 files changed, 143 insertions(+), 138 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 7058a71250a..02dfe8bf54e 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/03/08 +%% Generated by autoinst on 2020/03/09 %% \ProvidesFile{LY1TeXGyreScholaX-Inf.fd} - [2020/03/08 (autoinst) Font definitions for LY1/TeXGyreScholaX-Inf.] + [2020/03/09 (autoinst) Font definitions for LY1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,33 +20,33 @@ \DeclareFontFamily{LY1}{TeXGyreScholaX-Inf}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ly1 }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ly1 +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ly1 }{} % @@ -59,31 +59,27 @@ <-> alias * TeXGyreScholaX-Inf/regular/sl }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it -}{} - \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{n}{ <-> alias * TeXGyreScholaX-Inf/regular/n }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{m}{it}{ + <-> alias * TeXGyreScholaX-Inf/regular/it +}{} -% b --> bold -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{sl}{ - <-> alias * TeXGyreScholaX-Inf/bold/sl -}{} +% b --> bold \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{n}{ <-> alias * TeXGyreScholaX-Inf/bold/n }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{sl}{ + <-> alias * TeXGyreScholaX-Inf/bold/sl }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{it}{ - <-> ssub * TeXGyreScholaX-Inf/b/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{b}{it}{ + <-> alias * TeXGyreScholaX-Inf/bold/it }{} \DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{n}{ @@ -94,4 +90,8 @@ <-> ssub * TeXGyreScholaX-Inf/b/sl }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Inf}{bx}{it}{ + <-> ssub * TeXGyreScholaX-Inf/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd b/Master/texmf-dist/tex/latex/scholax/LY1TeXGyreScholaX-Sup.fd index 42b9f430704..e6e466cdd1a 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/03/08 +%% Generated by autoinst on 2020/03/09 %% \ProvidesFile{LY1TeXGyreScholaX-Sup.fd} - [2020/03/08 (autoinst) Font definitions for LY1/TeXGyreScholaX-Sup.] + [2020/03/09 (autoinst) Font definitions for LY1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -26,14 +26,14 @@ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ly1 }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ly1 -}{} - \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ly1 }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ly1 +}{} + % ---- regular ---- @@ -74,24 +74,24 @@ <-> alias * TeXGyreScholaX-Sup/bold/sl }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it -}{} - \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{n}{ <-> alias * TeXGyreScholaX-Sup/bold/n }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{sl}{ - <-> ssub * TeXGyreScholaX-Sup/b/sl +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> alias * TeXGyreScholaX-Sup/bold/it }{} -\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{it}{ - <-> ssub * TeXGyreScholaX-Sup/b/it +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Sup/b/sl }{} \DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{n}{ <-> ssub * TeXGyreScholaX-Sup/b/n }{} +\DeclareFontShape{LY1}{TeXGyreScholaX-Sup}{bx}{it}{ + <-> ssub * TeXGyreScholaX-Sup/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd b/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Inf.fd index e61d18335bb..989abc0ab88 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/03/08 +%% Generated by autoinst on 2020/03/09 %% \ProvidesFile{OT1TeXGyreScholaX-Inf.fd} - [2020/03/08 (autoinst) Font definitions for OT1/TeXGyreScholaX-Inf.] + [2020/03/09 (autoinst) Font definitions for OT1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,14 +22,14 @@ % ---- regular ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ot1 -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-ot1 }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-ot1 +}{} + \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{regular}{it}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-ot1 }{} @@ -41,28 +41,28 @@ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-inf-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ot1 -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-inf-ot1 }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bold}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-inf-ot1 +}{} + % % Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{sl}{ - <-> alias * TeXGyreScholaX-Inf/regular/sl -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{n}{ <-> alias * TeXGyreScholaX-Inf/regular/n }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{sl}{ + <-> alias * TeXGyreScholaX-Inf/regular/sl +}{} + \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{m}{it}{ <-> alias * TeXGyreScholaX-Inf/regular/it }{} @@ -74,14 +74,14 @@ <-> alias * TeXGyreScholaX-Inf/bold/sl }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{it}{ - <-> alias * TeXGyreScholaX-Inf/bold/it -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{n}{ <-> alias * TeXGyreScholaX-Inf/bold/n }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{b}{it}{ + <-> alias * TeXGyreScholaX-Inf/bold/it +}{} + \DeclareFontShape{OT1}{TeXGyreScholaX-Inf}{bx}{it}{ <-> ssub * TeXGyreScholaX-Inf/b/it }{} diff --git a/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd b/Master/texmf-dist/tex/latex/scholax/OT1TeXGyreScholaX-Sup.fd index 714686c9b5b..c024ec1192c 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/03/08 +%% Generated by autoinst on 2020/03/09 %% \ProvidesFile{OT1TeXGyreScholaX-Sup.fd} - [2020/03/08 (autoinst) Font definitions for OT1/TeXGyreScholaX-Sup.] + [2020/03/09 (autoinst) Font definitions for OT1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,10 +22,6 @@ % ---- regular ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{n}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ot1 -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{it}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-ot1 }{} @@ -34,19 +30,23 @@ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-ot1 }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{regular}{n}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-ot1 +}{} + % ---- bold ---- -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ot1 }{} \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-ot1 }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-ot1 +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-ot1 }{} % @@ -55,10 +55,6 @@ % m --> regular -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{n}{ - <-> alias * TeXGyreScholaX-Sup/regular/n -}{} - \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{it}{ <-> alias * TeXGyreScholaX-Sup/regular/it }{} @@ -67,29 +63,33 @@ <-> alias * TeXGyreScholaX-Sup/regular/sl }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{m}{n}{ + <-> alias * TeXGyreScholaX-Sup/regular/n +}{} + % b --> bold -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{sl}{ + <-> alias * TeXGyreScholaX-Sup/bold/sl }{} \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{n}{ <-> alias * TeXGyreScholaX-Sup/bold/n }{} -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl -}{} - -\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{n}{ - <-> ssub * TeXGyreScholaX-Sup/b/n +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> alias * TeXGyreScholaX-Sup/bold/it }{} \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{it}{ <-> ssub * TeXGyreScholaX-Sup/b/it }{} +\DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{n}{ + <-> ssub * TeXGyreScholaX-Sup/b/n +}{} + \DeclareFontShape{OT1}{TeXGyreScholaX-Sup}{bx}{sl}{ <-> ssub * TeXGyreScholaX-Sup/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Inf.fd b/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Inf.fd index 783b30a7ce0..125ec02cbc5 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/03/08 +%% Generated by autoinst on 2020/03/09 %% \ProvidesFile{T1TeXGyreScholaX-Inf.fd} - [2020/03/08 (autoinst) Font definitions for T1/TeXGyreScholaX-Inf.] + [2020/03/09 (autoinst) Font definitions for T1/TeXGyreScholaX-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -41,14 +41,14 @@ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-inf-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-t1 -}{} - \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-inf-t1 }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{regular}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-inf-t1 +}{} + % % Extra 'alias' rules to map the standard NFSS codes to our fancy names % @@ -59,14 +59,14 @@ <-> alias * TeXGyreScholaX-Inf/regular/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{it}{ - <-> alias * TeXGyreScholaX-Inf/regular/it -}{} - \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{n}{ <-> alias * TeXGyreScholaX-Inf/regular/n }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{m}{it}{ + <-> alias * TeXGyreScholaX-Inf/regular/it +}{} + % b --> bold @@ -82,14 +82,14 @@ <-> alias * TeXGyreScholaX-Inf/bold/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{n}{ - <-> ssub * TeXGyreScholaX-Inf/b/n -}{} - \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{it}{ <-> ssub * TeXGyreScholaX-Inf/b/it }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{n}{ + <-> ssub * TeXGyreScholaX-Inf/b/n +}{} + \DeclareFontShape{T1}{TeXGyreScholaX-Inf}{bx}{sl}{ <-> ssub * TeXGyreScholaX-Inf/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Sup.fd b/Master/texmf-dist/tex/latex/scholax/T1TeXGyreScholaX-Sup.fd index 55096118a4d..0f941f28bda 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/03/08 +%% Generated by autoinst on 2020/03/09 %% \ProvidesFile{T1TeXGyreScholaX-Sup.fd} - [2020/03/08 (autoinst) Font definitions for T1/TeXGyreScholaX-Sup.] + [2020/03/09 (autoinst) Font definitions for T1/TeXGyreScholaX-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -26,27 +26,27 @@ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Slanted-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-t1 -}{} - \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Regular-sup-t1 }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{regular}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Italic-sup-t1 +}{} + % ---- bold ---- -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{sl}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{it}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-t1 }{} \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{n}{ <-> \TeXGyreScholaX@@scale TeXGyreScholaX-Bold-sup-t1 }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{it}{ - <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldItalic-sup-t1 +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bold}{sl}{ + <-> \TeXGyreScholaX@@scale TeXGyreScholaX-BoldSlanted-sup-t1 }{} % @@ -59,27 +59,31 @@ <-> alias * TeXGyreScholaX-Sup/regular/sl }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{it}{ - <-> alias * TeXGyreScholaX-Sup/regular/it -}{} - \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{n}{ <-> alias * TeXGyreScholaX-Sup/regular/n }{} +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{m}{it}{ + <-> alias * TeXGyreScholaX-Sup/regular/it +}{} + % b --> bold -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{sl}{ - <-> alias * TeXGyreScholaX-Sup/bold/sl +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{it}{ + <-> alias * TeXGyreScholaX-Sup/bold/it }{} \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{n}{ <-> alias * TeXGyreScholaX-Sup/bold/n }{} -\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{it}{ - <-> alias * TeXGyreScholaX-Sup/bold/it +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{b}{sl}{ + <-> alias * TeXGyreScholaX-Sup/bold/sl +}{} + +\DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{sl}{ + <-> ssub * TeXGyreScholaX-Sup/b/sl }{} \DeclareFontShape{T1}{TeXGyreScholaX-Sup}{bx}{n}{ @@ -90,8 +94,4 @@ <-> 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 6613c6c0a7b..23dd1c14c88 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.00} -\def\filedate{2019/12/27} +\def\fileversion{1.024} +\def\filedate{2020/03/09} \ProvidesPackage{scholax} [\filedate\space v\fileversion] @@ -64,8 +64,8 @@ \@onlypreamble\useproportional \newif\ifzcs@thrm -\def\zcs@foresolidus{.06em} -\def\zcs@aftsolidus{-.06em} +\def\zcs@foresolidus{-.1em} +\def\zcs@aftsolidus{-.11em} \def\zcs@raisefrac{.111em} \edef\bfseries@rm{b} \edef\mdseries@rm{m} @@ -165,28 +165,33 @@ OsF}\fontshape{sc}\selectfont #1}% {\not@math@alphabet\thfamily\relax \fontfamily\thdefault\selectfont} -\ifzcs@thrm - %\RequirePackage{amsmath,amsthm} % in case of theoremfont - \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty - \@ifpackageloaded{ntheorem}\relax{% - \newtheoremstyle{plain} - {\medskipamount} % ABOVESPACE, was \topsep - {\medskipamount} % BELOWSPACE, was \topsep - {\thfamily} % BODYFONT--\thfamily is defined to be \itshape with upright figures and punctuation - {} % INDENT (empty value is the same as 0pt) - {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection - {.} % HEADPUNCT - {5pt plus 1pt minus 1pt} % HEADSPACE - {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section] - } % end @ifpackageloaded - \fi% -\fi%} +%\show\th@plain +%\ifzcs@thrm +% %\RequirePackage{amsmath,amsthm} % in case of theoremfont +% \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty +% \@ifpackageloaded{ntheorem}\relax{% +% \newtheoremstyle{plain} +% {\medskipamount} % ABOVESPACE, was \topsep +% {\medskipamount} % BELOWSPACE, was \topsep +% {\thfamily} % BODYFONT--\thfamily is defined to be \itshape with upright figures and punctuation +% {} % INDENT (empty value is the same as 0pt) +% {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection +% {.} % HEADPUNCT +% {5pt plus 1pt minus 1pt} % HEADSPACE +% {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section] +% } % end @ifpackageloaded +% \fi% +%\fi%} \AtEndPreamble{% \renewcommand*{\rmdefault}% {TeXGyreScholaX-\TeXGyreScholaX@figurealign\TeXGyreScholaX@figurestyle} \newcommand*{\thdefault}{zcsth-\TeXGyreScholaX@figurestyle} +\ifzcs@thrm + \theoremstyle{plain} + \patchcmd{\th@plain}{\itshape}{\thfamily}{\message{Replaced itshape by thfamily in theorem style plain.}}{\message{Unable to replace itshape by thfamily in theorem style plain.}} +\fi \normalfont} \endinput -- cgit v1.2.3