stringstrings update (2oct09)

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

3 files changed, 23 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/stringstrings/stringstrings.pdf b/Master/texmf-dist/doc/latex/stringstrings/stringstrings.pdf
index 0c70cec3929..faa54e40809 100644
--- a/Master/texmf-dist/doc/latex/stringstrings/stringstrings.pdf
+++ b/Master/texmf-dist/doc/latex/stringstrings/stringstrings.pdf
diff --git a/Master/texmf-dist/source/latex/stringstrings/stringstrings.dtx b/Master/texmf-dist/source/latex/stringstrings/stringstrings.dtx
index dac7b247664..33a8379c000 100644
--- a/Master/texmf-dist/source/latex/stringstrings/stringstrings.dtx
+++ b/Master/texmf-dist/source/latex/stringstrings/stringstrings.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %<package>\ProvidesPackage{stringstrings}
-%<package>[2009/02/13 v1.03
+%<package>[2009/10/01 v1.04
 %<package> Extensive array of string manipulation routines for
 %<package> cosmetic and programming application]
 %<package>\NeedsTeXFormat{LaTeX2e}
@@ -9,6 +9,9 @@
 % v1.01 -Included support for & character, though it loses catcode 4
 %        status
 % v1.02 -Bug fix.  Needed some % chars in \convertchar to avoid extra spaces
+% v1.03 -Documentation fix; notably removed 's' from \narg in \getargs
+% v1.04 -Removed \rotate command, as it conflicts with environment in
+%        \usepackage{rotating}
 \documentclass{ltxdoc}
 \usepackage{stringstrings}
 \DisableCrossrefs
@@ -1444,7 +1447,7 @@
 % for example, to be treated like an alphabetic character rather than
 % a symbol.
 %    \begin{macrocode}
-% QUICK WAY TO SET UP TREATMENTS BY WHICH \rotate HANDLES VARIOUS
+% QUICK WAY TO SET UP TREATMENTS BY WHICH \@rotate HANDLES VARIOUS
 % CHARACTERS
 \newcommand\Treatments[6]{%
   \def\AlphaCapsTreatment{#1}%  <--Set=0 to remove uppercase
@@ -1693,11 +1696,11 @@
       \if T\theresult%
 %       ROTATE THE ESCAPE CHARACTER, WHICH WILL LEAVE THE SYMBOL ENCODED
 %       FOR PROPER GOBBLING (ESCAPE CHARACTER DOESN'T COUNT AS A LETTER)
-        \edef\rotatingword{\rotate{\rotatingword}}%
+        \edef\rotatingword{\@rotate{\rotatingword}}%
         \addtocounter{@letterindex}{-1}%
       \else
 %       NORMAL CHARACTER OR SYMBOL CODE... ROTATE IT
-        \edef\rotatingword{\rotate{\rotatingword}}%
+        \edef\rotatingword{\@rotate{\rotatingword}}%
       \fi
       }%
       {%
@@ -1707,7 +1710,7 @@
         \edef\rotatingword{\ESCrotate{\expandafter\@gobble\rotatingword}}%
       \else
 %       NORMAL CHARACTER... ROTATE IT
-        \edef\rotatingword{\rotate{\rotatingword}}%
+        \edef\rotatingword{\@rotate{\rotatingword}}%
       \fi
       }%
 %    \end{macrocode}
@@ -1949,7 +1952,6 @@
        {\expandafter\@gobble\encodedfromarg}{\encodedtoarg}%
   \fi
 }
-
 %    \end{macrocode}
 % \end{macro}
 
@@ -2674,13 +2676,13 @@
 % of the string, lowering its case.  Store as |\@stringA|.
 %    \begin{macrocode}
     \def\AlphaCapsTreatment{2}%
-    \edef\@stringA{\rotate{#1}}%
+    \edef\@stringA{\@rotate{#1}}%
 %    \end{macrocode}
 % Rotate the first [normal] character of the string to the end
 % of the string, retaining its case.  Store as |\@stringB|.
 %    \begin{macrocode}
     \def\AlphaCapsTreatment{1}%
-    \edef\@stringB{\rotate{#1}}%
+    \edef\@stringB{\@rotate{#1}}%
   \fi
 %    \end{macrocode}
 % Compare strings A and B, to see if changing the case of first letter
@@ -2712,9 +2714,9 @@
     \edef\@stringB{\ESCrotate{\expandafter\@gobble\rotatingword}}%
   \else
     \def\AlphaTreatment{2}%
-    \edef\@stringA{\rotate{#1}}%
+    \edef\@stringA{\@rotate{#1}}%
     \def\AlphaTreatment{1}%
-    \edef\@stringB{\rotate{#1}}%
+    \edef\@stringB{\@rotate{#1}}%
   \fi
   \ifthenelse{\equal{\@stringA}{\@stringB}}%
   {\uncapitalizedfalse}{\uncapitalizedtrue}\?%
@@ -2890,19 +2892,11 @@
 %    \end{macrocode}
 % The following routines support the execution of the \stringstrings
 % package.
-% \begin{macro}{\rotate}
-% This user-callable routine is purely a placeholder for the
-% underlying service routine.
-%    \begin{macrocode}
-% CALLS ON THE GUTS OF THIS PACKAGE.
-\newcommand\rotate[1]{\@rotate{#1}}
-%    \end{macrocode}
-% \end{macro}
 
 % \begin{macro}{\ESCrotate}
 % After the escape character has been ascertained as the next character,
 % this routine operates on the subsequent escape code to rotate the
-% symbol to end of string, in the fashion of macro |\rotate|.
+% symbol to end of string, in the fashion of macro |\@rotate|.
 %    \begin{macrocode}
 \newcommand\ESCrotate[1]{%
   \if\@fromcode#1\@tostring\else
@@ -3479,7 +3473,7 @@
       \isnextbyte[q]{#3}{x}%
       \if F\theresult%
 %       NORMAL OR ENCODED BLANK... ROTATE IT
-        \edef\thestring{\rotate{\thestring}}%
+        \edef\thestring{\@rotate{\thestring}}%
       \else
 %       NORMAL OR ENCODED BLANK... DELETE IT (IF 3rd ARG=X)
         \@gobblearg{\thestring}{1}%
diff --git a/Master/texmf-dist/tex/latex/stringstrings/stringstrings.sty b/Master/texmf-dist/tex/latex/stringstrings/stringstrings.sty
index 7461c68591f..c4c4980880e 100644
--- a/Master/texmf-dist/tex/latex/stringstrings/stringstrings.sty
+++ b/Master/texmf-dist/tex/latex/stringstrings/stringstrings.sty
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 \ProvidesPackage{stringstrings}
-[2009/02/13 v1.03
+[2009/10/01 v1.04
  Extensive array of string manipulation routines for
  cosmetic and programming application]
 \NeedsTeXFormat{LaTeX2e}
@@ -426,17 +426,17 @@
     \ifthenelse{\value{@letterindex} < \value{@fromindex}}%
       {%
       \if T\theresult%
-        \edef\rotatingword{\rotate{\rotatingword}}%
+        \edef\rotatingword{\@rotate{\rotatingword}}%
         \addtocounter{@letterindex}{-1}%
       \else
-        \edef\rotatingword{\rotate{\rotatingword}}%
+        \edef\rotatingword{\@rotate{\rotatingword}}%
       \fi
       }%
       {%
       \if T\theresult%
         \edef\rotatingword{\ESCrotate{\expandafter\@gobble\rotatingword}}%
       \else
-        \edef\rotatingword{\rotate{\rotatingword}}%
+        \edef\rotatingword{\@rotate{\rotatingword}}%
       \fi
       }%
     \if 0\arabic{@capstrigger}%
@@ -557,7 +557,6 @@
   \fi
 }
 
-
 \newcommand\rotateword[2][v]{%
   \+\edef\thestring{#2}\?%
   \@treatleadingspaces[e]{\thestring}{}%
@@ -875,9 +874,9 @@
     \edef\@stringB{\ESCrotate{\expandafter\@gobble\rotatingword}}%
   \else
     \def\AlphaCapsTreatment{2}%
-    \edef\@stringA{\rotate{#1}}%
+    \edef\@stringA{\@rotate{#1}}%
     \def\AlphaCapsTreatment{1}%
-    \edef\@stringB{\rotate{#1}}%
+    \edef\@stringB{\@rotate{#1}}%
   \fi
   \ifthenelse{\equal{\@stringA}{\@stringB}}%
   {\capitalizedfalse}{\capitalizedtrue}\?%
@@ -898,9 +897,9 @@
     \edef\@stringB{\ESCrotate{\expandafter\@gobble\rotatingword}}%
   \else
     \def\AlphaTreatment{2}%
-    \edef\@stringA{\rotate{#1}}%
+    \edef\@stringA{\@rotate{#1}}%
     \def\AlphaTreatment{1}%
-    \edef\@stringB{\rotate{#1}}%
+    \edef\@stringB{\@rotate{#1}}%
   \fi
   \ifthenelse{\equal{\@stringA}{\@stringB}}%
   {\uncapitalizedfalse}{\uncapitalizedtrue}\?%
@@ -1010,7 +1009,6 @@
 }
 
 %%%%% SUPPORT ROUTINES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand\rotate[1]{\@rotate{#1}}
 
 \newcommand\ESCrotate[1]{%
   \if\@fromcode#1\@tostring\else
@@ -1483,7 +1481,7 @@
     \if T\theresult%
       \isnextbyte[q]{#3}{x}%
       \if F\theresult%
-        \edef\thestring{\rotate{\thestring}}%
+        \edef\thestring{\@rotate{\thestring}}%
       \else
         \@gobblearg{\thestring}{1}%
         \edef\thestring{\gobbledword}%