[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid @@ in verbatim etc that show up incorrectly in source3.pdf (8acfc5f)
Bruno Le Floch
bruno at le-floch.fr
Sun Mar 25 22:41:45 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/8acfc5fd1169404fedbdf9274ad147e171ae07ad
>---------------------------------------------------------------
commit 8acfc5fd1169404fedbdf9274ad147e171ae07ad
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Sun Mar 25 16:22:34 2018 -0400
Avoid @@ in verbatim etc that show up incorrectly in source3.pdf
A few other minor documentation cleanups
>---------------------------------------------------------------
8acfc5fd1169404fedbdf9274ad147e171ae07ad
l3kernel/l3basics.dtx | 4 ++--
l3kernel/l3fp-aux.dtx | 28 ++++++++++++++--------------
l3kernel/l3fp-basics.dtx | 2 +-
l3kernel/l3fp-parse.dtx | 2 +-
l3kernel/l3fp.dtx | 4 +---
l3kernel/l3msg.dtx | 2 +-
l3kernel/l3names.dtx | 2 +-
l3kernel/l3regex.dtx | 2 +-
8 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index e29a5fc..c2544ad 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -2702,8 +2702,8 @@
% \cs{@@_split_function:NN} is supposed to be a function
% taking three variables, one for name, one for signature, and one
% for the boolean. For example,
-% |\@@_split_function:NN \foo_bar:cnx \use_i:nnn| as input
-% becomes |\use_i:nnn {foo_bar} {cnx} \c_true_bool|.
+% \cs{@@_split_function:NN} \cs[no-index]{foo_bar:cnx} \cs{use_i:nnn} as input
+% becomes \cs{use_i:nnn} |{foo_bar}| |{cnx}| \cs{c_true_bool}.
%
% We cannot use |:| directly as it has the wrong category code so
% an |x|-type expansion is used to force the conversion.
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index d7f0fbb..71a9552 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -76,7 +76,7 @@
\cs_new_eq:NN \@@_int_eval_end: \scan_stop:
\cs_new_eq:NN \@@_int_to_roman:w \tex_romannumeral:D
\cs_new_eq:NN \@@_int_value:w \tex_number:D
-% \end{macrocode}
+% \end{macrocode}
% \end{macro}
%
% \subsection{Internal representation}
@@ -526,7 +526,7 @@
%
% \begin{macro}[EXP]{\@@_if_type_fp:NTwFw}
% Used as \cs{@@_if_type_fp:NTwFw} \meta{marker} \Arg{true code}
-% \cs{s__fp} \Arg{false code} \cs{q_stop}, this test whether the
+% \cs{s_@@} \Arg{false code} \cs{q_stop}, this test whether the
% \meta{marker} is \cs{s_@@} or not and runs the appropriate
% \meta{code}. The very unusual syntax is for optimization purposes
% as that function is used for all floating point operations.
@@ -686,7 +686,7 @@
% \begin{verbatim}
% \cs_new:Npn \pack:NNNNNw #1 #2#3#4#5 #6; { {#2#3#4#5} {#6} }
% \exp_after:wN \pack:NNNNNw
-% \@@_int_value:w \@@_int_eval:w 1 0000 0000 + #1 ;
+% \__fp_int_value:w \__fp_int_eval:w 1 0000 0000 + #1 ;
% \end{verbatim}
% The idea is that adding $10^8$ to the number ensures that it has
% exactly $9$ digits, and can then easily find which digits correspond
@@ -701,19 +701,19 @@
% 6677\,8899$. With simplified names, we would do
% \begin{verbatim}
% \exp_after:wN \post_processing:w
-% \@@_int_value:w \@@_int_eval:w - 5 0000
+% \__fp_int_value:w \__fp_int_eval:w - 5 0000
% \exp_after:wN \pack:NNNNNw
-% \@@_int_value:w \@@_int_eval:w 4 9995 0000
+% \__fp_int_value:w \__fp_int_eval:w 4 9995 0000
% + 12345 * 6677
% \exp_after:wN \pack:NNNNNw
-% \@@_int_value:w \@@_int_eval:w 5 0000 0000
+% \__fp_int_value:w \__fp_int_eval:w 5 0000 0000
% + 12345 * 8899 ;
% \end{verbatim}
-% The \cs{exp_after:wN} triggers |\@@_int_value:w \@@_int_eval:w|, which
+% The \cs{exp_after:wN} triggers \cs{@@_int_value:w} \cs{@@_int_eval:w}, which
% starts a first computation, whose initial value is $- 5\,0000$ (the
% \enquote{leading shift}). In that computation appears an
% \cs{exp_after:wN}, which triggers the nested computation
-% |\@@_int_value:w \@@_int_eval:w| with starting value $4\,9995\,0000$ (the
+% \cs{@@_int_value:w} \cs{@@_int_eval:w} with starting value $4\,9995\,0000$ (the
% \enquote{middle shift}). That, in turn, expands \cs{exp_after:wN}
% which triggers the third computation. The third computation's value
% is $5\,0000\,0000 + 12345 \times 8899$, which has $9$ digits. Adding
@@ -1041,12 +1041,12 @@
% treated using a few standard functions which we define now. A typical
% use context for those functions would be
% \begin{syntax}
-% |\if_case:w| \meta{integer} |\exp_stop_f:|
-% | \@@_case_return_o:Nw| \meta{fp var}
-% |\or: \@@_case_use:nw| \Arg{some computation}
-% |\or: \@@_case_return_same_o:w|
-% |\or: \@@_case_return:nw| \Arg{something}
-% |\fi:|
+% \cs{if_case:w} \meta{integer} \cs{exp_stop_f:}
+% | |\cs{@@_case_return_o:Nw} \meta{fp var}
+% \cs{or:} \cs{@@_case_use:nw} \Arg{some computation}
+% \cs{or:} \cs{@@_case_return_same_o:w}
+% \cs{or:} \cs{@@_case_return:nw} \Arg{something}
+% \cs{fi:}
% \meta{junk}
% \meta{floating point}
% \end{syntax}
diff --git a/l3kernel/l3fp-basics.dtx b/l3kernel/l3fp-basics.dtx
index a1e199b..8aba8e6 100644
--- a/l3kernel/l3fp-basics.dtx
+++ b/l3kernel/l3fp-basics.dtx
@@ -110,7 +110,7 @@
% opposite signs, shift the significand of the smaller one to match the
% bigger one, perform the addition or subtraction of significands,
% check for a carry, round, and pack using the
-% \cs[no-index]{__fp_basics_pack_\ldots{}} functions.
+% \cs[no-index]{@@_basics_pack_\ldots{}} functions.
% \end{itemize}
% The trickiest part is to round correctly when adding or subtracting
% normal floating point numbers.
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index b51d0dd..d797e7c 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -521,7 +521,7 @@
% character code, testing if |`#1| lies in $[65,90]$ (uppercase letters)
% or $[97,112]$ (lowercase letters)
% \begin{verbatim}
-% \if_int_compare:w \@@_int_eval:w
+% \if_int_compare:w \__fp_int_eval:w
% ( `#1 \if_int_compare:w `#1 > `Z - 32 \fi: ) / 26 = 3 \exp_stop_f:
% is a letter
% \else:
diff --git a/l3kernel/l3fp.dtx b/l3kernel/l3fp.dtx
index 8524ec0..723cf29 100644
--- a/l3kernel/l3fp.dtx
+++ b/l3kernel/l3fp.dtx
@@ -1366,9 +1366,7 @@
% \item Function to count items in a tuple (and to determine if something is a tuple).
% \item Decide what exponent range to consider.
% \item Support signalling \texttt{nan}.
-% \item Modulo and remainder, and rounding functions |quantize|,
-% |quantize0|, |quantize+|, |quantize-|, |quantize=|, |round=|.
-% Should the modulo also be provided as (catcode 12) |%|?
+% \item Modulo and remainder, and rounding function |quantize| (and its friends analogous to |trunc|, |ceil|, |floor|).
% \item \cs{fp_format:nn} \Arg{fpexpr} \Arg{format}, but what should
% \meta{format} be? More general pretty printing?
% \item Add |and|, |or|, |xor|? Perhaps under the names \texttt{all},
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index d49289e..c744b28 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -2127,7 +2127,7 @@
% \__kernel_msg_expandable_error:nn
% }
% The command built from the csname
-% |\c_@@_text_prefix_tl LaTeX / #1 / #2|
+% \cs{c_@@_text_prefix_tl} |LaTeX / #1 / #2|
% takes four arguments and builds the error text, which is fed to
% \cs{@@_expandable_error:n}.
% \begin{macrocode}
diff --git a/l3kernel/l3names.dtx b/l3kernel/l3names.dtx
index 80e862d..0c5e1de 100644
--- a/l3kernel/l3names.dtx
+++ b/l3kernel/l3names.dtx
@@ -1186,7 +1186,7 @@
% this simply as \tn{tracingfonts}, but that is overwritten by
% the \LaTeXe{} kernel. So any spurious definition has to be removed, then
% the real version saved either from the \pdfTeX{} name or from \LuaTeX{}.
-% In the latter case, we leave \tn{@@@@tracingfonts} available: this might
+% In the latter case, we leave \tn{@@tracingfonts} available: this might
% be useful and almost all \LaTeXe{} users will have \pkg{expl3} loaded by
% \pkg{fontspec}. (We follow the usual kernel convention that |@@| is used
% for saved primitives.)
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 44d801c..ef07553 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -5928,7 +5928,7 @@
% from \cs{l_@@_min_submatch_int} to
% \cs{l_@@_submatch_int} (exclusive). Extract the relevant ranges
% into \cs{l_@@_internal_a_tl}. We detect unbalanced results using
-% the two flags \texttt{@@_begin} and \texttt{@@_end}, raised
+% the two flags \texttt{__regex_begin} and \texttt{__regex_end}, raised
% whenever we see too many begin-group or end-group tokens in a
% submatch. We disable \cs{__seq_item:n} to prevent two
% \texttt{x}-expansions.
More information about the latex3-commits
mailing list