Further cherry-picks for the c++20 branch

source/atomics.tex

@@ -2240,7 +2240,7 @@
   bitwise exclusive or  \\
 \tcode{and}       &
   \tcode{\&}      &
-  bitwise and     &&&\\\hline
+  bitwise and     &&&\\
 \end{floattable}
 
 \indexlibraryglobal{atomic_fetch_add}%
@@ -2585,7 +2585,7 @@
   addition        &
 \tcode{sub}       &
   \tcode{-}       &
-  subtraction     \\ \hline
+  subtraction     \\
 \end{floattable}
 
 \indexlibraryglobal{atomic_fetch_add}%

source/containers.tex

@@ -27,7 +27,7 @@
   \tcode{<unordered_map>}, \tcode{<unordered_set>}    \\ \rowsep
 \ref{container.adaptors}     & Container adaptors               &
   \tcode{<queue>}, \tcode{<stack>}     \\ \rowsep
-\ref{views}                  & Views                            & \tcode{<span>} \\ \rowsep
+\ref{views}                  & Views                            & \tcode{<span>} \\
 \end{libsumtab}
 
 
@@ -415,7 +415,7 @@
 \tcode{a.crend()}         &
  \tcode{const_reverse_iterator}     &
  \tcode{const_cast<X const\&>(a).rend()} &
- constant                   \\ \rowsep
+ constant                   \\
 \end{libreqtab4a}
 
 \pnum

source/diagnostics.tex

@@ -18,7 +18,7 @@
 \ref{std.exceptions}  & Exception classes     &   \tcode{<stdexcept>}     \\ \rowsep
 \ref{assertions}      & Assertions            &   \tcode{<cassert>}       \\ \rowsep
 \ref{errno}           & Error numbers         &   \tcode{<cerrno>}        \\ \rowsep
-\ref{syserr}          & System error support  &   \tcode{<system_error>}  \\ \rowsep
+\ref{syserr}          & System error support  &   \tcode{<system_error>}  \\
 \end{libsumtab}
 
 \rSec1[std.exceptions]{Exception classes}

source/iostreams.tex

@@ -1728,7 +1728,7 @@
 \tcode{p - q}   &
  \tcode{streamoff}      &
  distance       &
- \tcode{p == q + (p - q)}   \\ \rowsep
+ \tcode{p == q + (p - q)}   \\
 \end{libreqtab4c}
 
 \pnum
@@ -13720,7 +13720,7 @@
   \recommended
   For POSIX-based systems, native and generic formats are equivalent
   and the character sequence should always be interpreted in the same way.
-\\\rowsep
+\\
 \end{floattable}
 
 \rSec3[fs.enum.file.type]{Enum class \tcode{file_type}}
@@ -13882,7 +13882,7 @@
   \tcode{all | set_uid | set_gid | sticky_bit} \\ \rowsep
 \tcode{unknown} & \tcode{0xFFFF} &  &
   The permissions are not known, such as when a \tcode{file_status} object
-  is created without specifying the permissions \\ \rowsep
+  is created without specifying the permissions \\
 \end{floattable}
 
 \rSec3[fs.enum.perm.opts]{Enum class \tcode{perm_options}}

source/iterators.tex

@@ -356,8 +356,8 @@
 
   template<class Iterator1, class Iterator2>
     constexpr auto operator-(
-    const move_iterator<Iterator1>& x,
-    const move_iterator<Iterator2>& y) -> decltype(x.base() - y.base());
+      const move_iterator<Iterator1>& x, const move_iterator<Iterator2>& y)
+        -> decltype(x.base() - y.base());
   template<class Iterator>
     constexpr move_iterator<Iterator>
       operator+(iter_difference_t<Iterator> n, const move_iterator<Iterator>& x);
@@ -4483,9 +4483,9 @@
 \indexlibrarymember{operator-}{move_iterator}%
 \begin{itemdecl}
 template<class Iterator1, class Iterator2>
-  constexpr auto operator-(const move_iterator<Iterator1>& x,
-                           const move_iterator<Iterator2>& y)
-    -> decltype(x.base() - y.base());
+  constexpr auto operator-(
+    const move_iterator<Iterator1>& x, const move_iterator<Iterator2>& y)
+      -> decltype(x.base() - y.base());
 template<@\libconcept{sized_sentinel_for}@<Iterator> S>
   friend constexpr iter_difference_t<Iterator>
     operator-(const move_sentinel<S>& x, const move_iterator& y);

source/lex.tex

@@ -1915,7 +1915,7 @@
 If \placeholder{S} contains a raw literal operator,
 the literal \placeholder{L} is treated as a call of the form
 \begin{codeblock}
