onlyamsmath (11jan17)

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

2 files changed, 28 insertions, 7 deletions

diff --git a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx
index de29c387262..d1861e83f9a 100644
--- a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx
+++ b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta comment
-% File: onlyamsmath.dtx Copyright (C) 2001, 2012 Harald Harders
+% File: onlyamsmath.dtx Copyright (C) 2001, 2012, 2016 Harald Harders
 % \fi
 %
 % \iffalse
@@ -32,11 +32,11 @@
 \DoNotIndex{\setcounter,\space,\begingroup,\endgroup}
 \CodelineNumbered
 \RecordChanges
-\CheckSum{91}
+\CheckSum{98}
 \input{onlyamsmath-v.tex}
 \GetFileInfo{onlyamsmath-v.tex}
 \title{The \texttt{onlyamsmath} package}
-\author{Harald Harders\\\texttt{h.harders@tu-bs.de}}
+\author{Harald Harders\\\texttt{harald.harders@gmx.de}}
 \date{Version \fileversion, \filedate, printed \today}
 \begin{document}
   \DocInput{onlyamsmath.dtx}
@@ -44,6 +44,8 @@
 %</driver>
 % \fi
 %
+% \changes{0.20}{2016/12/18}{Added switch \texttt{nodollardollar} again
+%   (prevent from changing catcode to avoid issues with TikZ/PGF)}%
 % \changes{0.10}{2012/01/01}{Explicitly state date and version in
 %   \cs{ProvidesPackage} statement}
 % \changes{0.10}{2012/01/01}{Update documentation}
@@ -62,7 +64,7 @@
 % \tableofcontents
 %
 % \section*{Copyright}
-% Copyright 2001, 2012 Harald Harders.
+% Copyright 2001, 2012, 2016 Harald Harders.
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
@@ -118,6 +120,12 @@
 % \DescribeMacro{warning}
 % If using |warning| \LaTeX\ only produces warnings and proceeds.
 %
+% \DescribeMacro{nodollardollar}
+% If |nodollardollar| is used, the |$| catcode is not changed.
+% This way, the plain \TeX\ |$$| macro can still be used.
+% This option helps to avoid issues with recent versions of TikZ/PGF but might
+% have other side effects.
+%
 % \section*{Acknowledgement}
 %
 % David Kastrup (David.Kastrup@t-online.de) has
@@ -127,6 +135,11 @@
 % Since I do not understand his code please don't ask me things
 % regarding it.
 %
+% Reinhard Kotucha has reported the problem with recent TikZ/PGF and also
+% identified that changing the |$| catcode caused the issues.
+% The class option |nodollardollar| has been introduced to resolve this
+% incompatibility.
+%
 % \StopEventually{\PrintBibliography \PrintChanges \PrintIndex}
 %
 % \section{The implementation}
@@ -135,7 +148,7 @@
 %    \begin{macrocode}
 %<package>\ProvidesPackage{onlyamsmath}
 %<version>\ProvidesFile{onlyamsmath-v.tex}
-%<package,version>  [2012/01/01  v0.10  Destroy the standard math environments]
+%<package,version>  [2016/12/18  v0.20  Destroy the standard math environments]
 %    \end{macrocode}
 % \iffalse
 %<*package>
@@ -171,6 +184,11 @@
 \DeclareOption{error}{\onlyams@errortrue}
 \DeclareOption{warning}{\onlyams@errorfalse}
 %    \end{macrocode}
+% Define the |nodollardollar| option:
+%    \begin{macrocode}
+\newif\ifonlyams@nodollardollar
+\DeclareOption{nodollardollar}{\onlyams@nodollardollartrue}
+%    \end{macrocode}
 % Set the default options:
 %    \begin{macrocode}
 \ExecuteOptions{error}
@@ -307,7 +325,10 @@
 % Activate the complaining behaviour at |\begin{document}| to ensure
 % that packages that internally use |$$| can do that without an error:
 %    \begin{macrocode}
-\AtBeginDocument{\catcode`\$=13 }
+\ifonlyams@nodollardollar
+\else
+  \AtBeginDocument{\catcode`\$=13 }
+\fi
 %    \end{macrocode}
 % \iffalse
 %</package>
diff --git a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins
index b1d64a5b64c..209e3e6ff10 100644
--- a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins
+++ b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins
@@ -4,7 +4,7 @@
 
   onlyamsmath package
 
-  Copyright  2001, 2012 Harald Harders
+  Copyright  2001, 2012, 2016 Harald Harders
 
   This program can be redistributed and/or modified under the terms
   of the LaTeX Project Public License Distributed from CTAN