Skip to content

Commit 97188f2

Browse files
committed
Merge pull request #580 from tkoeppe/angle
[intro.defs], [definitions] Use textual angle brackets rather than relational operators
2 parents ef0f323 + be071ac commit 97188f2

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

source/intro.tex

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,29 +118,29 @@
118118

119119
\indexdefn{access}%
120120
\definition{access}{defns.access}
121-
<execution-time action> to read or modify the value of an object
121+
\defncontext{execution-time action} to read or modify the value of an object
122122

123123
\indexdefn{argument}%
124124
\indexdefn{argument!function call expression}
125125
\definition{argument}{defns.argument}
126-
<function call expression> expression in the
126+
\defncontext{function call expression} expression in the
127127
comma-separated list bounded by the parentheses~(\ref{expr.call})
128128

129129
\indexdefn{argument}%
130130
\indexdefn{argument!function-like macro}%
131131
\definition{argument}{defns.argument.macro}
132-
<function-like macro> sequence of preprocessing tokens in the
132+
\defncontext{function-like macro} sequence of preprocessing tokens in the
133133
comma-separated list bounded by the parentheses~(\ref{cpp.replace})
134134

135135
\indexdefn{argument}%
136136
\indexdefn{argument!throw expression}%
137137
\definition{argument}{defns.argument.throw}
138-
<throw expression> the operand of \tcode{throw}~(\ref{expr.throw})
138+
\defncontext{throw expression} the operand of \tcode{throw}~(\ref{expr.throw})
139139

140140
\indexdefn{argument}%
141141
\indexdefn{argument!template instantiation}%
142142
\definition{argument}{defns.argument.templ}
143-
<template instantiation>
143+
\defncontext{template instantiation}
144144
\grammarterm{constant-expression},
145145
\grammarterm{type-id}, or
146146
\grammarterm{id-expression} in the comma-separated
@@ -159,7 +159,7 @@
159159

160160
\indexdefn{type!dynamic}%
161161
\definition{dynamic type}{defns.dynamic.type}
162-
<glvalue> type of the most derived object~(\ref{intro.object}) to which the
162+
\defncontext{glvalue} type of the most derived object~(\ref{intro.object}) to which the
163163
glvalue refers\\
164164
\enterexample
165165
if a pointer~(\ref{dcl.ptr}) \tcode{p} whose static type is ``pointer to
@@ -171,7 +171,7 @@
171171

172172
\indexdefn{type!dynamic}%
173173
\definition{dynamic type}{defns.dynamic.type.prvalue}
174-
<prvalue> static type of the prvalue expression
174+
\defncontext{prvalue} static type of the prvalue expression
175175

176176
\indexdefn{program!ill-formed}%
177177
\definition{ill-formed program}{defns.ill.formed}
@@ -203,53 +203,53 @@
203203
\indexdefn{parameter!function}%
204204
\indexdefn{parameter!catch clause}%
205205
\definition{parameter}{defns.parameter}
206-
<function or catch clause> object or reference declared as part of a function declaration or
206+
\defncontext{function or catch clause} object or reference declared as part of a function declaration or
207207
definition or in the catch clause of an exception handler that
208208
acquires a value on entry to the function or handler
209209

210210
\indexdefn{parameter}%
211211
\indexdefn{parameter!function-like macro}%
212212
\definition{parameter}{defns.parameter.macro}
213-
<function-like macro> identifier from
213+
\defncontext{function-like macro} identifier from
214214
the comma-separated list bounded by the parentheses immediately
215215
following the macro name
216216

217217
\indexdefn{parameter}%
218218
\indexdefn{parameter!template}%
219219
\definition{parameter}{defns.parameter.templ}
220-
<template> \grammarterm{template-parameter}
220+
\defncontext{template} \grammarterm{template-parameter}
221221

