Fixup: Fix various mistakes I've made, fix hboxes, apply menial changes like punctuation

Author: eisenwave

source/containers.tex

@@ -25262,15 +25262,10 @@
 The subset viewed by the created \tcode{mdspan} is determined by
 the \tcode{SliceSpecifier} arguments.
 
-%FIXME: WEIRD: the paper inconsistently uses math font and code font for the "S"
-%       that we are defining.
-%       To my understanding, we should aim to use code fonts for types,
-%       so this math font $S$ should be replaced.
 \pnum
 Given a signed or unsigned integer type \tcode{IndexType},
 a type $S$ is a
-%FIXME: the way I marked up this definition is almost certainly not the way it should be done
-\defnx{\tcode{submdspan} slide type for \tcode{IndexType}}{\tcode{submdspan}!slice type}
+\defnx{\tcode{submdspan} slice type for \tcode{IndexType}}{\tcode{submdspan}!slice type for \tcode{IndexType}}
 if at least one of the following holds:
 \begin{itemize}
 \item
@@ -25281,8 +25276,7 @@
   $S$ is a specialization of \tcode{strided_slice} and
   \tcode{is_convertible_v<$X$, IndexType>} is \tcode{true} for $X$ denoting
   \tcode{$S$::offset_type},
-  %FIXME: Oxford comma
-  \tcode{$S$::extent_type} and
+  \tcode{$S$::extent_type}, and
   \tcode{$S$::stride_type}; or
 \item
   all of the following hold:
@@ -25293,22 +25287,22 @@
   \item
     \tcode{sizeof...(ls)} is equal to 2, and
   \item
-    \tcode{(is_convertible_v<decltype(std::move(ls))>, IndexType> && ...)} is \tcode{true}.
+    \tcode{(is_convertible_v<decltype(std::move(ls)), IndexType> \&\& ...)} is \tcode{true}.
   \end{itemize}
 \end{itemize}
 
 \pnum
 Given a signed or unsigned integer type \tcode{IndexType},
 a type $S$ is a
-\defnx{canonical \tcode{submdspan} index type for \tcode{IndexType}}{\tcode{submdspan}!canonical index type}
-if $S$ is either \tcode{IndexType} or \tcode{constant_wrapper<V>}
+\defnx{canonical \tcode{submdspan} index type for \tcode{IndexType}}{\tcode{submdspan}!canonical index type for \tcode{IndexType}}
+if $S$ is either \tcode{IndexType} or \tcode{constant_wrapper<v>}
 for some value \tcode{v} of type \tcode{IndexType},
 such that \tcode{v} is greater than or equal to zero.
 
 \pnum
 Given a signed or unsigned integer type \tcode{IndexType},
 a type $S$ is a
-\defnx{canonical \tcode{submdspan} slice type for \tcode{IndexType}}{\tcode{submdspan}!canonical slice type}
+\defnx{canonical \tcode{submdspan} slice type for \tcode{IndexType}}{\tcode{submdspan}!canonical slice type for \tcode{IndexType}}
 if exactly one of the following is \tcode{true}:
 \begin{itemize}
 \item
@@ -25330,7 +25324,7 @@
 \end{itemize}
 
 \pnum
-A type $S$ is a \defnadj{collapsing}{slice type} if
+A type \tcode{S} is a \defnadj{collapsing}{slice type} if
 it is neither \tcode{full_extent_t} nor
 a specialization of \tcode{strided_slice}.
 \begin{note}
@@ -25354,29 +25348,25 @@
 Given an object \tcode{e} of type \tcode{E} that is a specialization of \tcode{extents}, and
 an object \tcode{s} of type \tcode{S}
 that is a canonical \tcode{submdspan} slice type for \tcode{E::index_type},
-the \defnx{\tcode{submdspan} slice range of \tcode{s} for the $k^\text{th}$ extent of \tcode{E}}{\tcode{submdspan}!slice range}
-of \tcode{e} is:
+the \defnx{\tcode{submdspan} slice range of \tcode{s} for the $k^\text{th}$ extent of \tcode{e}}{\tcode{submdspan}!slice range of \tcode{s} for the $k^\text{th}$ extent of \tcode{e}}
+is:
 \begin{itemize}
 \item
   \range{$0$}{e.extent($k$)},
   if \tcode{S} is \tcode{full_extent_t};
 \item
   \range{E::index_type(s.offset)}{E::index_type(s.offset + s.extent)},
