summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-11 23:07:51 +0000
committerKarl Berry <karl@freefriends.org>2017-01-11 23:07:51 +0000
commitb9cc4194bebb9019fd2deb2dae0e606f8ef01e69 (patch)
treea343863d284f9c839fc6f5d5c230396ea2867241 /Master
parent1678088b3d54bb6467925eb602c30d87fedda544 (diff)
onlyamsmath (11jan17)
git-svn-id: svn://tug.org/texlive/trunk@42927 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog8
-rw-r--r--Master/texmf-dist/doc/latex/onlyamsmath/Makefile3
-rw-r--r--Master/texmf-dist/doc/latex/onlyamsmath/README2
-rw-r--r--Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex4
-rw-r--r--Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdfbin210464 -> 212638 bytes
-rw-r--r--Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx33
-rw-r--r--Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins2
-rw-r--r--Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty11
8 files changed, 46 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog b/Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog
index 54cfa07f2a1..5df2279385e 100644
--- a/Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog
@@ -1,3 +1,7 @@
+2016/12/18 0.20 Harald Harders
+ Added switch nodollardollar again (prevent from changing catcode
+ to avoid issues with TikZ/PGF)
+
2012/01/01 0.10 Harald Harders
Explicitly state date and version in \ProvidesPackage statement
Update e-mail address
@@ -8,10 +12,10 @@
2001/09/22 0.03 Harald Harders
Changed definition of \dollarcode, by David Kastrup
- Removed switches \dollardollar and \nodollardollar
+ Removed switches dollardollar and nodollardollar
2001/09/21 0.02 Harald Harders
- Added switch \nodollardollar
+ Added switch nodollardollar
2001/09/21 0.01 Harald Harders
First version
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/Makefile b/Master/texmf-dist/doc/latex/onlyamsmath/Makefile
index 7320799daac..91a129aefe2 100644
--- a/Master/texmf-dist/doc/latex/onlyamsmath/Makefile
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/Makefile
@@ -41,8 +41,7 @@ tar: all clean
onlyamsmath/ChangeLog \
onlyamsmath/Makefile \
onlyamsmath/onlyamsmath.{dtx,ins,pdf} \
- onlyamsmath/onlyamsmathtest.tex \
- onlyamsmath/onlyamsmath.xml
+ onlyamsmath/onlyamsmathtest.tex
zip: all clean
@echo Generate onlyamsmath-$(VERSION).zip
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/README b/Master/texmf-dist/doc/latex/onlyamsmath/README
index 0c41c733748..91b5b4ab019 100644
--- a/Master/texmf-dist/doc/latex/onlyamsmath/README
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/README
@@ -7,7 +7,7 @@ This is useful for class writers who want to force their clients to
use the environments provided by the amsmath 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
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex
index 547e2255f82..9ca7939efb4 100644
--- a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex
@@ -8,7 +8,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
@@ -18,7 +18,7 @@
%% harald.harders@gmx.de
%%
\ProvidesFile{onlyamsmath-v.tex}
- [2012/01/01 v0.10 Destroy the standard math environments]
+ [2016/12/18 v0.20 Destroy the standard math environments]
\endinput
%%
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf
index f8278d67818..4954a638b4b 100644
--- a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf
Binary files differ
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
diff --git a/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty b/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty
index 1dd37ecf289..457ce7c5e6c 100644
--- a/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty
+++ b/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty
@@ -8,7 +8,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
@@ -18,7 +18,7 @@
%% harald.harders@gmx.de
%%
\ProvidesPackage{onlyamsmath}
- [2012/01/01 v0.10 Destroy the standard math environments]
+ [2016/12/18 v0.20 Destroy the standard math environments]
\RequirePackage{amsmath}
\newif\ifonlyams@eqnarray
\DeclareOption{eqnarray}{\onlyams@eqnarraytrue}
@@ -31,6 +31,8 @@
\onlyams@errortrue
\DeclareOption{error}{\onlyams@errortrue}
\DeclareOption{warning}{\onlyams@errorfalse}
+\newif\ifonlyams@nodollardollar
+\DeclareOption{nodollardollar}{\onlyams@nodollardollartrue}
\ExecuteOptions{error}
\ProcessOptions\relax
\newcommand{\onlyams@error}[1]{%
@@ -69,7 +71,10 @@
\onlyams@error{$$ $$}%
\expandafter \[
\fi}
-\AtBeginDocument{\catcode`\$=13 }
+\ifonlyams@nodollardollar
+\else
+ \AtBeginDocument{\catcode`\$=13 }
+\fi
\endinput
%%