Skip to content

Commit 8797517

Browse files
committed
[18-27] Remove tcode from index entries
Several old index entries use '\tcode' to force a code font on their sub-entry. This is no longer necessary, as the LaTeX scripts produce the correct font for an '\idxcode' entry. However, using '\tcode' inconsistently will produce duplicate entries, and entries that do not sort correctly. This change set consistently applies '\idxcode' in preference to '\tcode' to eliminate the redundant and mis-sorted entries.
1 parent a167f5c commit 8797517

File tree

7 files changed

+68
-68
lines changed

7 files changed

+68
-68
lines changed

source/containers.tex

+22-22
Original file line numberDiff line numberDiff line change
@@ -3085,7 +3085,7 @@
30853085

30863086
\rSec3[deque.capacity]{\tcode{deque} capacity}
30873087

3088-
\indexlibrary{\idxcode{resize}!\tcode{deque}}%
3088+
\indexlibrary{\idxcode{resize}!\idxcode{deque}}%
30893089
\begin{itemdecl}
30903090
void resize(size_type sz);
30913091
\end{itemdecl}
@@ -3100,7 +3100,7 @@
31003100
\requires \tcode{T} shall be \tcode{MoveInsertable} and \tcode{DefaultInsertable} into \tcode{*this}.
31013101
\end{itemdescr}
31023102

3103-
\indexlibrary{\idxcode{resize}!\tcode{deque}}%
3103+
\indexlibrary{\idxcode{resize}!\idxcode{deque}}%
31043104
\begin{itemdecl}
31053105
void resize(size_type sz, const T& c);
31063106
\end{itemdecl}
@@ -3136,10 +3136,10 @@
31363136

31373137
\rSec3[deque.modifiers]{\tcode{deque} modifiers}
31383138

3139-
\indexlibrary{\idxcode{insert}!\tcode{deque}}%
3140-
\indexlibrary{insert@\tcode{push_front}!\tcode{deque}}%
3141-
\indexlibrary{insert@\tcode{push_back}!\tcode{deque}}%
3142-
\indexlibrary{insert@\tcode{emplace}!\tcode{deque}}%
3139+
\indexlibrary{\idxcode{insert}!\idxcode{deque}}%
3140+
\indexlibrary{insert@\idxcode{push_front}!\idxcode{deque}}%
3141+
\indexlibrary{insert@\idxcode{push_back}!\idxcode{deque}}%
3142+
\indexlibrary{insert@\idxcode{emplace}!\idxcode{deque}}%
31433143
\begin{itemdecl}
31443144
iterator insert(const_iterator position, const T& x);
31453145
iterator insert(const_iterator position, T&& x);
@@ -3189,7 +3189,7 @@
31893189
\tcode{T}.
31903190
\end{itemdescr}
31913191

3192-
\indexlibrary{\idxcode{erase}!\tcode{deque}}%
3192+
\indexlibrary{\idxcode{erase}!\idxcode{deque}}%
31933193
\begin{itemdecl}
31943194
iterator erase(const_iterator position);
31953195
iterator erase(const_iterator first, const_iterator last);
@@ -4240,7 +4240,7 @@
42404240

42414241
\rSec3[list.capacity]{\tcode{list} capacity}
42424242

4243-
\indexlibrary{\idxcode{resize}!\tcode{list}}%
4243+
\indexlibrary{\idxcode{resize}!\idxcode{list}}%
42444244
\begin{itemdecl}
42454245
void resize(size_type sz);
42464246
\end{itemdecl}
@@ -4265,7 +4265,7 @@
42654265
\tcode{DefaultInsertable} into \tcode{*this}.
42664266
\end{itemdescr}
42674267

4268-
\indexlibrary{\idxcode{resize}!\tcode{list}}%
4268+
\indexlibrary{\idxcode{resize}!\idxcode{list}}%
42694269
\begin{itemdecl}
42704270
void resize(size_type sz, const T& c);
42714271
\end{itemdecl}
@@ -4292,7 +4292,7 @@
42924292

42934293
\rSec3[list.modifiers]{\tcode{list} modifiers}
42944294

