Skip to content

Commit c6900f9

Browse files
authored
Merge 2019-07 LWG Motions 5, 6, and 7
P0645R10 Text formatting P1361R2 Integration of chrono with text formatting P1652R1 Printf corner cases in std::format Fixes #3009, #3010, #3011.
2 parents 5caa968 + 895f30b commit c6900f9

File tree

6 files changed

+2375
-627
lines changed

6 files changed

+2375
-627
lines changed

source/lib-intro.tex

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,8 +1227,9 @@
12271227
\tcode{<exception>} \\
12281228
\tcode{<execution>} \\
12291229
\tcode{<filesystem>} \\
1230-
\tcode{<forward_list>} \\
1230+
\tcode{<format>} \\
12311231
\columnbreak
1232+
\tcode{<forward_list>} \\
12321233
\tcode{<fstream>} \\
12331234
\tcode{<functional>} \\
12341235
\tcode{<future>} \\
@@ -1246,8 +1247,8 @@
12461247
\tcode{<memory>} \\
12471248
\tcode{<memory_resource>} \\
12481249
\tcode{<mutex>} \\
1249-
\tcode{<new>} \\
12501250
\columnbreak
1251+
\tcode{<new>} \\
12511252
\tcode{<numeric>} \\
12521253
\tcode{<optional>} \\
12531254
\tcode{<ostream>} \\
@@ -1265,8 +1266,8 @@
12651266
\tcode{<stdexcept>} \\
12661267
\tcode{<streambuf>} \\
12671268
\tcode{<string>} \\
1268-
\tcode{<string_view>} \\
12691269
\columnbreak
1270+
\tcode{<string_view>} \\
12701271
\tcode{<strstream>} \\
12711272
\tcode{<syncstream>} \\
12721273
\tcode{<system_error>} \\

source/locales.tex

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4826,11 +4826,13 @@
48264826
\pnum
48274827
\returns
48284828
The specializations required in \tref{locale.spec}\iref{locale.category}, namely
4829-
\tcode{moneypunct<char>},
4830-
\tcode{moneypunct<\brk{}wchar_t>},
4831-
\tcode{moneypunct<char, true>},
4829+
\begin{itemize}
4830+
\item \tcode{moneypunct<char>},
4831+
\item \tcode{moneypunct<wchar_t>},
4832+
\item \tcode{moneypunct<char, true>},
48324833
and
4833-
\tcode{moneypunct<wchar_t, true>},
4834+
\item \tcode{moneypunct<wchar_t, true>},
4835+
\end{itemize}
48344836
return an object of type
48354837
\tcode{pattern}
48364838
initialized to

source/macros.tex

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
\newcommand{\idxcode}[1]{#1@\tcode{#1}}
166166
\newcommand{\idxhdr}[1]{#1@\tcode{<#1>}}
167167
\newcommand{\idxgram}[1]{#1@\gterm{#1}}
168+
\newcommand{\idxterm}[1]{#1@\term{#1}}
168169
\newcommand{\idxxname}[1]{__#1@\xname{#1}}
169170

170171
% class member library index
@@ -331,6 +332,12 @@
331332
\newcommand{\oldconcept}[1]{\textit{Cpp17#1}}
332333
\newcommand{\oldconceptdefn}[1]{\defn{Cpp17#1}}
333334
\newcommand{\idxoldconcept}[1]{Cpp17#1@\textit{Cpp17#1}}
335+
% FIXME: A "new" oldconcept (added after C++17),
336+
% which doesn't get a Cpp17 prefix.
337+
\newcommand{\newoldconcept}[1]{\textit{#1}}
338+
\newcommand{\newoldconceptdefn}[1]{\defn{#1}}
339+
\newcommand{\idxnewoldconcept}[1]{#1@\textit{#1}}
340+
334341
\newcommand{\libconcept}[1]{\tcode{#1}}
335342

336343
%% Ranges

source/support.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,8 @@
592592
\tcode{<execution>} \\ \rowsep
593593
\defnlibxname{cpp_lib_filesystem} & \tcode{201703L} &
594594
\tcode{<filesystem>} \\ \rowsep
595+
\defnlibxname{cpp_lib_format} & \tcode{201907L} &
596+
\tcode{<format>} \\ \rowsep
595597
\defnlibxname{cpp_lib_gcd_lcm} & \tcode{201606L} &
596598
\tcode{<numeric>} \\ \rowsep
597599
\defnlibxname{cpp_lib_generic_associative_lookup} & \tcode{201304L} &

0 commit comments

Comments
 (0)