Skip to content

Commit c668372

Browse files
committed
Replace \techterm with \term.
As per #2072, local terms should not be marked up at all, and more widely-used terms should have a (scoped) index entry (via \defnx etc.)
1 parent aa77121 commit c668372

File tree

6 files changed

+58
-58
lines changed

6 files changed

+58
-58
lines changed

source/algorithms.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3565,11 +3565,11 @@
35653565

35663566
\pnum
35673567
The term
3568-
\techterm{strict}
3568+
\term{strict}
35693569
refers to the
35703570
requirement of an irreflexive relation (\tcode{!comp(x, x)} for all \tcode{x}),
35713571
and the term
3572-
\techterm{weak}
3572+
\term{weak}
35733573
to requirements that are not as strong as
35743574
those for a total ordering,
35753575
but stronger than those for a partial
@@ -3612,7 +3612,7 @@
36123612

36133613
\pnum
36143614
A sequence is
3615-
\techterm{sorted with respect to a comparator}
3615+
\term{sorted with respect to a comparator}
36163616
\tcode{comp} if for every iterator
36173617
\tcode{i}
36183618
pointing to the sequence and every non-negative integer
@@ -3626,7 +3626,7 @@
36263626
A sequence
36273627
\range{start}{finish}
36283628
is
3629-
\techterm{partitioned with respect to an expression}
3629+
\term{partitioned with respect to an expression}
36303630
\tcode{f(e)}
36313631
if there exists an integer
36323632
\tcode{n}
@@ -4882,7 +4882,7 @@
48824882

48834883
\pnum
48844884
A
4885-
\techterm{heap}
4885+
\term{heap}
48864886
is a particular organization of elements in a range between two random access iterators
48874887
\range{a}{b} such that:
48884888

source/iterators.tex

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@
7575
This document defines
7676
five categories of iterators, according to the operations
7777
defined on them:
78-
\techterm{input iterators},
79-
\techterm{output iterators},
80-
\techterm{forward iterators},
81-
\techterm{bidirectional iterators}
78+
\term{input iterators},
79+
\term{output iterators},
80+
\term{forward iterators},
81+
\term{bidirectional iterators}
8282
and
83-
\techterm{random access iterators},
83+
\term{random access iterators},
8484
as shown in \tref{iterators.relations}.
8585

8686
\begin{floattable}{Relations among iterator categories}{tab:iterators.relations}
@@ -216,7 +216,7 @@
216216

