Skip to content

Commit 9ac27f7

Browse files
authored
Merge 2018-06 CWG Motion 8
Fixes #2120
2 parents aa8e85e + 8fe9ae8 commit 9ac27f7

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

source/future.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,7 +2673,7 @@
26732673
\begin{itemize}
26742674
\item
26752675
The facet shall convert between UTF-8 multibyte sequences
2676-
and UCS2 or UCS4 (depending on the size of \tcode{Elem})
2676+
and UCS2 or UTF-32 (depending on the size of \tcode{Elem})
26772677
within the program.
26782678
\item
26792679
Endianness shall not affect how multibyte sequences are read or written.
@@ -2686,7 +2686,7 @@
26862686
\begin{itemize}
26872687
\item
26882688
The facet shall convert between UTF-16 multibyte sequences
2689-
and UCS2 or UCS4 (depending on the size of \tcode{Elem})
2689+
and UCS2 or UTF-32 (depending on the size of \tcode{Elem})
26902690
within the program.
26912691
\item
26922692
Multibyte sequences shall be read or written

source/intro.tex

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
\item ISO/IEC 9899:2011, \doccite{Programming languages --- C}
5151
\item ISO/IEC 9945:2003, \doccite{Information Technology --- Portable
5252
Operating System Interface (POSIX)}
53+
\item ISO/IEC 10646, \doccite{Information technology ---
54+
Universal Coded Character Set (UCS)}
5355
\item ISO/IEC 10646-1:1993, \doccite{Information technology ---
5456
Universal Multiple-Octet Coded Character Set (UCS) --- Part 1:
5557
Architecture and Basic Multilingual Plane}
@@ -77,6 +79,12 @@
7779
hereinafter called \defn{ECMA-262}.
7880
\indextext{references!normative|)}
7981

82+
\pnum
83+
\begin{note}
84+
References to ISO/IEC 10646-1:1993 are used only
85+
to support deprecated features\iref{depr.locale.stdcvt}.
86+
\end{note}
87+
8088
\rSec0[intro.defs]{Terms and definitions}
8189

8290
\pnum

0 commit comments

Comments
 (0)