[everywhere] Number notes and examples, make them one point smaller, and

move them to (un-numbered) paragraphs of their own.

Partially addresses ISO/CS 016 (C++20 DIS).

Author: zygoloid

source/algorithms.tex

@@ -4390,7 +4390,7 @@
 \begin{note}
 For the overload with an \tcode{ExecutionPolicy},
 there may be a performance cost
-if \tcode{iterator_traits<ForwardIterator1>::value_type}
+if \tcode{iterator_traits<For\-ward\-It\-er\-ator1>::value_type}
 is not \oldconcept{\-Move\-Constructible} (\tref{cpp17.moveconstructible}).
 \end{note}
 
@@ -9726,7 +9726,7 @@
 \pnum
 \begin{note}
 The difference between \tcode{transform_exclusive_scan} and
-\tcode{transform_inclusive_scan} is that \tcode{transform_exclusive_scan}
+\tcode{transform_inclusive_scan} is that \tcode{trans\-form\-_\-exclusive_scan}
 excludes the $i^\text{th}$ input element from the $i^\text{th}$ sum.
 If \tcode{binary_op} is not mathematically associative,
 the behavior of \tcode{transform_exclusive_scan} may be nondeterministic.
@@ -9830,7 +9830,7 @@
 \pnum
 \begin{note}
 The difference between \tcode{transform_exclusive_scan} and
-\tcode{transform_inclusive_scan} is that \tcode{transform_inclusive_scan}
+\tcode{transform_inclusive_scan} is that \tcode{trans\-form\-_\-inclusive_scan}
 includes the $i^\text{th}$ input element in the $i^\text{th}$ sum.
 If \tcode{binary_op} is not mathematically associative,
 the behavior of \tcode{transform_inclusive_scan} may be nondeterministic.

source/containers.tex

@@ -336,9 +336,13 @@
 or until the allocator is replaced. The allocator may be replaced only via assignment or
 \tcode{swap()}. Allocator replacement is performed by
 copy assignment, move assignment, or swapping of the allocator only if
-\tcode{allocator_traits<allocator_type>::propagate_on_container_copy_assignment::value},
-\tcode{allocator_traits<allocator_type>::propagate_on_container_move_assignment::value},
-or \tcode{alloca\-tor_traits<allocator_type>::propagate_on_container_swap::value} is \tcode{true}
+\begin{itemize}
+\item \tcode{allocator_traits<allocator_type>::propagate_on_container_copy_assignment::value},
+\item \tcode{allocator_traits<allocator_type>::propagate_on_container_move_assignment::value},
+or
+\item \tcode{allocator_traits<allocator_type>::propagate_on_container_swap::value}
+\end{itemize}
+is \tcode{true}
 within the implementation of the corresponding container operation.
 In all container types defined in this Clause, the member \tcode{get_allocator()}
 returns a copy of the allocator used to construct the container or, if that allocator

source/expressions.tex

@@ -4551,7 +4551,7 @@
 fundamental types
 other than \tcode{char}, \tcode{signed char}, and \tcode{unsigned char}}.
 \begin{note}
-In particular, \tcode{sizeof(bool)}, \tcode{sizeof(char16_t)},
+In particular, the values of \tcode{sizeof(bool)}, \tcode{sizeof(char16_t)},
 \tcode{sizeof(char32_t)}, and \tcode{sizeof(wchar_t)} are
 implementation-defined.\footnote{\tcode{sizeof(bool)} is not required to be \tcode{1}.}
 \end{note}

source/future.tex

@@ -2665,9 +2665,9 @@
 \begin{note}
 The example above is representative of
 a historical use of \tcode{filesystem::u8path}.
-Passing a \tcode{std::u8string} to \tcode{path}'s constructor is preferred
-for an indication of UTF-8 encoding more consistent with
-\tcode{path}'s handling of other encodings.
+To indicate a UTF-8 encoding,
+passing a \tcode{std::u8string} to \tcode{path}'s constructor is preferred
+as it is consistent with \tcode{path}'s handling of other encodings.
 \end{note}
 \end{itemdescr}
 

source/intro.tex

@@ -913,13 +913,6 @@
 published description, and explains in detail the differences between
 \Cpp{} and C\@. Certain features of \Cpp{} exist solely for compatibility
 purposes; \ref{depr} describes those features.
-
-\pnum
-Throughout this document, each example is introduced by
-``\noteintro{Example}'' and terminated by ``\noteoutro{example}''. Each note is
-introduced by ``\noteintro{Note}'' or ``\noteintro{Note $n$ to entry}'' and
-terminated by ``\noteoutro{note}''. Examples
-and notes may be nested.%
 \indextext{standard!structure of|)}
 
 \rSec1[syntax]{Syntax notation}

source/iostreams.tex

@@ -14883,8 +14883,9 @@
 
 \pnum
 \begin{note}
