Skip to content

Commit 7c976f5

Browse files
committed
Use cxxdraft-htmlgen macros to annotate non-C++ code and literal fragments.
1 parent b10e4a3 commit 7c976f5

File tree

3 files changed

+352
-352
lines changed

3 files changed

+352
-352
lines changed

source/exceptions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@
135135
Any exception thrown while destroying
136136
\tcode{t2}
137137
will result in executing
138-
\tcode{handler 2};
138+
\noncxxtcode{handler 2};
139139
any exception thrown while destroying
140140
\tcode{t1}
141141
will result in executing
142-
\tcode{handler 1}.
142+
\noncxxtcode{handler 1}.
143143
\end{example}
144144

145145
\pnum

source/lex.tex

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -330,43 +330,43 @@
330330
\ucode{000c} & \uname{form feed} & \\
331331
\ucode{0020} & \uname{space} & \\
332332
\ucode{000a} & \uname{line feed} & new-line \\
333-
\ucode{0021} & \uname{exclamation mark} & \tcode{!} \\
334-
\ucode{0022} & \uname{quotation mark} & \tcode{"} \\
335-
\ucode{0023} & \uname{number sign} & \tcode{\#} \\
336-
\ucode{0024} & \uname{dollar sign} & \tcode{\$} \\
337-
\ucode{0025} & \uname{percent sign} & \tcode{\%} \\
338-
\ucode{0026} & \uname{ampersand} & \tcode{\&} \\
339-
\ucode{0027} & \uname{apostrophe} & \tcode{'} \\
340-
\ucode{0028} & \uname{left parenthesis} & \tcode{(} \\
341-
\ucode{0029} & \uname{right parenthesis} & \tcode{)} \\
342-
\ucode{002a} & \uname{asterisk} & \tcode{*} \\
343-
\ucode{002b} & \uname{plus sign} & \tcode{+} \\
344-
\ucode{002c} & \uname{comma} & \tcode{,} \\
345-
\ucode{002d} & \uname{hyphen-minus} & \tcode{-} \\
346-
\ucode{002e} & \uname{full stop} & \tcode{.} \\
347-
\ucode{002f} & \uname{solidus} & \tcode{/} \\
348-
\ucode{0030} .. \ucode{0039} & \uname{digit zero .. nine} & \tcode{0 1 2 3 4 5 6 7 8 9} \\
349-
\ucode{003a} & \uname{colon} & \tcode{:} \\
350-
\ucode{003b} & \uname{semicolon} & \tcode{;} \\
351-
\ucode{003c} & \uname{less-than sign} & \tcode{<} \\
352-
\ucode{003d} & \uname{equals sign} & \tcode{=} \\
353-
\ucode{003e} & \uname{greater-than sign} & \tcode{>} \\
354-
\ucode{003f} & \uname{question mark} & \tcode{?} \\
355-
\ucode{0040} & \uname{commercial at} & \tcode{@} \\
356-
\ucode{0041} .. \ucode{005a} & \uname{latin capital letter a .. z} & \tcode{A B C D E F G H I J K L M} \\
357-
& & \tcode{N O P Q R S T U V W X Y Z} \\
358-
\ucode{005b} & \uname{left square bracket} & \tcode{[} \\
359-
\ucode{005c} & \uname{reverse solidus} & \tcode{\textbackslash} \\
360-
\ucode{005d} & \uname{right square bracket} & \tcode{]} \\
361-
\ucode{005e} & \uname{circumflex accent} & \tcode{\caret} \\
362-
\ucode{005f} & \uname{low line} & \tcode{_} \\
363-
\ucode{0060} & \uname{grave accent} & \tcode{\`} \\
364-
\ucode{0061} .. \ucode{007a} & \uname{latin small letter a .. z} & \tcode{a b c d e f g h i j k l m} \\
365-
& & \tcode{n o p q r s t u v w x y z} \\
366-
\ucode{007b} & \uname{left curly bracket} & \tcode{\{} \\
367-
\ucode{007c} & \uname{vertical line} & \tcode{|} \\
368-
\ucode{007d} & \uname{right curly bracket} & \tcode{\}} \\
369-
\ucode{007e} & \uname{tilde} & \tcode{\textasciitilde} \\
333+
\ucode{0021} & \uname{exclamation mark} & \noncxxtcode{!} \\
334+
\ucode{0022} & \uname{quotation mark} & \noncxxtcode{"} \\
335+
\ucode{0023} & \uname{number sign} & \noncxxtcode{\#} \\
336+
\ucode{0024} & \uname{dollar sign} & \noncxxtcode{\$} \\
337+
\ucode{0025} & \uname{percent sign} & \noncxxtcode{\%} \\
338+
\ucode{0026} & \uname{ampersand} & \noncxxtcode{\&} \\
339+
\ucode{0027} & \uname{apostrophe} & \noncxxtcode{'} \\
340+
\ucode{0028} & \uname{left parenthesis} & \noncxxtcode{(} \\
341+
\ucode{0029} & \uname{right parenthesis} & \noncxxtcode{)} \\
342+
\ucode{002a} & \uname{asterisk} & \noncxxtcode{*} \\
343+
\ucode{002b} & \uname{plus sign} & \noncxxtcode{+} \\
344+
\ucode{002c} & \uname{comma} & \noncxxtcode{,} \\
345+
\ucode{002d} & \uname{hyphen-minus} & \noncxxtcode{-} \\
346+
\ucode{002e} & \uname{full stop} & \noncxxtcode{.} \\
347+
\ucode{002f} & \uname{solidus} & \noncxxtcode{/} \\
348+
\ucode{0030} .. \ucode{0039} & \uname{digit zero .. nine} & \noncxxtcode{0 1 2 3 4 5 6 7 8 9} \\
349+
\ucode{003a} & \uname{colon} & \noncxxtcode{:} \\
350+
\ucode{003b} & \uname{semicolon} & \noncxxtcode{;} \\
351+
\ucode{003c} & \uname{less-than sign} & \noncxxtcode{<} \\
352+
\ucode{003d} & \uname{equals sign} & \noncxxtcode{=} \\
353+
\ucode{003e} & \uname{greater-than sign} & \noncxxtcode{>} \\
354+
\ucode{003f} & \uname{question mark} & \noncxxtcode{?} \\
355+
\ucode{0040} & \uname{commercial at} & \noncxxtcode{@} \\
356+
\ucode{0041} .. \ucode{005a} & \uname{latin capital letter a .. z} & \noncxxtcode{A B C D E F G H I J K L M} \\
357+
& & \noncxxtcode{N O P Q R S T U V W X Y Z} \\
358+
\ucode{005b} & \uname{left square bracket} & \noncxxtcode{[} \\
359+
\ucode{005c} & \uname{reverse solidus} & \noncxxtcode{\textbackslash} \\
360+
\ucode{005d} & \uname{right square bracket} & \noncxxtcode{]} \\
361+
\ucode{005e} & \uname{circumflex accent} & \noncxxtcode{\caret} \\
362+
\ucode{005f} & \uname{low line} & \noncxxtcode{_} \\
363+
\ucode{0060} & \uname{grave accent} & \noncxxtcode{\`} \\
364+
\ucode{0061} .. \ucode{007a} & \uname{latin small letter a .. z} & \noncxxtcode{a b c d e f g h i j k l m} \\
365+
& & \noncxxtcode{n o p q r s t u v w x y z} \\
366+
\ucode{007b} & \uname{left curly bracket} & \noncxxtcode{\{} \\
367+
\ucode{007c} & \uname{vertical line} & \noncxxtcode{|} \\
368+
\ucode{007d} & \uname{right curly bracket} & \noncxxtcode{\}} \\
369+
\ucode{007e} & \uname{tilde} & \noncxxtcode{\textasciitilde} \\
370370
\end{floattable}
371371

372372
\pnum
@@ -605,15 +605,15 @@
605605
\item
606606
\indextext{literal!string!raw}%
607607
If the next character begins a sequence of characters that could be the prefix
608-
and initial double quote of a raw string literal, such as \tcode{R"}, the next preprocessing
608+
and initial double quote of a raw string literal, such as \literaltcode{R"}, the next preprocessing
609609
token shall be a raw string literal. Between the initial and final
610610
double quote characters of the raw string, any transformations performed in phase
611611
2 (line splicing) are reverted; this reversion
612612
shall apply before any \grammarterm{d-char}, \grammarterm{r-char}, or delimiting
613613
parenthesis is identified. The raw string literal is defined as the shortest sequence
614614
of characters that matches the raw-string pattern
615615
\begin{ncbnf}
616-
\opt{encoding-prefix} \terminal{R} raw-string
616+
\opt{encoding-prefix} \literalterminal{R} raw-string
617617
\end{ncbnf}
618618

619619
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
@@ -748,15 +748,15 @@
748748
\begin{bnf}
749749
\nontermdef{pp-number}\br
750750
digit\br
751-
\terminal{.} digit\br
751+
\literalterminal{.} digit\br
752752
pp-number identifier-continue\br
753-
pp-number \terminal{'} digit\br
754-
pp-number \terminal{'} nondigit\br
755-
pp-number \terminal{e} sign\br
756-
pp-number \terminal{E} sign\br
757-
pp-number \terminal{p} sign\br
758-
pp-number \terminal{P} sign\br
759-
pp-number \terminal{.}
753+
pp-number \literalterminal{'} digit\br
754+
pp-number \literalterminal{'} nondigit\br
755+
pp-number \literalterminal{e} sign\br
756+
pp-number \literalterminal{E} sign\br
757+
pp-number \literalterminal{p} sign\br
758+
pp-number \literalterminal{P} sign\br
759+
pp-number \literalterminal{.}
760760
\end{bnf}
761761

762762
\pnum
@@ -1184,19 +1184,19 @@
11841184
\nontermdef{binary-literal}\br
11851185
\terminal{0b} binary-digit\br
11861186
\terminal{0B} binary-digit\br
1187-
binary-literal \opt{\terminal{'}} binary-digit
1187+
binary-literal \opt{\literalterminal{'}} binary-digit
11881188
\end{bnf}
11891189

11901190
\begin{bnf}
11911191
\nontermdef{octal-literal}\br
11921192
\terminal{0}\br
1193-
octal-literal \opt{\terminal{'}} octal-digit
1193+
octal-literal \opt{\literalterminal{'}} octal-digit
11941194
\end{bnf}
11951195

11961196
\begin{bnf}
11971197
\nontermdef{decimal-literal}\br
11981198
nonzero-digit\br
1199-
decimal-literal \opt{\terminal{'}} digit
1199+
decimal-literal \opt{\literalterminal{'}} digit
12001200
\end{bnf}
12011201

12021202
\begin{bnf}
@@ -1227,14 +1227,14 @@
12271227
\begin{bnf}
12281228
\nontermdef{hexadecimal-digit-sequence}\br
12291229
hexadecimal-digit\br
1230-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1230+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
12311231
\end{bnf}
12321232

12331233
\begin{bnf}
12341234
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1235-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1236-
\terminal{a b c d e f}\br
1237-
\terminal{A B C D E F}
1235+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1236+
\literalterminal{a b c d e f}\br
1237+
\literalterminal{A B C D E F}
12381238
\end{bnf}
12391239

12401240
\begin{bnf}
@@ -1249,17 +1249,17 @@
12491249

12501250
\begin{bnf}
12511251
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1252-
\terminal{u U}
1252+
\literalterminal{u U}
12531253
\end{bnf}
12541254

12551255
\begin{bnf}
12561256
\nontermdef{long-suffix} \textnormal{one of}\br
1257-
\terminal{l L}
1257+
\literalterminal{l L}
12581258
\end{bnf}
12591259

12601260
\begin{bnf}
12611261
\nontermdef{long-long-suffix} \textnormal{one of}\br
1262-
\terminal{ll LL}
1262+
\literalterminal{ll LL}
12631263
\end{bnf}
12641264

12651265
\begin{bnf}
@@ -1298,7 +1298,7 @@
12981298

12991299
\pnum
13001300
The \grammarterm{hexadecimal-digit}s
1301-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1301+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
13021302
have decimal values ten through fifteen.
13031303
\begin{example}
13041304
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1342,7 +1342,7 @@
13421342
&
13431343
&
13441344
\tcode{unsigned long long int}\\\hline
1345-
\tcode{u} or \tcode{U} &
1345+
\literaltcode{u} or \literaltcode{U} &
13461346
\tcode{unsigned int} &
13471347
\tcode{unsigned int}\\
13481348
&
@@ -1351,7 +1351,7 @@
13511351
&
13521352
\tcode{unsigned long long int} &
13531353
\tcode{unsigned long long int}\\\hline
1354-
\tcode{l} or \tcode{L} &
1354+
\literaltcode{l} or \literaltcode{L} &
13551355
\tcode{long int} &
13561356
\tcode{long int}\\
13571357
&
@@ -1363,22 +1363,22 @@
13631363
&
13641364
&
13651365
\tcode{unsigned long long int}\\\hline
1366-
Both \tcode{u} or \tcode{U} &
1366+
Both \literaltcode{u} or \literaltcode{U} &
13671367
\tcode{unsigned long int} &
13681368
\tcode{unsigned long int}\\
1369-
and \tcode{l} or \tcode{L} &
1369+
and \literaltcode{l} or \literaltcode{L} &
13701370
\tcode{unsigned long long int} &
13711371
\tcode{unsigned long long int}\\\hline
1372-
\tcode{ll} or \tcode{LL} &
1372+
\literaltcode{ll} or \literaltcode{LL} &
13731373
\tcode{long long int} &
13741374
\tcode{long long int}\\
13751375
&
13761376
&
13771377
\tcode{unsigned long long int}\\\hline
1378-
Both \tcode{u} or \tcode{U} &
1378+
Both \literaltcode{u} or \literaltcode{U} &
13791379
\tcode{unsigned long long int} &
13801380
\tcode{unsigned long long int}\\
1381-
and \tcode{ll} or \tcode{LL} &
1381+
and \literaltcode{ll} or \literaltcode{LL} &
13821382
&
13831383
\\\hline
13841384
\tcode{z} or \tcode{Z} &
@@ -1426,12 +1426,12 @@
14261426
\indextext{literal!character}%
14271427
\begin{bnf}
14281428
\nontermdef{character-literal}\br
1429-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1429+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
14301430
\end{bnf}
14311431

14321432
\begin{bnf}
14331433
\nontermdef{encoding-prefix} \textnormal{one of}\br
1434-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1434+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
14351435
\end{bnf}
14361436

14371437
\begin{bnf}
@@ -1461,12 +1461,12 @@
14611461

14621462
\begin{bnf}
14631463
\nontermdef{simple-escape-sequence}\br
1464-
\terminal{\textbackslash} simple-escape-sequence-char
1464+
\literalterminal{\textbackslash} simple-escape-sequence-char
14651465
\end{bnf}
14661466

14671467
\begin{bnf}
14681468
\nontermdef{simple-escape-sequence-char} \textnormal{one of}\br
1469-
\terminal{' " ? \textbackslash{} a b f n r t v}
1469+
\literalterminal{' " ? \textbackslash{} a b f n r t v}
14701470
\end{bnf}
14711471

14721472
\begin{bnf}
@@ -1482,21 +1482,21 @@
14821482

14831483
\begin{bnf}
14841484
\nontermdef{octal-escape-sequence}\br
1485-
\terminal{\textbackslash} octal-digit\br
1486-
\terminal{\textbackslash} octal-digit octal-digit\br
1487-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1488-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}
1485+
\literalterminal{\textbackslash} octal-digit\br
1486+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1487+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1488+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}
14891489
\end{bnf}
14901490

14911491
\begin{bnf}
14921492
\nontermdef{hexadecimal-escape-sequence}\br
1493-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1494-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1493+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1494+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14951495
\end{bnf}
14961496

14971497
\begin{bnf}
14981498
\nontermdef{conditional-escape-sequence}\br
1499-
\terminal{\textbackslash} conditional-escape-sequence-char
1499+
\literalterminal{\textbackslash} conditional-escape-sequence-char
15001500
\end{bnf}
15011501

15021502
\begin{bnf}
@@ -1679,42 +1679,42 @@
16791679

16801680
\begin{bnf}
16811681
\nontermdef{fractional-constant}\br
1682-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1683-
digit-sequence \terminal{.}
1682+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1683+
digit-sequence \literalterminal{.}
16841684
\end{bnf}
16851685

16861686
\begin{bnf}
16871687
\nontermdef{hexadecimal-fractional-constant}\br
1688-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1689-
hexadecimal-digit-sequence \terminal{.}
1688+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1689+
hexadecimal-digit-sequence \literalterminal{.}
16901690
\end{bnf}
16911691

16921692
\begin{bnf}
16931693
\nontermdef{exponent-part}\br
1694-
\terminal{e} \opt{sign} digit-sequence\br
1695-
\terminal{E} \opt{sign} digit-sequence
1694+
\literalterminal{e} \opt{sign} digit-sequence\br
1695+
\literalterminal{E} \opt{sign} digit-sequence
16961696
\end{bnf}
16971697

16981698
\begin{bnf}
16991699
\nontermdef{binary-exponent-part}\br
1700-
\terminal{p} \opt{sign} digit-sequence\br
1701-
\terminal{P} \opt{sign} digit-sequence
1700+
\literalterminal{p} \opt{sign} digit-sequence\br
1701+
\literalterminal{P} \opt{sign} digit-sequence
17021702
\end{bnf}
17031703

17041704
\begin{bnf}
17051705
\nontermdef{sign} \textnormal{one of}\br
1706-
\terminal{+ -}
1706+
\literalterminal{+ -}
17071707
\end{bnf}
17081708

17091709
\begin{bnf}
17101710
\nontermdef{digit-sequence}\br
17111711
digit\br
1712-
digit-sequence \opt{\terminal{'}} digit
1712+
digit-sequence \opt{\literalterminal{'}} digit
17131713
\end{bnf}
17141714

17151715
\begin{bnf}
17161716
\nontermdef{floating-point-suffix} \textnormal{one of}\br
1717-
\terminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
1717+
\literalterminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
17181718
\end{bnf}
17191719

17201720
\pnum
@@ -1799,8 +1799,8 @@
17991799
\indextext{literal!string}%
18001800
\begin{bnf}
18011801
\nontermdef{string-literal}\br
1802-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1803-
\opt{encoding-prefix} \terminal{R} raw-string
1802+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1803+
\opt{encoding-prefix} \literalterminal{R} raw-string
18041804
\end{bnf}
18051805

18061806
\begin{bnf}
@@ -1823,7 +1823,7 @@
18231823

18241824
\begin{bnf}
18251825
\nontermdef{raw-string}\br
1826-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1826+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
18271827
\end{bnf}
18281828

18291829
\begin{bnf}
@@ -1910,7 +1910,7 @@
19101910

19111911
\pnum
19121912
\indextext{literal!string!raw}%
1913-
A \grammarterm{string-literal} that has an \tcode{R}
1913+
A \grammarterm{string-literal} that has an \literaltcode{R}
19141914
\indextext{prefix!\idxcode{R}}%
19151915
in the prefix is a \defn{raw string literal}. The
19161916
\grammarterm{d-char-sequence} serves as a delimiter. The terminating

0 commit comments

Comments
 (0)