14 files changed, 147 insertions, 140 deletions
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog b/Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog
new file mode 100644
index 00000000000..54cfa07f2a1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/ChangeLog
@@ -0,0 +1,17 @@
+2012/01/01  0.10  Harald Harders
+	Explicitly state date and version in \ProvidesPackage statement
+	Update e-mail address
+	Update documentation
+
+2001/09/23  0.04  Harald Harders
+	Removed code that forbids \[...\]
+
+2001/09/22  0.03  Harald Harders
+	Changed definition of \dollarcode, by David Kastrup
+	Removed switches \dollardollar and \nodollardollar
+
+2001/09/21  0.02  Harald Harders
+	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
new file mode 100644
index 00000000000..7320799daac
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/Makefile
@@ -0,0 +1,64 @@
+VERSION=`grep -e '\\[.*\\]' onlyamsmath-v.tex | sed 's/  \\[[0-9/]* *\\([v0-9]*\\)\\.\\([0-9]*\\).*\\]/\\1_\\2/'`
+
+.SUFFIXES: .sty .ins .dtx .pdf
+
+
+.ins.sty:
+	pdflatex $<
+
+.dtx.pdf:
+	pdflatex $<
+	pdflatex $<
+	makeindex -s gind.ist $(*D)/$(*F)
+	makeindex -s gglo.ist -o $(*D)/$(*F).gls $(*D)/$(*F).glo
+	pdflatex $<
+
+all: onlyamsmath onlyamsmath.pdf message 
+
+onlyamsmathtest.pdf:
+	pdflatex onlyamsmathtest
+
+
+onlyamsmath:
+	pdflatex onlyamsmath.ins
+
+
+
+clean:
+	@-rm -f onlyamsmath.{glo,gls,idx,ilg,ind,aux,log,toc}
+	@-rm -f onlyamsmathtest.{log,aux}
+	@-rm -f *~
+
+distclean: clean
+	@-rm -f onlyamsmath.{sty,pdf,ps}
+	@-rm -f onlyamsmathtest.{pdf,ps}
+
+tar:	all clean
+	@echo Generate onlyamsmath-$(VERSION).tar.gz
+	@-rm -f onlyamsmath-$(VERSION).tar.gz
+	@tar czCf .. onlyamsmath-$(VERSION).tar.gz \
+	  onlyamsmath/README \
+	  onlyamsmath/ChangeLog \
+	  onlyamsmath/Makefile \
+	  onlyamsmath/onlyamsmath.{dtx,ins,pdf} \
+	  onlyamsmath/onlyamsmathtest.tex \
+	  onlyamsmath/onlyamsmath.xml
+
+zip:	all clean
+	@echo Generate onlyamsmath-$(VERSION).zip
+	mkdir -p tex/latex/onlyamsmath
+	mkdir -p doc/latex/onlyamsmath
+	mkdir -p source/latex/onlyamsmath
+	cp onlyamsmath.sty tex/latex/onlyamsmath
+	cp README ChangeLog onlyamsmath.pdf onlyamsmathtest.tex doc/latex/onlyamsmath
+	cp onlyamsmath.dtx onlyamsmath.ins Makefile source/latex/onlyamsmath
+	@rm -f onlyamsmath-$(VERSION).zip
+	@zip -r onlyamsmath-$(VERSION).zip source/ tex/ doc/
+	rm -rf source/ tex/ doc/
+
+message:
+	@echo "Please copy onlyamsmath.sty to a directory"
+	@echo "in the LaTeX search path"
+	@echo "Then run \`latex onlyamsmathtest' to see an example"
+
+
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/README b/Master/texmf-dist/doc/latex/onlyamsmath/README
index b614b428cd2..0c41c733748 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 Harald Harders
+Copyright 2001, 2012 Harald Harders
 
 This program can be redistributed and/or modified under the terms
 of the LaTeX Project Public License Distributed from CTAN
@@ -22,29 +22,16 @@ automatic: - run make.
            - copy onlyamsmath.sty to a place where LaTeX can find it.
            - run texhash or the corresponding command of your distribution.
 
-by hand: - execute latex on onlyamsmath.ins
-         - execute latex on onlyamsmath.dtx (2x)
+by hand: - execute pdflatex on onlyamsmath.ins
+         - execute pdflatex on onlyamsmath.dtx (2x)
          - execute makeindex -s gind.ist onlyamsmath
          - execute makeindex -s gglo.ist -o onlyamsmath.gls onlyamsmath.glo
-         - execute latex on onlyamsmath.dtx
+         - execute pdflatex on onlyamsmath.dtx
          - copy onlyamsmath.sty to a place LaTeX can find it
          - run texhash or the corresponding command of your distribution
 
 
