Skip to content

Wrap keywords that were \terminal{} with \keyword{} instead #7602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Wrap keywords that were \terminal{} with \keyword{} instead #7602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03ac024
Wrap keywords with \keyword{...}
ilazaric Feb 1, 2025
84ee534
Jens feedback
ilazaric Feb 15, 2025
0c1a7de
Fix spacing previous commits broke
ilazaric Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions source/expressions.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,7 +2352,7 @@
identifier \opt{\terminal{...}}\br
\terminal{\&} identifier \opt{\terminal{...}}\br
\keyword{this}\br
\terminal{*} \terminal{this}
\terminal{*} \keyword{this}
\end{bnf}

\begin{bnf}
Expand Down Expand Up @@ -3204,8 +3204,8 @@
typename-specifier \terminal{(} \opt{expression-list} \terminal{)}\br
simple-type-specifier braced-init-list\br
typename-specifier braced-init-list\br
postfix-expression \terminal{.} \opt{\terminal{template}} id-expression\br
postfix-expression \terminal{->} \opt{\terminal{template}} id-expression\br
postfix-expression \terminal{.} \opt{\keyword{template}} id-expression\br
postfix-expression \terminal{->} \opt{\keyword{template}} id-expression\br
postfix-expression \terminal{++}\br
postfix-expression \terminal{--}\br
\keyword{dynamic_cast} \terminal{<} type-id \terminal{>} \terminal{(} expression \terminal{)}\br
Expand Down Expand Up @@ -4882,7 +4882,7 @@

\begin{bnf}
\nontermdef{await-expression}\br
\terminal{co_await} cast-expression
\keyword{co_await} cast-expression
\end{bnf}

\pnum
Expand Down Expand Up @@ -7199,8 +7199,8 @@

\begin{bnf}
\nontermdef{yield-expression}\br
\terminal{co_yield} assignment-expression\br
\terminal{co_yield} braced-init-list
\keyword{co_yield} assignment-expression\br
\keyword{co_yield} braced-init-list
\end{bnf}

\pnum
Expand Down
6 changes: 3 additions & 3 deletions source/lex.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2068,8 +2068,8 @@
\indextext{literal!boolean}%
\begin{bnf}
\nontermdef{boolean-literal}\br
\terminal{false}\br
\terminal{true}
\keyword{false}\br
\keyword{true}
\end{bnf}

\pnum
Expand All @@ -2082,7 +2082,7 @@
\indextext{literal!pointer}%
\begin{bnf}
\nontermdef{pointer-literal}\br
\terminal{nullptr}
\keyword{nullptr}
\end{bnf}

\pnum
Expand Down
4 changes: 2 additions & 2 deletions source/overloading.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@
and having the form
\begin{ncbnf}
\terminal{R} \placeholder{call-function} \terminal{(} conversion-type-id \ %
\terminal{F, P$_1$ a$_1$, $\dotsc$, P$_n$ a$_n$)} \terminal{\{ return F (a$_1$, $\dotsc$, a$_n$); \}}
\terminal{F, P$_1$ a$_1$, $\dotsc$, P$_n$ a$_n$)} \terminal{\{} \keyword{return} \terminal{F (a$_1$, $\dotsc$, a$_n$); \}}
\end{ncbnf}
is also considered as a candidate function.
Similarly, surrogate
Expand Down Expand Up @@ -3283,7 +3283,7 @@
%% Ed. note: character protrusion would misalign various operators.
\microtypesetup{protrusion=false}\obeyspaces
\nontermdef{operator} \textnormal{one of}\br
\terminal{new delete new[] delete[] co_await (\rlap{\,)} [\rlap{\,]} -> ->*}\br
\terminal{\keyword{new} \keyword{delete} \keyword{new}[] \keyword{delete}[] \keyword{co_await} (\rlap{\,)} [\rlap{\,]} -> ->*}\br
\terminal{\~ ! + - * / \% \caret{} \&}\br
\terminal{| = += -= *= /= \%= \caret{}= \&=}\br
\terminal{|= == != < > <= >= <=> \&\&}\br
Expand Down
2 changes: 1 addition & 1 deletion source/preprocessor.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@
whether the \tcode{\#include} preprocessing directive
is instead replaced by an \tcode{import} directive\iref{cpp.import} of the form
\begin{ncbnf}
\terminal{import} header-name \terminal{;} new-line
\keyword{import} header-name \terminal{;} new-line
\end{ncbnf}

\pnum
Expand Down
4 changes: 2 additions & 2 deletions source/statements.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@

\begin{bnf}
\nontermdef{coroutine-return-statement}\br
\terminal{co_return} \opt{expr-or-braced-init-list} \terminal{;}
\keyword{co_return} \opt{expr-or-braced-init-list} \terminal{;}
\end{bnf}

\pnum
Expand All @@ -996,7 +996,7 @@
promise object\iref{dcl.fct.def.coroutine}.
A \keyword{co_return} statement is equivalent to:
\begin{ncsimplebnf}
\terminal{\{} S\terminal{;} \terminal{goto} \exposid{final-suspend}\terminal{;} \terminal{\}}
\terminal{\{} S\terminal{;} \keyword{goto} \exposid{final-suspend}\terminal{;} \terminal{\}}
\end{ncsimplebnf}
where \exposid{final-suspend} is the exposition-only label
defined in \ref{dcl.fct.def.coroutine}
Expand Down
2 changes: 1 addition & 1 deletion source/templates.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4515,7 +4515,7 @@
\begin{bnf}
\nontermdef{typename-specifier}\br
\keyword{typename} nested-name-specifier identifier\br
\keyword{typename} nested-name-specifier \opt{\terminal{template}} simple-template-id
\keyword{typename} nested-name-specifier \opt{\keyword{template}} simple-template-id
\end{bnf}

\pnum
Expand Down