summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-08-26 17:33:09 +0000
committerKarl Berry <karl@freefriends.org>2014-08-26 17:33:09 +0000
commit6c4cd2ab2f8d1ebe3a051d700c3005d73eefe04c (patch)
tree16833d474c6532347c42dee6b34fa77aed22eca6 /Master/texmf-dist/source/latex/l3kernel/l3token.dtx
parent097e7dc0afa442be238a967b292237470680626e (diff)
l3 (26aug14)
git-svn-id: svn://tug.org/texlive/trunk@35045 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3token.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3token.dtx37
1 files changed, 20 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
index 36d2a427ac5..416bf573160 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
@@ -37,7 +37,7 @@
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\GetIdInfo$Id: l3token.dtx 4889 2014-05-26 19:59:25Z joseph $
+\GetIdInfo$Id: l3token.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Experimental token manipulation}
%</driver|package>
%<*driver>
@@ -206,7 +206,7 @@
% \begin{syntax}
% \cs{char_set_lcode:nn} \Arg{intexpr_1} \Arg{intexpr_2}
% \end{syntax}
-% This function set up the behaviour of \meta{character} when
+% Sets up the behaviour of the \meta{character} when
% found inside \cs{tl_to_lowercase:n}, such that \meta{character_1}
% will be converted into \meta{character_2}. The two \meta{characters}
% may be specified using an \meta{integer expression} for the character code
@@ -243,7 +243,7 @@
% \begin{syntax}
% \cs{char_set_uccode:nn} \Arg{intexpr_1} \Arg{intexpr_2}
% \end{syntax}
-% This function set up the behaviour of \meta{character} when
+% Sets up the behaviour of the \meta{character} when
% found inside \cs{tl_to_uppercase:n}, such that \meta{character_1}
% will be converted into \meta{character_2}. The two \meta{characters}
% may be specified using an \meta{integer expression} for the character code
@@ -974,7 +974,7 @@
\cs_new:Npn \char_value_catcode:n #1
{ \tex_the:D \tex_catcode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_catcode:n #1
- { \tex_showthe:D \tex_catcode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_catcode:n {#1} } }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1109,25 +1109,25 @@
\cs_new:Npn \char_value_mathcode:n #1
{ \tex_the:D \tex_mathcode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_mathcode:n #1
- { \tex_showthe:D \tex_mathcode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_mathcode:n {#1} } }
\cs_new_protected:Npn \char_set_lccode:nn #1#2
{ \tex_lccode:D #1 = \__int_eval:w #2 \__int_eval_end: }
\cs_new:Npn \char_value_lccode:n #1
{ \tex_the:D \tex_lccode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_lccode:n #1
- { \tex_showthe:D \tex_lccode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_lccode:n {#1} } }
\cs_new_protected:Npn \char_set_uccode:nn #1#2
{ \tex_uccode:D #1 = \__int_eval:w #2 \__int_eval_end: }
\cs_new:Npn \char_value_uccode:n #1
{ \tex_the:D \tex_uccode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_uccode:n #1
- { \tex_showthe:D \tex_uccode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_uccode:n {#1} } }
\cs_new_protected:Npn \char_set_sfcode:nn #1#2
{ \tex_sfcode:D #1 = \__int_eval:w #2 \__int_eval_end: }
\cs_new:Npn \char_value_sfcode:n #1
{ \tex_the:D \tex_sfcode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_sfcode:n #1
- { \tex_showthe:D \tex_sfcode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_sfcode:n {#1} } }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1308,7 +1308,8 @@
% Check if token is a math superscript token. We use the constant
% \cs{c_math_superscript_token} for this.
% \begin{macrocode}
-\prg_new_conditional:Npnn \token_if_math_superscript:N #1 { p , T , F , TF }
+\prg_new_conditional:Npnn \token_if_math_superscript:N #1
+ { p , T , F , TF }
{
\if_catcode:w \exp_not:N #1 \c_math_superscript_token
\prg_return_true: \else: \prg_return_false: \fi:
@@ -1574,12 +1575,11 @@
}
\cs_new:Npn \@@_if_chardef:w #1 CHAR" #2 \q_stop { #1 CHAR }
% \end{macrocode}
-%
-% Dim registers are a little more difficult since their \tn{meaning}
-% has the form |\dimen|\meta{number}, and we must take care of the
+% Dim registers are a bit more difficult since their \tn{meaning}
+% has the form \tn{dimen}\meta{number}, and we must take care of the
% two primitives \tn{dimen} and \tn{dimendef}.
% \begin{macrocode}
- \prg_new_conditional:Npnn \token_if_dim_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_dim_register:N #1 { p , T , F , TF }
{
\if_meaning:w \tex_dimen:D #1
\prg_return_false:
@@ -1602,7 +1602,7 @@
% differently from variables, and we also have to take care of the
% primitives \tn{count} and \tn{countdef}.
% \begin{macrocode}
- \prg_new_conditional:Npnn \token_if_int_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_int_register:N #1 { p , T , F , TF }
{
% \token_if_chardef:NTF #1 { \prg_return_true: }
% {
@@ -1629,7 +1629,8 @@
% \end{macrocode}
% Muskip registers are done the same way as the dimension registers.
% \begin{macrocode}
- \prg_new_conditional:Npnn \token_if_muskip_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_muskip_register:N #1
+ { p , T , F , TF }
{
\if_meaning:w \tex_muskip:D #1
\prg_return_false:
@@ -1650,7 +1651,8 @@
% \end{macrocode}
% Skip registers.
% \begin{macrocode}
- \prg_new_conditional:Npnn \token_if_skip_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_skip_register:N #1
+ { p , T , F , TF }
{
\if_meaning:w \tex_skip:D #1
\prg_return_false:
@@ -1671,7 +1673,8 @@
% \end{macrocode}
% Toks registers.
% \begin{macrocode}
- \prg_new_conditional:Npnn \token_if_toks_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_toks_register:N #1
+ { p , T , F , TF }
{
\if_meaning:w \tex_toks:D #1
\prg_return_false: