Skip to content

Commit d7eca2c

Browse files
committed
Significant progress on issue #22. Switching it to review.
1 parent 77cebb1 commit d7eca2c

File tree

9 files changed

+156
-160
lines changed

9 files changed

+156
-160
lines changed

source/abs-new-path.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989

9090
\rSec1 [\iotwod.absnewpath.nonmember]{Non-member functions}%
9191

92-
\indexlibrary{operator==}{abs_new_path}%
92+
\indexlibrarymember{operator==}{abs_new_path}%
9393
\begin{itemdecl}
9494
constexpr bool operator==(const abs_new_path& lhs, const abs_new_path& rhs)
9595
noexcept;
@@ -100,7 +100,7 @@
100100
\tcode{lhs.at() == rhs.at()}.
101101
\end{itemdescr}
102102

103-
\indexlibrary{operator!=}{abs_new_path}%
103+
\indexlibrarymember{operator!=}{abs_new_path}%
104104
\begin{itemdecl}
105105
constexpr bool operator!=(const abs_new_path& lhs, const abs_new_path& rhs)
106106
noexcept;

source/brush-props.tex

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
The \tcode{brush_props} class provides general state information that is applicable to all rendering and composing operations (\ref{\iotwod.surface.rendering}).
1010

1111
\pnum
12-
It has a Wrap Mode of type \tcode{wrap_mode}, a Filter of type \tcode{filter}, a Fill Rule of type \tcode{fill_rule}, and a Brush Matrix of type \tcode{matrix_2d}.
12+
It has a \term{wrap mode} of type \tcode{wrap_mode}, a \term{filter} of type \tcode{filter}, a \term{fill rule} of type \tcode{fill_rule}, and a \term{brush matrix} of type \tcode{matrix_2d}.
1313

1414
\rSec1 [\iotwod.brushprops.synopsis] {\tcode{brush_props} synopsis}
1515

@@ -41,7 +41,7 @@
4141

4242
\rSec1 [\iotwod.brushprops.cons] {\tcode{brush_props} constructors}
4343

44-
\indexlibrary{\idxcode{brush_props}!constructor}
44+
\indexlibrary{\idxcode{brush_props}!constructor}%
4545
\begin{itemdecl}
4646
constexpr brush_props(
4747
experimental::io2d::wrap_mode w = experimental::io2d::wrap_mode::none,
@@ -56,51 +56,45 @@
5656

5757
\pnum
5858
\effects
59-
The value of Wrap Mode is \tcode{w}.
59+
Constructs an object of type \tcode{brush_props}.
6060

6161
\pnum
62-
The value of Filter is \tcode{fi}.
63-
64-
\pnum
65-
The value of Fill Rule is \tcode{fr}.
66-
67-
\pnum
68-
The value of Brush Matrix is \tcode{m}.
62+
The wrap mode is \tcode{w}. The filter is \tcode{fi}. The fill rule is \tcode{fr}. The brush matrix is \tcode{m}.
6963
\end{itemdescr}
7064

7165
\rSec1 [\iotwod.brushprops.modifiers] {\tcode{brush_props} modifiers}
7266

73-
\indexlibrary{\idxcode{brush_props}!\idxcode{wrap_mode}}
67+
\indexlibrarymember{brush_props}{wrap_mode}%
7468
\begin{itemdecl}
7569
constexpr void wrap_mode(experimental::io2d::wrap_mode w) noexcept;
7670
\end{itemdecl}
7771
\begin{itemdescr}
7872
\pnum
7973
\effects
80-
The value of Wrap Mode is \tcode{w}.
74+
The wrap mode is \tcode{w}.
8175
\end{itemdescr}
8276

83-
\indexlibrary{\idxcode{brush_props}!\idxcode{filter}}
77+
\indexlibrarymember{brush_props}{filter}%
8478
\begin{itemdecl}
8579
constexpr void filter(experimental::io2d::filter fi) noexcept;
8680
\end{itemdecl}
8781
\begin{itemdescr}
8882
\pnum
8983
\effects
90-
The value of Filter is \tcode{fi}.
84+
The filter is \tcode{fi}.
9185
\end{itemdescr}
9286

93-
\indexlibrary{\idxcode{brush_props}!\idxcode{fill_rule}}
87+
\indexlibrarymember{brush_props}{fill_rule}%
9488
\begin{itemdecl}
9589
constexpr void fill_rule(experimental::io2d::fill_rule fr) noexcept;
9690
\end{itemdecl}
9791
\begin{itemdescr}
9892
\pnum
9993
\effects
100-
The value of Fill Rule is \tcode{fr}.
94+
The fill rule is \tcode{fr}.
10195
\end{itemdescr}
10296

103-
\indexlibrary{\idxcode{brush_props}!\idxcode{brush_matrix}}
97+
\indexlibrarymember{brush_props}{brush_matrix}%
10498
\begin{itemdecl}
10599
constexpr void brush_matrix(const matrix_2d& m) noexcept;
106100
\end{itemdecl}
@@ -111,47 +105,47 @@
111105

112106
\pnum
113107
\effects
114-
The value of Brush Matrix is \tcode{m}.
108+
The brush matrix is \tcode{m}.
115109
\end{itemdescr}
116110

117111
\rSec1 [\iotwod.brushprops.observers] {\tcode{brush_props} observers}
118112

119-
\indexlibrary{\idxcode{brush_props}!\idxcode{wrap_mode}}
113+
\indexlibrarymember{brush_props}{wrap_mode}%
120114
\begin{itemdecl}
121115
constexpr experimental::io2d::wrap_mode wrap_mode() const noexcept;
122116
\end{itemdecl}
123117
\begin{itemdescr}
124118
\pnum
125119
\returns
126-
The value of Wrap Mode.
120+
The wrap mode.
127121
\end{itemdescr}
128122

129-
\indexlibrary{\idxcode{brush_props}!\idxcode{filter}}
123+
\indexlibrarymember{brush_props}{filter}%
130124
\begin{itemdecl}
131125
constexpr experimental::io2d::filter filter() const noexcept;
132126
\end{itemdecl}
133127
\begin{itemdescr}
134128
\pnum
135129
\returns
136-
The value of Filter.
130+
The filter.
137131
\end{itemdescr}
138132

139-
\indexlibrary{\idxcode{brush_props}!\idxcode{fill_rule}}
133+
\indexlibrarymember{brush_props}{fill_rule}%
140134
\begin{itemdecl}
141135
constexpr experimental::io2d::fill_rule fill_rule() const noexcept;
142136
\end{itemdecl}
143137
\begin{itemdescr}
144138
\pnum
145139
\returns
146-
The value of Fill Rule.
140+
The fill rule.
147141
\end{itemdescr}
148142

149-
\indexlibrary{\idxcode{brush_props}!\idxcode{brush_matrix}}
143+
\indexlibrarymember{brush_props}{brush_matrix}%
150144
\begin{itemdecl}
151145
constexpr matrix_2d brush_matrix() const noexcept;
152146
\end{itemdecl}
153147
\begin{itemdescr}
154148
\pnum
155149
\returns
156-
The value of Brush Matrix.
150+
The brush matrix.
157151
\end{itemdescr}

source/clip-props.tex

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
The \tcode{clip_props} class provides general state information that is applicable to all rendering and composing operations (\ref{\iotwod.surface.rendering}).
99

1010
\pnum
11-
It has a Clip Area of type \tcode{path_group} and a Fill Rule of type \tcode{fill_rule}.
11+
It has a \term{clip area} of type \tcode{path_group} and a \term{fill rule} of type \tcode{fill_rule}.
1212

1313
\rSec1 [\iotwod.clipprops.synopsis] {\tcode{clip_props} synopsis}
1414

@@ -20,8 +20,9 @@
2020
clip_props() noexcept;
2121
template <class Allocator>
2222
explicit clip_props(const path_builder<Allocator>& pb,
23-
experimental::io2d::fill_rule = experimental::io2d::fill_rule::winding);
24-
explicit clip_props(const path_group& pg, experimental::io2d::fill_rule =
23+
experimental::io2d::fill_rule fr =
24+
experimental::io2d::fill_rule::winding);
25+
explicit clip_props(const path_group& pg, experimental::io2d::fill_rule fr =
2526
experimental::io2d::fill_rule::winding) noexcept;
2627

2728
// \ref{\iotwod.clipprops.modifiers}, modifiers:
@@ -39,65 +40,86 @@
3940

4041
\rSec1 [\iotwod.clipprops.cons] {\tcode{clip_props} constructors}
4142

42-
\indexlibrary{\idxcode{clip_props}!constructor}
43+
\indexlibrary{\idxcode{clip_props}!constructor}%
4344
\begin{itemdecl}
4445
clip_props() noexcept;
4546
\end{itemdecl}
4647
\begin{itemdescr}
4748
\pnum
4849
\effects
49-
The value of Clip Area is its default-constructed value.
50+
Equivalent to: \tcode{clip_props(path_builder<>\{ \})}.
51+
\end{itemdescr}
52+
53+
\indexlibrary{\idxcode{clip_props}!constructor}%
54+
\begin{itemdecl}
55+
template <class Allocator>
56+
explicit clip_props(const path_builder<Allocator>& pb,
57+
experimental::io2d::fill_rule fr);
58+
explicit clip_props(const path_group& pg, experimental::io2d::fill_rule fr)
59+
noexcept;
60+
\end{itemdecl}
61+
\begin{itemdescr}
62+
\pnum
63+
\effects
64+
Constructs an object of type \tcode{clip_props}.
65+
66+
\pnum
67+
The clip area is:
68+
\begin{itemize}
69+
\item \tcode{path_group\{pb\}}; or
70+
\item \tcode{pg}.
71+
\end{itemize}
5072

5173
\pnum
52-
The value of Fill Rule is \tcode{experimental::io2d::fill_rule::winding}.
74+
The fill rule is \tcode{fr}.
5375
\end{itemdescr}
5476

5577
\rSec1 [\iotwod.clipprops.modifiers] {\tcode{clip_props} modifiers}
5678

57-
\indexlibrary{\idxcode{clip_props}!\idxcode{clip}}
79+
\indexlibrarymember{clip}{clip_props}%
5880
\begin{itemdecl}
5981
template <class Allocator>
60-
void clip(const path_builder<Allocator>& pb);
61-
void clip(const path_group& pg) noexcept;
82+
void clip(const path_builder<Allocator>& pb, experimental::io2d::fill_rule fr);
83+
void clip(const path_group& pg, experimental::io2d::fill_rule fr) noexcept;
6284
\end{itemdecl}
6385
\begin{itemdescr}
6486
\pnum
6587
\effects
66-
The value of Clip Area is:
88+
The clip area is:
6789
\begin{itemize}
6890
\item \tcode{path_group\{pb\}}; or
6991
\item \tcode{pg}.
7092
\end{itemize}
7193
\end{itemdescr}
7294

73-
\indexlibrary{\idxcode{clip_props}!\idxcode{fill_rule}}
95+
\indexlibrarymember{fill_rule}{clip_props}%
7496
\begin{itemdecl}
7597
void fill_rule(experimental::io2d::fill_rule fr) noexcept;
7698
\end{itemdecl}
7799
\begin{itemdescr}
78100
\pnum
79101
\effects
80-
The value of Fill Rule is \tcode{fr}.
102+
The fill rule is \tcode{fr}.
81103
\end{itemdescr}
82104

83105
\rSec1 [\iotwod.clipprops.observers] {\tcode{clip_props} observers}
84106

85-
\indexlibrary{\idxcode{clip_props}!\idxcode{clip}}
107+
\indexlibrarymember{clip}{clip_props}%
86108
\begin{itemdecl}
87109
path_group clip() const noexcept;
88110
\end{itemdecl}
89111
\begin{itemdescr}
90112
\pnum
91113
\returns
92-
The value of Clip Area.
114+
The clip area.
93115
\end{itemdescr}
94116

95-
\indexlibrary{\idxcode{clip_props}!\idxcode{fill_rule}}
117+
\indexlibrarymember{fill_rule}{clip_props}%
96118
\begin{itemdecl}
97119
experimental::io2d::fill_rule fill_rule() const noexcept;
98120
\end{itemdecl}
99121
\begin{itemdescr}
100122
\pnum
101123
\returns
102-
The value of Fill Rule.
124+
The fill rule.
103125
\end{itemdescr}

source/io2d.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
\include{scope}
111111
\include{normative-references}
112112
\include{terms-and-definitions}
113-
\include{reqs}
113+
%\include{reqs}
114114
\include{error-reporting}
115115

116116
%% header synopsis

0 commit comments

Comments
 (0)