4295-
\indexlibrary{\idxcode{insert}!\tcode{list}}%
4295+
\indexlibrary{\idxcode{insert}!\idxcode{list}}%
42964296
\begin{itemdecl}
42974297
iterator insert(const_iterator position, const T& x);
42984298
iterator insert(const_iterator position, T&& x);
@@ -4327,7 +4327,7 @@
43274327
to the number of elements inserted.
43284328
\end{itemdescr}
43294329

4330-
\indexlibrary{\idxcode{erase}!\tcode{list}}%
4330+
\indexlibrary{\idxcode{erase}!\idxcode{list}}%
43314331
\begin{itemdecl}
43324332
iterator erase(const_iterator position);
43334333
iterator erase(const_iterator first, const_iterator last);
@@ -4368,7 +4368,7 @@
43684368
another. The behavior of splice operations is undefined if \tcode{get_allocator() !=
43694369
x.get_allocator()}.
43704370

4371-
\indexlibrary{\idxcode{splice}!\tcode{list}}%
4371+
\indexlibrary{\idxcode{splice}!\idxcode{list}}%
43724372
\begin{itemdecl}
43734373
void splice(const_iterator position, list& x);
43744374
void splice(const_iterator position, list&& x);
@@ -4502,7 +4502,7 @@
45024502
otherwise, linear time.
45034503
\end{itemdescr}
45044504

4505-
\indexlibrary{\idxcode{remove}!\tcode{list}}%
4505+
\indexlibrary{\idxcode{remove}!\idxcode{list}}%
45064506
\begin{itemdecl}
45074507
void remove(const T& value);
45084508
template <class Predicate> void remove_if(Predicate pred);
@@ -4532,7 +4532,7 @@
45324532
applications of the corresponding predicate.
45334533
\end{itemdescr}
45344534

4535-
\indexlibrary{\idxcode{unique}!\tcode{list}}%
4535+
\indexlibrary{\idxcode{unique}!\idxcode{list}}%
45364536
\begin{itemdecl}
45374537
void unique();
45384538
template <class BinaryPredicate> void unique(BinaryPredicate binary_pred);
@@ -4565,7 +4565,7 @@
45654565
otherwise no applications of the predicate.
45664566
\end{itemdescr}
45674567

4568-
\indexlibrary{\idxcode{merge}!\tcode{list}}%
4568+
\indexlibrary{\idxcode{merge}!\idxcode{list}}%
45694569
\begin{itemdecl}
45704570
void merge(list& x);
45714571
void merge(list&& x);
@@ -4607,7 +4607,7 @@
46074607
If an exception is thrown other than by a comparison there are no effects.
46084608
\end{itemdescr}
46094609

4610-
\indexlibrary{\idxcode{reverse}!\tcode{list}}%
4610+
\indexlibrary{\idxcode{reverse}!\idxcode{list}}%
46114611
\begin{itemdecl}
46124612
void reverse() noexcept;
46134613
\end{itemdecl}
@@ -4623,7 +4623,7 @@
46234623
Linear time.
46244624
\end{itemdescr}
46254625

4626-
\indexlibrary{\idxcode{sort}!\tcode{list}}%
4626+
\indexlibrary{\idxcode{sort}!\idxcode{list}}%
46274627
\begin{itemdecl}
46284628
void sort();
46294629
template <class Compare> void sort(Compare comp);
@@ -4822,8 +4822,8 @@
48224822
noexcept(noexcept(x.swap(y)));
48234823
}
48244824
\end{codeblock}%
4825-
\indexlibrary{\idxcode{vector}!\tcode{operator==}}%
4826-
\indexlibrary{\idxcode{vector}!\tcode{operator<}}
4825+
\indexlibrary{\idxcode{vector}!\idxcode{operator==}}%
4826+
\indexlibrary{\idxcode{vector}!\idxcode{operator<}}
48274827

48284828
\pnum
48294829
An incomplete type \tcode{T} may be used when instantiating \tcode{vector}
@@ -8772,7 +8772,7 @@
87728772

87738773
\rSec3[priqueue.members]{\tcode{priority_queue} members}
87748774

8775-
\indexlibrary{\idxcode{push}!\tcode{priority_queue}}%
8775+
\indexlibrary{\idxcode{push}!\idxcode{priority_queue}}%
87768776
\begin{itemdecl}
87778777
void push(const value_type& x);
87788778
\end{itemdecl}
@@ -8787,7 +8787,7 @@
87878787
\end{codeblock}
87888788
\end{itemdescr}
87898789