-To iterate over the current directory, use \tcode{recursive_directory_iterator(".")}
- rather than \tcode{recursive_directory_iterator("")}.
+Use \tcode{recursive_directory_iterator(".")}
+rather than \tcode{recursive_directory_iterator("")}
+to iterate over the current directory.
 \end{note}
 
 \pnum

source/layout.tex

@@ -65,8 +65,13 @@
 }}}
 \makeatother
 
-\def\pnum
-{\parabullnum{Paras}{0pt}}
+% Register our intent to number the next paragraph. Don't actually number it
+% yet, because we might have a paragraph break before we see its contents (for
+% example, if the paragraph begins with a note or example).
+\def\pnum{%
+\global\def\maybeaddpnum{\global\def\maybeaddpnum{}\parabullnum{Paras}{0pt}}%
+\everypar=\expandafter{\the\everypar\maybeaddpnum}%
+}
 
 % Leave more room for section numbers in TOC
 \cftsetindents{section}{1.5em}{3.0em}

source/locales.tex

@@ -228,7 +228,9 @@
 \begin{itemize}
 \item
 A member operator template
-\tcode{operator()(const basic_string<C, T, A>\&, const basic_string<\brk{}C, T, A>\&)}
+\begin{codeblock}
+operator()(const basic_string<C, T, A>&, const basic_string<C, T, A>&)
+\end{codeblock}
 is provided so that a locale may be used as a predicate argument to
 the standard collections, to collate strings.
 \item

source/macros.tex

@@ -91,7 +91,8 @@
       \or\let\s=\paragraph\let\l=\label
       \or\let\s=\subparagraph\let\l=\label
       \fi%
-\s[#3]{#3\hfill[#2]}\l{#2}\addxref{#2}}
+\s[#3]{#3\hfill[#2]}\l{#2}\addxref{#2}%
+\setcounter{note}{0}\setcounter{example}{0}}
 
 % A convenience feature (mostly for the convenience of the Project
 % Editor, to make it easy to move around large blocks of text):
@@ -266,10 +267,16 @@
 \newcommand{\leftshift}[1]{\ensuremath{\mathbin{\mathsf{lshift}_{#1}}}}
 
 %% Notes and examples
+\newcounter{note}
+\newcounter{example}
 \newcommand{\noteintro}[1]{[\textit{#1}:\space}
 \newcommand{\noteoutro}[1]{\textit{\,---\,end #1}\kern.5pt]}
-\newenvironment{note}[1][Note]{\noteintro{#1}}{\noteoutro{note}\space}
-\newenvironment{example}[1][Example]{\noteintro{#1}}{\noteoutro{example}\space}
+\newenvironment{note}[1][Note]
+{\par\small\addtocounter{note}{1}\noteintro{#1 \thenote}}
+{\noteoutro{note}\par}
+\newenvironment{example}[1][Example]
+{\par\small\addtocounter{example}{1}\noteintro{#1 \theexample}}
+{\noteoutro{example}\par}
 
 %% Library function descriptions
 \newcommand{\Fundescx}[1]{\textit{#1}}
@@ -635,4 +642,6 @@
 \let\addcontentsline\oldcontentsline%
 }
 \newcommand{\defncontext}[1]{\textlangle#1\textrangle}
-\newenvironment{defnote}{\addtocounter{termnote}{1}\noteintro{Note \thetermnote{} to entry}}{\noteoutro{note}\space}
+\newenvironment{defnote}
+{\small\addtocounter{termnote}{1}\noteintro{Note \thetermnote{} to entry}}
+{\noteoutro{note}\space}

source/ranges.tex

@@ -516,7 +516,7 @@
 \pnum
 \begin{note}
 Whenever \tcode{ranges::cend(E)} is a valid expression,
-the types \tcode{S} and \tcode{I} of
+the types \tcode{S} and \tcode{I} of the expressions
 \tcode{ranges::cend(E)} and \tcode{ranges::cbegin(E)}
 model \tcode{\libconcept{sentinel_for}<S, I>}.
 \end{note}
@@ -652,7 +652,7 @@
 \pnum
 \begin{note}
 Whenever \tcode{ranges::rend(E)} is a valid expression,
-the types \tcode{S} and \tcode{I} of
+the types \tcode{S} and \tcode{I} of the expressions
 \tcode{ranges::rend(E)} and \tcode{ranges::rbegin(E)}
 model \tcode{\libconcept{sentinel_for}<S, I>}.
 \end{note}
@@ -690,7 +690,7 @@
 \pnum
 \begin{note}
 Whenever \tcode{ranges::crend(E)} is a valid expression,
-the types \tcode{S} and \tcode{I} of
+the types \tcode{S} and \tcode{I} of the expressions
 \tcode{ranges::crend(E)} and \tcode{ranges::crbegin(E)}
 model \tcode{\libconcept{sentinel_for}<S, I>}.
 \end{note}