[allocator.requirements.general] Replace table for descriptive variables

Author: jensmaurer

source/lib-intro.tex

@@ -1840,43 +1840,61 @@
 \tcode{match_results}\iref{re} are parameterized in terms of
 allocators.
 
-\begin{shortlibreqtab2}
-{Descriptive variable definitions}
-{allocator.req.var}
-\topline
-\lhdr{Variable} &   \rhdr{Definition}   \\  \capsep
-\tcode{T, U, C}    &   any \cv-unqualified object type\iref{term.object.type}       \\ \rowsep
-\tcode{X}       &   an allocator class for type \tcode{T}   \\ \rowsep
-\tcode{Y}       &   the corresponding allocator class for type \tcode{U}    \\ \rowsep
-\tcode{XX}      &   the type \tcode{allocator_traits<X>}    \\ \rowsep
-\tcode{YY}      &   the type \tcode{allocator_traits<Y>}    \\ \rowsep
-\tcode{a, a1, a2}   &   lvalues of type \tcode{X}      \\ \rowsep
-\tcode{u}       &   the name of a variable being declared      \\ \rowsep
-\tcode{b}       &   a value of type \tcode{Y}           \\ \rowsep
-\tcode{c}       &   a pointer of type \tcode{C*} through which indirection is valid \\ \rowsep
-\tcode{p}       &   a value of type \tcode{XX::pointer}, obtained
-by calling \tcode{a1.allocate}, where \tcode{a1 == a}   \\ \rowsep
-\tcode{q}       &   a value of type \tcode{XX::const_pointer}
-obtained by conversion from a value \tcode{p}           \\ \rowsep
-\tcode{r}       &   a value of type \tcode{T\&}
-obtained by the expression \tcode{*p}                   \\ \rowsep
-\tcode{w}       &   a value of type \tcode{XX::void_pointer} obtained by
-  conversion from a value \tcode{p}  \\ \rowsep
-\tcode{x}       &   a value of type \tcode{XX::const_void_pointer} obtained by
-  conversion from a value \tcode{q} or a value \tcode{w}  \\ \rowsep
-\tcode{y}       &   a value of type \tcode{XX::const_void_pointer} obtained by
-conversion from a result value of \tcode{YY::allocate}, or else a value of
-type (possibly \keyword{const}) \tcode{std::nullptr_t}  \\ \rowsep
-\tcode{n}       &   a value of type \tcode{XX::size_type}    \\ \rowsep
-\tcode{Args}    &   a template parameter pack               \\ \rowsep
-\tcode{args}    &   a function parameter pack with the pattern \tcode{Args\&\&} \\
-\end{shortlibreqtab2}
+\pnum
+In subclause \ref{allocator.requirements},
+\begin{itemize}
+\item
+\tcode{T}, \tcode{U}, \tcode{C} denote
+any \cv-unqualified object type\iref{term.object.type},
+\item
+\tcode{X} denotes an allocator class for type \tcode{T},
+\item
+\tcode{Y} denotes the corresponding allocator class for type \tcode{U},
+\item
+\tcode{XX} denotes the type \tcode{allocator_traits<X>},
+\item
+\tcode{YY} denotes the type \tcode{allocator_traits<Y>},
+\item
+\tcode{a}, \tcode{a1}, \tcode{a2} denote lvalues of type \tcode{X},
+\item
+\tcode{u} denotes the name of a variable being declared,
+\item
+\tcode{b} denotes a value of type \tcode{Y},
+\item
+\tcode{c} denotes a pointer of type \tcode{C*}
+through which indirection is valid,
+\item
+\tcode{p} denotes a value of type \tcode{XX::pointer}
+obtained by calling \tcode{a1.allocate}, where \tcode{a1 == a},
+\item
+\tcode{q} denotes a value of type \tcode{XX::const_pointer}
+obtained by conversion from a value \tcode{p},
+\item
+\tcode{r} denotes a value of type \tcode{T\&}
+obtained by the expression \tcode{*p},
+\item
+\tcode{w} denotes a value of type \tcode{XX::void_pointer}
+obtained by conversion from a value \tcode{p},
+\item
+\tcode{x} denotes a value of type \tcode{XX::const_void_pointer}
+obtained by conversion from a value \tcode{q} or a value \tcode{w},
+\item
+\tcode{y} denotes a value of type \tcode{XX::const_void_pointer}
+obtained by conversion from a result value of \tcode{YY::allocate}, or else
+a value of type (possibly \tcode{const}) \tcode{std::nullptr_t},
+\item
+\tcode{n} denotes a value of type \tcode{XX::size_type},
+\item
+\tcode{Args} denotes a template parameter pack, and
+\item
+\tcode{args} denotes
+a function parameter pack with the pattern \tcode{Args\&\&}.
+\end{itemize}
 
 \pnum
 The class template \tcode{allocator_traits}\iref{allocator.traits} supplies
 a uniform interface to all allocator types.
-\tref{allocator.req.var} describes the types manipulated
-through allocators. \tref{cpp17.allocator}
+\tref{cpp17.allocator}
 describes the requirements on allocator types
 and thus on types used to instantiate \tcode{allocator_traits}. A requirement
 is optional if the last column of
@@ -1885,10 +1903,7 @@
 template, an optional requirement that is not supplied by an allocator is
 replaced by the specified default expression. A user specialization of
 \tcode{allocator_traits} may provide different defaults and may provide
-defaults for different requirements than the primary template. Within
-Tables~\ref{tab:allocator.req.var} and~\ref{tab:cpp17.allocator},
-the use of \tcode{move} and \tcode{forward} always refers to \tcode{std::move}
-and \tcode{std::forward}, respectively.
+defaults for different requirements than the primary template.
 
 \begin{libreqtab4d}
 {\oldconcept{Allocator} requirements}