summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/expl3/expl3.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/expl3.dtx')
-rw-r--r--Master/texmf-dist/source/latex/expl3/expl3.dtx152
1 files changed, 21 insertions, 131 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/expl3.dtx b/Master/texmf-dist/source/latex/expl3/expl3.dtx
index 7f8292d609a..63fb9616c72 100644
--- a/Master/texmf-dist/source/latex/expl3/expl3.dtx
+++ b/Master/texmf-dist/source/latex/expl3/expl3.dtx
@@ -37,7 +37,7 @@
\RequirePackage{l3names}
%</driver|package>
%\fi
-\GetIdInfo$Id: expl3.dtx 1866 2010-03-23 08:29:27Z joseph $
+\GetIdInfo$Id: expl3.dtx 1905 2010-05-19 07:45:31Z joseph $
{L3 Experimental code bundle wrapper}%
%\iffalse
%<*driver>
@@ -865,6 +865,24 @@
% \begin{macrocode}
\RequirePackage{etex}
% \end{macrocode}
+%
+%\begin{macro}{\@l@expl@check@declarations@bool}
+%\begin{macro}{\@l@expl@log@functions@bool}
+% A couple of package options to be provided.
+% These have to be done by hand as there is no expl3 yet.
+% \begin{macrocode}
+\newcommand*\@l@expl@check@declarations@bool{0}
+\newcommand*\@l@expl@log@functions@bool{0}
+\DeclareOption{check-declarations}{
+ \def\@l@expl@check@declarations@bool{1}
+}
+\DeclareOption{log-functions}{
+ \def\@l@expl@log@functions@bool{1}
+}
+\ProcessOptions\relax
+% \end{macrocode}
+%\end{macro}
+%\end{macro}
%
% We already loaded \pkg{l3names} at the beginning of the \texttt{dtx} file.
%
@@ -904,24 +922,9 @@
l3file
}
% \end{macrocode}
-%
-%\begin{macro}{\_l_expl_check_declarations_bool}
-% To indicate that token list variables should exist before
-% assignment, a flag is created and a single option provided.
-% \begin{macrocode}
-\bool_new:N \_l_expl_check_declarations_bool
-\DeclareOption{check-declarations}{
- \bool_set_true:N \_l_expl_check_declarations_bool
-}
-\ProcessOptions \scan_stop:
-% \end{macrocode}
-%\end{macro}
-%
-%\begin{macro}{\_tl_check_exists:N}
-% If the option is active, redefine token list variable functions to
-% be picky.
+%
% \begin{macrocode}
-\bool_if:NT \_l_expl_check_declarations_bool {
+\bool_if:nT { \@l@expl@check@declarations@bool } {
\msg_kernel_new:nnnn { check } { non-declared-variable }
{ The~variable~#1~has~not~been~declared~\msg_line_context:. }
{
@@ -933,121 +936,8 @@
\\
LaTeX~will~create~the~variable~and~continue.
}
- \cs_set_protected:Npn \_tl_check_exists:N #1
- {
- \cs_if_exist:NF #1
- {
- \msg_kernel_error:nnx { check } { non-declared-variable }
- { \token_to_str:N #1 }
- }
- }
- \cs_set_protected:Npn \tl_set:Nn #1#2
- {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:n {#2} }
- }
- \cs_set_protected:Npn \tl_set:Nx #1#2
- {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 {#2}
- }
- \cs_set_protected:Npn \tl_gset:Nn #1#2
- {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:n {#2} }
- }
- \cs_set_protected:Npn \tl_gset:Nx #1#2
- {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 {#2}
- }
- \cs_set_protected:Npn \tl_set_eq:NN #1#2
- {
- \_tl_check_exists:N #1
- \_tl_check_exists:N #2
- \cs_set_eq:NN #1 #2
- }
- \cs_set_protected:Npn \tl_gset_eq:NN #1#2
- {
- \_tl_check_exists:N #1
- \_tl_check_exists:N #2
- \cs_gset_eq:NN #1 #2
- }
- \cs_set_protected:Npn \tl_put_right:Nn #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} }
- }
- \cs_set_protected:Npn \tl_put_right:NV #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 }
- }
- \cs_set_protected:Npn \tl_put_right:Nv #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} }
- }
- \cs_set_protected:Npn \tl_put_right:No #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:o {#2} }
- }
- \cs_set_protected:Npn \tl_put_right:Nx #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:V #1 #2 }
- }
- \cs_set_protected:Npn \tl_gput_right:Nn #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} }
- }
- \cs_set_protected:Npn \tl_gput_right:NV #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 }
- }
- \cs_set_protected:Npn \tl_gput_right:Nv #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} }
- }
- \cs_set_protected:Npn \tl_gput_right:Nx #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:V #1 #2 }
- }
- \cs_set_protected:Npn \tl_put_left:Nn #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_put_left:NV #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_put_left:Nv #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_put_left:No #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_put_left:Nx #1#2 {
- \_tl_check_exists:N #1
- \cs_set_nopar:Npx #1 { #2 \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_gput_left:Nn #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_gput_left:NV #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_gput_left:Nv #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 }
- }
- \cs_set_protected:Npn \tl_gput_left:Nx #1#2 {
- \_tl_check_exists:N #1
- \cs_gset_nopar:Npx #1 { #2 \exp_not:V #1 }
- }
}
% \end{macrocode}
-%\end{macro}
%
%</package>
%