Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0b276c7

Browse filesBrowse files
EelisEelis
committed
[over.call.func, gram.key] Make colon in bnf non-italic.
By moving \fmtnontermdef to macros.tex and renaming it to \ninontermdef, for "Non-Indexed \nontermdef", analogous to how ncbnf means "Non-Copied bnf".
1 parent 0a1ce7e commit 0b276c7
Copy full SHA for 0b276c7

File tree

5 files changed

+31
-31
lines changed
Filter options

5 files changed

+31
-31
lines changed

‎source/grammar.tex

Copy file name to clipboardExpand all lines: source/grammar.tex
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@
2626
declarations.
2727

2828
\begin{ncbnf}
29-
typedef-name:\br
29+
\ninontermdef{typedef-name}\br
3030
identifier\br
3131
simple-template-id
3232
\end{ncbnf}
3333

3434
\begin{ncbnf}
35-
namespace-name:\br
35+
\ninontermdef{namespace-name}\br
3636
identifier\br
3737
namespace-alias
3838
\end{ncbnf}
3939

4040
\begin{ncbnf}
41-
namespace-alias:\br
41+
\ninontermdef{namespace-alias}\br
4242
identifier
4343
\end{ncbnf}
4444

4545
\begin{ncbnf}
46-
class-name:\br
46+
\ninontermdef{class-name}\br
4747
identifier\br
4848
simple-template-id
4949
\end{ncbnf}
5050

5151
\begin{ncbnf}
52-
enum-name:\br
52+
\ninontermdef{enum-name}\br
5353
identifier
5454
\end{ncbnf}
5555

5656
\begin{ncbnf}
57-
template-name:\br
57+
\ninontermdef{template-name}\br
5858
identifier
5959
\end{ncbnf}
6060

‎source/macros.tex

Copy file name to clipboardExpand all lines: source/macros.tex
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,8 @@
573573

