summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-13 17:24:04 +0000
committerKarl Berry <karl@freefriends.org>2010-09-13 17:24:04 +0000
commit55ef49769bfcb8d8d52f1a6c23a38d5d13b64426 (patch)
tree2388c09f5ae4d0cd1a8c59870631ac674f8436f9
parenta2a5d98db8396925801d7f3ea385465f1f633609 (diff)
texapi update (20jul10)
git-svn-id: svn://tug.org/texlive/trunk@19706 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/texapi/texapi-doc.pdfbin188829 -> 188968 bytes
-rw-r--r--Master/texmf-dist/doc/generic/texapi/texapi-doc.tex15
-rw-r--r--Master/texmf-dist/tex/generic/texapi/texapi.tex24
3 files changed, 21 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf b/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf
index 5e98a945220..b5f012612c5 100644
--- a/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf
+++ b/Master/texmf-dist/doc/generic/texapi/texapi-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex b/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex
index fcba1d1933b..32fe3753151 100644
--- a/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex
+++ b/Master/texmf-dist/doc/generic/texapi/texapi-doc.tex
@@ -314,7 +314,8 @@ Finally, the following may be a useful indication (added in version 1.01).
\cslist{
\texapiversion
}
-This a macro that holds \texapi's version number. Current: \texapiversion.
+This a macro that holds \texapi's version number.
+The current version is \texapiversion.
\description/
@@ -799,10 +800,11 @@ with a conditional.
\description{Poking at what comes next}
\cslist{
- \nospace/code/
+ \skipspace/code/
}
This gobbles any incoming space, if any, and executes \arg{code}.
Of course it doesn't require there to be any space to work properly.
+(This was called \com\nospace prior to version 1.02.)
\vskip\baselineskip
@@ -813,7 +815,7 @@ variants by doubling the \tcode{f} and/or adding \tcode{nospace}
at the end.
\Example
-\nospace{foo} bar
+\skipspace{foo} bar
\Example/
\cslist{
@@ -987,18 +989,19 @@ These define \comarg\ as \arg{string} without \arg{prefix}
(resp. \arg{suffix}). No test either. Sorry.
\cslist{
- \splitstring/string1//string2//code/
+ \splitstringat/string1//string2//code/
}
This cuts \arg{string2} in two at \arg{string1}'s first occurrence
and passes the two parts as braced arguments to \arg{code}. And,
-again: no test.
+again: no test. (This was called \com\splitstring prior to version
+1.02.)
\Example
\def\record#1 : #2.{%
\par\bgroup
\it\ifprefix*{#1}{\removeprefix*{#1} [live]}{#1}
\egroup
- (\ifcontains/{#2}{\splitstring/{#2}{\dodate}}{#2})
+ (\ifcontains/{#2}{\splitstringat/{#2}{\dodate}}{#2})
}
\def\dodate#1#2{recorded #1, released #2}
diff --git a/Master/texmf-dist/tex/generic/texapi/texapi.tex b/Master/texmf-dist/tex/generic/texapi/texapi.tex
index 2f755cf419a..4cb16ddeec9 100644
--- a/Master/texmf-dist/tex/generic/texapi/texapi.tex
+++ b/Master/texmf-dist/tex/generic/texapi/texapi.tex
@@ -16,7 +16,7 @@
\expandafter\endinput
\fi
%
-\def\texapiversion{1.01}
+\def\texapiversion{1.02}
\expandafter\edef\csname pi@restorecatcodes\endcsname{%
\catcode`\noexpand\@=\the\catcode`@\relax
\catcode`\noexpand\_=\the\catcode`_\relax
@@ -370,10 +370,10 @@
%
\newtoks\pi@temp_tokenA
\newtoks\pi@temp_tokenB
-\long\pdef\nospace#1{%
+\long\pdef\skipspace#1{%
\pi@temp_tokenA={#1}%
\def\pi@nospace_repeat{%
- \expandafter\nospace\expandafter{\the\pi@temp_tokenA}%
+ \expandafter\skipspace\expandafter{\the\pi@temp_tokenA}%
}%
\futurelet\pi@temp\pi@nospace_check
}
@@ -418,13 +418,13 @@
\futurelet\pi@temp\pi@ifnext_do
}
\long\def\pi@ifnext_nospace#1#2#3#4{%
- \nospace{\pi@ifnext_any#1#2{#3}{#4}}%
+ \skipspace{\pi@ifnext_any#1#2{#3}{#4}}%
}
\long\def\pi@iffnext_any#1#2#3{%
\pi@ifnext_any#1#2{#3}{}%
}
\long\def\pi@iffnext_nospace#1#2#3{%
- \nospace{\pi@ifnext_any#1#2{#3}{}}%
+ \skipspace{\pi@ifnext_any#1#2{#3}{}}%
}
\def\pi@ifnext_do{%
\pi@ifnext_test\noexpand\pi@temp\noexpand\pi@ifnext_token
@@ -448,7 +448,7 @@
\pi@dofor_noemptytrue\pi@dofor_getlist
}
\long\def\pi@dofor_getlist#1{%
- \nospace{\pi@dofor_getparameter{#1}}%
+ \skipspace{\pi@dofor_getparameter{#1}}%
}
\long\def\pi@dofor_getparameter#1#2#{%
\pi@dofor_dolist{#1}{#2}%
@@ -500,8 +500,8 @@
}
\pdef\newfornoempty#1{%
\pi@dofor_noemptytrue
- \ifcatnext\bgroup{\nospace{\pi@newfor_pass{#1}}}
- {\nospace{\pi@newfor_pass{#1}{0}}}%
+ \ifcatnext\bgroup{\skipspace{\pi@newfor_pass{#1}}}
+ {\skipspace{\pi@newfor_pass{#1}{0}}}%
}
\long\def\pi@newfor_pass#1#2#3#{%
\pi@newfor_getcoda{#1}{#2}{#3}
@@ -784,7 +784,7 @@
%
\long\gdefcs{pi@strings_ifcontains:\detokenize{#1}}##1#1##2\pi@terminator{%
\ifemptystring{##2}\secondoftwo\firstoftwo}%
- \long\gdefcs{pi@strings_splitstring:\detokenize{#1}}##1#1##2\pi@terminator##3{%
+ \long\gdefcs{pi@strings_splitstringat:\detokenize{#1}}##1#1##2\pi@terminator##3{%
##3{##1}{##2}}%
}
%
@@ -846,9 +846,9 @@
\pi@temp#2\pi@terminator
}
%
-\long\def\splitstring#1#2#3{%
- \ifcs{pi@strings_splitstring:\detokenize{#1}}
- {\usecs{pi@strings_splitstring:\detokenize{#1}}#2\pi@terminator{#3}}
+\long\def\splitstringat#1#2#3{%
+ \ifcs{pi@strings_splitstringat:\detokenize{#1}}
+ {\usecs{pi@strings_splitstringat:\detokenize{#1}}#2\pi@terminator{#3}}
{\long\def\pi@temp##1#1##2\pi@terminator{#3{##1}{##2}}%
\pi@temp#2\pi@terminator}%
}