4 files changed, 63 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/fonts/stickstoo/README b/Master/texmf-dist/doc/fonts/stickstoo/README
index 3463ab8b9d1..126d18f2c5c 100644
--- a/Master/texmf-dist/doc/fonts/stickstoo/README
+++ b/Master/texmf-dist/doc/fonts/stickstoo/README
@@ -19,7 +19,13 @@ The font files and the LaTeX support files are
 Files provided "as is", with no warranties.
 
 
-Current version: 1.034 2020-12-20
+Current version: 1.035 2021-10-17
+
+Changes in version 1.035
+1. Added a more capable \textfrac macro.
+2. Changed name \textin to texinf (for inferior figures) in order to avoid
+a conflict with hyperref.
+3. Minor documentation corrections and additions.
 
 Changes in version 1.034
 Added some Greek Blackboard Bold glyphs, bringing sticktoo math into compliance with newtxmath 1.640.
diff --git a/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.pdf b/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.pdf
index 77781a62428..79c7e67340f 100644
--- a/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.tex b/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.tex
index 276a9980b46..1f12232053b 100644
--- a/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.tex
+++ b/Master/texmf-dist/doc/fonts/stickstoo/stickstoo-doc.tex
@@ -1,4 +1,4 @@
-% !TEX TS-program = pdflatexmk
+% !TEX TS-program = pdflatex
 % Template file for TeXShop by Michael Sharpe, LPPL
 \documentclass[11pt]{article}
 \usepackage[margin=1in]{geometry} 
@@ -24,6 +24,7 @@
 
 \begin{document}
 \maketitle
+
 \section{In short}
 {\tt SticksToo} is a repackaging for \LaTeX\ of the text part of {\tt STIX2} that was released in early May 2018. The style file {\tt stix2.sty} does offer support for text processing at a rather basic level, but does not provide much access to the riches of the {\tt STIX2} Text fonts. With 
 {\tt SticksToo} there are most of the options and macros that are part of the {\tt newtxtext} package, but with Times fonts replaced by {\tt StixTwoText} fonts. As of the initial release of {\tt STIX2}, the math fonts have some problem which make them unsuited to high quality mathematical typesetting, and so I'm offering an update of {\tt newtxmath} with option {\tt stix2} that makes use of the Roman and Greek letters from {\tt STIX2} (the two year old beta version, not the one now available on CTAN)
@@ -43,7 +44,7 @@ scales everything up by 15\%.
 These affect the figure style used in text. The default is {\tt tabular}, {\tt lining}, which is appropriate for math usage, and will be used in math mode no matter how you set the text figure option. E.g., {\tt p,osf} sets the text figure style to {\tt proportional}, {\tt oldstyle}, like \textosf{12345}. 
 
 {\tt scosf:}\\
-This option makes {\tt osf} the default figure style in small cap text. 
+This option makes {\tt osf} the default figure style in small caps text. 
 
 {\tt theoremfont:}\\
 This option redefines the meaning of \verb|\textsl| and substitutes it for \verb|\textit| in the definition of the {\tt plain} theorem style. \textsl{This is how the Theorem font looks: it is Italic but has upright punctuation symbols :;!? etc. The figures are not changed, but should in many cases be tabular lining figures, accessed using, e.g.,\/} \verb|\texttlf|.
@@ -57,7 +58,7 @@ texdoc newtx
 \end{verbatim}
 and look at its discussion of the newtx text options.
 
-\verb|\textosf, \texttosf, \textlf, \texttlf, \textsu, \textin, \textnu, \textde|:
+\verb|\textosf, \texttosf, \textlf, \texttlf, \textsu, \textinf, \textnu, \textde|:
 These macros provide ways to use other figures styles, no matter what defaults may have been set. They denote respectively proportional oldstyle, tabular oldstyle, lining, tabular lining, superiors, inferiors, numerators and denominators, which render as follows.
 
 \verb|\textosf{0123456789}| \textosf{0123456789}\\
@@ -65,11 +66,11 @@ These macros provide ways to use other figures styles, no matter what defaults m
 \verb|\textlf{0123456789}| \textlf{0123456789}\\
 \verb|\texttlf{0123456789}| \texttlf{0123456789}\\
 \verb|\textsu{0123456789abc+-=()}| \textsu{0123456789abc+-=()}\\
-\verb|\textin{0123456789}| \textin{0123456789}\\
+\verb|\textinf{0123456789}| \textinf{0123456789}\\
 \verb|\textnu{0123456789}| \textnu{0123456789}\\
 \verb|\textde{0123456789}| \textde{0123456789}\\
-\verb|\textsu{1}\textnu{1}; \textin{1}\textde{1}| \textsu{1}\textnu{1}; \textin{1}\textde{1} \verb|Note the differences in size and baseline|
-\verb|\textfrac{17}{32}| \textfrac{17}{32} Constructs fractions using \verb|\textnu| and \verb|\textde|.
+\verb|\textsu{1}\textnu{1}; \textinf{1}\textde{1}| \textsu{1}\textnu{1}; \textinf{1}\textde{1} Note the differences in size and baseline.\\
+\verb|\textfrac{17}{32}| gives \textfrac{17}{32}, building fractions using \verb|\textnu| and \verb|\textde|. It has an optional argument for the whole number: \verb|\textfrac[1]{35}{64}| produces \textfrac[1]{35}{64}.
 \section{Example preamble with math}
 \textbf{Caution:} If you have an up-to-date distribution (TeXLive or MiKTeX), then there is an important change to note in the AMS classes, making the option {\tt noamsfonts} viable. If you plan to use the {\tt newtxmath} package with an AMS class, be sure to enable this option, as it will save you two of your precious sixteen math families. (The equivalent symbols are already in {\tt newtxmath} at a weight appropriate to Times and STIX2.)
 
