From d12441ec5229268a95a512e2b53154316483c17b Mon Sep 17 00:00:00 2001 From: Jens Maurer Date: Thu, 16 May 2024 13:12:03 +0200 Subject: [PATCH 1/2] [macros,regex] Pass an argument to the \xref macro --- source/macros.tex | 4 ++-- source/regex.tex | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/macros.tex b/source/macros.tex index bff719918e..f04ac68774 100644 --- a/source/macros.tex +++ b/source/macros.tex @@ -371,8 +371,8 @@ \newcommand{\templalias}{\Fundesc{Alias template}} %% Cross-reference -\newcommand{\xref}{\textsc{See also:}\space} -\newcommand{\xrefc}[1]{\xref{} \IsoC{}, #1} +\newcommand{\xref}[1]{\textsc{See also:}\space #1} +\newcommand{\xrefc}[1]{\xref{\IsoC{}, #1}} \newcommand{\termref}[3]{\textit{#2}{#3}\iref{#1}} % in Clause 3 %% Inline comma-separated parenthesized references diff --git a/source/regex.tex b/source/regex.tex index bbec2e9f78..13f0b63ba2 100644 --- a/source/regex.tex +++ b/source/regex.tex @@ -686,7 +686,7 @@ \tcode{ECMAScript} & Specifies that the grammar recognized by the regular expression engine shall be that used by ECMAScript in ECMA-262, as modified in~\ref{re.grammar}. -\newline \xref ECMA-262 15.10 +\newline \xref{ECMA-262 15.10} \indextext{ECMAScript}% \indexlibrarymember{syntax_option_type}{ECMAScript}% \\ \rowsep @@ -694,7 +694,7 @@ \tcode{basic} & Specifies that the grammar recognized by the regular expression engine shall be that used by basic regular expressions in POSIX. -\newline \xref POSIX, Base Definitions and Headers, Section 9.3 +\newline \xref{POSIX, Base Definitions and Headers, Section 9.3} \indextext{POSIX!regular expressions}% \indexlibrarymember{syntax_option_type}{basic}% \\ \rowsep @@ -702,7 +702,7 @@ \tcode{extended} & Specifies that the grammar recognized by the regular expression engine shall be that used by extended regular expressions in POSIX. -\newline \xref POSIX, Base Definitions and Headers, Section 9.4 +\newline \xref{POSIX, Base Definitions and Headers, Section 9.4} \indextext{POSIX!extended regular expressions}% \indexlibrarymember{syntax_option_type}{extended}% \\ \rowsep @@ -3997,5 +3997,5 @@ iterator range \range{first}{last} if \tcode{traits_inst.isctype(c, traits_inst.lookup_classname(first, last, flags() \& icase))} is \tcode{true}. \end{itemize} -\xref ECMA-262 15.10 +\xref{ECMA-262 15.10} \indextext{regular expression|)} From 3cb1fc811e12645571185c311c28cfcd94787c29 Mon Sep 17 00:00:00 2001 From: Jens Maurer Date: Thu, 16 May 2024 13:03:44 +0200 Subject: [PATCH 2/2] [macros] Avoid small caps for cross-references to C. Fixes ISO/CS comment (C++23 proof) --- source/macros.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/macros.tex b/source/macros.tex index f04ac68774..53f5e92760 100644 --- a/source/macros.tex +++ b/source/macros.tex @@ -371,7 +371,7 @@ \newcommand{\templalias}{\Fundesc{Alias template}} %% Cross-reference -\newcommand{\xref}[1]{\textsc{See also:}\space #1} +\newcommand{\xref}[1]{See also #1.} \newcommand{\xrefc}[1]{\xref{\IsoC{}, #1}} \newcommand{\termref}[3]{\textit{#2}{#3}\iref{#1}} % in Clause 3