Skip to content

Commit 4308d6e

Browse files
committed
Renamed extend to tiling since there was a lot of confusion over what extend meant and if it was a typo for, e.g. extent.
1 parent a189be1 commit 4308d6e

File tree

10 files changed

+137
-137
lines changed

10 files changed

+137
-137
lines changed

source/brush.tex

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
brush(surface_brush_factory& f, error_code& ec) noexcept;
2424

2525
// \ref{brush.modifiers}, modifiers:
26-
void extend(experimental::io2d::extend e) noexcept;
26+
void tiling(experimental::io2d::tiling e) noexcept;
2727
void filter(experimental::io2d::filter f) noexcept;
2828
void matrix(const matrix_2d& m) noexcept;
2929

3030
// \ref{brush.observers}, observers:
31-
experimental::io2d::extend extend() const noexcept;
31+
experimental::io2d::tiling tiling() const noexcept;
3232
experimental::io2d::filter filter() const noexcept;
3333
matrix_2d matrix() const noexcept;
3434
brush_type type() const noexcept;
3535

3636
private:
37-
experimental::io2d::extend _Extend; // \expos
37+
experimental::io2d::tiling _Tiling; // \expos
3838
experimental::io2d::filter _Filter; // \expos
3939
matrix_2d _Matrix; // \expos
4040
brush_type _Brush_type; // \expos
@@ -55,7 +55,7 @@
5555
A \tcode{brush} object's graphics data is immutable. It is observable only by the effect that it produces when the brush is used as a Source Brush (\ref{surface.sourcebrush}) or as a Mask Brush (\ref{surface.rendering} and \ref{surface.masking}).
5656

5757
\pnum
58-
A \tcode{brush} object also has mutable \tcode{extend}, \tcode{filter}, and \tcode{matrix_2d} observable state data values.
58+
A \tcode{brush} object also has mutable \tcode{tiling}, \tcode{filter}, and \tcode{matrix_2d} observable state data values.
5959

6060
\pnum
6161
A \tcode{brush} object has an immutable \tcode{brush_type} observable state data value which indicates the type of brush factory that was used in creating the \tcode{brush} object (Table~\ref{tab:brushtype.meanings}).
@@ -82,22 +82,22 @@
8282
\rSec2 [brush.sampling.solidcolor] {Sampling from a solid color brush}
8383

8484
\pnum
85-
When \tcode{b} is a solid color brush, then when sampling from \tcode{b}, the visual data returned shall always be the visual data equivalent to the result of calling \tcode{solid_color_brush_factory::color} on the \tcode{solid_color_brush_factory} from which \tcode{b} was created, regardless of the point which is to be sampled and regardless of the return values of \tcode{b.extend()}, \tcode{b.filter()}, and \tcode{b.matrix()}.
85+
When \tcode{b} is a solid color brush, then when sampling from \tcode{b}, the visual data returned shall always be the visual data equivalent to the result of calling \tcode{solid_color_brush_factory::color} on the \tcode{solid_color_brush_factory} from which \tcode{b} was created, regardless of the point which is to be sampled and regardless of the return values of \tcode{b.tiling()}, \tcode{b.filter()}, and \tcode{b.matrix()}.
8686

8787
\rSec2 [brush.sampling.linear] {Sampling from a linear gradient brush}
8888

8989
\pnum
90-
When \tcode{b} is a linear gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered linear gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered linear gradient is created as specified by \ref{gradients.linear} and \ref{gradients.sampling}, taking into account the value of \tcode{b.extend()} and \tcode{b.filter()}.
90+
When \tcode{b} is a linear gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered linear gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered linear gradient is created as specified by \ref{gradients.linear} and \ref{gradients.sampling}, taking into account the value of \tcode{b.tiling()} and \tcode{b.filter()}.
9191

9292
\rSec2 [brush.sampling.radial] {Sampling from a radial gradient brush}
9393

9494
\pnum
95-
When \tcode{b} is a radial gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered radial gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered radial gradient is created as specified by \ref{gradients.radial} and \ref{gradients.sampling}, taking into account the value of \tcode{b.extend()} and \tcode{b.filter()}.
95+
When \tcode{b} is a radial gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered radial gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered radial gradient is created as specified by \ref{gradients.radial} and \ref{gradients.sampling}, taking into account the value of \tcode{b.tiling()} and \tcode{b.filter()}.
9696

9797
\rSec2 [brush.sampling.surface] {Sampling from a surface brush}
9898

9999
\pnum
100-
When \tcode{b} is a surface brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the graphics data of the brush, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords}, taking into account the value of \tcode{b.extend()} and \tcode{b.filter()}.
100+
When \tcode{b} is a surface brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the graphics data of the brush, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords}, taking into account the value of \tcode{b.tiling()} and \tcode{b.filter()}.
101101

