From 4b0df656c35cd9a2eded4e224631cc9d74fe70d4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Sep 2010 16:20:18 +0000 Subject: expl3 update (26jul10) git-svn-id: svn://tug.org/texlive/trunk@19701 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/expl3/expl3.sty | 3 +- Master/texmf-dist/tex/latex/expl3/l3doc.cls | 17 ++- Master/texmf-dist/tex/latex/expl3/l3fp.sty | 2 +- Master/texmf-dist/tex/latex/expl3/l3luatex.sty | 172 +++++++++++++++++++++++++ Master/texmf-dist/tex/latex/expl3/l3names.sty | 20 ++- 5 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/expl3/l3luatex.sty (limited to 'Master/texmf-dist/tex/latex/expl3') diff --git a/Master/texmf-dist/tex/latex/expl3/expl3.sty b/Master/texmf-dist/tex/latex/expl3/expl3.sty index 108bdfb6a7d..63917163f94 100644 --- a/Master/texmf-dist/tex/latex/expl3/expl3.sty +++ b/Master/texmf-dist/tex/latex/expl3/expl3.sty @@ -49,7 +49,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: expl3.dtx 1982 2010-07-13 07:16:14Z joseph $ +\GetIdInfo$Id: expl3.dtx 1987 2010-07-25 14:55:46Z joseph $ {L3 Experimental code bundle wrapper}% \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -88,6 +88,7 @@ l3xref, l3file, l3fp, + l3luatex, } \RequirePackage{calc} \bool_if:nT { \@l@expl@check@declarations@bool } { diff --git a/Master/texmf-dist/tex/latex/expl3/l3doc.cls b/Master/texmf-dist/tex/latex/expl3/l3doc.cls index 286c61a03a5..e747cf92e84 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 1890 2010-04-11 03:37:15Z will $ +\GetIdInfo$Id: l3doc.dtx 1987 2010-07-25 14:55:46Z joseph $ {L3 Experimental documentation class} \ProvidesExplClass {\filename}{\filedate}{\fileversion}{\filedescription} @@ -133,6 +133,11 @@ \if b\expandafter\@car\f@series\@nil\boldmath\fi $\m@th\varepsilon$-\TeX } +\providecommand*\IniTeX{Ini\TeX} +\providecommand*\Lua{Lua} +\providecommand*\LuaTeX{\Lua\TeX} +\providecommand*\pdfTeX{pdf\TeX} +\RequirePackage{graphicx} \cs_if_free:NT \XeTeX { \cs_new_protected_nopar:Npn \XeTeX {X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\TeX} @@ -202,7 +207,9 @@ } \group_end: \cs_set_eq:NN \variable \function -\cs_set_nopar:Npn \function_aux:n #1 { +\group_begin: +\char_make_other:N \| +\cs_gset_nopar:Npn \function_aux:n #1 { \cs_set_nopar:Npn \nextnewline{\cs_gset_nopar:Npn\nextnewline{\\}} \tl_gset_eq:NN \g_doc_macro_tl \c_empty_tl \bigskip\endgraf\noindent\ttfamily @@ -213,7 +220,10 @@ \endtabular \group_end: } -\cs_set_nopar:Npn \doc_showmacro:w #1 | { +\group_end: +\group_begin: +\char_make_other:N \| +\cs_gset_nopar:Npn \doc_showmacro:w #1 | { \tl_if_blank:nTF {#1} { \use_none:n }{ @@ -221,6 +231,7 @@ \peek_meaning:NTF \q_stop { \use_none:n } { \doc_showmacro:w } } } +\group_end: \bool_new:N \l_doc_meta_TF_bool \bool_new:N \l_doc_meta_EXP_bool \cs_new_nopar:Npn \doc_showmacro_aux:w #1 / #2 \q_stop { diff --git a/Master/texmf-dist/tex/latex/expl3/l3fp.sty b/Master/texmf-dist/tex/latex/expl3/l3fp.sty index f2677b2c481..93915ae18be 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3fp.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3fp.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3fp.dtx 1979 2010-07-08 19:51:19Z joseph $ +\GetIdInfo$Id: l3fp.dtx 1985 2010-07-18 09:05:56Z joseph $ {L3 Experimental floating-point operations} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} diff --git a/Master/texmf-dist/tex/latex/expl3/l3luatex.sty b/Master/texmf-dist/tex/latex/expl3/l3luatex.sty new file mode 100644 index 00000000000..0aa6468d7e8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/expl3/l3luatex.sty @@ -0,0 +1,172 @@ +%% +%% This is file `l3luatex.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% l3luatex.dtx (with options: `package') +%% +%% +%% EXPERIMENTAL CODE +%% +%% Do not distribute this file without also distributing the +%% source files specified above. +%% +%% Do not distribute a modified version of this file. +%% +%% +%% File: l3fp.dtx Copyright (C) 2010 LaTeX3 project +%% +%% It may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License (LPPL), either version 1.3c of this +%% license or (at your option) any later version. The latest version +%% of this license is in the file +%% +%% http://www.latex-project.org/lppl.txt +%% +%% This file is part of the ``expl3 bundle'' (The Work in LPPL) +%% and all files in that bundle must be distributed together. +%% +%% The released version of this bundle is available from CTAN. +%% +%% ----------------------------------------------------------------------- +%% +%% The development version of the bundle can be found at +%% +%% http://www.latex-project.org/svnroot/experimental/trunk/ +%% +%% for those people who are interested. +%% +%%%%%%%%%%% +%% NOTE: %% +%%%%%%%%%%% +%% +%% Snapshots taken from the repository represent work in progress and may +%% not work or may contain conflicting material! We therefore ask +%% people _not_ to put them into distributions, archives, etc. without +%% prior consultation with the LaTeX Project Team. +%% +%% ----------------------------------------------------------------------- +\RequirePackage{l3names} +\GetIdInfo$Id: l3luatex.dtx 1985 2010-07-18 09:05:56Z joseph $ + {L3 Experimental LuaTeX functions} +\ProvidesExplPackage + {\filename}{\filedate}{\fileversion}{\filedescription} +\package_check_loaded_expl: +\luatex_if_engine:TF + { + \cs_new_eq:NN \lua_now:x \luatex_directlua:D + \cs_new_eq:NN \lua_shipout:x \luatex_latelua:D + } + { + \cs_new:Npn \lua_now:x #1 { \lua_wrong_engine: } + \cs_new:Npn \lua_shipout:x #1 { \lua_wrong_engine: } + } +\group_begin: +\char_make_letter:N\! +\char_make_letter:N\ % +\cs_gset:Npn\lua_wrong_engine:{% +\LuaTeX engine not in use!% +}% +\group_end:% +\int_new:N \g_cctab_allocate_int +\int_set:Nn \g_cctab_allocate_int { -1 } +\int_new:N \g_cctab_stack_int +\seq_new:N \g_cctab_stack_seq +\cs_new_protected_nopar:Npn \cctab_new:N #1 { + \cs_if_free:NTF #1 + { + \int_gadd:Nn \g_cctab_allocate_int { 2 } + \int_compare:nNnTF + { \g_cctab_allocate_int } < { \c_allocate_max_tl + 1 } + { + \tex_global:D \tex_mathchardef:D #1 \g_cctab_allocate_int + \luatex_initcatcodetable:D #1 + } + { + \msg_kernel_error:nnx { code } { out-of-registers } { cctab } + } + } + { + \msg_kernel_error:nnx { code } { variable-already-defined } + { \token_to_str:N #1 } + } +} +\luatex_if_engine:F { + \cs_set_protected_nopar:Npn \cctab_new:N #1 { \lua_wrong_engine: } +} +\luatex_if_engine:T { + \cs_set_protected_nopar:Npn \cctab_new:N #1 + { + \newcatcodetable #1 + \luatex_initcatcodetable:D #1 + } +} +\cs_new_protected_nopar:Npn \cctab_begin:N #1 { + \seq_gpush:Nx \g_cctab_stack_seq { \tex_the:D \luatex_catcodetable:D } + \luatex_catcodetable:D #1 + \int_gadd:Nn \g_cctab_stack_int { 2 } + \int_compare:nNnT { \g_cctab_stack_int } > { 268435453 } + { \msg_kernel_error:nn { code } { cctab-stack-full } } + \luatex_savecatcodetable:D \g_cctab_stack_int + \luatex_catcodetable:D \g_cctab_stack_int +} +\cs_new_protected_nopar:Npn \cctab_end: { + \int_gsub:Nn \g_cctab_stack_int { 2 } + \seq_gpop:NN \g_cctab_stack_seq \l_cctab_tmp_tl + \quark_if_no_value:NT \l_cctab_tmp_tl + { \tl_set:Nn \l_cctab_tmp_tl { 0 } } + \luatex_catcodetable:D \l_cctab_tmp_tl \scan_stop: +} +\luatex_if_engine:F { + \cs_set_protected_nopar:Npn \cctab_begin:N #1 { \lua_wrong_engine: } + \cs_set_protected_nopar:Npn \cctab_end: { \lua_wrong_engine: } +} +\luatex_if_engine:T { + \cs_set_protected_nopar:Npn \cctab_begin:N #1 + { \BeginCatcodeRegime #1 } + \cs_set_protected_nopar:Npn \cctab_end: + { \EndCatcodeRegime } +} +\tl_new:N \l_cctab_tmp_tl +\cs_new_protected:Npn \cctab_gset:Nn #1#2 { + \group_begin: + #2 + \luatex_savecatcodetable:D #1 + \group_end: +} +\luatex_if_engine:F { + \cs_set_protected_nopar:Npn \cctab_gset:Nn #1#2 { \lua_wrong_engine: } +} +\luatex_if_engine:T { + \cctab_new:N \c_code_cctab + \cctab_gset:Nn \c_code_cctab { } +} +\luatex_if_engine:T { + \cs_new_eq:NN \c_document_cctab \CatcodeTableLaTeX + \cs_new_eq:NN \c_initex_cctab \CatcodeTableIniTeX + \cs_new_eq:NN \c_other_cctab \CatcodeTableOther + \cs_new_eq:NN \c_string_cctab \CatcodeTableString +} +\luatex_if_engine:T { + \cs_set_protected_nopar:Npn \ExplSyntaxOn + { + \tex_ifodd:D \ExplSyntaxStatus \scan_stop: + \tex_else:D + \cs_set_protected_nopar:Npx \ExplSyntaxOff + { + \cctab_end: + \tex_endlinechar:D = + \tex_the:D \tex_endlinechar:D \scan_stop: + \cs_set_protected:Npn \ExplSyntaxOff { } + \tl_set:Nn \exp_not:N \ExplSyntaxStatus { 0 } + } + \tl_set:Nn \ExplSyntaxStatus { 1 } + \cctab_begin:N \c_code_cctab + \tex_endlinechar:D = 32 \scan_stop: + \tex_fi:D + } +} +%% +%% +%% End of file `l3luatex.sty'. diff --git a/Master/texmf-dist/tex/latex/expl3/l3names.sty b/Master/texmf-dist/tex/latex/expl3/l3names.sty index da660a756e5..dce13baccdb 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 1981 2010-07-11 07:28:30Z will $ +\GetIdInfo$Id: l3names.dtx 1987 2010-07-25 14:55:46Z joseph $ {L3 Experimental Naming Scheme for TeX Primitives} \endgroup \begingroup @@ -106,6 +106,17 @@ \endgroup \endinput } +\def\@tempa{% + \def\@tempa{}% + \RequirePackage{luatex}% + \RequirePackage{pdftexcmds}% + \let\pdfstrcmp\pdf@strcmp +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname directlua\endcsname\relax +\else + \expandafter\@tempa +\fi \protected\edef\ExplSyntaxOff{ \unexpanded{\ifodd \ExplSyntaxStatus\relax \def\ExplSyntaxStatus{0} @@ -637,7 +648,11 @@ \name_primitive:NN \pdfsetrandomseed \pdf_setrandomseed:D \name_primitive:NN \pdfnoligatures \pdf_noligatures:D \name_primitive:NN \XeTeXversion \xetex_version:D +\name_primitive:NN \catcodetable \luatex_catcodetable:D \name_primitive:NN \directlua \luatex_directlua:D +\name_primitive:NN \initcatcodetable \luatex_initcatcodetable:D +\name_primitive:NN \latelua \luatex_latelua:D +\name_primitive:NN \savecatcodetable \luatex_savecatcodetable:D \etex_ifdefined:D \strcmp \etex_ifdefined:D \xetex_version:D \name_primitive:NN \strcmp \pdf_strcmp:D @@ -781,6 +796,9 @@ \tex_let:D\tex_everydisplay:D \frozen@everydisplay \tex_let:D\tex_italiccor:D \@@italiccorr \tex_let:D\tex_hyphen:D \@@hyph +\tex_let:D\luatex_catcodetable:D \luatexcatcodetable +\tex_let:D\luatex_initcatcodetable:D \luatexinitcatcodetable +\tex_let:D\luatex_savecatcodetable:D \luatexsavecatcodetable \tex_let:D\par \tex_par:D \tex_ifx:D\name_undefine:N\@gobble \tex_def:D\name_pop_stack:w{} -- cgit v1.2.3