[macros] Introduce \indexhdr and apply it for all headers.

source/algorithms.tex

@@ -23,8 +23,7 @@
 \end{libsumtab}
 
 \rSec1[algorithm.syn]{Header \tcode{<algorithm>} synopsis}
-\indextext{\idxhdr{algorithm}}%
-\indexlibrary{\idxhdr{algorithm}}%
+\indexhdr{algorithm}%
 
 \begin{codeblock}
 #include <initializer_list>
@@ -5716,8 +5715,7 @@
 \rSec1[alg.c.library]{C library algorithms}
 
 \pnum
-\indextext{\idxhdr{cstdlib}}%
-\indexlibrary{\idxhdr{cstdlib}}%
+\indexhdr{cstdlib}%
 \begin{note}
 The header \tcode{<cstdlib>}\iref{cstdlib.syn}
 declares the functions described in this subclause.

source/atomics.tex

@@ -28,8 +28,7 @@
 
 \rSec1[atomics.syn]{Header \tcode{<atomic>} synopsis}
 
-\indextext{\idxhdr{atomic}}%
-\indexlibrary{\idxhdr{atomic}}%
+\indexhdr{atomic}%
 \begin{codeblock}
 namespace std {
   // \ref{atomics.order}, order and consistency

source/basic.tex

@@ -5548,7 +5548,7 @@
 \indexlibrary{\idxcode{abort}}%
 \indextext{termination!program}%
 Calling the function \tcode{std::abort()} declared in
-\indextext{\idxhdr{cstdlib}}%
+\indexhdr{cstdlib}%
 \tcode{<cstdlib>} terminates the program without executing any destructors
 and without calling
 the functions passed to \tcode{std::atexit()} or \tcode{std::at_quick_exit()}.%

source/compatibility.tex

@@ -1915,23 +1915,23 @@
 
 \pnum
 There are no \Cpp headers for the C headers
-\tcode{<stdatomic.h>}\indextext{\idxhdr{stdatomic.h}},
-\tcode{<stdnoreturn.h>}\indextext{\idxhdr{stdnoreturn.h}},
-and \tcode{<threads.h>}\indextext{\idxhdr{threads.h}},
+\tcode{<stdatomic.h>}\indexhdr{stdatomic.h},
+\tcode{<stdnoreturn.h>}\indexhdr{stdnoreturn.h},
+and \tcode{<threads.h>}\indexhdr{threads.h},
 nor are the C headers themselves part of \Cpp.
 
 \pnum
-The \Cpp headers \tcode{<ccomplex>}\indextext{\idxhdr{ccomplex}}\iref{depr.ccomplex.syn}
-and \tcode{<ctgmath>}\indextext{\idxhdr{ctgmath}}\iref{depr.ctgmath.syn}, as well
-as their corresponding C headers \tcode{<complex.h>}\indextext{\idxhdr{complex.h}}
-and \tcode{<tgmath.h>}\indextext{\idxhdr{tgmath.h}}, do not contain any of the
+The \Cpp headers \tcode{<ccomplex>}\indexhdr{ccomplex}\iref{depr.ccomplex.syn}
+and \tcode{<ctgmath>}\indexhdr{ctgmath}\iref{depr.ctgmath.syn}, as well
+as their corresponding C headers \tcode{<complex.h>}\indexhdr{complex.h}
+and \tcode{<tgmath.h>}\indexhdr{tgmath.h}, do not contain any of the
 content from the C standard library and instead merely include other headers
 from the \Cpp standard library.
 
 \pnum
-The headers \tcode{<ciso646>}\indextext{\idxhdr{ciso646}},
-\tcode{<cstdalign>}\indextext{\idxhdr{cstdalign}}\iref{depr.cstdalign.syn},
-and \tcode{<cstdbool>}\indextext{\idxhdr{cstdbool}}\iref{depr.cstdbool.syn}
+The headers \tcode{<ciso646>}\indexhdr{ciso646},
+\tcode{<cstdalign>}\indexhdr{cstdalign}\iref{depr.cstdalign.syn},
+and \tcode{<cstdbool>}\indexhdr{cstdbool}\iref{depr.cstdbool.syn}
 are meaningless in \Cpp. Use of
 the \Cpp headers \tcode{<ccomplex>}, \tcode{<cstdalign>}, \tcode{<cstdbool>},
 and \tcode{<ctgmath>} is deprecated\iref{depr.c.headers}.
@@ -1946,7 +1946,7 @@
 The tokens \tcode{char16_t} and \tcode{char32_t}
 are keywords in this International Standard\iref{lex.key}.
 They do not appear as macro names defined in
-\tcode{<cuchar>}\indexlibrary{\idxhdr{cuchar}}\iref{cuchar.syn}.
+\tcode{<cuchar>}\indexhdr{cuchar}\iref{cuchar.syn}.
 
 \rSec3[diff.wchar.t]{Type \tcode{wchar_t}}
 
@@ -1956,20 +1956,20 @@
 The token \tcode{wchar_t}
 is a keyword in this International Standard\iref{lex.key}.
 It does not appear as a type name defined in any of
-\tcode{<cstddef>}\iref{cstddef.syn}\indexlibrary{\idxhdr{cstddef}},
-\tcode{<cstdlib>}\iref{cstdlib.syn}\indexlibrary{\idxhdr{cstdlib}},
-or \tcode{<cwchar>}\iref{cwchar.syn}\indexlibrary{\idxhdr{cwchar}}.
+\tcode{<cstddef>}\iref{cstddef.syn}\indexhdr{cstddef},
+\tcode{<cstdlib>}\iref{cstdlib.syn}\indexhdr{cstdlib},
+or \tcode{<cwchar>}\iref{cwchar.syn}\indexhdr{cwchar}.
 
 \rSec3[diff.header.assert.h]{Header \tcode{<assert.h>}}
-\indexlibrary{\idxhdr{assert.h}}%
+\indexhdr{assert.h}%
 
 \pnum
 The token \tcode{static_assert} is a keyword in this International
 Standard\iref{lex.key}. It does not appear as a macro name defined
-in \tcode{<cassert>}\indexlibrary{\idxhdr{cassert}}\iref{cassert.syn}.
+in \tcode{<cassert>}\indexhdr{cassert}\iref{cassert.syn}.
 
 \rSec3[diff.header.iso646.h]{Header \tcode{<iso646.h>}}
-\indexlibrary{\idxhdr{iso646.h}}%
+\indexhdr{iso646.h}%
 
 \pnum
 The tokens
@@ -1989,45 +1989,45 @@
 Standard\iref{lex.key}.
 They do not appear as macro names defined in
 \tcode{<ciso646>}.
-\indexlibrary{\idxhdr{ciso646}}%
+\indexhdr{ciso646}%
 
 \rSec3[diff.header.stdalign.h]{Header \tcode{<stdalign.h>}}
-\indexlibrary{\idxhdr{stdalign.h}}%
+\indexhdr{stdalign.h}%
 
 \pnum
 The token \tcode{alignas} is a keyword in this International
 Standard\iref{lex.key}. It does not appear as a macro name defined
-in \tcode{<cstdalign>}\indexlibrary{\idxhdr{cstdalign}}\iref{depr.cstdalign.syn}.
+in \tcode{<cstdalign>}\indexhdr{cstdalign}\iref{depr.cstdalign.syn}.
 
 \rSec3[diff.header.stdbool.h]{Header \tcode{<stdbool.h>}}
-\indexlibrary{\idxhdr{stdbool.h}}%
+\indexhdr{stdbool.h}%
 
 \pnum
 The tokens \tcode{bool}, \tcode{true}, and \tcode{false}
 are keywords in this International Standard\iref{lex.key}.
 They do not appear as macro names defined in
-\tcode{<cstdbool>}\indexlibrary{\idxhdr{cstdbool}}\iref{depr.cstdbool.syn}.
+\tcode{<cstdbool>}\indexhdr{cstdbool}\iref{depr.cstdbool.syn}.
 
 \rSec3[diff.null]{Macro \tcode{NULL}}
 
 \pnum
 The macro
 \tcode{NULL},
 defined in any of
-\tcode{<clocale>}\iref{c.locales}\indexlibrary{\idxhdr{clocale}},
-\tcode{<cstddef>}\iref{cstddef.syn}\indexlibrary{\idxhdr{cstddef}},
-\tcode{<cstdio>}\iref{cstdio.syn}\indexlibrary{\idxhdr{cstdio}},
-\tcode{<cstdlib>}\iref{cstdlib.syn}\indexlibrary{\idxhdr{cstdlib}},
-\tcode{<cstring>}\iref{cstring.syn}\indexlibrary{\idxhdr{cstring}},
-\tcode{<ctime>}\iref{ctime.syn}\indexlibrary{\idxhdr{ctime}},
-or \tcode{<cwchar>}\iref{cwchar.syn}\indexlibrary{\idxhdr{cwchar}},
+\tcode{<clocale>}\iref{c.locales}\indexhdr{clocale},
+\tcode{<cstddef>}\iref{cstddef.syn}\indexhdr{cstddef},
+\tcode{<cstdio>}\iref{cstdio.syn}\indexhdr{cstdio},
+\tcode{<cstdlib>}\iref{cstdlib.syn}\indexhdr{cstdlib},
+\tcode{<cstring>}\iref{cstring.syn}\indexhdr{cstring},
+\tcode{<ctime>}\iref{ctime.syn}\indexhdr{ctime},
+or \tcode{<cwchar>}\iref{cwchar.syn}\indexhdr{cwchar},
 is an \impldef{definition of \tcode{NULL}} \Cpp null pointer constant in
 this International Standard\iref{support.types}.
 
 \rSec2[diff.mods.to.declarations]{Modifications to declarations}
 
 \pnum
-Header \tcode{<cstring>}\iref{cstring.syn}\indexlibrary{\idxhdr{cstring}}:
+Header \tcode{<cstring>}\iref{cstring.syn}\indexhdr{cstring}:
 The following functions have different declarations:
 
 \begin{itemize}
@@ -2041,7 +2041,7 @@
 Subclause \ref{cstring.syn} describes the changes.
 
 \pnum
-Header \tcode{<cwchar>}\iref{cwchar.syn}\indexlibrary{\idxhdr{cwchar}}:
+Header \tcode{<cwchar>}\iref{cwchar.syn}\indexhdr{cwchar}:
 The following functions have different declarations:
 
 \begin{itemize}
@@ -2055,14 +2055,14 @@
 Subclause \ref{cwchar.syn} describes the changes.
 
 \pnum
-Header \tcode{<cstddef>}\iref{cstddef.syn}\indexlibrary{\idxhdr{cstddef}}
+Header \tcode{<cstddef>}\iref{cstddef.syn}\indexhdr{cstddef}
 declares the name \tcode{nullptr_t} in addition to the names declared in
 \tcode{<stddef.h>} in the C standard library.
 
 \rSec2[diff.mods.to.behavior]{Modifications to behavior}
 
 \pnum
-Header \tcode{<cstdlib>}\iref{cstdlib.syn}\indexlibrary{\idxhdr{cstdlib}}:
+Header \tcode{<cstdlib>}\iref{cstdlib.syn}\indexhdr{cstdlib}:
 The following functions have different behavior:
 
 \begin{itemize}
@@ -2074,7 +2074,7 @@
 Subclause \ref{support.start.term} describes the changes.
 
 \pnum
-Header \tcode{<csetjmp>}\iref{csetjmp.syn}\indexlibrary{\idxhdr{csetjmp}}:
+Header \tcode{<csetjmp>}\iref{csetjmp.syn}\indexhdr{csetjmp}:
 The following functions have different behavior:
 
 \begin{itemize}
@@ -2088,7 +2088,7 @@
 
 \pnum
 The macro \tcode{offsetof}, defined in
-\tcode{<cstddef>}\iref{cstddef.syn}\indexlibrary{\idxhdr{cstddef}},
+\tcode{<cstddef>}\iref{cstddef.syn}\indexhdr{cstddef},
 accepts a restricted set of \tcode{\placeholder{type}} arguments in this International Standard.
 Subclause \ref{support.types.layout} describes the change.
 

source/containers.tex

@@ -2923,8 +2923,7 @@
 
 \rSec2[array.syn]{Header \tcode{<array>} synopsis}
 
-\indextext{\idxhdr{array}}%
-\indexlibrary{\idxhdr{array}}%
+\indexhdr{array}%
 \begin{codeblock}
 #include <initializer_list>
 
@@ -2966,8 +2965,7 @@
 
 \rSec2[deque.syn]{Header \tcode{<deque>} synopsis}
 
-\indextext{\idxhdr{deque}}%
-\indexlibrary{\idxhdr{deque}}%
+\indexhdr{deque}%
 
 \begin{codeblock}
 #include <initializer_list>
@@ -3002,8 +3000,7 @@
 
 \rSec2[forward_list.syn]{Header \tcode{<forward_list>} synopsis}
 
-\indextext{\idxhdr{forward_list}}%
-\indexlibrary{\idxhdr{forward_list}}%
+\indexhdr{forward_list}%
 
 \begin{codeblock}
 #include <initializer_list>
@@ -3038,8 +3035,7 @@
 
 \rSec2[list.syn]{Header \tcode{<list>} synopsis}
 
-\indextext{\idxhdr{list}}%
-\indexlibrary{\idxhdr{list}}%
+\indexhdr{list}%
 
 \begin{codeblock}
 #include <initializer_list>
@@ -3074,8 +3070,7 @@
 
 \rSec2[vector.syn]{Header \tcode{<vector>} synopsis}
 
-\indextext{\idxhdr{vector}}%
-\indexlibrary{\idxhdr{vector}}%
+\indexhdr{vector}%
 
 \begin{codeblock}
 #include <initializer_list>
@@ -5812,8 +5807,7 @@
 
 \rSec2[associative.map.syn]{Header \tcode{<map>} synopsis}
 
-\indextext{\idxhdr{map}}%
-\indexlibrary{\idxhdr{map}}%
+\indexhdr{map}%
 \begin{codeblock}
 #include <initializer_list>
 
@@ -5890,8 +5884,7 @@
 
 \rSec2[associative.set.syn]{Header \tcode{<set>} synopsis}%
 
-\indextext{\idxhdr{set}}%
-\indexlibrary{\idxhdr{set}}%
+\indexhdr{set}%
 
 \begin{codeblock}
 #include <initializer_list>
@@ -7353,8 +7346,7 @@
 defined in \ref{associative.general} may appear in deduction guides for unordered containers.
 
 \rSec2[unord.map.syn]{Header \tcode{<unordered_map>} synopsis}%
-\indextext{\idxhdr{unordered_map}}%
-\indexlibrary{\idxhdr{unordered_map}}%
+\indexhdr{unordered_map}%
 \indexlibrary{\idxcode{unordered_map}}%
 \indexlibrary{\idxcode{unordered_multimap}}%
 \begin{codeblock}
@@ -7422,8 +7414,7 @@
 \end{codeblock}
 
 \rSec2[unord.set.syn]{Header \tcode{<unordered_set>} synopsis}%
-\indextext{\idxhdr{unordered_set}}%
-\indexlibrary{\idxhdr{unordered_set}}%
+\indexhdr{unordered_set}%
 \indexlibrary{\idxcode{unordered_set}}%
 \indexlibrary{\idxcode{unordered_multiset}}%
 \begin{codeblock}
@@ -9018,8 +9009,7 @@
 \end{itemize}
 
 \rSec2[queue.syn]{Header \tcode{<queue>} synopsis}%
-\indextext{\idxhdr{queue}}%
-\indexlibrary{\idxhdr{queue}}
+\indexhdr{queue}%
 
 \begin{codeblock}
 #include <initializer_list>
@@ -9052,8 +9042,7 @@
 \end{codeblock}
 
 \rSec2[stack.syn]{Header \tcode{<stack>} synopsis}%
-\indextext{\idxhdr{stack}}%
-\indexlibrary{\idxhdr{stack}}
+\indexhdr{stack}%
 
 \begin{codeblock}
 #include <initializer_list>

source/declarators.tex

@@ -1386,7 +1386,7 @@
 \begin{note}
 The standard header
 \tcode{<cstdarg>}
-\indextext{\idxhdr{cstdarg}}%
+\indexhdr{cstdarg}%
 contains a mechanism for accessing arguments passed using the ellipsis
 (see~\ref{expr.call} and~\ref{support.runtime}).
 \end{note}

source/diagnostics.tex

@@ -43,14 +43,12 @@
 They cannot be easily predicted in advance.
 The header
 \tcode{<stdexcept>}
-\indextext{\idxhdr{stdexcept}}%
-\indexlibrary{\idxhdr{stdexcept}}%
+\indexhdr{stdexcept}%
 defines several types of predefined exceptions for reporting errors in a \Cpp program.
 These exceptions are related by inheritance.
 
 \rSec2[stdexcept.syn]{Header \tcode{<stdexcept>} synopsis}
-\indextext{\idxhdr{stdexcept}}%
-\indexlibrary{\idxhdr{stdexcept}}%
+\indexhdr{stdexcept}%
 \indexlibrary{\idxcode{logic_error}}%
 \indexlibrary{\idxcode{domain_error}}%
 \indexlibrary{\idxcode{invalid_argument}}%
@@ -545,16 +543,14 @@
 
 \rSec2[cassert.syn]{Header \tcode{<cassert>} synopsis}
 
-\indextext{\idxhdr{cassert}}%
-\indexlibrary{\idxhdr{cassert}}%
+\indexhdr{cassert}%
 \indexlibrary{\idxcode{assert}}%
 \begin{codeblock}
 #define assert(E) @\seebelow@
 \end{codeblock}
 
 \pnum
-\indextext{\idxhdr{assert.h}}%
-\indexlibrary{\idxhdr{assert.h}}%
+\indexhdr{assert.h}%
 \indextext{static_assert@\tcode{static_assert}!not macro}%
 The contents are the same as the C standard library header
 \tcode{<assert.h>},
@@ -580,8 +576,7 @@
 \rSec1[errno]{Error numbers}
 
 \pnum
-\indextext{\idxhdr{errno.h}}%
-\indexlibrary{\idxhdr{errno.h}}%
+\indexhdr{errno.h}%
 The contents of the header \tcode{<cerrno>} are the same as the POSIX header
 \tcode{<errno.h>}, except that \tcode{errno} shall be defined as a macro.
 \begin{note}
@@ -591,8 +586,7 @@
 
 \rSec2[cerrno.syn]{Header \tcode{<cerrno>} synopsis}
 
-\indextext{\idxhdr{cerrno}}%
-\indexlibrary{\idxhdr{cerrno}}%
+\indexhdr{cerrno}%
 \indexlibrary{\idxcode{errno}}%
 \indexlibrary{\idxcode{E2BIG}}%
 \indexlibrary{\idxcode{EACCES}}%
@@ -774,8 +768,7 @@
 libraries unchanged.
 
 \rSec2[system_error.syn]{Header \tcode{<system_error>} synopsis}
-\indextext{\idxhdr{system_error}}%
-\indexlibrary{\idxhdr{system_error}}%
+\indexhdr{system_error}%
 \indexlibrary{\idxcode{error_category}}%
 \indexlibrary{\idxcode{error_code}}%
 \indexlibrary{\idxcode{error_condition}}%