Skip to content

Commit 3c1ad45

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

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
@@ -1181,19 +1181,19 @@
11811181
\nontermdef{binary-literal}\br
11821182
\terminal{0b} binary-digit\br
11831183
\terminal{0B} binary-digit\br
1184-
binary-literal \opt{\terminal{'}} binary-digit
1184+
binary-literal \opt{\literalterminal{'}} binary-digit
11851185
\end{bnf}
11861186

11871187
\begin{bnf}
11881188
\nontermdef{octal-literal}\br
11891189
\terminal{0}\br
1190-
octal-literal \opt{\terminal{'}} octal-digit
1190+
octal-literal \opt{\literalterminal{'}} octal-digit
11911191
\end{bnf}
11921192

11931193
\begin{bnf}
11941194
\nontermdef{decimal-literal}\br
11951195
nonzero-digit\br
1196-
decimal-literal \opt{\terminal{'}} digit
1196+
decimal-literal \opt{\literalterminal{'}} digit
11971197
\end{bnf}
11981198

11991199
\begin{bnf}
@@ -1224,14 +1224,14 @@
12241224
\begin{bnf}
12251225
\nontermdef{hexadecimal-digit-sequence}\br
12261226
hexadecimal-digit\br
1227-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1227+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
12281228
\end{bnf}
12291229

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

12371237
\begin{bnf}
@@ -1246,17 +1246,17 @@
12461246

12471247
\begin{bnf}
12481248
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1249-
\terminal{u U}
1249+
\literalterminal{u U}
12501250
\end{bnf}
12511251

12521252
\begin{bnf}
12531253
\nontermdef{long-suffix} \textnormal{one of}\br
1254-
\terminal{l L}
1254+
\literalterminal{l L}
12551255
\end{bnf}
12561256

12571257
\begin{bnf}
12581258
\nontermdef{long-long-suffix} \textnormal{one of}\br
1259-
\terminal{ll LL}
1259+
\literalterminal{ll LL}
12601260
\end{bnf}
12611261

12621262
\begin{bnf}
@@ -1295,7 +1295,7 @@
12951295

12961296
\pnum
12971297
The \grammarterm{hexadecimal-digit}s
1298-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1298+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
12991299
have decimal values ten through fifteen.
13001300
\begin{example}
13011301
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1339,7 +1339,7 @@
13391339
&
13401340
&
13411341
\tcode{unsigned long long int}\\\hline
1342-
\tcode{u} or \tcode{U} &
1342+
\literaltcode{u} or \literaltcode{U} &
13431343
\tcode{unsigned int} &
13441344
\tcode{unsigned int}\\
13451345
&
@@ -1348,7 +1348,7 @@
13481348
&
13491349
\tcode{unsigned long long int} &
13501350
\tcode{unsigned long long int}\\\hline
1351-
\tcode{l} or \tcode{L} &
1351+
\literaltcode{l} or \literaltcode{L} &
13521352
\tcode{long int} &
13531353
\tcode{long int}\\
13541354
&
@@ -1360,22 +1360,22 @@
13601360
&
13611361
&
13621362
\tcode{unsigned long long int}\\\hline
1363-
Both \tcode{u} or \tcode{U} &
1363+
Both \literaltcode{u} or \literaltcode{U} &
13641364
\tcode{unsigned long int} &
13651365
\tcode{unsigned long int}\\
1366-
and \tcode{l} or \tcode{L} &
1366+
and \literaltcode{l} or \literaltcode{L} &
13671367
\tcode{unsigned long long int} &
13681368
\tcode{unsigned long long int}\\\hline
1369-
\tcode{ll} or \tcode{LL} &
1369+
\literaltcode{ll} or \literaltcode{LL} &
13701370
\tcode{long long int} &
13711371
\tcode{long long int}\\
13721372
&
13731373
&
13741374
\tcode{unsigned long long int}\\\hline
1375-
Both \tcode{u} or \tcode{U} &
1375+
Both \literaltcode{u} or \literaltcode{U} &
13761376
\tcode{unsigned long long int} &
13771377
\tcode{unsigned long long int}\\
1378-
and \tcode{ll} or \tcode{LL} &
1378+
and \literaltcode{ll} or \literaltcode{LL} &
13791379
&
13801380
\\\hline
13811381
\tcode{z} or \tcode{Z} &
@@ -1423,12 +1423,12 @@
14231423
\indextext{literal!character}%
14241424
\begin{bnf}
14251425
\nontermdef{character-literal}\br
1426-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1426+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
14271427
\end{bnf}
14281428

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

14341434
\begin{bnf}
@@ -1479,16 +1479,16 @@
14791479

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

14881488
\begin{bnf}
14891489
\nontermdef{hexadecimal-escape-sequence}\br
1490-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1491-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1490+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1491+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14921492
\end{bnf}
14931493

14941494
\begin{bnf}
@@ -1676,42 +1676,42 @@
16761676

16771677
\begin{bnf}
16781678
\nontermdef{fractional-constant}\br
1679-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1680-
digit-sequence \terminal{.}
1679+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1680+
digit-sequence \literalterminal{.}
16811681
\end{bnf}
16821682

16831683
\begin{bnf}
16841684
\nontermdef{hexadecimal-fractional-constant}\br
1685-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1686-
hexadecimal-digit-sequence \terminal{.}
1685+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1686+
hexadecimal-digit-sequence \literalterminal{.}
16871687
\end{bnf}
16881688

16891689
\begin{bnf}
16901690
\nontermdef{exponent-part}\br
1691-
\terminal{e} \opt{sign} digit-sequence\br
1692-
\terminal{E} \opt{sign} digit-sequence
1691+
\literalterminal{e} \opt{sign} digit-sequence\br
1692+
\literalterminal{E} \opt{sign} digit-sequence
16931693
\end{bnf}
16941694

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

17011701
\begin{bnf}
17021702
\nontermdef{sign} \textnormal{one of}\br
1703-
\terminal{+ -}
1703+
\literalterminal{+ -}
17041704
\end{bnf}
17051705

17061706
\begin{bnf}
17071707
\nontermdef{digit-sequence}\br
17081708
digit\br
1709-
digit-sequence \opt{\terminal{'}} digit
1709+
digit-sequence \opt{\literalterminal{'}} digit
17101710
\end{bnf}
17111711

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

17171717
\pnum
@@ -1796,8 +1796,8 @@
17961796
\indextext{literal!string}%
17971797
\begin{bnf}
17981798
\nontermdef{string-literal}\br
1799-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1800-
\opt{encoding-prefix} \terminal{R} raw-string
1799+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1800+
\opt{encoding-prefix} \literalterminal{R} raw-string
18011801
\end{bnf}
18021802

18031803
\begin{bnf}
@@ -1820,7 +1820,7 @@
18201820

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

18261826
\begin{bnf}
@@ -1907,7 +1907,7 @@
19071907

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

0 commit comments

Comments
 (0)