574574
\newenvironment{bnfbase}
575575
{
576-
\newcommand{\nontermdef}[1]{{\BnfNontermshape##1\itcorr}\indexgrammar{\idxgram{##1}}\textnormal{:}}
576+
\newcommand{\nontermdef}[1]{{\BnfNontermshape##1\itcorr}\indexgrammar{\idxgram{##1}}\textnormal{:}}%
577+
\newcommand{\ninontermdef}[1]{{\BnfNontermshape##1\itcorr}\textnormal{:}}
577578
\newcommand{\terminal}[1]{{\BnfTermshape ##1}}
578579
\renewcommand{\keyword}[1]{\terminal{##1}\indextext{\idxcode{##1}}}
579580
\renewcommand{\exposid}[1]{\terminal{\textit{##1}}}

‎source/overloading.tex

Copy file name to clipboardExpand all lines: source/overloading.tex
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@
745745
parentheses, has one of the following forms:
746746

747747
\begin{ncbnf}
748-
postfix-expression:\br
748+
\ninontermdef{postfix-expression}\br
749749
postfix-expression \terminal{.} id-expression\br
750750
postfix-expression \terminal{->} id-expression\br
751751
primary-expression

‎source/time.tex

Copy file name to clipboardExpand all lines: source/time.tex
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10437,34 +10437,34 @@
1043710437
according to the following syntax:
1043810438

1043910439
\begin{ncbnf}
10440-
\fmtnontermdef{chrono-format-spec}\br
10440+
\ninontermdef{chrono-format-spec}\br
1044110441
\opt{fill-and-align} \opt{width} \opt{precision} \opt{chrono-specs}
1044210442
\end{ncbnf}
1044310443

1044410444
\begin{ncbnf}
10445-
\fmtnontermdef{chrono-specs}\br
10445+
\ninontermdef{chrono-specs}\br
1044610446
conversion-spec\br
1044710447
chrono-specs conversion-spec\br
1044810448
chrono-specs literal-char
1044910449
\end{ncbnf}
1045010450

1045110451
\begin{ncbnf}
10452-
\fmtnontermdef{literal-char}\br
10452+
\ninontermdef{literal-char}\br
1045310453
\textnormal{any character other than \tcode{\{}, \tcode{\}}, or \tcode{\%}}
1045410454
\end{ncbnf}
1045510455

1045610456
\begin{ncbnf}
10457-
\fmtnontermdef{conversion-spec}\br
10457+
\ninontermdef{conversion-spec}\br
1045810458
\terminal{\%} \opt{modifier} type
1045910459
\end{ncbnf}
1046010460

1046110461
\begin{ncbnf}
10462-
\fmtnontermdef{modifier} \textnormal{one of}\br
10462+
\ninontermdef{modifier} \textnormal{one of}\br
1046310463
\terminal{E O}
1046410464
\end{ncbnf}
1046510465

1046610466
\begin{ncbnf}
10467-
\fmtnontermdef{type} \textnormal{one of}\br
10467+
\ninontermdef{type} \textnormal{one of}\br
1046810468
\terminal{a A b B c C d D e F g G h H I j m M n}\br
1046910469
\terminal{p q Q r R S t T u U V w W x X y Y z Z \%}
1047010470
\end{ncbnf}

‎source/utilities.tex

Copy file name to clipboardExpand all lines: source/utilities.tex
+16-17Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19238,7 +19238,6 @@
1923819238
% FIXME: For now, keep the format grammar productions out of the index, since
1923919239
% they conflict with the main grammar.
1924019240
% Consider renaming these en masse (to fmt-* ?) to avoid this problem.
19241-
\newcommand{\fmtnontermdef}[1]{{\BnfNontermshape#1\itcorr}\textnormal{:}}
1924219241
\newcommand{\fmtgrammarterm}[1]{\gterm{#1}}
1924319242

1924419243
\pnum
@@ -19256,46 +19255,46 @@
1925619255
The syntax of replacement fields is as follows:
1925719256

1925819257
\begin{ncbnf}
19259-
\fmtnontermdef{replacement-field}\br
19258+
\ninontermdef{replacement-field}\br
1926019259
\terminal{\{} \opt{arg-id} \opt{format-specifier} \terminal{\}}
1926119260
\end{ncbnf}
1926219261

1926319262
\begin{ncbnf}
19264-
\fmtnontermdef{arg-id}\br
19263+
\ninontermdef{arg-id}\br
1926519264
\terminal{0}\br
1926619265
positive-integer
1926719266
\end{ncbnf}
1926819267

1926919268
\begin{ncbnf}
19270-
\fmtnontermdef{positive-integer}\br
19269+
\ninontermdef{positive-integer}\br
1927119270
nonzero-digit\br
1927219271
positive-integer digit
1927319272
\end{ncbnf}
1927419273

1927519274
\begin{ncbnf}
19276-
\fmtnontermdef{nonnegative-integer}\br
19275+
\ninontermdef{nonnegative-integer}\br
1927719276
digit\br
1927819277
nonnegative-integer digit
1927919278
\end{ncbnf}
1928019279

1928119280
\begin{ncbnf}
19282-
\fmtnontermdef{nonzero-digit} \textnormal{one of}\br
19281+
\ninontermdef{nonzero-digit} \textnormal{one of}\br
1928319282
\terminal{1 2 3 4 5 6 7 8 9}
1928419283
\end{ncbnf}
1928519284

1928619285
% FIXME: This exactly duplicates the digit grammar term from [lex]
1928719286
\begin{ncbnf}
19288-
\fmtnontermdef{digit} \textnormal{one of}\br
19287+
\ninontermdef{digit} \textnormal{one of}\br
1928919288
\terminal{0 1 2 3 4 5 6 7 8 9}
1929019289
\end{ncbnf}
1929119290

1929219291
\begin{ncbnf}
19293-
\fmtnontermdef{format-specifier}\br
19292+
\ninontermdef{format-specifier}\br
1929419293
\terminal{:} format-spec
1929519294
\end{ncbnf}
1929619295

1929719296
\begin{ncbnf}
19298-
\fmtnontermdef{format-spec}\br
19297+
\ninontermdef{format-spec}\br
1929919298
\textnormal{as specified by the \tcode{formatter} specialization for the argument type}
1930019299
\end{ncbnf}
1930119300

@@ -19386,44 +19385,44 @@
1938619385
The syntax of format specifications is as follows:
1938719386

1938819387
\begin{ncbnf}
19389-
\fmtnontermdef{std-format-spec}\br
19388+
\ninontermdef{std-format-spec}\br
1939019389
\opt{fill-and-align} \opt{sign} \opt{\terminal{\#}} \opt{\terminal{0}} \opt{width} \opt{precision} \opt{\terminal{L}} \opt{type}
1939119390
\end{ncbnf}
1939219391

1939319392
\begin{ncbnf}
19394-
\fmtnontermdef{fill-and-align}\br
19393+
\ninontermdef{fill-and-align}\br
1939519394
\opt{fill} align
1939619395
\end{ncbnf}
1939719396

1939819397
\begin{ncbnf}
19399-
\fmtnontermdef{fill}\br
19398+
\ninontermdef{fill}\br
1940019399
\textnormal{any character other than \tcode{\{} or \tcode{\}}}
1940119400
\end{ncbnf}
1940219401

1940319402
\begin{ncbnf}
19404-
\fmtnontermdef{align} \textnormal{one of}\br
19403+
\ninontermdef{align} \textnormal{one of}\br
1940519404
\terminal{< > \caret}
1940619405
\end{ncbnf}
1940719406

1940819407
\begin{ncbnf}
19409-
\fmtnontermdef{sign} \textnormal{one of}\br
19408+
\ninontermdef{sign} \textnormal{one of}\br
1941019409
\terminal{+ -} \textnormal{space}
1941119410
\end{ncbnf}
1941219411

1941319412
\begin{ncbnf}
19414-
\fmtnontermdef{width}\br
19413+
\ninontermdef{width}\br
1941519414
positive-integer\br
1941619415
\terminal{\{} \opt{arg-id} \terminal{\}}
1941719416
\end{ncbnf}
1941819417

1941919418
\begin{ncbnf}
19420-
\fmtnontermdef{precision}\br
19419+
\ninontermdef{precision}\br
1942119420
\terminal{.} nonnegative-integer\br
1942219421
\terminal{.} \terminal{\{} \opt{arg-id} \terminal{\}}
1942319422
\end{ncbnf}
1942419423

1942519424
\begin{ncbnf}
19426-
\fmtnontermdef{type} \textnormal{one of}\br
19425+
\ninontermdef{type} \textnormal{one of}\br
1942719426
\terminal{a A b B c d e E f F g G o p s x X}
1942819427
\end{ncbnf}
1942919428

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.