[latex3-commits] [l3svn] r7400 - Rename \__debug functions correctly outside l3kernel
noreply at latex-project.org
noreply at latex-project.org
Wed Jul 19 05:58:40 CEST 2017
Author: bruno
Date: 2017-07-19 05:58:39 +0200 (Wed, 19 Jul 2017)
New Revision: 7400
Modified:
trunk/l3experimental/xgalley/l3galley.dtx
trunk/l3trial/l3auxdata/l3auxdata.dtx
trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx
trunk/l3trial/xbox/xbox.dtx
Log:
Rename \__debug functions correctly outside l3kernel
Modified: trunk/l3experimental/xgalley/l3galley.dtx
===================================================================
--- trunk/l3experimental/xgalley/l3galley.dtx 2017-07-18 00:59:21 UTC (rev 7399)
+++ trunk/l3experimental/xgalley/l3galley.dtx 2017-07-19 03:58:39 UTC (rev 7400)
@@ -2310,7 +2310,7 @@
% generic build system is invoked (in case the
% \cs{etex_interlinepenalties:D} has accidentally been cleared).
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } }
+\__debug_patch_args:nNNpn { { (#1) } }
\cs_new_protected:Npn \galley_interline_penalty_set:n #1
{
\int_compare:nNnTF { \etex_interlinepenalties:D 0 } = 0
Modified: trunk/l3trial/l3auxdata/l3auxdata.dtx
===================================================================
--- trunk/l3trial/l3auxdata/l3auxdata.dtx 2017-07-18 00:59:21 UTC (rev 7399)
+++ trunk/l3trial/l3auxdata/l3auxdata.dtx 2017-07-19 03:58:39 UTC (rev 7400)
@@ -675,7 +675,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\usepackage{catchfile,l3regex}
+\usepackage{catchfile,expl3}
% \end{macrocode}
%
% \paragraph{Variables and variants}
@@ -728,7 +728,7 @@
\prop_new:N \l_@@_catcodes_prop
\cs_new:Nn \@@_catcodes_pushing:
{
- \__debug_patch_args:nNw { {##1} { (##2) } }
+ \__debug_patch_args:nNNpn { {##1} { (##2) } }
\cs_set_protected:Npn \char_set_catcode:nn ##1 ##2
{
\prop_put:Nxx \l_@@_catcodes_prop
@@ -743,7 +743,7 @@
% \begin{macrocode}
\cs_new:Nn \@@_catcodes_pop:
{
- \__debug_patch_args:nNw { {##1} { (##2) } }
+ \__debug_patch_args:nNNpn { {##1} { (##2) } }
\cs_set_protected:Npn \char_set_catcode:nn ##1 ##2
{
\tex_catcode:D \int_eval:n {##1} = \__int_eval:w ##2 \__int_eval_end:
Modified: trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx
===================================================================
--- trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx 2017-07-18 00:59:21 UTC (rev 7399)
+++ trunk/l3trial/l3kernel-extras/l3kernel-extras.dtx 2017-07-19 03:58:39 UTC (rev 7400)
@@ -440,9 +440,9 @@
% ~~|}|
% \end{syntax}
% Defines an expandable function
-% \begin{syntax}
+% \begin{quote}
% |\|\meta{name}_replace:n \Arg{tokens}
-% \end{syntax}
+% \end{quote}
% which replaces \meta{from_1} by \meta{to_1}, \meta{from_2} by
% \meta{to_2}, \emph{etc.} in \meta{tokens}, and leaves the result in
% the input stream. This function does the replacements in the same
@@ -932,7 +932,7 @@
% \texttt{sp}, we must define |#1| to be the integer expression to be
% multiplied, and |#2| to be the (real) scaling factor.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } {#2} }
+\__debug_patch_args:nNNpn { { (#1) } {#2} }
\cs_new:Npn \int_mul_truncate:nn #1 #2
{
\__int_value:w
@@ -1165,7 +1165,7 @@
% overall \meta{skipexpr} is closed by \cs{scan_stop:} inserted by our
% auxiliary.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } }
+\__debug_patch_args:nNNpn { { (#1) } }
\cs_new:Npn \skip_abs:n #1
{
\skip_use:N \etex_glueexpr:D
@@ -1197,13 +1197,13 @@
% that the arguments of \cs{if_dim:w} are entirely found before the
% expansion hits \cs{prg_return_true:}.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \skip_compare_main:nNn #1#2#3 { p , T , F , TF }
{
\if_dim:w \etex_glueexpr:D #1 #2 \etex_glueexpr:D #3 \scan_stop:
\prg_return_true: \else: \prg_return_false: \fi:
}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \skip_compare_stretch:nNn #1#2#3 { p , T , F , TF }
{
\exp_after:wN \skip_compare_component_aux:wwNNN
@@ -1213,7 +1213,7 @@
\etex_gluestretchorder:D
\etex_gluestretch:D
}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \skip_compare_shrink:nNn #1#2#3 { p , T , F , TF }
{
\exp_after:wN \skip_compare_component_aux:wwNNN
@@ -1253,7 +1253,7 @@
% if $a=a'$, $b=b'$ and $c=c'$. The first is less than the second if
% and only if $a<a'$, $|b|<|b'|$, and $|c'|<|c|$.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \skip_compare:nNn #1#2#3 { p , T , F , TF }
{
\exp_after:wN \__skip_compare:wwN
@@ -1294,7 +1294,7 @@
% This relies on the same auxiliary as \cs{skip_abs:n}. See this
% function for an explanation of the code.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } }
+\__debug_patch_args:nNNpn { { (#1) } }
\cs_new:Npn \muskip_abs:n #1
{
\muskip_use:N \etex_muexpr:D
@@ -1316,7 +1316,7 @@
% \texttt{skip} counterparts, but mu expressions must be converted to
% glue using the \eTeX{} primitive \tn{mutoglue}.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \muskip_compare_main:nNn #1#2#3 { p , T , F , TF }
{
\if_dim:w \etex_mutoglue:D \etex_muexpr:D #1
@@ -1326,7 +1326,7 @@
\prg_return_false:
\fi:
}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \muskip_compare_stretch:nNn #1#2#3 { p , T , F , TF }
{
\exp_after:wN \skip_compare_component_aux:wwNNN
@@ -1336,7 +1336,7 @@
\etex_gluestretchorder:D
\etex_gluestretch:D
}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \muskip_compare_shrink:nNn #1#2#3 { p , T , F , TF }
{
\exp_after:wN \skip_compare_component_aux:wwNNN
@@ -1353,7 +1353,7 @@
% This function uses the same auxiliaries as \cs{skip_compare:nNn},
% first converting the mu units to points.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } {#2} { (#3) } }
+\__debug_patch_conditional_args:nNNpnn { { (#1) } {#2} { (#3) } }
\prg_new_conditional:Npnn \muskip_compare:nNn #1#2#3 { p , T , F , TF }
{
\exp_after:wN \__skip_compare:wwN
Modified: trunk/l3trial/xbox/xbox.dtx
===================================================================
--- trunk/l3trial/xbox/xbox.dtx 2017-07-18 00:59:21 UTC (rev 7399)
+++ trunk/l3trial/xbox/xbox.dtx 2017-07-19 03:58:39 UTC (rev 7400)
@@ -728,13 +728,13 @@
% As we want skips and kerns to have similar behaviour, we try to get similar
% results.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } }
+\__debug_patch_args:nNNpn { { (#1) } }
\cs_new_protected:Npn \kern_horizontal:n #1
{
\mode_leave_vertical:
\tex_kern:D \__dim_eval:w #1 \__dim_eval_end:
}
-\__debug_patch_args:nNw { { (#1) } }
+\__debug_patch_args:nNNpn { { (#1) } }
\cs_new_protected:Npn \kern_vertical:n #1
{
\mode_if_vertical:F
@@ -751,7 +751,7 @@
% dimension expression support. The non-expanding rule is set up in
% horizontal mode as that is usually the best plan.
% \begin{macrocode}
-\__debug_patch_args:nNw { { (#1) } { (#2) } { (#3) } }
+\__debug_patch_args:nNNpn { { (#1) } { (#2) } { (#3) } }
\cs_new_protected:Npn \rule:nnn #1#2#3
{
\hbox:n
@@ -762,14 +762,14 @@
width \__dim_eval:w #3 \__dim_eval_end:
}
}
-\__debug_patch_args:nNw { { (#1) } { (#2) } }
+\__debug_patch_args:nNNpn { { (#1) } { (#2) } }
\cs_new_protected:Npn \rule_horizontal:nn #1#2
{
\tex_hrule:D
height \__dim_eval:w #1 \__dim_eval_end:
depth \__dim_eval:w #2 \__dim_eval_end:
}
-\__debug_patch_args:nNw { { (#1) } }
+\__debug_patch_args:nNNpn { { (#1) } }
\cs_new_protected:Npn \rule_vertical:n #1
{ \tex_vrule:D width \__dim_eval:w #1 \__dim_eval_end: }
% \end{macrocode}
More information about the latex3-commits
mailing list