ntheorem update (5jun10)

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

2 files changed, 27 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/ntheorem/ntheorem.std b/Master/texmf-dist/tex/latex/ntheorem/ntheorem.std
index b7b80ad0a0a..41826472fe1 100644
--- a/Master/texmf-dist/tex/latex/ntheorem/ntheorem.std
+++ b/Master/texmf-dist/tex/latex/ntheorem/ntheorem.std
@@ -20,9 +20,9 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-\def\filedate{2005/07/07}
-\def\docdate{2005/07/07}
-\def\fileversion{1.25}
+\def\filedate{2009/07/01}
+\def\docdate{2009/07/01}
+\def\fileversion{1.28}
 \def\basename{ntheorem}
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
diff --git a/Master/texmf-dist/tex/latex/ntheorem/ntheorem.sty b/Master/texmf-dist/tex/latex/ntheorem/ntheorem.sty
index 16fcac4dc09..94624fae86a 100644
--- a/Master/texmf-dist/tex/latex/ntheorem/ntheorem.sty
+++ b/Master/texmf-dist/tex/latex/ntheorem/ntheorem.sty
@@ -20,9 +20,9 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-\def\filedate{2005/07/07}
-\def\docdate{2005/07/07}
-\def\fileversion{1.25}
+\def\filedate{2009/07/01}
+\def\docdate{2009/07/01}
+\def\fileversion{1.28}
 \def\basename{ntheorem}
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
@@ -57,6 +57,8 @@
 \newcounter{endNonectr}
 \newcounter{currNonectr}
 \newif\ifsetendmark\setendmarktrue
+\gdef\thm@romannum#1{\expandafter\thm@roman@num\csname c@#1\endcsname}%
+\gdef\thm@roman@num#1{\romannumeral #1}%
 \gdef\endtrivlist{%
   \@endtrivlist{\PotEndMark{\unskip\nobreak\hfill\nobreak}}}
 \gdef\@endtrivlist#1{%  % from \endtrivlist
@@ -86,18 +88,18 @@
          \makebox[.6\linewidth]%
       \fi
       $$\stepcounter{end\InTheoType ctr}%
