Skip to content

Commit 50aea92

Browse files
mikebmclmikebmcl
committed
P0267R0 commit. Too many changes to summarize.
1 parent c827c0f commit 50aea92

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4452
-2860
lines changed

‎source/P0267R0.pdf

1.53 MB
Binary file not shown.

‎source/arc-negative.tex

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
\pnum
3333
For purposes of determining whether a point is on the arc, if the value returned by \tcode{*this.angle_2()} is greater than the value returned by \tcode{*this.angle_1()} then the value returned by \tcode{*this.angle_2()} shall be continuously decremented by $2\pi$ until it is less than the value returned by \tcode{*this.angle_1()}.
3434

35-
\rSec1 [pathdataitem.arcnegative.synopsis] {\tcode{arc_negative} synopsis}
35+
\rSec1 [pathdataitem.arcnegative.synopsis] {\tcode{path_data_item::arc_negative} synopsis}
3636

3737
\begin{codeblock}
3838
namespace std { namespace experimental { namespace io2d { inline namespace v1 {
39-
class arc_negative : public path_data {
39+
class path_data_item::arc_negative : public path_data_item::path_data {
4040
public:
4141
// \ref{pathdataitem.arcnegative.cons}, construct/copy/move/destroy:
4242
arc_negative() noexcept;
43-
arc_negative(const arc_negative& other) noexcept;
44-
arc_negative& operator=(const arc_negative& other) noexcept;
45-
arc_negative(arc_negative&& other) noexcept;
46-
arc_negative& operator=(arc_negative&& other) noexcept;
43+
arc_negative(const arc_negative&) noexcept;
44+
path_data_item::arc_negative& operator=(const arc_negative&) noexcept;
45+
arc_negative(arc_negative&&) noexcept;
46+
path_data_item::arc_negative& operator=(arc_negative&&) noexcept;
4747
arc_negative(const vector_2d& ctr, double rad, double angle1,
4848
double angle2) noexcept;
4949

@@ -69,16 +69,16 @@
6969
} } } }
7070
\end{codeblock}
7171

72-
\rSec1 [pathdataitem.arcnegative.cons] {\tcode{arc_negative} constructors and assignment operators}
72+
\rSec1 [pathdataitem.arcnegative.cons] {\tcode{path_data_item::arc_negative} constructors and assignment operators}
7373

74-
\indexlibrary{\idxcode{arc_negative}!constructor}
74+
\indexlibrary{\idxcode{path_data_item::arc_negative}!constructor}
7575
\begin{itemdecl}
7676
arc_negative() noexcept;
7777
\end{itemdecl}
7878
\begin{itemdescr}
7979
\pnum
8080
\effects
81-
Constructs an object of type \tcode{arc_negative}.
81+
Constructs an object of type \tcode{path_data_item::arc_negative}.
8282

8383
\pnum
8484
\postconditions
@@ -89,18 +89,17 @@
8989
\tcode{_Angle_1 == 0.0}.
9090

9191
\tcode{_Angle_2 == 0.0}.
92-
9392
\end{itemdescr}
9493

95-
\indexlibrary{\idxcode{arc_negative}!constructor}
94+
\indexlibrary{\idxcode{path_data_item::arc_negative}!constructor}
9695
\begin{itemdecl}
9796
arc_negative(const vector_2d& ctr, double rad, double angle1,
9897
double angle2) noexcept;
9998
\end{itemdecl}
10099
\begin{itemdescr}
101100
\pnum
102101
\effects
103-
Constructs an object of type \tcode{arc_negative}.
102+
Constructs an object of type \tcode{path_data_item::arc_negative}.
104103

105104
\pnum
106105
\postconditions
@@ -111,117 +110,107 @@
111110
\tcode{_Angle_1 == angle1}.
112111

113112
\tcode{_Angle_2 == angle2}.
114-
115113
\end{itemdescr}
116114

117-
\rSec1 [pathdataitem.arcnegative.modifiers]{\tcode{arc_negative} modifiers}
115+
\rSec1 [pathdataitem.arcnegative.modifiers]{\tcode{path_data_item::arc_negative} modifiers}
118116

119-
\indexlibrary{\idxcode{arc_negative}!\idxcode{center}}
120-
\indexlibrary{\idxcode{center}!\idxcode{arc_negative}}
117+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{center}}
118+
\indexlibrary{\idxcode{center}!\idxcode{path_data_item::arc_negative}}
121119
\begin{itemdecl}
122120
void center(const vector_2d& value) noexcept;
123121
\end{itemdecl}
124122
\begin{itemdescr}
125123
\pnum
126124
\postconditions
127125
\tcode{_Center == value}.
128-
129126
\end{itemdescr}
130127

131-
\indexlibrary{\idxcode{arc_negative}!\idxcode{radius}}
132-
\indexlibrary{\idxcode{radius}!\idxcode{arc_negative}}
128+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{radius}}
129+
\indexlibrary{\idxcode{radius}!\idxcode{path_data_item::arc_negative}}
133130
\begin{itemdecl}
134131
void radius(double value) noexcept;
135132
\end{itemdecl}
136133
\begin{itemdescr}
137134
\pnum
138135
\postconditions
139136
\tcode{_Radius == value}.
140-
141137
\end{itemdescr}
142138

