Skip to content

Commit bfdd1ee

Browse files
EelisEelis
committed
Use cxxdraft-htmlgen macros to annotate non-C++ code and literal fragments.
1 parent cf050ce commit bfdd1ee

File tree

3 files changed

+349
-349
lines changed

3 files changed

+349
-349
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: 88 additions & 88 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
@@ -603,15 +603,15 @@
603603
\item
604604
\indextext{literal!string!raw}%
605605
If the next character begins a sequence of characters that could be the prefix
606-
and initial double quote of a raw string literal, such as \tcode{R"}, the next preprocessing
606+
and initial double quote of a raw string literal, such as \literaltcode{R"}, the next preprocessing
607607
token shall be a raw string literal. Between the initial and final
608608
double quote characters of the raw string, any transformations performed in phase
609609
2 (line splicing) are reverted; this reversion
610610
shall apply before any \grammarterm{d-char}, \grammarterm{r-char}, or delimiting
611611
parenthesis is identified. The raw string literal is defined as the shortest sequence
612612
of characters that matches the raw-string pattern
613613
\begin{ncbnf}
614-
\opt{encoding-prefix} \terminal{R} raw-string
614+
\opt{encoding-prefix} \literalterminal{R} raw-string
615615
\end{ncbnf}
616616

617617
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
@@ -746,15 +746,15 @@
746746
\begin{bnf}
747747
\nontermdef{pp-number}\br
748748
digit\br
749-
\terminal{.} digit\br
749+
\literalterminal{.} digit\br
750750
pp-number identifier-continue\br
751-
pp-number \terminal{'} digit\br
752-
pp-number \terminal{'} nondigit\br
753-
pp-number \terminal{e} sign\br
754-
pp-number \terminal{E} sign\br
755-
pp-number \terminal{p} sign\br
756-
pp-number \terminal{P} sign\br
757-
pp-number \terminal{.}
751+
pp-number \literalterminal{'} digit\br
752+
pp-number \literalterminal{'} nondigit\br
753+
pp-number \literalterminal{e} sign\br
754+
pp-number \literalterminal{E} sign\br
755+
pp-number \literalterminal{p} sign\br
756+
pp-number \literalterminal{P} sign\br
757+
pp-number \literalterminal{.}
758758
\end{bnf}
759759

760760
\pnum
@@ -1182,19 +1182,19 @@
11821182
\nontermdef{binary-literal}\br
11831183
\terminal{0b} binary-digit\br
11841184
\terminal{0B} binary-digit\br
1185-
binary-literal \opt{\terminal{'}} binary-digit
1185+
binary-literal \opt{\literalterminal{'}} binary-digit
11861186
\end{bnf}
11871187

11881188
\begin{bnf}
11891189
\nontermdef{octal-literal}\br
11901190
\terminal{0}\br
1191-
octal-literal \opt{\terminal{'}} octal-digit
1191+
octal-literal \opt{\literalterminal{'}} octal-digit
11921192
\end{bnf}
11931193

11941194
\begin{bnf}
11951195
\nontermdef{decimal-literal}\br
11961196
nonzero-digit\br
1197-
decimal-literal \opt{\terminal{'}} digit
1197+
decimal-literal \opt{\literalterminal{'}} digit
11981198
\end{bnf}
11991199

12001200
\begin{bnf}
@@ -1225,14 +1225,14 @@
12251225
\begin{bnf}
12261226
\nontermdef{hexadecimal-digit-sequence}\br
12271227
hexadecimal-digit\br
1228-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1228+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
12291229
\end{bnf}
12301230

12311231
\begin{bnf}
12321232
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1233-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1234-
\terminal{a b c d e f}\br
1235-
\terminal{A B C D E F}
1233+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1234+
\literalterminal{a b c d e f}\br
1235+
\literalterminal{A B C D E F}
12361236
\end{bnf}
12371237

12381238
\begin{bnf}
@@ -1247,17 +1247,17 @@
12471247

12481248
\begin{bnf}
12491249
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1250-
\terminal{u U}
1250+
\literalterminal{u U}
12511251
\end{bnf}
12521252

12531253
\begin{bnf}
12541254
\nontermdef{long-suffix} \textnormal{one of}\br
1255-
\terminal{l L}
1255+
\literalterminal{l L}
12561256
\end{bnf}
12571257

12581258
\begin{bnf}
12591259
\nontermdef{long-long-suffix} \textnormal{one of}\br
1260-
\terminal{ll LL}
1260+
\literalterminal{ll LL}
12611261
\end{bnf}
12621262

12631263
\begin{bnf}
@@ -1296,7 +1296,7 @@
12961296

12971297
\pnum
12981298
The \grammarterm{hexadecimal-digit}s
1299-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1299+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
13001300
have decimal values ten through fifteen.
13011301
\begin{example}
13021302
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1340,7 +1340,7 @@
13401340
&
13411341
&
13421342
\tcode{unsigned long long int}\\\hline
1343-
\tcode{u} or \tcode{U} &
1343+
\literaltcode{u} or \literaltcode{U} &
13441344
\tcode{unsigned int} &
13451345
\tcode{unsigned int}\\
13461346
&
@@ -1349,7 +1349,7 @@
13491349
&
13501350
\tcode{unsigned long long int} &
13511351
\tcode{unsigned long long int}\\\hline
1352-
\tcode{l} or \tcode{L} &
1352+
\literaltcode{l} or \literaltcode{L} &
13531353
\tcode{long int} &
13541354
\tcode{long int}\\
13551355
&
@@ -1361,22 +1361,22 @@
13611361
&
13621362
&
13631363
\tcode{unsigned long long int}\\\hline
1364-
Both \tcode{u} or \tcode{U} &
1364+
Both \literaltcode{u} or \literaltcode{U} &
13651365
\tcode{unsigned long int} &
13661366
\tcode{unsigned long int}\\
1367-
and \tcode{l} or \tcode{L} &
1367+
and \literaltcode{l} or \literaltcode{L} &
13681368
\tcode{unsigned long long int} &
13691369
\tcode{unsigned long long int}\\\hline
1370-
\tcode{ll} or \tcode{LL} &
1370+
\literaltcode{ll} or \literaltcode{LL} &
13711371
\tcode{long long int} &
13721372
\tcode{long long int}\\
13731373
&
13741374
&
13751375
\tcode{unsigned long long int}\\\hline
1376-
Both \tcode{u} or \tcode{U} &
1376+
Both \literaltcode{u} or \literaltcode{U} &
13771377
\tcode{unsigned long long int} &
13781378
\tcode{unsigned long long int}\\
1379-
and \tcode{ll} or \tcode{LL} &
1379+
and \literaltcode{ll} or \literaltcode{LL} &
13801380
&
13811381
\\\hline
13821382
\tcode{z} or \tcode{Z} &
@@ -1424,12 +1424,12 @@
14241424
\indextext{literal!character}%
14251425
\begin{bnf}
14261426
\nontermdef{character-literal}\br
1427-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1427+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
14281428
\end{bnf}
14291429

14301430
\begin{bnf}
14311431
\nontermdef{encoding-prefix} \textnormal{one of}\br
1432-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1432+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
14331433
\end{bnf}
14341434

14351435
\begin{bnf}
@@ -1480,16 +1480,16 @@
14801480

14811481
\begin{bnf}
14821482
\nontermdef{octal-escape-sequence}\br
1483-
\terminal{\textbackslash} octal-digit\br
1484-
\terminal{\textbackslash} octal-digit octal-digit\br
1485-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1486-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}
1483+
\literalterminal{\textbackslash} octal-digit\br
1484+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1485+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1486+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}
14871487
\end{bnf}
14881488

14891489
\begin{bnf}
14901490
\nontermdef{hexadecimal-escape-sequence}\br
1491-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1492-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1491+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1492+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14931493
\end{bnf}
14941494

14951495
\begin{bnf}
@@ -1677,42 +1677,42 @@
16771677

16781678
\begin{bnf}
16791679
\nontermdef{fractional-constant}\br
1680-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1681-
digit-sequence \terminal{.}
1680+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1681+
digit-sequence \literalterminal{.}
16821682
\end{bnf}
16831683

16841684
\begin{bnf}
16851685
\nontermdef{hexadecimal-fractional-constant}\br
1686-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1687-
hexadecimal-digit-sequence \terminal{.}
1686+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1687+
hexadecimal-digit-sequence \literalterminal{.}
16881688
\end{bnf}
16891689

16901690
\begin{bnf}
16911691
\nontermdef{exponent-part}\br
1692-
\terminal{e} \opt{sign} digit-sequence\br
1693-
\terminal{E} \opt{sign} digit-sequence
1692+
\literalterminal{e} \opt{sign} digit-sequence\br
1693+
\literalterminal{E} \opt{sign} digit-sequence
16941694
\end{bnf}
16951695

16961696
\begin{bnf}
16971697
\nontermdef{binary-exponent-part}\br
1698-
\terminal{p} \opt{sign} digit-sequence\br
1699-
\terminal{P} \opt{sign} digit-sequence
1698+
\literalterminal{p} \opt{sign} digit-sequence\br
1699+
\literalterminal{P} \opt{sign} digit-sequence
17001700
\end{bnf}
17011701

17021702
\begin{bnf}
17031703
\nontermdef{sign} \textnormal{one of}\br
1704-
\terminal{+ -}
1704+
\literalterminal{+ -}
17051705
\end{bnf}
17061706

17071707
\begin{bnf}
17081708
\nontermdef{digit-sequence}\br
17091709
digit\br
1710-
digit-sequence \opt{\terminal{'}} digit
1710+
digit-sequence \opt{\literalterminal{'}} digit
17111711
\end{bnf}
17121712

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

17181718
\pnum
@@ -1797,8 +1797,8 @@
17971797
\indextext{literal!string}%
17981798
\begin{bnf}
17991799
\nontermdef{string-literal}\br
1800-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1801-
\opt{encoding-prefix} \terminal{R} raw-string
1800+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1801+
\opt{encoding-prefix} \literalterminal{R} raw-string
18021802
\end{bnf}
18031803

18041804
\begin{bnf}
@@ -1821,7 +1821,7 @@
18211821

18221822
\begin{bnf}
18231823
\nontermdef{raw-string}\br
1824-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1824+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
18251825
\end{bnf}
18261826

18271827
\begin{bnf}
@@ -1908,7 +1908,7 @@
19081908

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

0 commit comments

Comments
 (0)