217217
\pnum
218218
An
219-
\techterm{invalid}
219+
\term{invalid}
220220
iterator is an iterator that may be singular.\footnote{This definition applies to pointers, since pointers are iterators.
221221
The effect of dereferencing an iterator that has been invalidated
222222
is undefined.
@@ -329,7 +329,7 @@
329329

330330
\pnum
331331
In \tref{iterator.input.requirements}, the term
332-
\techterm{the domain of \tcode{==}}
332+
\term{the domain of \tcode{==}}
333333
is used in the ordinary mathematical sense to denote
334334
the set of values over which
335335
\tcode{==} is (required to be) defined.
@@ -992,7 +992,7 @@
992992
argument, so that the function can select the most efficient algorithm at compile time.
993993
To facilitate this, the
994994
library introduces
995-
\techterm{category tag}
995+
\term{category tag}
996996
classes which are used as compile time tags for algorithm selection.
997997
They are:
998998
\tcode{input_iterator_tag},
@@ -1647,7 +1647,7 @@
16471647
\pnum
16481648
To make it possible to deal with insertion in the same way as writing into an array, a special kind of iterator
16491649
adaptors, called
1650-
\techterm{insert iterators},
1650+
\term{insert iterators},
16511651
are provided in the library.
16521652
With regular iterator classes,
16531653

@@ -1662,8 +1662,8 @@
16621662
being an insert iterator will insert corresponding elements into the container.
16631663
This device allows all of the
16641664
copying algorithms in the library to work in the
1665-
\techterm{insert mode}
1666-
instead of the \techterm{regular overwrite} mode.
1665+
\term{insert mode}
1666+
instead of the \term{regular overwrite} mode.
16671667

16681668
\pnum
16691669
An insert iterator is constructed from a container and possibly one of its iterators pointing to where

source/lib-intro.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,9 @@
496496

497497
\pnum
498498
Whenever the \Fundescx{Effects} element specifies that the semantics of some function
499-
\tcode{F} are \techterm{Equivalent to} some code sequence, then the various elements are
499+
\tcode{F} are \term{Equivalent to} some code sequence, then the various elements are
500500
interpreted as follows. If \tcode{F}'s semantics specifies a \Fundescx{Requires} element, then
501-
that requirement is logically imposed prior to the \techterm{equivalent-to} semantics.
501+
that requirement is logically imposed prior to the \term{equivalent-to} semantics.
502502
Next, the semantics of the code sequence are determined by the \Fundescx{Requires}, \Fundescx{Effects},
503503
\Fundescx{Synchronization}, \Fundescx{Postconditions}, \Fundescx{Returns}, \Fundescx{Throws}, \Fundescx{Complexity}, \Fundescx{Remarks}, and \Fundescx{Error conditions}
504504
specified for the function invocations contained in the code sequence. The value
@@ -1793,7 +1793,7 @@
17931793

17941794
\indextext{requirements!\idxcode{Allocator}}%
17951795
\pnum
1796-
The library describes a standard set of requirements for \techterm{allocators},
1796+
The library describes a standard set of requirements for \term{allocators},
17971797
which are class-type objects that encapsulate the information about an allocation model.
17981798
This information includes the knowledge of pointer types, the type of their
17991799
difference, the type of the size of objects in this allocation model, as well

source/macros.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@
180180

181181
% Code and definitions embedded in text.
182182
\newcommand{\tcode}[1]{\CodeStylex{#1}}
183-
\newcommand{\techterm}[1]{\textit{#1}}
184183
\newcommand{\defnx}[2]{\indexdefn{#2}\textit{#1}}
185184
\newcommand{\defn}[1]{\defnx{#1}{#1}}
185+
\newcommand{\techterm}[1]{\textit{#1}}
186186
\newcommand{\term}[1]{\textit{#1}}
187187
\newcommand{\gterm}[1]{\GrammarStylex{#1}}
188188
\newcommand{\fakegrammarterm}[1]{\gterm{#1}}

source/numerics.tex

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,11 +1389,11 @@
13891389
\pnum
13901390
In addition to a few utilities,
13911391
four categories of entities are described:
1392-
\techterm{uniform random bit generators},
1393-
\techterm{random number engines},
1394-
\techterm{random number engine adaptors},
1392+
\term{uniform random bit generators},
1393+
\term{random number engines},
1394+
\term{random number engine adaptors},
13951395
and
1396-
\techterm{random number distributions}.
1396+
\term{random number distributions}.
13971397
These categorizations are applicable
13981398
to types that satisfy the corresponding requirements,
13991399
to objects instantiated from such types,
@@ -1419,20 +1419,20 @@
14191419
that entity is characterized:
14201420
\begin{enumeratea}
14211421
\item
1422-
as \techterm{boolean} or equivalently as \techterm{boolean-valued},
1422+
as \term{boolean} or equivalently as \term{boolean-valued},
14231423
if \tcode{T} is \tcode{bool};
14241424
\item
14251425
otherwise
1426-
as \techterm{integral} or equivalently as \techterm{integer-valued},
1426+
as \term{integral} or equivalently as \term{integer-valued},
14271427
if \tcode{numeric_limits<T>::is_integer} is \tcode{true};
14281428
\item
14291429
otherwise
1430-
as \techterm{floating} or equivalently as \techterm{real-valued}.
1430+
as \term{floating} or equivalently as \term{real-valued}.
14311431
\end{enumeratea}
14321432
\noindent
14331433
If integer-valued,
14341434
an entity may optionally be further characterized as
1435-
\techterm{signed} or \techterm{unsigned},
1435+
\term{signed} or \term{unsigned},
14361436
according to \tcode{numeric_limits<T>::is_signed}.
14371437

14381438
\pnum
@@ -1560,7 +1560,7 @@
15601560
\indextext{requirements!seed sequence|(}
15611561

15621562
\pnum
1563-
A \techterm{seed sequence}\indextext{seed sequence}
1563+
A \term{seed sequence}\indextext{seed sequence}
15641564
is an object
15651565
that consumes a sequence
15661566
of integer-valued data
@@ -1701,7 +1701,7 @@
17011701
\indextext{requirements!uniform random bit generator|(}
17021702

17031703
\pnum
1704-
A \techterm{uniform random bit generator}
1704+
A \term{uniform random bit generator}
17051705
\tcode{g} of type \tcode{G}
17061706
is a function object
17071707
returning unsigned integer values
@@ -1718,7 +1718,7 @@
17181718
\pnum
17191719
A class \tcode{G}
17201720
satisfies the requirements
1721-
of a \techterm{uniform random bit generator}
1721+
of a \term{uniform random bit generator}
17221722
if the expressions shown
17231723
in \tref{UniformRandomBitGenerator}
17241724
are valid and have the indicated semantics,
@@ -1795,8 +1795,8 @@
17951795
\indextext{requirements!random number engine|(}
17961796

17971797
\pnum
1798-
A \techterm{random number engine}
1799-
(commonly shortened to \techterm{engine})
1798+
A \term{random number engine}
1799+
(commonly shortened to \term{engine})
18001800
\tcode{e} of type \tcode{E}
18011801
is a uniform random bit generator
18021802
that additionally meets the requirements
@@ -1824,14 +1824,14 @@
18241824
in multiples of the size of \tcode{result_type},
18251825
given as an integral constant expression;
18261826
\item
1827-
the \techterm{transition algorithm}
1827+
the \term{transition algorithm}
18281828
$\mathsf{TA}$
18291829
by which \tcode{e}'s state \state{e}{i}
1830-
is advanced to its \techterm{successor state}
1830+
is advanced to its \term{successor state}
18311831
\state{e}{i+1};
18321832
and
18331833
\item
1834-
the \techterm{generation algorithm}
1834+
the \term{generation algorithm}
18351835
$\mathsf{GA}$
18361836
by which an engine's state is mapped
18371837
to a value of type \tcode{result_type}.
@@ -1842,7 +1842,7 @@
18421842
that satisfies the requirements
18431843
of a uniform random bit generator\iref{rand.req.urng}
18441844
also satisfies the requirements
1845-
of a \techterm{random number engine}
1845+
of a \term{random number engine}
18461846
if the expressions shown
18471847
in \tref{RandomEngine}
18481848
are valid and have the indicated semantics,
@@ -2068,8 +2068,8 @@
20682068
\rSec3[rand.req.adapt]{Random number engine adaptor requirements}%
20692069

20702070
\pnum
2071-
A \techterm{random number engine adaptor}
2072-
(commonly shortened to \techterm{adaptor})
2071+
A \term{random number engine adaptor}
2072+
(commonly shortened to \term{adaptor})
20732073
\tcode{a} of type \tcode{A}
20742074
is a random number engine
20752075
that takes values
@@ -2078,7 +2078,7 @@
20782078
in order to deliver a sequence of values
20792079
with different randomness properties.
20802080
An engine \tcode{b} of type \tcode{B} adapted in this way
2081-
is termed a \techterm{base engine}
2081+
is termed a \term{base engine}
20822082
in this context.
20832083
The expression \tcode{a.base()} shall be valid and shall return a
20842084
const reference to \tcode{a}'s base engine.
@@ -2194,16 +2194,16 @@
21942194
\indextext{requirements!random number distribution|(}
21952195

21962196
\pnum
2197-
A \techterm{random number distribution}
2198-
(commonly shortened to \techterm{distribution})
2197+
A \term{random number distribution}
2198+
(commonly shortened to \term{distribution})
21992199
\tcode{d} of type \tcode{D}
22002200
is a function object
22012201
returning values
22022202
that are distributed according to
2203-
an associated mathematical \techterm{probability density function}
2203+
an associated mathematical \term{probability density function}
22042204
$p(z)$
22052205
or according to
2206-
an associated \techterm{discrete probability function}
2206+
an associated \term{discrete probability function}
22072207
$P(z_i)$.
22082208
A distribution's specification
22092209
identifies its associated probability function
@@ -2212,7 +2212,7 @@
22122212
\pnum
22132213
An associated probability function is typically expressed
22142214
using certain externally-supplied quantities
2215-
known as the \techterm{parameters of the distribution}.
2215+
known as the \term{parameters of the distribution}.
22162216
Such distribution parameters are identified
22172217
in this context by writing, for example,
22182218
$p(z\,|\,a,b)$ or $P(z_i\,|\,a,b)$,
@@ -2225,7 +2225,7 @@
22252225
\pnum
22262226
A class \tcode{D}
22272227
satisfies the requirements
2228-
of a \techterm{random number distribution}
2228+
of a \term{random number distribution}
22292229
if the expressions shown
22302230
in \tref{RandomDistribution}
22312231
are valid and have the indicated semantics,
@@ -2868,7 +2868,7 @@
28682868
defined by shift values $n$ and $m$, a twist value $r$,
28692869
and a conditional xor-mask $a$.
28702870
To improve the uniformity of the result,
2871-
the bits of the raw shift register are additionally \techterm{tempered}
2871+
the bits of the raw shift register are additionally \term{tempered}
28722872
(i.e., scrambled) according to a bit-scrambling matrix
28732873
defined by values $u$, $d$, $s$, $b$, $t$, $c$, and $\ell$.
28742874

@@ -3039,7 +3039,7 @@
30393039
all subscripts applied to $X$ are to be taken modulo $r$.
30403040
The state \state{x}{i}
30413041
additionally consists of an integer $c$
3042-
(known as the \techterm{carry})%
3042+
(known as the \term{carry})%
30433043
\indextext{\idxcode{subtract_with_carry_engine}!carry}%
30443044
\indextext{carry!\idxcode{subtract_with_carry_engine}}
30453045
whose value is either $0$ or $1$.
@@ -4760,7 +4760,7 @@
47604760
\indextext{\idxcode{poisson_distribution}!discrete probability function}%
47614761
\[ P(i\,|\,\mu) = \frac{e^{-\mu} \mu^{i}}{i\,!} \text{ .} \]
47624762
The distribution parameter $\mu$
4763-
is also known as this distribution's \techterm{mean}%
4763+
is also known as this distribution's \term{mean}%
47644764
\indextext{mean!\idxcode{poisson_distribution}}%
47654765
\indextext{\idxcode{poisson_distribution}!mean}%
47664766
.
@@ -5189,10 +5189,10 @@
51895189
\text{ .}
51905190
\]
51915191
The distribution parameters $\mu$ and $\sigma$
5192-
are also known as this distribution's \techterm{mean}%
5192+
are also known as this distribution's \term{mean}%
51935193
\indextext{mean!\idxcode{normal_distribution}}%
51945194
\indextext{\idxcode{normal_distribution}!mean}
5195-
and \techterm{standard deviation}%
5195+
and \term{standard deviation}%
51965196
\indextext{standard deviation!\idxcode{normal_distribution}}%
51975197
\indextext{\idxcode{normal_distribution}!standard deviation}%
51985198
.
@@ -5699,7 +5699,7 @@
56995699
the distribution parameters are calculated as:
57005700
$p_k = {w_k / S}$ for $k = 0, \dotsc, n - 1$,
57015701
in which the values $w_k$,
5702-
commonly known as the \techterm{weights}%
5702+
commonly known as the \term{weights}%
57035703
\indextext{\idxcode{discrete_distribution}!weights}%
57045704
\indextext{weights!\idxcode{discrete_distribution}}%
57055705
, shall be non-negative, non-NaN, and non-infinity.
@@ -5857,7 +5857,7 @@
58575857

58585858
\pnum
58595859
The $n + 1$ distribution parameters $b_i$,
5860-
also known as this distribution's \techterm{interval boundaries}%
5860+
also known as this distribution's \term{interval boundaries}%
58615861
\indextext{\idxcode{piecewise_constant_distribution}!interval boundaries}%
58625862
\indextext{interval boundaries!\idxcode{piecewise_constant_distribution}}%
58635863
, shall satisfy the relation
@@ -5866,7 +5866,7 @@
58665866
the remaining $n$ distribution parameters are calculated as:
58675867
\[ \rho_k = \frac{w_k}{S \cdot (b_{k+1}-b_k)} \text{ for } k = 0, \dotsc, n - 1 \text{ ,} \]
58685868
in which the values $w_k$,
5869-
commonly known as the \techterm{weights}%
5869+
commonly known as the \term{weights}%
58705870
\indextext{\idxcode{piecewise_constant_distribution}!weights}%
58715871
\indextext{weights!\idxcode{piecewise_constant_distribution}}%
58725872
, shall be non-negative, non-NaN, and non-infinity.
@@ -6072,14 +6072,14 @@
60726072

60736073
\pnum
60746074
The $n + 1$ distribution parameters $b_i$,
6075-
also known as this distribution's \techterm{interval boundaries}%
6075+
also known as this distribution's \term{interval boundaries}%
60766076
\indextext{\idxcode{piecewise_linear_distribution}!interval boundaries}%
60776077
\indextext{interval boundaries!\idxcode{piecewise_linear_distribution}}%
60786078
, shall satisfy the relation $b_i < b_{i+1}$ for $i = 0, \dotsc, n - 1$.
60796079
Unless specified otherwise,
60806080
the remaining $n + 1$ distribution parameters are calculated as
60816081
$\rho_k = {w_k / S}$ for $k = 0, \dotsc, n$, in which the values $w_k$,
6082-
commonly known as the \techterm{weights at boundaries}%
6082+
commonly known as the \term{weights at boundaries}%
60836083
\indextext{\idxcode{piecewise_linear_distribution}!weights at boundaries}%
60846084
\indextext{weights at boundaries!\idxcode{piecewise_linear_distribution}}%
60856085
, shall be non-negative, non-NaN, and non-infinity.

0 commit comments

Comments
 (0)