[allocator.adaptor.members] Use placeholder macro for OUTERMOST*

pseudo-functions, improve presentation.

Author: tkoeppe

source/utilities.tex

@@ -12312,14 +12312,14 @@
 
 \pnum
 In the \tcode{construct} member functions,
-\tcode{\textit{OUTERMOST}(x)} is \tcode{x} if \tcode{x} does not have an
+\tcode{\placeholdernc{OUTERMOST}(x)} is \tcode{x} if \tcode{x} does not have an
 \tcode{outer_allocator()} member function and
-\tcode{\textit{OUTERMOST}(x.outer_allocator())}
+\tcode{\placeholdernc{OUTERMOST}(x.outer_allocator())}
 otherwise;
-\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(x)} is \\
-\tcode{allocator_traits<decltype(\textit{OUTERMOST}(x))>}.
-\begin{note} \tcode{\textit{OUTERMOST}(x)} and
-\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(x)} are recursive operations. It
+\tcode{\placeholdernc{OUTERMOST_ALLOC_TRAITS}(x)} is
+\tcode{allocator_traits<decltype(\placeholdernc{OUTERMOST}(x))>}.
+\begin{note} \tcode{\placeholdernc{OUTERMOST}(x)} and
+\tcode{\placeholdernc{OUTERMOST_ALLOC_TRAITS}(x)} are recursive operations. It
 is incumbent upon the definition of \tcode{outer_allocator()} to ensure that the
 recursion terminates. It will terminate for all instantiations of
 \tcode{scoped_allocator_adaptor}. \end{note}
@@ -12406,27 +12406,35 @@
 \begin{itemdescr}
 \pnum
 \effects
-
 \begin{itemize}
-\item If \tcode{uses_allocator_v<T, inner_allocator_type>} is \tcode{false} and\\
-\tcode{is_constructible_v<T, Args...>} is \tcode{true}, calls\\
-\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this)::construct(\\
-\textit{OUTERMOST}(*this), p, std::forward<Args>(args)...)}.
+\item If \tcode{uses_allocator_v<T, inner_allocator_type>} is \tcode{false} and
+\tcode{is_constructible_v<T,\\ Args...>} is \tcode{true}, calls:
+\begin{codeblock}
+@\placeholdernc{OUTERMOST_ALLOC_TRAITS}@(*this)::construct(
+    @\placeholdernc{OUTERMOST}@(*this), p, std::forward<Args>(args)...)
+\end{codeblock}
 
 \item Otherwise, if \tcode{uses_allocator_v<T, inner_allocator_type>} is \tcode{true} and
-\tcode{is_construc\-tible_v<T, allocator_arg_t, inner_allocator_type\&, Args...>} is \tcode{true}, calls
-\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this)::construct(\textit{OUTERMOST}(*this),
-p, allocator_arg,\\inner_allocator(), std::forward<Args>(args)...)}.
+\tcode{is_constructible_v<T, allocator_arg_t, inner_allocator_type\&, Args...>} is \tcode{true}, calls:
+\begin{codeblock}
+@\placeholdernc{OUTERMOST_ALLOC_TRAITS}@(*this)::construct(
+    @\placeholdernc{OUTERMOST}@(*this), p, allocator_arg, inner_allocator(), std::forward<Args>(args)...)
+\end{codeblock}
 
 \item Otherwise, if \tcode{uses_allocator_v<T, inner_allocator_type>} is \tcode{true} and
-\tcode{is_construct\-ible_v<T, Args..., inner_allocator_type\&>} is \tcode{true}, calls
-\tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this)::
-construct(\textit{OUTERMOST}(*this), p, std::forward<Args>(args)...,\\inner_allocator())}.
+\tcode{is_constructible_v<T, Args..., inner_allocator_type\&>} is \tcode{true}, calls:
+\begin{codeblock}
+@\placeholdernc{OUTERMOST_ALLOC_TRAITS}@(*this)::construct(
+    @\placeholdernc{OUTERMOST}@(*this), p, std::forward<Args>(args)..., inner_allocator())
+\end{codeblock}
 
-\item Otherwise, the program is ill-formed. \begin{note} An error will result if
+\item Otherwise, the program is ill-formed.
+\begin{note}
+An error will result if
 \tcode{uses_allocator} evaluates to \tcode{true} but the specific constructor does not take an
 allocator. This definition prevents a silent failure to pass an inner allocator to a
-contained element. \end{note}
+contained element.
+\end{note}
 \end{itemize}
 \end{itemdescr}
 
@@ -12445,55 +12453,63 @@
 \pnum
 \effects Constructs a \tcode{tuple} object \tcode{xprime} from \tcode{x} by the
 following rules:
-
 \begin{itemize}