8790-
\indexlibrary{\idxcode{push}!\tcode{priority_queue}}%
8790+
\indexlibrary{\idxcode{push}!\idxcode{priority_queue}}%
87918791
\begin{itemdecl}
87928792
void push(value_type&& x);
87938793
\end{itemdecl}
@@ -8819,7 +8819,7 @@
88198819
\end{itemdescr}
88208820

88218821

8822-
\indexlibrary{\idxcode{pop}!\tcode{priority_queue}}%
8822+
\indexlibrary{\idxcode{pop}!\idxcode{priority_queue}}%
88238823
\begin{itemdecl}
88248824
void pop();
88258825
\end{itemdecl}

source/iostreams.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -4534,7 +4534,7 @@
45344534
None.
45354535
\end{itemdescr}
45364536

4537-
\indexlibrary{\idxcode{operator bool}!\tcode{basic_istream}}%
4537+
\indexlibrary{\idxcode{operator bool}!\idxcode{basic_istream}}%
45384538
\begin{itemdecl}
45394539
explicit operator bool() const;
45404540
\end{itemdecl}

source/iterators.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@
13681368

13691369
\rSec4[reverse.iter.op=]{\tcode{reverse_iterator::operator=}}
13701370

1371-
\indexlibrary{\idxcode{operator=}!\tcode{reverse_iterator}}%
1371+
\indexlibrary{\idxcode{operator=}!\idxcode{reverse_iterator}}%
13721372
\begin{itemdecl}
13731373
template <class U>
13741374
constexpr reverse_iterator&

source/locales.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,8 @@
794794

795795
\rSec3[locale.operators]{\tcode{locale} operators}
796796

797-
\indexlibrary{\idxcode{locale}!\idxcode{operators==}}%
798-
\indexlibrary{\idxcode{operators==}!\idxcode{locale}}%
797+
\indexlibrary{\idxcode{locale}!\idxcode{operator==}}%
798+
\indexlibrary{\idxcode{operator==}!\idxcode{locale}}%
799799
\begin{itemdecl}
800800
bool operator==(const locale& other) const;
801801
\end{itemdecl}

source/strings.tex

+16-16
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@
13111311
\remarks
13121312
Uses
13131313
\tcode{traits::length()}.
1314-
\indexlibrary{\idxcode{length}!\tcode{char_traits}}%
1314+
\indexlibrary{\idxcode{length}!\idxcode{char_traits}}%
13151315
\end{itemdescr}
13161316

13171317
\indexlibrary{\idxcode{basic_string}!constructor}%
@@ -1474,7 +1474,7 @@
14741474
\pnum
14751475
\remarks
14761476
Uses
1477-
\indexlibrary{\idxcode{length}!\tcode{char_traits}}%
1477+
\indexlibrary{\idxcode{length}!\idxcode{char_traits}}%
14781478
\tcode{traits::length()}.
14791479
\end{itemdescr}
14801480

@@ -2178,7 +2178,7 @@
21782178
\end{itemdescr}
21792179

21802180

2181-
\indexlibrary{\idxcode{length}!\tcode{char_traits}}%
2181+
\indexlibrary{\idxcode{length}!\idxcode{char_traits}}%
21822182
\begin{itemdecl}
21832183
basic_string& assign(size_type n, charT c);
21842184
\end{itemdecl}
@@ -2801,10 +2801,10 @@
28012801

28022802
\rSec4[string.accessors]{\tcode{basic_string} accessors}
28032803

2804-
\indexlibrary{\idxcode{c_str}!\tcode{basic_string}}%
2805-
\indexlibrary{\idxcode{data}!\tcode{basic_string}}%
2806-
\indexlibrary{\idxcode{basic_string}!\tcode{c_str}}%
2807-
\indexlibrary{\idxcode{basic_string}!\tcode{data}}%
2804+
\indexlibrary{\idxcode{c_str}!\idxcode{basic_string}}%
2805+
\indexlibrary{\idxcode{data}!\idxcode{basic_string}}%
2806+
\indexlibrary{\idxcode{basic_string}!\idxcode{c_str}}%
2807+
\indexlibrary{\idxcode{basic_string}!\idxcode{data}}%
28082808
\begin{itemdecl}
28092809
const charT* c_str() const noexcept;
28102810
const charT* data() const noexcept;
@@ -2823,8 +2823,8 @@
28232823
The program shall not alter any of the values stored in the character array.
28242824
\end{itemdescr}
28252825