-        \@ifundefined{mark\roman{curr\InTheoType ctr}%
-                      \InTheoType\roman{end\InTheoType ctr}}{\relax}%
+        \@ifundefined{mark\thm@romannum{curr\InTheoType ctr}%
+                      \InTheoType\thm@romannum{end\InTheoType ctr}}{\relax}%
           {\ifx\csname\InTheoType Symbol\endcsname\@empty\else
-             \boxmaxdepth=.5ex\begin{array}[b]{l}%
+             \boxmaxdepth=.5ex\begin{array}[b]{@{}l}%
              \boxmaxdepth=\maxdimen\displaystyle\fi}%
         \addtocounter{end\InTheoType ctr}{-1}%
         %%$$ BRACE MATCH HACK
    \fi}
 \gdef\]{%
       \stepcounter{end\InTheoType ctr}%
-        \@ifundefined{mark\roman{curr\InTheoType ctr}%
-                      \InTheoType\roman{end\InTheoType ctr}}{\relax}%
+        \@ifundefined{mark\thm@romannum{curr\InTheoType ctr}%
+                      \InTheoType\thm@romannum{end\InTheoType ctr}}{\relax}%
           {\ifx\csname\InTheoType Symbol\endcsname\@empty\else
               \end{array}\fi}%
         \addtocounter{end\InTheoType ctr}{-1}%
@@ -140,8 +142,8 @@
   \@endtrivlist
     {\PotEndMark{\rightskip0pt%
          \settowidth{\leftskip}%
-          { \csname mark\roman{curr\InTheoType ctr}\InTheoType
-                   \roman{end\InTheoType ctr}\endcsname}%
+          { \csname mark\thm@romannum{curr\InTheoType ctr}\InTheoType
+                   \thm@romannum{end\InTheoType ctr}\endcsname}%
          \advance\leftskip\@flushglue\hskip\@flushglue}}}
 \gdef\@empty{}
 \gdef\@endtheorem{%
@@ -160,9 +162,9 @@
 \gdef\PotEndMark#1{\SetEndMark{\InTheoType}{#1}}%
 \gdef\SetEndMark#1#2{%
    \stepcounter{end#1ctr}%
-   \@ifundefined{mark\roman{curr#1ctr}#1\roman{end#1ctr}}%
+   \@ifundefined{mark\thm@romannum{curr#1ctr}#1\thm@romannum{end#1ctr}}%
    {\relax}%
-   {#2{\csname mark\roman{curr#1ctr}#1\roman{end#1ctr}\endcsname
+   {#2{\csname mark\thm@romannum{curr#1ctr}#1\thm@romannum{end#1ctr}\endcsname
        \ifdim\rightmargin>\z@\hskip-\rightmargin\fi
        \hbox to 0cm{}}}}%
 \newskip\mysavskip
@@ -178,7 +180,7 @@
          \expandafter\meaning\csname\InTheoType Symbol\endcsname\relax}%
   \protected@write\@auxout{}%
      {\string\global\string\def\string\mark%
-      \roman{curr\InTheoType ctr}\InTheoType \roman{end\InTheoType ctr}%
+      \thm@romannum{curr\InTheoType ctr}\InTheoType \thm@romannum{end\InTheoType ctr}%
       {\thm@tmp}}%
   \@eesphack}
 } % end of option [thmmarks]
@@ -201,17 +203,17 @@
         \hb@xt@\linewidth\bgroup $\m@th\displaystyle %$
         \hskip\mathindent\bgroup
           \stepcounter{end\InTheoType ctr}%
-          \@ifundefined{mark\roman{curr\InTheoType ctr}%
-                        \InTheoType\roman{end\InTheoType ctr}}{\relax}%
+          \@ifundefined{mark\thm@romannum{curr\InTheoType ctr}%
+                        \InTheoType\thm@romannum{end\InTheoType ctr}}{\relax}%
             {\ifx\csname\InTheoType Symbol\endcsname\@empty\else
-              \boxmaxdepth=.5ex\begin{array}[b]{l}%
+              \boxmaxdepth=.5ex\begin{array}[b]{@{}l}%
               \boxmaxdepth=\maxdimen\displaystyle\fi}%
           \addtocounter{end\InTheoType ctr}{-1}%
     \fi}
  \renewcommand\]{%
     \stepcounter{end\InTheoType ctr}%
-    \@ifundefined{mark\roman{curr\InTheoType ctr}%
-                  \InTheoType\roman{end\InTheoType ctr}}{\relax}%
+    \@ifundefined{mark\thm@romannum{curr\InTheoType ctr}%
+                  \InTheoType\thm@romannum{end\InTheoType ctr}}{\relax}%
       {\ifx\csname\InTheoType Symbol\endcsname\@empty\else
           \end{array}\fi}%
     \addtocounter{end\InTheoType ctr}{-1}%
@@ -376,11 +378,14 @@
         \else
             \gdef\df@tag{\PotEndMark{\maketag@@@}}%
         \fi}
+\newdimen{\tagwidth}
 \gdef\SetTagPlusEndMark{%
         \iftagsleft@
           \gdef\maketag@@@##1{%
+             \settowidth{\tagwidth}{$##1$}%%  %% WM 17.10.2007
+             \hbox to \tagwidth{%
                \hbox to \displaywidth{\m@th\normalfont##1%
-                                      \hss\PotEndMark{\hss}}}%
+                                      \hss\PotEndMark{\hss}}\hss}}%
         \else
           \gdef\maketag@@@##1{\hbox{\m@th\normalfont##1%
                            \llap{\hss\PotEndMark{\raisebox{-1.3em}}}}}%