datatool (18jan16)

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

1 files changed, 47 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
index bff81cc7e7e..ce4d6d7b64f 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{datatool-base}[2016/01/18 v2.25 (NLCT)]
 \RequirePackage{etoolbox}
 \RequirePackage{amsmath}
 \RequirePackage{xkeyval}
@@ -1544,20 +1544,25 @@
       \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
       \ifnum\dtl@codeA=-1\relax
         \ifnum\dtl@codeB=-1\relax
-           \protected@edef\dtl@donext{%
-             \noexpand\dtlcompare{\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+           \edef\dtl@donext{%
+             \noexpand\dtlcompare
+             {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
            \dtl@donext
         \else
-           \protected@edef\dtl@donext{%
+           \edef\dtl@donext{%
              \noexpand\dtlcompare
-               {\noexpand#1}{\dtl@restA}{\dtl@firstB\dtl@restB}}%
+               {\noexpand#1}%
+               {\expandonce\dtl@restA}%
+               {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
            \dtl@donext
         \fi
       \else
         \ifnum\dtl@codeB=-1\relax
-           \protected@edef\dtl@donext{%
+           \edef\dtl@donext{%
              \noexpand\dtlcompare
-               {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@restB}}%
+               {\noexpand#1}%
+               {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+               {\expandonce\dtl@restB}}%
            \dtl@donext
         \else
           \ifnum\dtl@codeA<\dtl@codeB
@@ -1593,14 +1598,18 @@
         \fi
       \fi
       }{%
-      \protected@edef\dtl@donext{%
+      \edef\dtl@donext{%
         \noexpand\dtlcompare
-          {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+          {\noexpand#1}%
+          {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+          {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
       \dtl@donext
       }}{%
-      \protected@edef\dtl@donext{%
+      \edef\dtl@donext{%
         \noexpand\dtlcompare
-          {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+          {\noexpand#1}%
+          {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+          {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
       \dtl@donext
       }%
     }%
@@ -2022,20 +2031,25 @@
           \expandafter\dtl@setlccharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
           \ifnum\dtl@codeA=-1\relax
             \ifnum\dtl@codeB=-1\relax
-               \protected@edef\dtl@donext{%
-                 \noexpand\dtlicompare{\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+               \edef\dtl@donext{%
+                 \noexpand\dtlicompare{\noexpand#1}%
+                 {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
                \dtl@donext
             \else
-               \protected@edef\dtl@donext{%
+               \edef\dtl@donext{%
                  \noexpand\dtlicompare
-                   {\noexpand#1}{\dtl@restA}{\dtl@firstB\dtl@restB}}%
+                   {\noexpand#1}%
+                   {\expandonce\dtl@restA}%
+                   {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
                \dtl@donext
             \fi
           \else
             \ifnum\dtl@codeB=-1\relax
-               \protected@edef\dtl@donext{%
+               \edef\dtl@donext{%
                  \noexpand\dtlicompare
-                   {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@restB}}%
+                  {\noexpand#1}%
+                  {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+                  {\expandonce\dtl@restB}}%
                \dtl@donext
             \else
               \ifnum\dtl@codeA<\dtl@codeB
@@ -2060,9 +2074,11 @@
                        #1=1\relax
                      }%
                      {%
-                       \protected@edef\dtl@donext{%
+                       \edef\dtl@donext{%
                          \noexpand\dtlicompare
-                           {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+                           {\noexpand#1}%
+                           {\expandonce\dtl@restA}%
+                           {\expandonce\dtl@restB}}%
                        \dtl@donext
                      }%
                    }%
@@ -2072,16 +2088,20 @@
           \fi
         }%
         {%
-          \protected@edef\dtl@donext{%
+          \edef\dtl@donext{%
             \noexpand\dtlicompare
-              {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+              {\noexpand#1}%
+              {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+              {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
           \dtl@donext
         }%
       }%
       {%
-        \protected@edef\dtl@donext{%
+        \edef\dtl@donext{%
           \noexpand\dtlicompare
-            {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+            {\noexpand#1}%
+            {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+            {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
         \dtl@donext
       }%
     }%
@@ -2213,9 +2233,11 @@
           #1=1\relax
         \else
           \ifcase\@dtl@A@chargroup
-            \protected@edef\dtl@donext{%
+            \edef\dtl@donext{%
               \noexpand\dtlcompare
-                {\noexpand#1}{\@dtl@A@before}{\@dtl@B@before}}%
+                {\noexpand#1}%
+                {\expandonce\@dtl@A@before}%
+                {\expandonce\@dtl@B@before}}%
             \dtl@donext
           \or
             \ifnum\@dtl@A@before<\@dtl@B@before\relax