-  if \tcode{S} is a specialization of \tcode{strided_slice}; otherwise
+  if \tcode{S} is a specialization of \tcode{stri\-ded_slice}; otherwise
 \item
   \range{\tcode{E::index_type(s)}}{$\tcode{E::index_type(s)} + 1$}
 \end{itemize}
 
 \pnum
 Given a type \tcode{E} that is a specialization of \tcode{extents},
 a type \tcode{S} is a
-%FIXME: the trailing comma here makes no grammatical sense
-\defnx{valid \tcode{submdspan} slice type for the $k^\text{th}$ extent of \tcode{E}}{\tcode{submdspan}!valid slice type},
+\defnx{valid \tcode{submdspan} slice type for the $k^\text{th}$ extent of \tcode{E}}{\tcode{submdspan}!valid slice type for the $k^\text{th}$ extent of \tcode{E}}
 if \tcode{S} is a canonical slice type for \tcode{E::index_type}, and
-for
-%FIXME: this is weird ... what is "x"?
-%Maybe say "for a value x"?
-$x$ equal to \tcode{E::static_extent($k$)},
+for $x$ equal to \tcode{E::static_extent($k$)},
 either $x$ is equal to \tcode{dynamic_extent}; or
 \begin{itemize}
 \item
@@ -25405,7 +25395,7 @@
 that is a specialization of \tcode{extents} and
 an object \tcode{s} of type \tcode{S},
 \tcode{s} is a
-\defnx{valid \tcode{submdspan} slice for the $k^\text{th}$ extent of \tcode{e}}{\tcode{submdspan}!valid slice}
+\defnx{valid \tcode{submdspan} slice for the $k^\text{th}$ extent of \tcode{e}}{\tcode{submdspan}!valid slice for the $k^\text{th}$ extent of \tcode{e}}
 if
 \begin{itemize}
 \item
@@ -25490,9 +25480,9 @@
 \rSec4[mdspan.sub.helpers]{Exposition-only helpers}
 
 \pnum
-\indexlibraryglobal{\exposid{MAP_RANK}}%
+\indexlibraryglobal{\tcode{\placeholder{MAP_RANK}}}%
 For a pack \tcode{p} and an integer $i$,
-let \tcode{\exposid{MAP_RANK}(p, $i$)} be the number of elements \tcode{p...[$j$]}
+let \tcode{\placeholder{MAP_RANK}(p, $i$)} be the number of elements \tcode{p...[$j$]}
 for $0 \le j < i$ whose types are not collapsing slice types.
 
 \begin{itemdecl}
@@ -25502,7 +25492,7 @@
 
 \begin{itemdescr}
 \pnum
-The concept \tcode{\exposconcept{is_strided-slice}<T>}
+The concept \tcode{\exposconcept{is-strided-slice}<T>}
 is satisfied and modeled if and only
 if \tcode{T} is a specialization of \tcode{strided_slice}.
 \end{itemdescr}
@@ -25517,7 +25507,7 @@
 \pnum
 \mandates
 If \tcode{S} models \exposconcept{integral-constant-like},
-then \tcode{extents<IndexType>::\exposid{index-cast}(S::value)}
+then \tcode{extents<IndexType>::\exposid{index-cast}(S::val\-ue)}
 is representable as a value of type \tcode{IndexType}.
 
 \pnum
@@ -25613,7 +25603,7 @@
   is a \tcode{submdspan} slice type for \tcode{IndexType}, and
 \item
   \tcode{decltype(canonical-slice<IndexType>(slices...[k]))}
-  is a valid submdspan slice type for the $k^\text{th}$ extent of
+  is a valid \tcode{submdspan} slice type for the $k^\text{th}$ extent of
   \tcode{extents<IndexType, Extents...>}.
 \end{itemize}
 
