Fixes to TS v2 as requested by ISO

Author: jaredhoberock

README.md

@@ -1,28 +1,27 @@
-    Document Number: N4774
-    Date:            2018-10-08
+    Document Number: NXXXX+1
+    Date:            2018-XX-XX
     Revises:
     Project:         Programming Language C++
     Project Number:  TS 19570
     Reply-to:        Jared Hoberock
                      NVIDIA Corporation
                      [email protected]
 
-# Parallelism TS Editor's Report, pre-San Diego mailing 
+# Parallelism TS Editor's Report, post-San Diego mailing 
 
-N4773 is the proposed working draft of Parallelism TS Version 2. It contains editorial changes to the Parallelism TS working draft.
+NXXXX is the proposed working draft of Parallelism TS Version 2. It contains editorial changes to the Parallelism TS working draft.
 
-N4773 updates the previous draft, N4755, published in the post-Rapperswil mailing.
+NXXXX updates the previous draft, N4473, published in the pre-San Diego mailing.
 
 ## Normative Changes
 
-* None.
+XXX TODO
 
 ## Editorial Changes
 
-* Eliminate mistakenly applied `noexcept` from `copy_to` and `copy_from`.
-* Various typographical corrections.
+* Various changes requested by ISO.
 
 # Acknowledgements
 
-Thanks to Matthias Kretz for correcting `copy_to` and `copy_from` and Hubert Tong for submitting editorial changes.
+Thanks to Hubert Tong, Richard Smith, Casey Carter, and Jens Maurer for ISO-approved wording suggestions.
 

src/algorithms.tex

@@ -5,7 +5,7 @@
 \rSec1[parallel.alg.wavefront]{Wavefront Application}
 
 \pnum
-For the purposes of this section, an \defn{evaluation} is a value
+For the purposes of this subclause, an \defn{evaluation} is a value
 computation or side effect of an expression, or an execution of a statement.
 Initialization of a temporary object is considered a subexpression of the
 expression that necessitates the temporary object.
@@ -57,7 +57,7 @@
 In the following, $X_i$ and $X_j$ refer to evaluations of the same expression
 or statement contained in the application of an element access function
 corresponding to the $i^\text{th}$ and $j^\text{th}$ elements of the input sequence.
-\begin{note}There might be several evaluations $X_k$, $Y_k$, etc. of a single
+\begin{note}There can be several evaluations $X_k$, $Y_k$, etc. of a single
 expression or statement in application $k$, for example, if the expression or
 statement appears in a loop within the element access function.\end{note}
 
@@ -182,7 +182,7 @@
 \pnum
 An algorithm uses reduction objects by allocating an unspecified number
 of instances, known as \defn{accumulators}, of the reduction value type. \begin{note}An
-implementation might, for example, allocate an accumulator for each thread in
+implementation can, for example, allocate an accumulator for each thread in
 its private thread pool.\end{note} Each accumulator is initialized with the
 object's reduction identity, except that the live-out object (which was
     initialized by the caller) comprises one of the accumulators. The algorithm
@@ -280,7 +280,7 @@
 \rSec2[parallel.alg.inductions]{Inductions}
 
 \pnum
-Each of the function templates in this section return an \defn{induction object} of unspecified type having an \defn{induction value type} and encapsulating an initial value $i$ of that type and, optionally, a $stride$.
+Each of the function templates in this subclause return an \defn{induction object} of unspecified type having an \defn{induction value type} and encapsulating an initial value $i$ of that type and, optionally, a $stride$.
 
 \pnum
 For each element in the input range, an algorithm over input sequence $S$ computes an \defn{induction value} from an induction variable and ordinal position $p$ within $S$ by the formula $i + p * stride$ if a stride was specified or $i + p$ otherwise. This induction value is passed to the element access function.
@@ -349,7 +349,7 @@
 The first argument to $f$ is an element from the input sequence.\begin{note}If \tcode{I} is an iterator type, the iterators in the input sequence are not dereferenced before being passed to $f$.\end{note} For each member of the \tcode{rest} parameter pack excluding $f$, an additional argument is passed to each application of $f$ as follows:
 
 \begin{itemize}
