Merge branch 'cplusplus:main' into cxxdraft-htmlgen-fixes

Author: Eelis

Diff for: source/iostreams.tex

@@ -4946,7 +4946,7 @@
 \pnum
 Characters are extracted and stored until any of the following occurs:
 \begin{itemize}
-\item \tcode{n-1} characters are stored;
+\item \tcode{n - 1} characters are stored;
 \item end of file occurs on the input sequence;
 \item letting \tcode{ct} be \tcode{use_facet<ctype<charT>>(in.getloc())},
 \tcode{ct.is(ct.space, c)} is \tcode{true}.
@@ -8518,9 +8518,9 @@
 the \tcode{basic_stringbuf}'s underlying character sequence in \tcode{buf}:
 \begin{itemize}
 \item If \tcode{ios_base::out} is set in \exposid{mode},
-  then \tcode{sv(pbase(), high_mark-pbase())} is returned.
+  then \tcode{sv(pbase(), high_mark - pbase())} is returned.
 \item Otherwise, if \tcode{ios_base::in} is set in \exposid{mode},
-  then \tcode{sv(eback(), egptr()-eback())} is returned.
+  then \tcode{sv(eback(), egptr() - eback())} is returned.
 \item Otherwise, \tcode{sv()} is returned.
 \end{itemize}
 

Diff for: source/memory.tex

@@ -5818,7 +5818,7 @@
 
 \pnum
 The template parameter \tcode{Allocator} of \tcode{indirect}
-shall meet the \oldconceptname{Allocator} requirements.
+shall meet the \oldconcept{Allocator} requirements.
 
 \pnum
 If a program declares an explicit or partial specialization of \tcode{indirect},
@@ -6478,7 +6478,7 @@
 If
 \tcode{allocator_traits<Allocator>::propagate_on_container_swap::value}
 is \tcode{true}, then
-\tcode{Allocator} meets the \oldconceptname{Swappable} requirements.
+\tcode{Allocator} meets the \oldconcept{Swappable} requirements.
 Otherwise \tcode{get_allocator() == other.\linebreak{}get_allocator()} is \tcode{true}.
 
 \pnum
@@ -6675,7 +6675,7 @@
 
 \pnum
 The template parameter \tcode{Allocator} of \tcode{polymorphic}
-shall meet the requirements of \oldconceptname{Allocator}.
+shall meet the requirements of \oldconcept{Allocator}.
 
 \pnum
 If a program declares an explicit or
@@ -7269,7 +7269,7 @@
 \expects
 If \tcode{allocator_traits<Allocator>::propagate_on_container_swap::value}
 is \tcode{true}, then
-\tcode{Allocator} meets the \oldconceptname{Swappable} requirements.
+\tcode{Allocator} meets the \oldconcept{Swappable} requirements.
 Otherwise \tcode{get_allocator() == other.\linebreak{}get_allocator()} is \tcode{true}.
 
 \pnum

Diff for: source/text.tex

@@ -4276,7 +4276,7 @@
 \end{footnote}
 \begin{codeblock}
 for (int i = 0; i < n; ++i)
-  buf2[i] = src[find(atoms, atoms+sizeof(src), buf1[i]) - atoms];
+  buf2[i] = src[find(atoms, atoms + sizeof(src), buf1[i]) - atoms];
 buf2[n] = 0;
 sscanf(buf2, "%Lf", &units);
 \end{codeblock}
@@ -4434,30 +4434,30 @@
 
       explicit moneypunct(size_t refs = 0);
 
-      charT        decimal_point() const;
-      charT        thousands_sep() const;
-      string       grouping()      const;
-      string_type  curr_symbol()   const;
-      string_type  positive_sign() const;
-      string_type  negative_sign() const;
-      int          frac_digits()   const;
-      pattern      pos_format()    const;
-      pattern      neg_format()    const;
+      charT       decimal_point() const;
+      charT       thousands_sep() const;
+      string      grouping()      const;
+      string_type curr_symbol()   const;
+      string_type positive_sign() const;
+      string_type negative_sign() const;
+      int         frac_digits()   const;
+      pattern     pos_format()    const;
+      pattern     neg_format()    const;
 
       static locale::id id;
       static const bool intl = International;
 
     protected:
       ~moneypunct();
-      virtual charT        do_decimal_point() const;
-      virtual charT        do_thousands_sep() const;
-      virtual string       do_grouping()      const;
-      virtual string_type  do_curr_symbol()   const;
-      virtual string_type  do_positive_sign() const;
-      virtual string_type  do_negative_sign() const;
-      virtual int          do_frac_digits()   const;
-      virtual pattern      do_pos_format()    const;
-      virtual pattern      do_neg_format()    const;
+      virtual charT       do_decimal_point() const;
+      virtual charT       do_thousands_sep() const;
+      virtual string      do_grouping()      const;
+      virtual string_type do_curr_symbol()   const;
+      virtual string_type do_positive_sign() const;
+      virtual string_type do_negative_sign() const;
+      virtual int         do_frac_digits()   const;
+      virtual pattern     do_pos_format()    const;
+      virtual pattern     do_neg_format()    const;
     };
 }
 \end{codeblock}
@@ -4562,15 +4562,15 @@
 \indexlibrarymember{moneypunct}{positive_sign}%
 \indexlibrarymember{moneypunct}{negative_sign}%
 \begin{codeblock}
-charT        decimal_point() const;
-charT        thousands_sep() const;
-string       grouping()      const;
-string_type  curr_symbol()   const;
-string_type  positive_sign() const;
-string_type  negative_sign() const;
-int          frac_digits()   const;
-pattern      pos_format()    const;
-pattern      neg_format()    const;
+charT       decimal_point() const;
+charT       thousands_sep() const;
+string      grouping()      const;
+string_type curr_symbol()   const;
+string_type positive_sign() const;
+string_type negative_sign() const;
+int         frac_digits()   const;
+pattern     pos_format()    const;
+pattern     neg_format()    const;
 \end{codeblock}
 
 \pnum

Diff for: source/time.tex

@@ -2654,8 +2654,8 @@
     static time_point now() noexcept;
 
     // mapping to/from C type \tcode{time_t}
-    static time_t      to_time_t  (const time_point& t) noexcept;
-    static time_point  from_time_t(time_t t) noexcept;
+    static time_t     to_time_t  (const time_point& t) noexcept;
+    static time_point from_time_t(time_t t) noexcept;
   };
 }
 \end{codeblock}

Diff for: source/utilities.tex

@@ -4375,7 +4375,7 @@
 \begin{itemdescr}
 \pnum
 \constraints
-\tcode{F} models \tcode{\libconcept{invocable}<>} and
+\tcode{F} models \libconcept{invocable} and
 \tcode{T} models \libconcept{copy_constructible}.
 
 \pnum
@@ -4402,7 +4402,7 @@
 \begin{itemdescr}
 \pnum
 \constraints
-\tcode{F} models \tcode{\libconcept{invocable}<>} and
+\tcode{F} models \libconcept{invocable} and
 \tcode{T} models \libconcept{move_constructible}.
 
 \pnum