newvbtm (17sep11)

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

6 files changed, 30 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/newvbtm/README b/Master/texmf-dist/doc/latex/newvbtm/README
index 157db6d5a81..bf19bd015d9 100644
--- a/Master/texmf-dist/doc/latex/newvbtm/README
+++ b/Master/texmf-dist/doc/latex/newvbtm/README
@@ -1,4 +1,4 @@
-newvbtm (v1.0): The package for your own verbatim-like environments
+newvbtm (v1.1): The package for your own verbatim-like environments
 		containing two style files;
     newvbtm.sty:    To define your own verbatim-like environments
     varvbtm.sty:    To make some variants of verbatim
@@ -29,6 +29,8 @@ newvbtm (v1.0): The package for your own verbatim-like environments
     - non-verbatim stuff insertion in verbatim-like environment
     - verbatim input file
 
++ A small bug causing trouble with LaTeX 2.09 is fixed in v1.1.
+
 Enjoy!
 
 Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
diff --git a/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.pdf b/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.pdf
index 3dc3fdc3363..4865423a691 100644
--- a/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.pdf
+++ b/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.pdf
diff --git a/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.tex b/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.tex
index b1a50cc6f90..5763186a837 100644
--- a/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.tex
+++ b/Master/texmf-dist/doc/latex/newvbtm/newvbtm-man.tex
@@ -20,8 +20,8 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%        (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2002  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
+%%     (Toyohashi Univ. of Tech.)
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -46,7 +46,7 @@
 %%
 %%
 \ProvidesFile{newvbtm-man.tex}
-[1999/08/11 v1.0 ]
+[2002/04/08 v1.1 ]
 \documentclass{ltxdoc}
 \usepackage{varvbtm}
 \DisableCrossrefs
diff --git a/Master/texmf-dist/source/latex/newvbtm/newvbtm.dtx b/Master/texmf-dist/source/latex/newvbtm/newvbtm.dtx
index 67d2d39f249..7e85cd2ec6f 100644
--- a/Master/texmf-dist/source/latex/newvbtm/newvbtm.dtx
+++ b/Master/texmf-dist/source/latex/newvbtm/newvbtm.dtx
@@ -1,8 +1,8 @@
 % \iffalse
 %<newvbtm>%% Style file `newvbtm'.
 %<varvbtm>%% Style file `varvbtm'.
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%		       (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2002  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
+%%			    (Toyohashi Univ. of Tech.)
 %% 
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -46,7 +46,7 @@
 %<driver>\ProvidesFile{newvbtm-man.tex}
 % \fi
 % \ProvidesFile{newvbtm.dtx}
-[1999/08/11 v1.0 ]
+[2002/04/08 v1.1 ]
 % \iffalse
 %<*driver>
 \documentclass{ltxdoc}
@@ -73,6 +73,8 @@
 %	{The style newverbatim has already been born.}
 % \changes{v1.0}{1999/07/14}
 %	{The Style and macros are merged into newvbtm.dtx and rewritten.}
+% \changes{v1.1}{2002/04/08}
+%	{The following are to fix the bug revealed in LaTeX-2.09.}
 %
 % \errorcontextlines10000
 % \GetFileInfo{newvbtm.dtx}
@@ -612,7 +614,7 @@
 %\else \nvb@LaTeXefalse
 %\def\next[#1]{}\fi
 %\next
-%[1999/08/11 v1.0 ]
+%[2002/04/08 v1.1 ]
 %\end{verbatim}
 %\end{itemize}
 %
@@ -694,6 +696,8 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\nvb@xnewverbatim}
+% \changes{v1.1}{2002/04/05}
+%	{\cs{@tempa} is replaced by \cs{nvb@tempa} to avoid conflict in 2.09.}
 % \begin{macro}{\nvb@currenvir}
 % \begin{macro}{\nvb@defxverbatim}
 % \begin{macro}{\nvb@xverbatim}
@@ -773,18 +777,18 @@
 % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
 %

 %    \begin{macrocode}
-\long\def\nvb@xnewverbatim#1[#2][#3]#4#5#6#7{\def\@tempa{#3}%
-        \ifx\@tempa\@empty \def\@tempa{[#2]}%
-        \else              \def\@tempa{[#2][#3]}\fi
+\long\def\nvb@xnewverbatim#1[#2][#3]#4#5#6#7{\def\nvb@tempa{#3}%
+        \ifx\nvb@tempa\@empty \def\nvb@tempa{[#2]}%
+        \else                 \def\nvb@tempa{[#2][#3]}\fi
         \def\@tempb{\nvb@newenv{#1}}%
-        \expandafter\@tempb\@tempa
+        \expandafter\@tempb\nvb@tempa
                 {\def\nvb@currenvir{#1}%
                         #4\begingroup \@verbatim \frenchspacing \@vobeyspaces
                         \nvb@defxverbatim{#1}\nvb@beginhook #5\nvb@xverbatim}%
                 {#6\nvb@endinhook \endverbatim \endgroup
                         #7\nvb@endouthook \@endpetrue}%
         \def\@tempb{\nvb@newenv{#1*}}%
-        \expandafter\@tempb\@tempa
+        \expandafter\@tempb\nvb@tempa
                 {\def\nvb@currenvir{#1*}%
                         #4\begingroup \@verbatim
                         \nvb@defxverbatim{#1*}\nvb@beginhook #5\nvb@xverbatim}%
diff --git a/Master/texmf-dist/tex/latex/newvbtm/newvbtm.sty b/Master/texmf-dist/tex/latex/newvbtm/newvbtm.sty
index d4d6a559dc4..0d88ae5bdfd 100644
--- a/Master/texmf-dist/tex/latex/newvbtm/newvbtm.sty
+++ b/Master/texmf-dist/tex/latex/newvbtm/newvbtm.sty
@@ -21,8 +21,8 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% Style file `newvbtm'.
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%        (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2002  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
+%%     (Toyohashi Univ. of Tech.)
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -55,7 +55,7 @@
 \else \nvb@LaTeXefalse
 \def\next[#1]{}\fi
 \next
-[1999/08/11 v1.0 ]
+[2002/04/08 v1.1 ]
 %% tex newvbtm.ins
 
 \def\newverbatim{\let\nvb@newenv\newenvironment
@@ -74,18 +74,18 @@
 \def\nvb@inewverbatim#1[#2]{\nvb@Xnewverbatim{#1}[#2][]}
 \fi
 
-\long\def\nvb@xnewverbatim#1[#2][#3]#4#5#6#7{\def\@tempa{#3}%
-        \ifx\@tempa\@empty \def\@tempa{[#2]}%
-        \else              \def\@tempa{[#2][#3]}\fi
+\long\def\nvb@xnewverbatim#1[#2][#3]#4#5#6#7{\def\nvb@tempa{#3}%
+        \ifx\nvb@tempa\@empty \def\nvb@tempa{[#2]}%
+        \else                 \def\nvb@tempa{[#2][#3]}\fi
         \def\@tempb{\nvb@newenv{#1}}%
-        \expandafter\@tempb\@tempa
+        \expandafter\@tempb\nvb@tempa
                 {\def\nvb@currenvir{#1}%
                         #4\begingroup \@verbatim \frenchspacing \@vobeyspaces
                         \nvb@defxverbatim{#1}\nvb@beginhook #5\nvb@xverbatim}%
                 {#6\nvb@endinhook \endverbatim \endgroup
                         #7\nvb@endouthook \@endpetrue}%
         \def\@tempb{\nvb@newenv{#1*}}%
-        \expandafter\@tempb\@tempa
+        \expandafter\@tempb\nvb@tempa
                 {\def\nvb@currenvir{#1*}%
                         #4\begingroup \@verbatim
                         \nvb@defxverbatim{#1*}\nvb@beginhook #5\nvb@xverbatim}%
diff --git a/Master/texmf-dist/tex/latex/newvbtm/varvbtm.sty b/Master/texmf-dist/tex/latex/newvbtm/varvbtm.sty
index aa4a6db1b16..30b42e4437e 100644
--- a/Master/texmf-dist/tex/latex/newvbtm/varvbtm.sty
+++ b/Master/texmf-dist/tex/latex/newvbtm/varvbtm.sty
@@ -21,8 +21,8 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% Style file `varvbtm'.
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%        (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2002  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
+%%     (Toyohashi Univ. of Tech.)
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -55,7 +55,7 @@
 \else \nvb@LaTeXefalse
 \def\next[#1]{}\fi
 \next
-[1999/08/11 v1.0 ]
+[2002/04/08 v1.1 ]
 %% tex newvbtm.ins
 
 \ifnvb@LaTeXe