102102
\rSec1 [brush.cons] {\tcode{brush} constructors and assignment operators}
103103

@@ -118,7 +118,7 @@
118118
\postconditions
119119
\tcode{_Brush_type == brush_type::solid_color}.
120120

121-
\tcode{_Extend == std::experimental::io2d::extend::none}.
121+
\tcode{_Tiling == std::experimental::io2d::tiling::none}.
122122

123123
\tcode{_Filter == std::experimental::io2d::filter::fast}.
124124

@@ -152,11 +152,11 @@
152152
\postconditions
153153
\tcode{_Brush_type == brush_type::linear}.
154154

155-
\tcode{_Extend == std::experimental::io2d::extend::none}.
155+
\tcode{_Tiling == std::experimental::io2d::tiling::none}.
156156

157-
\tcode{_Filter == std::experimental::io2d::extend::good}.
157+
\tcode{_Filter == std::experimental::io2d::tiling::good}.
158158

159-
\tcode{_Extend == std::experimental::io2d::extend::none}.
159+
\tcode{_Tiling == std::experimental::io2d::tiling::none}.
160160

161161
\pnum
162162
\throws
@@ -186,11 +186,11 @@
186186
\postconditions
187187
\tcode{_Brush_type == brush_type::radial}.
188188

189-
\tcode{_Extend == std::experimental::io2d::extend::none}.
189+
\tcode{_Tiling == std::experimental::io2d::tiling::none}.
190190

191-
\tcode{_Filter == std::experimental::io2d::extend::good}.
191+
\tcode{_Filter == std::experimental::io2d::tiling::good}.
192192

193-
\tcode{_Extend == std::experimental::io2d::extend::none}.
193+
\tcode{_Tiling == std::experimental::io2d::tiling::none}.
194194

195195
\pnum
196196
\throws
@@ -217,11 +217,11 @@
217217
%\postconditions
218218
%\tcode{_Brush_type == brush_type::mesh}.
219219
%
220-
%\tcode{_Extend == std::experimental::io2d::extend::none}.
220+
%\tcode{_Tiling == std::experimental::io2d::tiling::none}.
221221
%
222-
%\tcode{_Filter == std::experimental::io2d::extend::good}.
222+
%\tcode{_Filter == std::experimental::io2d::tiling::good}.
223223
%
224-
%\tcode{_Extend == std::experimental::io2d::extend::none}.
224+
%\tcode{_Tiling == std::experimental::io2d::tiling::none}.
225225
%
226226
%\pnum
227227
%\throws
@@ -251,11 +251,11 @@
251251
\postconditions
252252
\tcode{_Brush_type == brush_type::surface}.
253253

254-
\tcode{_Extend == std::experimental::io2d::extend::none}.
254+
\tcode{_Tiling == std::experimental::io2d::tiling::none}.
255255

256-
\tcode{_Filter == std::experimental::io2d::extend::good}.
256+
\tcode{_Filter == std::experimental::io2d::tiling::good}.
257257

258-
\tcode{_Extend == std::experimental::io2d::extend::none}.
258+
\tcode{_Tiling == std::experimental::io2d::tiling::none}.
259259

260260
\pnum
261261
\throws
@@ -270,19 +270,19 @@
270270

271271
\rSec1 [brush.modifiers]{\tcode{brush} modifiers}
272272

273-
\indexlibrary{\idxcode{brush}!\idxcode{extend}}
274-
\indexlibrary{\idxcode{extend}!\idxcode{brush}}
273+
\indexlibrary{\idxcode{brush}!\idxcode{tiling}}
274+
\indexlibrary{\idxcode{tiling}!\idxcode{brush}}
275275
\begin{itemdecl}
276-
void extend(experimental::io2d::extend e) noexcept;
276+
void tiling(experimental::io2d::tiling e) noexcept;
277277
\end{itemdecl}
278278
\begin{itemdescr}
279279
\pnum
280280
\effects
281-
Sets the \tcode{extend} value for the \tcode{brush} object.
281+
Sets the \tcode{tiling} value for the \tcode{brush} object.
282282

283283
\pnum
284284
\postconditions
285-
\tcode{_Extend == e}.
285+
\tcode{_Tiling == e}.
286286
\end{itemdescr}
287287

288288
\indexlibrary{\idxcode{brush}!\idxcode{filter}}
@@ -317,15 +317,15 @@
317317

318318
\rSec1 [brush.observers]{\tcode{brush} observers}
319319