-operator "" @\placeholder{X}@(@"\placeholder{n}{"}@)
+operator "" @\placeholder{X}@("@\placeholder{n}@")
 \end{codeblock}
 Otherwise (\placeholder{S} contains a numeric literal operator template),
 \placeholder{L} is treated as a call of the form
@@ -1941,7 +1941,7 @@
 If \placeholder{S} contains a raw literal operator,
 the \grammarterm{literal} \placeholder{L} is treated as a call of the form
 \begin{codeblock}
-operator "" @\placeholder{X}@(@"\placeholder{f}{"}@)
+operator "" @\placeholder{X}@("@\placeholder{f}@")
 \end{codeblock}
 Otherwise (\placeholder{S} contains a numeric literal operator template),
 \placeholder{L} is treated as a call of the form

source/lib-intro.tex

@@ -1203,7 +1203,7 @@
 \ref{concepts}           & Concepts library          & \tcode{<concepts>}         \\ \rowsep
 \ref{meta}               & Type traits               & \tcode{<type_traits>}      \\ \rowsep
 \ref{bit}                & Bit manipulation          & \tcode{<bit>}              \\ \rowsep
-\ref{atomics}            & Atomics                   & \tcode{<atomic>}           \\ \rowsep
+\ref{atomics}            & Atomics                   & \tcode{<atomic>}           \\
 \end{libsumtab}
 
 \pnum
@@ -1635,7 +1635,7 @@
   \tcode{!(a == np)}          \\
 \tcode{np != a}               &
                               &
-                              \\ \rowsep
+                              \\
 \end{oldconcepttable}
 
 \rSec3[hash.requirements]{\oldconcept{Hash} requirements}

source/preprocessor.tex

@@ -1777,7 +1777,7 @@
 \defnxname{cpp_using_enum}                        & \tcode{201907L} \\ \rowsep
 \defnxname{cpp_variable_templates}                & \tcode{201304L} \\ \rowsep
 \defnxname{cpp_variadic_templates}                & \tcode{200704L} \\ \rowsep
-\defnxname{cpp_variadic_using}                    & \tcode{201611L} \\ \rowsep
+\defnxname{cpp_variadic_using}                    & \tcode{201611L} \\
 \end{LongTable}
 
 \pnum

source/ranges.tex

@@ -6678,7 +6678,7 @@
 
 \indexlibrarymember{operator-}{elements_view::iterator}%
 \begin{itemdecl}
-constexpr @\exposid{iterator}@ operator-(const @\exposid{iterator}@& x, difference_type y)
+friend constexpr @\exposid{iterator}@ operator-(const @\exposid{iterator}@& x, difference_type y)
   requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
 \end{itemdecl}
 
@@ -6690,7 +6690,7 @@
 
 \indexlibrarymember{operator-}{elements_view::iterator}%
 \begin{itemdecl}
-constexpr difference_type operator-(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
+friend constexpr difference_type operator-(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
   requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
 \end{itemdecl}
 

source/regex.tex

@@ -1215,7 +1215,7 @@
 \tcode{"s"}      & \tcode{L"s"}      & \tcode{ctype_base::space}  \\ \rowsep
 \tcode{"upper"}  & \tcode{L"upper"}  & \tcode{ctype_base::upper}  \\ \rowsep
 \tcode{"w"}      & \tcode{L"w"}      & \tcode{ctype_base::alnum}  \\ \rowsep
-\tcode{"xdigit"} & \tcode{L"xdigit"} & \tcode{ctype_base::xdigit} \\ \rowsep
+\tcode{"xdigit"} & \tcode{L"xdigit"} & \tcode{ctype_base::xdigit} \\
 \end{floattable}
 
 \rSec1[re.regex]{Class template \tcode{basic_regex}}

source/time.tex

@@ -21,7 +21,7 @@
 \ref{time.zone}             & Time zones                         & \\
 \ref{time.format}           & Formatting                         & \\
 \ref{time.parse}            & Parsing                            & \\ \rowsep
-\ref{ctime.syn}             & C library time utilities           & \tcode{<ctime>} \\ \rowsep
+\ref{ctime.syn}             & C library time utilities           & \tcode{<ctime>} \\
 \end{libsumtab}
 
 \pnum

source/utilities.tex

@@ -19183,6 +19183,7 @@
   using format_parse_context = basic_format_parse_context<char>;
   using wformat_parse_context = basic_format_parse_context<wchar_t>;
 
+  // \ref{format.context}, class template \tcode{basic_format_context}
   template<class Out, class charT> class basic_format_context;
   using format_context = basic_format_context<@\unspec@, char>;
   using wformat_context = basic_format_context<@\unspec@, wchar_t>;