diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-11 21:27:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-11 21:27:18 +0000 |
commit | fe26b665b6f4adbcd721977687e3e265b2d540db (patch) | |
tree | 7ce0d0dcd4259ce22b97dac429cac5213dd5ba48 /Master/texmf-dist/tex/latex/newtx/newtxtext.sty | |
parent | dc88eee66df8e562403b73d3c9c65451bd3dcf27 (diff) |
newtx (11jan24)
git-svn-id: svn://tug.org/texlive/trunk@69381 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx/newtxtext.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 169 |
1 files changed, 87 insertions, 82 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index b487cbc6dea..ac7033051d3 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -11,8 +11,8 @@ %\def\ntx@state{0} % 0 for both, 1 for tutex only, 2 for legacy only \def\setstate#1{\if 1\ntx@showstate\typeout{State=#1}\fi} -\def\fileversion{1.735} -\def\filedate{2023/12/18} +\def\fileversion{1.737} +\def\filedate{2024/01/11} \ProvidesPackage{newtxtext}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyreTermesX] @@ -130,20 +130,22 @@ \newcommand*{\ntx@scale}{1} % actual scaled command in \ntx@scaled \DeclareOptionX{scale}{\renewcommand*{\ntx@scale}{#1}} \DeclareOptionX{scaled}{\renewcommand*{\ntx@scale}{#1}} -\newdimen\ntxsups@scale -\newdimen\ntxsups@raise -\def\ntxsups@raised{\z@} -\def\ntxsups@Lspaced{.03em} -\def\ntxsups@Rspaced{.03em} -\def\ntxsups@scaledval{1} -\def\ntxsups@scalefactor{1} -\newcommand*{\ntxsups@color}{black} -\DeclareOptionX{supscaled}{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 -\DeclareOptionX{supscale}{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 -\DeclareOptionX{supsraised}{\renewcommand*{\ntxsups@raised}{#1}}%added 2023/09/16 -\DeclareOptionX{supLspaced}{\renewcommand*{\ntxsups@Lspaced}{#1}}%added 2023/09/16 -\DeclareOptionX{supRspaced}{\renewcommand*{\ntxsups@Rspaced}{#1}}%added 2023/09/16 -\DeclareOptionX{supscolor}{\renewcommand*{\ntxsups@color}{#1}} %added 2023/09/16 +%\newdimen\ntxsups@scale +%\newdimen\ntxsups@raise +%\def\ntxsups@raised{\z@} +%\def\ntxsups@Lspaced{.03em} +%\def\ntxsups@Rspaced{.03em} +%\def\ntxsups@scaledval{1} +%\def\ntxsups@scalefactor{1} +%\newcommand*{\ntxsups@color}{black} +\newif\ifntx@supsflag +\DeclareOptionX{supscaled}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 +\DeclareOptionX{supscale}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@scaledval}{#1}}%added 2023/09/16 +\DeclareOptionX{supsraised}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@raised}{#1}}%added 2023/09/16 +\DeclareOptionX{supLspaced}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@Lspaced}{#1}}%added 2023/09/16 +\DeclareOptionX{supRspaced}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@Rspaced}{#1}}%added 2023/09/16 +\DeclareOptionX{supspaced}{\ntx@supsflagtrue}% +\DeclareOptionX{supscolor}{\ntx@supsflagtrue}%{\renewcommand*{\ntxsups@color}{#1}} %added 2023/09/16 \newif\ifntx@defaultsups %\newif\ifntx@adobesc % we don't use this exc. in fd, but may in future @@ -224,13 +226,16 @@ %\def\ntx@sfrSC{#1}} \ProcessOptionsX\relax +\ifntx@supsflag% +\PackageWarningNoLine{newpxtext}{sups options no longer handled---use superiors package (v2) instead.}\fi + % otfmath beats no-math \ifntx@otfmath\ntx@nomathfalse\fi -\setlength{\ntxsups@raise}{\ntxsups@raised} -\setlength{\ntxsups@scale}{\ntxsups@scaledval\p@} -\ntxsups@scale=\ntx@scale\ntxsups@scale % -\def\ntxsups@scalefactor{\strip@pt\ntxsups@scale} -\def\ntxsups@scaled{s*[\ntxsups@scalefactor]} +%\setlength{\ntxsups@raise}{\ntxsups@raised} +%\setlength{\ntxsups@scale}{\ntxsups@scaledval\p@} +%\ntxsups@scale=\ntx@scale\ntxsups@scale % +%\def\ntxsups@scalefactor{\strip@pt\ntxsups@scale} +%\def\ntxsups@scaled{s*[\ntxsups@scalefactor]} %\ifntx@otftext \typeout{ntx@otftexttrue}\else\typeout{ntx@otftextfalse}\fi \ifntx@newtx\let\ntx@scale=\ntxtext@scale\fi @@ -499,38 +504,38 @@ \fontfamily{ntxtosf}\selectfont % } \ifntx@defaultsups % - \else - \ExplSyntaxOn - %\@textsuperscript is defined in latex.ltx to render text at about 70% size, at math superscript position - \DeclareDocumentCommand \textsuperscript {m} { - \hbox_set:Nn \l_tmpa_box {{\sustyle #1}} - \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } - \hbox_set:Nn \l_tmpa_box - { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } - \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}}% - - - \cs_set:Npn \@makefnmark { - \mbox{% - \footnotemarkfont\textsuperscript{\@thefnmark}} - } - \cs_if_exist:NTF \ftntm@font % will exist only for KOMA - { - \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} - } - { - \cs_new:Npn \footnotemarkfont {\normalfont} - } - \ExplSyntaxOff - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} -% \patchcmd{\maketitle} -%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} %2.18? - \ifntx@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi + \else\fi +% \ExplSyntaxOn +% %\@textsuperscript is defined in latex.ltx to render text at about 70% size, at math superscript position +% \DeclareDocumentCommand \textsuperscript {m} { +% \hbox_set:Nn \l_tmpa_box {{\sustyle #1}} +% \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } +% \hbox_set:Nn \l_tmpa_box +% { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } +% \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}}% +% +% +% \cs_set:Npn \@makefnmark { +% \mbox{% +% \footnotemarkfont\textsuperscript{\@thefnmark}} +% } +% \cs_if_exist:NTF \ftntm@font % will exist only for KOMA +% { +% \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} +% } +% { +% \cs_new:Npn \footnotemarkfont {\normalfont} +% } +% \ExplSyntaxOff +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} %2.18? +% \ifntx@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi % \ifntx@KOMA % %\let\textsuperscript\sustyle % \else % NOT KOMA @@ -641,35 +646,35 @@ \ifntx@defaultsups % \else - %\RequirePackage{realscripts} - \ExplSyntaxOn - \RenewDocumentCommand \textsuperscript {m} { - \hbox_set:Nn \l_tmpa_box {\textsu{\tlfstyle #1}} - \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } - \hbox_set:Nn \l_tmpa_box - { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } - \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}} - -\cs_set:Npn \@makefnmark { - \mbox{\footnotemarkfont\textsuperscript{\@thefnmark}} -} -\cs_if_exist:NTF \ftntm@font % KOMA only -{ - \cs_new:Npn \footnotemarkfont {\ftntm@font} -} -{ - \cs_new:Npn \footnotemarkfont {\normalfont} -} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} -% \patchcmd{\maketitle} -%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} % 2.18? - \ExplSyntaxOff - \ifntx@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi% end of tutex footnote handling + \fi +% \ExplSyntaxOn +% \RenewDocumentCommand \textsuperscript {m} { +% \hbox_set:Nn \l_tmpa_box {\textsu{\tlfstyle #1}} +% \box_scale:Nnn \l_tmpa_box { \ntxsups@scalefactor } { \ntxsups@scalefactor } +% \hbox_set:Nn \l_tmpa_box +% { \box_move_up:nn \ntxsups@raised {\box_use:N \l_tmpa_box} } +% \hspace*{\ntxsups@Lspaced}{\color{\ntxsups@color}\box_use:N \l_tmpa_box} \hspace*{\ntxsups@Rspaced}} +% +%\cs_set:Npn \@makefnmark { +% \mbox{\footnotemarkfont\textsuperscript{\@thefnmark}} +%} +%\cs_if_exist:NTF \ftntm@font % KOMA only +%{ +% \cs_new:Npn \footnotemarkfont {\ftntm@font} +%} +%{ +% \cs_new:Npn \footnotemarkfont {\normalfont} +%} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@1.8em}{}{} % 2.18? +% \ExplSyntaxOff +% \ifntx@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi% end of tutex footnote handling % \else % tutex+LTX (article,book,report) % \patchcmd[]{\maketitle}{\normalfont\@thefnmark}{\@thefnmark}{\message{Successfully patched maketitle command}}{\message{Unable to patch maketitle command}} % \patchcmd[]{\maketitle}{\normalfont\@thefnmark}{\@thefnmark}{\message{Successfully patched maketitle command}}{\message{Unable to patch maketitle command}} |