-
-To do:
-- ??
-
-
-Change log:
-- 0.01  First version
-- 0.02  Added switch nodollardollar
-- 0.03  Changed definition of \dollarcode, by David Kastrup
-        Removed switches dollardollar and nodollardollar
-- 0.04  Removed code that forbids \[...\]
-
-
-2001-10-04
+2012-01-01
 Harald Harders
-h.harders@tu-bs.de
+harald.harders@gmx.de
 
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex
new file mode 100644
index 00000000000..547e2255f82
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath-v.tex
@@ -0,0 +1,25 @@
+%%
+%% This is file `onlyamsmath-v.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% onlyamsmath.dtx  (with options: `version')
+%% 
+%%   onlyamsmath package
+%% 
+%%   Copyright  2001, 2012 Harald Harders
+%% 
+%%   This program can be redistributed and/or modified under the terms
+%%   of the LaTeX Project Public License Distributed from CTAN
+%%   archives in directory macros/latex/base/lppl.txt; either
+%%   version 1 of the License, or any later version.
+%% 
+%%   harald.harders@gmx.de
+%% 
+\ProvidesFile{onlyamsmath-v.tex}
+  [2012/01/01  v0.10  Destroy the standard math environments]
+
+\endinput
+%%
+%% End of file `onlyamsmath-v.tex'.
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf
index 8eb10c7b3d0..f8278d67818 100644
--- a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.pdf
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.xml b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.xml
deleted file mode 100644
index 2e9e53167c8..00000000000
--- a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmath.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE entry SYSTEM "../catalogue.dtd">
-<entry id="onlyamsmath" 
-       datestamp="2001/10/04" 
-       modifier="h.harders@tu-bs.de">
-  <about>
-    <name>onlyamsmath</name>
-    <caption>Inhibit use of TeX resp. LaTeX math environments when using amsmath.sty</caption>
-    <author>
-      <name>Harald Harders</name>
-      <email>h.harders@tu-bs.de</email>
-    </author>
-    <license type="lppl"/>
-    <version>
-      <number>0.04</number>
-    </version>
-  </about>
-  <description>
-    <abstract>
-      This package inhibits the usage of plain TeX and on demand of
-      standard LaTeX math environments.
-      This is useful for class writers who want to force their clients to
-      use the environments provided by the amsmath package.
-    </abstract>
-  </description>
-  <distribution>
-    <texlive>latex3</texlive>
-    <ctan>macros/latex/contrib/supported/onlyamsmath</ctan>
-  </distribution>
-</entry>
diff --git a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmathtest.tex b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmathtest.tex
index c6a4f3d9ca9..9f7d29afda7 100644
--- a/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmathtest.tex
+++ b/Master/texmf-dist/doc/latex/onlyamsmath/onlyamsmathtest.tex
@@ -14,12 +14,12 @@
 
 Normal inlined equations $a^2+b^2=c^2$ should work.
 
-Formulars in figures were a problem in version 0.1 and 0.2. 
+Formulae in figures were a problem in version 0.1 and 0.2. 
 Test wheather they work now in Fig.~\ref{fig:example}.
 \begin{figure}
   \centering
   Test
-  \caption{Here we have formulars $\alpha$, $\beta$, $\vec{a}$.\dots}
+  \caption{Here we have formulae $\alpha$, $\beta$, $\vec{a}$.\dots}
   \label{fig:example}
 \end{figure}
 
diff --git a/Master/texmf-dist/source/latex/onlyamsmath/Makefile b/Master/texmf-dist/source/latex/onlyamsmath/Makefile
deleted file mode 100644
index e194a0fea8c..00000000000
--- a/Master/texmf-dist/source/latex/onlyamsmath/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: Makefile,v 1.2 2001/03/12 17:22:36 harders Exp $
-
-.SUFFIXES: .sty .ins .dtx .dvi .ps
-
-
-.ins.sty:
-	latex $<
-
-.dtx.dvi:
-	latex $<
-	latex $<
-	makeindex -s gind.ist $(*D)/$(*F)
-	makeindex -s gglo.ist -o $(*D)/$(*F).gls $(*D)/$(*F).glo
-	latex $<
-
-.dvi.ps:
-	dvips -o $(*D)/$(*F).ps $(*D)/$(*F)
-
-
-all: onlyamsmath onlyamsmath.dvi onlyamsmath.ps message 
-
-onlyamsmathtest.dvi:
-	latex onlyamsmathtest
-
-
-onlyamsmath:
-	latex onlyamsmath.ins
-
-
-
-clean:
-	@-rm -f onlyamsmath.{glo,gls,idx,ilg,ind,aux,log,toc}
-	@-rm -f onlyamsmathtest.{log,aux}
-	@-rm -f *~
-
-distclean: clean
-	@-rm -f onlyamsmath.{sty,dvi,ps}
-	@-rm -f onlyamsmathtest.{dvi,ps}
-
-tar:	all clean
-	echo Lege onlyamsmath.tar.gz an
-	-rm -f onlyamsmath.tar.gz
-	cd ..; tar czf onlyamsmath.tar.gz \
-	  onlyamsmath/README onlyamsmath/Makefile \
-	  onlyamsmath/onlyamsmath.{dtx,ins,dvi} \
-	  onlyamsmath/onlyamsmathtest.tex \
-	  onlyamsmath/onlyamsmath.xml
-	mv ../onlyamsmath.tar.gz .
-
-
-message:
-	@echo "Please copy onlyamsmath.sty to a directory"
-	@echo "in the LaTeX search path"
-	@echo "Then run \`latex onlyamsmathtest' to see an example"
-
-
diff --git a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx
index f4c1ee14d75..de29c387262 100644
--- a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx
+++ b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.dtx
@@ -1,16 +1,9 @@
 % \iffalse meta comment
-% File: onlyams.dtx Copyright (C) 2001 Harald Harders
-% $Id:$
+% File: onlyamsmath.dtx Copyright (C) 2001, 2012 Harald Harders
 % \fi
 %
 % \iffalse
 %
-%<*package>
-\def\onlyamspackagename{onlyams}
-\def\onlyamsversion{0.04}
-\def\onlyamsfiledate{2001/10/04}
-\def\onlyamsdocdate{2001/10/04}
-%</package>
 %<*driver>
 \documentclass[fleqn]{ltxdoc}
 \usepackage{amsmath}
@@ -39,18 +32,22 @@
 \DoNotIndex{\setcounter,\space,\begingroup,\endgroup}
 \CodelineNumbered
 \RecordChanges
-\CheckSum{94}
+\CheckSum{91}
+\input{onlyamsmath-v.tex}
+\GetFileInfo{onlyamsmath-v.tex}
+\title{The \texttt{onlyamsmath} package}
+\author{Harald Harders\\\texttt{h.harders@tu-bs.de}}
+\date{Version \fileversion, \filedate, printed \today}
 \begin{document}
-  \title{The \texttt{onlyamsmath} package\thanks{This file is version
-      \onlyamsversion\ last revision \onlyamsfiledate, documentation
-      from \onlyamsdocdate.}}
-  \author{Harald Harders\\\texttt{h.harders@tu-bs.de}}
-  \date{File date \onlyamsfiledate, compiled \today}
   \DocInput{onlyamsmath.dtx}
 \end{document}
 %</driver>
 % \fi
 %
+% \changes{0.10}{2012/01/01}{Explicitly state date and version in
+%   \cs{ProvidesPackage} statement}
+% \changes{0.10}{2012/01/01}{Update documentation}
+% \changes{0.10}{2012/01/01}{Update e-mail address}
 % \changes{0.01}{2001/09/21}{First version}
 %
 % \maketitle
@@ -65,7 +62,7 @@
 % \tableofcontents
 %
 % \section*{Copyright}
-% Copyright 2001 Harald Harders.
+% Copyright 2001, 2012 Harald Harders.
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
@@ -84,6 +81,7 @@
 %   a=b\,.
 % $$
 %
+% \DescribeMacro{eqnarray}
 % One further option is \verb|eqnarray| to switch off
 % the |eqnarray| and |eqnarray*| environments that add an unwished
 % space before and after the aligned part of the formula as shown
@@ -97,6 +95,7 @@
 %   a&=b\,.
 % \end{align*}
 %
+% \DescribeMacro{all}
 % The most brutal option is |all| that inhibits the writer to use any
 % of the \TeX\ and \LaTeX\ math environments for non-inlined equations
 % I know (|$$|\dots|$$|, |eqnarray|, |eqnarray*|, |displaymath|.
@@ -109,12 +108,14 @@
 % variant. See the User's Guide of the |amsmath| package for further
 % details \cite{amsmath1999}.
 %
+% \DescribeMacro{error}
 % There are two more options that control the behaviour of the package
 % if you still use one of the ``forbidden'' environments.
 % If using |error| which is the default \LaTeX\ generates an error
 % message that reminds you to use the environments of the |amsmath|
 % package.
 %
+% \DescribeMacro{warning}
 % If using |warning| \LaTeX\ only produces warnings and proceeds.
 %
 % \section*{Acknowledgement}
@@ -129,15 +130,16 @@
 % \StopEventually{\PrintBibliography \PrintChanges \PrintIndex}
 %
 % \section{The implementation}
-% \iffalse
-%<*package>
-% \fi
 %
 % Package header:
 %    \begin{macrocode}
-\ProvidesPackage{onlyamsmath}[\onlyamsfiledate\space
-v\onlyamsversion\space destroy the standard math environments]
+%<package>\ProvidesPackage{onlyamsmath}
+%<version>\ProvidesFile{onlyamsmath-v.tex}
+%<package,version>  [2012/01/01  v0.10  Destroy the standard math environments]
 %    \end{macrocode}
+% \iffalse
+%<*package>
+% \fi
 % Load |amsmath| package:
 %    \begin{macrocode}
 \RequirePackage{amsmath}
diff --git a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins
index 76dde3650b0..b1d64a5b64c 100644
--- a/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins
+++ b/Master/texmf-dist/source/latex/onlyamsmath/onlyamsmath.ins
@@ -1,22 +1,22 @@
-%% $Id: onlyamsmath.ins,v 1.2 2001/03/12 09:17:56 harders Exp $
 \def\batchfile{onlyamsmath.ins}
 \input docstrip.tex
 \preamble
 
   onlyamsmath package
 
-  Copyright  2001 Harald Harders
+  Copyright  2001, 2012 Harald Harders
 
   This program can be redistributed and/or modified under the terms
   of the LaTeX Project Public License Distributed from CTAN
   archives in directory macros/latex/base/lppl.txt; either
   version 1 of the License, or any later version.
 
-  h.harders@tu-bs.de
+  harald.harders@gmx.de
 
 \endpreamble
 % Files
 %%%%%%%%%%%%%%%%%%%%%%
 \generateFile{onlyamsmath.sty}{f}{\from{onlyamsmath.dtx}{package}}
+\generateFile{onlyamsmath-v.tex}{f}{\from{onlyamsmath.dtx}{version}}
 
 \Msg{* Fertig}
diff --git a/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty b/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty
index adece4e23d6..1dd37ecf289 100644
--- a/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty
+++ b/Master/texmf-dist/tex/latex/onlyamsmath/onlyamsmath.sty
@@ -8,21 +8,17 @@
 %% 
 %%   onlyamsmath package
 %% 
-%%   Copyright  2001 Harald Harders
+%%   Copyright  2001, 2012 Harald Harders
 %% 
 %%   This program can be redistributed and/or modified under the terms
 %%   of the LaTeX Project Public License Distributed from CTAN
 %%   archives in directory macros/latex/base/lppl.txt; either
 %%   version 1 of the License, or any later version.
 %% 
-%%   h.harders@tu-bs.de
+%%   harald.harders@gmx.de
 %% 
-\def\onlyamspackagename{onlyams}
-\def\onlyamsversion{0.04}
-\def\onlyamsfiledate{2001/10/04}
-\def\onlyamsdocdate{2001/10/04}
-\ProvidesPackage{onlyamsmath}[\onlyamsfiledate\space
-v\onlyamsversion\space destroy the standard math environments]
+\ProvidesPackage{onlyamsmath}
+  [2012/01/01  v0.10  Destroy the standard math environments]
 \RequirePackage{amsmath}
 \newif\ifonlyams@eqnarray
 \DeclareOption{eqnarray}{\onlyams@eqnarraytrue}
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 0621283367e..9fcfb7dd8fc 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -187,7 +187,7 @@ my @TLP_working = qw(
     gradientframe grafcet graphics graphics-pln
     graphicx-psmin greek-inputenc greekdates greenpoint grfpaste
     grid gridset grverb gu guitar guitlogo
-  hands hanging har2nat hardwrap harmony harpoon
+  hands hanging hanoi har2nat hardwrap harmony harpoon
     harvard harvmac hatching
     hc he-she hep hepnames
     hepparticles hepthesis hepunits here hexgame
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8e6d77a49a7..041fce9f6c7 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -928,7 +928,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'zwpagelayout',"&MAKEcopy",
 );
 
-
+
 %prehook = (
  'apa6'			=> '&PREHOOK_apa6',
  'cals'			=> '&PREHOOK_cals',
@@ -1167,6 +1167,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'getoptk',	'\.tex',
  'ginpenc',	'\.gie|\.sty',
  'graphics-pln','^[^e].*\.tex|.*\.sty',  # not exmpl*
+ 'hanoid',	'hanoi\.tex',		
  'harvmac',	'mac\.tex',
  'hc',		'\.hld|' . $standardtex,
  'hfoldsty',	'\.sty|\.fd|\.cpa',
diff --git a/Master/tlpkg/tlpsrc/collection-games.tlpsrc b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
index f85944d9b0c..d81dbbf41b0 100644
--- a/Master/tlpkg/tlpsrc/collection-games.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
@@ -11,6 +11,7 @@ depend crosswrd
 depend egameps
 depend gamebook
 depend go
+depend hanoi
 depend hexgame
 depend jeopardy
 depend othello