rec-thy (6oct17)

git-svn-id: svn://tug.org/texlive/trunk@45488 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 17 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/rec-thy/README b/Master/texmf-dist/doc/latex/rec-thy/README
index ed3d5b66485..9e050067645 100644
--- a/Master/texmf-dist/doc/latex/rec-thy/README
+++ b/Master/texmf-dist/doc/latex/rec-thy/README
@@ -22,4 +22,5 @@ Github URL: https://github.com/TruePath/Recursion-Theory-Latex-Package
 10/15/2010 - v1.0 - Original Release
 01/01/2011 - v1.2
 06/20/2012 - v1.3
-09/26/2017 - v2.0 - Added support for introducing requirements, the subfunction relation and probably other undocumented features
\ No newline at end of file
+09/26/2017 - v2.0 - Added support for introducing requirements, the subfunction relation and probably other undocumented features
+10/05/2017 - v2.1 - Fixed way packages are required so rec-thy can be loaded in a flexible order.  Also fixed one or two bugs.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/rec-thy/rec-thy.pdf b/Master/texmf-dist/doc/latex/rec-thy/rec-thy.pdf
index a415a2a2bb3..f339ebd5027 100644
--- a/Master/texmf-dist/doc/latex/rec-thy/rec-thy.pdf
+++ b/Master/texmf-dist/doc/latex/rec-thy/rec-thy.pdf
diff --git a/Master/texmf-dist/doc/latex/rec-thy/rec-thy.tex b/Master/texmf-dist/doc/latex/rec-thy/rec-thy.tex
index 4f19e98c29b..225770b62c0 100644
--- a/Master/texmf-dist/doc/latex/rec-thy/rec-thy.tex
+++ b/Master/texmf-dist/doc/latex/rec-thy/rec-thy.tex
@@ -47,7 +47,7 @@
 
 \title{The rec-thy Package}
 \author{Peter M. Gerdes (gerdes@invariant.org)}
-\date{2011-01-01: Version 1.2}
+\date{2011-01-01: Version 2.1}
 
 \begin{document}
 
@@ -476,6 +476,7 @@ Finally to enable the mrref helper macros pass the option \verb=mrref=.\\  These
 \section{Release Notes}
 
 \begin{itemize}
+	\item[2.1] 10/05/2017 - Fixed way packages are required so rec-thy can be loaded in a flexible order.  Also fixed one or two bugs.
 	\item[2.0] 09/26/2017 - Added support for introducing requirements, the subfunction relation and probably other undocumented features
 	\item[1.3] 06/20/2012 - Added abbreviations for computable infinitary formulas and made a few minor fixes.
 	\item[1.2] 01/01/2011 - Fixed awful option processing bug preventing most options from being recognized and added mrref option.
diff --git a/Master/texmf-dist/tex/latex/rec-thy/rec-thy.sty b/Master/texmf-dist/tex/latex/rec-thy/rec-thy.sty
index 91479ca7d8e..02e13a16a28 100644
--- a/Master/texmf-dist/tex/latex/rec-thy/rec-thy.sty
+++ b/Master/texmf-dist/tex/latex/rec-thy/rec-thy.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rec-thy}[2017/09/26 v2.0  Provides commands for writing up recursion theory papers]
+\ProvidesPackage{rec-thy}[2017/09/26 v2.1  Provides commands for writing up recursion theory papers]
 \makeatletter
 % \newcommand*{\@curpack}{\@currname} %rec-thy.sty
 \newcommand*{\@packinfo}[1]{\PackageInfo{rec-thy}{#1}}
@@ -11,18 +11,23 @@
 % Version 1.2
 % Added mrref option
 % Fixed horrific option processing bug
-\RequirePackage{amsmath}
+\RequirePackage{ltxcmds}
 \RequirePackage{ifxetex,ifpdf}
 \RequirePackage{suffix}
 \RequirePackage{ifmtarg}
 \RequirePackage{xifthen}
 \RequirePackage{xkeyval}
-\RequirePackage{mathtools}
-\RequirePackage{amssymb}
-\RequirePackage{amsfonts}
-\RequirePackage{undertilde}
-\RequirePackage{ltxcmds}
+\AtBeginDocument{
+\ltx@ifpackageloaded{amsmath}{}{\RequirePackage{amsmath}}
+\ltx@ifpackageloaded{amssymb}{}{\RequirePackage{amssymb}}
+\ltx@ifpackageloaded{amsfonts}{}{\RequirePackage{amsfonts}}
+\ltx@ifpackageloaded{mathtools}{}{\RequirePackage{mathtools}}
 \ltx@ifpackageloaded{unicode-math}{}{\RequirePackage{mathrsfs}}
+\ltx@ifpackageloaded{undertilde}{}{\RequirePackage{undertilde}}
+}
+
+
+
 
 
 % \DeclareMathAlphabet{\mathbrush}{T1}{pbsi}{xl}{n}
@@ -172,7 +177,7 @@
 	}
 
 	\newenvironment{require}[3][]{
-		\begin{requirement}{\req[#1]{#2}{#3}} \label{\detokenize{req:#2@#1}}
+		\begin{requirement}{\req*[#1]{#2}{#3}} \label{\detokenize{req:#2@#1}}
 	}{
 		\end{requirement}
 	}