FIXUP

Author: tkoeppe

source/exec.tex

@@ -186,7 +186,7 @@
 \item
 once started, eventually completes exactly once
 with a (possibly empty) set of result datums and
-in exactly one of three \defnx{disposition}{dispositions}:
+in exactly one of three \defnx{dispositions}{disposition}:
 success, failure, or cancellation;
 \begin{itemize}
 \item

source/threads.tex

@@ -491,16 +491,6 @@
 are called when a stop request is first made
 by any associated \exposconcept{stoppable-source} object.
 
-\pnum
-Calls to the functions \tcode{request_stop}, \tcode{stop_requested},
-and \tcode{stop_possible}
-do not introduce data races.
-A call to \tcode{request_stop} that returns \tcode{true}
-synchronizes with a call to \tcode{stop_requested}
-on an associated \tcode{stop_token} or \tcode{stop_source} object
-that returns \tcode{true}.
-Registration of a callback synchronizes with the invocation of that callback.
-
 \pnum
 The types \tcode{stop_source} and \tcode{stop_token} and
 the class template \tcode{stop_callback} implement
@@ -526,7 +516,7 @@
 namespace std {
   // \ref{stoptoken.concepts}, stop token concepts
   template<class CallbackFn, class Token, class Initializer = CallbackFn>
-    concept @\exposconcept{stoppable-callback-for}@ = @\seebelow@;               // \expos
+    concept @\exposconcept{stoppable-callback-for}@ = @\seebelow@;           // \expos
 
   template<class Token>
     concept @\libconcept{stoppable_token}@ = @\seebelow@;
@@ -535,7 +525,7 @@
     concept @\libconcept{unstoppable_token}@ = @\seebelow@;
 
   template<class Source>
-    concept @\exposconcept{stoppable-source}@ = @\seebelow@;           // \expos
+    concept @\exposconcept{stoppable-source}@ = @\seebelow@;                 // \expos
 
   // \ref{stoptoken}, class \tcode{stop_token}
   class stop_token;
@@ -578,7 +568,7 @@
 checks for a callback compatible with a given \tcode{Token} type.
 \begin{codeblock}
 template<class CallbackFn, class Token, class Initializer = CallbackFn>
-  concept @\defexposconcept{stoppable-callback-for}@ =                              // \expos
+  concept @\defexposconcept{stoppable-callback-for}@ =                          // \expos
     @\libconcept{invocable}@<CallbackFn> &&
     @\libconcept{constructible_from}@<CallbackFn, Initializer> &&
     requires { typename stop_callback_for_t<Token, CallbackFn>; } &&
@@ -878,7 +868,10 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{\exposid{stop-state}.swap(rhs.\exposid{stop-state})}.
+Equivalent to:
+\begin{codeblock}
+@\exposid{stop-state}@.swap(rhs.@\exposid{stop-state}@);
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{stop_requested}{stop_token}%
@@ -980,7 +973,10 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to \tcode{\exposid{stop-state}.swap(rhs.\exposid{stop-state})}.
+Equivalent to:
+\begin{codeblock}
+@\exposid{stop-state}@.swap(rhs.@\exposid{stop-state}@);
+\end{codeblock}
 \end{itemdescr}
 
 \indexlibrarymember{get_token}{stop_source}%
@@ -1005,7 +1001,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{\exposid{stop-state} != nullptr}.
+\tcode{\exposidnc{stop-state} != nullptr}.
 \end{itemdescr}
 
 \indexlibrarymember{stop_requested}{stop_source}%
@@ -1093,11 +1089,12 @@
 \indexlibraryctor{stop_callback}%
 \begin{itemdecl}
 template<class Initializer>
-explicit stop_callback(const stop_token& st, Initializer&& init)
-  noexcept(is_nothrow_constructible_v<CallbackFn, Initializer>);
+  explicit stop_callback(const stop_token& st, Initializer&& init)
+    noexcept(is_nothrow_constructible_v<CallbackFn, Initializer>);
+
 template<class Initializer>
-explicit stop_callback(stop_token&& st, Initializer&& init)
-  noexcept(is_nothrow_constructible_v<CallbackFn, Initializer>);
+  explicit stop_callback(stop_token&& st, Initializer&& init)
+    noexcept(is_nothrow_constructible_v<CallbackFn, Initializer>);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -1223,7 +1220,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{\exposid{stop-source} != nullptr}.
+\tcode{\exposidnc{stop-source} != nullptr}.
 
 \pnum
 \begin{note}