summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/substr/ChangeLog3
-rw-r--r--Master/texmf-dist/doc/latex/substr/README4
-rw-r--r--Master/texmf-dist/doc/latex/substr/testsubstr.pdfbin18438 -> 18413 bytes
-rw-r--r--Master/texmf-dist/doc/latex/substr/testsubstr.tex13
-rw-r--r--Master/texmf-dist/tex/latex/substr/substr.sty18
5 files changed, 32 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/substr/ChangeLog b/Master/texmf-dist/doc/latex/substr/ChangeLog
index 10327fe961c..c57dd3e4567 100644
--- a/Master/texmf-dist/doc/latex/substr/ChangeLog
+++ b/Master/texmf-dist/doc/latex/substr/ChangeLog
@@ -1,2 +1,5 @@
+2009/10/20 v1.2 Uwe Lück
+ - Fix \IfSubStringInString which did not work if the string was contained in the substring
+
2005/11/29 v1.1 Harald Harders
- Add \IfBeforeSubStringEmpty and \IfBehindSubStringEmpty.
diff --git a/Master/texmf-dist/doc/latex/substr/README b/Master/texmf-dist/doc/latex/substr/README
index 4e8554ee7db..95fef13824b 100644
--- a/Master/texmf-dist/doc/latex/substr/README
+++ b/Master/texmf-dist/doc/latex/substr/README
@@ -23,7 +23,7 @@ who improved and rewrote many parts of it.
-Copyright 2000, 2005 Harald Harders
+Copyright 2000, 2005, 2009 Harald Harders
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
@@ -31,6 +31,6 @@ archives in directory macros/latex/base/lppl.txt; either
version 1 of the License, or any later version.
-2005-11-29
+2009-10-20
Harald Harders
h.harders@tu-bs.de
diff --git a/Master/texmf-dist/doc/latex/substr/testsubstr.pdf b/Master/texmf-dist/doc/latex/substr/testsubstr.pdf
index 515eb804d12..2d94070fb97 100644
--- a/Master/texmf-dist/doc/latex/substr/testsubstr.pdf
+++ b/Master/texmf-dist/doc/latex/substr/testsubstr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/substr/testsubstr.tex b/Master/texmf-dist/doc/latex/substr/testsubstr.tex
index 2b9054ae045..1429b7515a0 100644
--- a/Master/texmf-dist/doc/latex/substr/testsubstr.tex
+++ b/Master/texmf-dist/doc/latex/substr/testsubstr.tex
@@ -15,6 +15,19 @@
\IfSubStringInString{\subSTR}{\str}{Error}{No ``\subSTR'' in ``\str''}
+\IfSubStringInString{day after }{day after day}{JA}{NEIN}
+\IfSubStringInString{AMSTERD}{AMSTERDAM}{JA}{NEIN}
+\IfSubStringInString{bon}{bonbon}{JA}{NEIN}
+\IfSubStringInString{bono}{bonobo}{JA}{NEIN}
+\IfSubStringInString{ionizat}{ionization}{JA}{NEIN}
+
+\IfSubStringInString{day after day}{day after }{JA}{NEIN}
+\IfSubStringInString{AMSTERDAM}{AMSTERD}{JA}{NEIN}
+\IfSubStringInString{bonbon}{bon}{JA}{NEIN}
+\IfSubStringInString{bonobo}{bono}{JA}{NEIN}
+\IfSubStringInString{ionization}{ionizat}{JA}{NEIN}
+
+
\bigskip{\bfseries BeforeSubString and BehindSubString}
diff --git a/Master/texmf-dist/tex/latex/substr/substr.sty b/Master/texmf-dist/tex/latex/substr/substr.sty
index d7c0ca12612..0f5a74762bc 100644
--- a/Master/texmf-dist/tex/latex/substr/substr.sty
+++ b/Master/texmf-dist/tex/latex/substr/substr.sty
@@ -53,7 +53,17 @@
%% who improved and rewrote many parts of it.
%%
%%
-%% Copyright 2000, 2005 Harald Harders
+%% ChangeLog
+%%
+%% 2009/10/20 v1.2 Uwe Lück
+%% - Fix \IfSubStringInString which did not work if the string was contained in the substring
+%%
+%% 2005/11/29 v1.1 Harald Harders
+%% - Add \IfBeforeSubStringEmpty and \IfBehindSubStringEmpty.
+%%
+%%
+%%
+%% Copyright 2000, 2005, 2009 Harald Harders
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -61,11 +71,11 @@
%% version 1 of the License, or any later version.
%%
%%
-%% 2005-11-29
+%% 2009-10-20
%% Harald Harders
%% h.harders@tu-bs.de
%%
-\ProvidesPackage{substr}[2005/11/29 v1.1 Handle substrings]
+\ProvidesPackage{substr}[2009/10/20 v1.2 Handle substrings]
%%
% expands the first and second argument with
% \protected@edef and calls #3 with them:
@@ -92,7 +102,7 @@
\expandafter\@firstoftwo
\fi
}%
- \su@compare#2#1\@nil
+ \su@compare#2\@nnil#1\@nil
}
%%
%% tests if #1 in #2. If yes execute #3, else #4