-\item If the pack member is an object returned by a call to a reduction function listed in section \ref{parallel.alg.reductions}, then the additional argument is a reference to an accumulator of that reduction object.
+\item If the pack member is an object returned by a call to a reduction function listed in subclause \ref{parallel.alg.reductions}, then the additional argument is a reference to an accumulator of that reduction object.
 
 \item If the pack member is an object returned by a call to \tcode{induction}, then the additional argument is the induction value for that induction object corresponding to the position of the application of $f$ in the input sequence.
 \end{itemize}

src/config-reg.tex

@@ -0,0 +1,16 @@
+%!TEX root = ts.tex
+%%--------------------------------------------------
+%% Version numbers
+\newcommand{\docno}{ISO/IEC TS 19570:2018(E)}
+\newcommand{\prevdocno}{N4755}
+\newcommand{\tsver}{201806}
+
+%% Title
+\newcommand{\doctitle}{\Cpp Extensions for Parallelism Version 2}
+
+%% Release date
+\newcommand{\reldate}{2018-10-08}
+
+\newcommand{\copyrightyear}{2018}
+
+%% Library chapters

src/config.tex renamed to src/config-wd.tex

@@ -7,10 +7,8 @@
 
 %% Title
 \newcommand{\doctitle}{\Cpp Extensions for Parallelism Version 2}
-% \newcommand{\frtitle}{\Cpp Extensions for Parallelism Version 2}
 
 %% Release date
-%\newcommand{\reldate}{\today}
 \newcommand{\reldate}{2018-10-08}
 
 \newcommand{\copyrightyear}{2018}

src/cover-reg.tex

@@ -22,6 +22,8 @@
 
 \vfill
 
+% bring the title a quarter page down as requested by ISO
+\vspace{2.75in}
 \textbf{\LARGE Programming Languages --- \doctitle}
 
 % Langages de programmation --- \frtitle

src/executionpolicies.tex

@@ -93,6 +93,5 @@
 
 \pnum
 The header \tcode{<experimental/execution>} declares a global object
-associated with each type of execution policy defined by this Technical
-Specification.
+associated with each type of execution policy defined by this document.
 

src/foreword.tex

@@ -0,0 +1,64 @@
+%!TEX root = ts.tex
+
+\rSec0[parallel.foreword]{Foreword}
+
+\pnum
+ISO (the International Organization for Standardization) and IEC (the
+    International Electrotechnical Commission) form the specialized system for
+worldwide standardization. National bodies that are members of ISO or IEC
+participate in the development of International Standards through technical
+committees established by the respective organization to deal with particular
+fields of technical activity. ISO and IEC technical committees collaborate in
+fields of mutual interest. Other international organizations, governmental and
+non-governmental, in liaison with ISO and IEC, also take part in the work. In
+the field of information technology, ISO and IEC have established a joint
+technical committee, ISO/IEC JTC 1.
+
+\pnum
+The procedures used to develop this document and those intended for its
+further maintenance are described in the ISO/IEC Directives, Part 1. In
+particular, the different approval criteria needed for the different types of
+document should be noted. This document was drafted in accordance with the
+editorial rules of the ISO/IEC Directives, Part 2 (see \url{www.iso.org/directives}).
+
+\pnum
+Attention is drawn to the possibility that some of the elements of this
+document may be the subject of patent rights. ISO and IEC shall not be held
+responsible for identifying any or all such patent rights. Details of any
+patent rights identified during the development of the document will be in the
+Introduction and/or on the ISO list of patent declarations received (see
+    \url{www.iso.org/patents}).
+
+\pnum
+Any trade name used in this document is information given for the convenience
+of users and does not constitute an endorsement.
+
+\pnum
+For an explanation of the voluntary nature of standards, the meaning of ISO
+specific terms and expressions related to conformity assessment, as well as
+information about ISO's adherence to the World Trade Organization (WTO)
+principles in the Technical Barriers to Trade (TBT) see
+\url{www.iso.org/iso/foreword.html}.
+
+\pnum
+This document was prepared by Technical Committee ISO/IEC JTC 1, \textit{Information
+technology}, Subcommittee SC 22, \textit{Programming languages, their environments and
+system software interfaces}.
+
+\pnum
+This second edition cancels and replaces the first edition (ISO/IEC 19570:2015)
+which has been technically revised.
+
+\pnum
+The main changes compared to the previous edition are as follows:
+
+\begin{itemize}
+  \item Eliminate previously standardized functionality.
+  \item Introduce task block.
+  \item Introduce vector and wavefront policies.
+  \item Introduce a template library for parallel for loops.
+  \item Introduce data-parallel vector types.
+\end{itemize}
+
+Any feedback or questions on this document should be directed to the user's national standards body. A complete listing of these bodies can be found at \url{www.iso.org/members.html}.
+

