Editorial changes based on feedback

.gitignore

@@ -0,0 +1 @@
+.DS_Store

src/.gitignore

@@ -4,3 +4,5 @@
 *.ind
 ts.*
 !ts.tex
+
+*DS_Store*

src/basicconcepts.tex

@@ -58,4 +58,4 @@
 
 \rSec0[conv]{Standard conversions}
 
-No changes are made to Clause \the\value{chapter} of the \Cpp Standard.
+ISO/IEC 14882:2020, Clause \the\value{chapter} applies.

src/compatibility.tex

@@ -29,5 +29,5 @@
 \added{The \tcode{reflexpr} keyword is added to introduce meta-data through a \grammarterm{reflexpr-specifier}.}
 \effect
 Valid ISO \CppXIV{} code using \tcode{concept}\removed{ or}\added{,} \tcode{requires}\added{, or \tcode{reflexpr}}
-as an identifier is not valid in this International Standard.
+as an identifier is not valid in this document.
 \end{std.txt}

src/config.tex

@@ -2,6 +2,7 @@
 %%--------------------------------------------------
 %% Version numbers
 \newcommand{\docno}{N4856}
+\newcommand{\isodocno}{ISO/IEC 23619:2021(E)}
 \newcommand{\prevdocno}{N4818}
 \newcommand{\tsver}{201902}
 
@@ -13,6 +14,6 @@
 \newcommand{\reldate}{\today}
 % \newcommand{\reldate}{2018-04-04}
 
-\newcommand{\copyrightyear}{2020}
+\newcommand{\copyrightyear}{2021}
 
 %% Library chapters

src/cover-wd.tex

