[text] Improved indexing of macros

Author: AlisdairM

source/text.tex

@@ -4903,13 +4903,6 @@
 \indexlibraryglobal{lconv}%
 \indexlibraryglobal{setlocale}%
 \indexlibraryglobal{localeconv}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{LC_ALL}%
-\indexlibraryglobal{LC_COLLATE}%
-\indexlibraryglobal{LC_CTYPE}%
-\indexlibraryglobal{LC_MONETARY}%
-\indexlibraryglobal{LC_NUMERIC}%
-\indexlibraryglobal{LC_TIME}%
 \begin{codeblock}
 namespace std {
   struct lconv;
@@ -4918,13 +4911,13 @@
   lconv* localeconv();
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@
-#define LC_ALL @\seebelow@
-#define LC_COLLATE @\seebelow@
-#define LC_CTYPE @\seebelow@
-#define LC_MONETARY @\seebelow@
-#define LC_NUMERIC @\seebelow@
-#define LC_TIME @\seebelow@
+#define @\libmacro{NULL}@ @\textit{see \ref{support.types.nullptr}}@
+#define @\libmacro{LC_ALL}@ @\seebelow@
+#define @\libmacro{LC_COLLATE}@ @\seebelow@
+#define @\libmacro{LC_CTYPE}@ @\seebelow@
+#define @\libmacro{LC_MONETARY}@ @\seebelow@
+#define @\libmacro{LC_NUMERIC}@ @\seebelow@
+#define @\libmacro{LC_TIME}@ @\seebelow@
 \end{codeblock}
 
 \pnum
@@ -13065,7 +13058,6 @@
 \indexlibraryglobal{towupper}%
 \indexlibraryglobal{towctrans}%
 \indexlibraryglobal{wctrans}%
-\indexlibraryglobal{WEOF}%
 \begin{codeblock}
 namespace std {
   using wint_t = @\seebelow@;
@@ -13092,7 +13084,7 @@
   wctrans_t wctrans(const char* property);
 }
 
-#define WEOF @\seebelow@
+#define @\libmacro{WEOF}@ @\seebelow@
 \end{codeblock}
 
 \pnum
@@ -13104,10 +13096,6 @@
 \rSec2[cwchar.syn]{Header \tcode{<cwchar>} synopsis}
 
 \indexheader{cwchar}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{WCHAR_MAX}%
-\indexlibraryglobal{WCHAR_MIN}%
-\indexlibraryglobal{WEOF}%
 \indexlibraryglobal{btowc}%
 \indexlibraryglobal{fgetwc}%
 \indexlibraryglobal{fgetws}%
@@ -13247,10 +13235,10 @@
   size_t wcsrtombs(char* dst, const wchar_t** src, size_t len, mbstate_t* ps);
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@                                                  // freestanding
-#define WCHAR_MAX @\seebelow@                                             // freestanding
-#define WCHAR_MIN @\seebelow@                                             // freestanding
-#define WEOF @\seebelow@                                                  // freestanding
+#define @\libmacro{NULL}@ @\textit{see \ref{support.types.nullptr}}@                                                  // freestanding
+#define @\libmacro{WCHAR_MAX}@ @\seebelow@                                             // freestanding
+#define @\libmacro{WCHAR_MIN}@ @\seebelow@                                             // freestanding
+#define @\libmacro{WEOF}@ @\seebelow@                                                  // freestanding
 \end{codeblock}
 
 \pnum
@@ -13428,7 +13416,7 @@
 \item \tcode{(size_t)(-1)}, if an encoding error occurs,
 in which case the next \tcode{n} or fewer bytes do not contribute to
 a complete and valid multibyte character (no value is stored);
-the value of the macro \tcode{EILSEQ} is stored in \tcode{errno}, and
+the value of the macro \tcode{EILSEQ} is stored in \tcode{\libmacro{errno}}, and
 the conversion state is unspecified.
 \end{itemize}
 \end{itemdescr}
@@ -13460,7 +13448,7 @@
 The number of bytes stored in the array object (including any shift sequences).
 If \tcode{c8} does not contribute to a sequence of \keyword{char8_t}
 corresponding to a valid multibyte character,
-the value of the macro \tcode{EILSEQ} is stored in \tcode{errno},
+the value of the macro \tcode{EILSEQ} is stored in \tcode{\libmacro{errno}},
 \tcode{(size_t) (-1)} is returned, and the conversion state is unspecified.
 
 \pnum