summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-10-10 21:52:54 +0000
committerKarl Berry <karl@freefriends.org>2011-10-10 21:52:54 +0000
commit26a0070af35fa5652128c74fa1f126ec51def209 (patch)
treec3cb194fd4cc2dc13141e39c561dc5bc5d0b7a83 /Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
parent4d055293335b5b39f55edeff0c28700ebc2486eb (diff)
l3kernel 2900 (10oct11)
git-svn-id: svn://tug.org/texlive/trunk@24256 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3doc.cls')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls39
1 files changed, 26 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index b4d84b0f52a..d86ed4560e9 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -52,7 +52,7 @@
\let \filedateOld \ExplFileDate
\let \fileversionOld \ExplFileVersion
\let \filedescriptionOld \ExplFileDescription
-\GetIdInfo$Id: l3doc.dtx 2819 2011-09-12 17:26:47Z will $
+\GetIdInfo$Id: l3doc.dtx 2866 2011-10-01 05:16:55Z bruno $
{L3 Experimental documentation class}
\ProvidesExplClass
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -501,7 +501,9 @@
\tl_gset:Nx \g_doc_macro_tl { \l_doc_function_name_prefix_tl \l_doc_function_name_tl }
\g_doc_macro_tl
- \tl_if_empty:NF \l_doc_function_sig_tl { : \l_doc_function_sig_tl }
+ \int_compare:nT { \cs_get_arg_count_from_signature:N #1 >= 0 }
+ { : \l_doc_function_sig_tl }
+
\bool_if:NT \l_doc_meta_TF_bool { \doc_typeset_TF: }
&
@@ -634,32 +636,43 @@
\cs_set_eq:NN \testfile \doc_print_testfile:n
- \group_begin:
- \MakePrivateLetters
- \char_set_catcode_letter:N \\
- \char_set_catcode_ignore:N \ % space
- \char_set_catcode_ignore:N \^^M
- \char_set_catcode_ignore:N \^^I
- \doc_macro_aux:n
+ \peek_meaning_ignore_spaces:NTF \c_group_begin_token
+ {
+ \group_begin:
+ \MakePrivateLetters
+ \char_set_catcode_letter:N \\
+ \char_set_catcode_ignore:N \ % space
+ \char_set_catcode_ignore:N \^^M
+ \char_set_catcode_ignore:N \^^I
+ \doc_macro_aux:n
+ }
+ {
+ \doc_macro_verbatim:w
+ }
}
+\NewDocumentCommand {\doc_macro_verbatim:w} {v}
+ {
+ \group_begin: % pretty useless
+ \doc_macro_aux:n {#1}
+ }
\keys_define:nn { l3doc/macro }
{
unknown .code:n = { \use:c{doc_macro_opt_#1:} }
}
\cs_new_nopar:Npn \doc_macro_aux:n #1 {
\group_end:
- \cs_set:Npn \l_doc_macro_input_clist {#1}
+ \clist_set:Nn \l_doc_macro_input_clist {#1}
\bool_if:NTF \l_doc_macro_pTF_bool
{
- \clist_map_inline:nn {#1}
+ \clist_map_inline:Nn \l_doc_macro_input_clist
{
\exp_args:Nf \doc_macro_single { \doc_predicate_from_base:w ##1 }
}
\bool_set_true:N \l_doc_macro_TF_bool
- \clist_map_function:nN {#1} \doc_macro_single
+ \clist_map_function:NN \l_doc_macro_input_clist \doc_macro_single
\bool_set_false:N \l_doc_macro_TF_bool
}
- { \clist_map_function:nN {#1} \doc_macro_single }
+ { \clist_map_function:NN \l_doc_macro_input_clist \doc_macro_single }
}
\cs_set_nopar:Npn \doc_macro_opt_aux: { \bool_set_true:N \l_doc_macro_aux_bool }
\cs_set_nopar:Npn \doc_macro_opt_internal: { \bool_set_true:N \l_doc_macro_internal_bool }