Skip to content

Commit 7c8e0d8

Browse files
EelisEelis
committed
Use cxxdraft-htmlgen macros to annotate non-C++ code and literal fragments.
1 parent 42044fd commit 7c8e0d8

File tree

3 files changed

+351
-351
lines changed

3 files changed

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

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

622622
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
@@ -751,15 +751,15 @@
751751
\begin{bnf}
752752
\nontermdef{pp-number}\br
753753
digit\br
754-
\terminal{.} digit\br
754+
\literalterminal{.} digit\br
755755
pp-number identifier-continue\br
756-
pp-number \terminal{'} digit\br
757-
pp-number \terminal{'} nondigit\br
758-
pp-number \terminal{e} sign\br
759-
pp-number \terminal{E} sign\br
760-
pp-number \terminal{p} sign\br
761-
pp-number \terminal{P} sign\br
762-
pp-number \terminal{.}
756+
pp-number \literalterminal{'} digit\br
757+
pp-number \literalterminal{'} nondigit\br
758+
pp-number \literalterminal{e} sign\br
759+
pp-number \literalterminal{E} sign\br
760+
pp-number \literalterminal{p} sign\br
761+
pp-number \literalterminal{P} sign\br
762+
pp-number \literalterminal{.}
763763
\end{bnf}
764764

765765
\pnum
@@ -1172,19 +1172,19 @@
11721172
\nontermdef{binary-literal}\br
11731173
\terminal{0b} binary-digit\br
11741174
\terminal{0B} binary-digit\br
1175-
binary-literal \opt{\terminal{'}} binary-digit
1175+
binary-literal \opt{\literalterminal{'}} binary-digit
11761176
\end{bnf}
11771177

11781178
\begin{bnf}
11791179
\nontermdef{octal-literal}\br
11801180
\terminal{0}\br
1181-
octal-literal \opt{\terminal{'}} octal-digit
1181+
octal-literal \opt{\literalterminal{'}} octal-digit
11821182
\end{bnf}
11831183

11841184
\begin{bnf}
11851185
\nontermdef{decimal-literal}\br
11861186
nonzero-digit\br
1187-
decimal-literal \opt{\terminal{'}} digit
1187+
decimal-literal \opt{\literalterminal{'}} digit
11881188
\end{bnf}
11891189

11901190
\begin{bnf}
@@ -1215,14 +1215,14 @@
12151215
\begin{bnf}
12161216
\nontermdef{hexadecimal-digit-sequence}\br
12171217
hexadecimal-digit\br
1218-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1218+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
12191219
\end{bnf}
12201220

12211221
\begin{bnf}
12221222
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1223-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1224-
\terminal{a b c d e f}\br
1225-
\terminal{A B C D E F}
1223+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1224+
\literalterminal{a b c d e f}\br
1225+
\literalterminal{A B C D E F}
12261226
\end{bnf}
12271227

12281228
\begin{bnf}
@@ -1237,17 +1237,17 @@
12371237

12381238
\begin{bnf}
12391239
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1240-
\terminal{u U}
1240+
\literalterminal{u U}
12411241
\end{bnf}
12421242

12431243
\begin{bnf}
12441244
\nontermdef{long-suffix} \textnormal{one of}\br
1245-
\terminal{l L}
1245+
\literalterminal{l L}
12461246
\end{bnf}
12471247

12481248
\begin{bnf}
12491249
\nontermdef{long-long-suffix} \textnormal{one of}\br
1250-
\terminal{ll LL}
1250+
\literalterminal{ll LL}
12511251
\end{bnf}
12521252

12531253
\begin{bnf}
@@ -1286,7 +1286,7 @@
12861286

12871287
\pnum
12881288
The \grammarterm{hexadecimal-digit}s
1289-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1289+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
12901290
have decimal values ten through fifteen.
12911291
\begin{example}
12921292
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1330,7 +1330,7 @@
13301330
&
13311331
&
13321332
\tcode{unsigned long long int}\\\hline
1333-
\tcode{u} or \tcode{U} &
1333+
\literaltcode{u} or \literaltcode{U} &
13341334
\tcode{unsigned int} &
13351335
\tcode{unsigned int}\\
13361336
&
@@ -1339,7 +1339,7 @@
13391339
&
13401340
\tcode{unsigned long long int} &
13411341
\tcode{unsigned long long int}\\\hline
1342-
\tcode{l} or \tcode{L} &
1342+
\literaltcode{l} or \literaltcode{L} &
13431343
\tcode{long int} &
13441344
\tcode{long int}\\
13451345
&
@@ -1351,22 +1351,22 @@
13511351
&
13521352
&
13531353
\tcode{unsigned long long int}\\\hline
1354-
Both \tcode{u} or \tcode{U} &
1354+
Both \literaltcode{u} or \literaltcode{U} &
13551355
\tcode{unsigned long int} &
13561356
\tcode{unsigned long int}\\
1357-
and \tcode{l} or \tcode{L} &
1357+
and \literaltcode{l} or \literaltcode{L} &
13581358
\tcode{unsigned long long int} &
13591359
\tcode{unsigned long long int}\\\hline
1360-
\tcode{ll} or \tcode{LL} &
1360+
\literaltcode{ll} or \literaltcode{LL} &
13611361
\tcode{long long int} &
13621362
\tcode{long long int}\\
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 long int} &
13681368
\tcode{unsigned long long int}\\
1369-
and \tcode{ll} or \tcode{LL} &
1369+
and \literaltcode{ll} or \literaltcode{LL} &
13701370
&
13711371
\\\hline
13721372
\tcode{z} or \tcode{Z} &
@@ -1414,12 +1414,12 @@
14141414
\indextext{literal!character}%
14151415
\begin{bnf}
14161416
\nontermdef{character-literal}\br
1417-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1417+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
14181418
\end{bnf}
14191419

14201420
\begin{bnf}
14211421
\nontermdef{encoding-prefix} \textnormal{one of}\br
1422-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1422+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
14231423
\end{bnf}
14241424

14251425
\begin{bnf}
@@ -1449,12 +1449,12 @@
14491449

14501450
\begin{bnf}
14511451
\nontermdef{simple-escape-sequence}\br
1452-
\terminal{\textbackslash} simple-escape-sequence-char
1452+
\literalterminal{\textbackslash} simple-escape-sequence-char
14531453
\end{bnf}
14541454

14551455
\begin{bnf}
14561456
\nontermdef{simple-escape-sequence-char} \textnormal{one of}\br
1457-
\terminal{' " ? \textbackslash{} a b f n r t v}
1457+
\literalterminal{' " ? \textbackslash{} a b f n r t v}
14581458
\end{bnf}
14591459

14601460
\begin{bnf}
@@ -1470,21 +1470,21 @@
14701470

14711471
\begin{bnf}
14721472
\nontermdef{octal-escape-sequence}\br
1473-
\terminal{\textbackslash} octal-digit\br
1474-
\terminal{\textbackslash} octal-digit octal-digit\br
1475-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1476-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}
1473+
\literalterminal{\textbackslash} octal-digit\br
1474+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1475+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1476+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}
14771477
\end{bnf}
14781478

14791479
\begin{bnf}
14801480
\nontermdef{hexadecimal-escape-sequence}\br
1481-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1482-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1481+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1482+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14831483
\end{bnf}
14841484

14851485
\begin{bnf}
14861486
\nontermdef{conditional-escape-sequence}\br
1487-
\terminal{\textbackslash} conditional-escape-sequence-char
1487+
\literalterminal{\textbackslash} conditional-escape-sequence-char
14881488
\end{bnf}
14891489

14901490
\begin{bnf}
@@ -1667,42 +1667,42 @@
16671667

16681668
\begin{bnf}
16691669
\nontermdef{fractional-constant}\br
1670-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1671-
digit-sequence \terminal{.}
1670+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1671+
digit-sequence \literalterminal{.}
16721672
\end{bnf}
16731673

16741674
\begin{bnf}
16751675
\nontermdef{hexadecimal-fractional-constant}\br
1676-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1677-
hexadecimal-digit-sequence \terminal{.}
1676+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1677+
hexadecimal-digit-sequence \literalterminal{.}
16781678
\end{bnf}
16791679

16801680
\begin{bnf}
16811681
\nontermdef{exponent-part}\br
1682-
\terminal{e} \opt{sign} digit-sequence\br
1683-
\terminal{E} \opt{sign} digit-sequence
1682+
\literalterminal{e} \opt{sign} digit-sequence\br
1683+
\literalterminal{E} \opt{sign} digit-sequence
16841684
\end{bnf}
16851685

16861686
\begin{bnf}
16871687
\nontermdef{binary-exponent-part}\br
1688-
\terminal{p} \opt{sign} digit-sequence\br
1689-
\terminal{P} \opt{sign} digit-sequence
1688+
\literalterminal{p} \opt{sign} digit-sequence\br
1689+
\literalterminal{P} \opt{sign} digit-sequence
16901690
\end{bnf}
16911691

16921692
\begin{bnf}
16931693
\nontermdef{sign} \textnormal{one of}\br
1694-
\terminal{+ -}
1694+
\literalterminal{+ -}
16951695
\end{bnf}
16961696

16971697
\begin{bnf}
16981698
\nontermdef{digit-sequence}\br
16991699
digit\br
1700-
digit-sequence \opt{\terminal{'}} digit
1700+
digit-sequence \opt{\literalterminal{'}} digit
17011701
\end{bnf}
17021702

17031703
\begin{bnf}
17041704
\nontermdef{floating-point-suffix} \textnormal{one of}\br
1705-
\terminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
1705+
\literalterminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
17061706
\end{bnf}
17071707

17081708
\pnum
@@ -1788,7 +1788,7 @@
17881788
\begin{bnf}
17891789
\nontermdef{string-literal}\br
17901790
\opt{encoding-prefix} plain-string-literal\br
1791-
\opt{encoding-prefix} \terminal{R} raw-string
1791+
\opt{encoding-prefix} \literalterminal{R} raw-string
17921792
\end{bnf}
17931793

17941794
\begin{bnf}
@@ -1816,7 +1816,7 @@
18161816

18171817
\begin{bnf}
18181818
\nontermdef{raw-string}\br
1819-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1819+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
18201820
\end{bnf}
18211821

18221822
\begin{bnf}
@@ -1902,7 +1902,7 @@
19021902

19031903
\pnum
19041904
\indextext{literal!string!raw}%
1905-
A \grammarterm{string-literal} that has an \tcode{R}
1905+
A \grammarterm{string-literal} that has an \literaltcode{R}
19061906
\indextext{prefix!\idxcode{R}}%
19071907
in the prefix is a \defn{raw string literal}. The
19081908
\grammarterm{d-char-sequence} serves as a delimiter. The terminating

0 commit comments

Comments
 (0)