@@ -6,6 +6,7 @@
 \thispagestyle{empty}
 \begingroup
 \def\hd{\begin{tabular}{ll}
+          \textbf{ISO Document:} & {\larger\isodocno}             \\
           \textbf{Document Number:} & {\larger\docno}             \\
           \textbf{Date:}            & \reldate                    \\
           \textbf{Revises:}         & \prevdocno                  \\

src/declarations.tex

@@ -105,7 +105,7 @@
 
 Insert the following subclause:
 
-\begin{std.txt}\color{addclr}
+\begin{std.txt}
 
     \pnum
     The \grammarterm{reflexpr-specifier} yields a type \tcode{T} that allows

src/declarators.tex

@@ -15,20 +15,20 @@
 
 \rSec0[class]{Classes}
 
-No changes are made to Clause \the\value{chapter} of the \Cpp Standard.
+ISO/IEC 14882:2020, Clause \the\value{chapter} applies.
 
 \rSec0[class.derived]{Derived classes}
 
-No changes are made to Clause \the\value{chapter} of the \Cpp Standard.
+ISO/IEC 14882:2020, Clause \the\value{chapter} applies.
 
 \rSec0[class.access]{Member access control}
 
-No changes are made to Clause \the\value{chapter} of the \Cpp Standard.
+ISO/IEC 14882:2020, Clause \the\value{chapter} applies.
 
 \rSec0[special]{Special member functions}
 
-No changes are made to Clause \the\value{chapter} of the \Cpp Standard.
+ISO/IEC 14882:2020, Clause \the\value{chapter} applies.
 
 \rSec0[over]{Overloading}
 
-No changes are made to Clause \the\value{chapter} of the \Cpp Standard.
+ISO/IEC 14882:2020, Clause \the\value{chapter} applies.

src/definitions.tex

@@ -1,13 +1,13 @@
 %!TEX root = ts.tex
 
-\rSec1[intro.defs]{Terms and definitions}
+\rSec0[defs]{Terms and definitions}
 
 \pnum
 \indextext{definitions|(}%
 No terms and definitions are listed in this document. ISO and IEC maintain
 terminological databases for use in standardization at the following addresses:
 
 \begin{itemize}
-    \item IEC Electropedia: available at \url{http://www.electropedia.org/}
-    \item ISO Online browsing platform: available at \url{http://www.iso.org/obp}
+    \item IEC Electropedia: available at http://www.electropedia.org/
+    \item ISO Online browsing platform: available at http://www.iso.org/obp
 \end{itemize}

src/expressions.tex

@@ -77,4 +77,4 @@
 
 \rSec0[stmt.stmt]{Statements}
 
-No changes are made to Clause \the\value{chapter} of the \Cpp Standard.
+ISO/IEC 14882:2020, Clause \the\value{chapter} applies.

src/foreword.tex

@@ -0,0 +1,16 @@
+%!TEX root = ts.tex
+
+\rSec0[foreword]{Foreword}
+
+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.
+
+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 www.iso.org/directives).
+
+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 www.iso.org/patents) or the IEC list of patent declarations received (see http://patents.iec.ch).
+
+Any trade name used in this document is information given for the convenience of users and does not constitute an endorsement.
+
+For an explanation on 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 www.iso.org/iso/foreword.html.
+
+This document was prepared by Joint Technical Committee ISO/IEC JTC 1, \textit{Information technology}, Subcommittee SC 22, \textit{Programming languages, their environments and system software interfaces}.
+

src/front.tex

@@ -10,6 +10,7 @@
 %% within it (per ISO request) but do include a
 %% bookmark for it in the PDF.
 \phantomsection
+\setcounter{page}{3}
 \pdfbookmark{\contentsname}{toctarget}
 \hypertarget{toctarget}{\tableofcontents*}
 

src/general.tex

@@ -1,22 +1,24 @@
 %!TEX root = ts.tex
 
-\rSec1[intro.compliance]{Implementation compliance}
+\rSec0[general]{General}
+
+\rSec1[general.compliance]{Implementation compliance}
 
 \pnum
-Conformance requirements for this specification are those defined in subclause
-\ref{intro.compliance} in the C++ Standard. Similarly, all references to the C++ Standard in the
+Conformance requirements for this document are those defined in subclause
+\ref{general.compliance} in the C++ Standard. Similarly, all references to the C++ Standard in the
 resulting document shall be taken as referring to the resulting document itself.
 \begin{note}
 Conformance is defined in terms of the behavior of programs.
 \end{note}
 
-\rSec1[intro.namespaces]{Namespaces and headers}
+\rSec1[general.namespaces]{Namespaces and headers}
 
 \pnum
 Whenever a name \tcode{x} declared in subclause \ref{reflect} at namespace scope
 is mentioned, the name \tcode{x} is assumed to be fully qualified as
 \tcode{::std::experimental::reflect::v1::x}, unless otherwise specified.
-The header described in this specification (see Table~\ref{tab:info.headers})
+The header described in this document (see Table~\ref{tab:info.headers})
 shall import the contents of \tcode{::std::experimental::reflect::v1} into
 \tcode{::std::experimental::reflect} as if by:
 
@@ -37,10 +39,10 @@
 \tcode{<experimental/reflect>} \\
 \end{floattable}
 
-\rSec1[intro.features]{Feature-testing recommendations}
+\rSec1[general.features]{Feature-testing recommendations}
 
 \pnum
-An implementation that provides support for this Technical Specification shall define each feature test macro defined in \tref{intro.features} if no associated headers are indicated for that macro, and if associated headers are indicated for a macro, that macro is defined after inclusion of one of the corresponding headers specified in the table.
+An implementation that provides support for this document shall define each feature test macro defined in \tref{intro.features} if no associated headers are indicated for that macro, and if associated headers are indicated for a macro, that macro is defined after inclusion of one of the corresponding headers specified in the table.
 
 \begin{floattable}{Feature-test macros}{tab:intro.features}
 {lll}
@@ -50,13 +52,3 @@
 \tcode{__cpp_reflection}  & \tcode{\tsver}   &  none \\
 \tcode{__cpp_lib_reflection}  & \tcode{\tsver}  & \tcode{<experimental/reflect>} \\
 \end{floattable}
-
-\rSec1[intro.ack]{Acknowledgements}
-
-\pnum
-This work is the result of a collaboration of researchers in industry and
-academia.  We wish to thank the original authors of this TS, Mat\'{u}\v{s}
-Chochl\'{i}k, Axel Naumann, and David Sankel. We also wish to thank people who
-made valuable contributions within and outside these groups, including Ricardo
-Fabiano de Andrade, Roland Bock, Chandler Carruth, Jackie Kay, A. Joël Lamotte,
-Jens Maurer, and many others not named here who contributed to the discussion.