NB GB-67 (C++17 CD): [charname] [lex.name]: Integrate Annex E contents

into description of identifiers.

Author: zygoloid

source/charname.tex

@@ -549,10 +549,10 @@
 An identifier is an arbitrarily long sequence of letters and digits.
 Each \grammarterm{universal-character-name} in an identifier shall designate a
 character whose encoding in ISO 10646 falls into one of the ranges
-specified in~\ref{charname.allowed}.
+specified in Table~\ref{tab:charname.allowed}.
 The initial element shall not be a \grammarterm{universal-character-name}
 designating a character whose encoding falls into one of the ranges
-specified in~\ref{charname.disallowed}.
+specified in Table~\ref{tab:charname.disallowed}.
 Upper- and lower-case letters are
 different. All characters are significant.\footnote{On systems in which linkers cannot accept extended
 characters, an encoding of the \grammarterm{universal-character-name} may be used in
@@ -564,6 +564,66 @@
 identifiers. In \Cpp, upper- and lower-case letters are considered
 different for all identifiers, including external identifiers. }
 
+\begin{floattable}{Ranges of characters allowed}{tab:charname.allowed}
+{lllll}
+\topline
+\tcode{00A8} &
+\tcode{00AA} &
+\tcode{00AD} &
+\tcode{00AF} &
+\tcode{00B2-00B5} \\
+\tcode{00B7-00BA} &
+\tcode{00BC-00BE} &
+\tcode{00C0-00D6} &
+\tcode{00D8-00F6} &
+\tcode{00F8-00FF} \\
+\tcode{0100-167F} &
+\tcode{1681-180D} &
+\tcode{180F-1FFF} &&\\
+\tcode{200B-200D} &
+\tcode{202A-202E} &
+\tcode{203F-2040} &
+\tcode{2054} &
+\tcode{2060-206F} \\
+\tcode{2070-218F} &
+\tcode{2460-24FF} &
+\tcode{2776-2793} &
+\tcode{2C00-2DFF} &
+\tcode{2E80-2FFF} \\
+\tcode{3004-3007} &
+\tcode{3021-302F} &
+\tcode{3031-D7FF} && \\
+\tcode{F900-FD3D} &
+\tcode{FD40-FDCF} &
+\tcode{FDF0-FE44} &
+\tcode{FE47-FFFD} & \\
+\tcode{10000-1FFFD} &
+\tcode{20000-2FFFD} &
+\tcode{30000-3FFFD} &
+\tcode{40000-4FFFD} &
+\tcode{50000-5FFFD} \\
+\tcode{60000-6FFFD} &
+\tcode{70000-7FFFD} &
+\tcode{80000-8FFFD} &
+\tcode{90000-9FFFD} &
+\tcode{A0000-AFFFD} \\
+\tcode{B0000-BFFFD} &
+\tcode{C0000-CFFFD} &
+\tcode{D0000-DFFFD} &
+\tcode{E0000-EFFFD} &
+\\
+\end{floattable}
+
+\begin{floattable}{Ranges of characters disallowed initially (combining characters)}{tab:charname.disallowed}
+{llll}
+\topline
+\tcode{0300-036F} &
+% FIXME: Unicode v7 adds 1AB0-1AFF
+\tcode{1DC0-1DFF} &
+\tcode{20D0-20FF} &
+\tcode{FE20-FE2F} \\
+\end{floattable}
+
 \pnum
 The identifiers in Table~\ref{tab:identifiers.special} have a special meaning when
 appearing in a certain context. When referred to in the grammar, these identifiers

source/lex.tex

@@ -132,7 +132,6 @@
 \include{limits}
 \include{compatibility}
 \include{future}
-\include{charname}
 
 %%--------------------------------------------------
 %% back matter