esdiff update (30jun08)

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

2 files changed, 130 insertions, 122 deletions

diff --git a/Master/texmf-dist/source/latex/esdiff/esdiff.dtx b/Master/texmf-dist/source/latex/esdiff/esdiff.dtx
index e29dea18eac..a279ad4d6e6 100644
--- a/Master/texmf-dist/source/latex/esdiff/esdiff.dtx
+++ b/Master/texmf-dist/source/latex/esdiff/esdiff.dtx
@@ -1,7 +1,8 @@
 %\iffalse
 %
-%esdiff.dtx version 1.1 august 1999
+%esdiff.dtx version 1.2 April 2008
 %Eddie Saudrais (eddie.saudrais@wanadoo.fr)
+%Code slightly revised by Christophe Jorssen
 %
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
@@ -13,7 +14,7 @@
 \end{document}
 %</driver>
 %\fi
-%\CheckSum{482}
+%\CheckSum{486}
 %\title{Writing derivatives}
 %\author{Eddie Saudrais}
 %\date{\today}
@@ -61,7 +62,7 @@
 %To get $\diffp{f}{x}$, just write
 %|$\diffp{f}{x}$|.
 %
-%We obtain $\diffp[2]{f}{x}$ wrtiting |$\diffp[2]{f}{x}$|.
+%We obtain $\diffp[2]{f}{x}$ writing |$\diffp[2]{f}{x}$|.
 %
 %\DescribeMacro{\diffp*}
 %
@@ -117,185 +118,192 @@
 %    \end{macrocode}
 %We set default values for the options.
 %   \begin{macrocode}