-\item If \tcode{uses_allocator_v<T1, inner_allocator_type>} is \tcode{false} and\\
-\tcode{is_constructible_v<T1, Args1...>} is \tcode{true},
+\item If \tcode{uses_allocator_v<T1, inner_allocator_type>} is \tcode{false} and
+\tcode{is_constructible_v<T1,\\ Args1...>} is \tcode{true},
 then \tcode{xprime} is \tcode{x}.
 
 \item Otherwise, if \tcode{uses_allocator_v<T1, inner_allocator_type>} is \tcode{true}
 and
 \tcode{is_construct\-ible_v<T1, allocator_arg_t, inner_allocator_type\&, Args1...>}
 is
-\tcode{true}, then \tcode{xprime} is
-\tcode{tuple_cat(tuple<allocator_arg_t, inner_allocator_type\&>(
-allocator_arg, inner_allocator()), std::move(x))}.
+\tcode{true}, then \tcode{xprime} is:
+\begin{codeblock}
+tuple_cat(
+    tuple<allocator_arg_t, inner_allocator_type&>(allocator_arg, inner_allocator()),
+    std::move(x))
+\end{codeblock}
 
 \item Otherwise, if \tcode{uses_allocator_v<T1, inner_allocator_type>} is
 \tcode{true} and
 \tcode{is_construct\-ible_v<T1, Args1..., inner_allocator_type\&>} is \tcode{true},
-then \tcode{xprime} is
-\tcode{tuple_cat(std::move(x), tuple<inner_allocator_type\&>(inner_allocator()))}.
+then \tcode{xprime} is:
+\begin{codeblock}
+tuple_cat(std::move(x), tuple<inner_allocator_type&>(inner_allocator()))
+\end{codeblock}
 
 \item Otherwise, the program is ill-formed.
 \end{itemize}
-
 and constructs a \tcode{tuple} object \tcode{yprime} from \tcode{y} by the following rules:
-
 \begin{itemize}
-\item If \tcode{uses_allocator_v<T2, inner_allocator_type>} is \tcode{false} and\\
-\tcode{is_constructible_v<T2,
-Args2...>} is \tcode{true}, then \tcode{yprime} is \tcode{y}.
+\item If \tcode{uses_allocator_v<T2, inner_allocator_type>} is \tcode{false} and
+\tcode{is_constructible_v<T2,\\ Args2...>} is \tcode{true}, then \tcode{yprime} is \tcode{y}.
 
 \item Otherwise, if \tcode{uses_allocator_v<T2, inner_allocator_type>} is \tcode{true}
 and
-\tcode{is_construct\-ible_v<T2, allocator_arg_t, inner_allocator_type\&, Args2...>}
+\tcode{is_constructible_v<T2, allocator_arg_t, inner_allocator_type\&, Args2...>}
 is
-\tcode{true}, then \tcode{yprime} is
-\tcode{tuple_cat(tuple<allocator_arg_t, inner_allocator_type\&>(
-allocator_arg, inner_allocator()), std::move(y))}.
+\tcode{true}, then \tcode{yprime} is:
+\begin{codeblock}
+tuple_cat(
+    tuple<allocator_arg_t, inner_allocator_type&>(allocator_arg, inner_allocator()),
+    std::move(y))
+\end{codeblock}
 
 \item Otherwise, if \tcode{uses_allocator_v<T2, inner_allocator_type>} is
 \tcode{true} and
-\tcode{is_construct\-ible_v<T2, Args2..., inner_allocator_type\&>} is \tcode{true},
-then \tcode{yprime} is
-\tcode{tuple_cat(std::move(y), tuple<inner_allocator_type\&>(inner_allocator()))}.
+\tcode{is_constructible_v<T2, Args2..., inner_allocator_type\&>} is \tcode{true},
+then \tcode{yprime} is:
+\begin{codeblock}
+tuple_cat(std::move(y), tuple<inner_allocator_type&>(inner_allocator()))
+\end{codeblock}
 
 \item Otherwise, the program is ill-formed.
 \end{itemize}
-
-then calls \tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this)::construct(\textit{OUTERMOST}(*this), p,\\
-piecewise_construct, std::move(xprime), std::move(yprime))}.
+then calls:
+\begin{codeblock}
+@\placeholdernc{OUTERMOST_ALLOC_TRAITS}@(*this)::construct(
+    @\placeholdernc{OUTERMOST}@(*this), p, piecewise_construct, std::move(xprime), std::move(yprime))
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{construct}{scoped_allocator_adaptor}%
@@ -12566,7 +12582,7 @@
 
 \begin{itemdescr}
 \pnum
-\effects Calls \tcode{\textit{OUTERMOST_ALLOC_TRAITS}(*this)::destroy(\textit{OUTERMOST}(*this), p)}.
+\effects Calls \tcode{\placeholdernc{OUTERMOST_ALLOC_TRAITS}(*this)::destroy(\placeholdernc{OUTERMOST}(*this), p)}.
 \end{itemdescr}
 
 \indexlibrarymember{select_on_container_copy_construction}{scoped_allocator_adaptor}%