2826-
\indexlibrary{\idxcode{data}!\tcode{basic_string}}%
2827-
\indexlibrary{\idxcode{basic_string}!\tcode{data}}%
2826+
\indexlibrary{\idxcode{data}!\idxcode{basic_string}}%
2827+
\indexlibrary{\idxcode{basic_string}!\idxcode{data}}%
28282828
\begin{itemdecl}
28292829
charT* data() noexcept;
28302830
\end{itemdecl}
@@ -2877,7 +2877,7 @@
28772877
\tcode{pos <= xpos} and
28782878
\tcode{xpos + str.size() <= size()};
28792879
\item
2880-
\indexlibrary{\idxcode{eq}!\tcode{char_traits}}%
2880+
\indexlibrary{\idxcode{eq}!\idxcode{char_traits}}%
28812881
\tcode{traits::eq(at(xpos + I), str.at(I))}
28822882
for all elements \tcode{I} of the string controlled by \tcode{str}.
28832883
\end{itemize}
@@ -2955,7 +2955,7 @@
29552955
and
29562956
\tcode{xpos + str.size() <= size()};
29572957
\item
2958-
\indexlibrary{\idxcode{eq}!\tcode{char_traits}}%
2958+
\indexlibrary{\idxcode{eq}!\idxcode{char_traits}}%
29592959
\tcode{traits::eq(at(xpos + I), str.at(I))}
29602960
for all elements \tcode{I} of the string controlled by \tcode{str}.
29612961
\end{itemize}
@@ -3034,7 +3034,7 @@
30343034
and
30353035
\tcode{xpos < size()};
30363036
\item
3037-
\indexlibrary{\idxcode{eq}!\tcode{char_traits}}%
3037+
\indexlibrary{\idxcode{eq}!\idxcode{char_traits}}%
30383038
\tcode{traits::eq(at(xpos), str.at(I))}
30393039
for some element \tcode{I} of the string controlled by \tcode{str}.
30403040
\end{itemize}
@@ -3114,7 +3114,7 @@
31143114
and
31153115
\tcode{xpos < size()};
31163116
\item
3117-
\indexlibrary{\idxcode{eq}!\tcode{char_traits}}%
3117+
\indexlibrary{\idxcode{eq}!\idxcode{char_traits}}%
31183118
\tcode{traits::eq(at(xpos), str.at(I))}
31193119
for some element \tcode{I} of the string controlled by \tcode{str}.
31203120
\end{itemize}
@@ -3193,7 +3193,7 @@
31933193
and
31943194
\tcode{xpos < size()};
31953195
\item
3196-
\indexlibrary{\idxcode{eq}!\tcode{char_traits}}%
3196+
\indexlibrary{\idxcode{eq}!\idxcode{char_traits}}%
31973197
\tcode{traits::eq(at(xpos), str.at(I))}
31983198
for no element \tcode{I} of the string controlled by \tcode{str}.
31993199
\end{itemize}
@@ -3273,7 +3273,7 @@
32733273
and
32743274
\tcode{xpos < size()};
32753275
\item
3276-
\indexlibrary{\idxcode{eq}!\tcode{char_traits}}%
3276+
\indexlibrary{\idxcode{eq}!\idxcode{char_traits}}%
32773277
\tcode{traits::eq(at(xpos), str.at(I))}
32783278
for no element \tcode{I} of the string
32793279
controlled by \tcode{str}.
@@ -3709,7 +3709,7 @@
37093709
\tcode{lhs.compare(rhs) == 0}.
37103710
\end{itemdescr}
37113711

3712-
\indexlibrary{\idxcode{length}!\tcode{char_traits}}%
3712+
\indexlibrary{\idxcode{length}!\idxcode{char_traits}}%
37133713
\rSec3[string::op!=]{\tcode{operator!=}}
37143714

37153715
\indexlibrary{\idxcode{basic_string}!\idxcode{operator"!=}}%

0 commit comments

Comments
 (0)