-\newcommand{\taille}[1]{\displaystyle{#1}}
-\newcommand{\difint}{\mkern 0mu}
-\newcommand{\derpint}{\mkern 0mu}
-\newcommand{\croisint}{\mkern 0mu}
+\newcommand*{\ES@taille}[1]{\displaystyle{#1}}
+\newcommand*{\ES@difint}{\mkern 0mu}
+\newcommand*{\ES@derpint}{\mkern 0mu}
+\newcommand*{\ES@croisint}{\mkern 0mu}
 %    \end{macrocode}
 %The \textsf{d} is roman by default..
 %    \begin{macrocode}
-\newcommand{\dop}{\mathrm{d}}
+\newcommand*{\ES@dop}{\mathrm{d}}
 %    \end{macrocode}
 %Options:
 %    \begin{macrocode}
-\DeclareOption{display}{\renewcommand{\taille}[1]{\displaystyle{#1}}}
-\DeclareOption{text}{\renewcommand{\taille}[1]{\textstyle{#1}}}
-\DeclareOption{roman}{\renewcommand{\dop}{\ensuremath{\mathrm{d}}}}
-\DeclareOption{italic}{\renewcommand{\dop}{\ensuremath{d}}}
-\DeclareOption{thin}{\renewcommand{\difint}{\ensuremath{\,}}}
-\DeclareOption{med}{\renewcommand{\difint}{\ensuremath{\;}}}
-\DeclareOption{big}{\renewcommand{\difint}{\ensuremath{\:}}}
-\DeclareOption{thinp}{\renewcommand{\derpint}{\ensuremath{\,}}}
-\DeclareOption{medp}{\renewcommand{\derpint}{\ensuremath{\;}}}
-\DeclareOption{bigp}{\renewcommand{\derpint}{\ensuremath{\:}}}
-\DeclareOption{thinc}{\renewcommand{\croisint}{\ensuremath{\,}}}
-\DeclareOption{medc}{\renewcommand{\croisint}{\ensuremath{\;}}}
-\DeclareOption{bigc}{\renewcommand{\croisint}{\ensuremath{\:}}}
+\DeclareOption{display}{\renewcommand*{\ES@taille}[1]{\displaystyle{#1}}}
+\DeclareOption{text}{\renewcommand*{\ES@taille}[1]{\textstyle{#1}}}
+\DeclareOption{roman}{\renewcommand*{\ES@dop}{\ensuremath{\mathrm{d}}}}
+\DeclareOption{italic}{\renewcommand*{\ES@dop}{\ensuremath{d}}}
+\DeclareOption{thin}{\renewcommand*{\ES@difint}{\ensuremath{\,}}}
+\DeclareOption{med}{\renewcommand*{\ES@difint}{\ensuremath{\;}}}
+\DeclareOption{big}{\renewcommand*{\ES@difint}{\ensuremath{\:}}}
+\DeclareOption{thinp}{\renewcommand*{\ES@derpint}{\ensuremath{\,}}}
+\DeclareOption{medp}{\renewcommand*{\ES@derpint}{\ensuremath{\;}}}
+\DeclareOption{bigp}{\renewcommand*{\ES@derpint}{\ensuremath{\:}}}
+\DeclareOption{thinc}{\renewcommand*{\ES@croisint}{\ensuremath{\,}}}
+\DeclareOption{medc}{\renewcommand*{\ES@croisint}{\ensuremath{\;}}}
+\DeclareOption{bigc}{\renewcommand*{\ES@croisint}{\ensuremath{\:}}}
 \ProcessOptions\relax
 %    \end{macrocode}
 %
 %\subsection{Derivative}
 %Test of star version.
 %    \begin{macrocode}
-\def\diff{\@ifstar{\diffstar}{\diffnostar}}
+\newcommand*{\diff}{}
+\def\diff{\@ifstar{\ES@diffstar}{\ES@diffnostar}}
 %    \end{macrocode}
 %Star version. The subscript is given.
 %    \begin{macrocode}
-\def\diffstar{\@ifnextchar[{\@diffstar}{\@@diffstar}}
+\def\ES@diffstar{\@ifnextchar[{\ES@diffstar@i}{\ES@diffstar@ii}}
 %    \end{macrocode}
 %The ordre is given in square brakets, and there is a subscript.
 %    \begin{macrocode}
-\def\@diffstar[#1]#2#3#4{\mathchoice{\left(\frac{\dop^{#1}\difint#2}%
-{\dop\difint#3^{#1}}\right)_{\mkern-7mu#4}}%
-{\taille{\left(\frac{\dop^{#1}\difint#2}%
-{\dop\difint#3^{#1}}\right)_{\mkern-7mu#4}}}%
-{\scriptstyle{\left(\frac{\dop^{#1}\difint#2}%
-{\dop\difint#3^{#1}}\right)_{\mkern-7mu#4}}}%
-{\scriptstyle{\left(\frac{\dop^{#1}\difint#2}%
-{\dop\difint#3^{#1}}\right)_{\mkern-7mu#4}}}}
+\def\ES@diffstar@i[#1]#2#3#4{%
+	\mathchoice{%
+	\left(\frac{\ES@dop^{#1}\ES@difint#2}%
+	{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}%
+	{\ES@taille{\left(\frac{\ES@dop^{#1}\ES@difint#2}%
+	{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}}%
+	{\scriptstyle{\left(\frac{\ES@dop^{#1}\ES@difint#2}%
+	{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}}%
+	{\scriptstyle{\left(\frac{\ES@dop^{#1}\ES@difint#2}%
+	{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}}}
 %    \end{macrocode}
 %There is only a subscript.
 %    \begin{macrocode}
-\def\@@diffstar#1#2#3{\mathchoice{\left(\frac{\dop\difint#1}%
-{\dop\difint#2}\right)_{\mkern-7mu#3}}%
-{\taille{\left(\frac{\dop\difint#1}{\dop\difint#2}%
-\right)_{\mkern-7mu#3}}}{\scriptstyle{\left(%
-\frac{\dop\difint#1}{\dop\difint#2}\right)%
-_{\mkern-7mu#3}}}%
-{\scriptstyle{\left(\frac{\dop\difint#1}{\dop\difint#2}\right)%
-_{\mkern-7mu#3}}}}
+\def\ES@diffstar@ii#1#2#3{%
+	\mathchoice{\left(\frac{\ES@dop\ES@difint#1}%
+	{\ES@dop\ES@difint#2}\right)_{\mkern-7mu#3}}%
+	{\ES@taille{\left(\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}%
+	\right)_{\mkern-7mu#3}}}{\scriptstyle{\left(%
+	\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}\right)%
+	_{\mkern-7mu#3}}}%
+	{\scriptstyle{\left(\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}\right)%
+	_{\mkern-7mu#3}}}}
 %    \end{macrocode}
 %
 %No star version (no subscript).
 %    \begin{macrocode}
-\def\diffnostar{\@ifnextchar[{\@diffnostar}{\@@diffnostar}}
+\def\ES@diffnostar{\@ifnextchar[{\ES@diffnostar@i}{\ES@diffnostar@ii}}
 %    \end{macrocode}
 %The ordre is given in square brackets.
 %    \begin{macrocode}
-\def\@diffnostar[#1]#2#3{\mathchoice{\frac{\dop^{#1}\difint#2}%
-{\dop\difint#3^{#1}}}%
-{\taille{\frac{\dop^{#1}\difint#2}{\dop\difint#3^{#1}}}}%
-{\scriptstyle{\frac{\dop^{#1}\difint#2}{\dop\difint#3^{#1}}}}%
-{\scriptstyle{\frac{\dop^{#1}\difint#2}{\dop\difint#3^{#1}}}}}
+\def\ES@diffnostar@i[#1]#2#3{\mathchoice{\frac{\ES@dop^{#1}\ES@difint#2}%
+{\ES@dop\ES@difint#3^{#1}}}%
+{\ES@taille{\frac{\ES@dop^{#1}\ES@difint#2}{\ES@dop\ES@difint#3^{#1}}}}%
+{\scriptstyle{\frac{\ES@dop^{#1}\ES@difint#2}{\ES@dop\ES@difint#3^{#1}}}}%
+{\scriptstyle{\frac{\ES@dop^{#1}\ES@difint#2}{\ES@dop\ES@difint#3^{#1}}}}}
 %    \end{macrocode}
 %Basic notation.
 %    \begin{macrocode}
-\def\@@diffnostar#1#2{\mathchoice%
-{\frac{\dop\difint#1}{\dop\difint#2}}%
-{\taille{\frac{\dop\difint#1}{\dop\difint#2}}}%
-{\scriptstyle{\frac{\dop\difint#1}{\dop\difint#2}}}%
-{\scriptstyle{\frac{\dop\difint#1}{\dop\difint#2}}}}
+\def\ES@diffnostar@ii#1#2{\mathchoice%
+{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}%
+{\ES@taille{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}}%
+{\scriptstyle{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}}%
+{\scriptstyle{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}}}
 %    \end{macrocode}
 %
 %\subsection{Partial derivatives}
 %Test of the star version.
 %    \begin{macrocode}
-\def\diffp{\@ifstar{\diffpstar}{\diffpnostar}}
+\newcommand*{\diffp}{}
+\def\diffp{\@ifstar{\ES@diffpstar}{\ES@diffpnostar}}
 %    \end{macrocode}
 %Star version: a subscript is given.
 %    \begin{macrocode}
-\def\diffpstar{\@ifnextchar[{\@diffpstar}{\@@diffpstar}}
+\def\ES@diffpstar{\@ifnextchar[{\ES@diffpstar@i}{\ES@diffpstar@ii}}
 %    \end{macrocode}
 %Ordre of derivative is given, and there is a subscript.
 %    \begin{macrocode}
-\def\@diffpstar[#1]#2#3#4{\mathchoice{\left(\frac{\partial^{#1}%
-\derpint#2}{\partial\derpint#3^{#1}}\right)_{\mkern-7mu#4}}%
-{\taille{\left(\frac{\partial^{#1}\derpint#2}{\partial\derpint#3^{#1}}%
-\right)_{\mkern-7mu#4}}}%
-{\scriptstyle{\left(\frac{\partial^{#1}\derpint#2}%
-{\partial\derpint#3^{#1}}%
-\right)_{\mkern-7mu#4}}}%
-{\scriptstyle{\left(\frac{\partial^{#1}\derpint#2}%
-{\partial\derpint#3^{#1}}%
-\right)_{\mkern-7mu#4}}}}
+\def\ES@diffpstar@i[#1]#2#3#4{%
+	\mathchoice{\left(\frac{\partial^{#1}%
+	\ES@derpint#2}{\partial\ER@derpint#3^{#1}}\right)_{\mkern-7mu#4}}%
+	{\ES@taille{\left(\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}%
+	\right)_{\mkern-7mu#4}}}%
+	{\scriptstyle{\left(\frac{\partial^{#1}\ES@derpint#2}%
+	{\partial\ES@derpint#3^{#1}}%
+	\right)_{\mkern-7mu#4}}}%
+	{\scriptstyle{\left(\frac{\partial^{#1}\ES@derpint#2}%
+	{\partial\ES@derpint#3^{#1}}%
+	\right)_{\mkern-7mu#4}}}}
 %    \end{macrocode}
 %There is only a subscript.
 %    \begin{macrocode}
-\def\@@diffpstar#1#2#3{\mathchoice{\left({\begingroup
+\def\ES@diffpstar@ii#1#2#3{\mathchoice{\left({\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}\right)_{\mkern-7mu#3}}%
-            {\taille{\left({\begingroup
+            {\ES@taille{\left({\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}\right)_{\mkern-7mu#3}}}%
             {\scriptstyle{\left({\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}\right)_{\mkern-7mu#3}}}%
             {\scriptstyle{\left({\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}\right)_{\mkern-7mu#3}}}}
 %    \end{macrocode}
 %
 %No star version (no subscript is given).
 %    \begin{macrocode}
-\def\diffpnostar{\@ifnextchar[{\@diffpnostar}{\@@diffpnostar}}
+\def\ES@diffpnostar{\@ifnextchar[{\ES@diffpnostar@i}{\ES@diffpnostar@ii}}
 %    \end{macrocode}
 %The ordre of derivative is given.
 %    \begin{macrocode}
-\def\@diffpnostar[#1]#2#3{\mathchoice{\frac{\partial^{#1}\derpint#2}%
-{\partial\derpint#3^{#1}}}%
-{\taille{\frac{\partial^{#1}\derpint#2}{\partial\derpint#3^{#1}}}}%
-{\scriptstyle{\frac{\partial^{#1}\derpint#2}{\partial\derpint#3^{#1}}}}%
-{\scriptstyle{\frac{\partial^{#1}\derpint#2}{\partial\derpint#3^{#1}}}}}
+\def\ES@diffpnostar@i[#1]#2#3{%
+	\mathchoice{\frac{\partial^{#1}\ES@derpint#2}%
+	{\partial\ES@derpint#3^{#1}}}%
+	{\ES@taille{\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}}}%
+	{\scriptstyle{\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}}}%
+	{\scriptstyle{\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}}}}
 %    \end{macrocode}
 %Basic notation.
 %    \begin{macrocode}
-\def\@@diffpnostar#1#2{\mathchoice{\begingroup
+\def\ES@diffpnostar@ii#1#2{\mathchoice{\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}%
-            {\taille{\begingroup
+            {\ES@taille{\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}}%
             {\scriptstyle{\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}}%
             {\scriptstyle{\begingroup
             \toks0={}\count0=0
-            \degree #2\degree
-            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\derpint#1}%
+            \ES@degree #2\ES@degree
+            \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}%
             {\the\toks0}%
             \endgroup}}}
 %    \end{macrocode}
 %
 %Macros used for crossed derivatives.
 %    \begin{macrocode}
-\def\degree #1{\ifx #1\degree \expandafter\stopd
-                      \else \expandafter\addd \fi #1^1$#1\addd}
-\def\stopd #1\addd{}
-\def\addd #1^#2#3$#4\addd{\advance\count0 #2
+\def\ES@degree #1{\ifx #1\ES@degree \expandafter\ES@stopd
+                      \else \expandafter\ES@addd \fi #1^1$#1\ES@addd}
+\def\ES@stopd #1\ES@addd{}
+\def\ES@addd #1^#2#3$#4\ES@addd{\advance\count0 #2
                           \toks0=\expandafter{\the\toks0%
-                           {\partial\derpint #4}%
-                          \croisint}\degree}
+                           {\partial\ES@derpint #4}%
+                          \ES@croisint}\ES@degree}
 %</package>
 %    \end{macrocode}
 %\Finale
diff --git a/Master/texmf-dist/source/latex/esdiff/esdiff.ins b/Master/texmf-dist/source/latex/esdiff/esdiff.ins
index ddf7643c079..03ec83dbf76 100644
--- a/Master/texmf-dist/source/latex/esdiff/esdiff.ins
+++ b/Master/texmf-dist/source/latex/esdiff/esdiff.ins
@@ -1,28 +1,28 @@
-\def\batchfile{esdiff.ins}

-\input docstrip.tex

-\keepsilent

-\preamble

-

-Package for the notation of derivatives.

-Eddie Saudrais, 08/09/1999.

-Version 1.1

-

-If you found any bug, please contact me at

-eddie.saudrais@wanadoo.fr.

-Maybe there is a new version at

-http://perso.wanadoo.fr/eddie.saudrais/latex/latex.html

-

-Run LaTeX on esdiff.ins to generate esdiff.sty

-

-\endpreamble

-\generate{\file{esdiff.sty}{\from{esdiff.dtx}{package}}}

-\Msg{************************************************************}

-\Msg{ }

-\Msg{  To finish the installation you have to move the file}

-\Msg{  `esdiff.sty' into a directory searched by TeX.}

-\Msg{ }

-\Msg{  To type-set the documentation, including instructions,}

-\Msg{  run the file `esdiff.dtx' through LaTeX.}

-\Msg{ }

-\Msg{***********************************************************}

-\endinput

+\def\batchfile{esdiff.ins}
+\input docstrip.tex
+\keepsilent
+\preamble
+
+Package for the notation of derivatives.
+Eddie Saudrais, 08/09/1999.
+Version 1.1
+
+If you found any bug, please contact me at
+eddie.saudrais@wanadoo.fr.
+Maybe there is a new version at
+http://perso.wanadoo.fr/eddie.saudrais/latex/latex.html
+
+Run LaTeX on esdiff.ins to generate esdiff.sty
+
+\endpreamble
+\generate{\file{esdiff.sty}{\from{esdiff.dtx}{package}}}
+\Msg{************************************************************}
+\Msg{ }
+\Msg{  To finish the installation you have to move the file}
+\Msg{  `esdiff.sty' into a directory searched by TeX.}
+\Msg{ }
+\Msg{  To type-set the documentation, including instructions,}
+\Msg{  run the file `esdiff.dtx' through LaTeX.}
+\Msg{ }
+\Msg{***********************************************************}
+\endinput