320-
\indexlibrary{\idxcode{brush}!\idxcode{extend}}
321-
\indexlibrary{\idxcode{extend}!\idxcode{brush}}
320+
\indexlibrary{\idxcode{brush}!\idxcode{tiling}}
321+
\indexlibrary{\idxcode{tiling}!\idxcode{brush}}
322322
\begin{itemdecl}
323-
experimental::io2d::extend extend() const noexcept;
323+
experimental::io2d::tiling tiling() const noexcept;
324324
\end{itemdecl}
325325
\begin{itemdescr}
326326
\pnum
327327
\returns
328-
\tcode{_Extend}.
328+
\tcode{_Tiling}.
329329
\end{itemdescr}
330330

331331
\indexlibrary{\idxcode{brush}!\idxcode{filter}}

source/brushes.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Brushes serve as sources of visual data for composing operations.
77

88
\pnum
9-
A brush has its own mutable coordinate space (by default the standard coordinate space). It also posses a mutable \tcode{extend} value and a mutable \tcode{filter} value.
9+
A brush has its own mutable coordinate space (by default the standard coordinate space). It also posses a mutable \tcode{tiling} value and a mutable \tcode{filter} value.
1010

1111
\pnum
1212
A brush is created using one of four factory classes:
@@ -25,7 +25,7 @@
2525

2626
\addtocounter{SectionDepthBase}{1}
2727
\input{gradients}
28-
\input{extend}
28+
\input{tiling}
2929
\input{filter}
3030
\input{brush-type}
3131
\input{brush}

source/definitions-fonts.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
\definition{body size}{\iotwod.general.defns.bodysize}
120120
the font size, measured along the y axis of the glyph's standard coordinate system
121121

122-
\indexdefn{extended body size}
123-
\definition{extended body size}{\iotwod.general.defns.extendedbodysize}
122+
\indexdefn{tilinged body size}
123+
\definition{tilinged body size}{\iotwod.general.defns.tilingedbodysize}
124124
a reference size with two components, measured respectively along the \xaxis and \yaxis of the glyph's standard coordinate system
125125

126126
\indexdefn{design frame}
@@ -135,5 +135,5 @@
135135
%
136136
%\indexdefn{blackness}
137137
%\definition{blackness}{\iotwod.general.defns.blackness}
138-
%the ratio of the blackened area of a glyph image to the extended body size area of the glyph image \\
138+
%the ratio of the blackened area of a glyph image to the tilinged body size area of the glyph image \\
139139
%\lbrack SOURCE: ISO/IEC 9541-1:2012, definition 3.32 \rbrack

source/experimental-io2d.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
enum class line_join;
2323
enum class compositing_operator;
2424
enum class format;
25-
enum class extend;
25+
enum class tiling;
2626
enum class filter;
2727
enum class brush_type;
2828
enum class subpixel_order;

source/filter.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@
7272
\\
7373
\tcode{bilinear}
7474
& Bilinear interpolation filtering shall be used.
75-
% The distance-weighted average of the four nearest pixels is used to create an interpolated color for the destination pixel. If some source pixel values do not exist (e.g. because an edge or corner of the source has been reached) then the current \tcode{extend} should be considered in order to determine the values for the missing source pixels. If a hardware sampler is available and offers bilinear filtering, implementations may use it even if its results do not conform to those produced by the description of bilinear filtering provided by this standard.% Whether mipmapping is used and whether mipmaps are generated for sources that do not have them is \impldef{filter!bilinear mipmapping}.
75+
% The distance-weighted average of the four nearest pixels is used to create an interpolated color for the destination pixel. If some source pixel values do not exist (e.g. because an edge or corner of the source has been reached) then the current \tcode{tiling} should be considered in order to determine the values for the missing source pixels. If a hardware sampler is available and offers bilinear filtering, implementations may use it even if its results do not conform to those produced by the description of bilinear filtering provided by this standard.% Whether mipmapping is used and whether mipmaps are generated for sources that do not have them is \impldef{filter!bilinear mipmapping}.
7676
\\
7777
\end{libreqtab2}

source/font-extents.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
This value is the distance in untransformed coordinate space units from the top of the font's bounding box to the font's baseline.
146146

147147
\pnum
148-
Some glyphs may extend slightly above the top of the font's bounding box due to hinting or for aesthetic reasons.
148+
Some glyphs may tiling slightly above the top of the font's bounding box due to hinting or for aesthetic reasons.
149149

150150
\end{itemdescr}
151151

@@ -164,7 +164,7 @@
164164
This value is the distance in untransformed coordinate space units from the bottom of the font's bounding box to the font's baseline.
165165

166166
\pnum
167-
Some glyphs may extend slightly below the bottom of the font's bounding box due to hinting or for aesthetic reasons.
167+
Some glyphs may tiling slightly below the bottom of the font's bounding box due to hinting or for aesthetic reasons.
168168

169169
\pnum
170170
\enternote

source/gradients.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@
117117
where $o$ is a color stop offset value.
118118