143-
\indexlibrary{\idxcode{arc_negative}!\idxcode{angle_1}}
144-
\indexlibrary{\idxcode{angle_1}!\idxcode{arc_negative}}
139+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{angle_1}}
140+
\indexlibrary{\idxcode{angle_1}!\idxcode{path_data_item::arc_negative}}
145141
\begin{itemdecl}
146142
void angle_1(double value) noexcept;
147143
\end{itemdecl}
148144
\begin{itemdescr}
149145
\pnum
150146
\postconditions
151147
\tcode{_Angle_1 == value}.
152-
153148
\end{itemdescr}
154149

155-
\indexlibrary{\idxcode{arc_negative}!\idxcode{angle_2}}
156-
\indexlibrary{\idxcode{angle_2}!\idxcode{arc_negative}}
150+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{angle_2}}
151+
\indexlibrary{\idxcode{angle_2}!\idxcode{path_data_item::arc_negative}}
157152
\begin{itemdecl}
158153
void angle_2(double value) noexcept;
159154
\end{itemdecl}
160155
\begin{itemdescr}
161156
\pnum
162157
\postconditions
163158
\tcode{_Angle_2 == value}.
164-
165159
\end{itemdescr}
166160

167-
\rSec1 [pathdataitem.arcnegative.observers]{\tcode{arc_negative} observers}
161+
\rSec1 [pathdataitem.arcnegative.observers]{\tcode{path_data_item::arc_negative} observers}
168162

169-
\indexlibrary{\idxcode{arc_negative}!\idxcode{center}}
170-
\indexlibrary{\idxcode{center}!\idxcode{arc_negative}}
163+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{center}}
164+
\indexlibrary{\idxcode{center}!\idxcode{path_data_item::arc_negative}}
171165
\begin{itemdecl}
172166
vector_2d center() const noexcept;
173167
\end{itemdecl}
174168
\begin{itemdescr}
175169
\pnum
176170
\returns
177171
\tcode{_Center}.
178-
179172
\end{itemdescr}
180173

181-
\indexlibrary{\idxcode{arc_negative}!\idxcode{radius}}
182-
\indexlibrary{\idxcode{radius}!\idxcode{arc_negative}}
174+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{radius}}
175+
\indexlibrary{\idxcode{radius}!\idxcode{path_data_item::arc_negative}}
183176
\begin{itemdecl}
184177
double radius() const noexcept;
185178
\end{itemdecl}
186179
\begin{itemdescr}
187180
\pnum
188181
\returns
189182
\tcode{_Radius}.
190-
191183
\end{itemdescr}
192184

193-
\indexlibrary{\idxcode{arc_negative}!\idxcode{angle_1}}
194-
\indexlibrary{\idxcode{angle_1}!\idxcode{arc_negative}}
185+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{angle_1}}
186+
\indexlibrary{\idxcode{angle_1}!\idxcode{path_data_item::arc_negative}}
195187
\begin{itemdecl}
196188
double angle_1() const noexcept;
197189
\end{itemdecl}
198190
\begin{itemdescr}
199191
\pnum
200192
\returns
201193
\tcode{_Angle_1}.
202-
203194
\end{itemdescr}
204195

205-
\indexlibrary{\idxcode{arc_negative}!\idxcode{angle_2}}
206-
\indexlibrary{\idxcode{angle_2}!\idxcode{arc_negative}}
196+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{angle_2}}
197+
\indexlibrary{\idxcode{angle_2}!\idxcode{path_data_item::arc_negative}}
207198
\begin{itemdecl}
208199
double angle_2() const noexcept;
209200
\end{itemdecl}
210201
\begin{itemdescr}
211202
\pnum
212203
\returns
213204
\tcode{_Angle_2}.
214-
215205
\end{itemdescr}
216206

217-
\indexlibrary{\idxcode{arc_negative}!\idxcode{type}}
218-
\indexlibrary{\idxcode{type}!\idxcode{arc_negative}}
207+
\indexlibrary{\idxcode{path_data_item::arc_negative}!\idxcode{type}}
208+
\indexlibrary{\idxcode{type}!\idxcode{path_data_item::arc_negative}}
219209
\begin{itemdecl}
220210
virtual path_data_type type() const noexcept override;
221211
\end{itemdecl}
222212
\begin{itemdescr}
223213
\pnum
224214
\returns
225215
\tcode{path_data_type::arc_negative}.
226-
227216
\end{itemdescr}