@@ -79,9 +80,10 @@ These macros provide ways to use other figures styles, no matter what defaults m
 \usepackage[p,osf]{stickstootext} % loads Helvetica as SF, newtxtt as TT
 % T1 and textcomp are loaded by package. Change that here, if you want
 % load replacements for Helvetica and newtxtt here, if desired
+\usepackage{amsmath} % must be loaded before amsthm
 \usepackage{amsthm}% must be loaded before newtxmath
 % amsmath and amssymb should not be loaded
-\usepackage[stix,vvarbb]{newtxmath}
+\usepackage[stix2,vvarbb]{newtxmath}
 % vvarbb selects the STIX version of blackboard bold. See below.
 \end{verbatim}
 \section{Choices for blackboard bold}
diff --git a/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty b/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty
index 57f90a37a4c..f9d1351ede9 100644
--- a/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty
+++ b/Master/texmf-dist/tex/latex/stickstoo/stickstootext.sty
@@ -1,14 +1,14 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.02}
-\def\filedate{2018/05/21}
+\def\fileversion{1.035}
+\def\filedate{2021/10/17}
 \ProvidesPackage{stickstootext}
     [\filedate\space v\fileversion]
-\message{`SticksToo' v\fileversion, \filedate\space Text macros taking advantage of the STIXTwoText fonts (msharpe)}
+\message{`SticksTooText' v\fileversion, \filedate\space Text macros taking advantage of the STIXTwoText fonts (msharpe)}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{textcomp}
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
-\RequirePackage{etoolbox}
+\RequirePackage{etoolbox,xstring}
 \IfFileExists{fontaxes.sty}{
     \RequirePackage{fontaxes}
     \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
@@ -22,8 +22,8 @@
     \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
     \def\infigures{\@nomath\infigures
         \fontfigurestyle{inferior}\selectfont}
-    \DeclareTextFontCommand{\textin}{\infigures}
-    \let\textinferior\textin
+    \DeclareTextFontCommand{\textinf}{\infigures}
+    \let\textinferior\textinf
 
     \fa@naming@exception{figures}{{numerators}{proportional}}{Numr}
     \fa@naming@exception{figures}{{numerators}{tabular}}{Numr}
@@ -39,8 +39,8 @@
         \fontfigurestyle{numerators}\selectfont}
     \DeclareTextFontCommand{\textnu}{\nufigures}
     \let\textnumerators\textnu
-	\providecommand*{\textfrac}[2]{%
-    	\textnu{##1}\kern0em\textfractionsolidus\kern0em\textde{##2}}
+	%\providecommand*{\textfrac}[2]{%
+    	%\textnu{##1}\kern0em\textfractionsolidus\kern0em\textde{##2}}
 }{}
 
 \IfFileExists{xkeyval.sty}{
@@ -69,7 +69,8 @@
 \@onlypreamble\useosf
 \def\useproportional{\edef\SticksToo@figurealign{}}
 \@onlypreamble\useproportional
-
+\def\@SticksToo@foresolidus{0em}
+\def\@SticksToo@aftsolidus{0em}
 \DeclareOptionX{lining}{\edef\SticksToo@figurestyle{LF}}
 \DeclareOptionX{lf}{\edef\SticksToo@figurestyle{LF}}
 \DeclareOptionX{oldstyle}{\edef\SticksToo@figurestyle{OsF}}
@@ -81,9 +82,46 @@
 \DeclareOptionX{theoremfont}{\@SticksToo@thrmtrue}
 \DeclareOptionX{sups}{\@SticksToo@supstrue}
 \DeclareOptionX{scosf}{\@SticksToo@scosftrue}
+\DeclareOptionX{foresolidus}{\gdef\@SticksToo@foresolidus{#1}}
+\DeclareOptionX{aftsolidus}{\gdef\@SticksToo@aftsolidus{#1}}
 \ExecuteOptionsX{lining,tabular}
 \ProcessOptionsX\relax
 
+\newcommand{\textfrac}[3][]{% e.g., \textfrac[1]{7}{8}
+  \mbox{%
+    \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+      {\textlf{#1}\kern.05em}{}%         
+    \textnu{#2}% numerator
+    \StrRight{#2}{1}[\@digit@]%
+    % look for  1, 2, 6, 7
+    \ifcase\@digit@% 0
+    \or%\kern.03em% 1
+    \or%\kern.02em% 2
+    \or\kern-.02em% 3
+    \or%\kern-.01em% 4
+    \or\kern-.01em% 5
+    \or%\kern-.01em% 6
+    \or\kern-.08em% 7
+    \or%\kern-.08em% 8
+    \or\kern-.04em% 9
+    \fi%
+    \kern\@SticksToo@foresolidus{\fontencoding{TS1}\selectfont\char"2F}%
+    \kern\@SticksToo@aftsolidus%
+    \StrLeft{#3}{1}[\@digit@]%
+    % look for 1, 4, 7
+    \ifcase\@digit@% 0
+    \or%\kern -.02em% 1
+    \or\kern .01em% 2
+    \or% 3
+    \or\kern -.08em% 4
+    \or\kern -.03em% 5
+    \or\kern -.05em% 6
+    \or%\kern .02em% 7
+    \fi%
+    \textde{#3}%       denominator [#3]
+  }%
+}
+
 \if@SticksToo@thrm
     \patchcmd{\th@plain}{\itshape}{\slshape}{\message{Replaced itshape by slshape in theorem style plain.}}{\message{Unable to replace itshape by slshape in theorem style plain.}}
 \fi