ted update (7mar08)

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

1 files changed, 37 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/ted/ted.sty b/Master/texmf-dist/tex/latex/ted/ted.sty
index f86a33ddaf0..3ef652ff82c 100644
--- a/Master/texmf-dist/tex/latex/ted/ted.sty
+++ b/Master/texmf-dist/tex/latex/ted/ted.sty
@@ -6,15 +6,16 @@
 %%
 %% ted.dtx  (with options: `package')
 %% 
-%% ted package by Manuel P\'egouri\'e-Gonnard <mpg@math.jussieu.fr>
+%% ted package by Manuel P\'egouri\'e-Gonnard <mpg@elzevir.fr>
 %% This is a generated file. See ted.dtx for license information.
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ted}
-  [2007/12/12 v1.01 \space token list editor \space (mpg)]
+  [2008/03/07 v1.06 \space a token list editor \space (mpg)]
 \@ifdefinable\ted@toks{\newtoks\ted@toks}
 \@ifdefinable\ted@list{\let\ted@list\toks@}
 \@ifdefinable\ted@code{\let\ted@code\count@}
+\@ifdefinable\ted@count{\newcount\ted@count}
 \newcommand\ted@encloop{%
   \futurelet\@let@token
   \ted@encloop@}
@@ -174,7 +175,7 @@
       \uccode`{=#2
     \or
       \uccode`}=#2
-      \uppercase{\ted@toks\expandafter{\expandafter{\the\ted@toks}}}
+      \uppercase{\ted@toks\expandafter{\expandafter{\the\ted@toks}}}%
       \expandafter\endgroup
       \expandafter\ted@add@toks\expandafter{\the\ted@toks}%
     \fi}}
@@ -194,20 +195,27 @@
   \expandafter##\expandafter1\the\ted@toks##2{%
     \ted@add@toks{##1}%
     \ifx##2\ted@@end
-      \expandafter\@gobble
+      \expandafter\@firstoftwo
     \else
-      \expandafter\@firstofone
+      \expandafter\@secondoftwo
     \fi{%
+      \expandafter\ted@remove@nil\the\ted@toks
+      }{%
+      \global\advance\ted@count\@ne
       \ted@add@toks{#1}\ted@subsmac@loop##2}}%
   \expandafter\ted@def@subsmac@\expandafter{\the\ted@toks}}
 \newcommand\ted@def@subsmac@[1]{%
   \def\ted@subsmac{%
+    \global\ted@count\z@
     \ted@toks\expandafter{\expandafter}%
-    \expandafter\ted@subsmac@loop\the\ted@toks#1\ted@@end}}
+    \expandafter\ted@subsmac@loop\the\ted@toks\ted@@nil#1\ted@@end}}
+\@ifdefinable\ted@remove@nil{%
+  \long\def\ted@remove@nil#1\ted@@nil{%
+    \ted@toks{#1}}}
 \newcommand\ted@ShowTokens[1]{%
   \begingroup \ted@sanitize
   \ted@toks{#1}%
-  \ted@typeout{--- Begin token decompositon of:}%
+  \ted@typeout{--- Begin token decomposition of:}%
   \ted@typeout{\@spaces \the\ted@toks}%
   \ted@encode{#1}%
   \expandafter\ted@show@toks\the\ted@toks\ted@@end
@@ -215,12 +223,24 @@
   \ted@typeout{--- End token decomposition.}}
 \count@\catcode\z@ \catcode\z@ 12
 \newcommand\ted@show@toks[1]{%
-  \ifx#1\ted@@end \expandafter\@gobble\else\expandafter\@firstofone\fi{%
-    \ted@toks{#1}%
-    \begingroup
-    \escapechar\if\noexpand#1^^00 \@ne \else \z@ \fi
-    \expandafter\ted@show@toks@\string#1\@nil
-    \ted@show@toks}}
+  \ted@toks{#1}\expandafter
+  \ifx\the\ted@toks\ted@@end \else\expandafter
+    \ifx\the\ted@toks\ted@@active
+      \aftergroup\ted@type@active
+      \expandafter\aftergroup\the\ted@toks
+    \else
+      \if\expandafter\noexpand\the\ted@toks\@sptoken
+        \aftergroup\ted@type@normal
+        \expandafter\aftergroup\the\ted@toks
+      \else
+        \begingroup
+        \escapechar\if\noexpand#1^^00 \@ne \else \z@ \fi
+        \expandafter\expandafter\expandafter\ted@show@toks@
+        \expandafter\string\the\ted@toks\@nil
+      \fi
+    \fi
+    \expandafter\ted@show@toks
+  \fi}
 \catcode\z@\count@
 \@ifdefinable\ted@show@toks@{%
   \long\def\ted@show@toks@#1#2\@nil{%
@@ -232,14 +252,9 @@
         \aftergroup\ted@type@cs
         \expandafter\aftergroup\the\ted@toks
       \fi
-    \else \expandafter
-      \ifx\the\ted@toks\ted@@active
-        \aftergroup\ted@type@active
-        \expandafter\aftergroup\the\ted@toks
-      \else
-        \aftergroup\ted@type@normal
-        \expandafter\aftergroup\the\ted@toks
-      \fi
+    \else
+      \aftergroup\ted@type@normal
+      \expandafter\aftergroup\the\ted@toks
     \fi}}
 \@ifdefinable\ted@show@special{%
   \begingroup\escapechar\m@ne \expandafter\endgroup
@@ -256,7 +271,7 @@
     \begingroup \uccode`1#2
     \uppercase{\endgroup\aftergroup1}}}
 \newcommand\ted@type@hash[1]{%
-  \ted@typeout{#1 (macro paramater character #1)}}
+  \ted@typeout{#1 (macro parameter character #1)}}
 \newcommand\ted@type@blank[1]{%
   \ted@typeout{#1 (blank space #1)}}
 \newcommand\ted@type@bgroup[1]{%