src/front-reg.tex

@@ -0,0 +1,17 @@
+%!TEX root = ts.tex
+\input{cover-reg}
+
+%%--------------------------------------------------
+%% The table of contents
+% \markboth{\contentsname}{}
+
+%% Include table of contents. Do not list "Contents"
+%% within it (per ISO request) but do include a
+%% bookmark for it in the PDF.
+\phantomsection
+\pdfbookmark{\contentsname}{toctarget}
+\hypertarget{toctarget}{\tableofcontents*}
+
+\setcounter{tocdepth}{5}
+
+\input{foreword}

src/front.tex renamed to src/front-wd.tex

@@ -1,6 +1,5 @@
 %!TEX root = ts.tex
 \input{cover-wd}
-% \input{cover-reg}
 
 %%--------------------------------------------------
 %% The table of contents
@@ -15,4 +14,4 @@
 
 \setcounter{tocdepth}{5}
 
-%\input{preface}
+\input{foreword}

src/general.tex

@@ -4,25 +4,25 @@
 
 \rSec1[parallel.general.namespaces]{Namespaces and headers}
 
-\pnum Since the extensions described in this Technical Specification are
+\pnum Since the extensions described in this document are
 experimental and not part of the \Cpp Standard Library, they should not be
 declared directly within namespace \tcode{std}. Unless otherwise specified, all
-components described in this Technical Specification are declared in namespace
+components described in this document are declared in namespace
 \tcode{std\colcol{}experimental\colcol{}parallelism_v2}.
 
-\begin{note}Once standardized, the components described by this Technical
-Specification are expected to be promoted to namespace \tcode{std}.\end{note}
+\begin{note}Once standardized, the components described by this document
+are expected to be promoted to namespace \tcode{std}.\end{note}
 
 \pnum
-Each header described in this technical specification shall import the contents of \tcode{std\colcol{}experimental\colcol{}parallelism_v2} into \tcode{std\colcol{}experimental} as if by
+Each header described in this document shall import the contents of \tcode{std\colcol{}experimental\colcol{}parallelism_v2} into \tcode{std\colcol{}experimental} as if by
 \begin{codeblock}
 namespace std::experimental {
   inline namespace parallelism_v2 {}
 }
 \end{codeblock}
 
 \pnum Unless otherwise specified, references to such entities described in this
-Technical Specification are assumed to be qualified with
+document are assumed to be qualified with
 \tcode{std::experimental::parallelism_v2}, and references to entities described
 in the \Cpp Standard Library are assumed to be qualified with \tcode{std::}.
 
@@ -34,12 +34,12 @@
 
 \rSec1[parallel.general.features]{Feature-testing recommendations}
 
-\pnum An implementation that provides support for this Technical Specification shall define the feature test macro(s) in \tref{tab:parallel.general.features}.
+\pnum An implementation that provides support for this document shall define the feature test macro(s) in \tref{tab:parallel.general.features}.
 
 \begin{floattable}{Feature-test macro(s)}{tab:parallel.general.features}
   { x{2.1cm} | x{1cm} | x{4.4cm} | c | x{5.35cm} }
 \topline
-\lhdr{Title} & \chdr{Section} & \chdr{Macro Name} & \chdr{Value} & \rhdr{Header} \\
+\lhdr{Title} & \chdr{Subclause} & \chdr{Macro Name} & \chdr{Value} & \rhdr{Header} \\
 \capsep
 Task Block & \ref{parallel.taskblock} & \tcode{__cpp_lib_experimental_parallel_task_block} & 201711 & \tcode{<experimental/exception_list> \ <experimental/task_block>} \\
 \hline