diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
25 files changed, 528 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd index d3395d04c3b..6598756cec7 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ly1ntxlf.fd}[2015/01/17 v1.0 font definition file for LY1/ntx/lf] +\ProvidesFile{ly1ntxlf.fd}[2021/05/08 v1.0 font definition file for LY1/ntx/lf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,15 @@ \DeclareFontShape{LY1}{ntxlf}{bx}{n}{<->ssub * ntxlf/b/n}{} \DeclareFontShape{LY1}{ntxlf}{bx}{scit}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{LY1}{ntxlf}{bx}{it}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{LY1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ly1}{} -\DeclareFontShape{LY1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} -\DeclareFontShape{LY1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{LY1}{ntxlf}{m}{sl}{<-> \ntx@scaled ly1xsl-lf}{} + \DeclareFontShape{LY1}{ntxlf}{b}{sl}{<-> \ntx@scaled ztmbsl-lf-ly1}{} + \DeclareFontShape{LY1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{LY1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} + \DeclareFontShape{LY1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} + \DeclareFontShape{LY1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} +\fi \DeclareFontShape{LY1}{ntxlf}{b}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{LY1}{ntxlf}{bx}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{LY1}{ntxlf}{m}{scsl}{<->ssub * ntxlf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd index a9026bdd90b..6360501bd7d 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ly1ntxosf.fd}[2015/01/17 v1.0 font definition file for LY1/ntx/osf] +\ProvidesFile{ly1ntxosf.fd}[2021/05/08 v1.0 font definition file for LY1/ntx/osf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxth-lf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-lf.fd new file mode 100644 index 00000000000..80aba3a3226 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-lf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ly1ntxth-lf.fd}[2021/05/07 v1.0 font definition file for LY1/ntxth/lf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{LY1}{ntxth-lf}{\ntx@spacing} +\DeclareFontShape{LY1}{ntxth-lf}{m}{it}{<-> \ntx@scaled ntxth-Italic-tlf-ly1}{} +\DeclareFontShape{LY1}{ntxth-lf}{m}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{m}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{m}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{b}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{bx}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{b}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{bx}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{b}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{bx}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{b}{it}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{bx}{it}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{m}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{b}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{bx}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{b}{scsl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{bx}{scsl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{LY1}{ntxth-lf}{m}{scsl}{<->ssub * ntxth-lf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxth-osf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-osf.fd new file mode 100644 index 00000000000..cbd55d09cbd --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-osf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ly1ntxth-osf.fd}[2021/05/07 v1.0 font definition file for LY1/ntxth/osf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{LY1}{ntxth-osf}{\ntx@spacing} +\DeclareFontShape{LY1}{ntxth-osf}{m}{it}{<-> \ntx@scaled ntxth-Italic-osf-ly1}{} +\DeclareFontShape{LY1}{ntxth-osf}{m}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{m}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{m}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{b}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{bx}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{b}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{bx}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{b}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{bx}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{b}{it}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{bx}{it}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{m}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{b}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{bx}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{b}{scsl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{bx}{scsl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{LY1}{ntxth-osf}{m}{scsl}{<->ssub * ntxth-osf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxth-tlf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-tlf.fd new file mode 100644 index 00000000000..a14e1073988 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-tlf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ly1ntxth-tlf.fd}[2021/05/06 v1.0 font definition file for LY1/ntxth/tlf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{LY1}{ntxth-tlf}{\ntx@spacing} +\DeclareFontShape{LY1}{ntxth-tlf}{m}{it}{<-> \ntx@scaled ntxth-Italic-tlf-ly1}{} +\DeclareFontShape{LY1}{ntxth-tlf}{m}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{m}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{m}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{b}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{bx}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{b}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{bx}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{b}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{bx}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{b}{it}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{bx}{it}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{m}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{b}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{bx}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{b}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{bx}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tlf}{m}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxth-tosf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-tosf.fd new file mode 100644 index 00000000000..cf298132f44 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxth-tosf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ly1ntxth-tosf.fd}[2021/05/07 v1.0 font definition file for LY1/ntxth/tosf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{LY1}{ntxth-tosf}{\ntx@spacing} +\DeclareFontShape{LY1}{ntxth-tosf}{m}{it}{<-> \ntx@scaled ntxth-Italic-osf-ly1}{} +\DeclareFontShape{LY1}{ntxth-tosf}{m}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{m}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{m}{scit}{<-> ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{b}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{bx}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{b}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{bx}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{b}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{bx}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{b}{it}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{bx}{it}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{m}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{b}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{bx}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{b}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{bx}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{LY1}{ntxth-tosf}{m}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd index 02c7aef37cc..7fd8882ac8d 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ly1ntxtlf.fd}[2015/01/17 v1.0 font definition file for LY1/ntx/tlf] +\ProvidesFile{ly1ntxtlf.fd}[2021/05/08 v1.0 font definition file for LY1/ntx/tlf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,15 @@ \DeclareFontShape{LY1}{ntxtlf}{bx}{n}{<->ssub * ntxtlf/b/n}{} \DeclareFontShape{LY1}{ntxtlf}{bx}{scit}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{LY1}{ntxtlf}{bx}{it}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{LY1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ly1}{} -\DeclareFontShape{LY1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} -\DeclareFontShape{LY1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{LY1}{ntxtlf}{m}{sl}{<-> \ntx@scaled tyxsl}{} + \DeclareFontShape{LY1}{ntxtlf}{b}{sl}{<-> \ntx@scaled ztmbsl-tlf-ly1}{} + \DeclareFontShape{LY1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{LY1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} + \DeclareFontShape{LY1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} + \DeclareFontShape{LY1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} +\fi \DeclareFontShape{LY1}{ntxtlf}{b}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{LY1}{ntxtlf}{bx}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{LY1}{ntxtlf}{m}{scsl}{<->ssub * ntxtlf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd index 32c7f2fee4c..918953a2ab9 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ly1ntxtosf.fd}[2015/01/17 v1.0 font definition file for LY1/ntx/tosf] +\ProvidesFile{ly1ntxtosf.fd}[2021/05/08 v1.0 font definition file for LY1/ntx/tosf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -23,9 +27,15 @@ \DeclareFontShape{LY1}{ntxtosf}{bx}{n}{<->ssub * ntxtosf/b/n}{} \DeclareFontShape{LY1}{ntxtosf}{bx}{scit}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{LY1}{ntxtosf}{bx}{it}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{LY1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-ly1}{} -\DeclareFontShape{LY1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} -\DeclareFontShape{LY1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{LY1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ly1xsl-tosf}{} + \DeclareFontShape{LY1}{ntxtosf}{b}{sl}{<-> \ntx@scaled ztmbsl-tosf-ly1}{} + \DeclareFontShape{LY1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{LY1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} + \DeclareFontShape{LY1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} + \DeclareFontShape{LY1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} +\fi \DeclareFontShape{LY1}{ntxtosf}{b}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{LY1}{ntxtosf}{bx}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{LY1}{ntxtosf}{m}{scsl}{<->ssub * ntxtosf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index bea71a0617d..719ef139455 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -1,7 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.630} -\def\filedate{2020/09/19} +\def\fileversion{1.65} +\def\filedate{2021/05/16} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)} @@ -20,6 +20,7 @@ \@onlypreamble\useproportional \RequirePackage{etoolbox} +\def\ntx@dfltfigurestyle{lf} \def\ntx@figurestyle{lf}% default is lining figure style \def\ntx@figurealign{t}% default is tabular figure alignment \newif\ifntx@defaultsups @@ -41,6 +42,8 @@ \define@key{ntx}{babel}[true]{\relax}% keep, though no effect %\csname ntx@babel#1\endcsname} \newif\ifntx@thrm +\newif\ifntx@sl % slanted means theoremfont, by default +% If set to true, slanted really does mean true slanted \define@key{ntx}{helvratio}[0.9]{\def\ntx@helvratio{#1}} \define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}% \def\ntx@scale{#1}\def\LGCscale{#1}} @@ -60,6 +63,7 @@ \DeclareOption{lining}{\edef\ntx@figurestyle{lf}} \DeclareOption{lf}{\edef\ntx@figurestyle{lf}} \DeclareOption{theoremfont}{\ntx@thrmtrue} +\DeclareOption{trueslanted}{\ntx@sltrue} \DeclareOption{oldstyle}{\useosf} \DeclareOption{osf}{\useosf} \DeclareOption{tabular}{\edef\ntx@figurealign{t}} @@ -344,9 +348,29 @@ % \ntx@figurestyle} % \normalfont %\else - \AtEndPreamble{% + +\DeclareRobustCommand\thfamily % new family for theorem font + {\not@math@alphabet\thfamily\relax + \fontfamily\thdefault\selectfont} +\DeclareRobustCommand{\textth}[1]{% + {\thfamily #1}% +} +\let\textthit\textth + +\AtEndPreamble{% \renewcommand*{\rmdefault}{ntx\ntx@figurealign% \ntx@figurestyle} +\def\ntx@thfigurestyle{\ntx@figurestyle} +\ifx\ntx@figurestyle\ntx@dfltfigurestyle + \def\ntx@thfigurestyle{tlf} +\else + \def\ntx@thfigurestyle{osf} +\fi % there just two possible figure styles for the theorem font +\newcommand*{\thdefault}{ntxth-\ntx@thfigurestyle} +\ifntx@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} %\fi diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd index 215a44ed6d7..e685017088e 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ot1ntxlf.fd}[2015/01/19 v1.0 font definition file for OT1/ntx/lf] +\ProvidesFile{ot1ntxlf.fd}[2021/05/08 v1.0 font definition file for OT1/ntx/lf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,15 @@ \DeclareFontShape{OT1}{ntxlf}{bx}{n}{<->ssub * ntxlf/b/n}{} \DeclareFontShape{OT1}{ntxlf}{bx}{scit}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{OT1}{ntxlf}{bx}{it}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{OT1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ot1}{} -\DeclareFontShape{OT1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} -\DeclareFontShape{OT1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{OT1}{ntxlf}{m}{sl}{<-> \ntx@scaled ot1xsl-lf}{} + \DeclareFontShape{OT1}{ntxlf}{b}{sl}{<-> \ntx@scaled ztmbsl-lf-ot1}{} + \DeclareFontShape{OT1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{OT1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} + \DeclareFontShape{OT1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} + \DeclareFontShape{OT1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} +\fi \DeclareFontShape{OT1}{ntxlf}{b}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{OT1}{ntxlf}{bx}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{OT1}{ntxlf}{m}{scsl}{<->ssub * ntxlf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd index 3cf89bf7bf4..e52f5b27501 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ot1ntxosf.fd}[2015/01/17 v1.0 font definition file for OT1/ntx/osf] +\ProvidesFile{ot1ntxosf.fd}[2021/05/08 v1.0 font definition file for OT1/ntx/osf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,15 @@ \DeclareFontShape{OT1}{ntxosf}{bx}{n}{<->ssub * ntxosf/b/n}{} \DeclareFontShape{OT1}{ntxosf}{bx}{scit}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{OT1}{ntxosf}{bx}{it}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{OT1}{ntxosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-ot1}{} -\DeclareFontShape{OT1}{ntxosf}{b}{sl}{<->ssub * ntxosf/m/sl}{} -\DeclareFontShape{OT1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{OT1}{ntxosf}{m}{sl}{<-> \ntx@scaled ot1xsl-osf}{} + \DeclareFontShape{OT1}{ntxosf}{b}{sl}{<-> \ntx@scaled ztmbsl-osf-ot1}{} + \DeclareFontShape{OT1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{OT1}{ntxosf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} + \DeclareFontShape{OT1}{ntxosf}{b}{sl}{<->ssub * ntxosf/m/sl}{} + \DeclareFontShape{OT1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/m/sl}{} +\fi \DeclareFontShape{OT1}{ntxosf}{b}{scsl}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{OT1}{ntxosf}{bx}{scsl}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{OT1}{ntxosf}{m}{scsl}{<->ssub * ntxosf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxth-lf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-lf.fd new file mode 100644 index 00000000000..e88d20a8c95 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-lf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ot1ntxth-lf.fd}[2021/05/07 v1.0 font definition file for OT1/ntxth/lf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{OT1}{ntxth-lf}{\ntx@spacing} +\DeclareFontShape{OT1}{ntxth-lf}{m}{it}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} +\DeclareFontShape{OT1}{ntxth-lf}{m}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{m}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{m}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{b}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{bx}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{b}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{bx}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{b}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{bx}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{b}{it}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{bx}{it}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{m}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{b}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{bx}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{b}{scsl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{bx}{scsl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{OT1}{ntxth-lf}{m}{scsl}{<->ssub * ntxth-lf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxth-osf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-osf.fd new file mode 100644 index 00000000000..62d53017eef --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-osf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ot1ntxth-osf.fd}[2021/05/07 v1.0 font definition file for OT1/ntxth/osf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{OT1}{ntxth-osf}{\ntx@spacing} +\DeclareFontShape{OT1}{ntxth-osf}{m}{it}{<-> \ntx@scaled ntxth-Italic-osf-ot1}{} +\DeclareFontShape{OT1}{ntxth-osf}{m}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{m}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{m}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{b}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{bx}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{b}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{bx}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{b}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{bx}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{b}{it}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{bx}{it}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{m}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{b}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{bx}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{b}{scsl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{bx}{scsl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{OT1}{ntxth-osf}{m}{scsl}{<->ssub * ntxth-osf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxth-tlf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-tlf.fd new file mode 100644 index 00000000000..f8e64dae78d --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-tlf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ot1ntxth-tlf.fd}[2021/05/06 v1.0 font definition file for OT1/ntxth/tlf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{OT1}{ntxth-tlf}{\ntx@spacing} +\DeclareFontShape{OT1}{ntxth-tlf}{m}{it}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} +\DeclareFontShape{OT1}{ntxth-tlf}{m}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{m}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{m}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{b}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{bx}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{b}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{bx}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{b}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{bx}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{b}{it}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{bx}{it}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{m}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{b}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{bx}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{b}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{bx}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tlf}{m}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxth-tosf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-tosf.fd new file mode 100644 index 00000000000..8a683572b24 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxth-tosf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{ot1ntxth-tosf.fd}[2021/05/07 v1.0 font definition file for OT1/ntxth/tosf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{OT1}{ntxth-tosf}{\ntx@spacing} +\DeclareFontShape{OT1}{ntxth-tosf}{m}{it}{<-> \ntx@scaled ntxth-Italic-osf-ot1}{} +\DeclareFontShape{OT1}{ntxth-tosf}{m}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{m}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{m}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{b}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{bx}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{b}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{bx}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{b}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{bx}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{b}{it}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{bx}{it}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{m}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{b}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{bx}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{b}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{bx}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{OT1}{ntxth-tosf}{m}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd index c566647cdcf..7d2c64bd7ae 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ot1ntxtlf.fd}[2015/01/17 v1.0 font definition file for OT1/ntx/tlf] +\ProvidesFile{ot1ntxtlf.fd}[2021/05/08 v1.0 font definition file for OT1/ntx/tlf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,15 @@ \DeclareFontShape{OT1}{ntxtlf}{bx}{n}{<->ssub * ntxtlf/b/n}{} \DeclareFontShape{OT1}{ntxtlf}{bx}{scit}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{OT1}{ntxtlf}{bx}{it}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{OT1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ot1}{} -\DeclareFontShape{OT1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} -\DeclareFontShape{OT1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{OT1}{ntxtlf}{m}{sl}{<-> \ntx@scaled txsl}{} + \DeclareFontShape{OT1}{ntxtlf}{b}{sl}{<-> \ntx@scaled ztmbsl-tlf-ot1}{} + \DeclareFontShape{OT1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{OT1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} + \DeclareFontShape{OT1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} + \DeclareFontShape{OT1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} +\fi \DeclareFontShape{OT1}{ntxtlf}{b}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{OT1}{ntxtlf}{bx}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{OT1}{ntxtlf}{m}{scsl}{<->ssub * ntxtlf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd index 14a6cb7dc71..5d8421fec7b 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{ot1ntxtosf.fd}[2015/01/17 v1.0 font definition file for OT1/ntx/tosf] +\ProvidesFile{ot1ntxtosf.fd}[2021/05/08 v1.0 font definition file for OT1/ntx/tosf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -23,9 +27,15 @@ \DeclareFontShape{OT1}{ntxtosf}{bx}{n}{<->ssub * ntxtosf/b/n}{} \DeclareFontShape{OT1}{ntxtosf}{bx}{scit}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{OT1}{ntxtosf}{bx}{it}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{OT1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-ot1}{} -\DeclareFontShape{OT1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} -\DeclareFontShape{OT1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{OT1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ot1xsl-tosf}{} + \DeclareFontShape{OT1}{ntxtosf}{b}{sl}{<-> \ntx@scaled ztmbsl-tosf-ot1}{} + \DeclareFontShape{OT1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{OT1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-ot1}{} + \DeclareFontShape{OT1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} + \DeclareFontShape{OT1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} +\fi \DeclareFontShape{OT1}{ntxtosf}{b}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{OT1}{ntxtosf}{bx}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{OT1}{ntxtosf}{m}{scsl}{<->ssub * ntxtosf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd index 449bfc32b59..6e077f602f7 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{t1ntxlf.fd}[2015/01/17 v1.0 font definition file for T1/ntx/lf] +\ProvidesFile{t1ntxlf.fd}[2021/05/07 v1.1 font definition file for T1/ntx/lf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,16 @@ \DeclareFontShape{T1}{ntxlf}{bx}{n}{<->ssub * ntxlf/b/n}{} \DeclareFontShape{T1}{ntxlf}{bx}{scit}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{T1}{ntxlf}{bx}{it}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{T1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-t1}{} -\DeclareFontShape{T1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} -\DeclareFontShape{T1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{T1}{ntxlf}{m}{sl}{<-> \ntx@scaled t1xsl-lf}{} + \DeclareFontShape{T1}{ntxlf}{b}{sl}{<-> \ntx@scaled ztmbsl-lf-t1}{} + \DeclareFontShape{T1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{T1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-t1}{} + \DeclareFontShape{T1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} + \DeclareFontShape{T1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} +\fi + \DeclareFontShape{T1}{ntxlf}{b}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{T1}{ntxlf}{bx}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{T1}{ntxlf}{m}{scsl}{<->ssub * ntxlf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd index d84c8bd7705..20b9fbf84ce 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{t1ntxosf.fd}[2015/01/17 v1.0 font definition file for T1/ntx/osf] +\ProvidesFile{t1ntxosf.fd}[2021/05/07 v1.1 font definition file for T1/ntx/osf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,16 @@ \DeclareFontShape{T1}{ntxosf}{bx}{n}{<->ssub * ntxosf/b/n}{} \DeclareFontShape{T1}{ntxosf}{bx}{scit}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{T1}{ntxosf}{bx}{it}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{T1}{ntxosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-t1}{} -\DeclareFontShape{T1}{ntxosf}{b}{sl}{<->ssub * ntxosf/m/sl}{} -\DeclareFontShape{T1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{T1}{ntxosf}{m}{sl}{<-> \ntx@scaled t1xsl-osf}{} + \DeclareFontShape{T1}{ntxosf}{b}{sl}{<-> \ntx@scaled ztmbsl-osf-t1}{} + \DeclareFontShape{T1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{T1}{ntxosf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-osf-t1}{} + \DeclareFontShape{T1}{ntxosf}{b}{sl}{<->ssub * ntxosf/m/sl}{} + \DeclareFontShape{T1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/m/sl}{} +\fi + \DeclareFontShape{T1}{ntxosf}{b}{scsl}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{T1}{ntxosf}{bx}{scsl}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{T1}{ntxosf}{m}{scsl}{<->ssub * ntxosf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxth-lf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxth-lf.fd new file mode 100644 index 00000000000..743672592a1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxth-lf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{t1ntxth-lf.fd}[2021/05/07 v1.0 font definition file for T1/ntxth/lf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{T1}{ntxth-lf}{\ntx@spacing} +\DeclareFontShape{T1}{ntxth-lf}{m}{it}{<-> \ntx@scaled ntxth-Italic-tlf-t1}{} +\DeclareFontShape{T1}{ntxth-lf}{m}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{m}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{m}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{b}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{bx}{sc}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{b}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{bx}{n}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{b}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{bx}{scit}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{b}{it}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{bx}{it}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{m}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{b}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{bx}{sl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{b}{scsl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{bx}{scsl}{<->ssub * ntxth-lf/m/it}{} +\DeclareFontShape{T1}{ntxth-lf}{m}{scsl}{<->ssub * ntxth-lf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxth-osf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxth-osf.fd new file mode 100644 index 00000000000..f428e63995b --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxth-osf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{t1ntxth-osf.fd}[2021/05/07 v1.0 font definition file for T1/ntxth/osf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{T1}{ntxth-osf}{\ntx@spacing} +\DeclareFontShape{T1}{ntxth-osf}{m}{it}{<-> \ntx@scaled ntxth-Italic-osf-t1}{} +\DeclareFontShape{T1}{ntxth-osf}{m}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{m}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{m}{scit}{<-> ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{b}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{bx}{sc}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{b}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{bx}{n}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{b}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{bx}{scit}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{b}{it}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{bx}{it}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{m}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{b}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{bx}{sl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{b}{scsl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{bx}{scsl}{<->ssub * ntxth-osf/m/it}{} +\DeclareFontShape{T1}{ntxth-osf}{m}{scsl}{<->ssub * ntxth-osf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxth-tlf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxth-tlf.fd new file mode 100644 index 00000000000..d4ace2c2cea --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxth-tlf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{t1ntxth-tlf.fd}[2021/05/06 v1.0 font definition file for T1/ntxth/tlf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi + +\DeclareFontFamily{T1}{ntxth-tlf}{\ntx@spacing} +\DeclareFontShape{T1}{ntxth-tlf}{m}{it}{<-> \ntx@scaled ntxth-Italic-tlf-t1}{} +\DeclareFontShape{T1}{ntxth-tlf}{m}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{m}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{m}{scit}{<-> ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{b}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{bx}{sc}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{b}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{bx}{n}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{b}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{bx}{scit}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{b}{it}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{bx}{it}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{m}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{b}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{bx}{sl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{b}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{bx}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\DeclareFontShape{T1}{ntxth-tlf}{m}{scsl}{<->ssub * ntxth-tlf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxth-tosf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxth-tosf.fd new file mode 100644 index 00000000000..cfa6c457703 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxth-tosf.fd @@ -0,0 +1,28 @@ +\ProvidesFile{t1ntxth-tosf.fd}[2021/05/07 v1.0 font definition file for T1/ntxth/tosf] + +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \let\ntx@scaled\@empty% +\fi + +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi +%\traceon +\DeclareFontFamily{T1}{ntxth-tosf}{\ntx@spacing} +\DeclareFontShape{T1}{ntxth-tosf}{m}{it}{<-> \ntx@scaled ntxth-Italic-osf-t1}{} +\DeclareFontShape{T1}{ntxth-tosf}{m}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{m}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{m}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{b}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{bx}{sc}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{b}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{bx}{n}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{b}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{bx}{scit}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{b}{it}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{bx}{it}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{m}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{b}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{bx}{sl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{b}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{bx}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\DeclareFontShape{T1}{ntxth-tosf}{m}{scsl}{<->ssub * ntxth-tosf/m/it}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd index 2c3182cc808..9de08e5de0e 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{t1ntxtlf.fd}[2015/01/17 v1.0 font definition file for T1/ntx/tlf] +\ProvidesFile{t1ntxtlf.fd}[2021/05/07 v1.1 font definition file for T1/ntx/tlf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -21,9 +25,18 @@ \DeclareFontShape{T1}{ntxtlf}{bx}{n}{<->ssub * ntxtlf/b/n}{} \DeclareFontShape{T1}{ntxtlf}{bx}{scit}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{T1}{ntxtlf}{bx}{it}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{T1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-t1}{} -\DeclareFontShape{T1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} -\DeclareFontShape{T1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{T1}{ntxtlf}{m}{sl}{<-> \ntx@scaled t1xsl}{} + \DeclareFontShape{T1}{ntxtlf}{b}{sl}{<-> \ntx@scaled ztmbsl-tlf-t1}{} + \DeclareFontShape{T1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/b/sl}{} + +\else %point to theorem font + \DeclareFontShape{T1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-tlf-t1}{} + \DeclareFontShape{T1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} + \DeclareFontShape{T1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} + +\fi + \DeclareFontShape{T1}{ntxtlf}{b}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{T1}{ntxtlf}{bx}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{T1}{ntxtlf}{m}{scsl}{<->ssub * ntxtlf/m/scit}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd index ee3e68f46b4..bca2a799f04 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd @@ -1,4 +1,8 @@ -\ProvidesFile{t1ntxtosf.fd}[2015/01/17 v1.0 font definition file for T1/ntx/tosf] +\ProvidesFile{t1ntxtosf.fd}[2021/05/07 v1.1 font definition file for T1/ntx/tosf] + +\expandafter\ifx\csname ntx@sltrue\endcsname\relax + \global\newif\ntx@sl\global\ntx@sltrue% +\fi \expandafter\ifx\csname ntx@scaled\endcsname\relax \let\ntx@scaled\@empty% @@ -23,9 +27,16 @@ \DeclareFontShape{T1}{ntxtosf}{bx}{n}{<->ssub * ntxtosf/b/n}{} \DeclareFontShape{T1}{ntxtosf}{bx}{scit}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{T1}{ntxtosf}{bx}{it}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{T1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-t1}{} -\DeclareFontShape{T1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} -\DeclareFontShape{T1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} +\ifntx@sl % point to real slanted fonts + \DeclareFontShape{T1}{ntxtosf}{m}{sl}{<-> \ntx@scaled t1xsl-tosf}{} + \DeclareFontShape{T1}{ntxtosf}{b}{sl}{<-> \ntx@scaled ztmbsl-tosf-t1}{} + \DeclareFontShape{T1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/b/sl}{} +\else %point to theorem font + \DeclareFontShape{T1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntxth-Italic-osf-t1}{} + \DeclareFontShape{T1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} + \DeclareFontShape{T1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} +\fi + \DeclareFontShape{T1}{ntxtosf}{b}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{T1}{ntxtosf}{bx}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{T1}{ntxtosf}{m}{scsl}{<->ssub * ntxtosf/m/scit}{} |