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.dtx62
1 files changed, 39 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
index c1f0e04c7aa..73c126ed443 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
@@ -62,7 +62,7 @@ Do not distribute a modified version of this file.
%
%<*driver|class>
\RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 6847 2017-02-07 15:05:44Z bruno $
+\GetIdInfo$Id: l3doc.dtx 6943 2017-02-17 16:47:59Z bruno $
{L3 Experimental documentation class}
%</driver|class>
%
@@ -1165,6 +1165,9 @@ Do not distribute a modified version of this file.
%
% \begin{macro}[int, pTF]{\@@_date_compare:nNn}
% \begin{macro}[aux]{\@@_date_compare_aux:nnnNnnn, \@@_date_compare_aux:w}
+% Expects |#1| and |#3| to be dates in the format YYYY-MM-DD (but
+% accepts YYYY or YYYY-MM too). Compares them using |#2| (one of |<|,
+% |=|, |>|), filling in zeros for missing data.
% \begin{macrocode}
\prg_new_conditional:Npnn \@@_date_compare:nNn #1#2#3 { TF , T , F , p }
{ \@@_date_compare_aux:w #1--- \q_mark #2 #3--- \q_stop }
@@ -1232,6 +1235,8 @@ Do not distribute a modified version of this file.
}
\msg_new:nnn { l3doc } { deprecated-function }
{ The~deprecated~function(s)~'#1'~should~have~been~removed~on~#2. }
+\msg_new:nnn { l3doc } { date-format }
+ { The~date~'#1'~should~be~given~in~YYYY-MM-DD~format. }
% \end{macrocode}
%
% \subsection{Options and configuration}
@@ -2137,8 +2142,8 @@ Do not distribute a modified version of this file.
\bool_set_true:N \l_@@_macro_noTF_bool
\bool_set_true:N \l_@@_macro_TF_bool
} ,
- added .tl_set:N = \l_@@_date_added_tl ,
- updated .tl_set:N = \l_@@_date_updated_tl ,
+ added .code:n = { \@@_date_set:Nn \l_@@_date_added_tl {#1} },
+ updated .code:n = { \@@_date_set:Nn \l_@@_date_updated_tl {#1} } ,
deprecated .code:n = { \@@_deprecated_on:n {#1} } ,
tested .code:n = { } ,
label .code:n =
@@ -2152,7 +2157,22 @@ Do not distribute a modified version of this file.
}
% \end{macrocode}
%
+% \begin{macro}[aux]{\@@_date_set:Nn}
+% Minimal check that the date is not given in the YYYY/MM/DD format.
+% Eventually we should check the input more carefully.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_date_set:Nn #1#2
+ {
+ \tl_if_in:nnT {#2} { / }
+ { \msg_error:nnn { l3doc } { date-format } {#2} }
+ \tl_set:Nn #1 {#2}
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[aux]{\@@_deprecated_on:n}
+% The date comparison function expects two dates in the YYYY-MM-DD
+% format (|-|~is not subtraction here).
% Complain if a deprecated function should have been removed earlier.
% In any case, mark it as internal to suppress the text
% \enquote{documented on page \ldots{}}.
@@ -2472,11 +2492,9 @@ Do not distribute a modified version of this file.
% \begin{macrocode}
\cs_new:Npn \@@_typeset_dates:
{
- \bool_if:nF
- {
- \tl_if_empty_p:N \l_@@_date_added_tl &&
- \tl_if_empty_p:N \l_@@_date_updated_tl
- }
+ \bool_lazy_and:nnF
+ { \tl_if_empty_p:N \l_@@_date_added_tl }
+ { \tl_if_empty_p:N \l_@@_date_updated_tl }
{ \midrule }
\tl_if_empty:NF \l_@@_date_added_tl
{
@@ -2638,7 +2656,7 @@ Do not distribute a modified version of this file.
\hbox:n
{
\strut
- \int_compare:nNnT \l_@@_macro_int = \c_zero
+ \int_compare:nNnT \l_@@_macro_int = 0
{ \HD@target }
}
\vskip \int_eval:n { \l_@@_macro_int - 1 } \baselineskip
@@ -2967,12 +2985,12 @@ Do not distribute a modified version of this file.
% \begin{macrocode}
\cs_new_protected:Npn \@@_macro_end_check_tested:
{
- \bool_if:nT
+ \bool_lazy_all:nT
{
- \g_@@_checktest_bool &&
- ! \l_@@_macro_aux_bool &&
- ! \l_@@_macro_var_bool &&
- ! \l_@@_macro_tested_bool
+ { \g_@@_checktest_bool }
+ { ! \l_@@_macro_aux_bool }
+ { ! \l_@@_macro_var_bool }
+ { ! \l_@@_macro_tested_bool }
}
{
\seq_gput_right:Nx \g_@@_not_tested_seq
@@ -3034,11 +3052,9 @@ Do not distribute a modified version of this file.
}
\cs_new_protected:Npn \@@_print_documented:
{
- \bool_if:nT
- {
- ! \l_@@_macro_aux_bool &&
- ! \l_@@_macro_internal_bool
- }
+ \bool_lazy_or:nnF
+ { \l_@@_macro_aux_bool }
+ { \l_@@_macro_internal_bool }
{
\int_set:Nn \l_@@_tmpa_int
{ \seq_count:N \g_@@_nested_names_seq }
@@ -3512,8 +3528,8 @@ Do not distribute a modified version of this file.
% \begin{macrocode}
\cs_new_protected:Npn \@@_show_functions_defined:
{
- \bool_if:nT
- { \g_@@_typeset_implementation_bool && \g_@@_checkfunc_bool }
+ \bool_lazy_and:nnT
+ { \g_@@_typeset_implementation_bool } { \g_@@_checkfunc_bool }
{
\iow_term:x { \c_@@_iow_separator_tl \iow_newline: }
\iow_open:Nn \g_@@_func_iow { \c_sys_jobname_str .cmds }
@@ -4346,8 +4362,8 @@ page_precedence "rnaA"
% \c_sixteen,
% \c_thirty_two,
% \c_hundred_one,
-% \c_twohundred_fifty_five,
-% \c_twohundred_fifty_six,
+% \c_two_hundred_fifty_five,
+% \c_two_hundred_fifty_six,
% \c_thousand,
% \c_ten_thousand,
% \c_ten_thousand_one