222222
\indexdefn{signature}%
223223
\definition{signature}{defns.signature}
224-
<function> name, parameter type list~(\ref{dcl.fct}), and enclosing namespace (if any)\\
224+
\defncontext{function} name, parameter type list~(\ref{dcl.fct}), and enclosing namespace (if any)\\
225225
\enternote Signatures are used as a basis for
226226
name mangling and linking.\exitnote
227227

228228
\indexdefn{signature}%
229229
\definition{signature}{defns.signature.templ}
230-
<function template> name, parameter type list~(\ref{dcl.fct}), enclosing namespace (if any),
230+
\defncontext{function template} name, parameter type list~(\ref{dcl.fct}), enclosing namespace (if any),
231231
return type, and template parameter list
232232

233233
\indexdefn{signature}%
234234
\definition{signature}{defns.signature.spec}
235-
<function template specialization> signature of the template of which it is a specialization
235+
\defncontext{function template specialization} signature of the template of which it is a specialization
236236
and its template arguments (whether explicitly specified or deduced)
237237

238238
\indexdefn{signature}%
239239
\definition{signature}{defns.signature.member}
240-
<class member function> name, parameter type list~(\ref{dcl.fct}), class of which the
240+
\defncontext{class member function} name, parameter type list~(\ref{dcl.fct}), class of which the
241241
function is a member, \cv-qualifiers (if any),
242242
and \grammarterm{ref-qualifier} (if any)
243243

244244
\indexdefn{signature}%
245245
\definition{signature}{defns.signature.member.templ}
246-
<class member function template> name, parameter type list~(\ref{dcl.fct}), class of which the
246+
\defncontext{class member function template} name, parameter type list~(\ref{dcl.fct}), class of which the
247247
function is a member, \cv-qualifiers (if any),
248248
\grammarterm{ref-qualifier} (if any), return type, and template parameter list
249249

250250
\indexdefn{signature}%
251251
\definition{signature}{defns.signature.member.spec}
252-
<class member function template specialization> signature of the member function template
252+
\defncontext{class member function template specialization} signature of the member function template
253253
of which it is a specialization and its template arguments (whether explicitly specified or deduced)
254254

255255
\indexdefn{type!static}%

source/lib-intro.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137

138138
\definition{character}{defns.character}
139139
\indexdefn{character}%
140-
<Clauses~\ref{strings}, \ref{localization}, \ref{input.output}, and~\ref{re}>
140+
\defncontext{Clauses~\ref{strings}, \ref{localization}, \ref{input.output}, and~\ref{re}}
141141
any object which,
142142
when treated sequentially,
143143
can represent text\\
@@ -190,14 +190,14 @@
190190

191191
\definition{default behavior}{defns.default.behavior.impl}
192192
\indexdefn{behavior!default}%
193-
<implementation>
193+
\defncontext{implementation}
194194
any specific behavior provided by the implementation,
195195
within the scope of the
196196
\term{required behavior}
197197

198198
\definition{default behavior}{defns.default.behavior.func}
199199
\indexdefn{behavior!default}%
200-
<specification>
200+
\defncontext{specification}
201201
a description of
202202
\term{replacement function}
203203
and

source/macros.tex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,3 +504,4 @@
504504
\newcommand{\definition}[2]{%
505505
\subsection[#1]{\hfill[#2]}\vspace{-.3\onelineskip}\label{#2}\textbf{#1}\\%
506506
}
507+
\newcommand{\defncontext}[1]{\textlangle#1\textrangle}

source/std.tex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
\usepackage{ltcaption} % fix captions for long tables
1818
\usepackage{booktabs} % fancy tables
1919
\usepackage{relsize} % provide relative font size changes
20+
\usepackage{textcomp} % provide \text{l,r}angle
2021
\usepackage{underscore} % remove special status of '_' in ordinary text
2122
\usepackage{verbatim} % improved verbatim environment
2223
\usepackage{parskip} % handle non-indented paragraphs "properly"

0 commit comments

Comments
 (0)