@@ -25655,11 +25645,11 @@
 For each rank index $k$ of \tcode{src}:
 \begin{itemize}
 \item
-  \tcode{SliceSpecifiers...[k]}
+  \tcode{SliceSpecifiers...[$k$]}
   is a \tcode{submdspan} slice type for \tcode{IndexType}, and
 \item
-  \tcode{decltype(slices...[k])} is a valid \tcode{submdspan} slice type
-  for the $k^\text{th}$ extent of \tcode{extents<IndexType, Extents...>}.
+  \tcode{decltype(slices...[$k$])} is a valid \tcode{submdspan} slice type
+  for the $k^\text{th}$ extent of \tcode{extents<\brk{}Index\-Type, Extents...>}.
 \end{itemize}
 
 \pnum
@@ -25674,12 +25664,12 @@
 \begin{itemize}
 \item
 \tcode{SubExtents::rank()} equals
-\tcode{\exposid{MAP_RANK}(slices, Extents::rank())}; and
+\tcode{\placeholder{MAP_RANK}(slices, Extents::rank())}; and
 
 \item
 for each rank index $k$ of \tcode{Extents} such that
 the type of \tcode{slices...[$k$]} is not a collapsing slice type,
-\tcode{SubExt\-ents::static_extent(\exposid{MAP_RANK}(slices, $k$))}
+\tcode{SubExt\-ents::static_extent(\placeholder{MAP_RANK}(slices, $k$))}
 equals the following, where $\Sigma_k$
 denotes the type of \tcode{slices...[$k$]}:
 
@@ -25716,7 +25706,7 @@
 A value \tcode{ext} of type \tcode{SubExtents} such that
 for each rank index $k$ of \tcode{extents<IndexType, Extents...>},
 where the type of \tcode{slices...[$k$]} is not a collapsing slice type,
-\tcode{ext.extent(\exposid{MAP_RANK}(slices, $k$))}
+\tcode{ext.extent(\placeholder{MAP_RANK}(slices, $k$))}
 equals the following,
 where $\sigma_k$ denotes \tcode{slices...[$k$]}:
 \begin{itemize}
@@ -25777,13 +25767,11 @@
 \item
 the expression \tcode{submdspan_mapping(m, invalid_slices...)} is ill-formed, and
 \item
-%FIXME: is ISO going to like a bullet ending in a colon?
 the following expression is well-formed and has the specified semantics:
-\end{itemize}
-
-\begin{itemdecl}
+\begin{codeblock}
 submdspan_mapping(m, valid_slices...)
-\end{itemdecl}
+\end{codeblock}
+\end{itemize}
 
 \begin{itemdescr}
 \pnum
@@ -25793,7 +25781,7 @@
 \item \tcode{SM} meets the layout mapping requirements\iref{mdspan.layout.policy.reqmts},
 \item \tcode{SM::extents_type} is a specialization of \tcode{extents},
 \item \tcode{SM::extents_type::rank()} equals
-\tcode{\exposid{MAP_RANK}(valid_slices, M_rank)}, and
+\tcode{\placeholder{MAP_RANK}(valid_slices, M_rank)}, and
 \item \tcode{SM::extents_type::index_type} denotes \tcode{IT}.
 \end{itemize}
 
@@ -25803,10 +25791,10 @@
 \begin{itemize}
 \item
   \tcode{smr.mapping.extents() == submdspan_extents(m.extents(), valid_slices...)}
-  is \tcode{true}; and
+  is \tcode{true};\newline and
 \item
   for each integer pack \tcode{i}
-  which is a multidimensional index in \tcode{smr.mapping.extents()},
+  which is a multidimensional index in \tcode{smr.mapping.extents()},\newline
   \tcode{smr.mapping(i...) + smr.offset == m(j)} is \tcode{true},
   where \tcode{j} is an integer pack such that
   \begin{itemize}
@@ -25821,8 +25809,7 @@
       for extent $\rho$ of \tcode{m.extents()}, and
     \item
       zero if the type of \tcode{valid_slices...[$\rho$]} is a collapsing slice type,
