summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3doc.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3doc.dtx93
1 files changed, 49 insertions, 44 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
index c4638af4fc2..fc4319207fb 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
@@ -1,37 +1,24 @@
% \iffalse meta-comment
%
%% File: l3doc.dtx Copyright (C) 1990-2016 The LaTeX3 project
-%%
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License (LPPL), either version 1.3c of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3kernel bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
%
%<*driver>
\def\nameofplainTeX{plain}
@@ -75,7 +62,7 @@ Do not distribute a modified version of this file.
%
%<*driver|class>
\RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 6701 2016-09-08 13:56:52Z qinglee $
+\GetIdInfo$Id: l3doc.dtx 6809 2017-01-01 06:33:13Z bruno $
{L3 Experimental documentation class}
%</driver|class>
%
@@ -3715,8 +3702,8 @@ Do not distribute a modified version of this file.
\use:x
{
\@@_special_index_module:nnnnN
- { \quotechar #1 }
- { \quotechar \bslash \quotechar #1 }
+ {#1}
+ { \bslash #1 }
{ }
{ }
\c_false_bool
@@ -3758,6 +3745,7 @@ Do not distribute a modified version of this file.
% a construct such as |\meta{...}|.
% \begin{macrocode}
\tl_new:N \l_@@_index_escaped_macro_tl
+\tl_new:N \l_@@_index_escaped_key_tl
\cs_new_protected:Npn \@@_special_index_module:nnnnN #1#2#3#4#5
{
\use:x
@@ -3783,6 +3771,8 @@ Do not distribute a modified version of this file.
\cs_generate_variant:Nn \@@_special_index_module:nnnnN { ooo }
\cs_new_protected:Npn \@@_special_index_aux:nnnnnn #1#2#3#4#5#6
{
+ \tl_set:Nn \l_@@_index_escaped_key_tl {#1}
+ \@@_quote_special_char:N \l_@@_index_escaped_key_tl
\@@_special_index_set:Nn \l_@@_index_escaped_macro_tl {#2}
\str_if_eq:onTF { \@currenvir } { macrocode }
{ \codeline@wrindex }
@@ -3797,7 +3787,7 @@ Do not distribute a modified version of this file.
{
\tl_if_empty:nF { #3 #4 #5 }
{ #3 #5 \actualchar #4 #5 \levelchar }
- #1
+ \l_@@_index_escaped_key_tl
\actualchar
{
\token_to_str:N \verbatim@font \c_space_tl
@@ -3812,23 +3802,24 @@ Do not distribute a modified version of this file.
\tl_set:Nx #1 { \tl_to_str:n {#2} }
\@@_if_almost_str:nTF {#2}
{
+ \tl_replace_all:Non #1 { \tl_to_str:n { __ } }
+ {
+ \verbatimchar
+ \token_to_str:N \_ \token_to_str:N \_
+ \token_to_str:N \verb * \verbatimchar
+ }
\exp_args:Nx \tl_map_inline:nn
{ \tl_to_str:N \verbatimchar \token_to_str:N _ }
{
\tl_replace_all:Nnn #1 {##1}
{
\verbatimchar \c_@@_backslash_tl ##1
- \token_to_str:N \verb \quotechar * \verbatimchar
+ \token_to_str:N \verb * \verbatimchar
}
}
- \tl_map_inline:nn { \actualchar \encapchar \levelchar }
- {
- \tl_replace_all:Nxn #1
- { \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 }
- }
\tl_set:Nx #1
{
- \token_to_str:N \verb \quotechar * \verbatimchar
+ \token_to_str:N \verb * \verbatimchar
#1 \verbatimchar
}
}
@@ -3838,6 +3829,21 @@ Do not distribute a modified version of this file.
{ \c_@@_backslash_tl }
{ \token_to_str:N \bslash \c_space_tl }
}
+ \@@_quote_special_char:N #1
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[aux]{\@@_quote_special_char:N}
+% Quote some special characters.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_quote_special_char:N #1
+ {
+ \tl_map_inline:nn { \quotechar \actualchar \encapchar \levelchar }
+ {
+ \tl_replace_all:Nxn #1
+ { \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 }
+ }
}
% \end{macrocode}
% \end{macro}
@@ -3895,7 +3901,7 @@ Do not distribute a modified version of this file.
% the first occurence of |#1|. Helper that removes any leading
% underscore from \cs{l_@@_index_key_tl}.
% \begin{macrocode}
-\cs_set:Npn \@@_key_trim_module:n #1
+\cs_new_protected:Npn \@@_key_trim_module:n #1
{
\cs_set:Npn \@@_tmpa:w ##1 #1 ##2 \q_stop
{ \exp_not:n {##1} }
@@ -4322,7 +4328,6 @@ page_precedence "rnaA"
%
% \begin{macro}
% {
-% \c_minus_one,
% \c_zero,
% \c_one,
% \c_two,