From 2b6b5331725c50dd57db92fe63887394eaee411f Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <cxx@kayari.org>
Date: Wed, 20 May 2020 23:39:51 +0100
Subject: [PATCH] [socket] [internet] Improve indexing of extensible
 implementation properties

---
 src/internetprotocol.tex | 10 +++++-----
 src/sockets.tex          | 12 +++++++-----
 src/ts.tex               |  8 ++++++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/internetprotocol.tex b/src/internetprotocol.tex
index 1c2ddc7..f6397c2 100644
--- a/src/internetprotocol.tex
+++ b/src/internetprotocol.tex
@@ -396,7 +396,7 @@
 };
 \end{codeblock}
 
-\indexextensible{MulticastGroupSocketOption}%
+\indexextensiblereq{MulticastGroupSocketOption}%
 \pnum
 Extensible implementations provide the following member functions:
 
@@ -2733,7 +2733,7 @@
 \pnum
 \changed{Instances}{Specializations} of the \tcode{basic_endpoint} class template meet the requirements for an \tmpnewoldconcept{Endpoint}~(\ref{socket.reqmts.endpoint}).
 
-\indexextensible{basic_endpoint}%
+\indexextensibletype{basic_endpoint}%
 \pnum
  Extensible implementations provide the following member functions:
 
@@ -4001,7 +4001,7 @@
 \pnum
 The \tcode{tcp} class meets the requirements for an \tmpnewoldconcept{InternetProtocol}~(\ref{internet.reqmts.protocol}).
 
-\indexextensible{tcp}%
+\indexextensibletype{tcp}%
 \pnum
  Extensible implementations provide the following member functions:
 
@@ -4130,7 +4130,7 @@
 \pnum
 The \tcode{udp} class meets the requirements for an \tmpnewoldconcept{InternetProtocol}~(\ref{internet.reqmts.protocol}).
 
-\indexextensible{udp}%
+\indexextensibletype{udp}%
 \pnum
  Extensible implementations provide the following member functions:
 
@@ -4347,7 +4347,7 @@
 \pnum
 \tcode{outbound_interface} \changed{satisfies}{meets} the requirements for \tmpoldconcept{Destructible} (\CppXref{destructible}), \tmpoldconcept{CopyConstructible} (\CppXref{copyconstructible}), \tmpoldconcept{CopyAssignable} (\CppXref{copyassignable}), and \tmpnewoldconcept{SettableSocketOption}~(\ref{socket.reqmts.settablesocketoption}).
 
-\indexextensible{outbound_interface}%
+\indexextensibletype{outbound_interface}%
 \pnum
  Extensible implementations provide the following member functions:
 
diff --git a/src/sockets.tex b/src/sockets.tex
index 451943f..69e2217 100644
--- a/src/sockets.tex
+++ b/src/sockets.tex
@@ -245,7 +245,7 @@
 
 \end{libreqtab3}
 
-\indexextensible{Endpoint}%
+\indexextensiblereq{Endpoint}%
 \pnum
 In the table below, \tcode{a} denotes a \removed{(possibly const)} value of type \added{(possibly const)} \tcode{X},
 \tcode{b} denotes a value of type \tcode{X},
@@ -350,7 +350,7 @@
 
 \end{libreqtab3}
 
-\indexextensible{Protocol}%
+\indexextensiblereq{Protocol}%
 \pnum
 In the table below, \tcode{a} denotes a \removed{(possibly const)} value of type \added{(possibly const)} \tcode{X}.
 
@@ -413,6 +413,7 @@
 
 
 
+\indexextensiblereq{GettableSocketOption}%
 \rSec2[socket.reqmts.gettablesocketoption]{Gettable socket option requirements}
 
 \pnum
@@ -465,6 +466,7 @@
 
 
 
+\indexextensiblereq{SettableSocketOption}%
 \rSec2[socket.reqmts.settablesocketoption]{Settable socket option requirements}
 
 \pnum
@@ -579,7 +581,7 @@
 };
 \end{codeblock}
 
-\indexextensible{BooleanSocketOption}%
+\indexextensiblereq{BooleanSocketOption}%
 \pnum
 Extensible implementations provide the following member functions:
 
@@ -772,7 +774,7 @@
 };
 \end{codeblock}
 
-\indexextensible{BooleanSocketOption}%
+\indexextensiblereq{BooleanSocketOption}%
 \pnum
 Extensible implementations provide the following member functions:
 
@@ -1271,7 +1273,7 @@
 \pnum
 \tcode{linger} \changed{satisfies}{meets} the requirements of \tmpoldconcept{Destructible} (\CppXref{destructible}), \tmpoldconcept{DefaultConstructible} (\CppXref{defaultconstructible}), \tmpoldconcept{CopyConstructible} (\CppXref{copyconstructible}), \tmpoldconcept{CopyAssignable} (\CppXref{copyassignable}), \tmpnewoldconcept{GettableSocketOption}~(\ref{socket.reqmts.gettablesocketoption}), and \tmpnewoldconcept{SettableSocketOption}~(\ref{socket.reqmts.settablesocketoption}).
 
-\indexextensible{linger}%
+\indexextensibletype{linger}%
 \pnum
  Extensible implementations provide the following member functions:
 
diff --git a/src/ts.tex b/src/ts.tex
index 9937149..8c41da9 100644
--- a/src/ts.tex
+++ b/src/ts.tex
@@ -72,9 +72,13 @@
 
 % Add an extensible implementation entry to the main and library name indices
 \newcommand{\indexextensible}[1]{%
-\indextext{extensible implementation!\idxnewoldconcept{#1}}%
-\indextext{\idxnewoldconcept{#1}!extensible implementation}%
+\indextext{extensible implementation!#1}%
+\indextext{#1!extensible implementation}%
 }
+% Index extry for requirements on extensible implementations.
+\newcommand{\indexextensiblereq}[1]{\indexextensible{\idxnewoldconcept{#1}}}
+% Index extry for type properties on extensible implementations.
+\newcommand{\indexextensibletype}[1]{\indexextensible{\idxcode{#1}}}
 
 \newcommand{\namespaceverN}{v2}
 \newcommand{\namespacever}{\changed{v1}{\namespaceverN}}