-      %FIXME: the comma before "otherwise" seems wrong
-      \tcode{i...[MAP_RANK(valid_slices,$\rho$)]}, otherwise.
+      \tcode{i...[MAP_RANK(valid_slices,$\rho$)]} otherwise.
     \end{itemize}
   \end{itemize}
 \end{itemize}
@@ -25884,15 +25871,14 @@
 an \tcode{array<SubExtents::index_type, SubExtents::rank()>}
 such that for each rank index $k$ of \tcode{extents()}
 for which the type of \tcode{slices...[$k$]} is not a collapsing slice type,
-\tcode{sub_strides[\exposid{MAP_RANK}(slices,$k$)]} equals:
+\tcode{sub_strides[\placeholder{MAP_RANK}(slices,$k$)]} equals:
 \begin{itemize}
 \item
 \tcode{stride(k) * s.stride}
 %FIXME: this doesn't make any sense.
 %How can an lvalue like "s" be the specialization of a type?
 if \tcode{s} is a specialization of \tcode{strided_slice} and
-\tcode{s.stride < s.extent} is \tcode{true}
-%FIXME: comma?
+\tcode{s.stride < s.extent} is \tcode{true},
 where \tcode{s} is \tcode{slices...[$k$]};
 \item
 otherwise, \tcode{stride($k$)}.
@@ -25909,7 +25895,7 @@
 equals \tcode{extents().extent($k$)}
 for any rank index $k$ of \tcode{extents()}, then
 let \tcode{offset} be a value of type \tcode{size_t} equal to
-\tcode{operator().required_span_size()}.
+\tcode{required_span_size()}.
 Otherwise,
 let \tcode{offset} be a value of type \tcode{size_t} equal to
 \tcode{operator()(ls...)}.
@@ -25952,7 +25938,7 @@
   \end{itemize}
 \begin{note}
 If the above conditions are true,
-all \tcode{SpliceSpecifiers...[$k$]} with $k$ larger than \tcode{SubExtents::rank() - 1}
+all \tcode{SpliceSpecifiers...[$k$]} with $k$ larger than \tcode{SubExtents\brk{}::rank\brk{}() - 1}
 are convertible to \tcode{index_type}.
 \end{note}
 \item
@@ -25963,7 +25949,7 @@
 \end{codeblock}
 if for a value $u$ for which $u+1$ is
 the smallest value $p$ larger than zero
-for which \tcode{SliceSpecifiers...[p]} is a unit-stride slice type,
+for which \tcode{SliceSpecifiers...\brk{}[\brk{}p]} is a unit-stride slice type,
 the following conditions are met:
 \begin{itemize}
 \item
@@ -26028,7 +26014,8 @@
   \end{itemize}
 \begin{note}
 If the above conditions are true,
-all \tcode{SliceSpecifiers...[$k$]} with $k < \tcode{\exposid{rank_} - SubExtents::rank()}$
+all \tcode{SliceSpecifiers...[$k$]} with\newline
+$k < \tcode{\exposid{rank_} - SubExtents::rank()}$
 are convertible to \tcode{index_type}.
 \end{note}
 \item
@@ -26137,7 +26124,7 @@
 \end{codeblock}
 if for a value $u$
 for which \tcode{$u$ + 1} is the smallest value $p$ larger than zero
-for which \tcode{SliceSpecifiers...[$p$]} is a unit-stride slice type,
+for which \tcode{Slice\-Speci\-fiers\brk{}...[\brk{}$p$]} is a unit-stride slice type,
 the following conditions are met:
 \begin{itemize}
 \item
@@ -26219,7 +26206,7 @@
 \item
 for each $k$ in the range
 %FIXME: drive-by fix the broken parenthesis
-\range{\exposid{rank_} - SubExtents::rank() - $u$ + 1}{\exposid{rank_} - $u$ - 1)},
+\range{\exposid{rank_} - SubExtents::rank() - $u$ + 1}{\exposid{rank_} - $u$ - 1)},\newline
 \tcode{SliceSpecifiers...[$k$]} denotes \tcode{full_extent_t}; and
 \item
 for $k$ equal to \tcode{\exposid{rank_} - SubExtents::rank() - $u$},\newline