summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-22 22:00:03 +0000
committerKarl Berry <karl@freefriends.org>2014-05-22 22:00:03 +0000
commita8821950ae08fd013ee64b64531ab848daf3a52d (patch)
tree48ec8aeb134872f41c67392a341fa6ada437e8fe /Master/texmf-dist/tex
parent18d8e85ee1c3930117a61759d4443a3e495d9ac0 (diff)
l3kernel (22may14)
git-svn-id: svn://tug.org/texlive/trunk@34204 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex128
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex18
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex12
4 files changed, 94 insertions, 68 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 563e66c32ad..5940982692f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -81,20 +81,20 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2014/05/06}
-\def\ExplFileVersion{4751}
+\def\ExplFileDate{2014/05/20}
+\def\ExplFileVersion{4814}
\begingroup
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx PackageError\endcsname\relax
+ \def\next{\endgroup}
+ \expandafter\ifx\csname PackageError\endcsname\relax
\begingroup
- \def\PackageError##1##2##3%
+ \def\next{\endgroup\endgroup}
+ \def\PackageError#1#2#3%
{%
\endgroup
- \errhelp{##3}%
- \errmessage{##1 Error: ##2!}
+ \errhelp{#3}%
+ \errmessage{#1 Error: #2!}
}
\fi
- \def\next{}
\expandafter\ifx\csname ExplLoaderFileVersion\endcsname\relax
\def\next
{%
@@ -103,11 +103,11 @@
You have attempted to use the expl3 code directly rather than using
the correct loader. Loading of expl3 will abort.
}
+ \endgroup
\endinput
}
\else
\ifx\ExplLoaderFileVersion\ExplFileVersion
- \def\next{}
\else
\def\next
{%
@@ -117,11 +117,11 @@
probably you have one or more files 'locally installed' which
are in conflict. Loading of expl3 will abort.
}%
+ \endgroup
\endinput
}
\fi
- \expandafter\fi
-\expandafter\endgroup
+\fi
\next
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ver@\ExplFileName -code.tex\endcsname\relax
@@ -241,7 +241,7 @@
}
}
\endgroup
-\GetIdInfo$Id: l3bootstrap.dtx 4750 2014-05-06 16:56:59Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 4782 2014-05-16 22:12:19Z joseph $
{L3 Bootstrap code}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfstrcmp\endcsname\relax
@@ -254,9 +254,9 @@
\else
\catcode`\_=11 %
\catcode`\:=11 %
- \directlua
+ \def\tempa
{%
- l3kernel = { }
+ l3kernel = l3kernel or { }
function l3kernel.strcmp (A, B)
if A == B then
tex.write ("0")
@@ -267,6 +267,20 @@
end
end
}
+ \directlua{\tempa}
+ \ifnum 0%
+ \directlua
+ {%
+ if status.ini_version then
+ tex.write("1")
+ end
+ }>0 %
+ \global\everyjob\expandafter
+ {%
+ \the\expandafter\everyjob
+ \expandafter\luatex_directlua:D\expandafter{\tempa}%
+ }
+ \fi
\long\gdef\expl_pdfstrcmp#1#2%
{%
\luatex_directlua:D
@@ -282,6 +296,7 @@
\fi
\endgroup
\begingroup
+ \def\next{\endgroup}
\def\ShortText{Required primitives not found}%
\def\LongText%
{%
@@ -298,20 +313,26 @@
\catcode`\_=11 %
\expandafter\ifx\csname expl_pdfstrcmp\endcsname\relax
\def\LineBreak{\noexpand\MessageBreak}%
- \edef\Error%
+ \expandafter\ifx\csname PackageError\endcsname\relax
+ \def\LineBreak{^^J}%
+ \begingroup
+ \def\PackageError#1#2#3%
+ {%
+ \endgroup
+ \errhelp{#3}%
+ \errmessage{#1 Error: #2!}
+ }%
+ \fi
+ \edef\next
{%
- \endgroup
\noexpand\PackageError{expl3}{\ShortText}
{\LongText Loading of expl3 will abort!}%
+ \endgroup
\noexpand\endinput
}%
- \expandafter\expandafter\expandafter\Error
- \else
- \endgroup
\fi
-\else
- \endgroup
-\fi
+ \fi
+\next
\begingroup
\def\@tempa{LaTeX2e}
\def\next{}
@@ -3604,7 +3625,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3int.dtx 4728 2014-05-04 13:25:37Z joseph $
+\GetIdInfo$Id: l3int.dtx 4776 2014-05-16 14:46:44Z joseph $
{L3 Integers}
\cs_new_eq:NN \__int_value:w \tex_number:D
\cs_new_eq:NN \__int_eval:w \etex_numexpr:D
@@ -8122,7 +8143,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3keys.dtx 4728 2014-05-04 13:25:37Z joseph $
+\GetIdInfo$Id: l3keys.dtx 4753 2014-05-08 20:12:49Z joseph $
{L3 Key-value interfaces}
\int_new:N \g__keyval_level_int
\tl_new:N \l__keyval_key_tl
@@ -8140,7 +8161,6 @@
\cs_new_protected:Npn \__keyval_parse:n #1
{
\group_begin:
- \tl_clear:N \l__keyval_sanitise_tl
\tl_set:Nn \l__keyval_sanitise_tl {#1}
\tl_replace_all:Nnn \l__keyval_sanitise_tl { = } { 8 }
\tl_replace_all:Nnn \l__keyval_sanitise_tl { , } { 9 }
@@ -8153,19 +8173,18 @@
}
\cs_new_protected:Npn \__keyval_parse_elt:w #1 ,
{
- \tl_if_blank:oTF { \use_none:n #1 }
- { \__keyval_parse_elt:w \q_nil }
+ \tl_if_blank:oF { \use_none:n #1 }
{
- \quark_if_recursion_tail_stop:o { \use_ii:nn #1 }
- \__keyval_split_key_value:w #1 = = \q_stop
- \__keyval_parse_elt:w \q_nil
+ \quark_if_recursion_tail_stop:o { \use_none:n #1 }
+ \__keyval_split_key_value:w #1 \q_nil = = \q_stop
}
+ \__keyval_parse_elt:w \q_nil
}
-\cs_new_protected:Npn \__keyval_split_key_value:w #1 = #2 \q_stop
+\cs_new_protected:Npn \__keyval_split_key_value:w #1 = #2 = #3 \q_stop
{
- \__keyval_split_key:n {#1}
- \str_if_eq:nnTF {#2} { = }
+ \tl_if_blank:nTF {#3}
{
+ \__keyval_split_key:w #1 \q_stop
\tl_put_right:Nx \l__keyval_parse_tl
{
\exp_not:c
@@ -8174,47 +8193,32 @@
}
}
{
- \__keyval_split_key_value:wTF #2 \q_no_value \q_stop
- { \__keyval_split_value:w \q_nil #2 }
+ \__keyval_split:Nn \l__keyval_key_tl {#1}
+ \tl_if_blank:oTF { \use_none:n #3 }
+ { \__keyval_split_value:w \q_nil #2 \q_stop }
{ \__msg_kernel_error:nn { kernel } { misplaced-equals-sign } }
}
}
-\cs_new:Npn \__keyval_split_key_value:wTF #1 = #2#3 \q_stop
- { \tl_if_head_eq_meaning:nNTF {#3} \q_no_value }
-\cs_new_protected:Npn \__keyval_split_key:n #1
+\cs_new_protected:Npn \__keyval_split_key:w #1 \q_nil \q_stop
+ { \__keyval_split:Nn \l__keyval_key_tl {#1} }
+\cs_new_protected:Npn \__keyval_split:Nn #1#2
{
- \quark_if_nil:oTF { \use_none:nnn #1 \q_nil \q_nil }
- { \tl_set:Nx \l__keyval_key_tl { \exp_not:o { \use_ii:nnn #1 \q_nil } } }
- { \__keyval_split_key:w #1 \q_stop }
+ \quark_if_nil:oTF { \use_none:nnn #2 \q_nil \q_nil }
+ { \tl_set:Nx #1 { \exp_not:o { \use_ii:nnn #2 \q_nil } } }
+ { \__keyval_split:Nw #1 #2 \q_stop }
}
-\cs_new_protected:Npn \__keyval_split_key:w \q_nil #1 \q_stop
- { \tl_set:Nx \l__keyval_key_tl { \tl_trim_spaces:n {#1} } }
-\cs_new_protected:Npn \__keyval_split_value:w #1 = =
+\cs_new_protected:Npn \__keyval_split:Nw #1 \q_nil #2 \q_stop
+ { \tl_set:Nx #1 { \tl_trim_spaces:n {#2} } }
+\cs_new_protected:Npn \__keyval_split_value:w #1 \q_nil \q_stop
{
+ \__keyval_split:Nn \l__keyval_value_tl {#1}
\tl_put_right:Nx \l__keyval_parse_tl
{
\exp_not:c
{ __keyval_key_value_elt_ \int_use:N \g__keyval_level_int :nn }
{ \exp_not:o \l__keyval_key_tl }
+ { \exp_not:o \l__keyval_value_tl }
}
- \tl_set:Nx \l__keyval_value_tl
- { \exp_not:o { \use_none:nnn #1 \q_nil \q_nil } }
- \tl_if_empty:NTF \l__keyval_value_tl
- { \tl_put_right:Nn \l__keyval_parse_tl { { } } }
- {
- \quark_if_nil:NTF \l__keyval_value_tl
- {
- \tl_put_right:Nx \l__keyval_parse_tl
- { { \exp_not:o { \use_ii:nnn #1 \q_nil } } }
- }
- { \__keyval_split_value_aux:w #1 \q_stop }
- }
- }
-\cs_new_protected:Npn \__keyval_split_value_aux:w \q_nil #1 \q_stop
- {
- \tl_set:Nx \l__keyval_value_tl { \tl_trim_spaces:n {#1} }
- \tl_put_right:Nx \l__keyval_parse_tl
- { { \exp_not:o \l__keyval_value_tl } }
}
\cs_new_protected:Npn \keyval_parse:NNn #1#2#3
{
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 360099ac915..5f41e03a2d2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -47,8 +47,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2014/05/06}
-\def\ExplFileVersion{4751}
+\def\ExplFileDate{2014/05/20}
+\def\ExplFileVersion{4814}
\let\ExplLoaderFileVersion\ExplFileVersion
\begingroup
\def\tempa{LaTeX2e}
@@ -100,8 +100,17 @@
\input expl3-code.tex %
\cs_set_eq:NN \__iow_wrap_set:Nx \tl_set:Nx
\protected\def\GetIdInfoLog{}
-\cs_set_protected:Npn \ProvidesExplFile #1#2#3#4
- { \iow_log:n { File:~#1~#2~v#3~#4 } }
+\cs_set_protected:Npn \ProvidesExplFile
+ {
+ \group_begin:
+ \char_set_catcode_space:n { `\ }
+ \ProvidesExplFileAux
+ }
+\cs_set_protected:Npn \ProvidesExplFileAux #1#2#3#4
+ {
+ \group_end:
+ \iow_log:x { File:~#1~#2~v#3~#4 }
+ }
\tex_input:D
l3
\xetex_if_engine:TF
@@ -115,6 +124,7 @@
}
.def \scan_stop:
\cs_undefine:N \ProvidesExplFile
+\cs_undefine:N \ProvidesExplFileAux
\ExplSyntaxOff
\l@expl@tidy@tl
%%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index fa30ff9d0e9..1b25d6f4498 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -47,8 +47,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2014/05/06}
-\def\ExplFileVersion{4751}
+\def\ExplFileDate{2014/05/20}
+\def\ExplFileVersion{4814}
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
index a8d05a96841..c4cb4792191 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
@@ -101,6 +101,18 @@
\let\do\putline@do
\activefiles
}
+\def\doOption#1>#2\endLine{%
+ \maybeMsg{<#1 . >}%
+ \Evaluate{#1}%
+ \def\do##1##2##3{%
+ \if1\Expr{##2}%
+ \def\inLine{#2}%
+ \replaceModuleInLine
+ \StreamPut##1{\inLine}%
+ \fi
+ }%
+ \activefiles
+}
%%
%%
%% End of file `l3docstrip.tex'.