119119
\pnum
120-
The range of potential values for $o$ shall be determined by the \tcode{extend} value of the \tcode{brush} object created using the radial gradient:
120+
The range of potential values for $o$ shall be determined by the \tcode{tiling} value of the \tcode{brush} object created using the radial gradient:
121121
\begin{itemize}
122-
\item For \tcode{extend::none}, the range of potential values for $o$ is $[0,1]$.
123-
\item For all other \tcode{extend} values, the range of potential values for $o$ is\\ $[$~\tcode{numeric_limits<double>::lowest(),numeric_limits<double>::max()}~$]$.
122+
\item For \tcode{tiling::none}, the range of potential values for $o$ is $[0,1]$.
123+
\item For all other \tcode{tiling} values, the range of potential values for $o$ is\\ $[$~\tcode{numeric_limits<double>::lowest(),numeric_limits<double>::max()}~$]$.
124124
\end{itemize}
125125

126126
\pnum
@@ -181,20 +181,20 @@
181181

182182
\item Where the value of $o$ is in the range $[0,1]$, its color value shall be determined by interpolating between the color stop, $r$, which is the color stop whose offset value is closest to $o$ without being less than $o$ and which can have an adjacent color stop to its left, and the color stop that is adjacent to $r$ on $r$'s left. The acceptable forms of interpolating between color values is set forth later in this section.
183183

184-
\item Where the value of $o$ is outside the range $[0,1]$, its color value depends on the \tcode{extend} value of the brush which is created using the gradient:
184+
\item Where the value of $o$ is outside the range $[0,1]$, its color value depends on the \tcode{tiling} value of the brush which is created using the gradient:
185185
\begin{itemize}
186-
\item If the \tcode{extend} value is \tcode{extend::none}, the color value of $o$ shall be \tcode{rgba_color::transparent_black()}.
186+
\item If the \tcode{tiling} value is \tcode{tiling::none}, the color value of $o$ shall be \tcode{rgba_color::transparent_black()}.
187187

188-
\item If the \tcode{extend} value is \tcode{extend::pad}, if $o$ is negative then the color value of $o$ shall be the same as if the value of $o$ was \tcode{0.0}, otherwise the color value of $o$ shall be the same as if the value of $o$ was \tcode{1.0}.
188+
\item If the \tcode{tiling} value is \tcode{tiling::pad}, if $o$ is negative then the color value of $o$ shall be the same as if the value of $o$ was \tcode{0.0}, otherwise the color value of $o$ shall be the same as if the value of $o$ was \tcode{1.0}.
189189

190-
\item If the \tcode{extend} value is \tcode{extend::repeat}, then \tcode{1.0} shall be added to or subtracted from $o$ until $o$ is in the range $[0,1]$, at which point its color value is the color value for the modified value of $o$ as determined by these rules.
190+
\item If the \tcode{tiling} value is \tcode{tiling::repeat}, then \tcode{1.0} shall be added to or subtracted from $o$ until $o$ is in the range $[0,1]$, at which point its color value is the color value for the modified value of $o$ as determined by these rules.
191191
\enterexample
192192
Given $o == 2.1$, after application of this rule $o == 0.1$ and the color value of $o$ shall be the same value as if the initial value of $o$ was $0.1$.
193193

194194
Given $o == -0.3$, after application of this rule $o == 0.7$ and the color value of $o$ shall be the same as if the initial value of $o$ was $0.7$.
195195
\exitexample
196196

197-
\item If the \tcode{extend} value is \tcode{extend::reflect}, $o$ shall be set to the absolute value of $o$, then 2.0 shall be subtracted from $o$ until $o$ is in the range $[0,2]$, then if $o$ is in the range $(1,2]$ then $o$ shall be set to \tcode{1.0 - (o - 1.0)}, at which point its color value is the color value for the modified value of $o$ as determined by these rules.
197+
\item If the \tcode{tiling} value is \tcode{tiling::reflect}, $o$ shall be set to the absolute value of $o$, then 2.0 shall be subtracted from $o$ until $o$ is in the range $[0,2]$, then if $o$ is in the range $(1,2]$ then $o$ shall be set to \tcode{1.0 - (o - 1.0)}, at which point its color value is the color value for the modified value of $o$ as determined by these rules.
198198
\enterexample
199199
Given $o == 2.8$, after application of this rule $o == 0.8$ and the color value of $o$ shall be the same value as if the initial value of $o$ was $0.8$.
200200

source/io2d.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
%\include{line-join}
108108
%\include{compositing-operator}
109109
%\include{format}
110-
%\include{extend}
110+
%\include{tiling}
111111
%\include{filter}
112112
%\include{brush-type}
113113
%\include{font-slant}

0 commit comments

Comments
 (0)