‎source/arc.tex

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
public:
4141
// \ref{pathdataitem.arc.cons}, construct/copy/move/destroy:
4242
arc() noexcept;
43-
arc(const arc& other) noexcept;
44-
arc& operator=(const arc& other) noexcept;
45-
arc(arc&& other) noexcept;
46-
arc& operator=(arc&& other) noexcept;
43+
arc(const arc&) noexcept;
44+
path_data_item::arc& operator=(const arc&) noexcept;
45+
arc(arc&&) noexcept;
46+
path_data_item::arc& operator=(arc&&) noexcept;
4747
arc(const vector_2d& ctr, double rad, double angle1, double angle2) noexcept;
4848

4949
// \ref{pathdataitem.arc.modifiers}, modifiers:
@@ -88,7 +88,6 @@
8888
\tcode{_Angle_1 == 0.0}.
8989

9090
\tcode{_Angle_2 == 0.0}.
91-
9291
\end{itemdescr}
9392

9493
\indexlibrary{\idxcode{path_data_item::arc}!constructor}
@@ -109,7 +108,6 @@
109108
\tcode{_Angle_1 == angle1}.
110109

111110
\tcode{_Angle_2 == angle2}.
112-
113111
\end{itemdescr}
114112

115113
\rSec1 [pathdataitem.arc.modifiers]{\tcode{path_data_item::arc} modifiers}
@@ -123,7 +121,6 @@
123121
\pnum
124122
\postconditions
125123
\tcode{_Center == value}.
126-
127124
\end{itemdescr}
128125

129126
\indexlibrary{\idxcode{path_data_item::arc}!\idxcode{radius}}
@@ -135,7 +132,6 @@
135132
\pnum
136133
\postconditions
137134
\tcode{_Radius == value}.
138-
139135
\end{itemdescr}
140136

141137
\indexlibrary{\idxcode{path_data_item::arc}!\idxcode{angle_1}}
@@ -147,7 +143,6 @@
147143
\pnum
148144
\postconditions
149145
\tcode{_Angle_1 == value}.
150-
151146
\end{itemdescr}
152147

153148
\indexlibrary{\idxcode{path_data_item::arc}!\idxcode{angle_2}}
@@ -159,7 +154,6 @@
159154
\pnum
160155
\postconditions
161156
\tcode{_Angle_2 == value}.
162-
163157
\end{itemdescr}
164158

165159
\rSec1 [pathdataitem.arc.observers]{\tcode{path_data_item::arc} observers}
@@ -173,7 +167,6 @@
173167
\pnum
174168
\returns
175169
\tcode{_Center}.
176-
177170
\end{itemdescr}
178171

179172
\indexlibrary{\idxcode{path_data_item::arc}!\idxcode{radius}}
@@ -185,7 +178,6 @@
185178
\pnum
186179
\returns
187180
\tcode{_Radius}.
188-
189181
\end{itemdescr}
190182

191183
\indexlibrary{\idxcode{path_data_item::arc}!\idxcode{angle_1}}
@@ -197,7 +189,6 @@
197189
\pnum
198190
\returns
199191
\tcode{_Angle_1}.
200-
201192
\end{itemdescr}
202193

203194
\indexlibrary{\idxcode{path_data_item::arc}!\idxcode{angle_2}}
@@ -209,7 +200,6 @@
209200
\pnum
210201
\returns
211202
\tcode{_Angle_2}.
212-
213203
\end{itemdescr}
214204

215205
\indexlibrary{\idxcode{path_data_item::arc}!\idxcode{type}}
@@ -221,5 +211,4 @@
221211
\pnum
222212
\returns
223213
\tcode{path_data_type::arc}.
224-
225214
\end{itemdescr}

‎source/back.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
%corresponding page in the Grammar summary (Annex~\ref{gram}).\\}
99
%\printindex[grammarindex]
1010

11-
\clearpage
12-
\renewcommand{\preindexhook}{}
13-
\renewcommand{\indexname}{Index of library names}
14-
\printindex[libraryindex]
11+
%\clearpage
12+
%\renewcommand{\preindexhook}{}
13+
%\renewcommand{\indexname}{Index of library names}
14+
%\printindex[libraryindex]
1515

1616
\clearpage
1717
\renewcommand{\preindexhook}{The entries in this section are rough descriptions; exact

‎source/bibliography.tex

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
%!TEX root = io2d.tex
2+
\infannex{bibliography}{Bibliography}
3+
4+
\pnum
5+
The following is a list of informative resources intended to assist in the understanding or use of this \documenttypename{}.
6+
7+
\begin{itemize}
8+
\item Porter, Thomas and Duff, Tom, 1984, Compositing digital images. ACM SIGGRAPH Computer Graphics. 1984. Vol. 18, no. 3, p. 253-259. DOI 10.1145/964965.808606. Association for Computing Machinery (ACM)
9+
\end{itemize}

0 commit comments

Comments
 (0)
close