diff options
author | Karl Berry <karl@freefriends.org> | 2009-12-24 01:09:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-12-24 01:09:40 +0000 |
commit | 10ffc394eae6cfbb4eb3fe0c4c732d4d7bbcc8ef (patch) | |
tree | 7b3a274740b67ac109c564b9b73359ba660a2095 /Master/texmf-dist/tex | |
parent | cac11a2105e5c8aec24d45acb91d5f415bbaec52 (diff) |
expl3 update (23dec09)
git-svn-id: svn://tug.org/texlive/trunk@16491 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3doc.cls | 40 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3keys.sty | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3names.sty | 6 |
3 files changed, 15 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3doc.cls b/Master/texmf-dist/tex/latex/expl3/l3doc.cls index 8e39320c493..a1ff6c00b0f 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3doc.cls +++ b/Master/texmf-dist/tex/latex/expl3/l3doc.cls @@ -53,7 +53,7 @@ \let \filedateOld \filedate \let \fileversionOld \fileversion \let \filedescriptionOld \filedescription -\GetIdInfo$Id: l3doc.dtx 1733 2009-11-08 06:24:26Z will $ +\GetIdInfo$Id: l3doc.dtx 1755 2009-12-23 07:07:48Z joseph $ {L3 Experimental documentation class} \ProvidesExplClass {\filename}{\filedate}{\fileversion}{\filedescription} @@ -133,6 +133,10 @@ \if b\expandafter\@car\f@series\@nil\boldmath\fi $\m@th\varepsilon$-\TeX } +\cs_if_free:NT \XeTeX { + \cs_new_protected_nopar:Npn \XeTeX + {X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\TeX} +} \cs_set_nopar:Npn \cmd #1 { \cs{\expandafter\cmd@to@cs\string#1} } \cs_set_nopar:Npn \cmd@to@cs #1#2 { \char\number`#2\relax } \DeclareRobustCommand \cs [1] { \texttt { \char`\\ #1 } } @@ -702,40 +706,6 @@ ========================================^^J }} } -\cs_new_nopar:Npn \includeltpatch { - \cs_set_nopar:Npn \currentfile {l3patch.ltx} - \part{l3patch} - {\cs_set_eq:NN \ttfamily\relax - \cs_gset_nopar:Npx \filekey{\filekey, \thepart={\ttfamily\currentfile}}} - Things~we~did~wrong\ldots - \IndexInput{l3patch.ltx}} -\cs_set_nopar:Npn \patchdate{0} -\begingroup - %%\cs_set_nopar:Npn \ProvidesFile#1\fmtversion#2{\date{#2}\endinput} - \cs_set_nopar:Npn \ProvidesFile#1[#2#3]{\date{#2}\endinput} - \input{l3vers.dtx} - \cs_gset_nopar:Npx \@date{\@date} - \cs_gset_eq:NN \X@date \@date - \cs_set:Npn \Xdef#1#2#3\def#4#5 { - \cs_gset_nopar:Npx \X@date{#2} - \cs_gset_nopar:Npx \patchdate{#5} - \endinput - } - \InputIfFileExists{l3patch.ltx}{ - \cs_set_eq:NN \cs_set_nopar:Npn \Xdef - }{ - \cs_gset_eq:NN \includeltpatch \relax - } -\endgroup -\ifx\@date\X@date - \cs_set_nopar:Npn \Xpatch{0} - \ifx\patchdate\Xpatch\else - \cs_set_nopar:Npx \@date {\@date\space Patch level \patchdate} - \fi -\else - \@warning{l3patch.ltx does not match l3vers.dtx!} - \cs_set_eq:NN \includeltpatch \relax -\fi \bool_if:NTF \g_doc_full_bool { \RecordChanges \CodelineIndex diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty index d8531400ff4..d1a19278a5c 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3keys.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3keys.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3keys.dtx 1716 2009-11-06 08:56:23Z joseph $ +\GetIdInfo$Id: l3keys.dtx 1748 2009-11-18 08:48:04Z joseph $ {L3 Experimental key-value support} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -222,11 +222,14 @@ } } \cs_new_nopar:Npn \keys_meta_make:n #1 { + \exp_last_unbraced:NNo \keys_cmd_set:nn \l_keys_path_tl + \exp_after:wN { \exp_after:wN \keys_set:nn \exp_after:wN { \l_keys_module_tl } {#1} } +} +\cs_new_nopar:Npn \keys_meta_make:x #1 { \keys_cmd_set:nx { \l_keys_path_tl } { \exp_not:N \keys_set:nn { \l_keys_module_tl } {#1} } } -\cs_generate_variant:Nn \keys_meta_make:n { x } \cs_new_nopar:Npn \keys_property_find:n #1 { \tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / } \tl_if_in:nnTF {#1} {.} { diff --git a/Master/texmf-dist/tex/latex/expl3/l3names.sty b/Master/texmf-dist/tex/latex/expl3/l3names.sty index ba040510d0d..9c6fd97f716 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3names.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3names.sty @@ -87,7 +87,7 @@ \gdef\filedescription{#1}% \ProvidesPackage{[unknown package]}[0000/00/00 v0.0 #1] } -\GetIdInfo$Id: l3names.dtx 1677 2009-11-02 08:24:04Z joseph $ +\GetIdInfo$Id: l3names.dtx 1751 2009-11-26 08:36:12Z joseph $ {L3 Experimental Naming Scheme for TeX Primitives} \endgroup \begingroup @@ -729,6 +729,10 @@ \ProvidesClass{#1}[#2~v#3~#4] \ExplSyntaxOn } +\tex_def:D \ProvidesExplFile#1#2#3#4{ + \ProvidesFile{#1}[#2~v#3~#4] + \ExplSyntaxOn +} \tex_edef:D \@pushfilename{ \etex_unexpanded:D{ \tex_edef:D \ExplSyntaxStack{ \ExplSyntaxStatus \ExplSyntaxStack } |