[latex3-commits] [git/LaTeX3-latex3-latex2e] doc-v3beta: new doc version supporting \outer (18f8b74c)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Feb 7 16:15:01 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : doc-v3beta
Link : https://github.com/latex3/latex2e/commit/18f8b74c6e8b1688b7bee63cd9ba4b16718c6508
>---------------------------------------------------------------
commit 18f8b74c6e8b1688b7bee63cd9ba4b16718c6508
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Feb 7 16:15:01 2021 +0100
new doc version supporting \outer
>---------------------------------------------------------------
18f8b74c6e8b1688b7bee63cd9ba4b16718c6508
base/doc-v3beta.sty | 21 ++++++++++++---------
base/ltmath.dtx | 2 +-
required/tools/bm.dtx | 2 +-
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/base/doc-v3beta.sty b/base/doc-v3beta.sty
index 2158fd0d..eeac7156 100644
--- a/base/doc-v3beta.sty
+++ b/base/doc-v3beta.sty
@@ -51,7 +51,7 @@
\DeclareCurrentRelease{v3}{2018-04-16}
\ProvidesPackage{doc-v3beta}
- [2021/02/05 v3.0c
+ [2021/02/07 v3.0e
Standard LaTeX documentation package V3 (FMi)]
%%
%% Package `doc' to use with LaTeX 2e
@@ -78,6 +78,7 @@
\DeclareStringOption{idxtype}
\DeclareStringOption{idxgroup}
\DeclareStringOption{printtype}
+\DeclareBoolOption[false]{outer}
\ProcessKeyvalOptions*
\newif\ifscan at allowed \scan at allowedtrue
\def\SetupDoc#1{%
@@ -394,11 +395,11 @@
}
\cs_new:Npn \__doc_dont_index:n #1 {
\group_end:
- \__doc_trace:x{Disable~ indexing~ for~ '\exp_not:n{#1}' }
- \clist_map_function:nN {#1} \__doc_dont_index:N
+ \__doc_trace:x{Disable~ indexing~ for~ '\tl_to_str:n{#1}' }
+ \clist_map_function:nN {#1} \__doc_dont_index_aux:n
}
-\cs_new:Npn \__doc_dont_index:N #1 {
- \seq_put_right:Nx \l__doc_donotindex_seq {\cs_to_str:N #1}
+\cs_new:Npn \__doc_dont_index_aux:n #1 {
+ \seq_put_right:Nx \l__doc_donotindex_seq {\expandafter\@gobble \string#1}
}
\cs_set_eq:NN \DoNotIndex \doc_dont_index:n
\def \ShowIndexingState {
@@ -948,7 +949,6 @@
}
\ExplSyntaxOff
-
\long\def\@doc at env@#1#2#3{%
\topsep\MacroTopsep
\trivlist
@@ -989,10 +989,11 @@
\fi
\ifdoc at noindex\else
\global\advance\c at CodelineNo\@ne
- \@nameuse{SpecialMain#2Index}{#3}\nobreak
+ \csname SpecialMain#2Index\expandafter\endcsname
+ \expandafter{\saved at macroname}\nobreak
\global\advance\c at CodelineNo\m at ne
\fi
- \if#1\expandafter\DoNotIndex \csname \saved at indexname\endcsname \fi
+ \if#1\expandafter\DoNotIndex \expandafter {\saved at macroname}\fi
\ignorespaces}
\def\doc at env#1#2[#3]{%
@@ -1000,7 +1001,9 @@
\@nameuse{doc at noindex\doc at noindexdefault}%
\setkeys{doc}{#3}%
\begingroup
- \catcode`\\12
+ \ifdoc at outer
+ \catcode`\\12
+ \fi
\MakePrivateLetters
\@doc at env{#1}{#2}%
}
diff --git a/base/ltmath.dtx b/base/ltmath.dtx
index 8e84d51b..ca90e198 100644
--- a/base/ltmath.dtx
+++ b/base/ltmath.dtx
@@ -516,7 +516,7 @@
%
% \begin{macro}{\tmspace}
-% \begin{macro}{{\,}}
+% \begin{macro}{\,}
% \begin{macro}{\thinspace}
% \begin{macro}{\!}
% \begin{macro}{\negthinspace}
diff --git a/required/tools/bm.dtx b/required/tools/bm.dtx
index 80c73f57..77e2e547 100644
--- a/required/tools/bm.dtx
+++ b/required/tools/bm.dtx
@@ -977,7 +977,7 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\bm at end}
+% \begin{macro}[outer]{\bm at end}
% \changes{v0.10}{1997/01/04}
% {Macro added}
% Normally speaking |\outer| declarations should be avoided at all
More information about the latex3-commits
mailing list.